prefer automake-1.4 etc.GCONF_1_0_8

2002-02-04  Havoc Pennington  <hp@redhat.com>

	* autogen.sh (ACLOCAL): prefer automake-1.4 etc.

	* configure.in: bump version to 1.0.8

32 files changed, 5970 insertions, 5205 deletions

diff --git a/ChangeLog b/ChangeLog
index a9e79d72..5d7992da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-04  Havoc Pennington  <hp@redhat.com>
+
+	* autogen.sh (ACLOCAL): prefer automake-1.4 etc.
+
+	* configure.in: bump version to 1.0.8
+
 2002-01-23  Havoc Pennington  <hp@pobox.com>
 
 	* gconf/gconf-internals.c (gconf_activate_server): try to use
diff --git a/autogen.sh b/autogen.sh
index 4025ef08..fd433f2f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -20,7 +20,15 @@ DIE=0
 	DIE=1
 }
 
-(automake --version) < /dev/null > /dev/null 2>&1 || {
+AUTOMAKE=automake-1.4
+ACLOCAL=aclocal-1.4
+
+($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || {
+        AUTOMAKE=automake
+        ACLOCAL=aclocal
+}
+
+($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || {
 	echo
 	echo "You must have automake installed to compile $PROJECT."
 	echo "Get ftp://sourceware.cygnus.com/pub/automake/automake-1.4.tar.gz"
@@ -108,14 +116,14 @@ do
 	echo "Running libtoolize..."
 	libtoolize --force --copy
       fi
-      echo "Running aclocal $aclocalinclude ..."
-      aclocal $aclocalinclude
+      echo "Running $ACLOCAL $aclocalinclude ..."
+      $ACLOCAL $aclocalinclude
       if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
 	echo "Running autoheader..."
 	autoheader
       fi
-      echo "Running automake --gnu $am_opt ..."
-      automake --add-missing --gnu $am_opt
+      echo "Running $AUTOMAKE --gnu $am_opt ..."
+      $AUTOMAKE --add-missing --gnu $am_opt
       echo "Running autoconf ..."
       autoconf
     )
diff --git a/configure.in b/configure.in
index 22f049d6..2f93c100 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.0.7)
+AM_INIT_AUTOMAKE(GConf, 1.0.8)
 
 AM_MAINTAINER_MODE
 
@@ -73,7 +73,7 @@ GCONF_CURRENT=1
 
 dnl increment any time the source changes; set to 
 dnl  0 if you increment CURRENT
-GCONF_REVISION=2
+GCONF_REVISION=3
 
 dnl increment if any interfaces have been added; set to 0
 dnl  if any interfaces have been removed. removal has 
diff --git a/po/az.po b/po/az.po
index 50d28d99..65721d27 100644
--- a/po/az.po
+++ b/po/az.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf 1.0.7\n"
-"POT-Creation-Date: 2001-11-27 19:45+0100\n"
+"POT-Creation-Date: 2002-02-04 18:21-0500\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"
@@ -31,7 +31,7 @@ msgstr "BDB \"backend\" modulu başladılır"
 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:1053
+#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1050
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "`%s' qovluğunu yarada bilmədim : %s"
@@ -45,52 +45,47 @@ msgstr "`%s' ünvanda %s ana qovluğunda oxuya bilmədim və yaza bilmədim ."
 msgid "Unloading XML backend module."
 msgstr "XML modulunu çıxarıram ."
 
-#: backends/xml-backend.c:286
+#: backends/xml-backend.c:289
 #, c-format
 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:386
+#: backends/xml-backend.c:414
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
 msgstr "`%s' ünvanda XML ana qovluğunda oxuya bilmədim və yaza bilmədim ."
 
-#: backends/xml-backend.c:396
+#: backends/xml-backend.c:424
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "%s kökündəki XML qaynaq qovluq/fayl səlahiyyətləri : %o/%o"
 
-#: backends/xml-backend.c:680
+#: backends/xml-backend.c:708
 msgid "Initializing XML backend module"
 msgstr "XML modulunu əlavə edirəm"
 
-#: backends/xml-backend.c:745
+#: backends/xml-backend.c:773
 #, 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"
 
 #: 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"
+msgstr "XML modulunu qapadırkən sinxronlaşdırılmamış qovluq silinmələri geriyə qalır"
 
 #: 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"
+msgstr "XML modulunun axtar yaddaşından `%s' qovluğunu silə bilmirəm, çünkü bu qovluq diskə müvəffəqiyyətlə sinxronlaşdırılmamışdır"
 
 #: backends/xml-cache.c:256
 #, c-format
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than %"
 "u seconds"
-msgstr ""
-"%u saniyə içində onsuz da sinxronlaşdırılmış üzvlər təmizləndikdən sonra % u "
-"qədər üzv ön yaddaşda qalıb"
+msgstr "%u saniyə içində onsuz da sinxronlaşdırılmış üzvlər təmizləndikdən sonra % u qədər üzv ön yaddaşda qalıb"
 
 #: backends/xml-dir.c:164
 #, c-format
@@ -133,34 +128,32 @@ msgid "Failed to delete old file `%s': %s"
 msgstr "Köhnə fayl `%s'ni silerken xəta oldu : %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:806
+#: backends/xml-dir.c:803
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "`%s'ni aça bilmədim : %s"
 
-#: backends/xml-dir.c:950
+#: backends/xml-dir.c:947
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Cüt `%s' üzvləri ( `%s'də ), keçirəm"
 
-#: backends/xml-dir.c:972
+#: backends/xml-dir.c:969
 #, 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:980
+#: backends/xml-dir.c:977
 #, c-format
 msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
-msgstr ""
-"XML faylı `%s' içindəki təpə nüqtəsi<entry> yerinə <%s> olaraq tapılmışdır, "
-"keçirəm"
+msgstr "XML faylı `%s' içindəki təpə nüqtəsi<entry> yerinə <%s> olaraq tapılmışdır, keçirəm"
 
-#: backends/xml-dir.c:1069
+#: backends/xml-dir.c:1066
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "`%s' faylını yaradarkən xəta oldu : %s"
 
-#: backends/xml-dir.c:1077
+#: backends/xml-dir.c:1074
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "`%s' faylını qapadırkən xəta oldu : %s"
@@ -207,8 +200,7 @@ msgstr "XML siyahı üzvündəki <%s> XML üzvünü başa düşmədim"
 
 #: backends/xml-entry.c:1051
 msgid "Invalid type (list, pair, or unknown) in a list node"
-msgstr ""
-"Siyahı üzvünün növü hökmsüzdür ( siyahı, yoldaş ya da naməlum ola bilər )"
+msgstr "Siyahı üzvünün növü hökmsüzdür ( siyahı, yoldaş ya da naməlum ola bilər )"
 
 #: backends/xml-entry.c:1074
 #, c-format
@@ -227,8 +219,7 @@ msgstr "XML yoldaşı üçün pis şəkilləndirilmiş `car''ı : %s"
 
 #: backends/xml-entry.c:1143 backends/xml-entry.c:1166
 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"
+msgstr "XML faylını oxuyuram : siyahı və yoldaşlar birlikdə bir yerdə ola bilməz"
 
 #: backends/xml-entry.c:1156
 #, c-format
@@ -254,8 +245,7 @@ msgstr "XML faylındakı qiymət yoldaşları üçün `car' əksikdir"
 
 #: backends/xml-entry.c:1211
 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"
+msgstr "XML faylındakı qiymət yoldaşları üçün `cdr' və `cdr' qiymətləri əksikdir"
 
 #. -- end debug only
 #: gconf/gconf-backend.c:167
@@ -322,10 +312,7 @@ 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."
+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."
 
 #: gconf/gconf-database.c:1042
 #, c-format
@@ -341,7 +328,7 @@ msgstr ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
 "result in a notification weirdly reappearing): %s"
 
-#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1328
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "`%s' üçün qiyməti alırkən xəta oldu : %s"
@@ -532,8 +519,7 @@ msgstr "Cütünü gözləyərkən, %s aldım"
 #: gconf/gconf-internals.c:1585
 #, 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"
+msgstr "%s,%s cütünü gözləyərkən , bir ya da iki qiyməti olmayan bir oxşar aldım"
 
 #: gconf/gconf-internals.c:1601
 #, c-format
@@ -595,8 +581,10 @@ msgid "Failed to create or open '%s'"
 msgstr "'%s' yaradılması və ya açılmasında xəta"
 
 #: gconf/gconf-internals.c:2520
-#, c-format
-msgid "Failed to lock '%s': another process has the lock (%s)"
+#, fuzzy, c-format
+msgid ""
+"Failed to lock '%s': probably another process has the lock, or your "
+"operating system has NFS file locking misconfigured (%s)"
 msgstr "'%s' qıfıllana bilmədi: başqa bir gedişat başlamışdır(%s)"
 
 #: gconf/gconf-internals.c:2548
@@ -611,9 +599,7 @@ msgstr "gconftool və ya başqa qeyri-gconfd gedişatı '%s' faylını qıfılla
 
 #: gconf/gconf-internals.c:2595
 msgid "couldn't contact ORB to resolve existing gconfd object reference"
-msgstr ""
-"mövcud gconfd cism referenslərini həll etmək üçün ORB ilə rabitə qura "
-"bilmirəm"
+msgstr "mövcud gconfd cism referenslərini həll etmək üçün ORB ilə rabitə qura bilmirəm"
 
 #: gconf/gconf-internals.c:2627
 #, c-format
@@ -660,12 +646,12 @@ msgstr "%s yaradılması bacarılmadı: %s"
 msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
 msgstr "gconf demonu ilə borulanmış rabitə yaradılması bacarılmadı: %s\n"
 
-#: gconf/gconf-internals.c:3060
+#: gconf/gconf-internals.c:3064
 #, c-format
 msgid "Failed to launch configuration server: %s\n"
 msgstr "Quraşdırma vericisi başladıla bilmədi: %s\n"
 
-#: gconf/gconf-internals.c:3084
+#: gconf/gconf-internals.c:3088
 msgid ""
 "Failed to contact configuration server (a likely cause of this is that you "
 "have an existing configuration server (gconfd) running, but it isn't "
@@ -677,46 +663,46 @@ msgstr ""
 "reachable from here - if you're logged in from two machines at once, you may "
 "need to enable TCP networking for ORBit)\n"
 
-#: gconf/gconf-internals.c:3720
+#: gconf/gconf-internals.c:3724
 #, c-format
 msgid "Failed to read from child pipe (%s)"
 msgstr "Törəmə pipe-dan oxuma iflası (%s)"
 
-#: gconf/gconf-internals.c:3785
+#: gconf/gconf-internals.c:3789
 #, c-format
 msgid "Failed to fork (%s)"
 msgstr "fork iflası (%s)"
 
-#: gconf/gconf-internals.c:3925
+#: gconf/gconf-internals.c:3929
 #, c-format
 msgid "Failed to change to directory '%s' (%s)"
 msgstr "Qovluq dəyişdirmə iflası '%s' (%s)"
 
-#: gconf/gconf-internals.c:3935
+#: gconf/gconf-internals.c:3939
 #, c-format
 msgid "Failed to execute child process (%s)"
 msgstr "Törəmə gedişat icra iflası (%s)"
 
-#: gconf/gconf-internals.c:3944
+#: gconf/gconf-internals.c:3948
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
 msgstr "Törəmə gedişat giriş və ya yekun istiqamətləndirmə xətası (%s)"
 
-#: gconf/gconf-internals.c:3953
+#: gconf/gconf-internals.c:3957
 #, c-format
 msgid "Failed to fork child process (%s)"
 msgstr "Törəmə gedişat fork xətası (%s)"
 
-#: gconf/gconf-internals.c:3961
+#: gconf/gconf-internals.c:3965
 msgid "Unknown error executing child process"
 msgstr "Törəmə gedişat işində naməlum xəta"
 
-#: gconf/gconf-internals.c:3982
+#: gconf/gconf-internals.c:3986
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr "Törəmə pid pipe dan kifayət qədər məlumat oxuma iflası (%s)"
 
-#: gconf/gconf-internals.c:4032
+#: gconf/gconf-internals.c:4036
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr "Törəmə gedişatların xəbərləşməyi üçün pipe yaratma iflası (%s)"
@@ -726,25 +712,23 @@ msgstr "Törəmə gedişatların xəbərləşməyi üçün pipe yaratma iflası
 msgid "Failed to load source `%s': %s"
 msgstr "`%s' qaynağını yükləyə bilmədim : %s"
 
-#: gconf/gconf-sources.c:510
+#: gconf/gconf-sources.c:544
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr "`%s' şəkli `%s' üçün bir şəkil qiyməti olmayan bir qiymət daxil edir"
 
-#: gconf/gconf-sources.c:567
+#: gconf/gconf-sources.c:601
 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"
+msgstr "'/' adları sadəcə bir qovluq ola bilər, qətiyyan'iyyen bir açar ola bilməz"
 
-#: gconf/gconf-sources.c:596
+#: gconf/gconf-sources.c:630
 #, 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"
+msgstr "`%s' üçün sırf-oxunan qaynaqda sənin yolundan əvvəl bir qiymət oturdulub"
 
-#: gconf/gconf-sources.c:608
+#: gconf/gconf-sources.c:642
 #, c-format
 msgid ""
 "Unable to store a value at key '%s', as the configuration server has no "
@@ -769,22 +753,20 @@ msgstr ""
 "connections? As always, check the user.* syslog for details on problems "
 "gconfd encountered."
 
-#: gconf/gconf-sources.c:1164
+#: gconf/gconf-sources.c:1198
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Meta məlumatları axtarılırkən xəta oldu : %s"
 
-#: gconf/gconf-sources.c:1233
+#: gconf/gconf-sources.c:1267
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Meta məlumatları alırkən xəta oldu : %s"
 
-#: gconf/gconf-sources.c:1257
+#: gconf/gconf-sources.c:1291
 #, 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"
+msgstr "Açar `%s' `%s' açarı üçün şəkil olaraq bildirilmiş və düzdür `%s' növünü qeyd edir"
 
 #: gconf/gconf-value.c:81
 #, c-format
@@ -928,25 +910,19 @@ msgstr "Qapanma istəyi alındı"
 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"
+msgstr "gconfd vericisi məlumatlandırma ilə yoxlanıb ; qaynaq qovluğunda gconf.path'yuükləməyə cəhd edirəm"
 
 #: gconf/gconfd.c:297
 #, 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'ni istifadə "
-"edirəm"
+msgstr "Quraşdırma faylları tapıla bilmədi , əsas quraşdırma qaynağı `%s'ni istifadə edirəm"
 
 #: gconf/gconfd.c:306
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
-msgstr ""
-"Qaynaq qovluğunda quraşdırma mənbələri yoxdur, qurğular qeyd "
-"edilməyəcəkdir ; dəyişdir "
+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:306
 msgid "/path"
@@ -961,32 +937,24 @@ msgstr "Bəzi quraşdırma qaynaqlarını yüklərkən xəta oldu : %s"
 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"
+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"
 
 #: gconf/gconfd.c:349
 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"
+msgstr "Yazıla bilən bir quraşdırma qaynağı ünvanını həll edə bilmədim, bə'zi quraşdırma dəyişikliklərini bəlkə qeyd edə bilmədim"
 
 #: gconf/gconfd.c:375
 #, 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."
+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:391
 #, c-format
 msgid ""
 "Received signal %d, shutting down abnormally. Please file a GConf bug report."
-msgstr ""
-"%d siqnalını aldım, təmiz sürətdə qapana bilmirəm. Lütfən GConf xətasını "
-"raport edin."
+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:408
 #, c-format
@@ -1027,76 +995,72 @@ msgstr "Çıxıram"
 msgid "GConf server is not in use, shutting down."
 msgstr "GConf vericisi istifadədə deyildir, qapanıram ."
 
-#: gconf/gconfd.c:1049
+#: gconf/gconfd.c:1059
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Xəta təpməsi: %s"
 
-#: gconf/gconfd.c:1149
+#: gconf/gconfd.c:1159
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
 "gconfd shutdown (%s)"
-msgstr ""
-"Gconf qeyd faylı açıla bilmədi; fconf qurtardıqdan sonra dinləyiciləri "
-"bərpa  eda bilməyəcəksən (%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/gconfd.c:1184
+#: gconf/gconfd.c:1194
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr "Gconf qeyd faylı qapadıla bilmədi; data düzgün qeyd edilə bilməz (%s)"
 
-#: gconf/gconfd.c:1253
+#: gconf/gconfd.c:1263
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "Qeyd edilmiş hal faylı `%s'ni aça bilmədim : %s"
 
-#: gconf/gconfd.c:1267
+#: gconf/gconfd.c:1277
 #, 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:1276
+#: gconf/gconfd.c:1286
 #, 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:1290
+#: gconf/gconfd.c:1300
 #, 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:1300
+#: gconf/gconfd.c:1310
 #, 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:1309
+#: gconf/gconfd.c:1319
 #, 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"
+msgstr "'%s' a(ə) köçürülmüş əsl qeyd edilmiş hal faylını bərpa eda bilmədim: %s"
 
-#: gconf/gconfd.c:1784
+#: gconf/gconfd.c:1794
 #, 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"
+msgstr "'%s' ünvanındakı dinləyici bərpa edilə bilmir, database hall edilə bilmir"
 
-#: gconf/gconfd.c:1830
+#: gconf/gconfd.c:1840
 #, c-format
 msgid "Error reading saved state file: %s"
 msgstr "Qeyd edilmiş vəziyyət faylı oxunarkən xəta oldu : %s"
 
-#: gconf/gconfd.c:1883
+#: gconf/gconfd.c:1893
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "Qeyd edilmiş `%s' hal faylı açıla bilmədi:  %s"
 
-#: gconf/gconfd.c:2000
+#: gconf/gconfd.c:2010
 #, c-format
 msgid ""
 "Failed to log addition of listener to gconfd logfile; won't be able to re-"
@@ -1105,7 +1069,7 @@ msgstr ""
 "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/gconfd.c:2005
+#: gconf/gconfd.c:2015
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously re-"
@@ -1114,31 +1078,30 @@ msgstr ""
 "Failed to log removal of listener to gconfd logfile; might erroneously re-"
 "add the listener if gconfd exits or shuts down (%s)"
 
-#: gconf/gconfd.c:2028 gconf/gconfd.c:2193
+#: gconf/gconfd.c:2038 gconf/gconfd.c:2203
 #, c-format
 msgid "Failed to get IOR for client: %s"
 msgstr "IOR alıcısı alınması bacarılmadı: %s"
 
-#: gconf/gconfd.c:2043
+#: gconf/gconfd.c:2053
 #, c-format
 msgid "Failed to open saved state file: %s"
 msgstr "Qeyd edilmiş hal faylı açıla bilmədi:  %s"
 
-#: gconf/gconfd.c:2056
+#: gconf/gconfd.c:2066
 #, c-format
 msgid "Failed to write client add to saved state file: %s"
 msgstr "Qeyd edilmiş hal faylına alıcı qeyd edilə bilmədi: %s"
 
-#: gconf/gconfd.c:2064
+#: gconf/gconfd.c:2074
 #, 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:2154
+#: gconf/gconfd.c:2164
 msgid ""
 "Some client removed itself from the GConf server when it hadn't been added."
-msgstr ""
-"Bir alıcı özünü GConf vericisindən çıxardıb və ona görə də əlavə edilməyib."
+msgstr "Bir alıcı özünü GConf vericisindən çıxardıb və ona görə də əlavə edilməyib."
 
 #: gconf/gconftool.c:68
 msgid "Help options"
@@ -1146,8 +1109,7 @@ msgstr "Kömək seçənəkləri"
 
 #: gconf/gconftool.c:77
 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 ."
+msgstr "Bir açara bir qiymət ver və sinxronlaşdır . --type'la istifadə edilir ."
 
 #: gconf/gconftool.c:86
 msgid "Print the value of a key to standard output."
@@ -1157,9 +1119,7 @@ msgstr "Standart nəticəyə bir açarının qiymətini ver."
 msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and --"
 "type."
-msgstr ""
-"Sxemi seç və sinxronlaşdır. --short-desc, --long-desc, --owner, and --type "
-"ilə işlət."
+msgstr "Sxemi seç və sinxronlaşdır. --short-desc, --long-desc, --owner, and --type ilə işlət."
 
 #: gconf/gconftool.c:105
 msgid "Unset the keys on the command line"
@@ -1175,8 +1135,7 @@ msgstr "Bir qovluqdakı altqovluqları göstər ."
 
 #: gconf/gconftool.c:132
 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 ."
+msgstr "Bir qovluğun bütün alt qovluqlarını və üzvlərini dərinliyi ilə göstər ."
 
 #: gconf/gconftool.c:141
 msgid "Return 0 if the directory exists, 2 if it does not."
@@ -1188,24 +1147,19 @@ msgstr "gconfd'yi qapat . BU SEÇƏNƏYİ YAXŞI BIR SƏBƏBİN OLMADAN İSTİFA
 
 #: gconf/gconftool.c:159
 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 ."
+msgstr "gconfd vericisi işləyirsə 0'ı nəticəsini ver, yoxsa 2'yi nəticəsini ver ."
 
 #: gconf/gconftool.c:168
 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 . )"
+msgstr "Quraşdırma vericisini ( gconfd ) başlatdım. ( Bu onsuz da lazımlı olduğu vaxt edilir . )"
 
 #: gconf/gconftool.c:177
 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 ."
+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 ."
 
 #: gconf/gconftool.c:178
 msgid "int|bool|float|string|list|pair"
@@ -1215,9 +1169,7 @@ msgstr "int|bool|float|string|list|pair"
 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."
+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."
 
 #: gconf/gconftool.c:187 gconf/gconftool.c:196 gconf/gconftool.c:205
 msgid "int|bool|float|string"
@@ -1227,23 +1179,17 @@ msgstr "int | bool | float | string"
 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."
+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."
 
 #: gconf/gconftool.c:204
 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."
+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."
 
 #: gconf/gconftool.c:213
 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 ."
+msgstr "Şekilldə yaxşı görünəcək növdə , qısa və yarım-sətir uzunluğunda bir izahı bildir ."
 
 #: gconf/gconftool.c:214 gconf/gconftool.c:223
 msgid "DESCRIPTION"
@@ -1271,9 +1217,7 @@ msgstr "FAYLADI"
 
 #: gconf/gconftool.c:249
 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"
+msgstr "Əsas qurğulu qovluq xaricində istifadə ediləcək bir quraşdırma qaynağını bildir"
 
 #: gconf/gconftool.c:250
 msgid "SOURCE"
@@ -1283,35 +1227,26 @@ msgstr "QAYNAQ"
 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."
+msgstr "Quraşdırma bildi tabanına direkt olaraq yetiş və vericiyi keç . gconfd'nin fəal olmamalıdır."
 
 #: gconf/gconftool.c:267
 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 ."
+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 ."
 
 #: gconf/gconftool.c:276
 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) ."
+msgstr "Bir proqrama cəfa sınağını əlavə et ( bu əmrdə tapılan müxtəlif növlü müxtəlif qiymətlərin oturdulub silinməsi ilə olur) ."
 
 #: gconf/gconftool.c:285
 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) ."
+msgstr "Bir proqrama cəfa sınağını əlavə et ( bu əmrdə tapılan qovluqlar içindəki müxtəlif açarların oturdulub silinməsi ilə olur) ."
 
 #: gconf/gconftool.c:294
 msgid "Get the short doc string for a key"
@@ -1362,17 +1297,13 @@ msgstr "--get və ya --set'lə birlikdə --all-dirs istifadə edilə bilməz\n"
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-"
 "entries, or --all-dirs\n"
-msgstr ""
-"--recursive-list --get, --set, --unset, --all-entries və ya --all-dirs ilə "
-"işlədilməz\n"
+msgstr "--recursive-list --get, --set, --unset, --all-entries və ya --all-dirs ilə işlədilməz\n"
 
 #: gconf/gconftool.c:437
 msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-entries, --"
 "all-dirs\n"
-msgstr ""
-"--set_schema --get, --set, --unset, --all-entries, --all-dirs ilə işlədilə "
-"bilməz\n"
+msgstr "--set_schema --get, --set, --unset, --all-entries, --all-dirs ilə işlədilə bilməz\n"
 
 #: gconf/gconftool.c:443
 msgid "Value type is only relevant when setting a value\n"
@@ -1396,8 +1327,7 @@ msgstr "--install-schema-file öz özünə istifadə edilmək məcburiyyətində
 
 #: gconf/gconftool.c:490
 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"
+msgstr "--makefile-install-rule öz özünə istifadə edilmək məcburiyyətindədir .\n"
 
 #: gconf/gconftool.c:501
 msgid "--break-key must be used by itself.\n"
@@ -1410,404 +1340,380 @@ msgstr "--break-directory öz özünə istifadə edilmək məcburiyyətindədir
 #: gconf/gconftool.c:519
 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"
+msgstr "--direct'lə --config-source istifadə edildiyi vaxt bir quraşdırma qaynağını bildir \n"
 
 #: gconf/gconftool.c:525
+msgid "You should use --direct when using a non-default configuration source\n"
+msgstr ""
+
+#: gconf/gconftool.c:531
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "GConf'un başlaması iflas etdi: %s\n"
 
-#: gconf/gconftool.c:560
+#: gconf/gconftool.c:566
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "GCONF_CONFIG_SOURCE verisi bildirilmiş olmaq məcburiyyətindədir\n"
 
-#: gconf/gconftool.c:589
+#: gconf/gconftool.c:595
 #, 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:790
+#: gconf/gconftool.c:796
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Qapatılma xətası : %s\n"
 
-#: gconf/gconftool.c:833
+#: gconf/gconftool.c:839
 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"
+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:867
+#: gconf/gconftool.c:873
 #, c-format
 msgid "Failure listing entries in `%s': %s\n"
 msgstr "`%s' içindəki sahələr sıralana bilmədi: %s\n"
 
-#: gconf/gconftool.c:885
+#: gconf/gconftool.c:891
 msgid "(no value set)"
 msgstr "( qiyməti yoxdur )"
 
-#: gconf/gconftool.c:940
+#: gconf/gconftool.c:946
 #, 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:954
+#: gconf/gconftool.c:960
 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:989
+#: gconf/gconftool.c:995
 #, c-format
 msgid "Type: %s\n"
 msgstr "Nov: %s\n"
 
-#: gconf/gconftool.c:990
+#: gconf/gconftool.c:996
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Siyahı növü : %s\n"
 
-#: gconf/gconftool.c:991
+#: gconf/gconftool.c:997
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Car növü : %s\n"
 
-#: gconf/gconftool.c:992
+#: gconf/gconftool.c:998
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Cdr növü : %s\n"
 
-#: gconf/gconftool.c:997
+#: gconf/gconftool.c:1003
 #, c-format
 msgid "Default Value: %s\n"
 msgstr "Ana Qiymət: %s\n"
 
-#: gconf/gconftool.c:997 gconf/gconftool.c:999 gconf/gconftool.c:1000
-#: gconf/gconftool.c:1001
+#: gconf/gconftool.c:1003 gconf/gconftool.c:1005 gconf/gconftool.c:1006
+#: gconf/gconftool.c:1007
 msgid "Unset"
 msgstr "İşarəti Qaldır"
 
-#: gconf/gconftool.c:999
+#: gconf/gconftool.c:1005
 #, c-format
 msgid "Owner: %s\n"
 msgstr "Yiyə : %s\n"
 
-#: gconf/gconftool.c:1000
+#: gconf/gconftool.c:1006
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Qısa izahat : %s\n"
 
-#: gconf/gconftool.c:1001
+#: gconf/gconftool.c:1007
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Uzun izahat : %s\n"
 
-#: gconf/gconftool.c:1010 gconf/gconftool.c:1304
+#: gconf/gconftool.c:1016 gconf/gconftool.c:1310
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "`%s' üçün bir qiymət bildirilməyib\n"
 
-#: gconf/gconftool.c:1014 gconf/gconftool.c:1308
+#: gconf/gconftool.c:1020 gconf/gconftool.c:1314
 #, 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:1057 gconf/gconftool.c:1069
+#: gconf/gconftool.c:1063 gconf/gconftool.c:1075
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "`%s' növünü başa düşmürəm\n"
 
-#: gconf/gconftool.c:1081
+#: gconf/gconftool.c:1087
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Arqument olaraq dəyişən açar/qiymətlər vermək məcburiyyətindəsən\n"
 
-#: gconf/gconftool.c:1101
+#: gconf/gconftool.c:1107
 #, 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:1129
+#: gconf/gconftool.c:1135
 msgid "Cannot set schema as value\n"
 msgstr "Bir şəkli bir qiymət olaraq oturda bilmərəm\n"
 
-#: gconf/gconftool.c:1139
+#: gconf/gconftool.c:1145
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr "Bir siyahıyı bildirirkən siyahı növünü bildirmək məcburiyyətindəsən\n"
 
-#: gconf/gconftool.c:1153
+#: gconf/gconftool.c:1159
 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"
+msgstr "Bir cütü bildirirkən car növünü və cdr növünü bildirmək məcburiyyətindəsən\n"
 
-#: gconf/gconftool.c:1168
+#: gconf/gconftool.c:1174
 #, c-format
 msgid "Error: %s\n"
 msgstr "Xəta : %s\n"
 
-#: gconf/gconftool.c:1181
+#: gconf/gconftool.c:1187
 #, c-format
 msgid "Error setting value: %s\n"
 msgstr "Qiymət vermə xətası: %s\n"
 
-#: gconf/gconftool.c:1199
+#: gconf/gconftool.c:1205
 #, c-format
 msgid "Error syncing: %s\n"
 msgstr "Sinxronlaşdırma xətası: %s\n"
 
-#: gconf/gconftool.c:1222
+#: gconf/gconftool.c:1228
 msgid "Must specify a key or keys on the command line\n"
 msgstr "Əmr sətrində açar və ya açarları bildirməlisən\n"
 
-#: gconf/gconftool.c:1242
+#: gconf/gconftool.c:1248
 #, c-format
 msgid "No schema known for `%s'\n"
 msgstr "`%s' üçün sxem tapılmadı\n"
 
-#: gconf/gconftool.c:1275
+#: gconf/gconftool.c:1281
 #, c-format
 msgid "No doc string stored in schema at '%s'\n"
 msgstr "Sxemdə '%s' üstündə heç sənəd qatarı saxlanmayıb\n"
 
-#: gconf/gconftool.c:1280
+#: gconf/gconftool.c:1286
 #, c-format
 msgid "Error getting schema at '%s': %s\n"
 msgstr "'%s' üstündə sxem alma xətası: %s\n"
 
-#: gconf/gconftool.c:1287
+#: gconf/gconftool.c:1293
 #, c-format
 msgid "No schema stored at '%s'\n"
 msgstr "'%s' üstündə heç sxem saxlanmayıb\n"
 
-#: gconf/gconftool.c:1290
+#: gconf/gconftool.c:1296
 #, c-format
 msgid "Value at '%s' is not a schema\n"
 msgstr "'%s' üstündəki qiymət sxem deyildir\n"
 
-#: gconf/gconftool.c:1346
+#: gconf/gconftool.c:1352
 msgid "Must specify a schema name followed by the key name to apply it to\n"
 msgstr "Əlavə etmək üçün açar adı ilə davam edilmiş sxem adı girməlisən\n"
 
-#: gconf/gconftool.c:1353
+#: gconf/gconftool.c:1359
 #, c-format
 msgid "Error associating schema name '%s' with key name '%s': %s\n"
 msgstr "'%s' sxem adının '%s' açar adı ilə əlaqələndirmə xətası: %s\n"
 
-#: gconf/gconftool.c:1373
+#: gconf/gconftool.c:1379
 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:1415
+#: gconf/gconftool.c:1421
 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"
+msgstr "Siyahı növü bu əsas növlərdən meydana gəlməlidir: string, int, float ya da bool\n"
 
-#: gconf/gconftool.c:1435
+#: gconf/gconftool.c:1441
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr "Cütün car növü bu meydana gəlməlidir: string, int, float ya da bool\n"
 
-#: gconf/gconftool.c:1455
+#: gconf/gconftool.c:1461
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr "Cütün cdr növü bu meydana gəlməlidir: string, int, float ya da bool\n"
 
-#: gconf/gconftool.c:1470
+#: gconf/gconftool.c:1476
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Qiyməti oturdurkən xəta oldu : %s"
 
-#: gconf/gconftool.c:1484
+#: gconf/gconftool.c:1490
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Sinxronlaşdırılırkən xəta oldu : %s"
 
-#: gconf/gconftool.c:1499
+#: gconf/gconftool.c:1505
 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"
+msgstr "Açar/qiymət eşlemlerini göstəriləcək bir ya da daha çox qovluqları bildirmək məcburiyyətindəsən .\n"
 
-#: gconf/gconftool.c:1513
+#: gconf/gconftool.c:1519
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Silinəcək bir ya da daha çox açar vermək məcburiyyətindəsən .\n"
 
-#: gconf/gconftool.c:1524
+#: gconf/gconftool.c:1530
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "`%s'ni silinirkən xəta oldu : %s\n"
 
-#: gconf/gconftool.c:1547
+#: gconf/gconftool.c:1553
 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"
+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:1581
+#: gconf/gconftool.c:1587
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Qovluqları sıralarkən xəta oldu : %s\n"
 
-#: gconf/gconftool.c:1623
+#: gconf/gconftool.c:1629
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "XƏBƏRDARLIQ : %s şəkli üçün hökmsüz ya da əksik növ\n"
 
-#: gconf/gconftool.c:1632
+#: gconf/gconftool.c:1638
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "XƏBƏRDARLIQ : %s şəkli üçün hökmsüz ya da əksik siyahı növü\n"
 
-#: gconf/gconftool.c:1643 gconf/gconftool.c:1673 gconf/gconftool.c:1702
+#: gconf/gconftool.c:1649 gconf/gconftool.c:1679 gconf/gconftool.c:1708
 #, 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'ni daramasında xəta oldu\n"
 
-#: gconf/gconftool.c:1661
+#: gconf/gconftool.c:1667
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr "XƏBƏRDARLIQ : %s şəkli üçün hökmsüz ya da əksik cdr növü\n"
 
-#: gconf/gconftool.c:1686
+#: gconf/gconftool.c:1692
 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:1715
+#: gconf/gconftool.c:1721
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
-msgstr ""
-"XƏBƏRDARLIQ : gconftool'd daxili bir xəta oldu , naməlum GConfValueType\n"
+msgstr "XƏBƏRDARLIQ : gconftool'd daxili bir xəta oldu , naməlum GConfValueType\n"
 
-#: gconf/gconftool.c:1762 gconf/gconftool.c:1783 gconf/gconftool.c:1804
-#: gconf/gconftool.c:1825
+#: gconf/gconftool.c:1768 gconf/gconftool.c:1789 gconf/gconftool.c:1810
+#: gconf/gconftool.c:1831
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "XƏBƏRDARLIQ : növ adı `%s'ni daraya bilmədim\n"
 
-#: gconf/gconftool.c:1779
+#: gconf/gconftool.c:1785
 #, 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"
+msgstr "XƏBƏRDARLIQ : siyahı_növü int, float, string ya da bool ola bilər, fəqət `%s' ola bilməz\n"
 
-#: gconf/gconftool.c:1800
+#: gconf/gconftool.c:1806
 #, 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"
+msgstr "XƏBƏRDARLIQ : car_növü int, float, string ya da bool ola bilər, fəqət `%s' ola bilməz\n"
 
-#: gconf/gconftool.c:1821
+#: gconf/gconftool.c:1827
 #, 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"
+msgstr "XƏBƏRDARLIQ : cdr növü int, float, string ya da bool ola bilər, fəqət `%s' ola bilməz\n"
 
-#: gconf/gconftool.c:1849
+#: gconf/gconftool.c:1855
 msgid "WARNING: empty <applyto> node"
 msgstr "XƏBƏRDARLIQ : boşdur <applyto> nöqtəsi"
 
-#: gconf/gconftool.c:1852 gconf/gconftool.c:2115
+#: gconf/gconftool.c:1858 gconf/gconftool.c:2121
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "XƏBƏRDARLIQ : <schema>'nın altındakı <%s> nöqtəsini başa düşmədim\n"
 
-#: gconf/gconftool.c:1862
+#: gconf/gconftool.c:1868
 msgid "WARNING: no key specified for schema\n"
 msgstr "XƏBƏRDARLIQ : bu şəkil üçün açar bildirmədi\n"
 
-#: gconf/gconftool.c:1895
+#: gconf/gconftool.c:1901
 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"
+msgstr "XƏBƏRDARLIQ : <locale> nöqtəsinin `name=\"locale\" xüsusiyyəti yoxdur, keçirəm\n"
 
-#: gconf/gconftool.c:1901
+#: gconf/gconftool.c:1907
 #, 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"
+msgstr "XƏBƏRDARLIQ : `%s' lokalizasiyası üçün çoxlu <locale> nöqtələri var, köhnə ilkləri keçirəm\n"
 
-#: gconf/gconftool.c:1982
+#: gconf/gconftool.c:1988
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "XƏBƏRDARLIQ : <locale> nöqtəsində hökmsüz <%s> nöqtəsi\n"
 
-#: gconf/gconftool.c:2011
+#: gconf/gconftool.c:2017
 #, 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"
+msgstr "XƏBƏRDARLIQ : `%s' şəkil faylının `%s' lokalizasiyasının yüklənməsində xəta var : %s\n"
 
-#: gconf/gconftool.c:2019
+#: gconf/gconftool.c:2025
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "`%s' şeklinde `%s' lokalizasiyası yükləndi\n"
 
-#: gconf/gconftool.c:2041
+#: gconf/gconftool.c:2047
 #, 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"
+msgstr "XƏBƏRDARLIQ : `%s' şəkil faylını `%s' açarı ilə birləşdirə bilmədim : %s\n"
 
-#: gconf/gconftool.c:2049
+#: gconf/gconftool.c:2055
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "`%s' şekilni `%s' anahtarına ekledim\n"
 
-#: gconf/gconftool.c:2128
+#: gconf/gconftool.c:2134
 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"
+msgstr "Bir <schema>'da ən azından bir <locale> nöqtəsi olmaq məcburiyyətindədir\n"
 
-#: gconf/gconftool.c:2157
+#: gconf/gconftool.c:2165
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "XƏBƏRDARLIQ : <schemalist>'in altındakı <%s> nöqtəsi başa düşülmədi\n"
 
-#: gconf/gconftool.c:2179
+#: gconf/gconftool.c:2188
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "`%s'ni aça bilmədim : %s\n"
 
-#: gconf/gconftool.c:2186
+#: gconf/gconftool.c:2195
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "`%s' sənədi yoxsa boşdur mu ?\n"
 
-#: gconf/gconftool.c:2198
+#: gconf/gconftool.c:2207
 #, 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"
+msgstr "`%s' sənədin ana nöqtəsi (<%s>'in, <gconfschemafile> olmalıdır ) səhvdir \n"
 
-#: gconf/gconftool.c:2211
+#: gconf/gconftool.c:2220
 #, 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:2225
+#: gconf/gconftool.c:2234
 #, 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"
+msgstr "XƏBƏRDARLIQ : <gconfschemafile> altındakı <%s> nöqtəsi başa düşülmədi\n"
 
-#: gconf/gconftool.c:2236 gconf/gconftool.c:2268
+#: gconf/gconftool.c:2245 gconf/gconftool.c:2277
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Quraşdurma məlumatlarını sinxronlaşdırılırkən xəta oldu : %s"
 
-#: gconf/gconftool.c:2252
+#: gconf/gconftool.c:2261
 msgid "Must specify some schema files to install\n"
 msgstr "Yüklənəcək şəkil fayllarını bildirmək məcburiyyətindəsən\n"
 
-#: gconf/gconftool.c:2289
+#: gconf/gconftool.c:2298
 #, c-format
 msgid ""
 "\n"
@@ -1816,16 +1722,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2309
+#: gconf/gconftool.c:2318
 #, 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:2435
+#: gconf/gconftool.c:2444
 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:2441
+#: gconf/gconftool.c:2450
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1834,19 +1740,18 @@ msgstr ""
 "Proqramı bə'zi xətalı qiymətləri oturdaraq qırmağa cəhd edirəm : \n"
 "  %s\n"
 
-#: gconf/gconftool.c:2459
+#: gconf/gconftool.c:2468
 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:2478
+#: gconf/gconftool.c:2487
 #, 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:287 wrappers/gtk/gconf-client.c:304
diff --git a/po/ca.po b/po/ca.po
index c955ac0c..6200dd89 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: 2001-08-15 18:01-0400\n"
+"POT-Creation-Date: 2002-02-04 18:21-0500\n"
 "PO-Revision-Date: 2001-05-24 13:46+02:00\n"
 "Last-Translator: Softcatal� <tradgnome@softcatala.org>\n"
 "Language-Team: \n"
@@ -31,7 +31,7 @@ msgstr "S'est� inicialitzant el m�dul de fons BDB"
 msgid "Couldn't find the %s root directory in the address `%s'"
 msgstr "No s'ha pogut trobar el directori arrel %s a l'adre�a `%s'"
 
-#: backends/dir-utils.c:124 backends/xml-backend.c:301 backends/xml-dir.c:1051
+#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1050
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "No s'ha pogut crear el directori `%s': %s"
@@ -46,30 +46,30 @@ msgstr ""
 msgid "Unloading XML backend module."
 msgstr "S'est� descarregant el m�dul de fons del XML"
 
-#: backends/xml-backend.c:286
+#: backends/xml-backend.c:289
 #, 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
+#: backends/xml-backend.c:414
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
 msgstr ""
 "No es pot llegir des de ni escriure al directori arrel del XML a l'adre�a `%"
 "s'"
 
-#: backends/xml-backend.c:396
+#: backends/xml-backend.c:424
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
 "Els permisos del directori o fitxer per l'origen del XML a l'arrel %s s�n: %"
 "o/%o"
 
-#: backends/xml-backend.c:680
+#: backends/xml-backend.c:708
 msgid "Initializing XML backend module"
 msgstr "S'est� inicialitzant el m�dul de fons del XML"
 
-#: backends/xml-backend.c:745
+#: backends/xml-backend.c:773
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "No s'ha pogut abandonar el bloqueig del directori XML `%s': %s"
@@ -137,32 +137,32 @@ msgid "Failed to delete old file `%s': %s"
 msgstr "No s'ha pogut esborrar el fitxer vell `%s': %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:806
+#: backends/xml-dir.c:803
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "No s'ha pogut iniciar `%s': %s"
 
-#: backends/xml-dir.c:950
+#: backends/xml-dir.c:947
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Entrada duplicada `%s' a `%s', s'ignora"
 
-#: backends/xml-dir.c:972
+#: backends/xml-dir.c:969
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "Entrada sense nom al fitxer XML `%s', s'ignora"
 
-#: backends/xml-dir.c:979
-#, c-format
-msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
+#: backends/xml-dir.c:977
+#, fuzzy, c-format
+msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
 msgstr "El node d'alt nivell al fitxer XML `%s' no �s una <entry>, s'ignora"
 
-#: backends/xml-dir.c:1067
+#: backends/xml-dir.c:1066
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "No s'ha pogut crear el fitxer `%s': %s"
 
-#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2494
+#: backends/xml-dir.c:1074
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "No s'ha pogut tancar el fitxer `%s': %s"
@@ -173,11 +173,6 @@ msgstr "No s'ha pogut tancar el fitxer `%s': %s"
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "S'ignora el node XML anomenat `%s': %s"
 
-#: backends/xml-entry.c:200
-#, c-format
-msgid "%s"
-msgstr "%s"
-
 #: backends/xml-entry.c:327
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
@@ -353,7 +348,7 @@ msgstr ""
 "(probablement inofensiu, podria resultar en una notificaci� que "
 "dif�cilmentreapareixer�): %s"
 
-#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1328
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Error en obtenir valor per `%s': %s"
@@ -462,202 +457,292 @@ msgstr "No s'ha pogut bloquejar"
 msgid "No database available to save your configuration"
 msgstr "No hi ha cap base de dades disponible per desar la configuraci�"
 
-#: gconf/gconf-internals.c:87
+#: gconf/gconf-internals.c:114
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "No hi ha cap '/' a la clau `%s'"
 
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:227
+#, c-format
+msgid "Invalid UTF-8 in string value in '%s'"
+msgstr ""
+
+#: gconf/gconf-internals.c:286
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "No s'ha pogut interpretar el valor CORBA per l'element llista"
 
-#: gconf/gconf-internals.c:253
+#: gconf/gconf-internals.c:288
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "Tipus incorrecte per l'element de la llista a %s"
 
-#: gconf/gconf-internals.c:266
+#: gconf/gconf-internals.c:301
 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:447
+#: gconf/gconf-internals.c:482
 msgid "Failed to convert object to IOR"
 msgstr "No s'ha pogut convertir l'objecte a IOR"
 
-#: gconf/gconf-internals.c:813
+#: gconf/gconf-internals.c:619
+msgid "Invalid UTF-8 in locale for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:627
+msgid "Invalid UTF-8 in short description for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:635
+msgid "Invalid UTF-8 in long description for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:643
+msgid "Invalid UTF-8 in owner for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:868
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "No s'ha pogut obrir el cam� del fitxer `%s': %s\n"
 
-#: gconf/gconf-internals.c:873
+#: gconf/gconf-internals.c:928
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "S'est� afegint l'origen `%s'\n"
 
-#: gconf/gconf-internals.c:885
+#: gconf/gconf-internals.c:940
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "Error de lectura en el fitxer `%s': %s\n"
 
-#: gconf/gconf-internals.c:1327
+#: gconf/gconf-internals.c:1271 gconf/gconf-internals.c:1337
+#: gconf/gconf-value.c:125 gconf/gconf-value.c:224 gconf/gconf-value.c:366
+#: gconf/gconf-value.c:1084
+msgid "Text contains invalid UTF-8"
+msgstr ""
+
+#: gconf/gconf-internals.c:1422
 #, c-format
 msgid "Expected list, got %s"
 msgstr "S'esperava una llista, s'ha obtingut %s"
 
-#: gconf/gconf-internals.c:1337
+#: gconf/gconf-internals.c:1432
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "S'esperava una llista de %s, s'ha obtingut una llista de %s"
 
-#: gconf/gconf-internals.c:1476
+#: gconf/gconf-internals.c:1571
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "S'esperava una parella, s'ha obtingut %s"
 
-#: gconf/gconf-internals.c:1490
+#: gconf/gconf-internals.c:1585
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "S'esperava una parella (%s,%s), s'ha obtingut una parella amb un valor o "
 "ambd�s perduts"
 
-#: gconf/gconf-internals.c:1506
+#: gconf/gconf-internals.c:1601
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr ""
 "S'esperava una parella del tipus (%s,%s) i se n'ha obtingut del tipus (%s,%s)"
 
-#: gconf/gconf-internals.c:1622
+#: gconf/gconf-internals.c:1717
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "La cadena citada no comen�a amb cometes"
 
-#: gconf/gconf-internals.c:1684
+#: gconf/gconf-internals.c:1779
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "La cadena de citaci� no acaba amb cometes"
 
-#: gconf/gconf-internals.c:2164 gconf/gconf.c:3092
+#: gconf/gconf-internals.c:1915
+msgid "Encoded value is not valid UTF-8"
+msgstr ""
+
+#: gconf/gconf-internals.c:2265 gconf/gconf.c:3082
 #, c-format
 msgid "CORBA error: %s"
 msgstr "Error del CORBA: %s"
 
-#: gconf/gconf-internals.c:2180
+#: gconf/gconf-internals.c:2281
 #, c-format
 msgid "OAF problem description: '%s'"
 msgstr "Descripci� del problema OAF: '%s'"
 
-#: gconf/gconf-internals.c:2186
+#: gconf/gconf-internals.c:2287
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "s'intenta eliminar el directori d'objectes OAF no llistats"
 
-#: gconf/gconf-internals.c:2191
+#: gconf/gconf-internals.c:2292
 msgid "attempt to add already-listed OAF directory"
 msgstr "s'intenta afegir directoris OAF ja llistats"
 
-#: gconf/gconf-internals.c:2198
+#: gconf/gconf-internals.c:2299
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "Error d'an�lisis OAF: %s"
 
-#: gconf/gconf-internals.c:2203
+#: gconf/gconf-internals.c:2304
 msgid "Unknown OAF error"
 msgstr "Error OAF desconegut"
 
-#: gconf/gconf-internals.c:2290
-#, c-format
-msgid "No ior file in `%s'"
-msgstr "No existeix el fitxer ior a `%s'"
-
-#: gconf/gconf-internals.c:2321
-#, 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:2437
+#, fuzzy, c-format
+msgid "Could not lock temporary file '%s': %s"
+msgstr "No s'ha pogut obrir el cam� del fitxer `%s': %s\n"
 
-#: gconf/gconf-internals.c:2332
+#: gconf/gconf-internals.c:2464
 #, c-format
-msgid "Another program has lock `%s'"
-msgstr "Un altre programa ha blocat `%s'"
+msgid "Could not create file '%s', probably because it already exists"
+msgstr ""
 
-#: gconf/gconf-internals.c:2351
-msgid "couldn't contact ORB to ping existing gconfd"
-msgstr "no s'ha pogut contactar amb l'ORB per fer pings en el gconfd existent"
+#: gconf/gconf-internals.c:2510
+#, fuzzy, c-format
+msgid "Failed to create or open '%s'"
+msgstr "No s'ha pogut crear el fitxer `%s': %s"
 
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2520
 #, c-format
 msgid ""
-"Removing stale lock `%s' because IOR couldn't be converted to object "
-"reference, IOR `%s'"
+"Failed to lock '%s': probably another process has the lock, or your "
+"operating system has NFS file locking misconfigured (%s)"
 msgstr ""
-"S'elimina el blocatge antic `%s' degut a que l'IOR no s'ha pogut convertir "
-"en refer�ncia d'objecte, IOR `%s'"
 
-#: gconf/gconf-internals.c:2371
+#: gconf/gconf-internals.c:2548
 #, c-format
-msgid "Removing stale lock `%s' because of error pinging server: %s"
+msgid "IOR file '%s' not opened successfully, no gconfd located: %s"
 msgstr ""
-"S'elimina el blocatge antic `%s' degut a un error en fer pings al servidor: %"
-"s"
 
-#: gconf/gconf-internals.c:2383
+#: gconf/gconf-internals.c:2578
 #, c-format
-msgid "GConf configuration daemon (gconfd) has lock `%s'"
-msgstr "La configuraci� daemon de GConf (gconfd) ha blocat `%s'"
+msgid "gconftool or other non-gconfd process has the lock file '%s'"
+msgstr ""
+
+#: gconf/gconf-internals.c:2595
+#, fuzzy
+msgid "couldn't contact ORB to resolve existing gconfd object reference"
+msgstr "no s'ha pogut contactar amb l'ORB per fer pings en el gconfd existent"
 
-#: gconf/gconf-internals.c:2397
+#: gconf/gconf-internals.c:2627
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "no s'ha pogut crear el directori `%s': %s"
 
-#: gconf/gconf-internals.c:2446
-#, c-format
-msgid "Can't create lock `%s': %s"
-msgstr "No s'ha pogut crear el bloqueig `%s': %s"
-
-#: gconf/gconf-internals.c:2482
+#: gconf/gconf-internals.c:2686
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "No s'ha pogut escriure al fitxer `%s': %s"
 
-#: gconf/gconf-internals.c:2532
+#: gconf/gconf-internals.c:2727
 #, c-format
-msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
+msgid "We didn't have the lock on file `%s', but we should have"
 msgstr ""
-"No s'ha pogut obrir el fitxer blocat `%s'; s'assumeix que no �s el nostre: %s"
 
-#: gconf/gconf-internals.c:2549
-#, c-format
-msgid "Corrupt lock file `%s', removing anyway"
-msgstr "Fitxer de bloqueig danyat `%s', s'elimina de totes formes"
+#: gconf/gconf-internals.c:2748
+#, fuzzy, c-format
+msgid "Failed to link '%s' to '%s': %s"
+msgstr "No s'ha pogut reanomenar `%s' a `%s': %s"
+
+#: gconf/gconf-internals.c:2760
+#, fuzzy, c-format
+msgid "Failed to remove lock file `%s': %s"
+msgstr "No s'ha pogut crear el fitxer `%s': %s"
 
-#: gconf/gconf-internals.c:2559
+#: gconf/gconf-internals.c:2779
+#, fuzzy, c-format
+msgid "Failed to clean up file '%s': %s"
+msgstr "No s'ha pogut obrir el fitxer `%s': %s"
+
+#: gconf/gconf-internals.c:2793
+#, fuzzy, c-format
+msgid "Failed to remove lock directory `%s': %s"
+msgstr "No s'ha pogut llan�ar el blocatge del directori `%s': %s"
+
+#: gconf/gconf-internals.c:3003 gconf/gconfd.c:580
+#, fuzzy, c-format
+msgid "Failed to create %s: %s"
+msgstr "No s'ha pogut crear el fitxer `%s': %s"
+
+#: gconf/gconf-internals.c:3036
 #, c-format
+msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
+msgstr ""
+
+#: gconf/gconf-internals.c:3064
+#, fuzzy, c-format
+msgid "Failed to launch configuration server: %s\n"
+msgstr "No s'ha pogut accedir a la/es font/s de configuraci�: %s\n"
+
+#: gconf/gconf-internals.c:3088
 msgid ""
-"Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
-"took our lock"
+"Failed to contact configuration server (a likely cause of this is that you "
+"have an existing configuration server (gconfd) running, but it isn't "
+"reachable from here - if you're logged in from two machines at once, you may "
+"need to enable TCP networking for ORBit)\n"
 msgstr ""
-"No s'ha creat el fitxer de blocatge `%s' (pid originari %u, pid actual %u;"
-"s'assumeix que alg� ha pres el nostre blocatge"
 
-#: gconf/gconf-internals.c:2576
-#, c-format
-msgid "Failed to release lock directory `%s': %s"
+#: gconf/gconf-internals.c:3724
+#, fuzzy, c-format
+msgid "Failed to read from child pipe (%s)"
+msgstr "No s'ha pogut llan�ar el blocatge del directori `%s': %s"
+
+#: gconf/gconf-internals.c:3789
+#, fuzzy, c-format
+msgid "Failed to fork (%s)"
+msgstr "No s'ha pogut crear el fitxer `%s': %s"
+
+#: gconf/gconf-internals.c:3929
+#, fuzzy, c-format
+msgid "Failed to change to directory '%s' (%s)"
 msgstr "No s'ha pogut llan�ar el blocatge del directori `%s': %s"
 
+#: gconf/gconf-internals.c:3939
+#, fuzzy, c-format
+msgid "Failed to execute child process (%s)"
+msgstr "No s'ha pogut esborrar el fitxer vell `%s': %s"
+
+#: gconf/gconf-internals.c:3948
+#, c-format
+msgid "Failed to redirect output or input of child process (%s)"
+msgstr ""
+
+#: gconf/gconf-internals.c:3957
+#, fuzzy, c-format
+msgid "Failed to fork child process (%s)"
+msgstr "No s'ha pogut carregar l'origen`%s': %s"
+
+#: gconf/gconf-internals.c:3965
+msgid "Unknown error executing child process"
+msgstr ""
+
+#: gconf/gconf-internals.c:3986
+#, c-format
+msgid "Failed to read enough data from child pid pipe (%s)"
+msgstr ""
+
+#: gconf/gconf-internals.c:4036
+#, c-format
+msgid "Failed to create pipe for communicating with child process (%s)"
+msgstr ""
+
 #: gconf/gconf-sources.c:320
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "No s'ha pogut carregar l'origen`%s': %s"
 
-#: gconf/gconf-sources.c:510
+#: gconf/gconf-sources.c:544
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 "L'esquema `%s' especificat per `%s' emmagatzema un valor que no �s d'esquema"
 
-#: gconf/gconf-sources.c:567
+#: gconf/gconf-sources.c:601
 msgid "The '/' name can only be a directory, not a key"
 msgstr "El nom '/' nom�s pot ser un directori, no una clau"
 
-#: gconf/gconf-sources.c:596
+#: gconf/gconf-sources.c:630
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -666,92 +751,94 @@ msgstr ""
 "El valor per al conjunt `%s' en una font nom�s de lectura al capdavant de la "
 "configuraci�."
 
-#: gconf/gconf-sources.c:608
+#: gconf/gconf-sources.c:642
 #, 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 "
+"somehow we mistakenly created two gconfd processes. If you have two gconfd "
+"processes (or had two at the time the second was launched), logging out, "
+"killing all copies of gconfd, and logging back in may help. Perhaps the "
+"problem is that you attempted to use GConf from two machines at once, and "
+"ORBit still has its default configuration that prevents remote CORBA "
+"connections? As always, check the user.* syslog for details on problems "
 "gconfd encountered."
 msgstr ""
 
-#: gconf/gconf-sources.c:1164
+#: gconf/gconf-sources.c:1198
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Error en trobar el metainfo: %s"
 
-#: gconf/gconf-sources.c:1233
+#: gconf/gconf-sources.c:1267
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Error en aconseguir el metainfo: %s"
 
-#: gconf/gconf-sources.c:1257
+#: gconf/gconf-sources.c:1291
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
 "La clau `%s' llistada com a esquema per a la clau `%s' de fet emmagatzema el "
 "tipus `%s'"
 
-#: gconf/gconf-value.c:82
+#: gconf/gconf-value.c:81
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "`%s' no s'ent�n (s'esperava un enter)"
 
-#: gconf/gconf-value.c:92
+#: gconf/gconf-value.c:91
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "L'enter `%s' o �s massa gran o massa petit"
 
-#: gconf/gconf-value.c:113
+#: gconf/gconf-value.c:112
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "`%s' no s'ent�n (s'esperava un nombre real)"
 
-#: gconf/gconf-value.c:146
+#: gconf/gconf-value.c:156
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "`%s'no s'ent�n (s'esperava fals o cert)"
 
-#: gconf/gconf-value.c:214
+#: gconf/gconf-value.c:232
 #, c-format
 msgid "Didn't understand `%s' (list must start with a '[')"
 msgstr "`%s' no s'ent�n (la llista ha de comen�ar amb '[')"
 
-#: gconf/gconf-value.c:227
+#: gconf/gconf-value.c:245
 #, c-format
 msgid "Didn't understand `%s' (list must end with a ']')"
 msgstr "`%s' no s'ent�n (la llista ha d'acabar en ']'"
 
-#: gconf/gconf-value.c:278
+#: gconf/gconf-value.c:296
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
 msgstr "`%s' no s'ent�n (S'ha trobat ']' dins la llista)"
 
-#: gconf/gconf-value.c:309 gconf/gconf-value.c:462
+#: gconf/gconf-value.c:327 gconf/gconf-value.c:488
 #, c-format
 msgid "Didn't understand `%s' (extra trailing characters)"
 msgstr "`%s' no s'ent�n (car�cters extres d'arrossegament)"
 
-#: gconf/gconf-value.c:348
+#: gconf/gconf-value.c:374
 #, c-format
 msgid "Didn't understand `%s' (pair must start with a '(')"
 msgstr "'%s' no s'ent�n (una parella ha de comen�ar amb '(')"
 
-#: gconf/gconf-value.c:361
+#: gconf/gconf-value.c:387
 #, c-format
 msgid "Didn't understand `%s' (pair must end with a ')')"
 msgstr "`%s' no s'ent�n (una parella ha d'acabar en ')')"
 
-#: gconf/gconf-value.c:391 gconf/gconf-value.c:477
+#: gconf/gconf-value.c:417 gconf/gconf-value.c:503
 #, c-format
 msgid "Didn't understand `%s' (wrong number of elements)"
 msgstr "`%s' no s'ent�n (nombre d'elements erroni)"
 
-#: gconf/gconf-value.c:431
+#: gconf/gconf-value.c:457
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr "`%s' no s'ent�n (S'ha trobat ')' dins una parella)"
@@ -761,91 +848,81 @@ msgstr "`%s' no s'ent�n (S'ha trobat ')' dins una parella)"
 msgid "`%s': %s"
 msgstr "`%s': %s"
 
-#: gconf/gconf.c:289
+#: gconf/gconf.c:287
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "El servidor no ha pogut resoldre l'adre�a `%s'"
 
-#: gconf/gconf.c:574
+#: gconf/gconf.c:572
 msgid "Can't add notifications to a local configuration source"
 msgstr "No es poden afegir notificacions a una font local de configuraci�"
 
-#: gconf/gconf.c:1870
+#: gconf/gconf.c:1868
 #, c-format
 msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr ""
 "No s'ha pogut afegir el client a la llista del servidor, error del CORBA: %s"
 
-#: 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. "
-"This is a bug in the OAF package; something went wrong in OAF, and no error "
-"was reported. This is not a bug in the GConf package. Do not report a GConf "
-"bug unless you have information indicating what went wrong with OAF that was "
-"caused by GConf."
-msgstr ""
-
-#: gconf/gconf.c:2198
+#: gconf/gconf.c:2183
 msgid "Failed to init GConf, exiting\n"
 msgstr "No s'ha pogut d'inicialitzar GConf, s'abandona\n"
 
-#: gconf/gconf.c:2235
+#: gconf/gconf.c:2220
 msgid "Must begin with a slash (/)"
 msgstr "Ha de comen�ar amb una barra (/)"
 
-#: gconf/gconf.c:2257
+#: gconf/gconf.c:2242
 msgid "Can't have two slashes (/) in a row"
 msgstr "No es poden tenir dues barres (/) en una l�nia"
 
-#: gconf/gconf.c:2259
+#: gconf/gconf.c:2244
 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:2280
+#: gconf/gconf.c:2265
 #, 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:2294
+#: gconf/gconf.c:2279
 msgid "Key/directory may not end with a slash (/)"
 msgstr "La clau/directori pot no acabar amb una barra (/)"
 
-#: gconf/gconf.c:2547
+#: gconf/gconf.c:2520
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Fallada en tancar la configuraci� del servidor: %s"
 
-#: gconf/gconf.c:2608
+#: gconf/gconf.c:2581
 #, c-format
 msgid "Expected float, got %s"
 msgstr "S'esperava una coma flotant, s'ha obtingut %s"
 
-#: gconf/gconf.c:2643
+#: gconf/gconf.c:2616
 #, c-format
 msgid "Expected int, got %s"
 msgstr "S'esperava un enter, s'ha obtingut %s"
 
-#: gconf/gconf.c:2678
+#: gconf/gconf.c:2651
 #, c-format
 msgid "Expected string, got %s"
 msgstr "S'esperava una cadena, s'ha obtingut %s"
 
-#: gconf/gconf.c:2715
+#: gconf/gconf.c:2688
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "S'esperava un bolei�, s'ha obtingut %s"
 
-#: gconf/gconf.c:2748
+#: gconf/gconf.c:2721
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "S'esperava un esquema, s'ha obtingut %s"
 
-#: gconf/gconfd.c:248
+#: gconf/gconfd.c:247
 msgid "Shutdown request received"
 msgstr "S'ha rebut una ordre d'apagar"
 
-#: gconf/gconfd.c:280
+#: gconf/gconfd.c:279
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -853,7 +930,7 @@ msgstr ""
 "El gconfd ha compilat amb depuraci�; s'est� intentant carregar gconf.path "
 "des del directori font"
 
-#: gconf/gconfd.c:298
+#: gconf/gconfd.c:297
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -861,7 +938,7 @@ msgstr ""
 "No s'han trobat fitxers de configuraci�, s'intenta utilitzar l'origen de "
 "laconfiguraci� predeterminada `%s'"
 
-#: gconf/gconfd.c:307
+#: gconf/gconfd.c:306
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -869,16 +946,16 @@ msgstr ""
 "Sense els or�gens de configuraci� en el cam� arrel, la configuraci� no ha "
 "estat desada; edito "
 
-#: gconf/gconfd.c:307
+#: gconf/gconfd.c:306
 msgid "/path"
 msgstr ""
 
-#: gconf/gconfd.c:321
+#: gconf/gconfd.c:320
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Error en carregar alguns or�gens de configuraci�: %s"
 
-#: gconf/gconfd.c:333
+#: gconf/gconfd.c:332
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -886,7 +963,7 @@ msgstr ""
 "No s'han resolt satisfact�riament els or�gens de les adreces, no es poden "
 "carregar ni guardar les dades de configuraci�"
 
-#: gconf/gconfd.c:350
+#: gconf/gconfd.c:349
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -894,14 +971,14 @@ msgstr ""
 "No s'han pogut resoldre els or�gens de configuraci� grabables, podria ser "
 "incapa� de desar alguns canvis de configuraci�"
 
-#: gconf/gconfd.c:376
+#: gconf/gconfd.c:375
 #, c-format
 msgid "Received signal %d, dumping core. Please report a GConf bug."
 msgstr ""
 "S'ha rebut la senyal %d, s'apaga el nucli. Si us plau, arxiveu un "
 "informed'error de GConf"
 
-#: gconf/gconfd.c:392
+#: gconf/gconfd.c:391
 #, c-format
 msgid ""
 "Received signal %d, shutting down abnormally. Please file a GConf bug report."
@@ -909,104 +986,51 @@ msgstr ""
 "S'ha rebut la senyal %d, s'apaga l'ordinador de forma anormal. Si us plau,"
 "arxiveu un informe d'error de GConf."
 
-#: gconf/gconfd.c:409
+#: gconf/gconfd.c:408
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "S'ha rebut la senyal %d, s'apaga l'ordinador sense problemes"
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:513
+#: gconf/gconfd.c:526
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "S'inicia (versi� %s), pid %u usuari `%s'"
 
-#: gconf/gconfd.c:540
-msgid ""
-"Failed to init Object Activation Framework: please mail bug report to OAF "
-"maintainers"
-msgstr ""
-"No s'ha pogut d'inicialitzar Object Activation Framework: si us plau envieu "
-"un informe d'errors als qui mantenen OAF"
-
-#: gconf/gconfd.c:560
+#: gconf/gconfd.c:567
 msgid "Failed to get object reference for ConfigServer"
 msgstr "No s'ha pogut obtenir les refer�ncies pel ConfigServer"
 
-#: gconf/gconfd.c:573
-#, fuzzy, c-format
-msgid "Failed to create %s: %s"
-msgstr "No s'ha pogut crear el fitxer `%s': %s"
+#: gconf/gconfd.c:605
+#, c-format
+msgid "Failed to write byte to pipe fd %d so client program may hang: %s"
+msgstr ""
 
-#. Bad hack alert - register the current lockholder with oafd,
-#. * since oafd seems to have forgotten about us.
-#.
-#: gconf/gconfd.c:588
+#: gconf/gconfd.c:615
 #, fuzzy, c-format
-msgid "Failed to get lock for daemon: %s"
+msgid "Failed to get lock for daemon, exiting: %s"
 msgstr "No s'ha pogut aconseguir l'IOR del client: %s"
 
-#: gconf/gconfd.c:594
-msgid ""
-"Registering existing server with oafd, since OAF appears to have leaked it"
-msgstr ""
-
-#: gconf/gconfd.c:603
-#, fuzzy
-msgid ""
-"OAF doesn't know about our IID; indicates broken installation; can't "
-"register existing server."
-msgstr ""
-"L'OAF no coneix el vostre IID; aix� indica instal�laci� incorrecta; no pot "
-"ser registrada; se surt\n"
-
-#: gconf/gconfd.c:607
-#, 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; se surt\n"
-
-#: gconf/gconfd.c:612
-#, fuzzy
-msgid "Unknown error registering existing gconfd with OAF; exiting"
-msgstr "Error desconegut en registrar gconfd amb OAF; se surt\n"
-
-#: gconf/gconfd.c:639
-msgid ""
-"OAF 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; se surt\n"
-
-#: gconf/gconfd.c:643
-msgid "Another gconfd already registered with OAF; exiting\n"
-msgstr "Existeix un altre gconfd ja registrat amb OAF; se surt\n"
-
-#: gconf/gconfd.c:648
-msgid "Unknown error registering gconfd with OAF; exiting\n"
-msgstr "Error desconegut en registrar gconfd amb OAF; se surt\n"
-
-#: gconf/gconfd.c:692
+#: gconf/gconfd.c:657
 #, fuzzy, c-format
-msgid "Failed to release lockfile: %s"
+msgid "Error releasing lockfile: %s"
 msgstr "No s'ha pogut llan�ar el blocatge del directori `%s': %s"
 
-#: gconf/gconfd.c:700
+#: gconf/gconfd.c:665
 msgid "Exiting"
 msgstr "S'est� sortint"
 
-#: gconf/gconfd.c:725
+#: gconf/gconfd.c:690
 msgid "GConf server is not in use, shutting down."
 msgstr "El servidor GConf no est� en servei, s'apaga l'ordinador."
 
-#: gconf/gconfd.c:1084
+#: gconf/gconfd.c:1059
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Excepci� de retorn: %s"
 
-#: gconf/gconfd.c:1184
+#: gconf/gconfd.c:1159
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -1015,7 +1039,7 @@ msgstr ""
 "No s'ha pogut obrir el fitxer de registre del gconfd; ser� impossible "
 "restaurarels oients despr�s de tancar el gconfd (%s)"
 
-#: gconf/gconfd.c:1219
+#: gconf/gconfd.c:1194
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
@@ -1023,32 +1047,32 @@ msgstr ""
 "No s'ha pogut tancar el fitxer de registre del gconfd; podrien no haver-se "
 "desat  correctament les dades (%s)"
 
-#: gconf/gconfd.c:1288
+#: gconf/gconfd.c:1263
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "No s'ha pogut obrir el fitxer d'estat desat '%s' per escriure: %s"
 
-#: gconf/gconfd.c:1302
+#: gconf/gconfd.c:1277
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "No s'ha pogut escriure al fitxer d'estat desat '%s' fd: %d: %s"
 
-#: gconf/gconfd.c:1311
+#: gconf/gconfd.c:1286
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "No s'ha pogut tancar el nou fitxer d'estat desat '%s': %s"
 
-#: gconf/gconfd.c:1325
+#: gconf/gconfd.c:1300
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "No s'ha pogut moure el fitxer desat antic '%s': %s"
 
-#: gconf/gconfd.c:1335
+#: gconf/gconfd.c:1310
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "No s'ha pogut de traslladar el fitxer d'estat desat a: %s"
 
-#: gconf/gconfd.c:1344
+#: gconf/gconfd.c:1319
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
@@ -1056,7 +1080,7 @@ msgstr ""
 "No s'ha pogut restaurar el fitxer d'estat desat original, traslladat a '%s': "
 "%s"
 
-#: gconf/gconfd.c:1819
+#: gconf/gconfd.c:1794
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
@@ -1064,17 +1088,17 @@ msgstr ""
 "Incapa� de restaurar un oient a l'adre�a '%s', no es pot resoldre la base de "
 "dades"
 
-#: gconf/gconfd.c:1865
+#: gconf/gconfd.c:1840
 #, c-format
 msgid "Error reading saved state file: %s"
 msgstr "Error en llegir el fitxer d'estat desat: %s"
 
-#: gconf/gconfd.c:1918
+#: gconf/gconfd.c:1893
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "Impossible d'obrir el fitxer d'estat desat '%s': %s"
 
-#: gconf/gconfd.c:2035
+#: gconf/gconfd.c:2010
 #, c-format
 msgid ""
 "Failed to log addition of listener to gconfd logfile; won't be able to re-"
@@ -1083,7 +1107,7 @@ msgstr ""
 "No s'ha pogut afegir un oient al fitxer de registre del gconfd; ser� "
 "impossiblede tornar-lo a afegir si es surt o es tanca el gconfd (%s)"
 
-#: gconf/gconfd.c:2040
+#: gconf/gconfd.c:2015
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously re-"
@@ -1092,27 +1116,27 @@ msgstr ""
 "No s'ha pogut eliminar un oient al fitxer de registre del gconfd; per "
 "errorse'l podria tornar a afegir si es tanca o se surt del gconfd (%s)"
 
-#: gconf/gconfd.c:2063 gconf/gconfd.c:2228
+#: gconf/gconfd.c:2038 gconf/gconfd.c:2203
 #, c-format
 msgid "Failed to get IOR for client: %s"
 msgstr "No s'ha pogut aconseguir l'IOR del client: %s"
 
-#: gconf/gconfd.c:2078
+#: gconf/gconfd.c:2053
 #, c-format
 msgid "Failed to open saved state file: %s"
 msgstr "No s'ha pogut obrir el fitxer d'estat desat: %s"
 
-#: gconf/gconfd.c:2091
+#: gconf/gconfd.c:2066
 #, c-format
 msgid "Failed to write client add to saved state file: %s"
 msgstr "No s'ha pogut escriure afegir client al fitxer d'estat desat: %s"
 
-#: gconf/gconfd.c:2099
+#: gconf/gconfd.c:2074
 #, c-format
 msgid "Failed to flush client add to saved state file: %s"
 msgstr "No s'ha pogut buidar afegir client al fitxer d'estat desat: %s"
 
-#: gconf/gconfd.c:2189
+#: gconf/gconfd.c:2164
 msgid ""
 "Some client removed itself from the GConf server when it hadn't been added."
 msgstr ""
@@ -1394,296 +1418,285 @@ msgstr ""
 "direct\n"
 
 #: gconf/gconftool.c:525
+msgid "You should use --direct when using a non-default configuration source\n"
+msgstr ""
+
+#: gconf/gconftool.c:531
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "No s'ha pogut inicialitzar GConf: %s\n"
 
-#: gconf/gconftool.c:550
+#: gconf/gconftool.c:566
 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:565
-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 ""
-"No haur�eu d'executar gconfd mentre instal�leu esquemes de fitxers nous.\n"
-"Useu gconftool --shutdown per tancar el daemon, amb m�s seguretat mentre no "
-"hi hagi aplicacions en proc�s\n"
-"(malgrat que hauria de funcionar encara que hi hagi aplicacions en proc�s).\n"
-
-#: gconf/gconftool.c:587
+#: gconf/gconftool.c:595
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "No s'ha pogut accedir a la/es font/s de configuraci�: %s\n"
 
-#: gconf/gconftool.c:798
+#: gconf/gconftool.c:796
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Error en tancar: %s\n"
 
-#: gconf/gconftool.c:841
+#: gconf/gconftool.c:839
 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:875
+#: gconf/gconftool.c:873
 #, fuzzy, c-format
 msgid "Failure listing entries in `%s': %s\n"
 msgstr "Fallada en llistar parelles a `%s': %s"
 
-#: gconf/gconftool.c:893
+#: gconf/gconftool.c:891
 msgid "(no value set)"
 msgstr "(no hi ha valor definit)"
 
-#: gconf/gconftool.c:948
+#: gconf/gconftool.c:946
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "No s'ha pogut generar el servidor de configuraci� (gconfd): %s\n"
 
-#: gconf/gconftool.c:962
+#: gconf/gconftool.c:960
 msgid "Must specify a key or keys to get\n"
 msgstr "Heu d'especificar una clau o claus per obtenir\n"
 
-#: gconf/gconftool.c:997
+#: gconf/gconftool.c:995
 #, c-format
 msgid "Type: %s\n"
 msgstr "Tipus: %s\n"
 
-#: gconf/gconftool.c:998
+#: gconf/gconftool.c:996
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Tipus de llista: %s\n"
 
-#: gconf/gconftool.c:999
+#: gconf/gconftool.c:997
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Tipus de car�cter: %s\n"
 
-#: gconf/gconftool.c:1000
+#: gconf/gconftool.c:998
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Tipus de cdr: %s\n"
 
-#: gconf/gconftool.c:1005
+#: gconf/gconftool.c:1003
 #, c-format
 msgid "Default Value: %s\n"
 msgstr "Valor per defecte: %s\n"
 
-#: gconf/gconftool.c:1005 gconf/gconftool.c:1007 gconf/gconftool.c:1008
-#: gconf/gconftool.c:1009
+#: gconf/gconftool.c:1003 gconf/gconftool.c:1005 gconf/gconftool.c:1006
+#: gconf/gconftool.c:1007
 msgid "Unset"
 msgstr "Desactivar"
 
-#: gconf/gconftool.c:1007
+#: gconf/gconftool.c:1005
 #, c-format
 msgid "Owner: %s\n"
 msgstr "Propietari: %s\n"
 
-#: gconf/gconftool.c:1008
+#: gconf/gconftool.c:1006
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Descripci� curta: %s\n"
 
-#: gconf/gconftool.c:1009
+#: gconf/gconftool.c:1007
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Descripci� llarga: %s\n"
 
-#: gconf/gconftool.c:1018 gconf/gconftool.c:1312
+#: gconf/gconftool.c:1016 gconf/gconftool.c:1310
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "No s'ha especificat el valor per `%s'\n"
 
-#: gconf/gconftool.c:1022 gconf/gconftool.c:1316
+#: gconf/gconftool.c:1020 gconf/gconftool.c:1314
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "No s'ha pogut prendre el valor per `%s': %s\n"
 
-#: gconf/gconftool.c:1065 gconf/gconftool.c:1077
+#: gconf/gconftool.c:1063 gconf/gconftool.c:1075
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "No es compr�n el tipus `%s'\n"
 
-#: gconf/gconftool.c:1089
+#: gconf/gconftool.c:1087
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Heu d'especificar alternativament claus/valors com a arguments\n"
 
-#: gconf/gconftool.c:1109
+#: gconf/gconftool.c:1107
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "No existeix valor per definir la clau: `%s'\n"
 
-#: gconf/gconftool.c:1137
+#: gconf/gconftool.c:1135
 msgid "Cannot set schema as value\n"
 msgstr "No es pot definir un esquema com a valor\n"
 
-#: gconf/gconftool.c:1147
+#: gconf/gconftool.c:1145
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 "Quan es defineix una llista, s'ha d'especificar un tipus de llista previ\n"
 
-#: gconf/gconftool.c:1161
+#: gconf/gconftool.c:1159
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 "Quan es defineix una parella, s'ha d'especificar un tipus de car�cter o cdr "
 "previ\n"
 
-#: gconf/gconftool.c:1176
+#: gconf/gconftool.c:1174
 #, c-format
 msgid "Error: %s\n"
 msgstr "Error: %s\n"
 
-#: gconf/gconftool.c:1189
+#: gconf/gconftool.c:1187
 #, fuzzy, c-format
 msgid "Error setting value: %s\n"
 msgstr "Error en establir el valor: %s"
 
-#: gconf/gconftool.c:1207
+#: gconf/gconftool.c:1205
 #, fuzzy, c-format
 msgid "Error syncing: %s\n"
 msgstr "Error en sincronitzar: %s"
 
-#: gconf/gconftool.c:1230
+#: gconf/gconftool.c:1228
 #, 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:1250
+#: gconf/gconftool.c:1248
 #, fuzzy, c-format
 msgid "No schema known for `%s'\n"
 msgstr "El fitxer `%s' no existeix\n"
 
-#: gconf/gconftool.c:1283
+#: gconf/gconftool.c:1281
 #, c-format
 msgid "No doc string stored in schema at '%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1288
+#: gconf/gconftool.c:1286
 #, fuzzy, c-format
 msgid "Error getting schema at '%s': %s\n"
 msgstr "Error en definir l'esquema per `%s': %s"
 
-#: gconf/gconftool.c:1295
+#: gconf/gconftool.c:1293
 #, fuzzy, c-format
 msgid "No schema stored at '%s'\n"
 msgstr "El fitxer `%s' no existeix\n"
 
-#: gconf/gconftool.c:1298
+#: gconf/gconftool.c:1296
 #, c-format
 msgid "Value at '%s' is not a schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1354
+#: gconf/gconftool.c:1352
 #, fuzzy
 msgid "Must specify a schema name followed by the key name to apply it to\n"
 msgstr "Heu d'especificar una clau (nom de l'esquema) com a �nic argument\n"
 
-#: gconf/gconftool.c:1361
+#: gconf/gconftool.c:1359
 #, fuzzy, c-format
 msgid "Error associating schema name '%s' with key name '%s': %s\n"
 msgstr "ADVERT�NCIA: no s'ha pogut associar esquema `%s' amb clau `%s': %s\n"
 
-#: gconf/gconftool.c:1381
+#: gconf/gconftool.c:1379
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "Heu d'especificar una clau (nom de l'esquema) com a �nic argument\n"
 
-#: gconf/gconftool.c:1423
+#: gconf/gconftool.c:1421
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "El tipus de llista ha de ser d'un tipus previ: cadena, enter, coma  flotant "
 "o bolei�\n"
 
-#: gconf/gconftool.c:1443
+#: gconf/gconftool.c:1441
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "El tipus de car�cter ha de ser d'un tipus previ: cadena, enter, coma flotant "
 "o bolei�\n"
 
-#: gconf/gconftool.c:1463
+#: gconf/gconftool.c:1461
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "el tipus de parella cdr ha de ser d'un tipus previ: cadena, enter, coma "
 "flotant o bolei�\n"
 
-#: gconf/gconftool.c:1478
+#: gconf/gconftool.c:1476
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Error en establir el valor: %s"
 
-#: gconf/gconftool.c:1492
+#: gconf/gconftool.c:1490
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Error en sincronitzar: %s"
 
-#: gconf/gconftool.c:1507
+#: gconf/gconftool.c:1505
 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:1521
+#: gconf/gconftool.c:1519
 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:1532
+#: gconf/gconftool.c:1530
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Error en desactivar `%s': %s\n"
 
-#: gconf/gconftool.c:1555
+#: gconf/gconftool.c:1553
 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:1589
+#: gconf/gconftool.c:1587
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Error en llistar els directoris: %s\n"
 
-#: gconf/gconftool.c:1631
+#: gconf/gconftool.c:1629
 #, 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:1640
+#: gconf/gconftool.c:1638
 #, 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:1651 gconf/gconftool.c:1681 gconf/gconftool.c:1710
+#: gconf/gconftool.c:1649 gconf/gconftool.c:1679 gconf/gconftool.c:1708
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 "ADVERT�NCIA: No s'ha pogut analitzar el valor per defecte `%s' per l'esquema "
 "(%s)\n"
 
-#: gconf/gconftool.c:1669
+#: gconf/gconftool.c:1667
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 "ADVERT�NCIA: tipus de car�cter o cdr no v�lid o perdut per a esquema (%s)\n"
 
-#: gconf/gconftool.c:1694
+#: gconf/gconftool.c:1692
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "ADVERT�NCIA: No podeu definir un valor per defecte per un esquema\n"
 
-#: gconf/gconftool.c:1723
+#: gconf/gconftool.c:1721
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr ""
 "ADVERT�NCIA: error intern del gconftool, es desconeix el GConfValueType\n"
 
-#: gconf/gconftool.c:1770 gconf/gconftool.c:1791 gconf/gconftool.c:1812
-#: gconf/gconftool.c:1833
+#: gconf/gconftool.c:1768 gconf/gconftool.c:1789 gconf/gconftool.c:1810
+#: gconf/gconftool.c:1831
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "ADVERT�NCIA: no s'ha pogut analitzar el nom del tipus `%s'\n"
 
-#: gconf/gconftool.c:1787
+#: gconf/gconftool.c:1785
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
@@ -1691,38 +1704,38 @@ msgstr ""
 "ADVERT�NCIA: el list_type nom�s pot ser enter, coma flotant, cadena o bolei� "
 "i no `%s'\n"
 
-#: gconf/gconftool.c:1808
+#: gconf/gconftool.c:1806
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "ADVERT�NCIA: el car_type nom�s pot ser enter, coma flotant, cadena o bol�a i "
 "no `%s'\n"
 
-#: gconf/gconftool.c:1829
+#: gconf/gconftool.c:1827
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "ADVERT�NCIA: el cdr_type nom�s pot ser enter, coma flotant, cadena o bolei� "
 "i no `%s'\n"
 
-#: gconf/gconftool.c:1857
+#: gconf/gconftool.c:1855
 msgid "WARNING: empty <applyto> node"
 msgstr "ADVERT�NCIA: node <applyto> buit"
 
-#: gconf/gconftool.c:1860 gconf/gconftool.c:2123
+#: gconf/gconftool.c:1858 gconf/gconftool.c:2121
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "ADVERT�NCIA: no s'ent�n el node <%s> a <schema>\n"
 
-#: gconf/gconftool.c:1870
+#: gconf/gconftool.c:1868
 msgid "WARNING: no key specified for schema\n"
 msgstr "ADVERT�NCIA: no s'ha especificat clau per a l'esquema\n"
 
-#: gconf/gconftool.c:1903
+#: gconf/gconftool.c:1901
 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:1909
+#: gconf/gconftool.c:1907
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1730,32 +1743,32 @@ msgstr ""
 "ADVERT�NCIA: Hi ha m�ltiples <locale> nodes per locale `%s', ignorant totes "
 "les primeres passades\n"
 
-#: gconf/gconftool.c:1990
+#: gconf/gconftool.c:1988
 #, 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:2019
+#: gconf/gconftool.c:2017
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "ADVERT�NCIA: no s'ha pogut instal�lar l'esquema `%s' locale `%s': %s\n"
 
-#: gconf/gconftool.c:2027
+#: gconf/gconftool.c:2025
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Instal�lat esquema `%s' per locale `%s'\n"
 
-#: gconf/gconftool.c:2049
+#: gconf/gconftool.c:2047
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "ADVERT�NCIA: no s'ha pogut associar esquema `%s' amb clau `%s': %s\n"
 
-#: gconf/gconftool.c:2057
+#: gconf/gconftool.c:2055
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Esquema `%s' adjunt a la tecla `%s'\n"
 
-#: gconf/gconftool.c:2136
+#: gconf/gconftool.c:2134
 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"
 
@@ -1764,17 +1777,17 @@ msgstr "Heu de tenir com a m�nim una entrada <locale> en un <schema>\n"
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "ADVERT�NCIA: no s'ent�n el node <%s> sota <schemalist>\n"
 
-#: gconf/gconftool.c:2187
+#: gconf/gconftool.c:2188
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "No s'ha pogut obrir `%s': %s\n"
 
-#: gconf/gconftool.c:2194
+#: gconf/gconftool.c:2195
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Est� buit el document `%s'?\n"
 
-#: gconf/gconftool.c:2206
+#: gconf/gconftool.c:2207
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1783,26 +1796,26 @@ msgstr ""
 "El document `%s' t� un tipus incorrecte de node arrel (<%s>, hauria de "
 "ser<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:2219
+#: gconf/gconftool.c:2220
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "El document `%s' no t� node <gconfschemafile> d'alt nivell\n"
 
-#: gconf/gconftool.c:2233
+#: gconf/gconftool.c:2234
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "ADVERT�NCIA: no s'ent�n el node <%s> sota <gconfschemafile>\n"
 
-#: gconf/gconftool.c:2244 gconf/gconftool.c:2276
+#: gconf/gconftool.c:2245 gconf/gconftool.c:2277
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Error en sincronitzar les dades de configuraci�: %s"
 
-#: gconf/gconftool.c:2260
+#: gconf/gconftool.c:2261
 msgid "Must specify some schema files to install\n"
 msgstr "Heu d'especificar alguns esquemes de fitxers per instal�lar\n"
 
-#: gconf/gconftool.c:2297
+#: gconf/gconftool.c:2298
 #, c-format
 msgid ""
 "\n"
@@ -1811,16 +1824,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2317
+#: gconf/gconftool.c:2318
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "No s'ha pogut desactivar la clau de pausa %s: %s\n"
 
-#: gconf/gconftool.c:2443
+#: gconf/gconftool.c:2444
 msgid "Must specify some keys to break\n"
 msgstr "Heu d'especificar algunes claus per pausar\n"
 
-#: gconf/gconftool.c:2449
+#: gconf/gconftool.c:2450
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1829,11 +1842,11 @@ msgstr ""
 "S'intenta pausar l'aplicaci�, especificant valors erronis per la clau:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2467
+#: gconf/gconftool.c:2468
 msgid "Must specify some directories to break\n"
 msgstr "Cal especificar alguns directoris per pausar\n"
 
-#: gconf/gconftool.c:2486
+#: gconf/gconftool.c:2487
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1859,6 +1872,101 @@ msgstr "Advert�ncia del GConf: no s'han pogut llistar parelles a `%s': %s"
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "S'esperava `%s', s'ha obtingut `%s' per la clau %s"
 
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "No ior file in `%s'"
+#~ msgstr "No existeix el fitxer ior a `%s'"
+
+#~ msgid "gconfd taking lock `%s' from some other process"
+#~ msgstr "gconfd est� blocant `%s' des d'algun altre proc�s"
+
+#~ msgid "Another program has lock `%s'"
+#~ msgstr "Un altre programa ha blocat `%s'"
+
+#~ msgid ""
+#~ "Removing stale lock `%s' because IOR couldn't be converted to object "
+#~ "reference, IOR `%s'"
+#~ msgstr ""
+#~ "S'elimina el blocatge antic `%s' degut a que l'IOR no s'ha pogut "
+#~ "convertir en refer�ncia d'objecte, IOR `%s'"
+
+#~ msgid "Removing stale lock `%s' because of error pinging server: %s"
+#~ msgstr ""
+#~ "S'elimina el blocatge antic `%s' degut a un error en fer pings al "
+#~ "servidor: %s"
+
+#~ msgid "GConf configuration daemon (gconfd) has lock `%s'"
+#~ msgstr "La configuraci� daemon de GConf (gconfd) ha blocat `%s'"
+
+#~ msgid "Can't create lock `%s': %s"
+#~ msgstr "No s'ha pogut crear el bloqueig `%s': %s"
+
+#~ msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
+#~ msgstr ""
+#~ "No s'ha pogut obrir el fitxer blocat `%s'; s'assumeix que no �s el "
+#~ "nostre: %s"
+
+#~ msgid "Corrupt lock file `%s', removing anyway"
+#~ msgstr "Fitxer de bloqueig danyat `%s', s'elimina de totes formes"
+
+#~ 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' (pid originari %u, pid actual %u;"
+#~ "s'assumeix que alg� ha pres el nostre blocatge"
+
+#~ msgid ""
+#~ "Failed to init Object Activation Framework: please mail bug report to OAF "
+#~ "maintainers"
+#~ msgstr ""
+#~ "No s'ha pogut d'inicialitzar Object Activation Framework: si us plau "
+#~ "envieu un informe d'errors als qui mantenen OAF"
+
+#, fuzzy
+#~ msgid ""
+#~ "OAF doesn't know about our IID; indicates broken installation; can't "
+#~ "register existing server."
+#~ msgstr ""
+#~ "L'OAF no coneix el vostre IID; aix� indica instal�laci� incorrecta; no "
+#~ "pot ser registrada; se surt\n"
+
+#, 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; se surt\n"
+
+#, fuzzy
+#~ msgid "Unknown error registering existing gconfd with OAF; exiting"
+#~ msgstr "Error desconegut en registrar gconfd amb OAF; se surt\n"
+
+#~ msgid ""
+#~ "OAF 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; se surt\n"
+
+#~ msgid "Another gconfd already registered with OAF; exiting\n"
+#~ msgstr "Existeix un altre gconfd ja registrat amb OAF; se surt\n"
+
+#~ msgid "Unknown error registering gconfd with OAF; exiting\n"
+#~ msgstr "Error desconegut en registrar gconfd amb OAF; se surt\n"
+
+#~ 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 ""
+#~ "No haur�eu d'executar gconfd mentre instal�leu esquemes de fitxers nous.\n"
+#~ "Useu gconftool --shutdown per tancar el daemon, amb m�s seguretat mentre "
+#~ "no hi hagi aplicacions en proc�s\n"
+#~ "(malgrat que hauria de funcionar encara que hi hagi aplicacions en "
+#~ "proc�s).\n"
+
 #~ msgid "Ignoring XML node `%s', except for possible schema name: %s"
 #~ msgstr ""
 #~ "S'ignora el node XML `%s', excepte per a un possible nom d'esquema: %s"
@@ -1878,9 +1986,6 @@ msgstr "S'esperava `%s', s'ha obtingut `%s' per la clau %s"
 #~ "del oaf_activate_from_id() i no ha definit una excepci� que expliqui el "
 #~ "problema .Arxiveu un informe d'error d'OAF."
 
-#~ msgid "Failed to open file '%s': %s"
-#~ msgstr "No s'ha pogut obrir el fitxer `%s': %s"
-
 #~ msgid "Received signal %d, ignoring"
 #~ msgstr "S'ha rebut la senyal %d, s'ignora"
 
diff --git a/po/cs.po b/po/cs.po
index 3b87862a..2a57661e 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf VERSION\n"
-"POT-Creation-Date: 2001-08-15 18:01-0400\n"
+"POT-Creation-Date: 2002-02-04 18:21-0500\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"
@@ -31,7 +31,7 @@ msgstr ""
 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
+#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1050
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Nelze vytvo�it adres�� `%s': %s"
@@ -45,26 +45,26 @@ msgstr ""
 msgid "Unloading XML backend module."
 msgstr ""
 
-#: backends/xml-backend.c:286
+#: backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr ""
 
-#: backends/xml-backend.c:386
+#: backends/xml-backend.c:414
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
 msgstr ""
 
-#: backends/xml-backend.c:396
+#: backends/xml-backend.c:424
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
 
-#: backends/xml-backend.c:680
+#: backends/xml-backend.c:708
 msgid "Initializing XML backend module"
 msgstr ""
 
-#: backends/xml-backend.c:745
+#: backends/xml-backend.c:773
 #, fuzzy, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "Nelze otev��t adres�� `%s': %s"
@@ -128,32 +128,32 @@ msgid "Failed to delete old file `%s': %s"
 msgstr "Nelze smazat star� soubor `%s': %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:806
+#: backends/xml-dir.c:803
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "`stat' selhal na `%s': %s"
 
-#: backends/xml-dir.c:950
+#: backends/xml-dir.c:947
 #, fuzzy, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Zdvojen� polo�ka `%s' v `%s', vymaz�v�m"
 
-#: backends/xml-dir.c:972
+#: backends/xml-dir.c:969
 #, 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:979
+#: backends/xml-dir.c:977
 #, fuzzy, c-format
-msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
+msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
 msgstr "Polo�ka beze jm�na v XML souboru `%s', vymaz�v�m"
 
-#: backends/xml-dir.c:1067
+#: backends/xml-dir.c:1066
 #, fuzzy, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Nelze zav��t soubor `%s': %s"
 
-#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2494
+#: backends/xml-dir.c:1074
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Nelze zav��t soubor `%s': %s"
@@ -164,11 +164,6 @@ msgstr "Nelze zav��t soubor `%s': %s"
 msgid "Ignoring XML node with name `%s': %s"
 msgstr ""
 
-#: backends/xml-entry.c:200
-#, c-format
-msgid "%s"
-msgstr ""
-
 #: backends/xml-entry.c:327
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
@@ -331,7 +326,7 @@ msgid ""
 "result in a notification weirdly reappearing): %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1328
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr ""
@@ -441,281 +436,379 @@ msgstr "Nelze vymazat `%s': %s"
 msgid "No database available to save your configuration"
 msgstr ""
 
-#: gconf/gconf-internals.c:87
+#: gconf/gconf-internals.c:114
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:227
+#, c-format
+msgid "Invalid UTF-8 in string value in '%s'"
+msgstr ""
+
+#: gconf/gconf-internals.c:286
 msgid "Couldn't interpret CORBA value for list element"
 msgstr ""
 
-#: gconf/gconf-internals.c:253
+#: gconf/gconf-internals.c:288
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:266
+#: gconf/gconf-internals.c:301
 msgid "Received list from gconfd with a bad list type"
 msgstr ""
 
-#: gconf/gconf-internals.c:447
+#: gconf/gconf-internals.c:482
 msgid "Failed to convert object to IOR"
 msgstr ""
 
-#: gconf/gconf-internals.c:813
+#: gconf/gconf-internals.c:619
+msgid "Invalid UTF-8 in locale for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:627
+msgid "Invalid UTF-8 in short description for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:635
+msgid "Invalid UTF-8 in long description for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:643
+msgid "Invalid UTF-8 in owner for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:868
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:873
+#: gconf/gconf-internals.c:928
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "Zdroj `%s' p�id�n\n"
 
-#: gconf/gconf-internals.c:885
+#: gconf/gconf-internals.c:940
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "Chyba v �ten� souboru `%s': %s\n"
 
-#: gconf/gconf-internals.c:1327
+#: gconf/gconf-internals.c:1271 gconf/gconf-internals.c:1337
+#: gconf/gconf-value.c:125 gconf/gconf-value.c:224 gconf/gconf-value.c:366
+#: gconf/gconf-value.c:1084
+msgid "Text contains invalid UTF-8"
+msgstr ""
+
+#: gconf/gconf-internals.c:1422
 #, c-format
 msgid "Expected list, got %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1337
+#: gconf/gconf-internals.c:1432
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1476
+#: gconf/gconf-internals.c:1571
 #, c-format
 msgid "Expected pair, got %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1490
+#: gconf/gconf-internals.c:1585
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 
-#: gconf/gconf-internals.c:1506
+#: gconf/gconf-internals.c:1601
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:1622
+#: gconf/gconf-internals.c:1717
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:1684
+#: gconf/gconf-internals.c:1779
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:2164 gconf/gconf.c:3092
+#: gconf/gconf-internals.c:1915
+msgid "Encoded value is not valid UTF-8"
+msgstr ""
+
+#: gconf/gconf-internals.c:2265 gconf/gconf.c:3082
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA chyba: %s"
 
-#: gconf/gconf-internals.c:2180
+#: gconf/gconf-internals.c:2281
 #, c-format
 msgid "OAF problem description: '%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2186
+#: gconf/gconf-internals.c:2287
 msgid "attempt to remove not-listed OAF object directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2191
+#: gconf/gconf-internals.c:2292
 msgid "attempt to add already-listed OAF directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2198
+#: gconf/gconf-internals.c:2299
 #, c-format
 msgid "OAF parse error: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2203
+#: gconf/gconf-internals.c:2304
 msgid "Unknown OAF error"
 msgstr ""
 
-#: gconf/gconf-internals.c:2290
-#, c-format
-msgid "No ior file in `%s'"
-msgstr ""
-
-#: gconf/gconf-internals.c:2321
-#, c-format
-msgid "gconfd taking lock `%s' from some other process"
-msgstr ""
+#: gconf/gconf-internals.c:2437
+#, fuzzy, c-format
+msgid "Could not lock temporary file '%s': %s"
+msgstr "Nelze vytvo�it adres�� `%s': %s"
 
-#: gconf/gconf-internals.c:2332
+#: gconf/gconf-internals.c:2464
 #, c-format
-msgid "Another program has lock `%s'"
+msgid "Could not create file '%s', probably because it already exists"
 msgstr ""
 
-#: gconf/gconf-internals.c:2351
-msgid "couldn't contact ORB to ping existing gconfd"
-msgstr ""
+#: gconf/gconf-internals.c:2510
+#, fuzzy, c-format
+msgid "Failed to create or open '%s'"
+msgstr "Nelze zav��t soubor `%s': %s"
 
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2520
 #, c-format
 msgid ""
-"Removing stale lock `%s' because IOR couldn't be converted to object "
-"reference, IOR `%s'"
+"Failed to lock '%s': probably another process has the lock, or your "
+"operating system has NFS file locking misconfigured (%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:2371
+#: gconf/gconf-internals.c:2548
 #, c-format
-msgid "Removing stale lock `%s' because of error pinging server: %s"
+msgid "IOR file '%s' not opened successfully, no gconfd located: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2383
+#: gconf/gconf-internals.c:2578
 #, c-format
-msgid "GConf configuration daemon (gconfd) has lock `%s'"
+msgid "gconftool or other non-gconfd process has the lock file '%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2397
+#: gconf/gconf-internals.c:2595
+msgid "couldn't contact ORB to resolve existing gconfd object reference"
+msgstr ""
+
+#: gconf/gconf-internals.c:2627
 #, fuzzy, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "Nelze vytvo�it adres�� `%s': %s"
 
-#: gconf/gconf-internals.c:2446
-#, fuzzy, c-format
-msgid "Can't create lock `%s': %s"
-msgstr "Nelze vytvo�it soubor `%s': %s"
-
-#: gconf/gconf-internals.c:2482
+#: gconf/gconf-internals.c:2686
 #, fuzzy, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Nelze ps�t do souboru `%s': %s"
 
-#: gconf/gconf-internals.c:2532
+#: gconf/gconf-internals.c:2727
 #, c-format
-msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
+msgid "We didn't have the lock on file `%s', but we should have"
 msgstr ""
 
-#: gconf/gconf-internals.c:2549
+#: gconf/gconf-internals.c:2748
+#, fuzzy, c-format
+msgid "Failed to link '%s' to '%s': %s"
+msgstr "Nelze p�ejmenovat `%s' na `%s': %s"
+
+#: gconf/gconf-internals.c:2760
+#, fuzzy, c-format
+msgid "Failed to remove lock file `%s': %s"
+msgstr "Nelze zav��t soubor `%s': %s"
+
+#: gconf/gconf-internals.c:2779
+#, fuzzy, c-format
+msgid "Failed to clean up file '%s': %s"
+msgstr "Nelze zav��t soubor `%s': %s"
+
+#: gconf/gconf-internals.c:2793
+#, fuzzy, c-format
+msgid "Failed to remove lock directory `%s': %s"
+msgstr "Nelze otev��t adres�� `%s': %s"
+
+#: gconf/gconf-internals.c:3003 gconf/gconfd.c:580
+#, fuzzy, c-format
+msgid "Failed to create %s: %s"
+msgstr "Nelze zav��t soubor `%s': %s"
+
+#: gconf/gconf-internals.c:3036
 #, c-format
-msgid "Corrupt lock file `%s', removing anyway"
+msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:2559
-#, c-format
+#: gconf/gconf-internals.c:3064
+#, fuzzy, c-format
+msgid "Failed to launch configuration server: %s\n"
+msgstr "Nelze zav��t soubor `%s': %s"
+
+#: gconf/gconf-internals.c:3088
 msgid ""
-"Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
-"took our lock"
+"Failed to contact configuration server (a likely cause of this is that you "
+"have an existing configuration server (gconfd) running, but it isn't "
+"reachable from here - if you're logged in from two machines at once, you may "
+"need to enable TCP networking for ORBit)\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:2576
+#: gconf/gconf-internals.c:3724
 #, fuzzy, c-format
-msgid "Failed to release lock directory `%s': %s"
+msgid "Failed to read from child pipe (%s)"
 msgstr "Nelze otev��t adres�� `%s': %s"
 
+#: gconf/gconf-internals.c:3789
+#, fuzzy, c-format
+msgid "Failed to fork (%s)"
+msgstr "Nelze zav��t soubor `%s': %s"
+
+#: gconf/gconf-internals.c:3929
+#, fuzzy, c-format
+msgid "Failed to change to directory '%s' (%s)"
+msgstr "Nelze otev��t adres�� `%s': %s"
+
+#: gconf/gconf-internals.c:3939
+#, fuzzy, c-format
+msgid "Failed to execute child process (%s)"
+msgstr "Nelze smazat star� soubor `%s': %s"
+
+#: gconf/gconf-internals.c:3948
+#, c-format
+msgid "Failed to redirect output or input of child process (%s)"
+msgstr ""
+
+#: gconf/gconf-internals.c:3957
+#, fuzzy, c-format
+msgid "Failed to fork child process (%s)"
+msgstr "Nelze zav��t soubor `%s': %s"
+
+#: gconf/gconf-internals.c:3965
+msgid "Unknown error executing child process"
+msgstr ""
+
+#: gconf/gconf-internals.c:3986
+#, c-format
+msgid "Failed to read enough data from child pid pipe (%s)"
+msgstr ""
+
+#: gconf/gconf-internals.c:4036
+#, c-format
+msgid "Failed to create pipe for communicating with child process (%s)"
+msgstr ""
+
 #: 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:510
+#: gconf/gconf-sources.c:544
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 
-#: gconf/gconf-sources.c:567
+#: gconf/gconf-sources.c:601
 msgid "The '/' name can only be a directory, not a key"
 msgstr ""
 
-#: gconf/gconf-sources.c:596
+#: gconf/gconf-sources.c:630
 #, 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
+#: gconf/gconf-sources.c:642
 #, 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 "
+"somehow we mistakenly created two gconfd processes. If you have two gconfd "
+"processes (or had two at the time the second was launched), logging out, "
+"killing all copies of gconfd, and logging back in may help. Perhaps the "
+"problem is that you attempted to use GConf from two machines at once, and "
+"ORBit still has its default configuration that prevents remote CORBA "
+"connections? As always, check the user.* syslog for details on problems "
 "gconfd encountered."
 msgstr ""
 
-#: gconf/gconf-sources.c:1164
+#: gconf/gconf-sources.c:1198
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:1233
+#: gconf/gconf-sources.c:1267
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:1257
+#: gconf/gconf-sources.c:1291
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
 
-#: gconf/gconf-value.c:82
+#: gconf/gconf-value.c:81
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr ""
 
-#: gconf/gconf-value.c:92
+#: gconf/gconf-value.c:91
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr ""
 
-#: gconf/gconf-value.c:113
+#: gconf/gconf-value.c:112
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr ""
 
-#: gconf/gconf-value.c:146
+#: gconf/gconf-value.c:156
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr ""
 
-#: gconf/gconf-value.c:214
+#: gconf/gconf-value.c:232
 #, c-format
 msgid "Didn't understand `%s' (list must start with a '[')"
 msgstr ""
 
-#: gconf/gconf-value.c:227
+#: gconf/gconf-value.c:245
 #, c-format
 msgid "Didn't understand `%s' (list must end with a ']')"
 msgstr ""
 
-#: gconf/gconf-value.c:278
+#: gconf/gconf-value.c:296
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
 msgstr ""
 
-#: gconf/gconf-value.c:309 gconf/gconf-value.c:462
+#: gconf/gconf-value.c:327 gconf/gconf-value.c:488
 #, c-format
 msgid "Didn't understand `%s' (extra trailing characters)"
 msgstr ""
 
-#: gconf/gconf-value.c:348
+#: gconf/gconf-value.c:374
 #, c-format
 msgid "Didn't understand `%s' (pair must start with a '(')"
 msgstr ""
 
-#: gconf/gconf-value.c:361
+#: gconf/gconf-value.c:387
 #, c-format
 msgid "Didn't understand `%s' (pair must end with a ')')"
 msgstr ""
 
-#: gconf/gconf-value.c:391 gconf/gconf-value.c:477
+#: gconf/gconf-value.c:417 gconf/gconf-value.c:503
 #, c-format
 msgid "Didn't understand `%s' (wrong number of elements)"
 msgstr ""
 
-#: gconf/gconf-value.c:431
+#: gconf/gconf-value.c:457
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr ""
@@ -725,323 +818,269 @@ msgstr ""
 msgid "`%s': %s"
 msgstr ""
 
-#: gconf/gconf.c:289
+#: gconf/gconf.c:287
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr ""
 
-#: gconf/gconf.c:574
+#: gconf/gconf.c:572
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 
-#: gconf/gconf.c:1870
+#: gconf/gconf.c:1868
 #, c-format
 msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr ""
 
-#: 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. "
-"This is a bug in the OAF package; something went wrong in OAF, and no error "
-"was reported. This is not a bug in the GConf package. Do not report a GConf "
-"bug unless you have information indicating what went wrong with OAF that was "
-"caused by GConf."
-msgstr ""
-
-#: gconf/gconf.c:2198
+#: gconf/gconf.c:2183
 msgid "Failed to init GConf, exiting\n"
 msgstr ""
 
-#: gconf/gconf.c:2235
+#: gconf/gconf.c:2220
 msgid "Must begin with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2257
+#: gconf/gconf.c:2242
 msgid "Can't have two slashes (/) in a row"
 msgstr ""
 
-#: gconf/gconf.c:2259
+#: gconf/gconf.c:2244
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2280
+#: gconf/gconf.c:2265
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr ""
 
-#: gconf/gconf.c:2294
+#: gconf/gconf.c:2279
 msgid "Key/directory may not end with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2547
+#: gconf/gconf.c:2520
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr ""
 
-#: gconf/gconf.c:2608
+#: gconf/gconf.c:2581
 #, c-format
 msgid "Expected float, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2643
+#: gconf/gconf.c:2616
 #, c-format
 msgid "Expected int, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2678
+#: gconf/gconf.c:2651
 #, c-format
 msgid "Expected string, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2715
+#: gconf/gconf.c:2688
 #, c-format
 msgid "Expected bool, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2748
+#: gconf/gconf.c:2721
 #, c-format
 msgid "Expected schema, got %s"
 msgstr ""
 
-#: gconf/gconfd.c:248
+#: gconf/gconfd.c:247
 msgid "Shutdown request received"
 msgstr ""
 
-#: gconf/gconfd.c:280
+#: gconf/gconfd.c:279
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr ""
 
-#: gconf/gconfd.c:298
+#: gconf/gconfd.c:297
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
 msgstr ""
 
-#: gconf/gconfd.c:307
+#: gconf/gconfd.c:306
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
 msgstr ""
 
-#: gconf/gconfd.c:307
+#: gconf/gconfd.c:306
 msgid "/path"
 msgstr ""
 
-#: gconf/gconfd.c:321
+#: gconf/gconfd.c:320
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr ""
 
-#: gconf/gconfd.c:333
+#: gconf/gconfd.c:332
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
 msgstr ""
 
-#: gconf/gconfd.c:350
+#: gconf/gconfd.c:349
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
 
-#: gconf/gconfd.c:376
+#: gconf/gconfd.c:375
 #, c-format
 msgid "Received signal %d, dumping core. Please report a GConf bug."
 msgstr ""
 
-#: gconf/gconfd.c:392
+#: gconf/gconfd.c:391
 #, c-format
 msgid ""
 "Received signal %d, shutting down abnormally. Please file a GConf bug report."
 msgstr ""
 
-#: gconf/gconfd.c:409
+#: gconf/gconfd.c:408
 #, 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:513
+#: gconf/gconfd.c:526
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr ""
 
-#: gconf/gconfd.c:540
-msgid ""
-"Failed to init Object Activation Framework: please mail bug report to OAF "
-"maintainers"
-msgstr ""
-
-#: gconf/gconfd.c:560
+#: gconf/gconfd.c:567
 msgid "Failed to get object reference for ConfigServer"
 msgstr ""
 
-#: gconf/gconfd.c:573
-#, fuzzy, c-format
-msgid "Failed to create %s: %s"
-msgstr "Nelze zav��t soubor `%s': %s"
+#: gconf/gconfd.c:605
+#, c-format
+msgid "Failed to write byte to pipe fd %d so client program may hang: %s"
+msgstr ""
 
-#. Bad hack alert - register the current lockholder with oafd,
-#. * since oafd seems to have forgotten about us.
-#.
-#: gconf/gconfd.c:588
+#: gconf/gconfd.c:615
 #, fuzzy, c-format
-msgid "Failed to get lock for daemon: %s"
+msgid "Failed to get lock for daemon, exiting: %s"
 msgstr "Nelze vymazat `%s': %s"
 
-#: gconf/gconfd.c:594
-msgid ""
-"Registering existing server with oafd, since OAF appears to have leaked it"
-msgstr ""
-
-#: gconf/gconfd.c:603
-msgid ""
-"OAF doesn't know about our IID; indicates broken installation; can't "
-"register existing server."
-msgstr ""
-
-#: gconf/gconfd.c:607
-msgid ""
-"Another gconfd already registered with OAF, so we can't register the "
-"existing server"
-msgstr ""
-
-#: gconf/gconfd.c:612
-msgid "Unknown error registering existing gconfd with OAF; exiting"
-msgstr ""
-
-#: gconf/gconfd.c:639
-msgid ""
-"OAF doesn't know about our IID; indicates broken installation; can't "
-"register; exiting\n"
-msgstr ""
-
-#: gconf/gconfd.c:643
-msgid "Another gconfd already registered with OAF; exiting\n"
-msgstr ""
-
-#: gconf/gconfd.c:648
-msgid "Unknown error registering gconfd with OAF; exiting\n"
-msgstr ""
-
-#: gconf/gconfd.c:692
+#: gconf/gconfd.c:657
 #, fuzzy, c-format
-msgid "Failed to release lockfile: %s"
+msgid "Error releasing lockfile: %s"
 msgstr "Nelze otev��t adres�� `%s': %s"
 
-#: gconf/gconfd.c:700
+#: gconf/gconfd.c:665
 #, fuzzy
 msgid "Exiting"
 msgstr "Norm�ln� konec"
 
-#: gconf/gconfd.c:725
+#: gconf/gconfd.c:690
 msgid "GConf server is not in use, shutting down."
 msgstr ""
 
-#: gconf/gconfd.c:1084
+#: gconf/gconfd.c:1059
 #, c-format
 msgid "Returning exception: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1184
+#: gconf/gconfd.c:1159
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
 "gconfd shutdown (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1219
+#: gconf/gconfd.c:1194
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1288
+#: gconf/gconfd.c:1263
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1302
+#: gconf/gconfd.c:1277
 #, 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:1311
+#: gconf/gconfd.c:1286
 #, fuzzy, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Nelze zav��t soubor `%s': %s"
 
-#: gconf/gconfd.c:1325
+#: gconf/gconfd.c:1300
 #, fuzzy, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "`stat' selhal na `%s': %s"
 
-#: gconf/gconfd.c:1335
+#: gconf/gconfd.c:1310
 #, fuzzy, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "Nelze zav��t soubor `%s': %s"
 
-#: gconf/gconfd.c:1344
+#: gconf/gconfd.c:1319
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1819
+#: gconf/gconfd.c:1794
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr ""
 
-#: gconf/gconfd.c:1865
+#: gconf/gconfd.c:1840
 #, fuzzy, c-format
 msgid "Error reading saved state file: %s"
 msgstr "Chyba v �ten� souboru `%s': %s\n"
 
-#: gconf/gconfd.c:1918
+#: gconf/gconfd.c:1893
 #, fuzzy, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "Nelze zav��t soubor `%s': %s"
 
-#: gconf/gconfd.c:2035
+#: gconf/gconfd.c:2010
 #, 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:2040
+#: gconf/gconfd.c:2015
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously re-"
 "add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:2063 gconf/gconfd.c:2228
+#: gconf/gconfd.c:2038 gconf/gconfd.c:2203
 #, fuzzy, c-format
 msgid "Failed to get IOR for client: %s"
 msgstr "Nelze vymazat `%s': %s"
 
-#: gconf/gconfd.c:2078
+#: gconf/gconfd.c:2053
 #, fuzzy, c-format
 msgid "Failed to open saved state file: %s"
 msgstr "Nelze zav��t soubor `%s': %s"
 
-#: gconf/gconfd.c:2091
+#: gconf/gconfd.c:2066
 #, fuzzy, c-format
 msgid "Failed to write client add to saved state file: %s"
 msgstr "Nelze zav��t soubor `%s': %s"
 
-#: gconf/gconfd.c:2099
+#: gconf/gconfd.c:2074
 #, fuzzy, c-format
 msgid "Failed to flush client add to saved state file: %s"
 msgstr "Nelze zav��t soubor `%s': %s"
 
-#: gconf/gconfd.c:2189
+#: gconf/gconfd.c:2164
 msgid ""
 "Some client removed itself from the GConf server when it hadn't been added."
 msgstr ""
@@ -1284,339 +1323,332 @@ msgid ""
 msgstr ""
 
 #: gconf/gconftool.c:525
+msgid "You should use --direct when using a non-default configuration source\n"
+msgstr ""
+
+#: gconf/gconftool.c:531
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:550
+#: gconf/gconftool.c:566
 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:565
-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 ""
-
-#: gconf/gconftool.c:587
+#: gconf/gconftool.c:595
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:798
+#: gconf/gconftool.c:796
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:841
+#: gconf/gconftool.c:839
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 
-#: gconf/gconftool.c:875
+#: gconf/gconftool.c:873
 #, fuzzy, c-format
 msgid "Failure listing entries in `%s': %s\n"
 msgstr "Nelze zav��t soubor `%s': %s"
 
-#: gconf/gconftool.c:893
+#: gconf/gconftool.c:891
 msgid "(no value set)"
 msgstr ""
 
-#: gconf/gconftool.c:948
+#: gconf/gconftool.c:946
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:962
+#: gconf/gconftool.c:960
 msgid "Must specify a key or keys to get\n"
 msgstr ""
 
-#: gconf/gconftool.c:997
+#: gconf/gconftool.c:995
 #, c-format
 msgid "Type: %s\n"
 msgstr "Typ: %s\n"
 
-#: gconf/gconftool.c:998
+#: gconf/gconftool.c:996
 #, fuzzy, c-format
 msgid "List Type: %s\n"
 msgstr "Typ: %s\n"
 
-#: gconf/gconftool.c:999
+#: gconf/gconftool.c:997
 #, fuzzy, c-format
 msgid "Car Type: %s\n"
 msgstr "Typ: %s\n"
 
-#: gconf/gconftool.c:1000
+#: gconf/gconftool.c:998
 #, fuzzy, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Typ: %s\n"
 
-#: gconf/gconftool.c:1005
+#: gconf/gconftool.c:1003
 #, c-format
 msgid "Default Value: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1005 gconf/gconftool.c:1007 gconf/gconftool.c:1008
-#: gconf/gconftool.c:1009
+#: gconf/gconftool.c:1003 gconf/gconftool.c:1005 gconf/gconftool.c:1006
+#: gconf/gconftool.c:1007
 msgid "Unset"
 msgstr ""
 
-#: gconf/gconftool.c:1007
+#: gconf/gconftool.c:1005
 #, c-format
 msgid "Owner: %s\n"
 msgstr "Vlastn�k: %s\n"
 
-#: gconf/gconftool.c:1008
+#: gconf/gconftool.c:1006
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1009
+#: gconf/gconftool.c:1007
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1018 gconf/gconftool.c:1312
+#: gconf/gconftool.c:1016 gconf/gconftool.c:1310
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1022 gconf/gconftool.c:1316
+#: gconf/gconftool.c:1020 gconf/gconftool.c:1314
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1065 gconf/gconftool.c:1077
+#: gconf/gconftool.c:1063 gconf/gconftool.c:1075
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1089
+#: gconf/gconftool.c:1087
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr ""
 
-#: gconf/gconftool.c:1109
+#: gconf/gconftool.c:1107
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1137
+#: gconf/gconftool.c:1135
 msgid "Cannot set schema as value\n"
 msgstr ""
 
-#: gconf/gconftool.c:1147
+#: gconf/gconftool.c:1145
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1161
+#: gconf/gconftool.c:1159
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1176
+#: gconf/gconftool.c:1174
 #, c-format
 msgid "Error: %s\n"
 msgstr "Chyba: %s\n"
 
-#: gconf/gconftool.c:1189
+#: gconf/gconftool.c:1187
 #, fuzzy, c-format
 msgid "Error setting value: %s\n"
 msgstr "Chyba v �ten� souboru `%s': %s\n"
 
-#: gconf/gconftool.c:1207
+#: gconf/gconftool.c:1205
 #, fuzzy, c-format
 msgid "Error syncing: %s\n"
 msgstr "Chyba: %s\n"
 
-#: gconf/gconftool.c:1230
+#: gconf/gconftool.c:1228
 msgid "Must specify a key or keys on the command line\n"
 msgstr ""
 
-#: gconf/gconftool.c:1250
+#: gconf/gconftool.c:1248
 #, c-format
 msgid "No schema known for `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1283
+#: gconf/gconftool.c:1281
 #, c-format
 msgid "No doc string stored in schema at '%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1288
+#: gconf/gconftool.c:1286
 #, fuzzy, c-format
 msgid "Error getting schema at '%s': %s\n"
 msgstr "Chyba v �ten� souboru `%s': %s\n"
 
-#: gconf/gconftool.c:1295
+#: gconf/gconftool.c:1293
 #, c-format
 msgid "No schema stored at '%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1298
+#: gconf/gconftool.c:1296
 #, c-format
 msgid "Value at '%s' is not a schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1354
+#: gconf/gconftool.c:1352
 msgid "Must specify a schema name followed by the key name to apply it to\n"
 msgstr ""
 
-#: gconf/gconftool.c:1361
+#: gconf/gconftool.c:1359
 #, c-format
 msgid "Error associating schema name '%s' with key name '%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1381
+#: gconf/gconftool.c:1379
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr ""
 
-#: gconf/gconftool.c:1423
+#: gconf/gconftool.c:1421
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1443
+#: gconf/gconftool.c:1441
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1463
+#: gconf/gconftool.c:1461
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1478
+#: gconf/gconftool.c:1476
 #, c-format
 msgid "Error setting value: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1492
+#: gconf/gconftool.c:1490
 #, c-format
 msgid "Error syncing: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1507
+#: gconf/gconftool.c:1505
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1521
+#: gconf/gconftool.c:1519
 msgid "Must specify one or more keys to unset.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1532
+#: gconf/gconftool.c:1530
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1555
+#: gconf/gconftool.c:1553
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1589
+#: gconf/gconftool.c:1587
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1631
+#: gconf/gconftool.c:1629
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1640
+#: gconf/gconftool.c:1638
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1651 gconf/gconftool.c:1681 gconf/gconftool.c:1710
+#: gconf/gconftool.c:1649 gconf/gconftool.c:1679 gconf/gconftool.c:1708
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1669
+#: gconf/gconftool.c:1667
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1694
+#: gconf/gconftool.c:1692
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1723
+#: gconf/gconftool.c:1721
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr ""
 
-#: gconf/gconftool.c:1770 gconf/gconftool.c:1791 gconf/gconftool.c:1812
-#: gconf/gconftool.c:1833
+#: gconf/gconftool.c:1768 gconf/gconftool.c:1789 gconf/gconftool.c:1810
+#: gconf/gconftool.c:1831
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1787
+#: gconf/gconftool.c:1785
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1808
+#: gconf/gconftool.c:1806
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1829
+#: gconf/gconftool.c:1827
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1857
+#: gconf/gconftool.c:1855
 msgid "WARNING: empty <applyto> node"
 msgstr ""
 
-#: gconf/gconftool.c:1860 gconf/gconftool.c:2123
+#: gconf/gconftool.c:1858 gconf/gconftool.c:2121
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1870
+#: gconf/gconftool.c:1868
 msgid "WARNING: no key specified for schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1903
+#: gconf/gconftool.c:1901
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 
-#: gconf/gconftool.c:1909
+#: gconf/gconftool.c:1907
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 
-#: gconf/gconftool.c:1990
+#: gconf/gconftool.c:1988
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:2019
+#: gconf/gconftool.c:2017
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2027
+#: gconf/gconftool.c:2025
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:2049
+#: gconf/gconftool.c:2047
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2057
+#: gconf/gconftool.c:2055
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:2136
+#: gconf/gconftool.c:2134
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr ""
 
@@ -1625,70 +1657,70 @@ msgstr ""
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr ""
 
-#: gconf/gconftool.c:2187
+#: gconf/gconftool.c:2188
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Nelze otev��t `%s': %s\n"
 
-#: gconf/gconftool.c:2194
+#: gconf/gconftool.c:2195
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Dokument `%s' je pr�zdn�?\n"
 
-#: gconf/gconftool.c:2206
+#: gconf/gconftool.c:2207
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
 "<gconfschemafile>)\n"
 msgstr ""
 
-#: gconf/gconftool.c:2219
+#: gconf/gconftool.c:2220
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:2233
+#: gconf/gconftool.c:2234
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr ""
 
-#: gconf/gconftool.c:2244 gconf/gconftool.c:2276
+#: gconf/gconftool.c:2245 gconf/gconftool.c:2277
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr ""
 
-#: gconf/gconftool.c:2260
+#: gconf/gconftool.c:2261
 msgid "Must specify some schema files to install\n"
 msgstr ""
 
-#: gconf/gconftool.c:2297
+#: gconf/gconftool.c:2298
 #, c-format
 msgid ""
 "\n"
 "%s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2317
+#: gconf/gconftool.c:2318
 #, fuzzy, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Nelze vytvo�it soubor `%s': %s"
 
-#: gconf/gconftool.c:2443
+#: gconf/gconftool.c:2444
 msgid "Must specify some keys to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2449
+#: gconf/gconftool.c:2450
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
 "  %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2467
+#: gconf/gconftool.c:2468
 msgid "Must specify some directories to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2486
+#: gconf/gconftool.c:2487
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1712,11 +1744,11 @@ msgid "Expected `%s' got `%s' for key %s"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Unable to store a value at key '%s'"
-#~ msgstr "Nelze zav��t soubor `%s': %s"
+#~ msgid "Can't create lock `%s': %s"
+#~ msgstr "Nelze vytvo�it soubor `%s': %s"
 
 #, fuzzy
-#~ msgid "Failed to open file '%s': %s"
+#~ msgid "Unable to store a value at key '%s'"
 #~ msgstr "Nelze zav��t soubor `%s': %s"
 
 #~ msgid "Key"
diff --git a/po/da.po b/po/da.po
index 233942e3..1135cba5 100644
--- a/po/da.po
+++ b/po/da.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf 1.0.4\n"
-"POT-Creation-Date: 2001-12-27 16:49+0100\n"
+"POT-Creation-Date: 2002-02-04 18:21-0500\n"
 "PO-Revision-Date: 2001-12-27 16:49+0100\n"
 "Last-Translator: Ole Laursen <olau@hardworking.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -669,12 +669,12 @@ msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
 msgstr ""
 "Kunne ikke oprette kanal for kommunikering med opstartet gconfd-d�mon: %s\n"
 
-#: gconf/gconf-internals.c:3060
+#: gconf/gconf-internals.c:3064
 #, c-format
 msgid "Failed to launch configuration server: %s\n"
 msgstr "Kunne ikke opstarte konfigurationsserver: %s\n"
 
-#: gconf/gconf-internals.c:3084
+#: gconf/gconf-internals.c:3088
 msgid ""
 "Failed to contact configuration server (a likely cause of this is that you "
 "have an existing configuration server (gconfd) running, but it isn't "
@@ -686,46 +686,46 @@ msgstr ""
 "er logget ind fra to maskiner p� samme tid, skal du muligvis aktivere TCP-"
 "netv�rk for ORBit)\n"
 
-#: gconf/gconf-internals.c:3720
+#: gconf/gconf-internals.c:3724
 #, c-format
 msgid "Failed to read from child pipe (%s)"
 msgstr "Kunne ikke l�se fra b�rnekanal: %s"
 
-#: gconf/gconf-internals.c:3785
+#: gconf/gconf-internals.c:3789
 #, c-format
 msgid "Failed to fork (%s)"
 msgstr "Kunne ikke fork() (%s)"
 
-#: gconf/gconf-internals.c:3925
+#: gconf/gconf-internals.c:3929
 #, c-format
 msgid "Failed to change to directory '%s' (%s)"
 msgstr "Kunne ikke g� til katalog '%s' (%s)"
 
-#: gconf/gconf-internals.c:3935
+#: gconf/gconf-internals.c:3939
 #, c-format
 msgid "Failed to execute child process (%s)"
 msgstr "Kunne ikke udf�re barneproces (%s)"
 
-#: gconf/gconf-internals.c:3944
+#: gconf/gconf-internals.c:3948
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
 msgstr "Kunne ikke omdirigere uddata eller inddata for barneproces (%s)"
 
-#: gconf/gconf-internals.c:3953
+#: gconf/gconf-internals.c:3957
 #, c-format
 msgid "Failed to fork child process (%s)"
 msgstr "Kunne ikke oprette barneproces (%s)"
 
-#: gconf/gconf-internals.c:3961
+#: gconf/gconf-internals.c:3965
 msgid "Unknown error executing child process"
 msgstr "Ukendt fejl ved udf�rsel af barneproces"
 
-#: gconf/gconf-internals.c:3982
+#: gconf/gconf-internals.c:3986
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr "Kunne ikke l�se nok data fra kanal for barne-pid (%s)"
 
-#: gconf/gconf-internals.c:4032
+#: gconf/gconf-internals.c:4036
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr "Kunne ikke oprette kanal for kommunikation med barneproces (%s)"
diff --git a/po/de.po b/po/de.po
index b642fafe..ba7a4c71 100644
--- a/po/de.po
+++ b/po/de.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf 1.0.x\n"
-"POT-Creation-Date: 2002-01-09 22:22+0100\n"
+"POT-Creation-Date: 2002-02-04 18:21-0500\n"
 "PO-Revision-Date: 2002-01-06 20:14GMT\n"
 "Last-Translator: Manuel Borchers <webmaster@matronix.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -690,12 +690,12 @@ msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
 msgstr ""
 "Erzeugen der Pipe zur Kommunikation mit dem gconf-D�mon fehlgeschlagen:  %s\n"
 
-#: gconf/gconf-internals.c:3060
+#: gconf/gconf-internals.c:3064
 #, c-format
 msgid "Failed to launch configuration server: %s\n"
 msgstr "Konfigurationsserver konnte nicht gestartet werden: %s\n"
 
-#: gconf/gconf-internals.c:3084
+#: gconf/gconf-internals.c:3088
 msgid ""
 "Failed to contact configuration server (a likely cause of this is that you "
 "have an existing configuration server (gconfd) running, but it isn't "
@@ -707,46 +707,46 @@ msgstr ""
 "hier erreichbar ist - wenn Sie von zwei Maschinen angemeldet sind, m�ssen "
 "Sie ggf. TCP-networking f�r ORBit aktivieren)\n"
 
-#: gconf/gconf-internals.c:3720
+#: gconf/gconf-internals.c:3724
 #, c-format
 msgid "Failed to read from child pipe (%s)"
 msgstr "Lesen von Pipe des Kindprozesses fehlgeschlagen (%s)"
 
-#: gconf/gconf-internals.c:3785
+#: gconf/gconf-internals.c:3789
 #, c-format
 msgid "Failed to fork (%s)"
 msgstr "Abspalten fehlgeschlagen (%s)"
 
-#: gconf/gconf-internals.c:3925
+#: gconf/gconf-internals.c:3929
 #, c-format
 msgid "Failed to change to directory '%s' (%s)"
 msgstr "�ndern des Verzeichnisses '%s' fehlgeschlagen (%s)"
 
-#: gconf/gconf-internals.c:3935
+#: gconf/gconf-internals.c:3939
 #, c-format
 msgid "Failed to execute child process (%s)"
 msgstr "Ausf�hren des Kindprozesses fehlgeschlagen (%s)"
 
-#: gconf/gconf-internals.c:3944
+#: gconf/gconf-internals.c:3948
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
 msgstr "Umleiten der Aus- oder Eingabe des Kindprozesses fehlgeschlagen (%s)"
 
-#: gconf/gconf-internals.c:3953
+#: gconf/gconf-internals.c:3957
 #, c-format
 msgid "Failed to fork child process (%s)"
 msgstr "Abspalten des Kindprozesses fehlgeschlagen (%s)"
 
-#: gconf/gconf-internals.c:3961
+#: gconf/gconf-internals.c:3965
 msgid "Unknown error executing child process"
 msgstr "Unbekannter Fehler beim Ausf�hren des Kindprozesses"
 
-#: gconf/gconf-internals.c:3982
+#: gconf/gconf-internals.c:3986
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr "Nicht genug Daten von der Kind-PID-Pipe gelesen (%s)"
 
-#: gconf/gconf-internals.c:4032
+#: gconf/gconf-internals.c:4036
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr ""
diff --git a/po/el.po b/po/el.po
index e3741344..97048efa 100644
--- a/po/el.po
+++ b/po/el.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf 1.0.3\n"
-"POT-Creation-Date: 2001-09-02 00:17+0100\n"
+"POT-Creation-Date: 2002-02-04 18:21-0500\n"
 "PO-Revision-Date: 2001-09-02 00:27+0100\n"
 "Last-Translator: Simos Xenitellis <simos@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -41,7 +41,7 @@ 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
+#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1050
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "���������� ��������� ������� `%s': %s"
@@ -58,20 +58,20 @@ msgid "Unloading XML backend module."
 msgstr "������������ � ������ ����������� XML"
 
 # backends/xml-backend.c:300
-#: backends/xml-backend.c:286
+#: backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "������ ������� ��������� XML ������� ��� ��������� `%s'"
 
 # backends/xml-backend.c:400
-#: backends/xml-backend.c:386
+#: backends/xml-backend.c:414
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
 msgstr ""
 "������� � �������� � ������� ��� ������ �������� XML ��� ��������� `%s'"
 
 # backends/xml-backend.c:410
-#: backends/xml-backend.c:396
+#: backends/xml-backend.c:424
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
@@ -79,12 +79,12 @@ msgstr ""
 "�����: %o%o"
 
 # backends/xml-backend.c:694
-#: backends/xml-backend.c:680
+#: backends/xml-backend.c:708
 msgid "Initializing XML backend module"
 msgstr "�������������� � ������ ����������� XML"
 
 # backends/xml-backend.c:759
-#: backends/xml-backend.c:745
+#: backends/xml-backend.c:773
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "������� � �������� ����������� ���� �������� XML `%s': %s"
@@ -106,8 +106,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 �������� ��������� ���� ���������� ����� ���� ��� ��������� ��� "
 "�������������� ���������, ����������� ��� %u ������������"
@@ -161,36 +161,36 @@ msgstr "������� �������� ��� ������� ������� `%s': %s"
 
 # gconf/gconftool.c:1639
 #. These are all fatal errors
-#: backends/xml-dir.c:806
+#: backends/xml-dir.c:803
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "�������� ����������� ��� `%s': %s"
 
-#: backends/xml-dir.c:950
+#: backends/xml-dir.c:947
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "����� ������� `%s' ��� `%s', �������"
 
-#: backends/xml-dir.c:972
+#: backends/xml-dir.c:969
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "������� ����� ����� ��� ������ XML `%s', �������"
 
-#: backends/xml-dir.c:979
-#, c-format
-msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
+#: backends/xml-dir.c:977
+#, fuzzy, c-format
+msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
 msgstr ""
 "� ������ �������� ������� ��� ������ XML `%s' ��� ����� ��� <�������>, "
 "�������"
 
 # gconf/gconf-internals.c:2416
-#: backends/xml-dir.c:1067
+#: backends/xml-dir.c:1066
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "������� � ���������� ��� ������� `%s': %s"
 
 # gconf/gconf-internals.c:2416
-#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2494
+#: backends/xml-dir.c:1074
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "������� �� �������� ��� ������� `%s': %s"
@@ -202,12 +202,6 @@ msgstr "������� �� �������� ��� ������� `%s': %s"
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "������� ������ XML �� ����� `%s': %s"
 
-# gconf/gconf-internals.c:2120
-#: backends/xml-entry.c:200
-#, c-format
-msgid "%s"
-msgstr "%s"
-
 # gconf/gconfd.c:1745
 #: backends/xml-entry.c:327
 #, c-format
@@ -341,8 +335,7 @@ msgstr "������� ����� ���� ���� ������ �����������"
 # gconf/gconfd.c:519
 #: gconf/gconf-database.c:240
 #, c-format
-msgid ""
-"Couldn't make sense of CORBA value received in set request for key `%s'"
+msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 "�������� � ������������� ��� ����� CORBA ��� ������� ���� ������ ����������� "
 "��� �� ������ `%s"
@@ -400,7 +393,7 @@ msgstr ""
 "�������������): %s"
 
 # gconf/gconfd.c:1523
-#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1328
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "������ ���� �� ���� ����� ��� `%s': %s"
@@ -521,70 +514,97 @@ msgid "No database available to save your configuration"
 msgstr "��� ������� ��������� ���� ��������� ��� �� ������������ ��� ���������"
 
 # gconf/gconf-internals.c:100
-#: gconf/gconf-internals.c:87
+#: gconf/gconf-internals.c:114
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "��� ������� '/' ��� ������ `%s'"
 
+#: gconf/gconf-internals.c:227
+#, c-format
+msgid "Invalid UTF-8 in string value in '%s'"
+msgstr ""
+
 # gconf/gconf-internals.c:264
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:286
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "������� � ���������� ��� ����� CORBA ��� �� �������� ��� ������"
 
 # gconf/gconf-internals.c:266
-#: gconf/gconf-internals.c:253
+#: gconf/gconf-internals.c:288
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "����� ����� ��� �� �������� ��� ������ ��� %s"
 
 # gconf/gconf-internals.c:279
-#: gconf/gconf-internals.c:266
+#: gconf/gconf-internals.c:301
 msgid "Received list from gconfd with a bad list type"
 msgstr "������������ ����� ��� �� gconfd �� ���������� ���� ������"
 
 # gconf/gconfd.c:1194
-#: gconf/gconf-internals.c:447
+#: gconf/gconf-internals.c:482
 msgid "Failed to convert object to IOR"
 msgstr "�������� ���������� ������������ �� IOR"
 
+#: gconf/gconf-internals.c:619
+msgid "Invalid UTF-8 in locale for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:627
+msgid "Invalid UTF-8 in short description for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:635
+msgid "Invalid UTF-8 in long description for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:643
+msgid "Invalid UTF-8 in owner for schema"
+msgstr ""
+
 # gconf/gconf-internals.c:789
-#: gconf/gconf-internals.c:813
+#: gconf/gconf-internals.c:868
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "������� �� ������� ��� ������� ��������� `%s': %s\n"
 
 # gconf/gconf-internals.c:844
-#: gconf/gconf-internals.c:873
+#: gconf/gconf-internals.c:928
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "����������� ������� ������� `%s'\n"
 
 # gconf/gconf-internals.c:856
-#: gconf/gconf-internals.c:885
+#: gconf/gconf-internals.c:940
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "������ ��������� ��� ������ `%s': %s\n"
 
+#: gconf/gconf-internals.c:1271 gconf/gconf-internals.c:1337
+#: gconf/gconf-value.c:125 gconf/gconf-value.c:224 gconf/gconf-value.c:366
+#: gconf/gconf-value.c:1084
+msgid "Text contains invalid UTF-8"
+msgstr ""
+
 # gconf/gconf-internals.c:1282
-#: gconf/gconf-internals.c:1327
+#: gconf/gconf-internals.c:1422
 #, c-format
 msgid "Expected list, got %s"
 msgstr "���������� �����, ������� %s"
 
 # gconf/gconf-internals.c:1292
-#: gconf/gconf-internals.c:1337
+#: gconf/gconf-internals.c:1432
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "���������� ����� ��� %s, ������� ����� ��� %s"
 
 # gconf/gconf-internals.c:1431
-#: gconf/gconf-internals.c:1476
+#: gconf/gconf-internals.c:1571
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "���������� ������, ������� %s"
 
 # gconf/gconf-internals.c:1445
-#: gconf/gconf-internals.c:1490
+#: gconf/gconf-internals.c:1585
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
@@ -592,164 +612,229 @@ msgstr ""
 "�����"
 
 # gconf/gconf-internals.c:1461
-#: gconf/gconf-internals.c:1506
+#: gconf/gconf-internals.c:1601
 #, 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:1622
+#: gconf/gconf-internals.c:1717
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "�� ������������ ������������� ��� ������� �� ���������� ������"
 
 # gconf/gconf-internals.c:1639
-#: gconf/gconf-internals.c:1684
+#: gconf/gconf-internals.c:1779
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "�� ������������ ������������� ��� ��������� �� ���������� ������"
 
+#: gconf/gconf-internals.c:1915
+msgid "Encoded value is not valid UTF-8"
+msgstr ""
+
 # gconf/gconf-internals.c:2105 gconf/gconf.c:2607
-#: gconf/gconf-internals.c:2164 gconf/gconf.c:3092
+#: gconf/gconf-internals.c:2265 gconf/gconf.c:3082
 #, c-format
 msgid "CORBA error: %s"
 msgstr "������ CORBA: %s"
 
 # gconf/gconf-internals.c:2137
-#: gconf/gconf-internals.c:2180
+#: gconf/gconf-internals.c:2281
 #, c-format
 msgid "OAF problem description: '%s'"
 msgstr "��������� ����������� OAF: '%s'"
 
 # gconf/gconf-internals.c:2125
-#: gconf/gconf-internals.c:2186
+#: gconf/gconf-internals.c:2287
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "���������� ��������� �� ������������� ��������� ������������ OAF"
 
 # gconf/gconf-internals.c:2130
-#: gconf/gconf-internals.c:2191
+#: gconf/gconf-internals.c:2292
 msgid "attempt to add already-listed OAF directory"
 msgstr "���������� ��������� ��� ������������� ��������� OAF"
 
 # gconf/gconf-internals.c:2137
-#: gconf/gconf-internals.c:2198
+#: gconf/gconf-internals.c:2299
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "������ ����������� �������� OAF: %s"
 
 # gconf/gconf-internals.c:2142
-#: gconf/gconf-internals.c:2203
+#: gconf/gconf-internals.c:2304
 msgid "Unknown OAF error"
 msgstr "������� ������ OAF"
 
-# gconf/gconf-internals.c:2225
-#: gconf/gconf-internals.c:2290
-#, c-format
-msgid "No ior file in `%s'"
-msgstr "��� ������� ������ ior ��� `%s'"
-
-# gconf/gconf-internals.c:2256
-#: gconf/gconf-internals.c:2321
-#, c-format
-msgid "gconfd taking lock `%s' from some other process"
-msgstr "�� gconfd ������� �� �������� `%s' ��� ������ ���� ���������"
+# gconf/gconf-internals.c:789
+#: gconf/gconf-internals.c:2437
+#, fuzzy, c-format
+msgid "Could not lock temporary file '%s': %s"
+msgstr "������� �� ������� ��� ������� ��������� `%s': %s\n"
 
-# gconf/gconf-internals.c:2267
-#: gconf/gconf-internals.c:2332
+#: gconf/gconf-internals.c:2464
 #, c-format
-msgid "Another program has lock `%s'"
-msgstr "������ ���� ��������� ���� �� �������� `%s'"
+msgid "Could not create file '%s', probably because it already exists"
+msgstr ""
 
-# gconf/gconf-internals.c:2287
-#: gconf/gconf-internals.c:2351
-msgid "couldn't contact ORB to ping existing gconfd"
-msgstr "������� � ����� �� �� ORB ��� ��������� ���������� gconfd"
+# gconf/gconf-internals.c:2416
+#: gconf/gconf-internals.c:2510
+#, fuzzy, c-format
+msgid "Failed to create or open '%s'"
+msgstr "������� � ���������� ��� %s: %s"
 
-# gconf/gconf-internals.c:2295
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2520
 #, c-format
 msgid ""
-"Removing stale lock `%s' because IOR couldn't be converted to object "
-"reference, IOR `%s'"
+"Failed to lock '%s': probably another process has the lock, or your "
+"operating system has NFS file locking misconfigured (%s)"
 msgstr ""
-"���������� ����� �������� `%s' ������ �� IOR ��� �������� �� ���������� �� "
-"������� ������������, IOR `%s'"
 
-# gconf/gconf-internals.c:2307
-#: gconf/gconf-internals.c:2371
+#: gconf/gconf-internals.c:2548
 #, c-format
-msgid "Removing stale lock `%s' because of error pinging server: %s"
+msgid "IOR file '%s' not opened successfully, no gconfd located: %s"
 msgstr ""
-"���������� �� ����� �������� `%s' ���� ��������� ���������� ���������: %s"
 
-# gconf/gconf-internals.c:2319
-#: gconf/gconf-internals.c:2383
+#: gconf/gconf-internals.c:2578
 #, c-format
-msgid "GConf configuration daemon (gconfd) has lock `%s'"
-msgstr "� �������� ����������� GConf (gconfd) ���� �� �������� `%s'"
+msgid "gconftool or other non-gconfd process has the lock file '%s'"
+msgstr ""
+
+# gconf/gconf-internals.c:2287
+#: gconf/gconf-internals.c:2595
+#, fuzzy
+msgid "couldn't contact ORB to resolve existing gconfd object reference"
+msgstr "������� � ����� �� �� ORB ��� ��������� ���������� gconfd"
 
 # gconf/gconf-internals.c:2333
-#: gconf/gconf-internals.c:2397
+#: gconf/gconf-internals.c:2627
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "������� � ���������� ��������� `%s': %s"
 
-# gconf/gconf-internals.c:2368
-#: gconf/gconf-internals.c:2446
-#, c-format
-msgid "Can't create lock `%s': %s"
-msgstr "������� � ���������� ����������� `%s': %s"
-
 # gconf/gconf-internals.c:2404
-#: gconf/gconf-internals.c:2482
+#: gconf/gconf-internals.c:2686
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "������� � ������� ��� ������ `%s': %s"
 
-# gconf/gconf-internals.c:2447
-#: gconf/gconf-internals.c:2532
+#: gconf/gconf-internals.c:2727
 #, c-format
-msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
+msgid "We didn't have the lock on file `%s', but we should have"
 msgstr ""
-"������� �� ������� ��� ������� ����������� `%s'� ���������� ��� ��� ����� "
-"���� ���: %s"
 
-# gconf/gconf-internals.c:2464
-#: gconf/gconf-internals.c:2549
+# gconf/gconftool.c:1639
+#: gconf/gconf-internals.c:2748
+#, fuzzy, c-format
+msgid "Failed to link '%s' to '%s': %s"
+msgstr "�������� ������������ ��� `%s' �� `%s': %s"
+
+# gconf/gconf-internals.c:2416
+#: gconf/gconf-internals.c:2760
+#, fuzzy, c-format
+msgid "Failed to remove lock file `%s': %s"
+msgstr "������� � ���������� ��� ������� `%s': %s"
+
+# gconf/gconf-internals.c:2416
+#: gconf/gconf-internals.c:2779
+#, fuzzy, c-format
+msgid "Failed to clean up file '%s': %s"
+msgstr "������� �� �������� ��� ������� `%s': %s"
+
+# gconf/gconf-internals.c:2491
+#: gconf/gconf-internals.c:2793
+#, fuzzy, c-format
+msgid "Failed to remove lock directory `%s': %s"
+msgstr "������� � ����������� ����������� ��������� `%s': %s"
+
+# gconf/gconf-internals.c:2416
+#: gconf/gconf-internals.c:3003 gconf/gconfd.c:580
 #, c-format
-msgid "Corrupt lock file `%s', removing anyway"
-msgstr "�������� ������ ����������� `%s', ���������� ����� � �����"
+msgid "Failed to create %s: %s"
+msgstr "������� � ���������� ��� %s: %s"
 
-# gconf/gconf-internals.c:2474
-#: gconf/gconf-internals.c:2559
+#: gconf/gconf-internals.c:3036
 #, c-format
+msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
+msgstr ""
+
+# gconf/gconftool.c:510
+#: gconf/gconf-internals.c:3064
+#, fuzzy, c-format
+msgid "Failed to launch configuration server: %s\n"
+msgstr "�������� ��������� ����(��) ����(��) �����������: %s\n"
+
+#: gconf/gconf-internals.c:3088
 msgid ""
-"Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
-"took our lock"
+"Failed to contact configuration server (a likely cause of this is that you "
+"have an existing configuration server (gconfd) running, but it isn't "
+"reachable from here - if you're logged in from two machines at once, you may "
+"need to enable TCP networking for ORBit)\n"
 msgstr ""
-"��� ������������� ������ ����������� `%s' (���������� pid %u, ���� ��� pid "
-"%u� ���������� ��� ������� ���� �� �������� ���"
 
 # gconf/gconf-internals.c:2491
-#: gconf/gconf-internals.c:2576
-#, c-format
-msgid "Failed to release lock directory `%s': %s"
+#: gconf/gconf-internals.c:3724
+#, fuzzy, c-format
+msgid "Failed to read from child pipe (%s)"
+msgstr "������� � ����������� ������� �����������: %s"
+
+# gconf/gconf-internals.c:2416
+#: gconf/gconf-internals.c:3789
+#, fuzzy, c-format
+msgid "Failed to fork (%s)"
+msgstr "������� � ���������� ��� %s: %s"
+
+# gconf/gconf-internals.c:2491
+#: gconf/gconf-internals.c:3929
+#, fuzzy, c-format
+msgid "Failed to change to directory '%s' (%s)"
 msgstr "������� � ����������� ����������� ��������� `%s': %s"
 
 # gconf/gconf-internals.c:2416
+#: gconf/gconf-internals.c:3939
+#, fuzzy, c-format
+msgid "Failed to execute child process (%s)"
+msgstr "������� �������� ��� ������� ������� `%s': %s"
+
+#: gconf/gconf-internals.c:3948
+#, c-format
+msgid "Failed to redirect output or input of child process (%s)"
+msgstr ""
+
+# gconf/gconf-internals.c:2416
+#: gconf/gconf-internals.c:3957
+#, fuzzy, c-format
+msgid "Failed to fork child process (%s)"
+msgstr "������� � ������� ��� ����� `%s': %s"
+
+#: gconf/gconf-internals.c:3965
+msgid "Unknown error executing child process"
+msgstr ""
+
+#: gconf/gconf-internals.c:3986
+#, c-format
+msgid "Failed to read enough data from child pid pipe (%s)"
+msgstr ""
+
+#: gconf/gconf-internals.c:4036
+#, c-format
+msgid "Failed to create pipe for communicating with child process (%s)"
+msgstr ""
+
+# gconf/gconf-internals.c:2416
 #: gconf/gconf-sources.c:320
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "������� � ������� ��� ����� `%s': %s"
 
-#: gconf/gconf-sources.c:510
+#: gconf/gconf-sources.c:544
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr "�� ����� `%s' ��� �������� ��� �� `%s' ���������� ���� ��-��������"
 
-#: gconf/gconf-sources.c:567
+#: gconf/gconf-sources.c:601
 msgid "The '/' name can only be a directory, not a key"
 msgstr "�� ����� '/' ������ �� ����� ���� ���������, ��� ������"
 
-#: gconf/gconf-sources.c:596
+#: gconf/gconf-sources.c:630
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -758,22 +843,24 @@ msgstr ""
 "� ���� ��� �� `%s' ���� ������� �� ���� ���� ��� �������� ���� ���� ��� "
 "���������� ���������."
 
-#: gconf/gconf-sources.c:608
-#, c-format
+#: gconf/gconf-sources.c:642
+#, 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."
+"somehow we mistakenly created two gconfd processes. If you have two gconfd "
+"processes (or had two at the time the second was launched), logging out, "
+"killing all copies of gconfd, and logging back in may help. Perhaps the "
+"problem is that you attempted to use GConf from two machines at once, and "
+"ORBit still has its default configuration that prevents remote CORBA "
+"connections? As always, check the user.* syslog for details on problems "
+"gconfd encountered."
 msgstr ""
 "������� � ���������� ����� ��� ������ '%s' ����� � ������������ ��������� �� "
 "������� ���������� ������. �������� ��� ������� ������ ��� ���� �� ��������: "
-"1) � �������� ������� ��������� ��� ������������ ����� ���� � �� ������� � 2) "
-"�� OAF ���� ����� ����������� ��� ����������� gconfd. �� ����� ��� "
+"1) � �������� ������� ��������� ��� ������������ ����� ���� � �� ������� � "
+"2) �� OAF ���� ����� ����������� ��� ����������� gconfd. �� ����� ��� "
 "����������� gconfg (� ������ ��� �� ������ ��������� ��� ��������), ���� "
 "����� ������ ���������� ��� OAF ��� ��� �������� ��� GConf. � ������ ��� �� "
 "�������, � ����������� ��� ���������� oafd ��� gconfd ��� � ������� ���� ��� "
@@ -782,82 +869,82 @@ msgstr ""
 "���������."
 
 # gconf/gconftool.c:1181
-#: gconf/gconf-sources.c:1164
+#: gconf/gconf-sources.c:1198
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "������ ���� ������ ���������������: %s"
 
 # gconf/gconftool.c:964 gconf/gconftool.c:1070
-#: gconf/gconf-sources.c:1233
+#: gconf/gconf-sources.c:1267
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "������ ���� ���� ���������������: %s"
 
-#: gconf/gconf-sources.c:1257
+#: gconf/gconf-sources.c:1291
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
 "�� ������ `%s' ������������ �� ����� ��� �� ������ `%s' ���� �������������� "
 "���������� �� ����� `%s'"
 
-#: gconf/gconf-value.c:82
+#: gconf/gconf-value.c:81
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "��� ����� ��������� �� `%s' (���������� ��������)"
 
-#: gconf/gconf-value.c:92
+#: gconf/gconf-value.c:91
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "� �������� `%s' ����� ���� ���� ������� ���� ���� ������"
 
-#: gconf/gconf-value.c:113
+#: gconf/gconf-value.c:112
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "��� ����� ��������� �� `%s' (���������� ����������� �������)"
 
-#: gconf/gconf-value.c:146
+#: gconf/gconf-value.c:156
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "��� ����� ��������� �� `%s' (���������� ������ � ������)"
 
-#: gconf/gconf-value.c:214
+#: gconf/gconf-value.c:232
 #, c-format
 msgid "Didn't understand `%s' (list must start with a '[')"
 msgstr "��� ����� ��������� �� `%s' (�� ������ ������ �� �������� �� '[')"
 
-#: gconf/gconf-value.c:227
+#: gconf/gconf-value.c:245
 #, c-format
 msgid "Didn't understand `%s' (list must end with a ']')"
 msgstr "��� ����� ��������� �� `%s' (�� ������ ������ �� ����������� �� ']')"
 
-#: gconf/gconf-value.c:278
+#: gconf/gconf-value.c:296
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
 msgstr ""
 "��� ����� ��������� �� `%s' (������� �������� ']' ����� ��������� �������� "
 "���� ��� �����)"
 
-#: gconf/gconf-value.c:309 gconf/gconf-value.c:462
+#: gconf/gconf-value.c:327 gconf/gconf-value.c:488
 #, c-format
 msgid "Didn't understand `%s' (extra trailing characters)"
 msgstr "��� ����� ��������� �� `%s' (���������� �������� ����������)"
 
-#: gconf/gconf-value.c:348
+#: gconf/gconf-value.c:374
 #, c-format
 msgid "Didn't understand `%s' (pair must start with a '(')"
 msgstr "��� ����� ��������� �� `%s' (�� ������ ������ �� ������ �� '(')"
 
-#: gconf/gconf-value.c:361
+#: gconf/gconf-value.c:387
 #, c-format
 msgid "Didn't understand `%s' (pair must end with a ')')"
 msgstr "��� ����� ��������� �� `%s' (�� ������ ������ �� ���������� �� ')')"
 
-#: gconf/gconf-value.c:391 gconf/gconf-value.c:477
+#: gconf/gconf-value.c:417 gconf/gconf-value.c:503
 #, c-format
 msgid "Didn't understand `%s' (wrong number of elements)"
 msgstr "��� ����� ��������� �� `%s' (���������� ������� ���������)"
 
-#: gconf/gconf-value.c:431
+#: gconf/gconf-value.c:457
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr ""
@@ -871,113 +958,97 @@ msgid "`%s': %s"
 msgstr "`%s': %s"
 
 # gconf/gconf.c:261
-#: gconf/gconf.c:289
+#: gconf/gconf.c:287
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "� ���������� ��� ������� �� �������� �� ��������� `%s'"
 
 # gconf/gconf.c:391
-#: gconf/gconf.c:574
+#: gconf/gconf.c:572
 msgid "Can't add notifications to a local configuration source"
 msgstr "������� � �������� ������������ �� ��� ������ ������ �����������"
 
 # gconf/gconf.c:1449
-#: gconf/gconf.c:1870
+#: gconf/gconf.c:1868
 #, c-format
 msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr ""
 "� �������� ��� ������ ��� ����� ��� ����������� �������, ������ CORBA: %s"
 
-#: 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. "
-"This is a bug in the OAF package; something went wrong in OAF, and no error "
-"was reported. This is not a bug in the GConf package. Do not report a GConf "
-"bug unless you have information indicating what went wrong with OAF that was "
-"caused by GConf."
-msgstr ""
-"������ ���� ����������� �� ��� ����������� ���������: �� OAF ��������� ����� "
-"��� �� oaf_activate_from_id() ��� ��� ����� ��� �������� ��������� �� "
-"��������. ���� ����� ��� ������ ��� ������ OAF, ������� ���� ����� ��� OAF "
-"��� ��� ���������� ������. ���� ��� ����� ������ ��� ������ GConf. ��� �� "
-"��������� �� ������ ��� GConf ����� �� ����� ����������� ��� �������� ��� �� "
-"������ ������� ��� �� GConf."
-
 # gconf-editor/gconf-editor.c:69 gconf/gconftool.c:447
-#: gconf/gconf.c:2198
+#: gconf/gconf.c:2183
 msgid "Failed to init GConf, exiting\n"
 msgstr "�������� ������������� GConf, �����������\n"
 
 # gconf/gconf.c:1689
-#: gconf/gconf.c:2235
+#: gconf/gconf.c:2220
 msgid "Must begin with a slash (/)"
 msgstr "������ �� ������� �� ��� ������ (/)"
 
 # gconf/gconf.c:1711
-#: gconf/gconf.c:2257
+#: gconf/gconf.c:2242
 msgid "Can't have two slashes (/) in a row"
 msgstr "�� ������� �� �������� ��� ������� (/) ��� �����"
 
 # gconf/gconf.c:1713
-#: gconf/gconf.c:2259
+#: gconf/gconf.c:2244
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "�� ������� �� ������� ��� ������ (.) ������ ���� ��� ��� ������ (/)"
 
 # gconf/gconf.c:1734
-#: gconf/gconf.c:2280
+#: gconf/gconf.c:2265
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "`%c' ��� ����� ������� ���������� �� ������� ��������/���������"
 
 # gconf/gconf.c:1748
-#: gconf/gconf.c:2294
+#: gconf/gconf.c:2279
 msgid "Key/directory may not end with a slash (/)"
 msgstr "�� ������/��������� ��� ������ �� ��������� �� ������ (/)"
 
 # gconf/gconf.c:2079
-#: gconf/gconf.c:2547
+#: gconf/gconf.c:2520
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "������� �� �������� ��� ��������� �����������: %s"
 
 # gconf/gconf.c:2140
-#: gconf/gconf.c:2608
+#: gconf/gconf.c:2581
 #, c-format
 msgid "Expected float, got %s"
 msgstr "���������� ������� ������� ������������, ������� %s"
 
 # gconf/gconf.c:2175
-#: gconf/gconf.c:2643
+#: gconf/gconf.c:2616
 #, c-format
 msgid "Expected int, got %s"
 msgstr "���������� ��������, ������� %s"
 
 # gconf/gconf.c:2210
-#: gconf/gconf.c:2678
+#: gconf/gconf.c:2651
 #, c-format
 msgid "Expected string, got %s"
 msgstr "���������� �������������, ������� %s"
 
 # gconf/gconf.c:2247
-#: gconf/gconf.c:2715
+#: gconf/gconf.c:2688
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "���������� ������� ����, ������� %s"
 
 # gconf/gconf.c:2280
-#: gconf/gconf.c:2748
+#: gconf/gconf.c:2721
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "���������� �����, ������� %s"
 
 # gconf/gconfd.c:789
-#: gconf/gconfd.c:248
+#: gconf/gconfd.c:247
 msgid "Shutdown request received"
 msgstr "������� ������ �����������"
 
 # gconf/gconfd.c:861
-#: gconf/gconfd.c:280
+#: gconf/gconfd.c:279
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -986,7 +1057,7 @@ msgstr ""
 "�������� �� gconf.path ��� ��� ������ ��������"
 
 # gconf/gconfd.c:879
-#: gconf/gconfd.c:298
+#: gconf/gconfd.c:297
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -995,7 +1066,7 @@ msgstr ""
 "����������� `%s'"
 
 # gconf/gconfd.c:888
-#: gconf/gconfd.c:307
+#: gconf/gconfd.c:306
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -1003,23 +1074,27 @@ msgstr ""
 "��� �������� ������� ������������ ���� ������ ��������, � ���������� �� �� "
 "����������߷ ����������� "
 
+#: gconf/gconfd.c:306
+msgid "/path"
+msgstr ""
+
 # gconf/gconfd.c:901
-#: gconf/gconfd.c:321
+#: gconf/gconfd.c:320
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "������ ���� �� ������� ������� ������� ������������: %s"
 
 # gconf/gconfd.c:913
-#: gconf/gconfd.c:333
+#: gconf/gconfd.c:332
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
 msgstr ""
-"��� ���������� �������� ������� �����������, ������� � ������� � � ���������� "
-"��������� �����������"
+"��� ���������� �������� ������� �����������, ������� � ������� � � "
+"���������� ��������� �����������"
 
 # gconf/gconfd.c:930
-#: gconf/gconfd.c:350
+#: gconf/gconfd.c:349
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -1028,7 +1103,7 @@ msgstr ""
 "�� ������������ ������� ������� �����������"
 
 # gconf/gconfd.c:955 gconf/gconfd.c:967
-#: gconf/gconfd.c:376
+#: gconf/gconfd.c:375
 #, c-format
 msgid "Received signal %d, dumping core. Please report a GConf bug."
 msgstr ""
@@ -1036,14 +1111,14 @@ msgstr ""
 "GConf."
 
 # gconf/gconfd.c:955 gconf/gconfd.c:967
-#: gconf/gconfd.c:392
+#: gconf/gconfd.c:391
 #, 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:409
+#: gconf/gconfd.c:408
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "������� ���� %d, ����� ��������"
@@ -1051,112 +1126,50 @@ 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:513
+#: gconf/gconfd.c:526
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "���������� (������ %s), ����. �����. %u ������� `%s'"
 
-# gconf/gconfd.c:1036
-#: gconf/gconfd.c:540
-msgid ""
-"Failed to init Object Activation Framework: please mail bug report to OAF "
-"maintainers"
-msgstr ""
-"������� � ������������ ��� �������� ������������� ������������: �������� "
-"�������� ������� ����������� ����� ���������� ��� ��� (OAF)"
-
 # gconf/gconfd.c:1056
-#: gconf/gconfd.c:560
+#: gconf/gconfd.c:567
 msgid "Failed to get object reference for ConfigServer"
 msgstr "������� � ���� �������� ������������ ��� ��� ��������� �����������"
 
-# gconf/gconf-internals.c:2416
-#: gconf/gconfd.c:573
+#: gconf/gconfd.c:605
 #, c-format
-msgid "Failed to create %s: %s"
-msgstr "������� � ���������� ��� %s: %s"
+msgid "Failed to write byte to pipe fd %d so client program may hang: %s"
+msgstr ""
 
 # gconf/gconftool.c:881
-#. Bad hack alert - register the current lockholder with oafd,
-#. * since oafd seems to have forgotten about us.
-#.
-#: gconf/gconfd.c:588
-#, c-format
-msgid "Failed to get lock for daemon: %s"
+#: gconf/gconfd.c:615
+#, fuzzy, c-format
+msgid "Failed to get lock for daemon, exiting: %s"
 msgstr "�������� ����� ����������� ��� ��� ��������: %s"
 
-#: gconf/gconfd.c:594
-msgid ""
-"Registering existing server with oafd, since OAF appears to have leaked it"
-msgstr ""
-"������ ��� ���������� ����������� �� ��� oafd, ����� �� oafd ������� �� �� "
-"���������"
-
-# gconf/gconfd.c:1075
-#: gconf/gconfd.c:603
-msgid ""
-"OAF doesn't know about our IID; indicates broken installation; can't register "
-"existing server."
-msgstr ""
-"�� ��� (OAF) �� �������� ���� ��� IID ���, ���������� ���� �����������, �� "
-"������ �� ����������� � ������� ������������."
-
-# gconf/gconfd.c:1079
-#: gconf/gconfd.c:607
-msgid ""
-"Another gconfd already registered with OAF, so we can't register the existing "
-"server"
-msgstr ""
-"��� ���� gconfd ����� ��� ������������ ��� ��� (OAF)� ����� �� �������� �� "
-"������������� ��� ������� �����������"
-
-# gconf/gconfd.c:1084
-#: gconf/gconfd.c:612
-msgid "Unknown error registering existing gconfd with OAF; exiting"
-msgstr "������� ������ ����������� ���������� gconfd ��� ��� (OAF)� ��������"
-
-# gconf/gconfd.c:1075
-#: gconf/gconfd.c:639
-msgid ""
-"OAF 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:643
-msgid "Another gconfd already registered with OAF; exiting\n"
-msgstr "��� ���� gconfd ����� ��� ������������ ��� ��� (OAF)� ��������\n"
-
-# gconf/gconfd.c:1084
-#: gconf/gconfd.c:648
-msgid "Unknown error registering gconfd with OAF; exiting\n"
-msgstr "������� ����� ����������� ��� gconfd ��� ��� (OAF)� ��������\n"
-
 # gconf/gconf-internals.c:2491
-#: gconf/gconfd.c:692
-#, c-format
-msgid "Failed to release lockfile: %s"
+#: gconf/gconfd.c:657
+#, fuzzy, c-format
+msgid "Error releasing lockfile: %s"
 msgstr "������� � ����������� ������� �����������: %s"
 
 # gconf/gconfd.c:1100
-#: gconf/gconfd.c:700
+#: gconf/gconfd.c:665
 msgid "Exiting"
 msgstr "��������"
 
 # gconf/gconfd.c:955 gconf/gconfd.c:967
-#: gconf/gconfd.c:725
+#: gconf/gconfd.c:690
 msgid "GConf server is not in use, shutting down."
 msgstr "� ������������ GConf ��� ����� �� �����, �����������."
 
 # gconf/gconfd.c:2115
-#: gconf/gconfd.c:1084
+#: gconf/gconfd.c:1059
 #, c-format
 msgid "Returning exception: %s"
 msgstr "������������ ��������: %s"
 
-#: gconf/gconfd.c:1184
+#: gconf/gconfd.c:1159
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -1165,7 +1178,7 @@ msgstr ""
 "�������� ���������� ��� ������� ���������� ��� gconfd. ��� �� ����� ������� "
 "�� �������������� �� �������� ���� ��� ������������ ��� gconfd (%s)"
 
-#: gconf/gconfd.c:1219
+#: gconf/gconfd.c:1194
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
@@ -1174,41 +1187,41 @@ msgstr ""
 "������ �� ��� ����� ����������� ����� (%s)"
 
 # gconf/gconf-internals.c:789
-#: gconf/gconfd.c:1288
+#: gconf/gconfd.c:1263
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr ""
 "������� �� ������� ������������� ������� ���������� `%s' ��� �������: %s"
 
 # gconf/gconf-internals.c:2404
-#: gconf/gconfd.c:1302
+#: gconf/gconfd.c:1277
 #, 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:1311
+#: gconf/gconfd.c:1286
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "�������� ����������� ���� ������������� ������� ���������� `%s': %s"
 
 # gconf/gconf-internals.c:789
-#: gconf/gconfd.c:1325
+#: gconf/gconfd.c:1300
 #, 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:1335
+#: gconf/gconfd.c:1310
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "������� � �������� ���� ������������� ������� ���������� ��� ����: %s"
 
-#: gconf/gconfd.c:1344
+#: gconf/gconfd.c:1319
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
@@ -1216,74 +1229,74 @@ msgstr ""
 "�������� ������������� ��� ������� ������������� ������� ���������� ��� "
 "������������ ��� '%s': %s"
 
-#: gconf/gconfd.c:1819
+#: gconf/gconfd.c:1794
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr ""
-"�������� ������������� ������� ��� ��������� '%s', ������� � ������������ ��� "
-"����� ���������"
+"�������� ������������� ������� ��� ��������� '%s', ������� � ������������ "
+"��� ����� ���������"
 
 # gconf/gconfd.c:1676
-#: gconf/gconfd.c:1865
+#: gconf/gconfd.c:1840
 #, c-format
 msgid "Error reading saved state file: %s"
 msgstr "������ ��������� ������������� ������� ����������: %s"
 
 # gconf/gconf-internals.c:2416
-#: gconf/gconfd.c:1918
+#: gconf/gconfd.c:1893
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "������� �� ������� ������� ������������� ���������� `%s': %s"
 
-#: gconf/gconfd.c:2035
+#: gconf/gconfd.c:2010
 #, 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 ""
 "�������� ���������� ��� ��������� ������� ��� ������ ���������� ��� gconfd. "
 "�� �� ����� ������ �� �������������� � �������� �� �� gconfd ���������� � "
 "����������� (%s)"
 
-#: gconf/gconfd.c:2040
+#: gconf/gconfd.c:2015
 #, 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 ""
 "�������� ���������� ��� ��������� ������� ��� ������ ���������� ��� gconfd. "
 "����� ������ �� �������������� � �������� ���� ����� �� �� gconfd ���������� "
 "� ����������� (%s)"
 
 # gconf/gconftool.c:881
-#: gconf/gconfd.c:2063 gconf/gconfd.c:2228
+#: gconf/gconfd.c:2038 gconf/gconfd.c:2203
 #, c-format
 msgid "Failed to get IOR for client: %s"
 msgstr "�������� ����� IOR ��� �� ������: %s"
 
 # gconf/gconf-internals.c:2416
-#: gconf/gconfd.c:2078
+#: gconf/gconfd.c:2053
 #, c-format
 msgid "Failed to open saved state file: %s"
 msgstr "�������� ���������� ������� ������������� ����������: %s"
 
 # gconf/gconf-internals.c:2416
-#: gconf/gconfd.c:2091
+#: gconf/gconfd.c:2066
 #, c-format
 msgid "Failed to write client add to saved state file: %s"
 msgstr ""
 "�������� �������� ��������� ������ ��� ������ �������������� ����������: %s"
 
 # gconf/gconf-internals.c:2416
-#: gconf/gconfd.c:2099
+#: gconf/gconfd.c:2074
 #, c-format
 msgid "Failed to flush client add to saved state file: %s"
 msgstr ""
-"�������� ����������� ��������� ������ ��� ������ �������������� ����������: "
-"%s"
+"�������� ����������� ��������� ������ ��� ������ �������������� ����������: %"
+"s"
 
-#: gconf/gconfd.c:2189
+#: gconf/gconfd.c:2164
 msgid ""
 "Some client removed itself from the GConf server when it hadn't been added."
 msgstr ""
@@ -1307,8 +1320,8 @@ msgstr "�������� ��� ����� ���� �������� ���� ��������  �����"
 # gconf/gconftool.c:100
 #: gconf/gconftool.c:95
 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."
@@ -1379,8 +1392,8 @@ msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
-"���������� ��� ����� ��� ����� ��� ������ ��� ���������� � ��� ���� ��� ����� "
-"��� ���������� ��� �����. ������������ ������������ ����� �������."
+"���������� ��� ����� ��� ����� ��� ������ ��� ���������� � ��� ���� ��� "
+"����� ��� ���������� ��� �����. ������������ ������������ ����� �������."
 
 # gconf/gconftool.c:183
 #: gconf/gconftool.c:187 gconf/gconftool.c:196 gconf/gconftool.c:205
@@ -1503,11 +1516,10 @@ msgid "Get the name of the schema applied to this key"
 msgstr "���� ��� �������� ��� �������� ��� ����������� ��� ������"
 
 #: gconf/gconftool.c:321
-msgid ""
-"Specify the schema name followed by the key to apply the schema name to"
+msgid "Specify the schema name followed by the key to apply the schema name to"
 msgstr ""
-"���������� ��� �������� �������� �������������� ��� �������� ��� ��� �������� "
-"��� �������� �������"
+"���������� ��� �������� �������� �������������� ��� �������� ��� ��� "
+"�������� ��� �������� �������"
 
 #: gconf/gconftool.c:330
 msgid "Get the name of the default source"
@@ -1547,17 +1559,17 @@ msgstr "������� � ����� ��� --all-dirs �� ��� --get � --set\n"
 # gconf/gconftool.c:355
 #: gconf/gconftool.c:427
 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 �� �� ������ �� ��������������� �� ��� --get, "
-"--set, --unset, --all-entries � --all-dirs\n"
+"� ������� --recursive-list �� �� ������ �� ��������������� �� ��� --get, --"
+"set, --unset, --all-entries � --all-dirs\n"
 
 # gconf/gconftool.c:365
 #: gconf/gconftool.c:437
 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 �� �� ������ �� ��������������� �� ��� --get, --set, "
 "--all-entries � --all-dirs\n"
@@ -1590,7 +1602,8 @@ msgstr "� ������� --install-schema-file ������ �� ��������������� ���� ���.\n"
 # gconf/gconftool.c:414
 #: gconf/gconftool.c:490
 msgid "--makefile-install-rule must be used by itself.\n"
-msgstr "� ������� --makefile-install-rule ������ �� ��������������� ���� ���.\n"
+msgstr ""
+"� ������� --makefile-install-rule ������ �� ��������������� ���� ���.\n"
 
 # gconf/gconftool.c:424
 #: gconf/gconftool.c:501
@@ -1610,314 +1623,302 @@ msgstr ""
 "������ �� ���������� ��� ���� ����������� �� ��� --config-source ���� "
 "�������������� ��� --direct\n"
 
-# gconf-editor/gconf-editor.c:69 gconf/gconftool.c:447
 #: gconf/gconftool.c:525
+msgid "You should use --direct when using a non-default configuration source\n"
+msgstr ""
+
+# gconf-editor/gconf-editor.c:69 gconf/gconftool.c:447
+#: gconf/gconftool.c:531
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "�������� ������������� GConf: %s\n"
 
 # gconf/gconftool.c:472
-#: gconf/gconftool.c:550
+#: gconf/gconftool.c:566
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "������ �� ����� � ��������� ������������� GCONF_CONFIG_SOURCE\n"
 
-# gconf/gconftool.c:488
-#. 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
-msgid ""
-"Shouldn't run gconfd while installing new schema files.\n"
-"Use gconftool --shutdown to shut down the daemon, most safely while no "
-"applications are running\n"
-"(though things theoretically work if apps are running).\n"
-msgstr ""
-"�� �� ������ �� ���������� �� gconfd ���� ������������� ��� ������ ��������.\n"
-"��������������� �� gconftool --shutdown ��� �� �������� �� �������, "
-"����������� ���� ��� ����������� ���������\n"
-"(�� ��� ��������� �� ������ �� �������� �� ����������� ���������).\n"
-
 # gconf/gconftool.c:510
-#: gconf/gconftool.c:587
+#: gconf/gconftool.c:595
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "�������� ��������� ����(��) ����(��) �����������: %s\n"
 
 # gconf/gconftool.c:670
-#: gconf/gconftool.c:798
+#: gconf/gconftool.c:796
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "������ �����������: %s\n"
 
 # gconf/gconftool.c:715
-#: gconf/gconftool.c:841
+#: gconf/gconftool.c:839
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 "������ �� ���������� ���� � ������������ ��������� ��� ���������� "
 "����������.\n"
 
 # gconf/gconftool.c:749
-#: gconf/gconftool.c:875
+#: gconf/gconftool.c:873
 #, c-format
 msgid "Failure listing entries in `%s': %s\n"
 msgstr "�������� ����������� ������ ��� `%s': %s\n"
 
 # gconf/gconftool.c:767
-#: gconf/gconftool.c:893
+#: gconf/gconftool.c:891
 msgid "(no value set)"
 msgstr "(��� ���� ����� ����)"
 
 # gconf/gconftool.c:820
-#: gconf/gconftool.c:948
+#: gconf/gconftool.c:946
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "�������� ��������������� ��������� �����������: %s\n"
 
 # gconf/gconftool.c:834
-#: gconf/gconftool.c:962
+#: gconf/gconftool.c:960
 msgid "Must specify a key or keys to get\n"
 msgstr "������ �� ���������� ��� ������ � ������� ��� ����\n"
 
 # gconf/gconftool.c:865
-#: gconf/gconftool.c:997
+#: gconf/gconftool.c:995
 #, c-format
 msgid "Type: %s\n"
 msgstr "�����: %s\n"
 
 # gconf/gconftool.c:865
-#: gconf/gconftool.c:998
+#: gconf/gconftool.c:996
 #, c-format
 msgid "List Type: %s\n"
 msgstr "����� ������: %s\n"
 
 # gconf/gconftool.c:865
-#: gconf/gconftool.c:999
+#: gconf/gconftool.c:997
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "����� Car: %s\n"
 
 # gconf/gconftool.c:865
-#: gconf/gconftool.c:1000
+#: gconf/gconftool.c:998
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "����� Cdr: %s\n"
 
-#: gconf/gconftool.c:1005
+#: gconf/gconftool.c:1003
 #, c-format
 msgid "Default Value: %s\n"
 msgstr "��' ������� ����: %s\n"
 
 # gconf/gconftool.c:866 gconf/gconftool.c:867 gconf/gconftool.c:868
-#: gconf/gconftool.c:1005 gconf/gconftool.c:1007 gconf/gconftool.c:1008
-#: gconf/gconftool.c:1009
+#: gconf/gconftool.c:1003 gconf/gconftool.c:1005 gconf/gconftool.c:1006
+#: gconf/gconftool.c:1007
 msgid "Unset"
 msgstr "��������"
 
 # gconf/gconftool.c:866
-#: gconf/gconftool.c:1007
+#: gconf/gconftool.c:1005
 #, c-format
 msgid "Owner: %s\n"
 msgstr "����������: %s\n"
 
 # gconf/gconftool.c:867
-#: gconf/gconftool.c:1008
+#: gconf/gconftool.c:1006
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "������� ���������: %s\n"
 
 # gconf/gconftool.c:868
-#: gconf/gconftool.c:1009
+#: gconf/gconftool.c:1007
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "����� ���������: %s\n"
 
 # gconf/gconftool.c:877
-#: gconf/gconftool.c:1018 gconf/gconftool.c:1312
+#: gconf/gconftool.c:1016 gconf/gconftool.c:1310
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "��� ���� ����� ���� ��� `%s'\n"
 
 # gconf/gconftool.c:881
-#: gconf/gconftool.c:1022 gconf/gconftool.c:1316
+#: gconf/gconftool.c:1020 gconf/gconftool.c:1314
 #, 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:1065 gconf/gconftool.c:1077
+#: gconf/gconftool.c:1063 gconf/gconftool.c:1075
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "��� ����� ���������� � ����� `%s'\n"
 
 # gconf/gconftool.c:900
-#: gconf/gconftool.c:1089
+#: gconf/gconftool.c:1087
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "������ �� ����������� ������������� �������/����� �� ��������\n"
 
 # gconf/gconftool.c:917
-#: gconf/gconftool.c:1109
+#: gconf/gconftool.c:1107
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "��� ���� ����� ���� ��� �� ������: `%s'\n"
 
-#: gconf/gconftool.c:1137
+#: gconf/gconftool.c:1135
 msgid "Cannot set schema as value\n"
 msgstr "�������� � ������� �������� �� ����\n"
 
-#: gconf/gconftool.c:1147
+#: gconf/gconftool.c:1145
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr "���� ������� ����� ������ �� ���������� ��� �� ����� ���\n"
 
-#: gconf/gconftool.c:1161
+#: gconf/gconftool.c:1159
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr "���� ������� ������ ������ �� ���������� �� ���� ��� car ��� cdr\n"
 
 # gconf/gconftool.c:951
-#: gconf/gconftool.c:1176
+#: gconf/gconftool.c:1174
 #, c-format
 msgid "Error: %s\n"
 msgstr "������: %s\n"
 
 # gconf/gconftool.c:964 gconf/gconftool.c:1070
-#: gconf/gconftool.c:1189
+#: gconf/gconftool.c:1187
 #, c-format
 msgid "Error setting value: %s\n"
 msgstr "������ ���� ��� ������� �����: %s\n"
 
 # gconf/gconftool.c:982 gconf/gconftool.c:1084
-#: gconf/gconftool.c:1207
+#: gconf/gconftool.c:1205
 #, c-format
 msgid "Error syncing: %s\n"
 msgstr "������ ��� �����������: %s\n"
 
 # gconf/gconftool.c:834
-#: gconf/gconftool.c:1230
+#: gconf/gconftool.c:1228
 msgid "Must specify a key or keys on the command line\n"
 msgstr "������ �� ���������� ��� ������ � ������� ��� ������ �������\n"
 
 # gconf/gconf-backend.c:180
-#: gconf/gconftool.c:1250
+#: gconf/gconftool.c:1248
 #, c-format
 msgid "No schema known for `%s'\n"
 msgstr "��� ������� ������ ����� ��� �� `%s'\n"
 
-#: gconf/gconftool.c:1283
+#: gconf/gconftool.c:1281
 #, c-format
 msgid "No doc string stored in schema at '%s'\n"
 msgstr "��� ������� ������������� doc ������������ ��� ����� ��� '%s'\n"
 
 # gconf/gconfd.c:1745
-#: gconf/gconftool.c:1288
+#: gconf/gconftool.c:1286
 #, c-format
 msgid "Error getting schema at '%s': %s\n"
 msgstr "������ ����� �������� ��� `%s': %s\n"
 
 # gconf/gconf-backend.c:180
-#: gconf/gconftool.c:1295
+#: gconf/gconftool.c:1293
 #, c-format
 msgid "No schema stored at '%s'\n"
 msgstr "��� ������� ����� ������������ ��� `%s'\n"
 
-#: gconf/gconftool.c:1298
+#: gconf/gconftool.c:1296
 #, c-format
 msgid "Value at '%s' is not a schema\n"
 msgstr "� ���� ��� '%s' ��� ����� ��� �����\n"
 
 # gconf/gconftool.c:1000
-#: gconf/gconftool.c:1354
+#: gconf/gconftool.c:1352
 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:1361
+#: gconf/gconftool.c:1359
 #, 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:1381
+#: gconf/gconftool.c:1379
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "������ �� ���������� ������ (����� ��������) �� �������� ������\n"
 
-#: gconf/gconftool.c:1423
+#: gconf/gconftool.c:1421
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "�� ����� ������ ������ �� ����� ����������� ����� ���������: �������������, "
 "��������, ���. ������������ � ��������\n"
 
-#: gconf/gconftool.c:1443
+#: gconf/gconftool.c:1441
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "�� ����� ������� car ������ �� ����� ����������� ����� ���������: "
 "�������������, ��������, ���. ������������ � ��������\n"
 
-#: gconf/gconftool.c:1463
+#: gconf/gconftool.c:1461
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "�� ����� ������� cdr ������ �� ����� ����������� ����� ���������: "
 "�������������, ��������, ���. ������������ � ��������\n"
 
 # gconf/gconftool.c:964 gconf/gconftool.c:1070
-#: gconf/gconftool.c:1478
+#: gconf/gconftool.c:1476
 #, c-format
 msgid "Error setting value: %s"
 msgstr "������ ���� ��� ������� �����: %s"
 
 # gconf/gconftool.c:982 gconf/gconftool.c:1084
-#: gconf/gconftool.c:1492
+#: gconf/gconftool.c:1490
 #, c-format
 msgid "Error syncing: %s"
 msgstr "������ ��� �����������: %s"
 
 # gconf/gconftool.c:1099
-#: gconf/gconftool.c:1507
+#: gconf/gconftool.c:1505
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "������ �� ����������� ���� � ������������ ��������� ��� ���� �� ������� �� "
 "����� ��������/�����.\n"
 
 # gconf/gconftool.c:1113
-#: gconf/gconftool.c:1521
+#: gconf/gconftool.c:1519
 msgid "Must specify one or more keys to unset.\n"
 msgstr "������ �� ����������� ��� � ����������� ������� ���� ��������.\n"
 
 # gconf/gconftool.c:1124
-#: gconf/gconftool.c:1532
+#: gconf/gconftool.c:1530
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "������ ���� �������� `%s': %s\n"
 
 # gconf/gconftool.c:1147
-#: gconf/gconftool.c:1555
+#: gconf/gconftool.c:1553
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "������ �� ����������� ���� � ������������ ��������� ��� ���� �� ������� �� "
 "������������.\n"
 
 # gconf/gconftool.c:1181
-#: gconf/gconftool.c:1589
+#: gconf/gconftool.c:1587
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "������ ���� ���������� ���������: %s\n"
 
 # gconf/gconftool.c:1220
-#: gconf/gconftool.c:1631
+#: gconf/gconftool.c:1629
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "�������������: ������ � ���� ����� ��� �� ����� (%s)\n"
 
 # gconf/gconftool.c:1220
-#: gconf/gconftool.c:1640
+#: gconf/gconftool.c:1638
 #, 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:1651 gconf/gconftool.c:1681 gconf/gconftool.c:1710
+#: gconf/gconftool.c:1649 gconf/gconftool.c:1679 gconf/gconftool.c:1708
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
@@ -1925,38 +1926,39 @@ msgstr ""
 "(%s)\n"
 
 # gconf/gconftool.c:1220
-#: gconf/gconftool.c:1669
+#: gconf/gconftool.c:1667
 #, 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:1694
+#: gconf/gconftool.c:1692
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr ""
 "�������������: ��� ����� ������ �� ����� ��' ������� ���� ��� ��� �����\n"
 
 # gconf/gconftool.c:1256
-#: gconf/gconftool.c:1723
+#: gconf/gconftool.c:1721
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
-msgstr "�������������: ��������� ������ ��� gconftool, ������� GConfValueType\n"
+msgstr ""
+"�������������: ��������� ������ ��� gconftool, ������� GConfValueType\n"
 
 # gconf/gconftool.c:1304
-#: gconf/gconftool.c:1770 gconf/gconftool.c:1791 gconf/gconftool.c:1812
-#: gconf/gconftool.c:1833
+#: gconf/gconftool.c:1768 gconf/gconftool.c:1789 gconf/gconftool.c:1810
+#: gconf/gconftool.c:1831
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "�������������: �������� ����������� �������� �������� ����� `%s'\n"
 
-#: gconf/gconftool.c:1787
+#: gconf/gconftool.c:1785
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
-"��������Ϻ���: �� list_type ������ �� ����� ���� ��������, ���. ������������, "
-"������������� � �������� ��� ��� `%s'\n"
+"��������Ϻ���: �� list_type ������ �� ����� ���� ��������, ���. "
+"������������, ������������� � �������� ��� ��� `%s'\n"
 
-#: gconf/gconftool.c:1808
+#: gconf/gconftool.c:1806
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
@@ -1964,7 +1966,7 @@ msgstr ""
 "������������� � �������� ��� ��� `%s'\n"
 "\n"
 
-#: gconf/gconftool.c:1829
+#: gconf/gconftool.c:1827
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
@@ -1972,31 +1974,32 @@ msgstr ""
 "������������� � �������� ��� ��� `%s'\n"
 
 # gconf/gconftool.c:1327
-#: gconf/gconftool.c:1857
+#: gconf/gconftool.c:1855
 msgid "WARNING: empty <applyto> node"
 msgstr "�������������: ����� ������ <applyto>"
 
 # gconf/gconftool.c:1330 gconf/gconftool.c:1575
-#: gconf/gconftool.c:1860 gconf/gconftool.c:2123
+#: gconf/gconftool.c:1858 gconf/gconftool.c:2121
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr ""
-"�������������: � ������ <%s> ��� ����� ���������� ���������� ��� �� <schema>\n"
+"�������������: � ������ <%s> ��� ����� ���������� ���������� ��� �� "
+"<schema>\n"
 
 # gconf/gconftool.c:1340
-#: gconf/gconftool.c:1870
+#: gconf/gconftool.c:1868
 msgid "WARNING: no key specified for schema\n"
 msgstr "�������������: ��� ���� ���������� ������ ��� �� �����\n"
 
 # gconf/gconftool.c:1373
-#: gconf/gconftool.c:1903
+#: gconf/gconftool.c:1901
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "�������������: � ������ <locale> ��� ���� ��� �������� `name=\"locale\", "
 "���������\n"
 
 # gconf/gconftool.c:1379
-#: gconf/gconftool.c:1909
+#: gconf/gconftool.c:1907
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -2005,41 +2008,43 @@ msgstr ""
 "���������� ���� ���� ��� �����\n"
 
 # gconf/gconftool.c:1451
-#: gconf/gconftool.c:1990
+#: gconf/gconftool.c:1988
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "�������������: ������ ������ <%s> �� ��� ����� <locale>\n"
 
 # gconf/gconftool.c:1480
-#: gconf/gconftool.c:2019
+#: gconf/gconftool.c:2017
 #, 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:2027
+#: gconf/gconftool.c:2025
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "������������� ����� `%s' ��� ��� ������ ������� `%s'\n"
 
 # gconf/gconftool.c:1510
-#: gconf/gconftool.c:2049
+#: gconf/gconftool.c:2047
 #, 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:2057
+#: gconf/gconftool.c:2055
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "����� `%s' ������������ ��� ������ `%s'\n"
 
 # gconf/gconftool.c:1588
-#: gconf/gconftool.c:2136
+#: gconf/gconftool.c:2134
 msgid "You must have at least one <locale> entry in a <schema>\n"
-msgstr "������ �� ������� ����������� ��� ���������� <locale> �� ��� <schema>\n"
+msgstr ""
+"������ �� ������� ����������� ��� ���������� <locale> �� ��� <schema>\n"
 
 # gconf/gconftool.c:1617
 #: gconf/gconftool.c:2165
@@ -2050,19 +2055,19 @@ msgstr ""
 "<schemalist>\n"
 
 # gconf/gconftool.c:1639
-#: gconf/gconftool.c:2187
+#: gconf/gconftool.c:2188
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "�������� ���������� `%s': %s\n"
 
 # gconf/gconftool.c:1646
-#: gconf/gconftool.c:2194
+#: gconf/gconftool.c:2195
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "�� ������� `%s' ����� ����;\n"
 
 # gconf/gconftool.c:1658
-#: gconf/gconftool.c:2206
+#: gconf/gconftool.c:2207
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -2072,13 +2077,13 @@ msgstr ""
 "����� <gconfschemafile>)\n"
 
 # gconf/gconftool.c:1671
-#: gconf/gconftool.c:2219
+#: gconf/gconftool.c:2220
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "�� ������� `%s' ��� ���� ����� <gconfschemafile> ��������� ��������\n"
 
 # gconf/gconftool.c:1685
-#: gconf/gconftool.c:2233
+#: gconf/gconftool.c:2234
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr ""
@@ -2086,18 +2091,18 @@ msgstr ""
 "<gconfschemafile>\n"
 
 # gconf/gconftool.c:1696 gconf/gconftool.c:1728
-#: gconf/gconftool.c:2244 gconf/gconftool.c:2276
+#: gconf/gconftool.c:2245 gconf/gconftool.c:2277
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "������ ��� ����������� ��������� �����������: %s"
 
 # gconf/gconftool.c:1712
-#: gconf/gconftool.c:2260
+#: gconf/gconftool.c:2261
 msgid "Must specify some schema files to install\n"
 msgstr "������ �� ����������� ������ ������ �������� ���� �����������\n"
 
 # gconf/gconftool.c:1749
-#: gconf/gconftool.c:2297
+#: gconf/gconftool.c:2298
 #, c-format
 msgid ""
 "\n"
@@ -2107,18 +2112,18 @@ msgstr ""
 "%s\n"
 
 # gconf/gconftool.c:1769
-#: gconf/gconftool.c:2317
+#: gconf/gconftool.c:2318
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "�������� ���� �������� �������� ���������� %s: %s\n"
 
 # gconf/gconftool.c:1895
-#: gconf/gconftool.c:2443
+#: gconf/gconftool.c:2444
 msgid "Must specify some keys to break\n"
 msgstr "������ �� ����������� ������ ������� ��� �������\n"
 
 # gconf/gconftool.c:1901
-#: gconf/gconftool.c:2449
+#: gconf/gconftool.c:2450
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -2129,16 +2134,17 @@ msgstr ""
 "  %s\n"
 
 # gconf/gconftool.c:1919
-#: gconf/gconftool.c:2467
+#: gconf/gconftool.c:2468
 msgid "Must specify some directories to break\n"
 msgstr "������ �� ����������� ������� ��������� ���� �������\n"
 
 # gconf/gconftool.c:1938
-#: gconf/gconftool.c:2486
+#: gconf/gconftool.c:2487
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
-"directory:\n  %s\n"
+"directory:\n"
+"  %s\n"
 msgstr ""
 "���������� ���������� ������������ ���� �������� �������� ������� ����� ��� "
 "�� ������ ���� ��������:\n"
@@ -2162,6 +2168,140 @@ msgstr "������������� GConf: �������� ����������� ������ ��� `%s': %s"
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "���������� `%s' ������� `%s' ��� �� ������ %s"
 
+# gconf/gconf-internals.c:2120
+#~ msgid "%s"
+#~ msgstr "%s"
+
+# gconf/gconf-internals.c:2225
+#~ msgid "No ior file in `%s'"
+#~ msgstr "��� ������� ������ ior ��� `%s'"
+
+# gconf/gconf-internals.c:2256
+#~ msgid "gconfd taking lock `%s' from some other process"
+#~ msgstr "�� gconfd ������� �� �������� `%s' ��� ������ ���� ���������"
+
+# gconf/gconf-internals.c:2267
+#~ msgid "Another program has lock `%s'"
+#~ msgstr "������ ���� ��������� ���� �� �������� `%s'"
+
+# gconf/gconf-internals.c:2295
+#~ msgid ""
+#~ "Removing stale lock `%s' because IOR couldn't be converted to object "
+#~ "reference, IOR `%s'"
+#~ msgstr ""
+#~ "���������� ����� �������� `%s' ������ �� IOR ��� �������� �� ���������� "
+#~ "�� ������� ������������, IOR `%s'"
+
+# gconf/gconf-internals.c:2307
+#~ msgid "Removing stale lock `%s' because of error pinging server: %s"
+#~ msgstr ""
+#~ "���������� �� ����� �������� `%s' ���� ��������� ���������� ���������: %s"
+
+# gconf/gconf-internals.c:2319
+#~ msgid "GConf configuration daemon (gconfd) has lock `%s'"
+#~ msgstr "� �������� ����������� GConf (gconfd) ���� �� �������� `%s'"
+
+# gconf/gconf-internals.c:2368
+#~ msgid "Can't create lock `%s': %s"
+#~ msgstr "������� � ���������� ����������� `%s': %s"
+
+# gconf/gconf-internals.c:2447
+#~ msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
+#~ msgstr ""
+#~ "������� �� ������� ��� ������� ����������� `%s'� ���������� ��� ��� ����� "
+#~ "���� ���: %s"
+
+# gconf/gconf-internals.c:2464
+#~ msgid "Corrupt lock file `%s', removing anyway"
+#~ msgstr "�������� ������ ����������� `%s', ���������� ����� � �����"
+
+# gconf/gconf-internals.c:2474
+#~ msgid ""
+#~ "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming "
+#~ "someone took our lock"
+#~ msgstr ""
+#~ "��� ������������� ������ ����������� `%s' (���������� pid %u, ���� ��� "
+#~ "pid %u� ���������� ��� ������� ���� �� �������� ���"
+
+#~ msgid ""
+#~ "Error contacting configuration server: OAF returned nil from "
+#~ "oaf_activate_from_id() and did not set an exception explaining the "
+#~ "problem. This is a bug in the OAF package; something went wrong in OAF, "
+#~ "and no error was reported. This is not a bug in the GConf package. Do not "
+#~ "report a GConf bug unless you have information indicating what went wrong "
+#~ "with OAF that was caused by GConf."
+#~ msgstr ""
+#~ "������ ���� ����������� �� ��� ����������� ���������: �� OAF ��������� "
+#~ "����� ��� �� oaf_activate_from_id() ��� ��� ����� ��� �������� ��������� "
+#~ "�� ��������. ���� ����� ��� ������ ��� ������ OAF, ������� ���� ����� ��� "
+#~ "OAF ��� ��� ���������� ������. ���� ��� ����� ������ ��� ������ GConf. "
+#~ "��� �� ��������� �� ������ ��� GConf ����� �� ����� ����������� ��� "
+#~ "�������� ��� �� ������ ������� ��� �� GConf."
+
+# gconf/gconfd.c:1036
+#~ msgid ""
+#~ "Failed to init Object Activation Framework: please mail bug report to OAF "
+#~ "maintainers"
+#~ msgstr ""
+#~ "������� � ������������ ��� �������� ������������� ������������: �������� "
+#~ "�������� ������� ����������� ����� ���������� ��� ��� (OAF)"
+
+#~ msgid ""
+#~ "Registering existing server with oafd, since OAF appears to have leaked it"
+#~ msgstr ""
+#~ "������ ��� ���������� ����������� �� ��� oafd, ����� �� oafd ������� �� "
+#~ "�� ���������"
+
+# gconf/gconfd.c:1075
+#~ msgid ""
+#~ "OAF doesn't know about our IID; indicates broken installation; can't "
+#~ "register existing server."
+#~ msgstr ""
+#~ "�� ��� (OAF) �� �������� ���� ��� IID ���, ���������� ���� �����������, "
+#~ "�� ������ �� ����������� � ������� ������������."
+
+# gconf/gconfd.c:1079
+#~ msgid ""
+#~ "Another gconfd already registered with OAF, so we can't register the "
+#~ "existing server"
+#~ msgstr ""
+#~ "��� ���� gconfd ����� ��� ������������ ��� ��� (OAF)� ����� �� �������� "
+#~ "�� ������������� ��� ������� �����������"
+
+# gconf/gconfd.c:1084
+#~ msgid "Unknown error registering existing gconfd with OAF; exiting"
+#~ msgstr ""
+#~ "������� ������ ����������� ���������� gconfd ��� ��� (OAF)� ��������"
+
+# gconf/gconfd.c:1075
+#~ msgid ""
+#~ "OAF doesn't know about our IID; indicates broken installation; can't "
+#~ "register; exiting\n"
+#~ msgstr ""
+#~ "�� ��� (OAF) �� �������� ���� ��� IID ��� �� ������ �� ����������߷ "
+#~ "��������\n"
+
+# gconf/gconfd.c:1079
+#~ msgid "Another gconfd already registered with OAF; exiting\n"
+#~ msgstr "��� ���� gconfd ����� ��� ������������ ��� ��� (OAF)� ��������\n"
+
+# gconf/gconfd.c:1084
+#~ msgid "Unknown error registering gconfd with OAF; exiting\n"
+#~ msgstr "������� ����� ����������� ��� gconfd ��� ��� (OAF)� ��������\n"
+
+# gconf/gconftool.c:488
+#~ msgid ""
+#~ "Shouldn't run gconfd while installing new schema files.\n"
+#~ "Use gconftool --shutdown to shut down the daemon, most safely while no "
+#~ "applications are running\n"
+#~ "(though things theoretically work if apps are running).\n"
+#~ msgstr ""
+#~ "�� �� ������ �� ���������� �� gconfd ���� ������������� ��� ������ "
+#~ "��������.\n"
+#~ "��������������� �� gconftool --shutdown ��� �� �������� �� �������, "
+#~ "����������� ���� ��� ����������� ���������\n"
+#~ "(�� ��� ��������� �� ������ �� �������� �� ����������� ���������).\n"
+
 #~ msgid "Ignoring XML node `%s', except for possible schema name: %s"
 #~ msgstr "������� ��� ������ XML `%s', ����� ��� �� ������ ����� ��������: %s"
 
@@ -2176,12 +2316,12 @@ msgstr "���������� `%s' ������� `%s' ��� �� ������ %s"
 # gconf/gconf.c:1463
 #~ msgid ""
 #~ "Error contacting configuration server: OAF returned nil from "
-#~ "oaf_activate_from_id() and did not set an exception explaining the problem. "
-#~ "Please file an OAF bug report."
+#~ "oaf_activate_from_id() and did not set an exception explaining the "
+#~ "problem. Please file an OAF bug report."
 #~ msgstr ""
-#~ "������ ���� ����� �� ��� ��������� �����������: �� OAF ��������� ����� ��� "
-#~ "��� oaf_activate_from_id() ��� ��� �������� ��� �������� ��� �� ������ �� "
-#~ "��������. �������� ������� ��� ������� ��������� OAF"
+#~ "������ ���� ����� �� ��� ��������� �����������: �� OAF ��������� ����� "
+#~ "��� ��� oaf_activate_from_id() ��� ��� �������� ��� �������� ��� �� "
+#~ "������ �� ��������. �������� ������� ��� ������� ��������� OAF"
 
 #~ msgid "GConf was built with debugging features enabled"
 #~ msgstr ""
diff --git a/po/es.po b/po/es.po
index 290fc831..1ce25655 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf 1.0.4\n"
-"POT-Creation-Date: 2001-10-06 16:06+0200\n"
+"POT-Creation-Date: 2002-02-04 18:21-0500\n"
 "PO-Revision-Date: 2001-10-06 16:10+0200\n"
 "Last-Translator: H�ctor Garc�a �lvarez <hector@scouts-es.org>\n"
 "Language-Team: Spanish <traductores@es.gnome.org>\n"
@@ -31,7 +31,7 @@ msgstr "Inicializando el m�dulo BDB"
 msgid "Couldn't find the %s root directory in the address `%s'"
 msgstr "No pude encontrar el directorio ra�z %s en la direcci�n `%s'"
 
-#: backends/dir-utils.c:124 backends/xml-backend.c:301 backends/xml-dir.c:1053
+#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1050
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "No pude crear el directorio `%s': %s"
@@ -45,26 +45,26 @@ msgstr "No puedo leer ni escribir la directorio ra�z %s en la direcci�n `%s'"
 msgid "Unloading XML backend module."
 msgstr "Descargando el m�dulo de soporte de XML."
 
-#: backends/xml-backend.c:286
+#: backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "No pude encontrar el directorio ra�z XML en la direcci�n `%s'"
 
-#: backends/xml-backend.c:386
+#: backends/xml-backend.c:414
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
 msgstr "No puedo leer ni escribir la directorio ra�z XML en la direcci�n `%s'"
 
-#: backends/xml-backend.c:396
+#: backends/xml-backend.c:424
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "Los permisos del archivo/directorio de la fuente XML en %s son: %o/%o"
 
-#: backends/xml-backend.c:680
+#: backends/xml-backend.c:708
 msgid "Initializing XML backend module"
 msgstr "Inicializando el m�dulo de XML"
 
-#: backends/xml-backend.c:745
+#: backends/xml-backend.c:773
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "Fallo al liberar el bloqueo en el directorio XML `%s': %s"
@@ -132,34 +132,34 @@ msgid "Failed to delete old file `%s': %s"
 msgstr "Error al borrar el archivo antiguo `%s': %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:806
+#: backends/xml-dir.c:803
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Error al pedir la informaci�n de `%s': %s"
 
-#: backends/xml-dir.c:950
+#: backends/xml-dir.c:947
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Entrada duplicada `%s' en `%s', ignor�ndola"
 
-#: backends/xml-dir.c:972
+#: backends/xml-dir.c:969
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "Entrada sin nombre en el archivo XML `%s', ignor�ndola"
 
-#: backends/xml-dir.c:980
+#: backends/xml-dir.c:977
 #, c-format
 msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
 msgstr ""
 "El nodo de alto nivel en el archivo XML `%s' es <%s> en lugar de <entry>, "
 "ignor�ndolo"
 
-#: backends/xml-dir.c:1069
+#: backends/xml-dir.c:1066
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Error al crear el archivo `%s': %s"
 
-#: backends/xml-dir.c:1077
+#: backends/xml-dir.c:1074
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Error al cerrar el archivo `%s': %s"
@@ -170,11 +170,6 @@ msgstr "Error al cerrar el archivo `%s': %s"
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "Ignorando el nodo XML con nombre `%s': %s"
 
-#: backends/xml-entry.c:200
-#, c-format
-msgid "%s"
-msgstr "%s"
-
 #: backends/xml-entry.c:327
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
@@ -231,7 +226,8 @@ msgstr "Ignorando car err�neo para la pareja XML: %s"
 #: backends/xml-entry.c:1143 backends/xml-entry.c:1166
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
-"analizando archivo XML: listas y parejas pueden no ser incluidas en una pareja"
+"analizando archivo XML: listas y parejas pueden no ser incluidas en una "
+"pareja"
 
 #: backends/xml-entry.c:1156
 #, c-format
@@ -345,7 +341,7 @@ msgstr ""
 "(aunque lo m�s probable es que no ocurra nada, puede que surjan extra�as "
 "notificaciones): %s"
 
-#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1328
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Error al obtener el valor para `%s': %s"
@@ -454,194 +450,227 @@ msgstr "Error al obtener un bloqueo"
 msgid "No database available to save your configuration"
 msgstr "No hay bases de datos disponibles para guardar su configuraci�n"
 
-#: gconf/gconf-internals.c:112
+#: gconf/gconf-internals.c:114
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "No hay '/' en la clave `%s'"
 
-#: gconf/gconf-internals.c:276
+#: gconf/gconf-internals.c:227
+#, c-format
+msgid "Invalid UTF-8 in string value in '%s'"
+msgstr ""
+
+#: gconf/gconf-internals.c:286
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "No pude interpretar el valor CORBA para el elemento lista"
 
-#: gconf/gconf-internals.c:278
+#: gconf/gconf-internals.c:288
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "Tipo incorrecto para el elemento lista en %s"
 
-#: gconf/gconf-internals.c:291
+#: gconf/gconf-internals.c:301
 msgid "Received list from gconfd with a bad list type"
 msgstr "Recib� una lista de gconfd con un tipo de lista err�neo"
 
-#: gconf/gconf-internals.c:472
+#: gconf/gconf-internals.c:482
 msgid "Failed to convert object to IOR"
 msgstr "Error al convertir el objeto a IOR"
 
-#: gconf/gconf-internals.c:838
+#: gconf/gconf-internals.c:619
+msgid "Invalid UTF-8 in locale for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:627
+msgid "Invalid UTF-8 in short description for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:635
+msgid "Invalid UTF-8 in long description for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:643
+msgid "Invalid UTF-8 in owner for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:868
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "No pude abrir el directorio del archivo `%s': %s\n"
 
-#: gconf/gconf-internals.c:898
+#: gconf/gconf-internals.c:928
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "A�adiendo la fuente `%s'\n"
 
-#: gconf/gconf-internals.c:910
+#: gconf/gconf-internals.c:940
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "Error de lectura en el archivo `%s': %s\n"
 
-#: gconf/gconf-internals.c:1352
+#: gconf/gconf-internals.c:1271 gconf/gconf-internals.c:1337
+#: gconf/gconf-value.c:125 gconf/gconf-value.c:224 gconf/gconf-value.c:366
+#: gconf/gconf-value.c:1084
+msgid "Text contains invalid UTF-8"
+msgstr ""
+
+#: gconf/gconf-internals.c:1422
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Esperaba un lista, tengo %s"
 
-#: gconf/gconf-internals.c:1362
+#: gconf/gconf-internals.c:1432
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "Esperaba una lista de %s, tengo una de %s"
 
-#: gconf/gconf-internals.c:1501
+#: gconf/gconf-internals.c:1571
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Esperaba un par, tengo %s"
 
-#: gconf/gconf-internals.c:1515
+#: gconf/gconf-internals.c:1585
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr "Esperaba el par (%s,%s), tengo un par sin uno o sin los dos valores"
 
-#: gconf/gconf-internals.c:1531
+#: gconf/gconf-internals.c:1601
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "Esperaba un par del tipo (%s,%s) tengo uno del tipo (%s,%s)"
 
-#: gconf/gconf-internals.c:1647
+#: gconf/gconf-internals.c:1717
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "Cadena entrecomillada no comienza con una marca de comillas"
 
-#: gconf/gconf-internals.c:1709
+#: gconf/gconf-internals.c:1779
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Cadena entrecomillada no finaliza con una marca de comillas"
 
-#: gconf/gconf-internals.c:2189 gconf/gconf.c:3062
+#: gconf/gconf-internals.c:1915
+msgid "Encoded value is not valid UTF-8"
+msgstr ""
+
+#: gconf/gconf-internals.c:2265 gconf/gconf.c:3082
 #, c-format
 msgid "CORBA error: %s"
 msgstr "Error CORBA: %s"
 
-#: gconf/gconf-internals.c:2205
+#: gconf/gconf-internals.c:2281
 #, c-format
 msgid "OAF problem description: '%s'"
 msgstr "descripci�n del problema de OAF: `%s'"
 
-#: gconf/gconf-internals.c:2211
+#: gconf/gconf-internals.c:2287
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "intento de eliminar un directorio de objetos OAF no listado"
 
-#: gconf/gconf-internals.c:2216
+#: gconf/gconf-internals.c:2292
 msgid "attempt to add already-listed OAF directory"
 msgstr "intento de a�adir un directorio OAF ya listado"
 
-#: gconf/gconf-internals.c:2223
+#: gconf/gconf-internals.c:2299
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "Error de sintaxis en OAF: %s"
 
-#: gconf/gconf-internals.c:2228
+#: gconf/gconf-internals.c:2304
 msgid "Unknown OAF error"
 msgstr "Error de OAF desconocido"
 
-#: gconf/gconf-internals.c:2361
+#: gconf/gconf-internals.c:2437
 #, c-format
 msgid "Could not lock temporary file '%s': %s"
 msgstr "No pude bloquear el archivo temporal `%s': %s"
 
-#: gconf/gconf-internals.c:2388
+#: gconf/gconf-internals.c:2464
 #, c-format
 msgid "Could not create file '%s', probably because it already exists"
 msgstr "No pude crear el archivo '%s', probablemente porque ya existe"
 
-#: gconf/gconf-internals.c:2434
+#: gconf/gconf-internals.c:2510
 #, c-format
 msgid "Failed to create or open '%s'"
 msgstr "Error al crear o abrir '%s'"
 
-#: gconf/gconf-internals.c:2444
-#, c-format
-msgid "Failed to lock '%s': another process has the lock (%s)"
+#: gconf/gconf-internals.c:2520
+#, fuzzy, c-format
+msgid ""
+"Failed to lock '%s': probably another process has the lock, or your "
+"operating system has NFS file locking misconfigured (%s)"
 msgstr "Error al bloquear '%s': otro proceso tiene el bloqueo (%s)"
 
-#: gconf/gconf-internals.c:2472
+#: gconf/gconf-internals.c:2548
 #, c-format
 msgid "IOR file '%s' not opened successfully, no gconfd located: %s"
 msgstr ""
 "El archivo IOR '%s' no se abri� satisfactoriamente, no se localiz� a gconfd: "
 "%s"
 
-#: gconf/gconf-internals.c:2502
+#: gconf/gconf-internals.c:2578
 #, c-format
 msgid "gconftool or other non-gconfd process has the lock file '%s'"
 msgstr ""
 "gconftool u otro proceso que no es gconfd tiene un bloqueo en el archivo '%s'"
 
-#: gconf/gconf-internals.c:2519
+#: gconf/gconf-internals.c:2595
 msgid "couldn't contact ORB to resolve existing gconfd object reference"
 msgstr ""
 "no pude contactar con ORB para resolver la referencia al objeto gconfd "
 "existente"
 
-#: gconf/gconf-internals.c:2551
+#: gconf/gconf-internals.c:2627
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "no pude crear el directorio `%s': %s"
 
-#: gconf/gconf-internals.c:2610
+#: gconf/gconf-internals.c:2686
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "No pude escribir al archivo `%s': %s"
 
-#: gconf/gconf-internals.c:2651
+#: gconf/gconf-internals.c:2727
 #, c-format
 msgid "We didn't have the lock on file `%s', but we should have"
 msgstr ""
 "No ten�amos un bloqueo en el archivo `%s', pero deber�amos haberlo tenido"
 
-#: gconf/gconf-internals.c:2672
+#: gconf/gconf-internals.c:2748
 #, c-format
 msgid "Failed to link '%s' to '%s': %s"
 msgstr "Error al enlazar '%s' a '%s': %s"
 
-#: gconf/gconf-internals.c:2684
+#: gconf/gconf-internals.c:2760
 #, c-format
 msgid "Failed to remove lock file `%s': %s"
 msgstr "Error al eliminar el archivo de bloqueo `%s': %s"
 
-#: gconf/gconf-internals.c:2703
+#: gconf/gconf-internals.c:2779
 #, c-format
 msgid "Failed to clean up file '%s': %s"
 msgstr "Error al limpiar el archivo '%s': %s"
 
-#: gconf/gconf-internals.c:2717
+#: gconf/gconf-internals.c:2793
 #, c-format
 msgid "Failed to remove lock directory `%s': %s"
 msgstr "Error el eliminar el bloqueo al directorio `%s': %s"
 
-#: gconf/gconf-internals.c:2927 gconf/gconfd.c:578
+#: gconf/gconf-internals.c:3003 gconf/gconfd.c:580
 #, c-format
 msgid "Failed to create %s: %s"
 msgstr "Error al crear %s: %s"
 
-#: gconf/gconf-internals.c:2960
+#: gconf/gconf-internals.c:3036
 #, c-format
 msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
 msgstr "Error al crear una comunicaci�n con el demonio gconfd: %s\n"
 
-#: gconf/gconf-internals.c:2984
+#: gconf/gconf-internals.c:3064
 #, c-format
 msgid "Failed to launch configuration server: %s\n"
 msgstr "Error al ejecutar el servidor de configuraci�n: %s\n"
 
-#: gconf/gconf-internals.c:3006
+#: gconf/gconf-internals.c:3088
 msgid ""
 "Failed to contact configuration server (a likely cause of this is that you "
 "have an existing configuration server (gconfd) running, but it isn't "
@@ -654,46 +683,46 @@ msgstr ""
 "m�quinas al mismo tiempo, puede que necesite habilitar el soporte TCP de "
 "ORBit\n"
 
-#: gconf/gconf-internals.c:3643
+#: gconf/gconf-internals.c:3724
 #, c-format
 msgid "Failed to read from child pipe (%s)"
 msgstr "Error al leer de la tuber�a del hijo (%s)"
 
-#: gconf/gconf-internals.c:3708
+#: gconf/gconf-internals.c:3789
 #, c-format
 msgid "Failed to fork (%s)"
 msgstr "Error a hacer fork (%s)"
 
-#: gconf/gconf-internals.c:3848
+#: gconf/gconf-internals.c:3929
 #, c-format
 msgid "Failed to change to directory '%s' (%s)"
 msgstr "Error al cambiar al directorio '%s': (%s)"
 
-#: gconf/gconf-internals.c:3858
+#: gconf/gconf-internals.c:3939
 #, c-format
 msgid "Failed to execute child process (%s)"
 msgstr "Error al ejecutar un proceso hijo (%s)"
 
-#: gconf/gconf-internals.c:3867
+#: gconf/gconf-internals.c:3948
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
 msgstr "Error al redirigir la salida o la entrada de un proceso hijo (%s)"
 
-#: gconf/gconf-internals.c:3876
+#: gconf/gconf-internals.c:3957
 #, c-format
 msgid "Failed to fork child process (%s)"
 msgstr "Error al hacer fork a un proceso hijo (%s)"
 
-#: gconf/gconf-internals.c:3884
+#: gconf/gconf-internals.c:3965
 msgid "Unknown error executing child process"
 msgstr "Error desconocido al ejecutar un proceso hijo"
 
-#: gconf/gconf-internals.c:3905
+#: gconf/gconf-internals.c:3986
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr "No se ha podido leer suficientes datos de la tuber�a del hijo (%s)"
 
-#: gconf/gconf-internals.c:3955
+#: gconf/gconf-internals.c:4036
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr "Error al crear una tuber�a para comunicarse con un proceso hijo (%s)"
@@ -703,16 +732,16 @@ msgstr "Error al crear una tuber�a para comunicarse con un proceso hijo (%s)"
 msgid "Failed to load source `%s': %s"
 msgstr "Error al cargar la fuente `%s': %s"
 
-#: gconf/gconf-sources.c:510
+#: gconf/gconf-sources.c:544
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr "Esquema `%s' especificado por `%s' guarda un valor no esquem�tico"
 
-#: gconf/gconf-sources.c:567
+#: gconf/gconf-sources.c:601
 msgid "The '/' name can only be a directory, not a key"
 msgstr "El nombre '/' solo puede ser un directorio, no una clave"
 
-#: gconf/gconf-sources.c:596
+#: gconf/gconf-sources.c:630
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -721,7 +750,7 @@ msgstr ""
 "El valor de `%s' est� definido en una fuente de solo lectura en la parte "
 "superior de su configuraci�n."
 
-#: gconf/gconf-sources.c:608
+#: gconf/gconf-sources.c:642
 #, c-format
 msgid ""
 "Unable to store a value at key '%s', as the configuration server has no "
@@ -747,77 +776,77 @@ msgstr ""
 "conexiones remotas de CORBA. Como siempre, compruebe los logs user.* para "
 "obtener detalles acerca de los problemas encontrados por gconfd."
 
-#: gconf/gconf-sources.c:1164
+#: gconf/gconf-sources.c:1198
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Error buscando menta-informaci�n: %s"
 
-#: gconf/gconf-sources.c:1233
+#: gconf/gconf-sources.c:1267
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Error obteniendo meta-informaci�n: %s"
 
-#: gconf/gconf-sources.c:1257
+#: gconf/gconf-sources.c:1291
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr "Clave `%s' listada como esquema por la clave `%s' es de tipo `%s'"
 
-#: gconf/gconf-value.c:82
+#: gconf/gconf-value.c:81
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "No entend� `%s' (esperaba un entero)"
 
-#: gconf/gconf-value.c:92
+#: gconf/gconf-value.c:91
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "El entero `%s' es demasiado grande o demasiado peque�o"
 
-#: gconf/gconf-value.c:113
+#: gconf/gconf-value.c:112
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "No entend� `%s' (esperaba un n�mero real)"
 
-#: gconf/gconf-value.c:146
+#: gconf/gconf-value.c:156
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "No entend� `%s' (esperaba verdadero o falso)"
 
-#: gconf/gconf-value.c:214
+#: gconf/gconf-value.c:232
 #, c-format
 msgid "Didn't understand `%s' (list must start with a '[')"
 msgstr "No entend� `%s' (las lista deben comenzar con '[')"
 
-#: gconf/gconf-value.c:227
+#: gconf/gconf-value.c:245
 #, c-format
 msgid "Didn't understand `%s' (list must end with a ']')"
 msgstr "No entend� `%s' (las lista deben finalizar con ']')"
 
-#: gconf/gconf-value.c:278
+#: gconf/gconf-value.c:296
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
 msgstr "No entend� `%s' (hay un ']' extra dentro de la lista)"
 
-#: gconf/gconf-value.c:309 gconf/gconf-value.c:462
+#: gconf/gconf-value.c:327 gconf/gconf-value.c:488
 #, c-format
 msgid "Didn't understand `%s' (extra trailing characters)"
 msgstr "No entend� `%s' (caracteres extra al final)"
 
-#: gconf/gconf-value.c:348
+#: gconf/gconf-value.c:374
 #, c-format
 msgid "Didn't understand `%s' (pair must start with a '(')"
 msgstr "No entend� `%s' (el par debe comenzar con '(')"
 
-#: gconf/gconf-value.c:361
+#: gconf/gconf-value.c:387
 #, c-format
 msgid "Didn't understand `%s' (pair must end with a ')')"
 msgstr "No entend� `%s' (el par debe finalizar con ')')"
 
-#: gconf/gconf-value.c:391 gconf/gconf-value.c:477
+#: gconf/gconf-value.c:417 gconf/gconf-value.c:503
 #, c-format
 msgid "Didn't understand `%s' (wrong number of elements)"
 msgstr "No entend� `%s' (n�mero de elementos err�neo)"
 
-#: gconf/gconf-value.c:431
+#: gconf/gconf-value.c:457
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr "No entend� `%s' (hay un ')' extra dentro del par)"
@@ -836,62 +865,62 @@ msgstr "El servidor no pudo resolver la direcci�n `%s'"
 msgid "Can't add notifications to a local configuration source"
 msgstr "No puedo a�adir notificaciones a una fuente de configuraci�n local"
 
-#: gconf/gconf.c:1865
+#: gconf/gconf.c:1868
 #, c-format
 msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr "Error al a�adir el cliente a la lista del servidor, error CORBA: %s"
 
-#: gconf/gconf.c:2180
+#: gconf/gconf.c:2183
 msgid "Failed to init GConf, exiting\n"
 msgstr "Fallo al iniciar GConf, saliendo\n"
 
-#: gconf/gconf.c:2217
+#: gconf/gconf.c:2220
 msgid "Must begin with a slash (/)"
 msgstr "Debe comenzar con una barra (/)"
 
-#: gconf/gconf.c:2239
+#: gconf/gconf.c:2242
 msgid "Can't have two slashes (/) in a row"
 msgstr "No puede haber dos barras (/) en una fila"
 
-#: gconf/gconf.c:2241
+#: gconf/gconf.c:2244
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "No puede haber un punto (.) tras una barra (/)"
 
-#: gconf/gconf.c:2262
+#: gconf/gconf.c:2265
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "`%c' es un car�cter no v�lido en los nombres de claves/directorios"
 
-#: gconf/gconf.c:2276
+#: gconf/gconf.c:2279
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Las Claves/directorios no pueden terminar con una barra (/)"
 
-#: gconf/gconf.c:2517
+#: gconf/gconf.c:2520
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Fallo al terminar el servidor de configuraciones: %s"
 
-#: gconf/gconf.c:2578
+#: gconf/gconf.c:2581
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Esperaba un float, obtuve %s"
 
-#: gconf/gconf.c:2613
+#: gconf/gconf.c:2616
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Esperaba un entero, obtuve %s"
 
-#: gconf/gconf.c:2648
+#: gconf/gconf.c:2651
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Esperaba una cadena, obtuve %s"
 
-#: gconf/gconf.c:2685
+#: gconf/gconf.c:2688
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Esperaba un booleano, obtuve %s"
 
-#: gconf/gconf.c:2718
+#: gconf/gconf.c:2721
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Esperaba un esquema, obtuve %s"
@@ -971,46 +1000,46 @@ msgstr "Recibida la se�al %d, acabando limpiamente"
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:524
+#: gconf/gconfd.c:526
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "comenzando (versi�n  %s), pid %u usuario '%s'"
 
-#: gconf/gconfd.c:565
+#: gconf/gconfd.c:567
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Fallo al obtener la referencia de un objeto para ConfigServer"
 
-#: gconf/gconfd.c:603
+#: gconf/gconfd.c:605
 #, c-format
 msgid "Failed to write byte to pipe fd %d so client program may hang: %s"
 msgstr ""
 "Error al escribir al conducto fd %d as� que el programa cliente puede que se "
 "cuelgue: %s"
 
-#: gconf/gconfd.c:613
+#: gconf/gconfd.c:615
 #, c-format
 msgid "Failed to get lock for daemon, exiting: %s"
 msgstr "Error al obtener bloqueo para el demonio, terminando: %s"
 
-#: gconf/gconfd.c:655
+#: gconf/gconfd.c:657
 #, c-format
 msgid "Error releasing lockfile: %s"
 msgstr "Error al liberar el bloqueo: %s"
 
-#: gconf/gconfd.c:663
+#: gconf/gconfd.c:665
 msgid "Exiting"
 msgstr "Finalizando"
 
-#: gconf/gconfd.c:688
+#: gconf/gconfd.c:690
 msgid "GConf server is not in use, shutting down."
 msgstr "El servidor GConf no se est� usando, cerr�ndolo"
 
-#: gconf/gconfd.c:1047
+#: gconf/gconfd.c:1059
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Devolviendo la excepci�n: %s"
 
-#: gconf/gconfd.c:1147
+#: gconf/gconfd.c:1159
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -1019,7 +1048,7 @@ msgstr ""
 "Fall� al abrir el archivo de log de gconfd. No ser� capaz de restaurar los "
 "servicios  despu�s de acabar gconfd (%s)"
 
-#: gconf/gconfd.c:1182
+#: gconf/gconfd.c:1194
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
@@ -1027,39 +1056,39 @@ msgstr ""
 "Fall� al cerrar el archivo de log de gconfd. Puede que los datos no se hayan "
 "guardado apropiadamente (%s)"
 
-#: gconf/gconfd.c:1251
+#: gconf/gconfd.c:1263
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "No pude abrir el archivo de estado '%s' para escritura: %s"
 
-#: gconf/gconfd.c:1265
+#: gconf/gconfd.c:1277
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "No pude escribir en el archivo de estado guardado '%s' fd: %d: %s"
 
-#: gconf/gconfd.c:1274
+#: gconf/gconfd.c:1286
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Error al cerrar el nuevo archivo de estado '%s': %s"
 
-#: gconf/gconfd.c:1288
+#: gconf/gconfd.c:1300
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "No pude apartar el antiguo archivo de estado '%s': %s"
 
-#: gconf/gconfd.c:1298
+#: gconf/gconfd.c:1310
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "Error al mover el nuevo archivo de estado a su sitio: %s"
 
-#: gconf/gconfd.c:1307
+#: gconf/gconfd.c:1319
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
 "Error reponiendo archivo de estado original que hab�a sido movido a '%s': %s"
 
-#: gconf/gconfd.c:1782
+#: gconf/gconfd.c:1794
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
@@ -1067,17 +1096,17 @@ msgstr ""
 "No pude reponer un servicio en la direcci�n '%s', no pude encontrar la base "
 "de datos"
 
-#: gconf/gconfd.c:1828
+#: gconf/gconfd.c:1840
 #, c-format
 msgid "Error reading saved state file: %s"
 msgstr "Error leyendo el archivo de estado: %s"
 
-#: gconf/gconfd.c:1881
+#: gconf/gconfd.c:1893
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "No pude abrir el archivo de estado '%s': %s"
 
-#: gconf/gconfd.c:1998
+#: gconf/gconfd.c:2010
 #, c-format
 msgid ""
 "Failed to log addition of listener to gconfd logfile; won't be able to re-"
@@ -1086,7 +1115,7 @@ msgstr ""
 "Error al anotar la adici�n de un servicio al archivo de log de gconfd. No "
 "ser� capaz de restaurar el servicio si se cierra gconfd (%s)"
 
-#: gconf/gconfd.c:2003
+#: gconf/gconfd.c:2015
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously re-"
@@ -1095,28 +1124,28 @@ msgstr ""
 "Error al anotar la sustracci�n de un servicio al archivo de log de gconfd. "
 "Puede que restaure err�neamente el servicio si se cierra gconfd (%s)"
 
-#: gconf/gconfd.c:2026 gconf/gconfd.c:2191
+#: gconf/gconfd.c:2038 gconf/gconfd.c:2203
 #, c-format
 msgid "Failed to get IOR for client: %s"
 msgstr "Error al obtener IOR para el cliente: %s"
 
-#: gconf/gconfd.c:2041
+#: gconf/gconfd.c:2053
 #, c-format
 msgid "Failed to open saved state file: %s"
 msgstr "No pude abrir el archivo de estado guardado: %s"
 
-#: gconf/gconfd.c:2054
+#: gconf/gconfd.c:2066
 #, c-format
 msgid "Failed to write client add to saved state file: %s"
 msgstr ""
 "Error al escribir la adici�n del cliente al archivo de estado guardado: %s"
 
-#: gconf/gconfd.c:2062
+#: gconf/gconfd.c:2074
 #, c-format
 msgid "Failed to flush client add to saved state file: %s"
 msgstr "Error al escribir la adici�n del cliente al archivo de estado: %s"
 
-#: gconf/gconfd.c:2152
+#: gconf/gconfd.c:2164
 msgid ""
 "Some client removed itself from the GConf server when it hadn't been added."
 msgstr ""
@@ -1395,307 +1424,311 @@ msgstr ""
 "--direct\n"
 
 #: gconf/gconftool.c:525
+msgid "You should use --direct when using a non-default configuration source\n"
+msgstr ""
+
+#: gconf/gconftool.c:531
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "Error al iniciar GConf: %s\n"
 
-#: gconf/gconftool.c:550
+#: gconf/gconftool.c:566
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "Debe asignar un valor a la variable de entorno GCONF_CONFIG_SOURCE\n"
 
-#: gconf/gconftool.c:576
+#: gconf/gconftool.c:595
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Error al acceder a la(s) fuente(s) de configuraci�n: %s\n"
 
-#: gconf/gconftool.c:787
+#: gconf/gconftool.c:796
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Error al cerrar el programa: %s\n"
 
-#: gconf/gconftool.c:830
+#: gconf/gconftool.c:839
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr "Debe especificar uno o mas directorios para listar recursivamente.\n"
 
-#: gconf/gconftool.c:864
+#: gconf/gconftool.c:873
 #, c-format
 msgid "Failure listing entries in `%s': %s\n"
 msgstr "Error al listar las entradas en `%s': %s\n"
 
-#: gconf/gconftool.c:882
+#: gconf/gconftool.c:891
 msgid "(no value set)"
 msgstr "(no hay valor asignado)"
 
-#: gconf/gconftool.c:937
+#: gconf/gconftool.c:946
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Error al reiniciar el servidor de configuraciones (gconfd): %s\n"
 
-#: gconf/gconftool.c:951
+#: gconf/gconftool.c:960
 msgid "Must specify a key or keys to get\n"
 msgstr "Debe especificar una clave o claves para obtener\n"
 
-#: gconf/gconftool.c:986
+#: gconf/gconftool.c:995
 #, c-format
 msgid "Type: %s\n"
 msgstr "Tipo: %s\n"
 
-#: gconf/gconftool.c:987
+#: gconf/gconftool.c:996
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Tipo de Lista: %s\n"
 
-#: gconf/gconftool.c:988
+#: gconf/gconftool.c:997
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Tipo de Car: %s\n"
 
-#: gconf/gconftool.c:989
+#: gconf/gconftool.c:998
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Tipo de Cdr: %s\n"
 
-#: gconf/gconftool.c:994
+#: gconf/gconftool.c:1003
 #, c-format
 msgid "Default Value: %s\n"
 msgstr "Valor por defecto: %s\n"
 
-#: gconf/gconftool.c:994 gconf/gconftool.c:996 gconf/gconftool.c:997
-#: gconf/gconftool.c:998
+#: gconf/gconftool.c:1003 gconf/gconftool.c:1005 gconf/gconftool.c:1006
+#: gconf/gconftool.c:1007
 msgid "Unset"
 msgstr "Sin asignar"
 
-#: gconf/gconftool.c:996
+#: gconf/gconftool.c:1005
 #, c-format
 msgid "Owner: %s\n"
 msgstr "Due�o: %s\n"
 
-#: gconf/gconftool.c:997
+#: gconf/gconftool.c:1006
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Descripci�n corta: %s\n"
 
-#: gconf/gconftool.c:998
+#: gconf/gconftool.c:1007
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Descripci�n larga: %s\n"
 
-#: gconf/gconftool.c:1007 gconf/gconftool.c:1301
+#: gconf/gconftool.c:1016 gconf/gconftool.c:1310
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "No se ha asignado valor a `%s'\n"
 
-#: gconf/gconftool.c:1011 gconf/gconftool.c:1305
+#: gconf/gconftool.c:1020 gconf/gconftool.c:1314
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Error al obtener un valor para `%s': %s\n"
 
-#: gconf/gconftool.c:1054 gconf/gconftool.c:1066
+#: gconf/gconftool.c:1063 gconf/gconftool.c:1075
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "No entiendo el tipo `%s'\n"
 
-#: gconf/gconftool.c:1078
+#: gconf/gconftool.c:1087
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Debe especificar alternativamente claves/valores como argumentos\n"
 
-#: gconf/gconftool.c:1098
+#: gconf/gconftool.c:1107
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "No hay valor asignado para la clave: `%s'\n"
 
-#: gconf/gconftool.c:1126
+#: gconf/gconftool.c:1135
 msgid "Cannot set schema as value\n"
 msgstr "No puede asignar un esquema como valor\n"
 
-#: gconf/gconftool.c:1136
+#: gconf/gconftool.c:1145
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr "Cuando asigne una lista debe especificar un tipo de lista primitivo\n"
 
-#: gconf/gconftool.c:1150
+#: gconf/gconftool.c:1159
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 "Cuando asigne un par debe especificar un tipo car y un tipo cdr primitivos\n"
 
-#: gconf/gconftool.c:1165
+#: gconf/gconftool.c:1174
 #, c-format
 msgid "Error: %s\n"
 msgstr "Error: %s\n"
 
-#: gconf/gconftool.c:1178
+#: gconf/gconftool.c:1187
 #, c-format
 msgid "Error setting value: %s\n"
 msgstr "Error asignando valor: %s\n"
 
-#: gconf/gconftool.c:1196
+#: gconf/gconftool.c:1205
 #, c-format
 msgid "Error syncing: %s\n"
 msgstr "Error sincronizando: %s\n"
 
-#: gconf/gconftool.c:1219
+#: gconf/gconftool.c:1228
 msgid "Must specify a key or keys on the command line\n"
 msgstr "Debe especificar una clave o claves en la l�nea de comandos\n"
 
-#: gconf/gconftool.c:1239
+#: gconf/gconftool.c:1248
 #, c-format
 msgid "No schema known for `%s'\n"
 msgstr "No hay ning�n schema conocido para `%s'\n"
 
-#: gconf/gconftool.c:1272
+#: gconf/gconftool.c:1281
 #, c-format
 msgid "No doc string stored in schema at '%s'\n"
 msgstr "No hay ninguna cadena doc guardada en el schema en '%s'\n"
 
-#: gconf/gconftool.c:1277
+#: gconf/gconftool.c:1286
 #, c-format
 msgid "Error getting schema at '%s': %s\n"
 msgstr "Error al obtener el esquema de `%s': %s\n"
 
-#: gconf/gconftool.c:1284
+#: gconf/gconftool.c:1293
 #, c-format
 msgid "No schema stored at '%s'\n"
 msgstr "No hay ning�n schema guardado en `%s'\n"
 
-#: gconf/gconftool.c:1287
+#: gconf/gconftool.c:1296
 #, c-format
 msgid "Value at '%s' is not a schema\n"
 msgstr "El valor en '%s' no es un schema\n"
 
-#: gconf/gconftool.c:1343
+#: gconf/gconftool.c:1352
 msgid "Must specify a schema name followed by the key name to apply it to\n"
 msgstr ""
 "Debe especificar un nombre de schema seguido por el nombre de la clave para "
 "aplicarlo a\n"
 
-#: gconf/gconftool.c:1350
+#: gconf/gconftool.c:1359
 #, c-format
 msgid "Error associating schema name '%s' with key name '%s': %s\n"
 msgstr "Error al asociar el esquema `%s' con la clave `%s': %s\n"
 
-#: gconf/gconftool.c:1370
+#: gconf/gconftool.c:1379
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "Debe especificar una clave (nombre de esquema) como �nico argumento\n"
 
-#: gconf/gconftool.c:1412
+#: gconf/gconftool.c:1421
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr "El tipo de la lista debe ser primitivo: string, int, float o bool\n"
 
-#: gconf/gconftool.c:1432
+#: gconf/gconftool.c:1441
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr "El tipo del par car debe ser primitivo: string, int, float o bool\n"
 
-#: gconf/gconftool.c:1452
+#: gconf/gconftool.c:1461
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr "El tipo del par cdr debe ser primitivo: string, int, float o bool\n"
 
-#: gconf/gconftool.c:1467
+#: gconf/gconftool.c:1476
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Error asignando valor: %s"
 
-#: gconf/gconftool.c:1481
+#: gconf/gconftool.c:1490
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Error sincronizando: %s"
 
-#: gconf/gconftool.c:1496
+#: gconf/gconftool.c:1505
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "Debe especificar uno o m�s directorios donde obtener los pares clave/valor.\n"
 
-#: gconf/gconftool.c:1510
+#: gconf/gconftool.c:1519
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Debe especificar una o m�s claves para des-asignar.\n"
 
-#: gconf/gconftool.c:1521
+#: gconf/gconftool.c:1530
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Error des-asignando `%s': %s\n"
 
-#: gconf/gconftool.c:1544
+#: gconf/gconftool.c:1553
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "Debe especificar uno o m�s directorios de los que obtener subdirectorios.\n"
 
-#: gconf/gconftool.c:1578
+#: gconf/gconftool.c:1587
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Error listando directorios: %s\n"
 
-#: gconf/gconftool.c:1620
+#: gconf/gconftool.c:1629
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "AVISO: falta tipo o es err�neo para el esquema (%s)\n"
 
-#: gconf/gconftool.c:1629
+#: gconf/gconftool.c:1638
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "AVISO: falta tipo de lista o es err�neo para el esquema (%s)\n"
 
-#: gconf/gconftool.c:1640 gconf/gconftool.c:1670 gconf/gconftool.c:1699
+#: gconf/gconftool.c:1649 gconf/gconftool.c:1679 gconf/gconftool.c:1708
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 "AVISO: Error al analizar el valor por defecto `%s' para el esquema (%s)\n"
 
-#: gconf/gconftool.c:1658
+#: gconf/gconftool.c:1667
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr "AVISO: falta tipo car o cdr o es err�neo para el esquema (%s)\n"
 
-#: gconf/gconftool.c:1683
+#: gconf/gconftool.c:1692
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "AVISO: No puede asignar un valor por defecto para el esquema\n"
 
-#: gconf/gconftool.c:1712
+#: gconf/gconftool.c:1721
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "AVISO: error interno en gconftool, GConfValueType desconocido\n"
 
-#: gconf/gconftool.c:1759 gconf/gconftool.c:1780 gconf/gconftool.c:1801
-#: gconf/gconftool.c:1822
+#: gconf/gconftool.c:1768 gconf/gconftool.c:1789 gconf/gconftool.c:1810
+#: gconf/gconftool.c:1831
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "AVISO: error al analizar el nombre del tipo `%s'\n"
 
-#: gconf/gconftool.c:1776
+#: gconf/gconftool.c:1785
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "AVISO: el tipo de lista solo puede ser int, float, string o bool y no `%s'\n"
 
-#: gconf/gconftool.c:1797
+#: gconf/gconftool.c:1806
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "AVISO: el tipo de car solo puede ser int, float, string o bool y no `%s'\n"
 
-#: gconf/gconftool.c:1818
+#: gconf/gconftool.c:1827
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "AVISO: el tipo de cdr solo puede ser int, float, string o bool y no `%s'\n"
 
-#: gconf/gconftool.c:1846
+#: gconf/gconftool.c:1855
 msgid "WARNING: empty <applyto> node"
 msgstr "AVISO: nodo <applyto> vac�o"
 
-#: gconf/gconftool.c:1849 gconf/gconftool.c:2112
+#: gconf/gconftool.c:1858 gconf/gconftool.c:2121
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "AVISO: nodo <%s> no comprendido en <schema>\n"
 
-#: gconf/gconftool.c:1859
+#: gconf/gconftool.c:1868
 msgid "WARNING: no key specified for schema\n"
 msgstr "AVISO: no hay clave especificada para el esquema\n"
 
-#: gconf/gconftool.c:1892
+#: gconf/gconftool.c:1901
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "AVISO: nodo <locale> no tiene atributo `name=\"locale\"', ignor�ndolo\n"
 
-#: gconf/gconftool.c:1898
+#: gconf/gconftool.c:1907
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1703,51 +1736,51 @@ msgstr ""
 "AVISO: m�ltiples nodos <locale> para el locale `%s', ignorando todos despu�s "
 "del primero\n"
 
-#: gconf/gconftool.c:1979
+#: gconf/gconftool.c:1988
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "AVISO: Nodo <%s> inv�lido en un nodo <locale>\n"
 
-#: gconf/gconftool.c:2008
+#: gconf/gconftool.c:2017
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "AVISO: error al instalar esquema `%s' locale `%s': %s\n"
 
-#: gconf/gconftool.c:2016
+#: gconf/gconftool.c:2025
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Instalado el esquema `%s' para el locale `%s'\n"
 
-#: gconf/gconftool.c:2038
+#: gconf/gconftool.c:2047
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "AVISO: error al asociar el esquema `%s' con la clave `%s': %s\n"
 
-#: gconf/gconftool.c:2046
+#: gconf/gconftool.c:2055
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Adjuntado esquema `%s' a la clave `%s'\n"
 
-#: gconf/gconftool.c:2125
+#: gconf/gconftool.c:2134
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "Debe tener al menos una entrada <locale> en un <schema>\n"
 
-#: gconf/gconftool.c:2154
+#: gconf/gconftool.c:2165
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "AVISO: no comprend� el nodo <%s> bajo <schemalist>\n"
 
-#: gconf/gconftool.c:2176
+#: gconf/gconftool.c:2188
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Error al abrir `%s': %s\n"
 
-#: gconf/gconftool.c:2183
+#: gconf/gconftool.c:2195
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "�El documento `%s' esta vac�o?\n"
 
-#: gconf/gconftool.c:2195
+#: gconf/gconftool.c:2207
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1756,26 +1789,26 @@ msgstr ""
 "El documento `%s' tiene un tipo err�neo para el nodo ra�z (<%s>, debe ser "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:2208
+#: gconf/gconftool.c:2220
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "El documento `%s' no tiene node <gconfschemafile> de nivel superior\n"
 
-#: gconf/gconftool.c:2222
+#: gconf/gconftool.c:2234
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "AVISO: no comprend� el nodo <%s> bajo <gconfschemafile>\n"
 
-#: gconf/gconftool.c:2233 gconf/gconftool.c:2265
+#: gconf/gconftool.c:2245 gconf/gconftool.c:2277
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Error sincronizando datos: %s"
 
-#: gconf/gconftool.c:2249
+#: gconf/gconftool.c:2261
 msgid "Must specify some schema files to install\n"
 msgstr "Debe especificar algunos archivos de esquema a instalar\n"
 
-#: gconf/gconftool.c:2286
+#: gconf/gconftool.c:2298
 #, c-format
 msgid ""
 "\n"
@@ -1784,16 +1817,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2306
+#: gconf/gconftool.c:2318
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Error al des-asignar la clave de rotura %s: %s\n"
 
-#: gconf/gconftool.c:2432
+#: gconf/gconftool.c:2444
 msgid "Must specify some keys to break\n"
 msgstr "Debe especificar algunas claves a romper\n"
 
-#: gconf/gconftool.c:2438
+#: gconf/gconftool.c:2450
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1802,11 +1835,11 @@ msgstr ""
 "Tratando de romper su aplicaci�n asignando valores err�neos para la clave:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2456
+#: gconf/gconftool.c:2468
 msgid "Must specify some directories to break\n"
 msgstr "Debe especificar algunos directorios a romper\n"
 
-#: gconf/gconftool.c:2475
+#: gconf/gconftool.c:2487
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1832,6 +1865,9 @@ msgstr "Aviso GConf: error al listar los pares en `%s': %s"
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "Esperaba `%s' y obtuve `%s' para la clave %s"
 
+#~ msgid "%s"
+#~ msgstr "%s"
+
 #~ msgid "Failed to convert IOR '%s' to an object reference"
 #~ msgstr "Error al convertir IOR '%s' a una referencia a un objeto"
 
diff --git a/po/eu.po b/po/eu.po
index 3b0e7db7..9baaa23d 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf-1-0 1.0.7\n"
-"POT-Creation-Date: 2002-01-02 14:11+0100\n"
+"POT-Creation-Date: 2002-02-04 18:21-0500\n"
 "PO-Revision-Date: 2001-05-25 13:35+0200\n"
 "Last-Translator: Josu Wali�o <josu@elhuyar.com>\n"
 "Language-Team: Euskara\n"
@@ -663,12 +663,12 @@ msgstr "Huts egin du %s sortzean: %s "
 msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:3060
+#: gconf/gconf-internals.c:3064
 #, fuzzy, c-format
 msgid "Failed to launch configuration server: %s\n"
 msgstr "Huts egin du konfigurazio-iturburu hauek atzitzean: %s\n"
 
-#: gconf/gconf-internals.c:3084
+#: gconf/gconf-internals.c:3088
 msgid ""
 "Failed to contact configuration server (a likely cause of this is that you "
 "have an existing configuration server (gconfd) running, but it isn't "
@@ -676,46 +676,46 @@ msgid ""
 "need to enable TCP networking for ORBit)\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:3720
+#: gconf/gconf-internals.c:3724
 #, fuzzy, c-format
 msgid "Failed to read from child pipe (%s)"
 msgstr "Huts egin du blokeatutako fitxategi hau askatzean: %s "
 
-#: gconf/gconf-internals.c:3785
+#: gconf/gconf-internals.c:3789
 #, fuzzy, c-format
 msgid "Failed to fork (%s)"
 msgstr "Huts egin du %s sortzean: %s "
 
-#: gconf/gconf-internals.c:3925
+#: gconf/gconf-internals.c:3929
 #, fuzzy, c-format
 msgid "Failed to change to directory '%s' (%s)"
 msgstr "Huts egin du `%s' direktorio blokeatua askatzean: %s "
 
-#: gconf/gconf-internals.c:3935
+#: gconf/gconf-internals.c:3939
 #, fuzzy, c-format
 msgid "Failed to execute child process (%s)"
 msgstr "Huts egin du `%s' fitxategi zaharra ezabatzean: %s "
 
-#: gconf/gconf-internals.c:3944
+#: gconf/gconf-internals.c:3948
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:3953
+#: gconf/gconf-internals.c:3957
 #, fuzzy, c-format
 msgid "Failed to fork child process (%s)"
 msgstr "Huts egin du `%s' iturburua kargatzean: %s "
 
-#: gconf/gconf-internals.c:3961
+#: gconf/gconf-internals.c:3965
 msgid "Unknown error executing child process"
 msgstr ""
 
-#: gconf/gconf-internals.c:3982
+#: gconf/gconf-internals.c:3986
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:4032
+#: gconf/gconf-internals.c:4036
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index fda65bd1..a706f242 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf 1.0.7\n"
-"POT-Creation-Date: 2002-01-26 17:00+0200\n"
+"POT-Creation-Date: 2002-02-04 18:21-0500\n"
 "PO-Revision-Date: 2002-01-26 14:01+0200\n"
 "Last-Translator: Pauli Virtanen <pauli.virtanen@saunalahti.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
diff --git a/po/fr.po b/po/fr.po
index 06000993..70204628 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf 1.0.7\n"
-"POT-Creation-Date: 2002-01-05 20:51+0100\n"
+"POT-Creation-Date: 2002-02-04 18:21-0500\n"
 "PO-Revision-Date: 2002-01-05 20:51+0100\n"
 "Last-Translator: Christophe Merlet (RedFox) <redfox@eikonex.org>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
@@ -157,7 +157,8 @@ msgstr "Ignore l'entr�e sans nom dans le fichier XML � %s �"
 #, c-format
 msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
 msgstr ""
-"Un noeud racine dans le fichier XML � %s � est <%s> au lieu de <entry>, ignore"
+"Un noeud racine dans le fichier XML � %s � est <%s> au lieu de <entry>, "
+"ignore"
 
 #: backends/xml-dir.c:1066
 #, c-format
@@ -614,8 +615,8 @@ msgid ""
 "operating system has NFS file locking misconfigured (%s)"
 msgstr ""
 "Impossible de verrouiller � %s � : un autre process a probablement le "
-"verrou, ou votre syst�me d'exploitation a le v�rouillage de fichier "
-"NFS mal configur� (%s)"
+"verrou, ou votre syst�me d'exploitation a le v�rouillage de fichier NFS mal "
+"configur� (%s)"
 
 #: gconf/gconf-internals.c:2548
 #, c-format
@@ -681,12 +682,12 @@ msgstr ""
 "Impossible de cr�er un tube pour communiquer avec les d�mons gconf cr��s : %"
 "s\n"
 
-#: gconf/gconf-internals.c:3060
+#: gconf/gconf-internals.c:3064
 #, c-format
 msgid "Failed to launch configuration server: %s\n"
 msgstr "Impossible de lancer le serveur de configuration : %s\n"
 
-#: gconf/gconf-internals.c:3084
+#: gconf/gconf-internals.c:3088
 msgid ""
 "Failed to contact configuration server (a likely cause of this is that you "
 "have an existing configuration server (gconfd) running, but it isn't "
@@ -699,46 +700,46 @@ msgstr ""
 "connect� depuis deux machines � la fois, vous pouvez avoir besoin d'activer "
 "le r�seau TCP/IP pour ORBit)\n"
 
-#: gconf/gconf-internals.c:3720
+#: gconf/gconf-internals.c:3724
 #, c-format
 msgid "Failed to read from child pipe (%s)"
 msgstr "Impossible de lire depuis le tube fils (%s)"
 
-#: gconf/gconf-internals.c:3785
+#: gconf/gconf-internals.c:3789
 #, c-format
 msgid "Failed to fork (%s)"
 msgstr "Impossible de cloner (%s)"
 
-#: gconf/gconf-internals.c:3925
+#: gconf/gconf-internals.c:3929
 #, c-format
 msgid "Failed to change to directory '%s' (%s)"
 msgstr "Impossible de changer de r�pertoire � %s � (%s)"
 
-#: gconf/gconf-internals.c:3935
+#: gconf/gconf-internals.c:3939
 #, c-format
 msgid "Failed to execute child process (%s)"
 msgstr "Impossible d'ex�cuter le processus fils (%s)"
 
-#: gconf/gconf-internals.c:3944
+#: gconf/gconf-internals.c:3948
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
 msgstr "Impossible de rediriger la sortie ou l'entr�e du processus fils (%s)"
 
-#: gconf/gconf-internals.c:3953
+#: gconf/gconf-internals.c:3957
 #, c-format
 msgid "Failed to fork child process (%s)"
 msgstr "Impossible de cloner le processus enfant (%s)"
 
-#: gconf/gconf-internals.c:3961
+#: gconf/gconf-internals.c:3965
 msgid "Unknown error executing child process"
 msgstr "Erreur inconnue � l'ex�cution du processus enfant"
 
-#: gconf/gconf-internals.c:3982
+#: gconf/gconf-internals.c:3986
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr "Impossible de lire suffisemment de donn�e depuis le tube fils pid (%s)"
 
-#: gconf/gconf-internals.c:4032
+#: gconf/gconf-internals.c:4036
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr ""
@@ -1461,8 +1462,8 @@ msgstr ""
 #: gconf/gconftool.c:525
 msgid "You should use --direct when using a non-default configuration source\n"
 msgstr ""
-"Vous devez utiliser --direct quand vous utilisez une source de "
-"configuration personnalis�e\n"
+"Vous devez utiliser --direct quand vous utilisez une source de configuration "
+"personnalis�e\n"
 
 #: gconf/gconftool.c:531
 #, c-format
diff --git a/po/ga.po b/po/ga.po
index 0d3f47c2..4eef8d69 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf 1.0.4\n"
-"POT-Creation-Date: 2001-09-06 19:05+0200\n"
+"POT-Creation-Date: 2002-02-04 18:21-0500\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"
@@ -31,7 +31,7 @@ msgstr ""
 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
+#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1050
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr ""
@@ -45,26 +45,26 @@ msgstr ""
 msgid "Unloading XML backend module."
 msgstr ""
 
-#: backends/xml-backend.c:286
+#: backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr ""
 
-#: backends/xml-backend.c:386
+#: backends/xml-backend.c:414
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
 msgstr ""
 
-#: backends/xml-backend.c:396
+#: backends/xml-backend.c:424
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
 
-#: backends/xml-backend.c:680
+#: backends/xml-backend.c:708
 msgid "Initializing XML backend module"
 msgstr ""
 
-#: backends/xml-backend.c:745
+#: backends/xml-backend.c:773
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr ""
@@ -128,32 +128,32 @@ msgid "Failed to delete old file `%s': %s"
 msgstr ""
 
 #. These are all fatal errors
-#: backends/xml-dir.c:806
+#: backends/xml-dir.c:803
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:950
+#: backends/xml-dir.c:947
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:972
+#: backends/xml-dir.c:969
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:979
+#: backends/xml-dir.c:977
 #, c-format
-msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
+msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:1067
+#: backends/xml-dir.c:1066
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2494
+#: backends/xml-dir.c:1074
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr ""
@@ -164,11 +164,6 @@ msgstr ""
 msgid "Ignoring XML node with name `%s': %s"
 msgstr ""
 
-#: backends/xml-entry.c:200
-#, c-format
-msgid "%s"
-msgstr ""
-
 #: backends/xml-entry.c:327
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
@@ -331,7 +326,7 @@ msgid ""
 "result in a notification weirdly reappearing): %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1328
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr ""
@@ -440,174 +435,270 @@ msgstr ""
 msgid "No database available to save your configuration"
 msgstr ""
 
-#: gconf/gconf-internals.c:87
+#: gconf/gconf-internals.c:114
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:227
+#, c-format
+msgid "Invalid UTF-8 in string value in '%s'"
+msgstr ""
+
+#: gconf/gconf-internals.c:286
 msgid "Couldn't interpret CORBA value for list element"
 msgstr ""
 
-#: gconf/gconf-internals.c:253
+#: gconf/gconf-internals.c:288
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:266
+#: gconf/gconf-internals.c:301
 msgid "Received list from gconfd with a bad list type"
 msgstr ""
 
-#: gconf/gconf-internals.c:447
+#: gconf/gconf-internals.c:482
 msgid "Failed to convert object to IOR"
 msgstr ""
 
-#: gconf/gconf-internals.c:813
+#: gconf/gconf-internals.c:619
+msgid "Invalid UTF-8 in locale for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:627
+msgid "Invalid UTF-8 in short description for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:635
+msgid "Invalid UTF-8 in long description for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:643
+msgid "Invalid UTF-8 in owner for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:868
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:873
+#: gconf/gconf-internals.c:928
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:885
+#: gconf/gconf-internals.c:940
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:1327
+#: gconf/gconf-internals.c:1271 gconf/gconf-internals.c:1337
+#: gconf/gconf-value.c:125 gconf/gconf-value.c:224 gconf/gconf-value.c:366
+#: gconf/gconf-value.c:1084
+msgid "Text contains invalid UTF-8"
+msgstr ""
+
+#: gconf/gconf-internals.c:1422
 #, c-format
 msgid "Expected list, got %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1337
+#: gconf/gconf-internals.c:1432
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1476
+#: gconf/gconf-internals.c:1571
 #, c-format
 msgid "Expected pair, got %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1490
+#: gconf/gconf-internals.c:1585
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 
-#: gconf/gconf-internals.c:1506
+#: gconf/gconf-internals.c:1601
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:1622
+#: gconf/gconf-internals.c:1717
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:1684
+#: gconf/gconf-internals.c:1779
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:2164 gconf/gconf.c:3092
+#: gconf/gconf-internals.c:1915
+msgid "Encoded value is not valid UTF-8"
+msgstr ""
+
+#: gconf/gconf-internals.c:2265 gconf/gconf.c:3082
 #, c-format
 msgid "CORBA error: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2180
+#: gconf/gconf-internals.c:2281
 #, c-format
 msgid "OAF problem description: '%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2186
+#: gconf/gconf-internals.c:2287
 msgid "attempt to remove not-listed OAF object directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2191
+#: gconf/gconf-internals.c:2292
 msgid "attempt to add already-listed OAF directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2198
+#: gconf/gconf-internals.c:2299
 #, c-format
 msgid "OAF parse error: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2203
+#: gconf/gconf-internals.c:2304
 msgid "Unknown OAF error"
 msgstr ""
 
-#: gconf/gconf-internals.c:2290
+#: gconf/gconf-internals.c:2437
 #, c-format
-msgid "No ior file in `%s'"
+msgid "Could not lock temporary file '%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2321
+#: gconf/gconf-internals.c:2464
 #, c-format
-msgid "gconfd taking lock `%s' from some other process"
+msgid "Could not create file '%s', probably because it already exists"
 msgstr ""
 
-#: gconf/gconf-internals.c:2332
+#: gconf/gconf-internals.c:2510
 #, c-format
-msgid "Another program has lock `%s'"
+msgid "Failed to create or open '%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2351
-msgid "couldn't contact ORB to ping existing gconfd"
-msgstr ""
-
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2520
 #, c-format
 msgid ""
-"Removing stale lock `%s' because IOR couldn't be converted to object "
-"reference, IOR `%s'"
+"Failed to lock '%s': probably another process has the lock, or your "
+"operating system has NFS file locking misconfigured (%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:2371
+#: gconf/gconf-internals.c:2548
 #, c-format
-msgid "Removing stale lock `%s' because of error pinging server: %s"
+msgid "IOR file '%s' not opened successfully, no gconfd located: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2383
+#: gconf/gconf-internals.c:2578
 #, c-format
-msgid "GConf configuration daemon (gconfd) has lock `%s'"
+msgid "gconftool or other non-gconfd process has the lock file '%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2397
+#: gconf/gconf-internals.c:2595
+msgid "couldn't contact ORB to resolve existing gconfd object reference"
+msgstr ""
+
+#: gconf/gconf-internals.c:2627
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2446
+#: gconf/gconf-internals.c:2686
 #, c-format
-msgid "Can't create lock `%s': %s"
+msgid "Can't write to file `%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2482
+#: gconf/gconf-internals.c:2727
 #, c-format
-msgid "Can't write to file `%s': %s"
+msgid "We didn't have the lock on file `%s', but we should have"
+msgstr ""
+
+#: gconf/gconf-internals.c:2748
+#, c-format
+msgid "Failed to link '%s' to '%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2532
+#: gconf/gconf-internals.c:2760
 #, c-format
-msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
+msgid "Failed to remove lock file `%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2549
+#: gconf/gconf-internals.c:2779
 #, c-format
-msgid "Corrupt lock file `%s', removing anyway"
+msgid "Failed to clean up file '%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2559
+#: gconf/gconf-internals.c:2793
 #, c-format
+msgid "Failed to remove lock directory `%s': %s"
+msgstr ""
+
+#: gconf/gconf-internals.c:3003 gconf/gconfd.c:580
+#, c-format
+msgid "Failed to create %s: %s"
+msgstr ""
+
+#: gconf/gconf-internals.c:3036
+#, c-format
+msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
+msgstr ""
+
+#: gconf/gconf-internals.c:3064
+#, c-format
+msgid "Failed to launch configuration server: %s\n"
+msgstr ""
+
+#: gconf/gconf-internals.c:3088
 msgid ""
-"Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
-"took our lock"
+"Failed to contact configuration server (a likely cause of this is that you "
+"have an existing configuration server (gconfd) running, but it isn't "
+"reachable from here - if you're logged in from two machines at once, you may "
+"need to enable TCP networking for ORBit)\n"
+msgstr ""
+
+#: gconf/gconf-internals.c:3724
+#, c-format
+msgid "Failed to read from child pipe (%s)"
+msgstr ""
+
+#: gconf/gconf-internals.c:3789
+#, c-format
+msgid "Failed to fork (%s)"
+msgstr ""
+
+#: gconf/gconf-internals.c:3929
+#, c-format
+msgid "Failed to change to directory '%s' (%s)"
+msgstr ""
+
+#: gconf/gconf-internals.c:3939
+#, c-format
+msgid "Failed to execute child process (%s)"
+msgstr ""
+
+#: gconf/gconf-internals.c:3948
+#, c-format
+msgid "Failed to redirect output or input of child process (%s)"
+msgstr ""
+
+#: gconf/gconf-internals.c:3957
+#, c-format
+msgid "Failed to fork child process (%s)"
+msgstr ""
+
+#: gconf/gconf-internals.c:3965
+msgid "Unknown error executing child process"
+msgstr ""
+
+#: gconf/gconf-internals.c:3986
+#, c-format
+msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:2576
+#: gconf/gconf-internals.c:4036
 #, c-format
-msgid "Failed to release lock directory `%s': %s"
+msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr ""
 
 #: gconf/gconf-sources.c:320
@@ -615,106 +706,108 @@ msgstr ""
 msgid "Failed to load source `%s': %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:510
+#: gconf/gconf-sources.c:544
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 
-#: gconf/gconf-sources.c:567
+#: gconf/gconf-sources.c:601
 msgid "The '/' name can only be a directory, not a key"
 msgstr ""
 
-#: gconf/gconf-sources.c:596
+#: gconf/gconf-sources.c:630
 #, 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
+#: gconf/gconf-sources.c:642
 #, 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 "
+"somehow we mistakenly created two gconfd processes. If you have two gconfd "
+"processes (or had two at the time the second was launched), logging out, "
+"killing all copies of gconfd, and logging back in may help. Perhaps the "
+"problem is that you attempted to use GConf from two machines at once, and "
+"ORBit still has its default configuration that prevents remote CORBA "
+"connections? As always, check the user.* syslog for details on problems "
 "gconfd encountered."
 msgstr ""
 
-#: gconf/gconf-sources.c:1164
+#: gconf/gconf-sources.c:1198
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:1233
+#: gconf/gconf-sources.c:1267
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:1257
+#: gconf/gconf-sources.c:1291
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
 
-#: gconf/gconf-value.c:82
+#: gconf/gconf-value.c:81
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr ""
 
-#: gconf/gconf-value.c:92
+#: gconf/gconf-value.c:91
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr ""
 
-#: gconf/gconf-value.c:113
+#: gconf/gconf-value.c:112
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr ""
 
-#: gconf/gconf-value.c:146
+#: gconf/gconf-value.c:156
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr ""
 
-#: gconf/gconf-value.c:214
+#: gconf/gconf-value.c:232
 #, c-format
 msgid "Didn't understand `%s' (list must start with a '[')"
 msgstr ""
 
-#: gconf/gconf-value.c:227
+#: gconf/gconf-value.c:245
 #, c-format
 msgid "Didn't understand `%s' (list must end with a ']')"
 msgstr ""
 
-#: gconf/gconf-value.c:278
+#: gconf/gconf-value.c:296
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
 msgstr ""
 
-#: gconf/gconf-value.c:309 gconf/gconf-value.c:462
+#: gconf/gconf-value.c:327 gconf/gconf-value.c:488
 #, c-format
 msgid "Didn't understand `%s' (extra trailing characters)"
 msgstr ""
 
-#: gconf/gconf-value.c:348
+#: gconf/gconf-value.c:374
 #, c-format
 msgid "Didn't understand `%s' (pair must start with a '(')"
 msgstr ""
 
-#: gconf/gconf-value.c:361
+#: gconf/gconf-value.c:387
 #, c-format
 msgid "Didn't understand `%s' (pair must end with a ')')"
 msgstr ""
 
-#: gconf/gconf-value.c:391 gconf/gconf-value.c:477
+#: gconf/gconf-value.c:417 gconf/gconf-value.c:503
 #, c-format
 msgid "Didn't understand `%s' (wrong number of elements)"
 msgstr ""
 
-#: gconf/gconf-value.c:431
+#: gconf/gconf-value.c:457
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr ""
@@ -724,322 +817,268 @@ msgstr ""
 msgid "`%s': %s"
 msgstr ""
 
-#: gconf/gconf.c:289
+#: gconf/gconf.c:287
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr ""
 
-#: gconf/gconf.c:574
+#: gconf/gconf.c:572
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 
-#: gconf/gconf.c:1870
+#: gconf/gconf.c:1868
 #, c-format
 msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr ""
 
-#: 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. "
-"This is a bug in the OAF package; something went wrong in OAF, and no error "
-"was reported. This is not a bug in the GConf package. Do not report a GConf "
-"bug unless you have information indicating what went wrong with OAF that was "
-"caused by GConf."
-msgstr ""
-
-#: gconf/gconf.c:2198
+#: gconf/gconf.c:2183
 msgid "Failed to init GConf, exiting\n"
 msgstr ""
 
-#: gconf/gconf.c:2235
+#: gconf/gconf.c:2220
 msgid "Must begin with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2257
+#: gconf/gconf.c:2242
 msgid "Can't have two slashes (/) in a row"
 msgstr ""
 
-#: gconf/gconf.c:2259
+#: gconf/gconf.c:2244
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2280
+#: gconf/gconf.c:2265
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr ""
 
-#: gconf/gconf.c:2294
+#: gconf/gconf.c:2279
 msgid "Key/directory may not end with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2547
+#: gconf/gconf.c:2520
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr ""
 
-#: gconf/gconf.c:2608
+#: gconf/gconf.c:2581
 #, c-format
 msgid "Expected float, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2643
+#: gconf/gconf.c:2616
 #, c-format
 msgid "Expected int, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2678
+#: gconf/gconf.c:2651
 #, c-format
 msgid "Expected string, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2715
+#: gconf/gconf.c:2688
 #, c-format
 msgid "Expected bool, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2748
+#: gconf/gconf.c:2721
 #, c-format
 msgid "Expected schema, got %s"
 msgstr ""
 
-#: gconf/gconfd.c:248
+#: gconf/gconfd.c:247
 msgid "Shutdown request received"
 msgstr ""
 
-#: gconf/gconfd.c:280
+#: gconf/gconfd.c:279
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr ""
 
-#: gconf/gconfd.c:298
+#: gconf/gconfd.c:297
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
 msgstr ""
 
-#: gconf/gconfd.c:307
+#: gconf/gconfd.c:306
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
 msgstr ""
 
-#: gconf/gconfd.c:307
+#: gconf/gconfd.c:306
 msgid "/path"
 msgstr ""
 
-#: gconf/gconfd.c:321
+#: gconf/gconfd.c:320
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr ""
 
-#: gconf/gconfd.c:333
+#: gconf/gconfd.c:332
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
 msgstr ""
 
-#: gconf/gconfd.c:350
+#: gconf/gconfd.c:349
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
 
-#: gconf/gconfd.c:376
+#: gconf/gconfd.c:375
 #, c-format
 msgid "Received signal %d, dumping core. Please report a GConf bug."
 msgstr ""
 
-#: gconf/gconfd.c:392
+#: gconf/gconfd.c:391
 #, c-format
 msgid ""
 "Received signal %d, shutting down abnormally. Please file a GConf bug report."
 msgstr ""
 
-#: gconf/gconfd.c:409
+#: gconf/gconfd.c:408
 #, 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:513
+#: gconf/gconfd.c:526
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr ""
 
-#: gconf/gconfd.c:540
-msgid ""
-"Failed to init Object Activation Framework: please mail bug report to OAF "
-"maintainers"
-msgstr ""
-
-#: gconf/gconfd.c:560
+#: gconf/gconfd.c:567
 msgid "Failed to get object reference for ConfigServer"
 msgstr ""
 
-#: gconf/gconfd.c:573
+#: gconf/gconfd.c:605
 #, c-format
-msgid "Failed to create %s: %s"
+msgid "Failed to write byte to pipe fd %d so client program may hang: %s"
 msgstr ""
 
-#. Bad hack alert - register the current lockholder with oafd,
-#. * since oafd seems to have forgotten about us.
-#.
-#: gconf/gconfd.c:588
+#: gconf/gconfd.c:615
 #, c-format
-msgid "Failed to get lock for daemon: %s"
+msgid "Failed to get lock for daemon, exiting: %s"
 msgstr ""
 
-#: gconf/gconfd.c:594
-msgid ""
-"Registering existing server with oafd, since OAF appears to have leaked it"
-msgstr ""
-
-#: gconf/gconfd.c:603
-msgid ""
-"OAF doesn't know about our IID; indicates broken installation; can't "
-"register existing server."
-msgstr ""
-
-#: gconf/gconfd.c:607
-msgid ""
-"Another gconfd already registered with OAF, so we can't register the "
-"existing server"
-msgstr ""
-
-#: gconf/gconfd.c:612
-msgid "Unknown error registering existing gconfd with OAF; exiting"
-msgstr ""
-
-#: gconf/gconfd.c:639
-msgid ""
-"OAF doesn't know about our IID; indicates broken installation; can't "
-"register; exiting\n"
-msgstr ""
-
-#: gconf/gconfd.c:643
-msgid "Another gconfd already registered with OAF; exiting\n"
-msgstr ""
-
-#: gconf/gconfd.c:648
-msgid "Unknown error registering gconfd with OAF; exiting\n"
-msgstr ""
-
-#: gconf/gconfd.c:692
-#, c-format
-msgid "Failed to release lockfile: %s"
-msgstr ""
+#: gconf/gconfd.c:657
+#, fuzzy, c-format
+msgid "Error releasing lockfile: %s"
+msgstr "Earr�id: %s\n"
 
-#: gconf/gconfd.c:700
+#: gconf/gconfd.c:665
 msgid "Exiting"
 msgstr "Ag eirigh as"
 
-#: gconf/gconfd.c:725
+#: gconf/gconfd.c:690
 msgid "GConf server is not in use, shutting down."
 msgstr ""
 
-#: gconf/gconfd.c:1084
+#: gconf/gconfd.c:1059
 #, c-format
 msgid "Returning exception: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1184
+#: gconf/gconfd.c:1159
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
 "gconfd shutdown (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1219
+#: gconf/gconfd.c:1194
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1288
+#: gconf/gconfd.c:1263
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1302
+#: gconf/gconfd.c:1277
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1311
+#: gconf/gconfd.c:1286
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1325
+#: gconf/gconfd.c:1300
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1335
+#: gconf/gconfd.c:1310
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1344
+#: gconf/gconfd.c:1319
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1819
+#: gconf/gconfd.c:1794
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr ""
 
-#: gconf/gconfd.c:1865
+#: gconf/gconfd.c:1840
 #, c-format
 msgid "Error reading saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1918
+#: gconf/gconfd.c:1893
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:2035
+#: gconf/gconfd.c:2010
 #, 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:2040
+#: gconf/gconfd.c:2015
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously re-"
 "add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:2063 gconf/gconfd.c:2228
+#: gconf/gconfd.c:2038 gconf/gconfd.c:2203
 #, c-format
 msgid "Failed to get IOR for client: %s"
 msgstr ""
 
-#: gconf/gconfd.c:2078
+#: gconf/gconfd.c:2053
 #, c-format
 msgid "Failed to open saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:2091
+#: gconf/gconfd.c:2066
 #, c-format
 msgid "Failed to write client add to saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:2099
+#: gconf/gconfd.c:2074
 #, c-format
 msgid "Failed to flush client add to saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:2189
+#: gconf/gconfd.c:2164
 msgid ""
 "Some client removed itself from the GConf server when it hadn't been added."
 msgstr ""
@@ -1282,339 +1321,332 @@ msgid ""
 msgstr ""
 
 #: gconf/gconftool.c:525
+msgid "You should use --direct when using a non-default configuration source\n"
+msgstr ""
+
+#: gconf/gconftool.c:531
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:550
+#: gconf/gconftool.c:566
 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:565
-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 ""
-
-#: gconf/gconftool.c:587
+#: gconf/gconftool.c:595
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:798
+#: gconf/gconftool.c:796
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:841
+#: gconf/gconftool.c:839
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 
-#: gconf/gconftool.c:875
+#: gconf/gconftool.c:873
 #, c-format
 msgid "Failure listing entries in `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:893
+#: gconf/gconftool.c:891
 msgid "(no value set)"
 msgstr ""
 
-#: gconf/gconftool.c:948
+#: gconf/gconftool.c:946
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:962
+#: gconf/gconftool.c:960
 msgid "Must specify a key or keys to get\n"
 msgstr ""
 
-#: gconf/gconftool.c:997
+#: gconf/gconftool.c:995
 #, c-format
 msgid "Type: %s\n"
 msgstr "Saghas: %s\n"
 
-#: gconf/gconftool.c:998
+#: gconf/gconftool.c:996
 #, fuzzy, c-format
 msgid "List Type: %s\n"
 msgstr "Saghas: %s\n"
 
-#: gconf/gconftool.c:999
+#: gconf/gconftool.c:997
 #, fuzzy, c-format
 msgid "Car Type: %s\n"
 msgstr "Saghas: %s\n"
 
-#: gconf/gconftool.c:1000
+#: gconf/gconftool.c:998
 #, fuzzy, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Saghas: %s\n"
 
-#: gconf/gconftool.c:1005
+#: gconf/gconftool.c:1003
 #, c-format
 msgid "Default Value: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1005 gconf/gconftool.c:1007 gconf/gconftool.c:1008
-#: gconf/gconftool.c:1009
+#: gconf/gconftool.c:1003 gconf/gconftool.c:1005 gconf/gconftool.c:1006
+#: gconf/gconftool.c:1007
 msgid "Unset"
 msgstr ""
 
-#: gconf/gconftool.c:1007
+#: gconf/gconftool.c:1005
 #, c-format
 msgid "Owner: %s\n"
 msgstr "�in�ar: %s\n"
 
-#: gconf/gconftool.c:1008
+#: gconf/gconftool.c:1006
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1009
+#: gconf/gconftool.c:1007
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1018 gconf/gconftool.c:1312
+#: gconf/gconftool.c:1016 gconf/gconftool.c:1310
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1022 gconf/gconftool.c:1316
+#: gconf/gconftool.c:1020 gconf/gconftool.c:1314
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1065 gconf/gconftool.c:1077
+#: gconf/gconftool.c:1063 gconf/gconftool.c:1075
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1089
+#: gconf/gconftool.c:1087
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr ""
 
-#: gconf/gconftool.c:1109
+#: gconf/gconftool.c:1107
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1137
+#: gconf/gconftool.c:1135
 msgid "Cannot set schema as value\n"
 msgstr ""
 
-#: gconf/gconftool.c:1147
+#: gconf/gconftool.c:1145
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1161
+#: gconf/gconftool.c:1159
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1176
+#: gconf/gconftool.c:1174
 #, c-format
 msgid "Error: %s\n"
 msgstr "Earr�id: %s\n"
 
-#: gconf/gconftool.c:1189
+#: gconf/gconftool.c:1187
 #, c-format
 msgid "Error setting value: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1207
+#: gconf/gconftool.c:1205
 #, fuzzy, c-format
 msgid "Error syncing: %s\n"
 msgstr "Earr�id: %s\n"
 
-#: gconf/gconftool.c:1230
+#: gconf/gconftool.c:1228
 msgid "Must specify a key or keys on the command line\n"
 msgstr ""
 
-#: gconf/gconftool.c:1250
+#: gconf/gconftool.c:1248
 #, c-format
 msgid "No schema known for `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1283
+#: gconf/gconftool.c:1281
 #, c-format
 msgid "No doc string stored in schema at '%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1288
+#: gconf/gconftool.c:1286
 #, c-format
 msgid "Error getting schema at '%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1295
+#: gconf/gconftool.c:1293
 #, c-format
 msgid "No schema stored at '%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1298
+#: gconf/gconftool.c:1296
 #, c-format
 msgid "Value at '%s' is not a schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1354
+#: gconf/gconftool.c:1352
 msgid "Must specify a schema name followed by the key name to apply it to\n"
 msgstr ""
 
-#: gconf/gconftool.c:1361
+#: gconf/gconftool.c:1359
 #, c-format
 msgid "Error associating schema name '%s' with key name '%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1381
+#: gconf/gconftool.c:1379
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr ""
 
-#: gconf/gconftool.c:1423
+#: gconf/gconftool.c:1421
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1443
+#: gconf/gconftool.c:1441
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1463
+#: gconf/gconftool.c:1461
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1478
+#: gconf/gconftool.c:1476
 #, c-format
 msgid "Error setting value: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1492
+#: gconf/gconftool.c:1490
 #, c-format
 msgid "Error syncing: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1507
+#: gconf/gconftool.c:1505
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1521
+#: gconf/gconftool.c:1519
 msgid "Must specify one or more keys to unset.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1532
+#: gconf/gconftool.c:1530
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1555
+#: gconf/gconftool.c:1553
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1589
+#: gconf/gconftool.c:1587
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1631
+#: gconf/gconftool.c:1629
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1640
+#: gconf/gconftool.c:1638
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1651 gconf/gconftool.c:1681 gconf/gconftool.c:1710
+#: gconf/gconftool.c:1649 gconf/gconftool.c:1679 gconf/gconftool.c:1708
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1669
+#: gconf/gconftool.c:1667
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1694
+#: gconf/gconftool.c:1692
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1723
+#: gconf/gconftool.c:1721
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr ""
 
-#: gconf/gconftool.c:1770 gconf/gconftool.c:1791 gconf/gconftool.c:1812
-#: gconf/gconftool.c:1833
+#: gconf/gconftool.c:1768 gconf/gconftool.c:1789 gconf/gconftool.c:1810
+#: gconf/gconftool.c:1831
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1787
+#: gconf/gconftool.c:1785
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1808
+#: gconf/gconftool.c:1806
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1829
+#: gconf/gconftool.c:1827
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1857
+#: gconf/gconftool.c:1855
 msgid "WARNING: empty <applyto> node"
 msgstr ""
 
-#: gconf/gconftool.c:1860 gconf/gconftool.c:2123
+#: gconf/gconftool.c:1858 gconf/gconftool.c:2121
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1870
+#: gconf/gconftool.c:1868
 msgid "WARNING: no key specified for schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1903
+#: gconf/gconftool.c:1901
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 
-#: gconf/gconftool.c:1909
+#: gconf/gconftool.c:1907
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 
-#: gconf/gconftool.c:1990
+#: gconf/gconftool.c:1988
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:2019
+#: gconf/gconftool.c:2017
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2027
+#: gconf/gconftool.c:2025
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:2049
+#: gconf/gconftool.c:2047
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2057
+#: gconf/gconftool.c:2055
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:2136
+#: gconf/gconftool.c:2134
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr ""
 
@@ -1623,43 +1655,43 @@ msgstr ""
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr ""
 
-#: gconf/gconftool.c:2187
+#: gconf/gconftool.c:2188
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2194
+#: gconf/gconftool.c:2195
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Is Cap�is '`%s' folamh?\n"
 
-#: gconf/gconftool.c:2206
+#: gconf/gconftool.c:2207
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
 "<gconfschemafile>)\n"
 msgstr ""
 
-#: gconf/gconftool.c:2219
+#: gconf/gconftool.c:2220
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:2233
+#: gconf/gconftool.c:2234
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr ""
 
-#: gconf/gconftool.c:2244 gconf/gconftool.c:2276
+#: gconf/gconftool.c:2245 gconf/gconftool.c:2277
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr ""
 
-#: gconf/gconftool.c:2260
+#: gconf/gconftool.c:2261
 msgid "Must specify some schema files to install\n"
 msgstr ""
 
-#: gconf/gconftool.c:2297
+#: gconf/gconftool.c:2298
 #, c-format
 msgid ""
 "\n"
@@ -1668,27 +1700,27 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2317
+#: gconf/gconftool.c:2318
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2443
+#: gconf/gconftool.c:2444
 msgid "Must specify some keys to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2449
+#: gconf/gconftool.c:2450
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
 "  %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2467
+#: gconf/gconftool.c:2468
 msgid "Must specify some directories to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2486
+#: gconf/gconftool.c:2487
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
diff --git a/po/gl.po b/po/gl.po
index cbdf8476..f30dc7d1 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 12:04+0200\n"
+"POT-Creation-Date: 2002-02-04 18:21-0500\n"
 "PO-Revision-Date: 2001-08-19 15:13+0200\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -36,7 +36,7 @@ msgstr "Inicializando o m�dulo BDB"
 msgid "Couldn't find the %s root directory in the address `%s'"
 msgstr "Non se atopou o directorio ra�z de %s no enderezo `%s'"
 
-#: backends/dir-utils.c:124 backends/xml-backend.c:301 backends/xml-dir.c:1051
+#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1050
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Non foi posible crear o directorio `%s': %s"
@@ -50,26 +50,26 @@ msgstr "Non se pode ler ou escribir no directorio ra�z de %s no enderezo `%s'"
 msgid "Unloading XML backend module."
 msgstr "Descargando o m�dulo XML."
 
-#: backends/xml-backend.c:286
+#: backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Non se atopou o directorio ra�z de XML no enderezo `%s'"
 
-#: backends/xml-backend.c:386
+#: backends/xml-backend.c:414
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
 msgstr "Non se pode ler ou escribir no directorio ra�z de XML no enderezo `%s'"
 
-#: backends/xml-backend.c:396
+#: backends/xml-backend.c:424
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "Os permisos do directorio/ficheiro da fonte XML con ra�z %s son: %o/%o"
 
-#: backends/xml-backend.c:680
+#: backends/xml-backend.c:708
 msgid "Initializing XML backend module"
 msgstr "Inicializando o m�dulo XML"
 
-#: backends/xml-backend.c:745
+#: backends/xml-backend.c:773
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "Erro ao eliminar o bloqueo no directorio de XML `%s': %s"
@@ -138,32 +138,32 @@ msgid "Failed to delete old file `%s': %s"
 msgstr "Erro ao borrar o ficheiro antigo `%s': %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:806
+#: backends/xml-dir.c:803
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Erro ao facer stat de `%s': %s"
 
-#: backends/xml-dir.c:950
+#: backends/xml-dir.c:947
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Entrada `%s' duplicada en `%s', ignorando"
 
-#: backends/xml-dir.c:972
+#: backends/xml-dir.c:969
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "Entrada sen nome no ficheiro XML `%s', ignorando"
 
-#: backends/xml-dir.c:979
-#, c-format
-msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
+#: backends/xml-dir.c:977
+#, fuzzy, c-format
+msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
 msgstr "O n� de nivel superior no ficheiro XML `%s' non � <entry>, ignorando"
 
-#: backends/xml-dir.c:1067
+#: backends/xml-dir.c:1066
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Erro ao crear o ficheiro `%s': %s"
 
-#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2494
+#: backends/xml-dir.c:1074
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Erro ao pechar o ficheiro `%s': %s"
@@ -174,11 +174,6 @@ msgstr "Erro ao pechar o ficheiro `%s': %s"
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "Ignorando o n� XML co nome `%s': %s"
 
-#: backends/xml-entry.c:200
-#, c-format
-msgid "%s"
-msgstr "%s"
-
 #: backends/xml-entry.c:327
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
@@ -300,7 +295,9 @@ msgstr "Recibiuse un valor non v�lido na petici�n de establecer"
 #: gconf/gconf-database.c:240
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
-msgstr "Non ten sentido o valor CORBA recibido na petici�n de establecer para a clave `%s'"
+msgstr ""
+"Non ten sentido o valor CORBA recibido na petici�n de establecer para a "
+"clave `%s'"
 
 #: gconf/gconf-database.c:518
 msgid "Received request to drop all cached data"
@@ -312,7 +309,8 @@ msgstr "Recibiuse unha petici�n de sincronizar sincronizadamente"
 
 #: gconf/gconf-database.c:770
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
-msgstr "Erro moi grave: fallo ao obter a referencia de obxecto para ConfigDatabase"
+msgstr ""
+"Erro moi grave: fallo ao obter a referencia de obxecto para ConfigDatabase"
 
 #: gconf/gconf-database.c:929
 #, c-format
@@ -348,7 +346,7 @@ msgstr ""
 "Erro ao eliminar un cliente do ficheiro de rexistro (probablemente sen "
 "problemas, poder�a resultar unha notificaci�n reaparecendo): %s"
 
-#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1328
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Erro obtendo o valor para `%s': %s"
@@ -457,198 +455,290 @@ msgstr "Erro ao obter un bloqueo"
 msgid "No database available to save your configuration"
 msgstr "Non hai ningunha base de datos dispo�ible para gardar a configuraci�n"
 
-#: gconf/gconf-internals.c:87
+#: gconf/gconf-internals.c:114
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "Non hai un '/' na clave `%s'"
 
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:227
+#, c-format
+msgid "Invalid UTF-8 in string value in '%s'"
+msgstr ""
+
+#: gconf/gconf-internals.c:286
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "Non foi posible interpretar o valor CORBA para o elemento da lista"
 
-#: gconf/gconf-internals.c:253
+#: gconf/gconf-internals.c:288
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "Tipo incorrecto para un elemento da lista en %s"
 
-#: gconf/gconf-internals.c:266
+#: gconf/gconf-internals.c:301
 msgid "Received list from gconfd with a bad list type"
 msgstr "Recibiuse unha lista de gconfd cun tipo de lista err�neo"
 
-#: gconf/gconf-internals.c:447
+#: gconf/gconf-internals.c:482
 msgid "Failed to convert object to IOR"
 msgstr "Erro ao convertir un obxecto a IOR"
 
-#: gconf/gconf-internals.c:813
+#: gconf/gconf-internals.c:619
+msgid "Invalid UTF-8 in locale for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:627
+msgid "Invalid UTF-8 in short description for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:635
+msgid "Invalid UTF-8 in long description for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:643
+msgid "Invalid UTF-8 in owner for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:868
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "Non foi posible abrir o ficheiro `%s': %s\n"
 
-#: gconf/gconf-internals.c:873
+#: gconf/gconf-internals.c:928
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "Engadindo a fonte `%s'\n"
 
-#: gconf/gconf-internals.c:885
+#: gconf/gconf-internals.c:940
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "Erro de lectura no ficheiro `%s': %s\n"
 
-#: gconf/gconf-internals.c:1327
+#: gconf/gconf-internals.c:1271 gconf/gconf-internals.c:1337
+#: gconf/gconf-value.c:125 gconf/gconf-value.c:224 gconf/gconf-value.c:366
+#: gconf/gconf-value.c:1084
+msgid "Text contains invalid UTF-8"
+msgstr ""
+
+#: gconf/gconf-internals.c:1422
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Agard�base unha lista, obteuse %s"
 
-#: gconf/gconf-internals.c:1337
+#: gconf/gconf-internals.c:1432
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "Agard�base unha lista de %s, obteuse unha lista de %s"
 
-#: gconf/gconf-internals.c:1476
+#: gconf/gconf-internals.c:1571
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Agard�base unha parella, obteuse %s"
 
-#: gconf/gconf-internals.c:1490
+#: gconf/gconf-internals.c:1585
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "Agard�base a parella (%s,%s), obteuse unha parella sen un ou os dous valores"
 
-#: gconf/gconf-internals.c:1506
+#: gconf/gconf-internals.c:1601
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "Agard�base unha parella de tipo (%s,%s), obteuse de tipo (%s,%s)"
 
-#: gconf/gconf-internals.c:1622
+#: gconf/gconf-internals.c:1717
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "A cadea entre comi�as non comeza con comi�as"
 
-#: gconf/gconf-internals.c:1684
+#: gconf/gconf-internals.c:1779
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "A cadea entre comi�as non remata con comi�as"
 
-#: gconf/gconf-internals.c:2164 gconf/gconf.c:3092
+#: gconf/gconf-internals.c:1915
+msgid "Encoded value is not valid UTF-8"
+msgstr ""
+
+#: gconf/gconf-internals.c:2265 gconf/gconf.c:3082
 #, c-format
 msgid "CORBA error: %s"
 msgstr "Erro de CORBA: %s"
 
-#: gconf/gconf-internals.c:2180
+#: gconf/gconf-internals.c:2281
 #, c-format
 msgid "OAF problem description: '%s'"
 msgstr "Descrici�n do problema de OAF: '%s'"
 
-#: gconf/gconf-internals.c:2186
+#: gconf/gconf-internals.c:2287
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "tentouse eliminar un directorio de obxectos OAF non listado"
 
-#: gconf/gconf-internals.c:2191
+#: gconf/gconf-internals.c:2292
 msgid "attempt to add already-listed OAF directory"
 msgstr "tentouse engadir un directorio de OAF xa listado"
 
-#: gconf/gconf-internals.c:2198
+#: gconf/gconf-internals.c:2299
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "Erro de an�lise de OAF: %s"
 
-#: gconf/gconf-internals.c:2203
+#: gconf/gconf-internals.c:2304
 msgid "Unknown OAF error"
 msgstr "Erro de OAF desco�ecido"
 
-#: gconf/gconf-internals.c:2290
-#, c-format
-msgid "No ior file in `%s'"
-msgstr "Non hai un ficheiro ior en `%s'"
-
-#: gconf/gconf-internals.c:2321
-#, c-format
-msgid "gconfd taking lock `%s' from some other process"
-msgstr "gconfd tomando o bloqueo `%s' dalg�n outro proceso"
+#: gconf/gconf-internals.c:2437
+#, fuzzy, c-format
+msgid "Could not lock temporary file '%s': %s"
+msgstr "Non foi posible abrir o ficheiro `%s': %s\n"
 
-#: gconf/gconf-internals.c:2332
+#: gconf/gconf-internals.c:2464
 #, c-format
-msgid "Another program has lock `%s'"
-msgstr "Outro programa ten o bloqueo `%s'"
+msgid "Could not create file '%s', probably because it already exists"
+msgstr ""
 
-#: gconf/gconf-internals.c:2351
-msgid "couldn't contact ORB to ping existing gconfd"
-msgstr "non foi posible contactar co ORB para facer ping ao gconfd existente"
+#: gconf/gconf-internals.c:2510
+#, fuzzy, c-format
+msgid "Failed to create or open '%s'"
+msgstr "Erro ao crear %s: %s"
 
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2520
 #, c-format
 msgid ""
-"Removing stale lock `%s' because IOR couldn't be converted to object "
-"reference, IOR `%s'"
+"Failed to lock '%s': probably another process has the lock, or your "
+"operating system has NFS file locking misconfigured (%s)"
 msgstr ""
-"Eliminando o bloqueo antigo `%s', xa que non foi posible converter o IOR "
-"`%s' a unha referencia a obxecto"
 
-#: gconf/gconf-internals.c:2371
+#: gconf/gconf-internals.c:2548
 #, c-format
-msgid "Removing stale lock `%s' because of error pinging server: %s"
+msgid "IOR file '%s' not opened successfully, no gconfd located: %s"
 msgstr ""
-"Borrando o bloqueo antigo `%s' por mor dun erro facendo ping ao servidor: %s"
 
-#: gconf/gconf-internals.c:2383
+#: gconf/gconf-internals.c:2578
 #, c-format
-msgid "GConf configuration daemon (gconfd) has lock `%s'"
-msgstr "O daemon de configuraci�n GConf (gconfd) ten o bloqueo `%s'"
+msgid "gconftool or other non-gconfd process has the lock file '%s'"
+msgstr ""
+
+#: gconf/gconf-internals.c:2595
+#, fuzzy
+msgid "couldn't contact ORB to resolve existing gconfd object reference"
+msgstr "non foi posible contactar co ORB para facer ping ao gconfd existente"
 
-#: gconf/gconf-internals.c:2397
+#: gconf/gconf-internals.c:2627
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "non foi posible crear o directorio `%s': %s"
 
-#: gconf/gconf-internals.c:2446
-#, c-format
-msgid "Can't create lock `%s': %s"
-msgstr "Non se pode crear o bloqueo `%s': %s"
-
-#: gconf/gconf-internals.c:2482
+#: gconf/gconf-internals.c:2686
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Non se pode escribir ao ficheiro `%s': %s"
 
-#: gconf/gconf-internals.c:2532
+#: gconf/gconf-internals.c:2727
 #, c-format
-msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
+msgid "We didn't have the lock on file `%s', but we should have"
 msgstr ""
-"Non se pode abrir o ficheiro de bloqueo `%s'; asumindo que non � noso: %s"
 
-#: gconf/gconf-internals.c:2549
+#: gconf/gconf-internals.c:2748
+#, fuzzy, c-format
+msgid "Failed to link '%s' to '%s': %s"
+msgstr "Erro ao renomear `%s' a `%s': %s"
+
+#: gconf/gconf-internals.c:2760
+#, fuzzy, c-format
+msgid "Failed to remove lock file `%s': %s"
+msgstr "Erro ao crear o ficheiro `%s': %s"
+
+#: gconf/gconf-internals.c:2779
+#, fuzzy, c-format
+msgid "Failed to clean up file '%s': %s"
+msgstr "Erro ao pechar o ficheiro `%s': %s"
+
+#: gconf/gconf-internals.c:2793
+#, fuzzy, c-format
+msgid "Failed to remove lock directory `%s': %s"
+msgstr "Erro ao liberar o directorio de bloqueo `%s': %s"
+
+#: gconf/gconf-internals.c:3003 gconf/gconfd.c:580
 #, c-format
-msgid "Corrupt lock file `%s', removing anyway"
-msgstr "Ficheiro de bloqueo `%s' corrupto, borrando de calquera xeito"
+msgid "Failed to create %s: %s"
+msgstr "Erro ao crear %s: %s"
 
-#: gconf/gconf-internals.c:2559
+#: gconf/gconf-internals.c:3036
 #, c-format
+msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
+msgstr ""
+
+#: gconf/gconf-internals.c:3064
+#, fuzzy, c-format
+msgid "Failed to launch configuration server: %s\n"
+msgstr "Erro ao acceder a(s) fonte(s) da configuraci�n: %s\n"
+
+#: gconf/gconf-internals.c:3088
 msgid ""
-"Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
-"took our lock"
+"Failed to contact configuration server (a likely cause of this is that you "
+"have an existing configuration server (gconfd) running, but it isn't "
+"reachable from here - if you're logged in from two machines at once, you may "
+"need to enable TCP networking for ORBit)\n"
 msgstr ""
-"Non se creou o ficheiro de bloqueo `%s' (pid do creador %u, o noso pid %u); "
-"asumindo que algu�n tomou o noso bloqueo"
 
-#: gconf/gconf-internals.c:2576
-#, c-format
-msgid "Failed to release lock directory `%s': %s"
+#: gconf/gconf-internals.c:3724
+#, fuzzy, c-format
+msgid "Failed to read from child pipe (%s)"
+msgstr "Erro ao liberar o ficheiro de bloqueo: %s"
+
+#: gconf/gconf-internals.c:3789
+#, fuzzy, c-format
+msgid "Failed to fork (%s)"
+msgstr "Erro ao crear %s: %s"
+
+#: gconf/gconf-internals.c:3929
+#, fuzzy, c-format
+msgid "Failed to change to directory '%s' (%s)"
 msgstr "Erro ao liberar o directorio de bloqueo `%s': %s"
 
+#: gconf/gconf-internals.c:3939
+#, fuzzy, c-format
+msgid "Failed to execute child process (%s)"
+msgstr "Erro ao borrar o ficheiro antigo `%s': %s"
+
+#: gconf/gconf-internals.c:3948
+#, c-format
+msgid "Failed to redirect output or input of child process (%s)"
+msgstr ""
+
+#: gconf/gconf-internals.c:3957
+#, fuzzy, c-format
+msgid "Failed to fork child process (%s)"
+msgstr "Erro ao cargar a fonte `%s': %s"
+
+#: gconf/gconf-internals.c:3965
+msgid "Unknown error executing child process"
+msgstr ""
+
+#: gconf/gconf-internals.c:3986
+#, c-format
+msgid "Failed to read enough data from child pid pipe (%s)"
+msgstr ""
+
+#: gconf/gconf-internals.c:4036
+#, c-format
+msgid "Failed to create pipe for communicating with child process (%s)"
+msgstr ""
+
 #: gconf/gconf-sources.c:320
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "Erro ao cargar a fonte `%s': %s"
 
-#: gconf/gconf-sources.c:510
+#: gconf/gconf-sources.c:544
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
-msgstr "O esquema `%s' indicado para `%s' almacena un valor que non � un esquema"
+msgstr ""
+"O esquema `%s' indicado para `%s' almacena un valor que non � un esquema"
 
-#: gconf/gconf-sources.c:567
+#: gconf/gconf-sources.c:601
 msgid "The '/' name can only be a directory, not a key"
 msgstr "O nome '/' s� pode ser un directorio, non unha clave"
 
-#: gconf/gconf-sources.c:596
+#: gconf/gconf-sources.c:630
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -657,16 +747,18 @@ msgstr ""
 "O valor de `%s' est� establecido nunha fonte de s�-lectura no inicio do seu "
 "cami�o de configuraci�n."
 
-#: gconf/gconf-sources.c:608
-#, c-format
+#: gconf/gconf-sources.c:642
+#, 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 "
+"somehow we mistakenly created two gconfd processes. If you have two gconfd "
+"processes (or had two at the time the second was launched), logging out, "
+"killing all copies of gconfd, and logging back in may help. Perhaps the "
+"problem is that you attempted to use GConf from two machines at once, and "
+"ORBit still has its default configuration that prevents remote CORBA "
+"connections? As always, check the user.* syslog for details on problems "
 "gconfd encountered."
 msgstr ""
 "Non � posible almacenar un valor na clave '%s', xa que o servidor de "
@@ -679,77 +771,79 @@ msgstr ""
 "os rexistros do sistema user.* para detalles dos problemas atopados polo "
 "gconfd."
 
-#: gconf/gconf-sources.c:1164
+#: gconf/gconf-sources.c:1198
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Erro buscando metainfo: %s"
 
-#: gconf/gconf-sources.c:1233
+#: gconf/gconf-sources.c:1267
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Erro obtendo metainfo: %s"
 
-#: gconf/gconf-sources.c:1257
+#: gconf/gconf-sources.c:1291
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
-msgstr "A clave `%s' listada como un esquema da clave `%s', cont�n realmente o tipo `%s'"
+msgstr ""
+"A clave `%s' listada como un esquema da clave `%s', cont�n realmente o tipo `"
+"%s'"
 
-#: gconf/gconf-value.c:82
+#: gconf/gconf-value.c:81
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Non se entendeu `%s' (agard�base un enteiro)"
 
-#: gconf/gconf-value.c:92
+#: gconf/gconf-value.c:91
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "O enteiro `%s' � demasiado grande ou pequeno"
 
-#: gconf/gconf-value.c:113
+#: gconf/gconf-value.c:112
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Non se entendeu `%s' (agard�base un n�mero real)"
 
-#: gconf/gconf-value.c:146
+#: gconf/gconf-value.c:156
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Non se entendeu `%s' (agard�base true ou false)"
 
-#: gconf/gconf-value.c:214
+#: gconf/gconf-value.c:232
 #, c-format
 msgid "Didn't understand `%s' (list must start with a '[')"
 msgstr "Non se entendeu `%s' (unha lista debe comezar con '[')"
 
-#: gconf/gconf-value.c:227
+#: gconf/gconf-value.c:245
 #, c-format
 msgid "Didn't understand `%s' (list must end with a ']')"
 msgstr "Non se entendeu `%s' (unha lista debe rematar con ']')"
 
-#: gconf/gconf-value.c:278
+#: gconf/gconf-value.c:296
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
 msgstr "Non se entendeu `%s' (atopouse un ']' extra dentro da lista)"
 
-#: gconf/gconf-value.c:309 gconf/gconf-value.c:462
+#: gconf/gconf-value.c:327 gconf/gconf-value.c:488
 #, c-format
 msgid "Didn't understand `%s' (extra trailing characters)"
 msgstr "Non se entendeu `%s' (caracteres finais extras)"
 
-#: gconf/gconf-value.c:348
+#: gconf/gconf-value.c:374
 #, c-format
 msgid "Didn't understand `%s' (pair must start with a '(')"
 msgstr "Non se entendeu `%s' (a parella ten que comezar con '(')"
 
-#: gconf/gconf-value.c:361
+#: gconf/gconf-value.c:387
 #, c-format
 msgid "Didn't understand `%s' (pair must end with a ')')"
 msgstr "Non se entendeu `%s' (a parella ten que rematar con ')')"
 
-#: gconf/gconf-value.c:391 gconf/gconf-value.c:477
+#: gconf/gconf-value.c:417 gconf/gconf-value.c:503
 #, c-format
 msgid "Didn't understand `%s' (wrong number of elements)"
 msgstr "Non se entendeu `%s' (n�mero de elementos err�neo)"
 
-#: gconf/gconf-value.c:431
+#: gconf/gconf-value.c:457
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr "Non se entendeu `%s' (atopouse un ')' extra dentro da parella)"
@@ -759,96 +853,81 @@ msgstr "Non se entendeu `%s' (atopouse un ')' extra dentro da parella)"
 msgid "`%s': %s"
 msgstr "`%s': %s"
 
-#: gconf/gconf.c:289
+#: gconf/gconf.c:287
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "O servidor non puido resolver o enderezo `%s'"
 
-#: gconf/gconf.c:574
+#: gconf/gconf.c:572
 msgid "Can't add notifications to a local configuration source"
-msgstr "Non � posible engadir notificaci�ns a unha fonte de configuraci�n local"
+msgstr ""
+"Non � posible engadir notificaci�ns a unha fonte de configuraci�n local"
 
-#: gconf/gconf.c:1870
+#: gconf/gconf.c:1868
 #, c-format
 msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr "Erro engadindo o cliente � lista do servidor, erro de CORBA: %s"
 
-#: 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. "
-"This is a bug in the OAF package; something went wrong in OAF, and no error "
-"was reported. This is not a bug in the GConf package. Do not report a GConf "
-"bug unless you have information indicating what went wrong with OAF that was "
-"caused by GConf."
-msgstr ""
-"Erro contactando co servidor de configuraci�n: OAF devolveu nil de "
-"oaf_activate_from_id() e non estableceu unha excepci�n para explicar o "
-"problema. Isto � un erro do paquete OAF; algo foi mal no OAF, e non se "
-"indicou ning�n erro. Non � un problema do paquete GConf. Non informe dun "
-"erro do GConf a menos que te�a informaci�n que indique que o problema do "
-"OAF foi causado polo GConf."
-
-#: gconf/gconf.c:2198
+#: gconf/gconf.c:2183
 msgid "Failed to init GConf, exiting\n"
 msgstr "Fallou a inicializaci�n de GConf, sa�ndo\n"
 
-#: gconf/gconf.c:2235
+#: gconf/gconf.c:2220
 msgid "Must begin with a slash (/)"
 msgstr "Ten que comezar cunha barra (/)"
 
-#: gconf/gconf.c:2257
+#: gconf/gconf.c:2242
 msgid "Can't have two slashes (/) in a row"
 msgstr "Non pode haber d�as barras (/) nunha ringleira"
 
-#: gconf/gconf.c:2259
+#: gconf/gconf.c:2244
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Non pode haber un punto (.) xusto trala barra (/)"
 
-#: gconf/gconf.c:2280
+#: gconf/gconf.c:2265
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "`%c' � un car�cter non v�lido nos nomes de clave/directorio"
 
-#: gconf/gconf.c:2294
+#: gconf/gconf.c:2279
 msgid "Key/directory may not end with a slash (/)"
 msgstr "A clave/directorio non pode rematar cunha barra (/)"
 
-#: gconf/gconf.c:2547
+#: gconf/gconf.c:2520
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "Fallo desactivando o servidor de configuraci�n: %s"
 
-#: gconf/gconf.c:2608
+#: gconf/gconf.c:2581
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Agard�base un flotante, obteuse %s"
 
-#: gconf/gconf.c:2643
+#: gconf/gconf.c:2616
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Agard�base un enteiro, obteuse %s"
 
-#: gconf/gconf.c:2678
+#: gconf/gconf.c:2651
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Agard�base unha cadea, obteuse %s"
 
-#: gconf/gconf.c:2715
+#: gconf/gconf.c:2688
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Agard�base un booleano, obteuse %s"
 
-#: gconf/gconf.c:2748
+#: gconf/gconf.c:2721
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Agard�base un esquema, obteuse %s"
 
-#: gconf/gconfd.c:248
+#: gconf/gconfd.c:247
 msgid "Shutdown request received"
 msgstr "Recibiuse unha petici�n de finalizaci�n"
 
-#: gconf/gconfd.c:280
+#: gconf/gconfd.c:279
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -856,7 +935,7 @@ msgstr ""
 "gconfd foi compilado con depuraci�n; tentando cargar gconf.path do "
 "directorio fonte"
 
-#: gconf/gconfd.c:298
+#: gconf/gconfd.c:297
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -864,7 +943,7 @@ msgstr ""
 "Non se atopou ning�n ficheiro de configuraci�n, tentando usar a fonte de "
 "configuraci�n por omisi�n `%s'"
 
-#: gconf/gconfd.c:307
+#: gconf/gconfd.c:306
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -872,24 +951,24 @@ msgstr ""
 "Non hai fontes de configuraci�n no cami�o de fontes, non se gardar� a "
 "configuraci�n; edite "
 
-#: gconf/gconfd.c:307
+#: gconf/gconfd.c:306
 msgid "/path"
 msgstr "/path"
 
-#: gconf/gconfd.c:321
+#: gconf/gconfd.c:320
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "Erro cargando algunhas fontes de configuraci�n: %s"
 
-#: gconf/gconfd.c:333
+#: gconf/gconfd.c:332
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
 msgstr ""
-"Non se resolveu correctamente ning�n enderezo fonte de configuraci�n, non "
-"� posible cargar ou almacenar datos de configuraci�n"
+"Non se resolveu correctamente ning�n enderezo fonte de configuraci�n, non � "
+"posible cargar ou almacenar datos de configuraci�n"
 
-#: gconf/gconfd.c:350
+#: gconf/gconfd.c:349
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -897,14 +976,14 @@ msgstr ""
 "Non se resolveu correctamente ningunha fonte de configuraci�n escribible, "
 "pode que non sexa posible gardar alg�ns cambios da configuraci�n"
 
-#: gconf/gconfd.c:376
+#: gconf/gconfd.c:375
 #, c-format
 msgid "Received signal %d, dumping core. Please report a GConf bug."
 msgstr ""
 "Recibiuse o sinal %d, facendo un envorcado. Por favor, informe dun erro do "
 "GConf."
 
-#: gconf/gconfd.c:392
+#: gconf/gconfd.c:391
 #, c-format
 msgid ""
 "Received signal %d, shutting down abnormally. Please file a GConf bug report."
@@ -912,104 +991,51 @@ msgstr ""
 "Recibiuse o sinal %d, parando anormalmente. Por favor, informe dun erro do "
 "GConf."
 
-#: gconf/gconfd.c:409
+#: gconf/gconfd.c:408
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "Recibiuse o sinal %d, sa�ndo limpamente"
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:513
+#: gconf/gconfd.c:526
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "iniciando (versi�n %s), pid %u usuario '%s'"
 
-#: gconf/gconfd.c:540
-msgid ""
-"Failed to init Object Activation Framework: please mail bug report to OAF "
-"maintainers"
-msgstr ""
-"Erro ao iniciar o Ambiente de Activaci�n de Obxectos; por favor, env�e un "
-"informe de erro aos encargados do OAF"
-
-#: gconf/gconfd.c:560
+#: gconf/gconfd.c:567
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Erro ao obter unha referencia de obxecto para o ConfigServer"
 
-#: gconf/gconfd.c:573
+#: gconf/gconfd.c:605
 #, c-format
-msgid "Failed to create %s: %s"
-msgstr "Erro ao crear %s: %s"
-
-#. Bad hack alert - register the current lockholder with oafd,
-#. * since oafd seems to have forgotten about us.
-#.
-#: gconf/gconfd.c:588
-#, c-format
-msgid "Failed to get lock for daemon: %s"
-msgstr "Erro ao obter o bloqueo para o daemon: %s"
-
-#: gconf/gconfd.c:594
-msgid ""
-"Registering existing server with oafd, since OAF appears to have leaked it"
+msgid "Failed to write byte to pipe fd %d so client program may hang: %s"
 msgstr ""
-"Rexistrando o servidor existente con oafd, xa que semella que o OAF o perdeu"
 
-#: gconf/gconfd.c:603
-msgid ""
-"OAF doesn't know about our IID; indicates broken installation; can't "
-"register existing server."
-msgstr ""
-"OAF non co�ece o noso IID; isto indica unha instalaci�n err�nea; non "
-"se pode rexistrar o servidor existente."
-
-#: gconf/gconfd.c:607
-msgid ""
-"Another gconfd already registered with OAF, so we can't register the "
-"existing server"
-msgstr ""
-"Xa hai outro gconfd rexistrado con OAF; non � posible rexistrar o "
-"servidor existente"
-
-#: gconf/gconfd.c:612
-msgid "Unknown error registering existing gconfd with OAF; exiting"
-msgstr "Erro desco�ecido rexistrando gconfd con OAF; sa�ndo"
-
-#: gconf/gconfd.c:639
-msgid ""
-"OAF doesn't know about our IID; indicates broken installation; can't "
-"register; exiting\n"
-msgstr ""
-"OAF non co�ece o noso IID; isto indica unha instalaci�n err�nea; non "
-"� posible rexistrar; sa�ndo\n"
-
-#: gconf/gconfd.c:643
-msgid "Another gconfd already registered with OAF; exiting\n"
-msgstr "Xa hai outro gconfd rexistrado con OAF; sa�ndo\n"
-
-#: gconf/gconfd.c:648
-msgid "Unknown error registering gconfd with OAF; exiting\n"
-msgstr "Erro desco�ecido rexistrando gconfd con OAF; sa�ndo\n"
+#: gconf/gconfd.c:615
+#, fuzzy, c-format
+msgid "Failed to get lock for daemon, exiting: %s"
+msgstr "Erro ao obter o bloqueo para o daemon: %s"
 
-#: gconf/gconfd.c:692
-#, c-format
-msgid "Failed to release lockfile: %s"
+#: gconf/gconfd.c:657
+#, fuzzy, c-format
+msgid "Error releasing lockfile: %s"
 msgstr "Erro ao liberar o ficheiro de bloqueo: %s"
 
-#: gconf/gconfd.c:700
+#: gconf/gconfd.c:665
 msgid "Exiting"
 msgstr "Sa�ndo"
 
-#: gconf/gconfd.c:725
+#: gconf/gconfd.c:690
 msgid "GConf server is not in use, shutting down."
 msgstr "Non se est� a usar o servidor GConf, sa�ndo."
 
-#: gconf/gconfd.c:1084
+#: gconf/gconfd.c:1059
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Devolvendo unha excepci�n: %s"
 
-#: gconf/gconfd.c:1184
+#: gconf/gconfd.c:1159
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -1018,7 +1044,7 @@ msgstr ""
 "Erro ao abrir o ficheiro de rexistro do gconfd; non vai ser posible "
 "restaurar os clientes ao desactivar o gconfd (%s)"
 
-#: gconf/gconfd.c:1219
+#: gconf/gconfd.c:1194
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
@@ -1026,41 +1052,41 @@ msgstr ""
 "Erro ao pechar o ficheiro de rexistro do gconfd; pode que os datos non se "
 "gardaran apropiadamente (%s)"
 
-#: gconf/gconfd.c:1288
+#: gconf/gconfd.c:1263
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr ""
 "Non foi posible abrir para escritura o ficheiro co estado gardado '%s': %s"
 
-#: gconf/gconfd.c:1302
+#: gconf/gconfd.c:1277
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "Non foi posible escribir no ficheiro co estado gardado '%s' fd: %d: %s"
 
-#: gconf/gconfd.c:1311
+#: gconf/gconfd.c:1286
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Erro ao pechar o novo ficheiro co estado gardado '%s': %s"
 
-#: gconf/gconfd.c:1325
+#: gconf/gconfd.c:1300
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "Non se pode mover o antigo ficheiro co estado gardado '%s': %s"
 
-#: gconf/gconfd.c:1335
+#: gconf/gconfd.c:1310
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "Erro ao mover o novo ficheiro co estado gardado ao sitio: %s"
 
-#: gconf/gconfd.c:1344
+#: gconf/gconfd.c:1319
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
-"Erro ao restaurar o ficheiro orixinal co estado gardado que fora movido a "
-"'%s': %s"
+"Erro ao restaurar o ficheiro orixinal co estado gardado que fora movido a '%"
+"s': %s"
 
-#: gconf/gconfd.c:1819
+#: gconf/gconfd.c:1794
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
@@ -1068,17 +1094,17 @@ msgstr ""
 "Non � posible restaurar un cliente no enderezo '%s', non foi posible "
 "resolver a base de datos"
 
-#: gconf/gconfd.c:1865
+#: gconf/gconfd.c:1840
 #, c-format
 msgid "Error reading saved state file: %s"
 msgstr "Erro lendo o ficheiro co estado gardado: %s"
 
-#: gconf/gconfd.c:1918
+#: gconf/gconfd.c:1893
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "Non � posible abrir o ficheiro do estado gardado '%s': %s"
 
-#: gconf/gconfd.c:2035
+#: gconf/gconfd.c:2010
 #, c-format
 msgid ""
 "Failed to log addition of listener to gconfd logfile; won't be able to re-"
@@ -1087,7 +1113,7 @@ msgstr ""
 "Erro ao engadir un cliente no ficheiro de rexistro do gconfd; non vai ser "
 "posible engadir novamente o cliente se o gconfd sae ou finaliza (%s)"
 
-#: gconf/gconfd.c:2040
+#: gconf/gconfd.c:2015
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously re-"
@@ -1096,33 +1122,32 @@ msgstr ""
 "Erro ao eliminar un cliente do ficheiro de rexistro do gconfd; poder�a "
 "engadirse de novo erroneamente o cliente se o gconfd sae ou finaliza (%s)"
 
-#: gconf/gconfd.c:2063 gconf/gconfd.c:2228
+#: gconf/gconfd.c:2038 gconf/gconfd.c:2203
 #, c-format
 msgid "Failed to get IOR for client: %s"
 msgstr "Erro ao obter o IOR do cliente: %s"
 
-#: gconf/gconfd.c:2078
+#: gconf/gconfd.c:2053
 #, c-format
 msgid "Failed to open saved state file: %s"
 msgstr "Erro ao abrir o ficheiro co estado gardado: %s"
 
-#: gconf/gconfd.c:2091
+#: gconf/gconfd.c:2066
 #, c-format
 msgid "Failed to write client add to saved state file: %s"
 msgstr ""
 "Erro ao escribir a adici�n do cliente ao ficheiro co estado gardado: %s"
 
-#: gconf/gconfd.c:2099
+#: gconf/gconfd.c:2074
 #, c-format
 msgid "Failed to flush client add to saved state file: %s"
 msgstr ""
 "Erro ao envorcar a adici�n do cliente ao ficheiro co estado gardado: %s"
 
-#: gconf/gconfd.c:2189
+#: gconf/gconfd.c:2164
 msgid ""
 "Some client removed itself from the GConf server when it hadn't been added."
-msgstr ""
-"Alg�n cliente eliminouse do servidor GConf, mais non se engadira."
+msgstr "Alg�n cliente eliminouse do servidor GConf, mais non se engadira."
 
 #: gconf/gconftool.c:68
 msgid "Help options"
@@ -1141,8 +1166,8 @@ msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and --"
 "type."
 msgstr ""
-"Establecer un esquema e sincronizar. Usar con --short-desc, --long-desc, "
-"--owner e --type."
+"Establecer un esquema e sincronizar. Usar con --short-desc, --long-desc, --"
+"owner e --type."
 
 #: gconf/gconftool.c:105
 msgid "Unset the keys on the command line"
@@ -1186,8 +1211,8 @@ msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
 msgstr ""
-"Indica o tipo de valor que est� a ser establecido, ou o tipo do valor "
-"que describe un esquema. Abreviaci�ns �nicas v�lidas."
+"Indica o tipo de valor que est� a ser establecido, ou o tipo do valor que "
+"describe un esquema. Abreviaci�ns �nicas v�lidas."
 
 #: gconf/gconftool.c:178
 msgid "int|bool|float|string|list|pair"
@@ -1198,8 +1223,8 @@ msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
-"Indica o tipo do valor da lista que se est� a establecer, ou o tipo do "
-"valor que describe un esquema. Abreviaci�ns �nicas v�lidas."
+"Indica o tipo do valor da lista que se est� a establecer, ou o tipo do valor "
+"que describe un esquema. Abreviaci�ns �nicas v�lidas."
 
 #: gconf/gconftool.c:187 gconf/gconftool.c:196 gconf/gconftool.c:205
 msgid "int|bool|float|string"
@@ -1271,10 +1296,10 @@ msgid ""
 "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 ""
-"Instala apropiadamente os ficheiros de esquema da li�a de comandos na "
-"base de datos. A variable de ambiente GCONF_CONFIG_SOURCE deber�a ter "
-"unha fonte de configuraci�n non predeterminada, ou ser unha cadea baleira "
-"para usar o predeterminado."
+"Instala apropiadamente os ficheiros de esquema da li�a de comandos na base "
+"de datos. A variable de ambiente GCONF_CONFIG_SOURCE deber�a ter unha fonte "
+"de configuraci�n non predeterminada, ou ser unha cadea baleira para usar o "
+"predeterminado."
 
 #: gconf/gconftool.c:276
 msgid ""
@@ -1343,16 +1368,16 @@ msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-"
 "entries, or --all-dirs\n"
 msgstr ""
-"--recursive-list non deber�a usarse con --get, --set, --unset, "
-"--all-entries, ou --all-dirs\n"
+"--recursive-list non deber�a usarse con --get, --set, --unset, --all-"
+"entries, ou --all-dirs\n"
 
 #: gconf/gconftool.c:437
 msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-entries, --"
 "all-dirs\n"
 msgstr ""
-"--set_schema non deber�a usarse con --get, --set, --unset, --all-entries, "
-"--all-dirs\n"
+"--set_schema non deber�a usarse con --get, --set, --unset, --all-entries, --"
+"all-dirs\n"
 
 #: gconf/gconftool.c:443
 msgid "Value type is only relevant when setting a value\n"
@@ -1390,329 +1415,317 @@ msgstr "--break-directory debe usarse por si mesma.\n"
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
-"Ten que indicar unha fonte de configuraci�n con --config-source se usa "
-"--direct\n"
+"Ten que indicar unha fonte de configuraci�n con --config-source se usa --"
+"direct\n"
 
 #: gconf/gconftool.c:525
+msgid "You should use --direct when using a non-default configuration source\n"
+msgstr ""
+
+#: gconf/gconftool.c:531
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "Fallou a iniciaci�n de GConf: %s\n"
 
-#: gconf/gconftool.c:550
+#: gconf/gconftool.c:566
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "Ten que establecer a variable de ambiente 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:565
-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 ""
-"Non deber�a estar a se executar o gconfd ao instalar novos ficheiros de "
-"esquema.\n"
-"Use gconftool --shutdown para desactivar o daemon, con maior seguridade "
-"cando non haxa ningunha aplicaci�n a se executar\n"
-"(a�nda que teoricamente deber�a funcionar se hai aplicaci�ns activas).\n"
-
-#: gconf/gconftool.c:587
+#: gconf/gconftool.c:595
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Erro ao acceder a(s) fonte(s) da configuraci�n: %s\n"
 
-#: gconf/gconftool.c:798
+#: gconf/gconftool.c:796
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Erro ao finalizar: %s\n"
 
-#: gconf/gconftool.c:841
+#: gconf/gconftool.c:839
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr "Ten que indicar un ou m�is directorios para listar recursivamente\n"
 
-#: gconf/gconftool.c:875
+#: gconf/gconftool.c:873
 #, c-format
 msgid "Failure listing entries in `%s': %s\n"
 msgstr "Erro listando as entradas en `%s': %s\n"
 
-#: gconf/gconftool.c:893
+#: gconf/gconftool.c:891
 msgid "(no value set)"
 msgstr "(ning�n valor establecido)"
 
-#: gconf/gconftool.c:948
+#: gconf/gconftool.c:946
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Erro ao lanzar o servidor de configuraci�n (gconfd): %s\n"
 
-#: gconf/gconftool.c:962
+#: gconf/gconftool.c:960
 msgid "Must specify a key or keys to get\n"
 msgstr "Debe indicar unha clave ou claves para obter\n"
 
-#: gconf/gconftool.c:997
+#: gconf/gconftool.c:995
 #, c-format
 msgid "Type: %s\n"
 msgstr "Tipo: %s\n"
 
-#: gconf/gconftool.c:998
+#: gconf/gconftool.c:996
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Tipo de lista: %s\n"
 
-#: gconf/gconftool.c:999
+#: gconf/gconftool.c:997
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Tipo de car: %s\n"
 
-#: gconf/gconftool.c:1000
+#: gconf/gconftool.c:998
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Tipo de cdr: %s\n"
 
-#: gconf/gconftool.c:1005
+#: gconf/gconftool.c:1003
 #, c-format
 msgid "Default Value: %s\n"
 msgstr "Valor por omisi�n: %s\n"
 
-#: gconf/gconftool.c:1005 gconf/gconftool.c:1007 gconf/gconftool.c:1008
-#: gconf/gconftool.c:1009
+#: gconf/gconftool.c:1003 gconf/gconftool.c:1005 gconf/gconftool.c:1006
+#: gconf/gconftool.c:1007
 msgid "Unset"
 msgstr "Desestablecer"
 
-#: gconf/gconftool.c:1007
+#: gconf/gconftool.c:1005
 #, c-format
 msgid "Owner: %s\n"
 msgstr "Dono: %s\n"
 
-#: gconf/gconftool.c:1008
+#: gconf/gconftool.c:1006
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Descrici�n curta: %s\n"
 
-#: gconf/gconftool.c:1009
+#: gconf/gconftool.c:1007
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Descrici�n longa: %s\n"
 
-#: gconf/gconftool.c:1018 gconf/gconftool.c:1312
+#: gconf/gconftool.c:1016 gconf/gconftool.c:1310
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Ning�n valor establecido para `%s'\n"
 
-#: gconf/gconftool.c:1022 gconf/gconftool.c:1316
+#: gconf/gconftool.c:1020 gconf/gconftool.c:1314
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Erro ao obter o valor de `%s': %s\n"
 
-#: gconf/gconftool.c:1065 gconf/gconftool.c:1077
+#: gconf/gconftool.c:1063 gconf/gconftool.c:1075
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "Non se entende o tipo `%s'\n"
 
-#: gconf/gconftool.c:1089
+#: gconf/gconftool.c:1087
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Debe indicar claves/valores alternados como argumentos\n"
 
-#: gconf/gconftool.c:1109
+#: gconf/gconftool.c:1107
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Non hai ning�n valor para establecer para a clave: `%s'\n"
 
-#: gconf/gconftool.c:1137
+#: gconf/gconftool.c:1135
 msgid "Cannot set schema as value\n"
 msgstr "Non se pode establecer un esquema como valor\n"
 
-#: gconf/gconftool.c:1147
+#: gconf/gconftool.c:1145
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr "Ao establecer unha lista, debe indicar o tipo primitivo da lista\n"
 
-#: gconf/gconftool.c:1161
+#: gconf/gconftool.c:1159
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 "Ao establecer unha parella, debe indicar o tipo primitivo do car e do cdr\n"
 
-#: gconf/gconftool.c:1176
+#: gconf/gconftool.c:1174
 #, c-format
 msgid "Error: %s\n"
 msgstr "Erro: %s\n"
 
-#: gconf/gconftool.c:1189
+#: gconf/gconftool.c:1187
 #, c-format
 msgid "Error setting value: %s\n"
 msgstr "Erro ao establecer o valor: %s\n"
 
-#: gconf/gconftool.c:1207
+#: gconf/gconftool.c:1205
 #, c-format
 msgid "Error syncing: %s\n"
 msgstr "Erro ao sincronizar: %s\n"
 
-#: gconf/gconftool.c:1230
+#: gconf/gconftool.c:1228
 msgid "Must specify a key or keys on the command line\n"
 msgstr "Debe indicar unha ou varias claves na li�a de comandos\n"
 
-#: gconf/gconftool.c:1250
+#: gconf/gconftool.c:1248
 #, c-format
 msgid "No schema known for `%s'\n"
 msgstr "Non hai ning�n esquema para `%s'\n"
 
-#: gconf/gconftool.c:1283
+#: gconf/gconftool.c:1281
 #, c-format
 msgid "No doc string stored in schema at '%s'\n"
 msgstr "Non hai ningunha cadea de documentaci�n no esquema de '%s'\n"
 
-#: gconf/gconftool.c:1288
+#: gconf/gconftool.c:1286
 #, c-format
 msgid "Error getting schema at '%s': %s\n"
 msgstr "Erro obtendo o esquema de '%s': %s\n"
 
-#: gconf/gconftool.c:1295
+#: gconf/gconftool.c:1293
 #, c-format
 msgid "No schema stored at '%s'\n"
 msgstr "Non hai ning�n esquema almacenado en '%s'\n"
 
-#: gconf/gconftool.c:1298
+#: gconf/gconftool.c:1296
 #, c-format
 msgid "Value at '%s' is not a schema\n"
 msgstr "O valor de '%s' non � un esquema\n"
 
-#: gconf/gconftool.c:1354
+#: gconf/gconftool.c:1352
 msgid "Must specify a schema name followed by the key name to apply it to\n"
 msgstr ""
 "Debe indicar un nome de esquema seguido do nome da clave para aplicarllo\n"
 
-#: gconf/gconftool.c:1361
+#: gconf/gconftool.c:1359
 #, c-format
 msgid "Error associating schema name '%s' with key name '%s': %s\n"
 msgstr "Erro ao asociar o nome de esquema '%s' co nome de clave '%s': %s\n"
 
-#: gconf/gconftool.c:1381
+#: gconf/gconftool.c:1379
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "Debe indicar a clave (o nome do esquema) como �nico argumento\n"
 
-#: gconf/gconftool.c:1423
+#: gconf/gconftool.c:1421
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "O tipo dunha lista ten que ser un tipo primitivo: string, int, float ou "
 "bool\n"
 
-#: gconf/gconftool.c:1443
+#: gconf/gconftool.c:1441
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "O tipo do car dunha parella ten que ser un tipo primitivo: string, int, "
 "float ou bool\n"
 
-#: gconf/gconftool.c:1463
+#: gconf/gconftool.c:1461
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "O tipo do cdr dunha parella ten que ser un tipo primitivo: string, int, "
 "float ou bool\n"
 
-#: gconf/gconftool.c:1478
+#: gconf/gconftool.c:1476
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Erro establecendo o valor: %s"
 
-#: gconf/gconftool.c:1492
+#: gconf/gconftool.c:1490
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Erro sincronizando: %s"
 
-#: gconf/gconftool.c:1507
+#: gconf/gconftool.c:1505
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "Debe indicar un ou m�is directorios para obter as parellas clave/valor.\n"
 
-#: gconf/gconftool.c:1521
+#: gconf/gconftool.c:1519
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Debe indicar unha ou m�is claves para desestablecer.\n"
 
-#: gconf/gconftool.c:1532
+#: gconf/gconftool.c:1530
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Erro ao desestablecer `%s': %s\n"
 
-#: gconf/gconftool.c:1555
+#: gconf/gconftool.c:1553
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "Debe indicar un ou m�is directorios para obter os subdirectorios deles.\n"
 
-#: gconf/gconftool.c:1589
+#: gconf/gconftool.c:1587
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Erro listando directorios: %s\n"
 
-#: gconf/gconftool.c:1631
+#: gconf/gconftool.c:1629
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "AVISO: falta ou non � v�lido o tipo para o esquema (%s)\n"
 
-#: gconf/gconftool.c:1640
+#: gconf/gconftool.c:1638
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "AVISO: falta ou non � v�lido o list_type para o esquema (%s)\n"
 
-#: gconf/gconftool.c:1651 gconf/gconftool.c:1681 gconf/gconftool.c:1710
+#: gconf/gconftool.c:1649 gconf/gconftool.c:1679 gconf/gconftool.c:1708
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr "AVISO: Erro ao analizar o valor por omisi�n `%s' para o esquema (%s)\n"
 
-#: gconf/gconftool.c:1669
+#: gconf/gconftool.c:1667
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 "AVISO: falta ou non � v�lido o car_type ou cdr_type para o esquema (%s)\n"
 
-#: gconf/gconftool.c:1694
+#: gconf/gconftool.c:1692
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "AVISO: Non pode establecer un valor por omisi�n para un esquema\n"
 
-#: gconf/gconftool.c:1723
+#: gconf/gconftool.c:1721
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "AVISO: erro interno de gconftool, GConfValueType desco�ecido\n"
 
-#: gconf/gconftool.c:1770 gconf/gconftool.c:1791 gconf/gconftool.c:1812
-#: gconf/gconftool.c:1833
+#: gconf/gconftool.c:1768 gconf/gconftool.c:1789 gconf/gconftool.c:1810
+#: gconf/gconftool.c:1831
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "AVISO: erro ao analizar o nome de tipo `%s'\n"
 
-#: gconf/gconftool.c:1787
+#: gconf/gconftool.c:1785
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr "AVISO: list_type s� pode ser int, float, string ou bool, e non `%s'\n"
 
-#: gconf/gconftool.c:1808
+#: gconf/gconftool.c:1806
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr "AVISO: car_type s� pode ser int, float, string ou bool, e non `%s'\n"
 
-#: gconf/gconftool.c:1829
+#: gconf/gconftool.c:1827
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr "AVISO: cdr_type s� pode ser int, float, string ou bool, e non `%s'\n"
 
-#: gconf/gconftool.c:1857
+#: gconf/gconftool.c:1855
 msgid "WARNING: empty <applyto> node"
 msgstr "AVISO: n� <applyto> baleiro"
 
-#: gconf/gconftool.c:1860 gconf/gconftool.c:2123
+#: gconf/gconftool.c:1858 gconf/gconftool.c:2121
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "AVISO: n� <%s> non entendido baixo <schema>\n"
 
-#: gconf/gconftool.c:1870
+#: gconf/gconftool.c:1868
 msgid "WARNING: no key specified for schema\n"
 msgstr "AVISO: non se indicou unha clave para o esquema\n"
 
-#: gconf/gconftool.c:1903
+#: gconf/gconftool.c:1901
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "WARNING: o n� <locale> non ten o atributo `name=\"locale\"', ignorando\n"
 
-#: gconf/gconftool.c:1909
+#: gconf/gconftool.c:1907
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1720,32 +1733,32 @@ msgstr ""
 "AVISO: M�ltiples n�s <locale> para o locale `%s', ignorando todos tralo "
 "primeiro\n"
 
-#: gconf/gconftool.c:1990
+#: gconf/gconftool.c:1988
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "AVISO: N� <%s> non v�lido nun n� <locale>\n"
 
-#: gconf/gconftool.c:2019
+#: gconf/gconftool.c:2017
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "AVISO: fallo ao instalar o esquema `%s' locale `%s': %s\n"
 
-#: gconf/gconftool.c:2027
+#: gconf/gconftool.c:2025
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Instalado o esquema `%s' para o locale `%s'\n"
 
-#: gconf/gconftool.c:2049
+#: gconf/gconftool.c:2047
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "AVISO: fallo ao asociar o esquema `%s' coa clave `%s': %s\n"
 
-#: gconf/gconftool.c:2057
+#: gconf/gconftool.c:2055
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Asociado o esquema `%s' � clave `%s'\n"
 
-#: gconf/gconftool.c:2136
+#: gconf/gconftool.c:2134
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "Ten que ter polo menos unha entrada <locale> nun <schema>\n"
 
@@ -1754,17 +1767,17 @@ msgstr "Ten que ter polo menos unha entrada <locale> nun <schema>\n"
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "AVISO: n� <%s> non entendido baixo <schemalist>\n"
 
-#: gconf/gconftool.c:2187
+#: gconf/gconftool.c:2188
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Erro ao abrir `%s': %s\n"
 
-#: gconf/gconftool.c:2194
+#: gconf/gconftool.c:2195
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "�O documento `%s' est� baleiro?\n"
 
-#: gconf/gconftool.c:2206
+#: gconf/gconftool.c:2207
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1773,26 +1786,26 @@ msgstr ""
 "O documento `%s' ten un tipo err�neo de n� ra�z (<%s>, deber�a ser "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:2219
+#: gconf/gconftool.c:2220
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "O documento `%s' non ten o n� de nivel superior <gconfschemafile>\n"
 
-#: gconf/gconftool.c:2233
+#: gconf/gconftool.c:2234
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "AVISO: n� <%s> baixo <gconfschemafile> non entendido\n"
 
-#: gconf/gconftool.c:2244 gconf/gconftool.c:2276
+#: gconf/gconftool.c:2245 gconf/gconftool.c:2277
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Erro sincronizando os datos de configuraci�n: %s"
 
-#: gconf/gconftool.c:2260
+#: gconf/gconftool.c:2261
 msgid "Must specify some schema files to install\n"
 msgstr "Debe indicar alg�n ficheiro de esquema para instalar\n"
 
-#: gconf/gconftool.c:2297
+#: gconf/gconftool.c:2298
 #, c-format
 msgid ""
 "\n"
@@ -1801,16 +1814,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2317
+#: gconf/gconftool.c:2318
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Erro ao desestablecer a clave estragadora %s: %s\n"
 
-#: gconf/gconftool.c:2443
+#: gconf/gconftool.c:2444
 msgid "Must specify some keys to break\n"
 msgstr "Debe indicar algunhas claves para estragar\n"
 
-#: gconf/gconftool.c:2449
+#: gconf/gconftool.c:2450
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1819,11 +1832,11 @@ msgstr ""
 "Tentando estragar a aplicaci�n establecendo valores err�neos para a clave:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2467
+#: gconf/gconftool.c:2468
 msgid "Must specify some directories to break\n"
 msgstr "Debe indicar alg�ns directorios para estragar\n"
 
-#: gconf/gconftool.c:2486
+#: gconf/gconftool.c:2487
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1848,3 +1861,117 @@ msgstr "Aviso de GConf: fallo listando as parellas en `%s': %s"
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "Agard�base `%s' e obteuse `%s' para a clave %s"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "No ior file in `%s'"
+#~ msgstr "Non hai un ficheiro ior en `%s'"
+
+#~ msgid "gconfd taking lock `%s' from some other process"
+#~ msgstr "gconfd tomando o bloqueo `%s' dalg�n outro proceso"
+
+#~ msgid "Another program has lock `%s'"
+#~ msgstr "Outro programa ten o bloqueo `%s'"
+
+#~ msgid ""
+#~ "Removing stale lock `%s' because IOR couldn't be converted to object "
+#~ "reference, IOR `%s'"
+#~ msgstr ""
+#~ "Eliminando o bloqueo antigo `%s', xa que non foi posible converter o IOR `"
+#~ "%s' a unha referencia a obxecto"
+
+#~ msgid "Removing stale lock `%s' because of error pinging server: %s"
+#~ msgstr ""
+#~ "Borrando o bloqueo antigo `%s' por mor dun erro facendo ping ao servidor: "
+#~ "%s"
+
+#~ msgid "GConf configuration daemon (gconfd) has lock `%s'"
+#~ msgstr "O daemon de configuraci�n GConf (gconfd) ten o bloqueo `%s'"
+
+#~ msgid "Can't create lock `%s': %s"
+#~ msgstr "Non se pode crear o bloqueo `%s': %s"
+
+#~ msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
+#~ msgstr ""
+#~ "Non se pode abrir o ficheiro de bloqueo `%s'; asumindo que non � noso: %s"
+
+#~ msgid "Corrupt lock file `%s', removing anyway"
+#~ msgstr "Ficheiro de bloqueo `%s' corrupto, borrando de calquera xeito"
+
+#~ msgid ""
+#~ "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming "
+#~ "someone took our lock"
+#~ msgstr ""
+#~ "Non se creou o ficheiro de bloqueo `%s' (pid do creador %u, o noso pid %"
+#~ "u); asumindo que algu�n tomou o noso bloqueo"
+
+#~ msgid ""
+#~ "Error contacting configuration server: OAF returned nil from "
+#~ "oaf_activate_from_id() and did not set an exception explaining the "
+#~ "problem. This is a bug in the OAF package; something went wrong in OAF, "
+#~ "and no error was reported. This is not a bug in the GConf package. Do not "
+#~ "report a GConf bug unless you have information indicating what went wrong "
+#~ "with OAF that was caused by GConf."
+#~ msgstr ""
+#~ "Erro contactando co servidor de configuraci�n: OAF devolveu nil de "
+#~ "oaf_activate_from_id() e non estableceu unha excepci�n para explicar o "
+#~ "problema. Isto � un erro do paquete OAF; algo foi mal no OAF, e non se "
+#~ "indicou ning�n erro. Non � un problema do paquete GConf. Non informe dun "
+#~ "erro do GConf a menos que te�a informaci�n que indique que o problema do "
+#~ "OAF foi causado polo GConf."
+
+#~ msgid ""
+#~ "Failed to init Object Activation Framework: please mail bug report to OAF "
+#~ "maintainers"
+#~ msgstr ""
+#~ "Erro ao iniciar o Ambiente de Activaci�n de Obxectos; por favor, env�e un "
+#~ "informe de erro aos encargados do OAF"
+
+#~ msgid ""
+#~ "Registering existing server with oafd, since OAF appears to have leaked it"
+#~ msgstr ""
+#~ "Rexistrando o servidor existente con oafd, xa que semella que o OAF o "
+#~ "perdeu"
+
+#~ msgid ""
+#~ "OAF doesn't know about our IID; indicates broken installation; can't "
+#~ "register existing server."
+#~ msgstr ""
+#~ "OAF non co�ece o noso IID; isto indica unha instalaci�n err�nea; non se "
+#~ "pode rexistrar o servidor existente."
+
+#~ msgid ""
+#~ "Another gconfd already registered with OAF, so we can't register the "
+#~ "existing server"
+#~ msgstr ""
+#~ "Xa hai outro gconfd rexistrado con OAF; non � posible rexistrar o "
+#~ "servidor existente"
+
+#~ msgid "Unknown error registering existing gconfd with OAF; exiting"
+#~ msgstr "Erro desco�ecido rexistrando gconfd con OAF; sa�ndo"
+
+#~ msgid ""
+#~ "OAF doesn't know about our IID; indicates broken installation; can't "
+#~ "register; exiting\n"
+#~ msgstr ""
+#~ "OAF non co�ece o noso IID; isto indica unha instalaci�n err�nea; non � "
+#~ "posible rexistrar; sa�ndo\n"
+
+#~ msgid "Another gconfd already registered with OAF; exiting\n"
+#~ msgstr "Xa hai outro gconfd rexistrado con OAF; sa�ndo\n"
+
+#~ msgid "Unknown error registering gconfd with OAF; exiting\n"
+#~ msgstr "Erro desco�ecido rexistrando gconfd con OAF; sa�ndo\n"
+
+#~ 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 ""
+#~ "Non deber�a estar a se executar o gconfd ao instalar novos ficheiros de "
+#~ "esquema.\n"
+#~ "Use gconftool --shutdown para desactivar o daemon, con maior seguridade "
+#~ "cando non haxa ningunha aplicaci�n a se executar\n"
+#~ "(a�nda que teoricamente deber�a funcionar se hai aplicaci�ns activas).\n"
diff --git a/po/hu.po b/po/hu.po
index 5e76d370..981816d8 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf 0.6\n"
-"POT-Creation-Date: 2001-08-15 18:01-0400\n"
+"POT-Creation-Date: 2002-02-04 18:21-0500\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"
@@ -30,7 +30,7 @@ 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"
 
-#: backends/dir-utils.c:124 backends/xml-backend.c:301 backends/xml-dir.c:1051
+#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1050
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Nem lehet a k�nyvt�rat l�trehozni `%s': %s"
@@ -44,26 +44,26 @@ msgstr "Nem tudok olvasni vagy irni a %s gy�k�r k�nyvt�rban a `%s' c�men"
 msgid "Unloading XML backend module."
 msgstr "Nincs bet�ltve az XML h�tt�r modul."
 
-#: backends/xml-backend.c:286
+#: backends/xml-backend.c:289
 #, c-format
 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:386
+#: backends/xml-backend.c:414
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
 msgstr "Nem tudok olvasni vagy irni az XML gy�k�r k�nyvt�rba a `%s' c�men"
 
-#: backends/xml-backend.c:396
+#: backends/xml-backend.c:424
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "K�nyvt�r/f�jl jogosults�gok az XML forr�snak a gy�k�rben %s are: %o/%o"
 
-#: backends/xml-backend.c:680
+#: backends/xml-backend.c:708
 msgid "Initializing XML backend module"
 msgstr "XML h�tt�r modul ind�t�sa"
 
-#: backends/xml-backend.c:745
+#: backends/xml-backend.c:773
 #, 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"
@@ -129,32 +129,32 @@ 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:806
+#: backends/xml-dir.c:803
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Sikertelen adat lek�rdez�s a `%s'-r�l: %s"
 
-#: backends/xml-dir.c:950
+#: backends/xml-dir.c:947
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Kett�s bejegyz�s `%s' a `%s'-ben, elvetem"
 
-#: backends/xml-dir.c:972
+#: backends/xml-dir.c:969
 #, 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:979
-#, c-format
-msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
+#: backends/xml-dir.c:977
+#, fuzzy, c-format
+msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
 msgstr "Fels� szint� node az XML `%s' f�jlban nem <bejegyez�s>, elvetem"
 
-#: backends/xml-dir.c:1067
+#: backends/xml-dir.c:1066
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Sikertelen a `%s' f�jl l�trehoz�sa: %s"
 
-#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2494
+#: backends/xml-dir.c:1074
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Sikertelen a `%s' f�jl bez�r�sa: %s"
@@ -165,11 +165,6 @@ msgstr "Sikertelen a `%s' f�jl bez�r�sa: %s"
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "Figyelmen k�v�l hagyott XML node `%s' n�vvel: %s"
 
-#: backends/xml-entry.c:200
-#, c-format
-msgid "%s"
-msgstr "%s"
-
 #: backends/xml-entry.c:327
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
@@ -334,7 +329,7 @@ msgid ""
 "result in a notification weirdly reappearing): %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1328
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr ""
@@ -443,174 +438,270 @@ msgstr "Nem siker�lt lez�rni"
 msgid "No database available to save your configuration"
 msgstr ""
 
-#: gconf/gconf-internals.c:87
+#: gconf/gconf-internals.c:114
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "Nem lehet '/' a kulcsban `%s'"
 
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:227
+#, c-format
+msgid "Invalid UTF-8 in string value in '%s'"
+msgstr ""
+
+#: gconf/gconf-internals.c:286
 msgid "Couldn't interpret CORBA value for list element"
 msgstr ""
 
-#: gconf/gconf-internals.c:253
+#: gconf/gconf-internals.c:288
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:266
+#: gconf/gconf-internals.c:301
 msgid "Received list from gconfd with a bad list type"
 msgstr ""
 
-#: gconf/gconf-internals.c:447
+#: gconf/gconf-internals.c:482
 msgid "Failed to convert object to IOR"
 msgstr ""
 
-#: gconf/gconf-internals.c:813
+#: gconf/gconf-internals.c:619
+msgid "Invalid UTF-8 in locale for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:627
+msgid "Invalid UTF-8 in short description for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:635
+msgid "Invalid UTF-8 in long description for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:643
+msgid "Invalid UTF-8 in owner for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:868
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:873
+#: gconf/gconf-internals.c:928
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:885
+#: gconf/gconf-internals.c:940
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:1327
+#: gconf/gconf-internals.c:1271 gconf/gconf-internals.c:1337
+#: gconf/gconf-value.c:125 gconf/gconf-value.c:224 gconf/gconf-value.c:366
+#: gconf/gconf-value.c:1084
+msgid "Text contains invalid UTF-8"
+msgstr ""
+
+#: gconf/gconf-internals.c:1422
 #, c-format
 msgid "Expected list, got %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1337
+#: gconf/gconf-internals.c:1432
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1476
+#: gconf/gconf-internals.c:1571
 #, c-format
 msgid "Expected pair, got %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1490
+#: gconf/gconf-internals.c:1585
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 
-#: gconf/gconf-internals.c:1506
+#: gconf/gconf-internals.c:1601
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:1622
+#: gconf/gconf-internals.c:1717
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:1684
+#: gconf/gconf-internals.c:1779
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:2164 gconf/gconf.c:3092
+#: gconf/gconf-internals.c:1915
+msgid "Encoded value is not valid UTF-8"
+msgstr ""
+
+#: gconf/gconf-internals.c:2265 gconf/gconf.c:3082
 #, c-format
 msgid "CORBA error: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2180
+#: gconf/gconf-internals.c:2281
 #, c-format
 msgid "OAF problem description: '%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2186
+#: gconf/gconf-internals.c:2287
 msgid "attempt to remove not-listed OAF object directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2191
+#: gconf/gconf-internals.c:2292
 msgid "attempt to add already-listed OAF directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2198
+#: gconf/gconf-internals.c:2299
 #, c-format
 msgid "OAF parse error: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2203
+#: gconf/gconf-internals.c:2304
 msgid "Unknown OAF error"
 msgstr ""
 
-#: gconf/gconf-internals.c:2290
+#: gconf/gconf-internals.c:2437
+#, fuzzy, c-format
+msgid "Could not lock temporary file '%s': %s"
+msgstr "Nem lehet a k�nyvt�rat l�trehozni `%s': %s"
+
+#: gconf/gconf-internals.c:2464
 #, c-format
-msgid "No ior file in `%s'"
+msgid "Could not create file '%s', probably because it already exists"
 msgstr ""
 
-#: gconf/gconf-internals.c:2321
+#: gconf/gconf-internals.c:2510
+#, fuzzy, c-format
+msgid "Failed to create or open '%s'"
+msgstr "Sikertelen a `%s' f�jl l�trehoz�sa: %s"
+
+#: gconf/gconf-internals.c:2520
 #, c-format
-msgid "gconfd taking lock `%s' from some other process"
+msgid ""
+"Failed to lock '%s': probably another process has the lock, or your "
+"operating system has NFS file locking misconfigured (%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:2332
+#: gconf/gconf-internals.c:2548
 #, c-format
-msgid "Another program has lock `%s'"
+msgid "IOR file '%s' not opened successfully, no gconfd located: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2351
-msgid "couldn't contact ORB to ping existing gconfd"
+#: gconf/gconf-internals.c:2578
+#, c-format
+msgid "gconftool or other non-gconfd process has the lock file '%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2359
-#, c-format
-msgid ""
-"Removing stale lock `%s' because IOR couldn't be converted to object "
-"reference, IOR `%s'"
+#: gconf/gconf-internals.c:2595
+msgid "couldn't contact ORB to resolve existing gconfd object reference"
 msgstr ""
 
-#: gconf/gconf-internals.c:2371
+#: gconf/gconf-internals.c:2627
 #, c-format
-msgid "Removing stale lock `%s' because of error pinging server: %s"
+msgid "couldn't create directory `%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2383
+#: gconf/gconf-internals.c:2686
 #, c-format
-msgid "GConf configuration daemon (gconfd) has lock `%s'"
+msgid "Can't write to file `%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2397
+#: gconf/gconf-internals.c:2727
 #, c-format
-msgid "couldn't create directory `%s': %s"
+msgid "We didn't have the lock on file `%s', but we should have"
 msgstr ""
 
-#: gconf/gconf-internals.c:2446
+#: gconf/gconf-internals.c:2748
+#, fuzzy, c-format
+msgid "Failed to link '%s' to '%s': %s"
+msgstr "Sikertelen �tnevez�s `%s'-r�l `%s'-re: %s"
+
+#: gconf/gconf-internals.c:2760
+#, fuzzy, c-format
+msgid "Failed to remove lock file `%s': %s"
+msgstr "Sikertelen a `%s' f�jl l�trehoz�sa: %s"
+
+#: gconf/gconf-internals.c:2779
+#, fuzzy, c-format
+msgid "Failed to clean up file '%s': %s"
+msgstr "Sikertelen a `%s' f�jl bez�r�sa: %s"
+
+#: gconf/gconf-internals.c:2793
+#, fuzzy, c-format
+msgid "Failed to remove lock directory `%s': %s"
+msgstr "Sikertelen �tnevez�s `%s'-r�l `%s'-re: %s"
+
+#: gconf/gconf-internals.c:3003 gconf/gconfd.c:580
+#, fuzzy, c-format
+msgid "Failed to create %s: %s"
+msgstr "Sikertelen a `%s' f�jl l�trehoz�sa: %s"
+
+#: gconf/gconf-internals.c:3036
 #, c-format
-msgid "Can't create lock `%s': %s"
+msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:2482
-#, c-format
-msgid "Can't write to file `%s': %s"
+#: gconf/gconf-internals.c:3064
+#, fuzzy, c-format
+msgid "Failed to launch configuration server: %s\n"
+msgstr "A m�velet nem enged�lyezett a konfigur�ci�s szerver n�lk�l"
+
+#: gconf/gconf-internals.c:3088
+msgid ""
+"Failed to contact configuration server (a likely cause of this is that you "
+"have an existing configuration server (gconfd) running, but it isn't "
+"reachable from here - if you're logged in from two machines at once, you may "
+"need to enable TCP networking for ORBit)\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:2532
+#: gconf/gconf-internals.c:3724
+#, fuzzy, c-format
+msgid "Failed to read from child pipe (%s)"
+msgstr "Sikertelen a `%s' f�jl l�trehoz�sa: %s"
+
+#: gconf/gconf-internals.c:3789
+#, fuzzy, c-format
+msgid "Failed to fork (%s)"
+msgstr "Sikertelen a `%s' f�jl l�trehoz�sa: %s"
+
+#: gconf/gconf-internals.c:3929
+#, fuzzy, c-format
+msgid "Failed to change to directory '%s' (%s)"
+msgstr "Sikertelen a `%s' f�jl l�trehoz�sa: %s"
+
+#: gconf/gconf-internals.c:3939
+#, fuzzy, c-format
+msgid "Failed to execute child process (%s)"
+msgstr "Sikertelen a r�gi `%s' f�jl t�rl�se: %s"
+
+#: gconf/gconf-internals.c:3948
 #, c-format
-msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
+msgid "Failed to redirect output or input of child process (%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:2549
-#, c-format
-msgid "Corrupt lock file `%s', removing anyway"
+#: gconf/gconf-internals.c:3957
+#, fuzzy, c-format
+msgid "Failed to fork child process (%s)"
+msgstr "Nem tudom �rni `%s' f�jlt: %s"
+
+#: gconf/gconf-internals.c:3965
+msgid "Unknown error executing child process"
 msgstr ""
 
-#: gconf/gconf-internals.c:2559
+#: gconf/gconf-internals.c:3986
 #, c-format
-msgid ""
-"Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
-"took our lock"
+msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:2576
+#: gconf/gconf-internals.c:4036
 #, c-format
-msgid "Failed to release lock directory `%s': %s"
+msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr ""
 
 #: gconf/gconf-sources.c:320
@@ -618,106 +709,108 @@ msgstr ""
 msgid "Failed to load source `%s': %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:510
+#: gconf/gconf-sources.c:544
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 
-#: gconf/gconf-sources.c:567
+#: gconf/gconf-sources.c:601
 msgid "The '/' name can only be a directory, not a key"
 msgstr ""
 
-#: gconf/gconf-sources.c:596
+#: gconf/gconf-sources.c:630
 #, 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
+#: gconf/gconf-sources.c:642
 #, 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 "
+"somehow we mistakenly created two gconfd processes. If you have two gconfd "
+"processes (or had two at the time the second was launched), logging out, "
+"killing all copies of gconfd, and logging back in may help. Perhaps the "
+"problem is that you attempted to use GConf from two machines at once, and "
+"ORBit still has its default configuration that prevents remote CORBA "
+"connections? As always, check the user.* syslog for details on problems "
 "gconfd encountered."
 msgstr ""
 
-#: gconf/gconf-sources.c:1164
+#: gconf/gconf-sources.c:1198
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:1233
+#: gconf/gconf-sources.c:1267
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:1257
+#: gconf/gconf-sources.c:1291
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
 
-#: gconf/gconf-value.c:82
+#: gconf/gconf-value.c:81
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr ""
 
-#: gconf/gconf-value.c:92
+#: gconf/gconf-value.c:91
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr ""
 
-#: gconf/gconf-value.c:113
+#: gconf/gconf-value.c:112
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr ""
 
-#: gconf/gconf-value.c:146
+#: gconf/gconf-value.c:156
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr ""
 
-#: gconf/gconf-value.c:214
+#: gconf/gconf-value.c:232
 #, c-format
 msgid "Didn't understand `%s' (list must start with a '[')"
 msgstr ""
 
-#: gconf/gconf-value.c:227
+#: gconf/gconf-value.c:245
 #, c-format
 msgid "Didn't understand `%s' (list must end with a ']')"
 msgstr ""
 
-#: gconf/gconf-value.c:278
+#: gconf/gconf-value.c:296
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
 msgstr ""
 
-#: gconf/gconf-value.c:309 gconf/gconf-value.c:462
+#: gconf/gconf-value.c:327 gconf/gconf-value.c:488
 #, c-format
 msgid "Didn't understand `%s' (extra trailing characters)"
 msgstr ""
 
-#: gconf/gconf-value.c:348
+#: gconf/gconf-value.c:374
 #, c-format
 msgid "Didn't understand `%s' (pair must start with a '(')"
 msgstr ""
 
-#: gconf/gconf-value.c:361
+#: gconf/gconf-value.c:387
 #, c-format
 msgid "Didn't understand `%s' (pair must end with a ')')"
 msgstr ""
 
-#: gconf/gconf-value.c:391 gconf/gconf-value.c:477
+#: gconf/gconf-value.c:417 gconf/gconf-value.c:503
 #, c-format
 msgid "Didn't understand `%s' (wrong number of elements)"
 msgstr ""
 
-#: gconf/gconf-value.c:431
+#: gconf/gconf-value.c:457
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr ""
@@ -727,322 +820,268 @@ msgstr ""
 msgid "`%s': %s"
 msgstr ""
 
-#: gconf/gconf.c:289
+#: gconf/gconf.c:287
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr ""
 
-#: gconf/gconf.c:574
+#: gconf/gconf.c:572
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 
-#: gconf/gconf.c:1870
+#: gconf/gconf.c:1868
 #, c-format
 msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr ""
 
-#: 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. "
-"This is a bug in the OAF package; something went wrong in OAF, and no error "
-"was reported. This is not a bug in the GConf package. Do not report a GConf "
-"bug unless you have information indicating what went wrong with OAF that was "
-"caused by GConf."
-msgstr ""
-
-#: gconf/gconf.c:2198
+#: gconf/gconf.c:2183
 msgid "Failed to init GConf, exiting\n"
 msgstr ""
 
-#: gconf/gconf.c:2235
+#: gconf/gconf.c:2220
 msgid "Must begin with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2257
+#: gconf/gconf.c:2242
 msgid "Can't have two slashes (/) in a row"
 msgstr ""
 
-#: gconf/gconf.c:2259
+#: gconf/gconf.c:2244
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2280
+#: gconf/gconf.c:2265
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr ""
 
-#: gconf/gconf.c:2294
+#: gconf/gconf.c:2279
 msgid "Key/directory may not end with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2547
+#: gconf/gconf.c:2520
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr ""
 
-#: gconf/gconf.c:2608
+#: gconf/gconf.c:2581
 #, c-format
 msgid "Expected float, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2643
+#: gconf/gconf.c:2616
 #, c-format
 msgid "Expected int, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2678
+#: gconf/gconf.c:2651
 #, c-format
 msgid "Expected string, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2715
+#: gconf/gconf.c:2688
 #, c-format
 msgid "Expected bool, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2748
+#: gconf/gconf.c:2721
 #, c-format
 msgid "Expected schema, got %s"
 msgstr ""
 
-#: gconf/gconfd.c:248
+#: gconf/gconfd.c:247
 msgid "Shutdown request received"
 msgstr ""
 
-#: gconf/gconfd.c:280
+#: gconf/gconfd.c:279
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr ""
 
-#: gconf/gconfd.c:298
+#: gconf/gconfd.c:297
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
 msgstr ""
 
-#: gconf/gconfd.c:307
+#: gconf/gconfd.c:306
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
 msgstr ""
 
-#: gconf/gconfd.c:307
+#: gconf/gconfd.c:306
 msgid "/path"
 msgstr ""
 
-#: gconf/gconfd.c:321
+#: gconf/gconfd.c:320
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr ""
 
-#: gconf/gconfd.c:333
+#: gconf/gconfd.c:332
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
 msgstr ""
 
-#: gconf/gconfd.c:350
+#: gconf/gconfd.c:349
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
 
-#: gconf/gconfd.c:376
+#: gconf/gconfd.c:375
 #, c-format
 msgid "Received signal %d, dumping core. Please report a GConf bug."
 msgstr ""
 
-#: gconf/gconfd.c:392
+#: gconf/gconfd.c:391
 #, c-format
 msgid ""
 "Received signal %d, shutting down abnormally. Please file a GConf bug report."
 msgstr ""
 
-#: gconf/gconfd.c:409
+#: gconf/gconfd.c:408
 #, 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:513
+#: gconf/gconfd.c:526
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr ""
 
-#: gconf/gconfd.c:540
-msgid ""
-"Failed to init Object Activation Framework: please mail bug report to OAF "
-"maintainers"
-msgstr ""
-
-#: gconf/gconfd.c:560
+#: gconf/gconfd.c:567
 msgid "Failed to get object reference for ConfigServer"
 msgstr ""
 
-#: gconf/gconfd.c:573
-#, fuzzy, c-format
-msgid "Failed to create %s: %s"
-msgstr "Sikertelen a `%s' f�jl l�trehoz�sa: %s"
+#: gconf/gconfd.c:605
+#, c-format
+msgid "Failed to write byte to pipe fd %d so client program may hang: %s"
+msgstr ""
 
-#. Bad hack alert - register the current lockholder with oafd,
-#. * since oafd seems to have forgotten about us.
-#.
-#: gconf/gconfd.c:588
+#: gconf/gconfd.c:615
 #, fuzzy, c-format
-msgid "Failed to get lock for daemon: %s"
+msgid "Failed to get lock for daemon, exiting: %s"
 msgstr "Sikertelen `%s' t�rl�se: %s"
 
-#: gconf/gconfd.c:594
-msgid ""
-"Registering existing server with oafd, since OAF appears to have leaked it"
-msgstr ""
-
-#: gconf/gconfd.c:603
-msgid ""
-"OAF doesn't know about our IID; indicates broken installation; can't "
-"register existing server."
-msgstr ""
-
-#: gconf/gconfd.c:607
-msgid ""
-"Another gconfd already registered with OAF, so we can't register the "
-"existing server"
-msgstr ""
-
-#: gconf/gconfd.c:612
-msgid "Unknown error registering existing gconfd with OAF; exiting"
-msgstr ""
-
-#: gconf/gconfd.c:639
-msgid ""
-"OAF doesn't know about our IID; indicates broken installation; can't "
-"register; exiting\n"
-msgstr ""
-
-#: gconf/gconfd.c:643
-msgid "Another gconfd already registered with OAF; exiting\n"
-msgstr ""
-
-#: gconf/gconfd.c:648
-msgid "Unknown error registering gconfd with OAF; exiting\n"
-msgstr ""
-
-#: gconf/gconfd.c:692
+#: gconf/gconfd.c:657
 #, fuzzy, c-format
-msgid "Failed to release lockfile: %s"
+msgid "Error releasing lockfile: %s"
 msgstr "Sikertelen a `%s' f�jl l�trehoz�sa: %s"
 
-#: gconf/gconfd.c:700
+#: gconf/gconfd.c:665
 msgid "Exiting"
 msgstr ""
 
-#: gconf/gconfd.c:725
+#: gconf/gconfd.c:690
 msgid "GConf server is not in use, shutting down."
 msgstr ""
 
-#: gconf/gconfd.c:1084
+#: gconf/gconfd.c:1059
 #, c-format
 msgid "Returning exception: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1184
+#: gconf/gconfd.c:1159
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
 "gconfd shutdown (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1219
+#: gconf/gconfd.c:1194
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1288
+#: gconf/gconfd.c:1263
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1302
+#: gconf/gconfd.c:1277
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1311
+#: gconf/gconfd.c:1286
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1325
+#: gconf/gconfd.c:1300
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1335
+#: gconf/gconfd.c:1310
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1344
+#: gconf/gconfd.c:1319
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1819
+#: gconf/gconfd.c:1794
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr ""
 
-#: gconf/gconfd.c:1865
+#: gconf/gconfd.c:1840
 #, c-format
 msgid "Error reading saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1918
+#: gconf/gconfd.c:1893
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:2035
+#: gconf/gconfd.c:2010
 #, 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:2040
+#: gconf/gconfd.c:2015
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously re-"
 "add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:2063 gconf/gconfd.c:2228
+#: gconf/gconfd.c:2038 gconf/gconfd.c:2203
 #, c-format
 msgid "Failed to get IOR for client: %s"
 msgstr ""
 
-#: gconf/gconfd.c:2078
+#: gconf/gconfd.c:2053
 #, c-format
 msgid "Failed to open saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:2091
+#: gconf/gconfd.c:2066
 #, c-format
 msgid "Failed to write client add to saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:2099
+#: gconf/gconfd.c:2074
 #, c-format
 msgid "Failed to flush client add to saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:2189
+#: gconf/gconfd.c:2164
 msgid ""
 "Some client removed itself from the GConf server when it hadn't been added."
 msgstr ""
@@ -1285,339 +1324,332 @@ msgid ""
 msgstr ""
 
 #: gconf/gconftool.c:525
+msgid "You should use --direct when using a non-default configuration source\n"
+msgstr ""
+
+#: gconf/gconftool.c:531
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:550
+#: gconf/gconftool.c:566
 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:565
-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 ""
-
-#: gconf/gconftool.c:587
+#: gconf/gconftool.c:595
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:798
+#: gconf/gconftool.c:796
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:841
+#: gconf/gconftool.c:839
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 
-#: gconf/gconftool.c:875
+#: gconf/gconftool.c:873
 #, 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:893
+#: gconf/gconftool.c:891
 msgid "(no value set)"
 msgstr ""
 
-#: gconf/gconftool.c:948
+#: gconf/gconftool.c:946
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:962
+#: gconf/gconftool.c:960
 msgid "Must specify a key or keys to get\n"
 msgstr ""
 
-#: gconf/gconftool.c:997
+#: gconf/gconftool.c:995
 #, c-format
 msgid "Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:998
+#: gconf/gconftool.c:996
 #, c-format
 msgid "List Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:999
+#: gconf/gconftool.c:997
 #, c-format
 msgid "Car Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1000
+#: gconf/gconftool.c:998
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1005
+#: gconf/gconftool.c:1003
 #, c-format
 msgid "Default Value: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1005 gconf/gconftool.c:1007 gconf/gconftool.c:1008
-#: gconf/gconftool.c:1009
+#: gconf/gconftool.c:1003 gconf/gconftool.c:1005 gconf/gconftool.c:1006
+#: gconf/gconftool.c:1007
 msgid "Unset"
 msgstr ""
 
-#: gconf/gconftool.c:1007
+#: gconf/gconftool.c:1005
 #, c-format
 msgid "Owner: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1008
+#: gconf/gconftool.c:1006
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1009
+#: gconf/gconftool.c:1007
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1018 gconf/gconftool.c:1312
+#: gconf/gconftool.c:1016 gconf/gconftool.c:1310
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1022 gconf/gconftool.c:1316
+#: gconf/gconftool.c:1020 gconf/gconftool.c:1314
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1065 gconf/gconftool.c:1077
+#: gconf/gconftool.c:1063 gconf/gconftool.c:1075
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1089
+#: gconf/gconftool.c:1087
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr ""
 
-#: gconf/gconftool.c:1109
+#: gconf/gconftool.c:1107
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1137
+#: gconf/gconftool.c:1135
 msgid "Cannot set schema as value\n"
 msgstr ""
 
-#: gconf/gconftool.c:1147
+#: gconf/gconftool.c:1145
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1161
+#: gconf/gconftool.c:1159
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1176
+#: gconf/gconftool.c:1174
 #, c-format
 msgid "Error: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1189
+#: gconf/gconftool.c:1187
 #, 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:1207
+#: gconf/gconftool.c:1205
 #, fuzzy, c-format
 msgid "Error syncing: %s\n"
 msgstr "Hiba a modul megnyit�sakor `%s': %s\n"
 
-#: gconf/gconftool.c:1230
+#: gconf/gconftool.c:1228
 msgid "Must specify a key or keys on the command line\n"
 msgstr ""
 
-#: gconf/gconftool.c:1250
+#: gconf/gconftool.c:1248
 #, fuzzy, c-format
 msgid "No schema known for `%s'\n"
 msgstr "Nincs ilyen f�jl `%s'\n"
 
-#: gconf/gconftool.c:1283
+#: gconf/gconftool.c:1281
 #, c-format
 msgid "No doc string stored in schema at '%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1288
+#: gconf/gconftool.c:1286
 #, 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:1295
+#: gconf/gconftool.c:1293
 #, fuzzy, c-format
 msgid "No schema stored at '%s'\n"
 msgstr "Nincs ilyen f�jl `%s'\n"
 
-#: gconf/gconftool.c:1298
+#: gconf/gconftool.c:1296
 #, c-format
 msgid "Value at '%s' is not a schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1354
+#: gconf/gconftool.c:1352
 msgid "Must specify a schema name followed by the key name to apply it to\n"
 msgstr ""
 
-#: gconf/gconftool.c:1361
+#: gconf/gconftool.c:1359
 #, 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:1381
+#: gconf/gconftool.c:1379
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr ""
 
-#: gconf/gconftool.c:1423
+#: gconf/gconftool.c:1421
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1443
+#: gconf/gconftool.c:1441
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1463
+#: gconf/gconftool.c:1461
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1478
+#: gconf/gconftool.c:1476
 #, c-format
 msgid "Error setting value: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1492
+#: gconf/gconftool.c:1490
 #, c-format
 msgid "Error syncing: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1507
+#: gconf/gconftool.c:1505
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1521
+#: gconf/gconftool.c:1519
 msgid "Must specify one or more keys to unset.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1532
+#: gconf/gconftool.c:1530
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1555
+#: gconf/gconftool.c:1553
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1589
+#: gconf/gconftool.c:1587
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1631
+#: gconf/gconftool.c:1629
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1640
+#: gconf/gconftool.c:1638
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1651 gconf/gconftool.c:1681 gconf/gconftool.c:1710
+#: gconf/gconftool.c:1649 gconf/gconftool.c:1679 gconf/gconftool.c:1708
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1669
+#: gconf/gconftool.c:1667
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1694
+#: gconf/gconftool.c:1692
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1723
+#: gconf/gconftool.c:1721
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr ""
 
-#: gconf/gconftool.c:1770 gconf/gconftool.c:1791 gconf/gconftool.c:1812
-#: gconf/gconftool.c:1833
+#: gconf/gconftool.c:1768 gconf/gconftool.c:1789 gconf/gconftool.c:1810
+#: gconf/gconftool.c:1831
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1787
+#: gconf/gconftool.c:1785
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1808
+#: gconf/gconftool.c:1806
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1829
+#: gconf/gconftool.c:1827
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1857
+#: gconf/gconftool.c:1855
 msgid "WARNING: empty <applyto> node"
 msgstr ""
 
-#: gconf/gconftool.c:1860 gconf/gconftool.c:2123
+#: gconf/gconftool.c:1858 gconf/gconftool.c:2121
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1870
+#: gconf/gconftool.c:1868
 msgid "WARNING: no key specified for schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1903
+#: gconf/gconftool.c:1901
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 
-#: gconf/gconftool.c:1909
+#: gconf/gconftool.c:1907
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 
-#: gconf/gconftool.c:1990
+#: gconf/gconftool.c:1988
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:2019
+#: gconf/gconftool.c:2017
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2027
+#: gconf/gconftool.c:2025
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:2049
+#: gconf/gconftool.c:2047
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2057
+#: gconf/gconftool.c:2055
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:2136
+#: gconf/gconftool.c:2134
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr ""
 
@@ -1626,70 +1658,70 @@ msgstr ""
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr ""
 
-#: gconf/gconftool.c:2187
+#: gconf/gconftool.c:2188
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2194
+#: gconf/gconftool.c:2195
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr ""
 
-#: gconf/gconftool.c:2206
+#: gconf/gconftool.c:2207
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
 "<gconfschemafile>)\n"
 msgstr ""
 
-#: gconf/gconftool.c:2219
+#: gconf/gconftool.c:2220
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:2233
+#: gconf/gconftool.c:2234
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr ""
 
-#: gconf/gconftool.c:2244 gconf/gconftool.c:2276
+#: gconf/gconftool.c:2245 gconf/gconftool.c:2277
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr ""
 
-#: gconf/gconftool.c:2260
+#: gconf/gconftool.c:2261
 msgid "Must specify some schema files to install\n"
 msgstr ""
 
-#: gconf/gconftool.c:2297
+#: gconf/gconftool.c:2298
 #, c-format
 msgid ""
 "\n"
 "%s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2317
+#: gconf/gconftool.c:2318
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2443
+#: gconf/gconftool.c:2444
 msgid "Must specify some keys to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2449
+#: gconf/gconftool.c:2450
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
 "  %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2467
+#: gconf/gconftool.c:2468
 msgid "Must specify some directories to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2486
+#: gconf/gconftool.c:2487
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1712,6 +1744,9 @@ msgstr ""
 msgid "Expected `%s' got `%s' for key %s"
 msgstr ""
 
+#~ msgid "%s"
+#~ msgstr "%s"
+
 #~ 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"
diff --git a/po/it.po b/po/it.po
index b4cd4262..95995a70 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf 0.5\n"
-"POT-Creation-Date: 2001-08-15 18:01-0400\n"
+"POT-Creation-Date: 2002-02-04 18:21-0500\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"
@@ -31,7 +31,7 @@ msgstr "Inizializzo il modulo backend BDB"
 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
+#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1050
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr ""
@@ -45,26 +45,26 @@ msgstr ""
 msgid "Unloading XML backend module."
 msgstr ""
 
-#: backends/xml-backend.c:286
+#: backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr ""
 
-#: backends/xml-backend.c:386
+#: backends/xml-backend.c:414
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
 msgstr ""
 
-#: backends/xml-backend.c:396
+#: backends/xml-backend.c:424
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
 
-#: backends/xml-backend.c:680
+#: backends/xml-backend.c:708
 msgid "Initializing XML backend module"
 msgstr ""
 
-#: backends/xml-backend.c:745
+#: backends/xml-backend.c:773
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr ""
@@ -128,32 +128,32 @@ msgid "Failed to delete old file `%s': %s"
 msgstr ""
 
 #. These are all fatal errors
-#: backends/xml-dir.c:806
+#: backends/xml-dir.c:803
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:950
+#: backends/xml-dir.c:947
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:972
+#: backends/xml-dir.c:969
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:979
+#: backends/xml-dir.c:977
 #, c-format
-msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
+msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:1067
+#: backends/xml-dir.c:1066
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2494
+#: backends/xml-dir.c:1074
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr ""
@@ -164,11 +164,6 @@ msgstr ""
 msgid "Ignoring XML node with name `%s': %s"
 msgstr ""
 
-#: backends/xml-entry.c:200
-#, c-format
-msgid "%s"
-msgstr ""
-
 #: backends/xml-entry.c:327
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
@@ -331,7 +326,7 @@ msgid ""
 "result in a notification weirdly reappearing): %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1328
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr ""
@@ -440,174 +435,270 @@ msgstr ""
 msgid "No database available to save your configuration"
 msgstr ""
 
-#: gconf/gconf-internals.c:87
+#: gconf/gconf-internals.c:114
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:227
+#, c-format
+msgid "Invalid UTF-8 in string value in '%s'"
+msgstr ""
+
+#: gconf/gconf-internals.c:286
 msgid "Couldn't interpret CORBA value for list element"
 msgstr ""
 
-#: gconf/gconf-internals.c:253
+#: gconf/gconf-internals.c:288
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:266
+#: gconf/gconf-internals.c:301
 msgid "Received list from gconfd with a bad list type"
 msgstr ""
 
-#: gconf/gconf-internals.c:447
+#: gconf/gconf-internals.c:482
 msgid "Failed to convert object to IOR"
 msgstr ""
 
-#: gconf/gconf-internals.c:813
+#: gconf/gconf-internals.c:619
+msgid "Invalid UTF-8 in locale for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:627
+msgid "Invalid UTF-8 in short description for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:635
+msgid "Invalid UTF-8 in long description for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:643
+msgid "Invalid UTF-8 in owner for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:868
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:873
+#: gconf/gconf-internals.c:928
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:885
+#: gconf/gconf-internals.c:940
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:1327
+#: gconf/gconf-internals.c:1271 gconf/gconf-internals.c:1337
+#: gconf/gconf-value.c:125 gconf/gconf-value.c:224 gconf/gconf-value.c:366
+#: gconf/gconf-value.c:1084
+msgid "Text contains invalid UTF-8"
+msgstr ""
+
+#: gconf/gconf-internals.c:1422
 #, c-format
 msgid "Expected list, got %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1337
+#: gconf/gconf-internals.c:1432
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1476
+#: gconf/gconf-internals.c:1571
 #, c-format
 msgid "Expected pair, got %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1490
+#: gconf/gconf-internals.c:1585
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 
-#: gconf/gconf-internals.c:1506
+#: gconf/gconf-internals.c:1601
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:1622
+#: gconf/gconf-internals.c:1717
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:1684
+#: gconf/gconf-internals.c:1779
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:2164 gconf/gconf.c:3092
+#: gconf/gconf-internals.c:1915
+msgid "Encoded value is not valid UTF-8"
+msgstr ""
+
+#: gconf/gconf-internals.c:2265 gconf/gconf.c:3082
 #, c-format
 msgid "CORBA error: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2180
+#: gconf/gconf-internals.c:2281
 #, c-format
 msgid "OAF problem description: '%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2186
+#: gconf/gconf-internals.c:2287
 msgid "attempt to remove not-listed OAF object directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2191
+#: gconf/gconf-internals.c:2292
 msgid "attempt to add already-listed OAF directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2198
+#: gconf/gconf-internals.c:2299
 #, c-format
 msgid "OAF parse error: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2203
+#: gconf/gconf-internals.c:2304
 msgid "Unknown OAF error"
 msgstr ""
 
-#: gconf/gconf-internals.c:2290
+#: gconf/gconf-internals.c:2437
 #, c-format
-msgid "No ior file in `%s'"
+msgid "Could not lock temporary file '%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2321
+#: gconf/gconf-internals.c:2464
 #, c-format
-msgid "gconfd taking lock `%s' from some other process"
+msgid "Could not create file '%s', probably because it already exists"
 msgstr ""
 
-#: gconf/gconf-internals.c:2332
+#: gconf/gconf-internals.c:2510
 #, c-format
-msgid "Another program has lock `%s'"
-msgstr ""
-
-#: gconf/gconf-internals.c:2351
-msgid "couldn't contact ORB to ping existing gconfd"
+msgid "Failed to create or open '%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2520
 #, c-format
 msgid ""
-"Removing stale lock `%s' because IOR couldn't be converted to object "
-"reference, IOR `%s'"
+"Failed to lock '%s': probably another process has the lock, or your "
+"operating system has NFS file locking misconfigured (%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:2371
+#: gconf/gconf-internals.c:2548
 #, c-format
-msgid "Removing stale lock `%s' because of error pinging server: %s"
+msgid "IOR file '%s' not opened successfully, no gconfd located: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2383
+#: gconf/gconf-internals.c:2578
 #, c-format
-msgid "GConf configuration daemon (gconfd) has lock `%s'"
+msgid "gconftool or other non-gconfd process has the lock file '%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2397
+#: gconf/gconf-internals.c:2595
+msgid "couldn't contact ORB to resolve existing gconfd object reference"
+msgstr ""
+
+#: gconf/gconf-internals.c:2627
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2446
+#: gconf/gconf-internals.c:2686
 #, c-format
-msgid "Can't create lock `%s': %s"
+msgid "Can't write to file `%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2482
+#: gconf/gconf-internals.c:2727
 #, c-format
-msgid "Can't write to file `%s': %s"
+msgid "We didn't have the lock on file `%s', but we should have"
 msgstr ""
 
-#: gconf/gconf-internals.c:2532
+#: gconf/gconf-internals.c:2748
 #, c-format
-msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
+msgid "Failed to link '%s' to '%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2549
+#: gconf/gconf-internals.c:2760
 #, c-format
-msgid "Corrupt lock file `%s', removing anyway"
+msgid "Failed to remove lock file `%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2559
+#: gconf/gconf-internals.c:2779
 #, c-format
+msgid "Failed to clean up file '%s': %s"
+msgstr ""
+
+#: gconf/gconf-internals.c:2793
+#, c-format
+msgid "Failed to remove lock directory `%s': %s"
+msgstr ""
+
+#: gconf/gconf-internals.c:3003 gconf/gconfd.c:580
+#, c-format
+msgid "Failed to create %s: %s"
+msgstr ""
+
+#: gconf/gconf-internals.c:3036
+#, c-format
+msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
+msgstr ""
+
+#: gconf/gconf-internals.c:3064
+#, c-format
+msgid "Failed to launch configuration server: %s\n"
+msgstr ""
+
+#: gconf/gconf-internals.c:3088
 msgid ""
-"Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
-"took our lock"
+"Failed to contact configuration server (a likely cause of this is that you "
+"have an existing configuration server (gconfd) running, but it isn't "
+"reachable from here - if you're logged in from two machines at once, you may "
+"need to enable TCP networking for ORBit)\n"
+msgstr ""
+
+#: gconf/gconf-internals.c:3724
+#, c-format
+msgid "Failed to read from child pipe (%s)"
+msgstr ""
+
+#: gconf/gconf-internals.c:3789
+#, c-format
+msgid "Failed to fork (%s)"
+msgstr ""
+
+#: gconf/gconf-internals.c:3929
+#, c-format
+msgid "Failed to change to directory '%s' (%s)"
+msgstr ""
+
+#: gconf/gconf-internals.c:3939
+#, c-format
+msgid "Failed to execute child process (%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:2576
+#: gconf/gconf-internals.c:3948
 #, c-format
-msgid "Failed to release lock directory `%s': %s"
+msgid "Failed to redirect output or input of child process (%s)"
+msgstr ""
+
+#: gconf/gconf-internals.c:3957
+#, c-format
+msgid "Failed to fork child process (%s)"
+msgstr ""
+
+#: gconf/gconf-internals.c:3965
+msgid "Unknown error executing child process"
+msgstr ""
+
+#: gconf/gconf-internals.c:3986
+#, c-format
+msgid "Failed to read enough data from child pid pipe (%s)"
+msgstr ""
+
+#: gconf/gconf-internals.c:4036
+#, c-format
+msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr ""
 
 #: gconf/gconf-sources.c:320
@@ -615,106 +706,108 @@ msgstr ""
 msgid "Failed to load source `%s': %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:510
+#: gconf/gconf-sources.c:544
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 
-#: gconf/gconf-sources.c:567
+#: gconf/gconf-sources.c:601
 msgid "The '/' name can only be a directory, not a key"
 msgstr ""
 
-#: gconf/gconf-sources.c:596
+#: gconf/gconf-sources.c:630
 #, 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
+#: gconf/gconf-sources.c:642
 #, 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 "
+"somehow we mistakenly created two gconfd processes. If you have two gconfd "
+"processes (or had two at the time the second was launched), logging out, "
+"killing all copies of gconfd, and logging back in may help. Perhaps the "
+"problem is that you attempted to use GConf from two machines at once, and "
+"ORBit still has its default configuration that prevents remote CORBA "
+"connections? As always, check the user.* syslog for details on problems "
 "gconfd encountered."
 msgstr ""
 
-#: gconf/gconf-sources.c:1164
+#: gconf/gconf-sources.c:1198
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:1233
+#: gconf/gconf-sources.c:1267
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:1257
+#: gconf/gconf-sources.c:1291
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
 
-#: gconf/gconf-value.c:82
+#: gconf/gconf-value.c:81
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr ""
 
-#: gconf/gconf-value.c:92
+#: gconf/gconf-value.c:91
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr ""
 
-#: gconf/gconf-value.c:113
+#: gconf/gconf-value.c:112
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr ""
 
-#: gconf/gconf-value.c:146
+#: gconf/gconf-value.c:156
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr ""
 
-#: gconf/gconf-value.c:214
+#: gconf/gconf-value.c:232
 #, c-format
 msgid "Didn't understand `%s' (list must start with a '[')"
 msgstr ""
 
-#: gconf/gconf-value.c:227
+#: gconf/gconf-value.c:245
 #, c-format
 msgid "Didn't understand `%s' (list must end with a ']')"
 msgstr ""
 
-#: gconf/gconf-value.c:278
+#: gconf/gconf-value.c:296
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
 msgstr ""
 
-#: gconf/gconf-value.c:309 gconf/gconf-value.c:462
+#: gconf/gconf-value.c:327 gconf/gconf-value.c:488
 #, c-format
 msgid "Didn't understand `%s' (extra trailing characters)"
 msgstr ""
 
-#: gconf/gconf-value.c:348
+#: gconf/gconf-value.c:374
 #, c-format
 msgid "Didn't understand `%s' (pair must start with a '(')"
 msgstr ""
 
-#: gconf/gconf-value.c:361
+#: gconf/gconf-value.c:387
 #, c-format
 msgid "Didn't understand `%s' (pair must end with a ')')"
 msgstr ""
 
-#: gconf/gconf-value.c:391 gconf/gconf-value.c:477
+#: gconf/gconf-value.c:417 gconf/gconf-value.c:503
 #, c-format
 msgid "Didn't understand `%s' (wrong number of elements)"
 msgstr ""
 
-#: gconf/gconf-value.c:431
+#: gconf/gconf-value.c:457
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr ""
@@ -724,322 +817,268 @@ msgstr ""
 msgid "`%s': %s"
 msgstr ""
 
-#: gconf/gconf.c:289
+#: gconf/gconf.c:287
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr ""
 
-#: gconf/gconf.c:574
+#: gconf/gconf.c:572
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 
-#: gconf/gconf.c:1870
+#: gconf/gconf.c:1868
 #, c-format
 msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr ""
 
-#: 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. "
-"This is a bug in the OAF package; something went wrong in OAF, and no error "
-"was reported. This is not a bug in the GConf package. Do not report a GConf "
-"bug unless you have information indicating what went wrong with OAF that was "
-"caused by GConf."
-msgstr ""
-
-#: gconf/gconf.c:2198
+#: gconf/gconf.c:2183
 msgid "Failed to init GConf, exiting\n"
 msgstr ""
 
-#: gconf/gconf.c:2235
+#: gconf/gconf.c:2220
 msgid "Must begin with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2257
+#: gconf/gconf.c:2242
 msgid "Can't have two slashes (/) in a row"
 msgstr ""
 
-#: gconf/gconf.c:2259
+#: gconf/gconf.c:2244
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2280
+#: gconf/gconf.c:2265
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr ""
 
-#: gconf/gconf.c:2294
+#: gconf/gconf.c:2279
 msgid "Key/directory may not end with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2547
+#: gconf/gconf.c:2520
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr ""
 
-#: gconf/gconf.c:2608
+#: gconf/gconf.c:2581
 #, c-format
 msgid "Expected float, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2643
+#: gconf/gconf.c:2616
 #, c-format
 msgid "Expected int, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2678
+#: gconf/gconf.c:2651
 #, c-format
 msgid "Expected string, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2715
+#: gconf/gconf.c:2688
 #, c-format
 msgid "Expected bool, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2748
+#: gconf/gconf.c:2721
 #, c-format
 msgid "Expected schema, got %s"
 msgstr ""
 
-#: gconf/gconfd.c:248
+#: gconf/gconfd.c:247
 msgid "Shutdown request received"
 msgstr ""
 
-#: gconf/gconfd.c:280
+#: gconf/gconfd.c:279
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr ""
 
-#: gconf/gconfd.c:298
+#: gconf/gconfd.c:297
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
 msgstr ""
 
-#: gconf/gconfd.c:307
+#: gconf/gconfd.c:306
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
 msgstr ""
 
-#: gconf/gconfd.c:307
+#: gconf/gconfd.c:306
 msgid "/path"
 msgstr ""
 
-#: gconf/gconfd.c:321
+#: gconf/gconfd.c:320
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr ""
 
-#: gconf/gconfd.c:333
+#: gconf/gconfd.c:332
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
 msgstr ""
 
-#: gconf/gconfd.c:350
+#: gconf/gconfd.c:349
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
 
-#: gconf/gconfd.c:376
+#: gconf/gconfd.c:375
 #, c-format
 msgid "Received signal %d, dumping core. Please report a GConf bug."
 msgstr ""
 
-#: gconf/gconfd.c:392
+#: gconf/gconfd.c:391
 #, c-format
 msgid ""
 "Received signal %d, shutting down abnormally. Please file a GConf bug report."
 msgstr ""
 
-#: gconf/gconfd.c:409
+#: gconf/gconfd.c:408
 #, 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:513
+#: gconf/gconfd.c:526
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr ""
 
-#: gconf/gconfd.c:540
-msgid ""
-"Failed to init Object Activation Framework: please mail bug report to OAF "
-"maintainers"
-msgstr ""
-
-#: gconf/gconfd.c:560
+#: gconf/gconfd.c:567
 msgid "Failed to get object reference for ConfigServer"
 msgstr ""
 
-#: gconf/gconfd.c:573
+#: gconf/gconfd.c:605
 #, c-format
-msgid "Failed to create %s: %s"
+msgid "Failed to write byte to pipe fd %d so client program may hang: %s"
 msgstr ""
 
-#. Bad hack alert - register the current lockholder with oafd,
-#. * since oafd seems to have forgotten about us.
-#.
-#: gconf/gconfd.c:588
+#: gconf/gconfd.c:615
 #, c-format
-msgid "Failed to get lock for daemon: %s"
+msgid "Failed to get lock for daemon, exiting: %s"
 msgstr ""
 
-#: gconf/gconfd.c:594
-msgid ""
-"Registering existing server with oafd, since OAF appears to have leaked it"
-msgstr ""
-
-#: gconf/gconfd.c:603
-msgid ""
-"OAF doesn't know about our IID; indicates broken installation; can't "
-"register existing server."
-msgstr ""
-
-#: gconf/gconfd.c:607
-msgid ""
-"Another gconfd already registered with OAF, so we can't register the "
-"existing server"
-msgstr ""
-
-#: gconf/gconfd.c:612
-msgid "Unknown error registering existing gconfd with OAF; exiting"
-msgstr ""
-
-#: gconf/gconfd.c:639
-msgid ""
-"OAF doesn't know about our IID; indicates broken installation; can't "
-"register; exiting\n"
-msgstr ""
-
-#: gconf/gconfd.c:643
-msgid "Another gconfd already registered with OAF; exiting\n"
-msgstr ""
-
-#: gconf/gconfd.c:648
-msgid "Unknown error registering gconfd with OAF; exiting\n"
-msgstr ""
-
-#: gconf/gconfd.c:692
+#: gconf/gconfd.c:657
 #, c-format
-msgid "Failed to release lockfile: %s"
+msgid "Error releasing lockfile: %s"
 msgstr ""
 
-#: gconf/gconfd.c:700
+#: gconf/gconfd.c:665
 msgid "Exiting"
 msgstr ""
 
-#: gconf/gconfd.c:725
+#: gconf/gconfd.c:690
 msgid "GConf server is not in use, shutting down."
 msgstr ""
 
-#: gconf/gconfd.c:1084
+#: gconf/gconfd.c:1059
 #, c-format
 msgid "Returning exception: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1184
+#: gconf/gconfd.c:1159
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
 "gconfd shutdown (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1219
+#: gconf/gconfd.c:1194
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1288
+#: gconf/gconfd.c:1263
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1302
+#: gconf/gconfd.c:1277
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1311
+#: gconf/gconfd.c:1286
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1325
+#: gconf/gconfd.c:1300
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1335
+#: gconf/gconfd.c:1310
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1344
+#: gconf/gconfd.c:1319
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1819
+#: gconf/gconfd.c:1794
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr ""
 
-#: gconf/gconfd.c:1865
+#: gconf/gconfd.c:1840
 #, c-format
 msgid "Error reading saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1918
+#: gconf/gconfd.c:1893
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:2035
+#: gconf/gconfd.c:2010
 #, 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:2040
+#: gconf/gconfd.c:2015
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously re-"
 "add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:2063 gconf/gconfd.c:2228
+#: gconf/gconfd.c:2038 gconf/gconfd.c:2203
 #, c-format
 msgid "Failed to get IOR for client: %s"
 msgstr ""
 
-#: gconf/gconfd.c:2078
+#: gconf/gconfd.c:2053
 #, c-format
 msgid "Failed to open saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:2091
+#: gconf/gconfd.c:2066
 #, c-format
 msgid "Failed to write client add to saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:2099
+#: gconf/gconfd.c:2074
 #, c-format
 msgid "Failed to flush client add to saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:2189
+#: gconf/gconfd.c:2164
 msgid ""
 "Some client removed itself from the GConf server when it hadn't been added."
 msgstr ""
@@ -1282,339 +1321,332 @@ msgid ""
 msgstr ""
 
 #: gconf/gconftool.c:525
+msgid "You should use --direct when using a non-default configuration source\n"
+msgstr ""
+
+#: gconf/gconftool.c:531
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:550
+#: gconf/gconftool.c:566
 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:565
-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 ""
-
-#: gconf/gconftool.c:587
+#: gconf/gconftool.c:595
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:798
+#: gconf/gconftool.c:796
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:841
+#: gconf/gconftool.c:839
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 
-#: gconf/gconftool.c:875
+#: gconf/gconftool.c:873
 #, c-format
 msgid "Failure listing entries in `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:893
+#: gconf/gconftool.c:891
 msgid "(no value set)"
 msgstr ""
 
-#: gconf/gconftool.c:948
+#: gconf/gconftool.c:946
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:962
+#: gconf/gconftool.c:960
 msgid "Must specify a key or keys to get\n"
 msgstr ""
 
-#: gconf/gconftool.c:997
+#: gconf/gconftool.c:995
 #, c-format
 msgid "Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:998
+#: gconf/gconftool.c:996
 #, c-format
 msgid "List Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:999
+#: gconf/gconftool.c:997
 #, c-format
 msgid "Car Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1000
+#: gconf/gconftool.c:998
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1005
+#: gconf/gconftool.c:1003
 #, c-format
 msgid "Default Value: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1005 gconf/gconftool.c:1007 gconf/gconftool.c:1008
-#: gconf/gconftool.c:1009
+#: gconf/gconftool.c:1003 gconf/gconftool.c:1005 gconf/gconftool.c:1006
+#: gconf/gconftool.c:1007
 msgid "Unset"
 msgstr ""
 
-#: gconf/gconftool.c:1007
+#: gconf/gconftool.c:1005
 #, c-format
 msgid "Owner: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1008
+#: gconf/gconftool.c:1006
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1009
+#: gconf/gconftool.c:1007
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1018 gconf/gconftool.c:1312
+#: gconf/gconftool.c:1016 gconf/gconftool.c:1310
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1022 gconf/gconftool.c:1316
+#: gconf/gconftool.c:1020 gconf/gconftool.c:1314
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1065 gconf/gconftool.c:1077
+#: gconf/gconftool.c:1063 gconf/gconftool.c:1075
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1089
+#: gconf/gconftool.c:1087
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr ""
 
-#: gconf/gconftool.c:1109
+#: gconf/gconftool.c:1107
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1137
+#: gconf/gconftool.c:1135
 msgid "Cannot set schema as value\n"
 msgstr ""
 
-#: gconf/gconftool.c:1147
+#: gconf/gconftool.c:1145
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1161
+#: gconf/gconftool.c:1159
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1176
+#: gconf/gconftool.c:1174
 #, c-format
 msgid "Error: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1189
+#: gconf/gconftool.c:1187
 #, c-format
 msgid "Error setting value: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1207
+#: gconf/gconftool.c:1205
 #, c-format
 msgid "Error syncing: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1230
+#: gconf/gconftool.c:1228
 msgid "Must specify a key or keys on the command line\n"
 msgstr ""
 
-#: gconf/gconftool.c:1250
+#: gconf/gconftool.c:1248
 #, c-format
 msgid "No schema known for `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1283
+#: gconf/gconftool.c:1281
 #, c-format
 msgid "No doc string stored in schema at '%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1288
+#: gconf/gconftool.c:1286
 #, c-format
 msgid "Error getting schema at '%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1295
+#: gconf/gconftool.c:1293
 #, c-format
 msgid "No schema stored at '%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1298
+#: gconf/gconftool.c:1296
 #, c-format
 msgid "Value at '%s' is not a schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1354
+#: gconf/gconftool.c:1352
 msgid "Must specify a schema name followed by the key name to apply it to\n"
 msgstr ""
 
-#: gconf/gconftool.c:1361
+#: gconf/gconftool.c:1359
 #, c-format
 msgid "Error associating schema name '%s' with key name '%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1381
+#: gconf/gconftool.c:1379
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr ""
 
-#: gconf/gconftool.c:1423
+#: gconf/gconftool.c:1421
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1443
+#: gconf/gconftool.c:1441
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1463
+#: gconf/gconftool.c:1461
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1478
+#: gconf/gconftool.c:1476
 #, c-format
 msgid "Error setting value: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1492
+#: gconf/gconftool.c:1490
 #, c-format
 msgid "Error syncing: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1507
+#: gconf/gconftool.c:1505
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1521
+#: gconf/gconftool.c:1519
 msgid "Must specify one or more keys to unset.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1532
+#: gconf/gconftool.c:1530
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1555
+#: gconf/gconftool.c:1553
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1589
+#: gconf/gconftool.c:1587
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1631
+#: gconf/gconftool.c:1629
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1640
+#: gconf/gconftool.c:1638
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1651 gconf/gconftool.c:1681 gconf/gconftool.c:1710
+#: gconf/gconftool.c:1649 gconf/gconftool.c:1679 gconf/gconftool.c:1708
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1669
+#: gconf/gconftool.c:1667
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1694
+#: gconf/gconftool.c:1692
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1723
+#: gconf/gconftool.c:1721
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr ""
 
-#: gconf/gconftool.c:1770 gconf/gconftool.c:1791 gconf/gconftool.c:1812
-#: gconf/gconftool.c:1833
+#: gconf/gconftool.c:1768 gconf/gconftool.c:1789 gconf/gconftool.c:1810
+#: gconf/gconftool.c:1831
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1787
+#: gconf/gconftool.c:1785
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1808
+#: gconf/gconftool.c:1806
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1829
+#: gconf/gconftool.c:1827
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1857
+#: gconf/gconftool.c:1855
 msgid "WARNING: empty <applyto> node"
 msgstr ""
 
-#: gconf/gconftool.c:1860 gconf/gconftool.c:2123
+#: gconf/gconftool.c:1858 gconf/gconftool.c:2121
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1870
+#: gconf/gconftool.c:1868
 msgid "WARNING: no key specified for schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1903
+#: gconf/gconftool.c:1901
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 
-#: gconf/gconftool.c:1909
+#: gconf/gconftool.c:1907
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 
-#: gconf/gconftool.c:1990
+#: gconf/gconftool.c:1988
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:2019
+#: gconf/gconftool.c:2017
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2027
+#: gconf/gconftool.c:2025
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:2049
+#: gconf/gconftool.c:2047
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2057
+#: gconf/gconftool.c:2055
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:2136
+#: gconf/gconftool.c:2134
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr ""
 
@@ -1623,70 +1655,70 @@ msgstr ""
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr ""
 
-#: gconf/gconftool.c:2187
+#: gconf/gconftool.c:2188
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2194
+#: gconf/gconftool.c:2195
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr ""
 
-#: gconf/gconftool.c:2206
+#: gconf/gconftool.c:2207
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
 "<gconfschemafile>)\n"
 msgstr ""
 
-#: gconf/gconftool.c:2219
+#: gconf/gconftool.c:2220
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:2233
+#: gconf/gconftool.c:2234
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr ""
 
-#: gconf/gconftool.c:2244 gconf/gconftool.c:2276
+#: gconf/gconftool.c:2245 gconf/gconftool.c:2277
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr ""
 
-#: gconf/gconftool.c:2260
+#: gconf/gconftool.c:2261
 msgid "Must specify some schema files to install\n"
 msgstr ""
 
-#: gconf/gconftool.c:2297
+#: gconf/gconftool.c:2298
 #, c-format
 msgid ""
 "\n"
 "%s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2317
+#: gconf/gconftool.c:2318
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2443
+#: gconf/gconftool.c:2444
 msgid "Must specify some keys to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2449
+#: gconf/gconftool.c:2450
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
 "  %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2467
+#: gconf/gconftool.c:2468
 msgid "Must specify some directories to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2486
+#: gconf/gconftool.c:2487
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
diff --git a/po/ja.po b/po/ja.po
index 5d824f60..76ba6a21 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -2,11 +2,10 @@
 # Copyright (C) 2000,2001 Free Software Foundation, Inc.
 # Takeshi Aihana <aihana@gnome.gr.jp>, 2000, 2001.
 # 
-#, no-wrap
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf 1.0.7\n"
-"POT-Creation-Date: 2001-12-10 16:32+0900\n"
+"POT-Creation-Date: 2002-02-04 18:21-0500\n"
 "PO-Revision-Date: 2001-12-10 16:29+0900\n"
 "Last-Translator: Takeshi Aihana <aihana@gnome.gr.jp>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -32,7 +31,7 @@ msgstr "BarkeleyDB (BDB) �Хå�����ɥ⥸�塼��ν������Ǥ�"
 msgid "Couldn't find the %s root directory in the address `%s'"
 msgstr "���ɥ쥹 %s �ˤ��� %s �Υ롼�ȥǥ��쥯�ȥ꤬���Ĥ���ޤ���Ǥ���"
 
-#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1053
+#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1050
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "�ǥ��쥯�ȥ� '%s' ������Ǥ��ޤ���Ǥ���: %s"
@@ -136,34 +135,34 @@ msgid "Failed to delete old file `%s': %s"
 msgstr "�Ť��ե����� '%s' �κ���˼��Ԥ��ޤ���: %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:806
+#: backends/xml-dir.c:803
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "'%s' �ξ��֤������Ǥ��ޤ���Ǥ���: %s"
 
-#: backends/xml-dir.c:950
+#: backends/xml-dir.c:947
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "'%s' �� '%s' ����ǽ�ʣ���Ƥ��ޤ���̵�뤷�ޤ�"
 
-#: backends/xml-dir.c:972
+#: backends/xml-dir.c:969
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "XML �ե����� '%s' �����̾����̵������ȥ꤬�ޤޤ�Ƥ��ޤ���̵�뤷�ޤ�"
 
-#: backends/xml-dir.c:980
+#: backends/xml-dir.c:977
 #, c-format
 msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
 msgstr ""
 "XML �ե����� '%s' ����Υȥåץ�٥�Ρ��ɤ� 1 �Ĥ� <entry> �ǤϤʤ� <%s> ��"
 "����̵�뤷�ޤ�"
 
-#: backends/xml-dir.c:1069
+#: backends/xml-dir.c:1066
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "�ե����� '%s' �κ����˼��Ԥ��ޤ���: %s"
 
-#: backends/xml-dir.c:1077
+#: backends/xml-dir.c:1074
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "�ե����� '%s' ���Ĥ���Τ˼��Ԥ��ޤ���: %s"
@@ -347,7 +346,7 @@ msgstr ""
 "�����ե�����إꥹ�ʡ��Υ�����ư�˼��Ԥ��ޤ��� (�ؤɼ³��Ϥ���ޤ��󡢺��٤�"
 "���������Τ����뤫�⤷��ޤ��󤻤�): %s"
 
-#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1328
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "'%s' ���ͤμ����ǥ��顼: %s"
@@ -675,12 +674,12 @@ msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
 msgstr ""
 "�ҥץ������� gconf �ǡ������̿����뤿��Υѥ��פκ����˼��Ԥ��ޤ���: %s\n"
 
-#: gconf/gconf-internals.c:3060
+#: gconf/gconf-internals.c:3064
 #, c-format
 msgid "Failed to launch configuration server: %s\n"
 msgstr "���ꥵ���Фε�ư�˼��Ԥ��ޤ���: %s\n"
 
-#: gconf/gconf-internals.c:3084
+#: gconf/gconf-internals.c:3088
 msgid ""
 "Failed to contact configuration server (a likely cause of this is that you "
 "have an existing configuration server (gconfd) running, but it isn't "
@@ -691,46 +690,46 @@ msgstr ""
 "���뤬������������̿��Ǥ��ʤ� - ���٤���ĤΥޥ��󤫤�������󤷤Ƥ�����"
 "�ϡ�ORBit �� TCP �ͥåȥ�����ǽ�ˤ���ɬ�פ�����ޤ�)\n"
 
-#: gconf/gconf-internals.c:3720
+#: gconf/gconf-internals.c:3724
 #, c-format
 msgid "Failed to read from child pipe (%s)"
 msgstr "�ҥץ������Υѥ��� (%s) ������ɤ߹��ߤ˼��Ԥ��ޤ���"
 
-#: gconf/gconf-internals.c:3785
+#: gconf/gconf-internals.c:3789
 #, c-format
 msgid "Failed to fork (%s)"
 msgstr "Fork (%s) �˼��Ԥ��ޤ���"
 
-#: gconf/gconf-internals.c:3925
+#: gconf/gconf-internals.c:3929
 #, c-format
 msgid "Failed to change to directory '%s' (%s)"
 msgstr "�ǥ��쥯�ȥ� '%s' �ؤΰ�ư�˼��Ԥ��ޤ��� (%s)"
 
-#: gconf/gconf-internals.c:3935
+#: gconf/gconf-internals.c:3939
 #, c-format
 msgid "Failed to execute child process (%s)"
 msgstr "�ҥץ����� (%s) �μ¹Ԥ˼��Ԥ��ޤ���"
 
-#: gconf/gconf-internals.c:3944
+#: gconf/gconf-internals.c:3948
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
 msgstr "�ҥץ����� (%s) �������ϥ�����쥯�Ȥ˼��Ԥ��ޤ���"
 
-#: gconf/gconf-internals.c:3953
+#: gconf/gconf-internals.c:3957
 #, c-format
 msgid "Failed to fork child process (%s)"
 msgstr "�ҥץ����� (%s) �� Fork �˼��Ԥ��ޤ���"
 
-#: gconf/gconf-internals.c:3961
+#: gconf/gconf-internals.c:3965
 msgid "Unknown error executing child process"
 msgstr "�ҥץ�������¹���������ʥ��顼"
 
-#: gconf/gconf-internals.c:3982
+#: gconf/gconf-internals.c:3986
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr "�ҥץ����� PID �ѥ��� (%s) ����ǡ�����ʬ���ɤ�ޤ���"
 
-#: gconf/gconf-internals.c:4032
+#: gconf/gconf-internals.c:4036
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr "�ҥץ����� (%s) ���̿����뤿��Υѥ��פκ����˼��Ԥ��ޤ���"
@@ -740,23 +739,23 @@ msgstr "�ҥץ����� (%s) ���̿����뤿��Υѥ��פκ����˼��Ԥ��ޤ���"
 msgid "Failed to load source `%s': %s"
 msgstr "�ե����� '%s' ���ɤ߹��ߤ˼��Ԥ��ޤ���: %s"
 
-#: gconf/gconf-sources.c:510
+#: gconf/gconf-sources.c:544
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr "�������� '%s' �ϥ������ޤǤ�̵���� '%s' ����¸����褦���ꤵ��ޤ���"
 
-#: gconf/gconf-sources.c:567
+#: gconf/gconf-sources.c:601
 msgid "The '/' name can only be a directory, not a key"
 msgstr "̾�� '/' �ϥǥ��쥯�ȥ�ξ������ǡ������ˤϻȤ��ޤ���"
 
-#: gconf/gconf-sources.c:596
+#: gconf/gconf-sources.c:630
 #, 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:608
+#: gconf/gconf-sources.c:642
 #, c-format
 msgid ""
 "Unable to store a value at key '%s', as the configuration server has no "
@@ -780,17 +779,17 @@ msgstr ""
 "�ˤʤäƤޤ����� ��ˡ�gconfd ��ȯ����������ξܺ٤ˤĤ��Ƥ� users.* ��������"
 "���ǧ���ƤߤƲ�������"
 
-#: gconf/gconf-sources.c:1164
+#: gconf/gconf-sources.c:1198
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "�᥿����θ�����˥��顼: %s"
 
-#: gconf/gconf-sources.c:1233
+#: gconf/gconf-sources.c:1267
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "�᥿����μ�����˥��顼: %s"
 
-#: gconf/gconf-sources.c:1257
+#: gconf/gconf-sources.c:1291
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index cb9371b9..1cbf0ec9 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf 0.12\n"
-"POT-Creation-Date: 2001-08-15 18:01-0400\n"
+"POT-Creation-Date: 2002-02-04 18:21-0500\n"
 "PO-Revision-Date: 2001-02-09 02:04+0900\n"
 "Last-Translator: Sung-Hyun Nam <namsh@kldp.org>\n"
 "Language-Team: Korean <ko@li.org>\n"
@@ -31,7 +31,7 @@ msgstr "BDB backend ����� �ʱ�ȭ�մϴ�"
 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
+#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1050
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "`%s'���丮�� ������� �����ϴ�: %s"
@@ -45,26 +45,26 @@ msgstr ""
 msgid "Unloading XML backend module."
 msgstr ""
 
-#: backends/xml-backend.c:286
+#: backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr ""
 
-#: backends/xml-backend.c:386
+#: backends/xml-backend.c:414
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
 msgstr ""
 
-#: backends/xml-backend.c:396
+#: backends/xml-backend.c:424
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
 
-#: backends/xml-backend.c:680
+#: backends/xml-backend.c:708
 msgid "Initializing XML backend module"
 msgstr ""
 
-#: backends/xml-backend.c:745
+#: backends/xml-backend.c:773
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr ""
@@ -128,32 +128,32 @@ msgid "Failed to delete old file `%s': %s"
 msgstr "���� ���� `%s` ����Ⱑ �����߽��ϴ�: %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:806
+#: backends/xml-dir.c:803
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "`%s'�� ������ �������� �����ϴ�: %s"
 
-#: backends/xml-dir.c:950
+#: backends/xml-dir.c:947
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "��Ʈ�� `%s'�� `%s'���� �ߺ��Ǿ��ֽ��ϴ�. ����"
 
-#: backends/xml-dir.c:972
+#: backends/xml-dir.c:969
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:979
+#: backends/xml-dir.c:977
 #, c-format
-msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
+msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:1067
+#: backends/xml-dir.c:1066
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "`%s'������ �����ϴµ� �����߽��ϴ�: %s"
 
-#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2494
+#: backends/xml-dir.c:1074
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "`%s'������ �ݴµ� �����߽��ϴ�: %s"
@@ -164,11 +164,6 @@ msgstr "`%s'������ �ݴµ� �����߽��ϴ�: %s"
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "`%s'��� �̸��� ���� XML ��带 �����մϴ�: %s"
 
-#: backends/xml-entry.c:200
-#, c-format
-msgid "%s"
-msgstr "%s"
-
 #: backends/xml-entry.c:327
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
@@ -331,7 +326,7 @@ msgid ""
 "result in a notification weirdly reappearing): %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1328
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "`%s'������ ���� ��µ� ���� �߻�: %s"
@@ -440,174 +435,270 @@ msgstr "����� ��µ� �����߽��ϴ�"
 msgid "No database available to save your configuration"
 msgstr ""
 
-#: gconf/gconf-internals.c:87
+#: gconf/gconf-internals.c:114
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "Ű `%s'�� '/'�� �����ϴ�"
 
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:227
+#, c-format
+msgid "Invalid UTF-8 in string value in '%s'"
+msgstr ""
+
+#: gconf/gconf-internals.c:286
 msgid "Couldn't interpret CORBA value for list element"
 msgstr ""
 
-#: gconf/gconf-internals.c:253
+#: gconf/gconf-internals.c:288
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:266
+#: gconf/gconf-internals.c:301
 msgid "Received list from gconfd with a bad list type"
 msgstr ""
 
-#: gconf/gconf-internals.c:447
+#: gconf/gconf-internals.c:482
 msgid "Failed to convert object to IOR"
 msgstr ""
 
-#: gconf/gconf-internals.c:813
+#: gconf/gconf-internals.c:619
+msgid "Invalid UTF-8 in locale for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:627
+msgid "Invalid UTF-8 in short description for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:635
+msgid "Invalid UTF-8 in long description for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:643
+msgid "Invalid UTF-8 in owner for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:868
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:873
+#: gconf/gconf-internals.c:928
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:885
+#: gconf/gconf-internals.c:940
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "`%s'������ �дµ� ������ �߻��߽��ϴ�: %s\n"
 
-#: gconf/gconf-internals.c:1327
+#: gconf/gconf-internals.c:1271 gconf/gconf-internals.c:1337
+#: gconf/gconf-value.c:125 gconf/gconf-value.c:224 gconf/gconf-value.c:366
+#: gconf/gconf-value.c:1084
+msgid "Text contains invalid UTF-8"
+msgstr ""
+
+#: gconf/gconf-internals.c:1422
 #, c-format
 msgid "Expected list, got %s"
 msgstr "����Ǵ� ����Ʈ ��� %s�� ������ϴ�"
 
-#: gconf/gconf-internals.c:1337
+#: gconf/gconf-internals.c:1432
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "����Ǵ� %s�� ����Ʈ��� %s�� ����Ʈ�� ������ϴ�"
 
-#: gconf/gconf-internals.c:1476
+#: gconf/gconf-internals.c:1571
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "����Ǵ� pair��ſ� %s�� ������ϴ�"
 
-#: gconf/gconf-internals.c:1490
+#: gconf/gconf-internals.c:1585
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 
-#: gconf/gconf-internals.c:1506
+#: gconf/gconf-internals.c:1601
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "����Ǵ� (%s, %s)Ÿ���� pair ��ſ� (%s, %s)�� ������ϴ�"
 
-#: gconf/gconf-internals.c:1622
+#: gconf/gconf-internals.c:1717
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:1684
+#: gconf/gconf-internals.c:1779
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:2164 gconf/gconf.c:3092
+#: gconf/gconf-internals.c:1915
+msgid "Encoded value is not valid UTF-8"
+msgstr ""
+
+#: gconf/gconf-internals.c:2265 gconf/gconf.c:3082
 #, c-format
 msgid "CORBA error: %s"
 msgstr "�ڹ� ����: %s"
 
-#: gconf/gconf-internals.c:2180
+#: gconf/gconf-internals.c:2281
 #, c-format
 msgid "OAF problem description: '%s'"
 msgstr "OAF ���� ����: '%s'"
 
-#: gconf/gconf-internals.c:2186
+#: gconf/gconf-internals.c:2287
 msgid "attempt to remove not-listed OAF object directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2191
+#: gconf/gconf-internals.c:2292
 msgid "attempt to add already-listed OAF directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2198
+#: gconf/gconf-internals.c:2299
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "OAF �Ľ� ����: %s"
 
-#: gconf/gconf-internals.c:2203
+#: gconf/gconf-internals.c:2304
 msgid "Unknown OAF error"
 msgstr "�˷��������� OAF������ �߻�"
 
-#: gconf/gconf-internals.c:2290
-#, c-format
-msgid "No ior file in `%s'"
-msgstr "`%s'�ȿ� ior ������ �����ϴ�"
+#: gconf/gconf-internals.c:2437
+#, fuzzy, c-format
+msgid "Could not lock temporary file '%s': %s"
+msgstr "`%s'���丮�� ������� �����ϴ�: %s"
 
-#: gconf/gconf-internals.c:2321
+#: gconf/gconf-internals.c:2464
 #, c-format
-msgid "gconfd taking lock `%s' from some other process"
+msgid "Could not create file '%s', probably because it already exists"
 msgstr ""
 
-#: gconf/gconf-internals.c:2332
-#, c-format
-msgid "Another program has lock `%s'"
-msgstr "�ٸ� ���α׷��� ���(`%s')�� ������ �ֽ��ϴ�"
-
-#: gconf/gconf-internals.c:2351
-msgid "couldn't contact ORB to ping existing gconfd"
-msgstr ""
+#: gconf/gconf-internals.c:2510
+#, fuzzy, c-format
+msgid "Failed to create or open '%s'"
+msgstr "`%s'������ �����ϴµ� �����߽��ϴ�: %s"
 
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2520
 #, c-format
 msgid ""
-"Removing stale lock `%s' because IOR couldn't be converted to object "
-"reference, IOR `%s'"
+"Failed to lock '%s': probably another process has the lock, or your "
+"operating system has NFS file locking misconfigured (%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:2371
+#: gconf/gconf-internals.c:2548
 #, c-format
-msgid "Removing stale lock `%s' because of error pinging server: %s"
+msgid "IOR file '%s' not opened successfully, no gconfd located: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2383
+#: gconf/gconf-internals.c:2578
 #, c-format
-msgid "GConf configuration daemon (gconfd) has lock `%s'"
+msgid "gconftool or other non-gconfd process has the lock file '%s'"
+msgstr ""
+
+#: gconf/gconf-internals.c:2595
+msgid "couldn't contact ORB to resolve existing gconfd object reference"
 msgstr ""
 
-#: gconf/gconf-internals.c:2397
+#: gconf/gconf-internals.c:2627
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "`%s'���丮�� ���� ���� �����ϴ�: %s"
 
-#: gconf/gconf-internals.c:2446
-#, c-format
-msgid "Can't create lock `%s': %s"
-msgstr "`%s' ��� ������ ���� ���� �����ϴ�: %s"
-
-#: gconf/gconf-internals.c:2482
+#: gconf/gconf-internals.c:2686
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "`%s'���Ͽ� ������ �����ϴ�: %s"
 
-#: gconf/gconf-internals.c:2532
+#: gconf/gconf-internals.c:2727
 #, c-format
-msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
+msgid "We didn't have the lock on file `%s', but we should have"
 msgstr ""
 
-#: gconf/gconf-internals.c:2549
-#, c-format
-msgid "Corrupt lock file `%s', removing anyway"
-msgstr "��� ����(%s)�� �����־ �����մϴ�"
+#: gconf/gconf-internals.c:2748
+#, fuzzy, c-format
+msgid "Failed to link '%s' to '%s': %s"
+msgstr "`%s'�� ������ �������� �����ϴ�: %s"
+
+#: gconf/gconf-internals.c:2760
+#, fuzzy, c-format
+msgid "Failed to remove lock file `%s': %s"
+msgstr "`%s'������ �����ϴµ� �����߽��ϴ�: %s"
 
-#: gconf/gconf-internals.c:2559
+#: gconf/gconf-internals.c:2779
+#, fuzzy, c-format
+msgid "Failed to clean up file '%s': %s"
+msgstr "`%s'������ �ݴµ� �����߽��ϴ�: %s"
+
+#: gconf/gconf-internals.c:2793
+#, fuzzy, c-format
+msgid "Failed to remove lock directory `%s': %s"
+msgstr "`%s'�� ��� ������ �����߽��ϴ�: %s"
+
+#: gconf/gconf-internals.c:3003 gconf/gconfd.c:580
+#, fuzzy, c-format
+msgid "Failed to create %s: %s"
+msgstr "`%s'������ �����ϴµ� �����߽��ϴ�: %s"
+
+#: gconf/gconf-internals.c:3036
 #, c-format
+msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
+msgstr ""
+
+#: gconf/gconf-internals.c:3064
+#, fuzzy, c-format
+msgid "Failed to launch configuration server: %s\n"
+msgstr "���� ����(gconfd)�� �����Ҽ��� �����ϴ�: %s\n"
+
+#: gconf/gconf-internals.c:3088
 msgid ""
-"Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
-"took our lock"
+"Failed to contact configuration server (a likely cause of this is that you "
+"have an existing configuration server (gconfd) running, but it isn't "
+"reachable from here - if you're logged in from two machines at once, you may "
+"need to enable TCP networking for ORBit)\n"
+msgstr ""
+
+#: gconf/gconf-internals.c:3724
+#, fuzzy, c-format
+msgid "Failed to read from child pipe (%s)"
+msgstr "`%s'������ �����ϴµ� �����߽��ϴ�: %s"
+
+#: gconf/gconf-internals.c:3789
+#, fuzzy, c-format
+msgid "Failed to fork (%s)"
+msgstr "`%s'������ �����ϴµ� �����߽��ϴ�: %s"
+
+#: gconf/gconf-internals.c:3929
+#, fuzzy, c-format
+msgid "Failed to change to directory '%s' (%s)"
+msgstr "`%s'������ ���� ��µ� �����߽��ϴ�: %s\n"
+
+#: gconf/gconf-internals.c:3939
+#, fuzzy, c-format
+msgid "Failed to execute child process (%s)"
+msgstr "���� ���� `%s` ����Ⱑ �����߽��ϴ�: %s"
+
+#: gconf/gconf-internals.c:3948
+#, c-format
+msgid "Failed to redirect output or input of child process (%s)"
+msgstr ""
+
+#: gconf/gconf-internals.c:3957
+#, fuzzy, c-format
+msgid "Failed to fork child process (%s)"
+msgstr "source `%s'�� �ҷ����̴µ� �����߽��ϴ�: %s"
+
+#: gconf/gconf-internals.c:3965
+msgid "Unknown error executing child process"
+msgstr ""
+
+#: gconf/gconf-internals.c:3986
+#, c-format
+msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:2576
+#: gconf/gconf-internals.c:4036
 #, c-format
-msgid "Failed to release lock directory `%s': %s"
+msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr ""
 
 #: gconf/gconf-sources.c:320
@@ -615,106 +706,108 @@ msgstr ""
 msgid "Failed to load source `%s': %s"
 msgstr "source `%s'�� �ҷ����̴µ� �����߽��ϴ�: %s"
 
-#: gconf/gconf-sources.c:510
+#: gconf/gconf-sources.c:544
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 
-#: gconf/gconf-sources.c:567
+#: gconf/gconf-sources.c:601
 msgid "The '/' name can only be a directory, not a key"
 msgstr ""
 
-#: gconf/gconf-sources.c:596
+#: gconf/gconf-sources.c:630
 #, 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
+#: gconf/gconf-sources.c:642
 #, 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 "
+"somehow we mistakenly created two gconfd processes. If you have two gconfd "
+"processes (or had two at the time the second was launched), logging out, "
+"killing all copies of gconfd, and logging back in may help. Perhaps the "
+"problem is that you attempted to use GConf from two machines at once, and "
+"ORBit still has its default configuration that prevents remote CORBA "
+"connections? As always, check the user.* syslog for details on problems "
 "gconfd encountered."
 msgstr ""
 
-#: gconf/gconf-sources.c:1164
+#: gconf/gconf-sources.c:1198
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "��Ÿ ������ ã�µ� ������ ������ϴ�: %s"
 
-#: gconf/gconf-sources.c:1233
+#: gconf/gconf-sources.c:1267
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "��Ÿ ������ ���µ� ������ ������ϴ�: %s"
 
-#: gconf/gconf-sources.c:1257
+#: gconf/gconf-sources.c:1291
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
 
-#: gconf/gconf-value.c:82
+#: gconf/gconf-value.c:81
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "`%s'�� �ؼ��Ҽ��� �����ϴ� (������ �;��մϴ�)"
 
-#: gconf/gconf-value.c:92
+#: gconf/gconf-value.c:91
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "������ `%s'�� �ʹ� ũ�ų� �ƴϸ� �ʹ� �۽��ϴ�"
 
-#: gconf/gconf-value.c:113
+#: gconf/gconf-value.c:112
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "`%s'�� �ؼ��Ҽ��� �����ϴ� (�Ǽ��� �;��մϴ�)"
 
-#: gconf/gconf-value.c:146
+#: gconf/gconf-value.c:156
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "`%s'�� �ؼ��Ҽ��� �����ϴ� (true�� false�� �;��մϴ�)"
 
-#: gconf/gconf-value.c:214
+#: gconf/gconf-value.c:232
 #, c-format
 msgid "Didn't understand `%s' (list must start with a '[')"
 msgstr "`%s'�� �ؼ��Ҽ��� �����ϴ� (����Ʈ�� '['���� �����ؾ��մϴ�)"
 
-#: gconf/gconf-value.c:227
+#: gconf/gconf-value.c:245
 #, c-format
 msgid "Didn't understand `%s' (list must end with a ']')"
 msgstr "`%s'�� �ؼ��Ҽ��� �����ϴ� (����Ʈ�� ']'���� �������մϴ�)"
 
-#: gconf/gconf-value.c:278
+#: gconf/gconf-value.c:296
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
 msgstr "`%s'�� �ؼ��Ҽ��� �����ϴ� (����Ʈ ���� ']'�� �����մϴ�)"
 
-#: gconf/gconf-value.c:309 gconf/gconf-value.c:462
+#: gconf/gconf-value.c:327 gconf/gconf-value.c:488
 #, c-format
 msgid "Didn't understand `%s' (extra trailing characters)"
 msgstr "`%s'�� �ؼ��Ҽ��� �����ϴ� (�� �κп� �߰� ���ڿ��� �ֽ��ϴ�)"
 
-#: gconf/gconf-value.c:348
+#: gconf/gconf-value.c:374
 #, c-format
 msgid "Didn't understand `%s' (pair must start with a '(')"
 msgstr ""
 
-#: gconf/gconf-value.c:361
+#: gconf/gconf-value.c:387
 #, c-format
 msgid "Didn't understand `%s' (pair must end with a ')')"
 msgstr ""
 
-#: gconf/gconf-value.c:391 gconf/gconf-value.c:477
+#: gconf/gconf-value.c:417 gconf/gconf-value.c:503
 #, c-format
 msgid "Didn't understand `%s' (wrong number of elements)"
 msgstr ""
 
-#: gconf/gconf-value.c:431
+#: gconf/gconf-value.c:457
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr ""
@@ -724,323 +817,269 @@ msgstr ""
 msgid "`%s': %s"
 msgstr "`%s': %s"
 
-#: gconf/gconf.c:289
+#: gconf/gconf.c:287
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "������ `%s'�ּҸ� �ؼ��Ҽ��� �����ϴ�"
 
-#: gconf/gconf.c:574
+#: gconf/gconf.c:572
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 
-#: gconf/gconf.c:1870
+#: gconf/gconf.c:1868
 #, c-format
 msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr "Ŭ���̾�Ʈ�� ������ ��Ͽ� �߰����� ���߽��ϴ�. �ڹ� ����: %s"
 
-#: 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. "
-"This is a bug in the OAF package; something went wrong in OAF, and no error "
-"was reported. This is not a bug in the GConf package. Do not report a GConf "
-"bug unless you have information indicating what went wrong with OAF that was "
-"caused by GConf."
-msgstr ""
-
-#: gconf/gconf.c:2198
+#: gconf/gconf.c:2183
 msgid "Failed to init GConf, exiting\n"
 msgstr "GConf�� �ʱ�ȭ�ϴµ� �����Ͽ� ����ħ�ϴ�\n"
 
-#: gconf/gconf.c:2235
+#: gconf/gconf.c:2220
 msgid "Must begin with a slash (/)"
 msgstr "������(/)�� �����ؾ��մϴ�"
 
-#: gconf/gconf.c:2257
+#: gconf/gconf.c:2242
 msgid "Can't have two slashes (/) in a row"
 msgstr ""
 
-#: gconf/gconf.c:2259
+#: gconf/gconf.c:2244
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2280
+#: gconf/gconf.c:2265
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr ""
 
-#: gconf/gconf.c:2294
+#: gconf/gconf.c:2279
 msgid "Key/directory may not end with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2547
+#: gconf/gconf.c:2520
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "���� ������ �����µ� �����߽��ϴ�: %s"
 
-#: gconf/gconf.c:2608
+#: gconf/gconf.c:2581
 #, c-format
 msgid "Expected float, got %s"
 msgstr "�Ǽ����� �;��ϳ� ��ſ� %s�� ������ϴ�."
 
-#: gconf/gconf.c:2643
+#: gconf/gconf.c:2616
 #, c-format
 msgid "Expected int, got %s"
 msgstr "�������� �;��ϳ� ��ſ� %s�� ������ϴ�."
 
-#: gconf/gconf.c:2678
+#: gconf/gconf.c:2651
 #, c-format
 msgid "Expected string, got %s"
 msgstr "���ڿ��� �;��ϳ� ��ſ� %s�� ������ϴ�."
 
-#: gconf/gconf.c:2715
+#: gconf/gconf.c:2688
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "bool���� �;��ϳ� ��ſ� %s�� ������ϴ�."
 
-#: gconf/gconf.c:2748
+#: gconf/gconf.c:2721
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "��Ű���� �;��ϳ� ��ſ� %s�� ������ϴ�"
 
-#: gconf/gconfd.c:248
+#: gconf/gconfd.c:247
 msgid "Shutdown request received"
 msgstr "������� ��û�� �޾ҽ��ϴ�"
 
-#: gconf/gconfd.c:280
+#: gconf/gconfd.c:279
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr ""
 
-#: gconf/gconfd.c:298
+#: gconf/gconfd.c:297
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
 msgstr ""
 
-#: gconf/gconfd.c:307
+#: gconf/gconfd.c:306
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
 msgstr ""
 
-#: gconf/gconfd.c:307
+#: gconf/gconfd.c:306
 msgid "/path"
 msgstr ""
 
-#: gconf/gconfd.c:321
+#: gconf/gconfd.c:320
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "���� ������ �ҷ����̴µ� ������ �߻��߽��ϴ�: %s"
 
-#: gconf/gconfd.c:333
+#: gconf/gconfd.c:332
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
 msgstr ""
 
-#: gconf/gconfd.c:350
+#: gconf/gconfd.c:349
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
 
-#: gconf/gconfd.c:376
+#: gconf/gconfd.c:375
 #, c-format
 msgid "Received signal %d, dumping core. Please report a GConf bug."
 msgstr "�ñ׳� %d�� �޾Ƽ� ����ħ�ϴ�. GConf ���׸� ������ �ּ���."
 
-#: gconf/gconfd.c:392
+#: gconf/gconfd.c:391
 #, c-format
 msgid ""
 "Received signal %d, shutting down abnormally. Please file a GConf bug report."
 msgstr ""
 "�ñ׳� %d�� �޾Ƽ� ������������ ����ħ�ϴ�. GConf ���׸� ������ �ּ���."
 
-#: gconf/gconfd.c:409
+#: gconf/gconfd.c:408
 #, 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:513
+#: gconf/gconfd.c:526
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "�����մϴ� (���� %s), pid %u ����� '%s'"
 
-#: gconf/gconfd.c:540
-msgid ""
-"Failed to init Object Activation Framework: please mail bug report to OAF "
-"maintainers"
-msgstr ""
-
-#: gconf/gconfd.c:560
+#: gconf/gconfd.c:567
 msgid "Failed to get object reference for ConfigServer"
 msgstr ""
 
-#: gconf/gconfd.c:573
-#, fuzzy, c-format
-msgid "Failed to create %s: %s"
-msgstr "`%s'������ �����ϴµ� �����߽��ϴ�: %s"
+#: gconf/gconfd.c:605
+#, c-format
+msgid "Failed to write byte to pipe fd %d so client program may hang: %s"
+msgstr ""
 
-#. Bad hack alert - register the current lockholder with oafd,
-#. * since oafd seems to have forgotten about us.
-#.
-#: gconf/gconfd.c:588
+#: gconf/gconfd.c:615
 #, fuzzy, c-format
-msgid "Failed to get lock for daemon: %s"
+msgid "Failed to get lock for daemon, exiting: %s"
 msgstr "Ŭ���̾�Ʈ�� IOR�� ���� �� �����ϴ�: %s"
 
-#: gconf/gconfd.c:594
-msgid ""
-"Registering existing server with oafd, since OAF appears to have leaked it"
-msgstr ""
-
-#: gconf/gconfd.c:603
-msgid ""
-"OAF doesn't know about our IID; indicates broken installation; can't "
-"register existing server."
-msgstr ""
-
-#: gconf/gconfd.c:607
-msgid ""
-"Another gconfd already registered with OAF, so we can't register the "
-"existing server"
-msgstr ""
-
-#: gconf/gconfd.c:612
-msgid "Unknown error registering existing gconfd with OAF; exiting"
-msgstr ""
-
-#: gconf/gconfd.c:639
-msgid ""
-"OAF doesn't know about our IID; indicates broken installation; can't "
-"register; exiting\n"
-msgstr ""
-
-#: gconf/gconfd.c:643
-msgid "Another gconfd already registered with OAF; exiting\n"
-msgstr ""
-
-#: gconf/gconfd.c:648
-msgid "Unknown error registering gconfd with OAF; exiting\n"
-msgstr ""
-
-#: gconf/gconfd.c:692
+#: gconf/gconfd.c:657
 #, fuzzy, c-format
-msgid "Failed to release lockfile: %s"
+msgid "Error releasing lockfile: %s"
 msgstr "`%s'������ �����ϴµ� �����߽��ϴ�: %s"
 
-#: gconf/gconfd.c:700
+#: gconf/gconfd.c:665
 msgid "Exiting"
 msgstr "��������"
 
-#: gconf/gconfd.c:725
+#: gconf/gconfd.c:690
 msgid "GConf server is not in use, shutting down."
 msgstr "GConf ������ ������ �ʰ� �ֽ��ϴ�, �����մϴ�."
 
-#: gconf/gconfd.c:1084
+#: gconf/gconfd.c:1059
 #, c-format
 msgid "Returning exception: %s"
 msgstr "���ܰ� �߻��߽��ϴ�: %s"
 
-#: gconf/gconfd.c:1184
+#: gconf/gconfd.c:1159
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
 "gconfd shutdown (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1219
+#: gconf/gconfd.c:1194
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1288
+#: gconf/gconfd.c:1263
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1302
+#: gconf/gconfd.c:1277
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "����� ���� ���� '%s'�� �� �� �����ϴ�: %d: %s"
 
-#: gconf/gconfd.c:1311
+#: gconf/gconfd.c:1286
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "���� ����� ���� ���� '%s'�� ���� �� �����ϴ�: %s"
 
-#: gconf/gconfd.c:1325
+#: gconf/gconfd.c:1300
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "������ ����� ���� ���� '%s'�� �ű� �� �����ϴ�: %s"
 
-#: gconf/gconfd.c:1335
+#: gconf/gconfd.c:1310
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "���� ����� ���� ������ �ű� �� �����ϴ�: %s"
 
-#: gconf/gconfd.c:1344
+#: gconf/gconfd.c:1319
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1819
+#: gconf/gconfd.c:1794
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr ""
 
-#: gconf/gconfd.c:1865
+#: gconf/gconfd.c:1840
 #, c-format
 msgid "Error reading saved state file: %s"
 msgstr "����� ���� ������ ���� �� �����ϴ�: %s"
 
-#: gconf/gconfd.c:1918
+#: gconf/gconfd.c:1893
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:2035
+#: gconf/gconfd.c:2010
 #, 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:2040
+#: gconf/gconfd.c:2015
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously re-"
 "add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:2063 gconf/gconfd.c:2228
+#: gconf/gconfd.c:2038 gconf/gconfd.c:2203
 #, c-format
 msgid "Failed to get IOR for client: %s"
 msgstr "Ŭ���̾�Ʈ�� IOR�� ���� �� �����ϴ�: %s"
 
-#: gconf/gconfd.c:2078
+#: gconf/gconfd.c:2053
 #, c-format
 msgid "Failed to open saved state file: %s"
 msgstr "����� ���� ������ �� �� �����ϴ�: %s"
 
-#: gconf/gconfd.c:2091
+#: gconf/gconfd.c:2066
 #, c-format
 msgid "Failed to write client add to saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:2099
+#: gconf/gconfd.c:2074
 #, c-format
 msgid "Failed to flush client add to saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:2189
+#: gconf/gconfd.c:2164
 msgid ""
 "Some client removed itself from the GConf server when it hadn't been added."
 msgstr ""
@@ -1283,276 +1322,269 @@ msgid ""
 msgstr ""
 
 #: gconf/gconftool.c:525
+msgid "You should use --direct when using a non-default configuration source\n"
+msgstr ""
+
+#: gconf/gconftool.c:531
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "GConf�� �ʱ�ȭ�ϴµ� �����߽��ϴ�: %s\n"
 
-#: gconf/gconftool.c:550
+#: gconf/gconftool.c:566
 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:565
-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 ""
-
-#: gconf/gconftool.c:587
+#: gconf/gconftool.c:595
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:798
+#: gconf/gconftool.c:796
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "����ġ�µ� ���� �߻�: %s\n"
 
-#: gconf/gconftool.c:841
+#: gconf/gconftool.c:839
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 
-#: gconf/gconftool.c:875
+#: gconf/gconftool.c:873
 #, fuzzy, c-format
 msgid "Failure listing entries in `%s': %s\n"
 msgstr "`%s'���� pair���� �����ϴµ� ������ ������ϴ�: %s"
 
-#: gconf/gconftool.c:893
+#: gconf/gconftool.c:891
 msgid "(no value set)"
 msgstr ""
 
-#: gconf/gconftool.c:948
+#: gconf/gconftool.c:946
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "���� ����(gconfd)�� �����Ҽ��� �����ϴ�: %s\n"
 
-#: gconf/gconftool.c:962
+#: gconf/gconftool.c:960
 msgid "Must specify a key or keys to get\n"
 msgstr "�� Ű�� Ű���� �����Ͽ����մϴ�\n"
 
-#: gconf/gconftool.c:997
+#: gconf/gconftool.c:995
 #, c-format
 msgid "Type: %s\n"
 msgstr "Ÿ��: %s\n"
 
-#: gconf/gconftool.c:998
+#: gconf/gconftool.c:996
 #, c-format
 msgid "List Type: %s\n"
 msgstr "List Ÿ��: %s\n"
 
-#: gconf/gconftool.c:999
+#: gconf/gconftool.c:997
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Car Ÿ��: %s\n"
 
-#: gconf/gconftool.c:1000
+#: gconf/gconftool.c:998
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Cdr Ÿ��: %s\n"
 
-#: gconf/gconftool.c:1005
+#: gconf/gconftool.c:1003
 #, c-format
 msgid "Default Value: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1005 gconf/gconftool.c:1007 gconf/gconftool.c:1008
-#: gconf/gconftool.c:1009
+#: gconf/gconftool.c:1003 gconf/gconftool.c:1005 gconf/gconftool.c:1006
+#: gconf/gconftool.c:1007
 msgid "Unset"
 msgstr ""
 
-#: gconf/gconftool.c:1007
+#: gconf/gconftool.c:1005
 #, c-format
 msgid "Owner: %s\n"
 msgstr "������: %s\n"
 
-#: gconf/gconftool.c:1008
+#: gconf/gconftool.c:1006
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "������ ����: %s\n"
 
-#: gconf/gconftool.c:1009
+#: gconf/gconftool.c:1007
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "���� ����: %s\n"
 
-#: gconf/gconftool.c:1018 gconf/gconftool.c:1312
+#: gconf/gconftool.c:1016 gconf/gconftool.c:1310
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1022 gconf/gconftool.c:1316
+#: gconf/gconftool.c:1020 gconf/gconftool.c:1314
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "`%s'������ ���� ��µ� �����߽��ϴ�: %s\n"
 
-#: gconf/gconftool.c:1065 gconf/gconftool.c:1077
+#: gconf/gconftool.c:1063 gconf/gconftool.c:1075
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "`%s'Ÿ���� �ν��Ҽ��� �����ϴ�\n"
 
-#: gconf/gconftool.c:1089
+#: gconf/gconftool.c:1087
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr ""
 
-#: gconf/gconftool.c:1109
+#: gconf/gconftool.c:1107
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1137
+#: gconf/gconftool.c:1135
 msgid "Cannot set schema as value\n"
 msgstr "�����μ� ��Ű���� ����Ҽ��� �����ϴ�\n"
 
-#: gconf/gconftool.c:1147
+#: gconf/gconftool.c:1145
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1161
+#: gconf/gconftool.c:1159
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1176
+#: gconf/gconftool.c:1174
 #, c-format
 msgid "Error: %s\n"
 msgstr "����: %s\n"
 
-#: gconf/gconftool.c:1189
+#: gconf/gconftool.c:1187
 #, fuzzy, c-format
 msgid "Error setting value: %s\n"
 msgstr "���� �����ϴµ� ������ �߻�: %s"
 
-#: gconf/gconftool.c:1207
+#: gconf/gconftool.c:1205
 #, fuzzy, c-format
 msgid "Error syncing: %s\n"
 msgstr "����ȭ�� �����߽��ϴ�: %s"
 
-#: gconf/gconftool.c:1230
+#: gconf/gconftool.c:1228
 #, fuzzy
 msgid "Must specify a key or keys on the command line\n"
 msgstr "�� Ű�� Ű���� �����Ͽ����մϴ�\n"
 
-#: gconf/gconftool.c:1250
+#: gconf/gconftool.c:1248
 #, fuzzy, c-format
 msgid "No schema known for `%s'\n"
 msgstr "`%s'�Ͱ��� ������ �����ϴ�\n"
 
-#: gconf/gconftool.c:1283
+#: gconf/gconftool.c:1281
 #, c-format
 msgid "No doc string stored in schema at '%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1288
+#: gconf/gconftool.c:1286
 #, fuzzy, c-format
 msgid "Error getting schema at '%s': %s\n"
 msgstr "`%s'�� ���� ���� ������ ����: %s"
 
-#: gconf/gconftool.c:1295
+#: gconf/gconftool.c:1293
 #, fuzzy, c-format
 msgid "No schema stored at '%s'\n"
 msgstr "`%s'�Ͱ��� ������ �����ϴ�\n"
 
-#: gconf/gconftool.c:1298
+#: gconf/gconftool.c:1296
 #, c-format
 msgid "Value at '%s' is not a schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1354
+#: gconf/gconftool.c:1352
 msgid "Must specify a schema name followed by the key name to apply it to\n"
 msgstr ""
 
-#: gconf/gconftool.c:1361
+#: gconf/gconftool.c:1359
 #, fuzzy, c-format
 msgid "Error associating schema name '%s' with key name '%s': %s\n"
 msgstr "���: ��Ű�� `%s'�� Ű `%s'�� �Ҵ��ϴµ� ������ ������ϴ�: %s\n"
 
-#: gconf/gconftool.c:1381
+#: gconf/gconftool.c:1379
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr ""
 
-#: gconf/gconftool.c:1423
+#: gconf/gconftool.c:1421
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr "List Ÿ���� �⺻Ÿ��(���ڿ�, ����, �Ǽ�, ��/����)�̾���մϴ�\n"
 
-#: gconf/gconftool.c:1443
+#: gconf/gconftool.c:1441
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr "Pair car Ÿ���� �⺻Ÿ��(���ڿ�, ����, �Ǽ�, ��/����)�̾���մϴ�\n"
 
-#: gconf/gconftool.c:1463
+#: gconf/gconftool.c:1461
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr "Pair cdr Ÿ���� �⺻Ÿ��(���ڿ�, ����, �Ǽ�, ��/����)�̾���մϴ�\n"
 
-#: gconf/gconftool.c:1478
+#: gconf/gconftool.c:1476
 #, c-format
 msgid "Error setting value: %s"
 msgstr "���� �����ϴµ� ������ �߻�: %s"
 
-#: gconf/gconftool.c:1492
+#: gconf/gconftool.c:1490
 #, c-format
 msgid "Error syncing: %s"
 msgstr "����ȭ�� �����߽��ϴ�: %s"
 
-#: gconf/gconftool.c:1507
+#: gconf/gconftool.c:1505
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1521
+#: gconf/gconftool.c:1519
 msgid "Must specify one or more keys to unset.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1532
+#: gconf/gconftool.c:1530
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1555
+#: gconf/gconftool.c:1553
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1589
+#: gconf/gconftool.c:1587
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "���丮�鸦 �о���µ� ����: %s\n"
 
-#: gconf/gconftool.c:1631
+#: gconf/gconftool.c:1629
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "���: ��Ű��(%s)�� �������ϰų� ���� Ÿ���� �ֽ��ϴ�\n"
 
-#: gconf/gconftool.c:1640
+#: gconf/gconftool.c:1638
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "���: ��Ű��(%s)�� �������ϰų� ���� list_type�� �ֽ��ϴ�\n"
 
-#: gconf/gconftool.c:1651 gconf/gconftool.c:1681 gconf/gconftool.c:1710
+#: gconf/gconftool.c:1649 gconf/gconftool.c:1679 gconf/gconftool.c:1708
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1669
+#: gconf/gconftool.c:1667
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1694
+#: gconf/gconftool.c:1692
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "���: ��Ű�������� �⺻���� ������ ���� �����ϴ�\n"
 
-#: gconf/gconftool.c:1723
+#: gconf/gconftool.c:1721
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "���: gconftool ���� ����, �ν��Ҽ����� GConfValueType\n"
 
-#: gconf/gconftool.c:1770 gconf/gconftool.c:1791 gconf/gconftool.c:1812
-#: gconf/gconftool.c:1833
+#: gconf/gconftool.c:1768 gconf/gconftool.c:1789 gconf/gconftool.c:1810
+#: gconf/gconftool.c:1831
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "���: Ÿ�� �̸� `%s'�� �Ľ��ϴµ� �����߽��ϴ�\n"
 
-#: gconf/gconftool.c:1787
+#: gconf/gconftool.c:1785
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
@@ -1560,69 +1592,69 @@ msgstr ""
 "���: list_type�� ����,�Ǽ�, ���ڿ� �Ǵ� bool�ϼ��� �ֽ��ϴ�. `%s'�� �ȵ˴�"
 "��.\n"
 
-#: gconf/gconftool.c:1808
+#: gconf/gconftool.c:1806
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "���: car_type�� ����,�Ǽ�, ���ڿ� �Ǵ� bool�ϼ��� �ֽ��ϴ�. `%s'�� �ȵ˴�"
 "��.\n"
 
-#: gconf/gconftool.c:1829
+#: gconf/gconftool.c:1827
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "���: cdr_type�� ����,�Ǽ�, ���ڿ� �Ǵ� bool�ϼ��� �ֽ��ϴ�. `%s'�� �ȵ˴�"
 "��.\n"
 
-#: gconf/gconftool.c:1857
+#: gconf/gconftool.c:1855
 msgid "WARNING: empty <applyto> node"
 msgstr "���: <applyto>��尡 ���ֽ��ϴ�"
 
-#: gconf/gconftool.c:1860 gconf/gconftool.c:2123
+#: gconf/gconftool.c:1858 gconf/gconftool.c:2121
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "���: <schema>�Ʒ����� <%s>���� �������մϴ�\n"
 
-#: gconf/gconftool.c:1870
+#: gconf/gconftool.c:1868
 msgid "WARNING: no key specified for schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1903
+#: gconf/gconftool.c:1901
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 
-#: gconf/gconftool.c:1909
+#: gconf/gconftool.c:1907
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 
-#: gconf/gconftool.c:1990
+#: gconf/gconftool.c:1988
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "���: <locale>���ӿ� ���������ʴ� <%s>��尡 �ֽ��ϴ�\n"
 
-#: gconf/gconftool.c:2019
+#: gconf/gconftool.c:2017
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "���: ��Ű�� `%s' ������ `%s' ��ġ �����߽��ϴ�: %s\n"
 
-#: gconf/gconftool.c:2027
+#: gconf/gconftool.c:2025
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "`%s' ��Ű���� `%s' �������� ���� ��ġ�߽��ϴ�\n"
 
-#: gconf/gconftool.c:2049
+#: gconf/gconftool.c:2047
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "���: ��Ű�� `%s'�� Ű `%s'�� �Ҵ��ϴµ� ������ ������ϴ�: %s\n"
 
-#: gconf/gconftool.c:2057
+#: gconf/gconftool.c:2055
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "��Ű�� `%s'�� Ű `%s'�� �Ҵ��մϴ�\n"
 
-#: gconf/gconftool.c:2136
+#: gconf/gconftool.c:2134
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "�� <schema>�ȿ��� ���� �Ѱ��� <locale>��Ʈ������ ������ �־���մϴ�\n"
 
@@ -1631,17 +1663,17 @@ msgstr "�� <schema>�ȿ��� ���� �Ѱ��� <locale>��Ʈ������ ������ �־���մϴ�\n"
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "���: <schemalist>�Ʒ��� <%s>���� ���������ʽ��ϴ�\n"
 
-#: gconf/gconftool.c:2187
+#: gconf/gconftool.c:2188
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "`%s'�� ���µ� �����߽��ϴ�: %s\n"
 
-#: gconf/gconftool.c:2194
+#: gconf/gconftool.c:2195
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "`%s' ������ ��������ʳ���?\n"
 
-#: gconf/gconftool.c:2206
+#: gconf/gconftool.c:2207
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1650,26 +1682,26 @@ msgstr ""
 "`%s'������ �������� �ֻ��� ���(<%s>)�� ������ �ֽ��ϴ�(�ݵ��"
 "<gconfschemafile>�̾���մϴ�\n"
 
-#: gconf/gconftool.c:2219
+#: gconf/gconftool.c:2220
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "���� `%s'�� �ֻ��� �ܰ� <gconfschemafile> ��尡 �����ϴ�\n"
 
-#: gconf/gconftool.c:2233
+#: gconf/gconftool.c:2234
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "���: <gconfschemafile>�Ʒ��� �ִ� ��� <%s>�� ���������ʽ��ϴ�\n"
 
-#: gconf/gconftool.c:2244 gconf/gconftool.c:2276
+#: gconf/gconftool.c:2245 gconf/gconftool.c:2277
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "���� ����Ÿ�� ����ȭ�ϴµ� ������ �߻��߽��ϴ�: %s"
 
-#: gconf/gconftool.c:2260
+#: gconf/gconftool.c:2261
 msgid "Must specify some schema files to install\n"
 msgstr "��ġ�� ��Ű�� ���ϵ��� �����ϼž��մϴ�\n"
 
-#: gconf/gconftool.c:2297
+#: gconf/gconftool.c:2298
 #, c-format
 msgid ""
 "\n"
@@ -1678,27 +1710,27 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2317
+#: gconf/gconftool.c:2318
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2443
+#: gconf/gconftool.c:2444
 msgid "Must specify some keys to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2449
+#: gconf/gconftool.c:2450
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
 "  %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2467
+#: gconf/gconftool.c:2468
 msgid "Must specify some directories to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2486
+#: gconf/gconftool.c:2487
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1721,5 +1753,20 @@ msgstr ""
 msgid "Expected `%s' got `%s' for key %s"
 msgstr ""
 
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "No ior file in `%s'"
+#~ msgstr "`%s'�ȿ� ior ������ �����ϴ�"
+
+#~ msgid "Another program has lock `%s'"
+#~ msgstr "�ٸ� ���α׷��� ���(`%s')�� ������ �ֽ��ϴ�"
+
+#~ msgid "Can't create lock `%s': %s"
+#~ msgstr "`%s' ��� ������ ���� ���� �����ϴ�: %s"
+
+#~ msgid "Corrupt lock file `%s', removing anyway"
+#~ msgstr "��� ����(%s)�� �����־ �����մϴ�"
+
 #~ msgid "GConf was built with debugging features enabled"
 #~ msgstr "GConf�� ������� ���� ��ɸ� ������ ����������ϴ�"
diff --git a/po/nl.po b/po/nl.po
index bc632ef5..e555d5aa 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf 1\n"
-"POT-Creation-Date: 2001-12-27 06:16-0500\n"
+"POT-Creation-Date: 2002-02-04 18:21-0500\n"
 "PO-Revision-Date: 2001-12-27 16:48+0100\n"
 "Last-Translator: Vincent van Adrighem <V.vanAdrighem@dirck.mine.nu>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -75,8 +75,8 @@ msgstr "Fout bij het loslaten van de vergrendeling op XML dir `%s': %s"
 #: backends/xml-cache.c:119
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr ""
-"Ongesynchronizeerde verwijderde directories tijdens het afsluiten van het XML "
-"backend"
+"Ongesynchronizeerde verwijderde directories tijdens het afsluiten van het "
+"XML backend"
 
 #: backends/xml-cache.c:229
 #, c-format
@@ -91,8 +91,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 items achtergebleven in de cache na het schoonmaken van de al "
 "gesynchronizeerde items ouder dan %u seconden"
@@ -296,8 +296,7 @@ msgstr "Ongeldige waarde ontvangen in instel verzoek"
 
 #: gconf/gconf-database.c:240
 #, c-format
-msgid ""
-"Couldn't make sense of CORBA value received in set request for key `%s'"
+msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 "Kon geen wijs maken uit de CORBA waarde die ontvangen werd in een instel "
 "verzoek voor sleutel `%s'"
@@ -608,8 +607,8 @@ msgstr "Fout bij maken of openen van bestand `%s'"
 #: gconf/gconf-internals.c:2520
 #, c-format
 msgid ""
-"Failed to lock '%s': probably another process has the lock, or your operating "
-"system has NFS file locking misconfigured (%s)"
+"Failed to lock '%s': probably another process has the lock, or your "
+"operating system has NFS file locking misconfigured (%s)"
 msgstr ""
 "Kon '%s' niet vastzetten: Waarschijnlijk heeft een ander het bestand "
 "vastgelegd, of uw besturingssysteem heeft problemen met NFS-locking (%s)."
@@ -675,12 +674,12 @@ msgstr "Fout bij maken `%s': %s"
 msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
 msgstr "Kon geen pijp aanleggen om te communiceren met de gconf deamon: %s\n"
 
-#: gconf/gconf-internals.c:3060
+#: gconf/gconf-internals.c:3064
 #, c-format
 msgid "Failed to launch configuration server: %s\n"
 msgstr "Kan de configuratieserver niet starten: %s\n"
 
-#: gconf/gconf-internals.c:3084
+#: gconf/gconf-internals.c:3088
 msgid ""
 "Failed to contact configuration server (a likely cause of this is that you "
 "have an existing configuration server (gconfd) running, but it isn't "
@@ -688,50 +687,50 @@ msgid ""
 "need to enable TCP networking for ORBit)\n"
 msgstr ""
 "Kon geen contact krijgen met de configuratieserver (waarschijnlijk draait er "
-"nog een configuratieserver (gconfd), maar is die niet bereikbaar vanaf hier - "
-"als u ingelogd bent vanaf twee verschillende machines, dan dient u de "
-"tcp-netwerkmogelijkheden van Orbit in te schakelen)\n"
+"nog een configuratieserver (gconfd), maar is die niet bereikbaar vanaf hier "
+"- als u ingelogd bent vanaf twee verschillende machines, dan dient u de tcp-"
+"netwerkmogelijkheden van Orbit in te schakelen)\n"
 
-#: gconf/gconf-internals.c:3720
+#: gconf/gconf-internals.c:3724
 #, c-format
 msgid "Failed to read from child pipe (%s)"
 msgstr "Kon niet lezen uit de pijp van kindproces (%s)"
 
-#: gconf/gconf-internals.c:3785
+#: gconf/gconf-internals.c:3789
 #, c-format
 msgid "Failed to fork (%s)"
 msgstr "Kon niet forken (%s)"
 
-#: gconf/gconf-internals.c:3925
+#: gconf/gconf-internals.c:3929
 #, c-format
 msgid "Failed to change to directory '%s' (%s)"
 msgstr "Kon niet wisselen naar werkmap '%s' (%s)"
 
-#: gconf/gconf-internals.c:3935
+#: gconf/gconf-internals.c:3939
 #, c-format
 msgid "Failed to execute child process (%s)"
 msgstr "Kan kindproces niet starten (%s)"
 
-#: gconf/gconf-internals.c:3944
+#: gconf/gconf-internals.c:3948
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
 msgstr "Kon de invoer of uitvoer van kindproces niet aanpassen (%s)"
 
-#: gconf/gconf-internals.c:3953
+#: gconf/gconf-internals.c:3957
 #, c-format
 msgid "Failed to fork child process (%s)"
 msgstr "Kon kindproces niet forken (%s)"
 
-#: gconf/gconf-internals.c:3961
+#: gconf/gconf-internals.c:3965
 msgid "Unknown error executing child process"
 msgstr "Onbekende fout bij starten kindproces"
 
-#: gconf/gconf-internals.c:3982
+#: gconf/gconf-internals.c:3986
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr "Kon niet genoeg gegevens inlezen uit pijp van kindproces (%s)"
 
-#: gconf/gconf-internals.c:4032
+#: gconf/gconf-internals.c:4036
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr "Kon geen pijp maken om te communiceren met kindproces (%s)"
@@ -777,10 +776,10 @@ msgstr ""
 "geen beschrijfbare databank heeft. Er zijn twee grote oorzaken voor dit "
 "probleem: 1) Uw configuratiepad werd niet gevonden of bevat geen databanken "
 "of 2) op de een of andere manier hebben we per ongeluk twee gconfd processen "
-"gestart. Als u twee gconfd processen heeft, kunt u het beste uitloggen, gconf "
-"vernietigen, en weer inloggen. Misschien is de oorzaak dat u gconf probeerde "
-"te grbuiken vanaf twee verschillende computers. U moet daarvoor Orbit "
-"toestemming geven."
+"gestart. Als u twee gconfd processen heeft, kunt u het beste uitloggen, "
+"gconf vernietigen, en weer inloggen. Misschien is de oorzaak dat u gconf "
+"probeerde te grbuiken vanaf twee verschillende computers. U moet daarvoor "
+"Orbit toestemming geven."
 
 #: gconf/gconf-sources.c:1198
 #, c-format
@@ -943,16 +942,16 @@ 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:297
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
 msgstr ""
-"Geen configuratie bestanden gevonden, terugval op standaard configuratie bron "
-"`%s'"
+"Geen configuratie bestanden gevonden, terugval op standaard configuratie "
+"bron `%s'"
 
 #: gconf/gconfd.c:306
 msgid ""
@@ -977,8 +976,8 @@ msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
 msgstr ""
-"Geen configuratie bron adressen konden worden gevonden, kan configuratie data "
-"niet\n"
+"Geen configuratie bron adressen konden worden gevonden, kan configuratie "
+"data niet\n"
 "laden en opslaan"
 
 #: gconf/gconfd.c:349
@@ -986,7 +985,8 @@ msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
-"Geen schrijfbare configuratie bronnen konden worden gevonden, misschien niet\n"
+"Geen schrijfbare configuratie bronnen konden worden gevonden, misschien "
+"niet\n"
 "in staat om sommige wijzingen op te slaan"
 
 #: gconf/gconfd.c:375
@@ -1022,8 +1022,8 @@ msgstr "Fout bij het verkrijgen van object referentie voor ConfigServer"
 #, c-format
 msgid "Failed to write byte to pipe fd %d so client program may hang: %s"
 msgstr ""
-"Kon byte niet doorsturen naar fd %s waardoot programma misschien vastloopt: "
-"%s"
+"Kon byte niet doorsturen naar fd %s waardoot programma misschien vastloopt: %"
+"s"
 
 #: gconf/gconfd.c:615
 #, c-format
@@ -1121,8 +1121,8 @@ msgstr "Fout bij openen opslag status bestand '%s': %s"
 #: gconf/gconfd.c:2010
 #, 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)"
@@ -1130,8 +1130,8 @@ msgstr ""
 #: gconf/gconfd.c:2015
 #, 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 "
@@ -1181,8 +1181,8 @@ msgstr "Druk de waarde van een sleutel af op de standaard uitvoer."
 
 #: gconf/gconftool.c:95
 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."
@@ -1309,8 +1309,8 @@ msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
 msgstr ""
-"Benader de configuratie databank direct, de server omzeilend. Gconfd mag niet "
-"draaien."
+"Benader de configuratie databank direct, de server omzeilend. Gconfd mag "
+"niet draaien."
 
 #: gconf/gconftool.c:267
 msgid ""
@@ -1319,8 +1319,8 @@ msgid ""
 "config source or set to the empty string to use the default."
 msgstr ""
 "Installeert schema bestanden op de opdrachtregel in de databank. De "
-"GCONF_CONFIG_SOURCE omgevingsvariabele moet ingesteld staan op een "
-"niet-standaard configuratie bron of naar een lege tekenreeks om de "
+"GCONF_CONFIG_SOURCE omgevingsvariabele moet ingesteld staan op een niet-"
+"standaard configuratie bron of naar een lege tekenreeks om de "
 "standaardwaarde te gebruiken."
 
 #: gconf/gconftool.c:276
@@ -1336,8 +1336,8 @@ msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
 msgstr ""
-"Martelings-test voor een applicatie d.m.v. het instellen en uitzetten van een "
-"groep sleutels binnen de directories op de opdrachtregel."
+"Martelings-test voor een applicatie d.m.v. het instellen en uitzetten van "
+"een groep sleutels binnen de directories op de opdrachtregel."
 
 #: gconf/gconftool.c:294
 msgid "Get the short doc string for a key"
@@ -1352,8 +1352,7 @@ msgid "Get the name of the schema applied to this key"
 msgstr "Zoek de naam van het schema op voor deze sleutel"
 
 #: gconf/gconftool.c:321
-msgid ""
-"Specify the schema name followed by the key to apply the schema name to"
+msgid "Specify the schema name followed by the key to apply the schema name to"
 msgstr ""
 "Geef de schemanaam gevolgd door de sleutel om het schema op toe te passen"
 
@@ -1368,8 +1367,8 @@ msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 "Fout bij optie %s: %s.\n"
-"Start '%s --help' om een volledige lijst van beschikbare opdrachtregel opties "
-"te zien.\n"
+"Start '%s --help' om een volledige lijst van beschikbare opdrachtregel "
+"opties te zien.\n"
 
 #: gconf/gconftool.c:394
 msgid "Can't get and set/unset simultaneously\n"
@@ -1389,19 +1388,19 @@ msgstr "Kan --all-dirs niet met --get of --set gebruiken\n"
 
 #: gconf/gconftool.c:427
 msgid ""
-"--recursive-list should not be used with --get, --set, --unset, "
-"--all-entries, or --all-dirs\n"
+"--recursive-list should not be used with --get, --set, --unset, --all-"
+"entries, or --all-dirs\n"
 msgstr ""
-"--recursive-list moet niet gebruikt worden met --get, --set, --unset, "
-"--all-entries of --all-dirs\n"
+"--recursive-list moet niet gebruikt worden met --get, --set, --unset, --all-"
+"entries of --all-dirs\n"
 
 #: gconf/gconftool.c:437
 msgid ""
-"--set_schema should not be used with --get, --set, --unset, --all-entries, "
-"--all-dirs\n"
+"--set_schema should not be used with --get, --set, --unset, --all-entries, --"
+"all-dirs\n"
 msgstr ""
-"--set_schema moet niet gebruikt worden met --get, --set, --unset, "
-"--all-entries of --all-dirs\n"
+"--set_schema moet niet gebruikt worden met --get, --set, --unset, --all-"
+"entries of --all-dirs\n"
 
 #: gconf/gconftool.c:443
 msgid "Value type is only relevant when setting a value\n"
@@ -1439,8 +1438,8 @@ msgstr "--break-directory moet gebruikt worden door zichzelf.\n"
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
-"Je moet een configuratie bron specificeren met --config-source als je "
-"--direct gebruikt\n"
+"Je moet een configuratie bron specificeren met --config-source als je --"
+"direct gebruikt\n"
 
 #: gconf/gconftool.c:525
 msgid "You should use --direct when using a non-default configuration source\n"
@@ -1722,22 +1721,22 @@ msgstr "WAARSCHUWING: fout bij ontleden type naam `%s'\n"
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
-"WAARSCHUWING: list_type kan alleen int, float, string of bool zijn en niet "
-"`%s'\n"
+"WAARSCHUWING: list_type kan alleen int, float, string of bool zijn en niet `%"
+"s'\n"
 
 #: gconf/gconftool.c:1806
 #, 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:1827
 #, 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:1855
 msgid "WARNING: empty <applyto> node"
@@ -1862,8 +1861,8 @@ msgid ""
 "Trying to break your application by setting bad values for key:\n"
 "  %s\n"
 msgstr ""
-"Probeer je applicatie te breken d.m.v. het instellen van slechte waarden voor "
-"een sleutel:\n"
+"Probeer je applicatie te breken d.m.v. het instellen van slechte waarden "
+"voor een sleutel:\n"
 "  %s\n"
 
 #: gconf/gconftool.c:2468
@@ -1874,10 +1873,11 @@ msgstr "Moet enkele te breken directories specificeren\n"
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
-"directory:\n  %s\n"
+"directory:\n"
+"  %s\n"
 msgstr ""
-"Probeer je applicatie te breken d.m.v. het instellen van slechte waarden voor "
-"sleutels in directory:\n"
+"Probeer je applicatie te breken d.m.v. het instellen van slechte waarden "
+"voor sleutels in directory:\n"
 "  %s\n"
 
 #: wrappers/gtk/gconf-client.c:287 wrappers/gtk/gconf-client.c:304
diff --git a/po/nn.po b/po/nn.po
index 56a70587..4633026f 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf 0.6.5\n"
-"POT-Creation-Date: 2002-01-16 00:37+0100\n"
+"POT-Creation-Date: 2002-02-04 18:21-0500\n"
 "PO-Revision-Date: 2001-12-30 22:27+0100\n"
 "Last-Translator: Roy-Magne Mo <rmo@sunnmore.net>\n"
 "Language-Team: Norwegian/Nynorsk <nn@li.org>\n"
@@ -654,12 +654,12 @@ msgstr "Klarte ikkje � opprette %s: %s"
 msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:3060
+#: gconf/gconf-internals.c:3064
 #, fuzzy, c-format
 msgid "Failed to launch configuration server: %s\n"
 msgstr "filene for systemoppsettet.\n"
 
-#: gconf/gconf-internals.c:3084
+#: gconf/gconf-internals.c:3088
 msgid ""
 "Failed to contact configuration server (a likely cause of this is that you "
 "have an existing configuration server (gconfd) running, but it isn't "
@@ -667,46 +667,46 @@ msgid ""
 "need to enable TCP networking for ORBit)\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:3720
+#: gconf/gconf-internals.c:3724
 #, c-format
 msgid "Failed to read from child pipe (%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:3785
+#: gconf/gconf-internals.c:3789
 #, c-format
 msgid "Failed to fork (%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:3925
+#: gconf/gconf-internals.c:3929
 #, c-format
 msgid "Failed to change to directory '%s' (%s)"
 msgstr "Klarte ikkje � skifte katalog til �%s� (%s)"
 
-#: gconf/gconf-internals.c:3935
+#: gconf/gconf-internals.c:3939
 #, c-format
 msgid "Failed to execute child process (%s)"
 msgstr "Klarte ikkje � starte barnprosess (%s)"
 
-#: gconf/gconf-internals.c:3944
+#: gconf/gconf-internals.c:3948
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:3953
+#: gconf/gconf-internals.c:3957
 #, fuzzy, c-format
 msgid "Failed to fork child process (%s)"
 msgstr "Kunne ikkje lasta %1."
 
-#: gconf/gconf-internals.c:3961
+#: gconf/gconf-internals.c:3965
 msgid "Unknown error executing child process"
 msgstr ""
 
-#: gconf/gconf-internals.c:3982
+#: gconf/gconf-internals.c:3986
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:4032
+#: gconf/gconf-internals.c:4036
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr ""
diff --git a/po/no.po b/po/no.po
index bf603aab..1e4393a9 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf 1.0\n"
-"POT-Creation-Date: 2001-12-14 23:22+0100\n"
+"POT-Creation-Date: 2002-02-04 18:21-0500\n"
 "PO-Revision-Date: 2001-12-14 23:24+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -31,7 +31,7 @@ msgstr "Initialiserer BDB-backend modul"
 msgid "Couldn't find the %s root directory in the address `%s'"
 msgstr "Kunne ikke finne %s-rotkatalogen i adressen `%s'"
 
-#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1053
+#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1050
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Kunne ikke opprette katalogen `%s': %s"
@@ -132,34 +132,34 @@ msgid "Failed to delete old file `%s': %s"
 msgstr "Kunne ikke slette gammel fil `%s': %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:806
+#: backends/xml-dir.c:803
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Kunne ikke kj�re stat p� `%s': %s"
 
-#: backends/xml-dir.c:950
+#: backends/xml-dir.c:947
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Duplisert oppf�ring `%s' i `%s', ignorerer"
 
-#: backends/xml-dir.c:972
+#: backends/xml-dir.c:969
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "Oppf�ring uten navn i XML-fil `%s', ignorerer"
 
-#: backends/xml-dir.c:980
+#: backends/xml-dir.c:977
 #, c-format
 msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
 msgstr ""
 "En toppniv�-node i XML-fil `%s' er <%s> i stedet for en <oppf�ring>, "
 "ignorerer"
 
-#: backends/xml-dir.c:1069
+#: backends/xml-dir.c:1066
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Kunne ikke opprette fil `%s': %s"
 
-#: backends/xml-dir.c:1077
+#: backends/xml-dir.c:1074
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Kunne ikke lukke filen `%s': %s"
@@ -339,7 +339,7 @@ msgstr ""
 "harml�st, kan resultere i at notifikasjon gjenintreffer p� uforklarlig vis): "
 "%s"
 
-#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1328
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Feil under henting av verdi for `%s': %s"
@@ -597,7 +597,9 @@ msgstr "Kunne ikke opprette eller �pne '%s'"
 msgid ""
 "Failed to lock '%s': probably another process has the lock, or your "
 "operating system has NFS file locking misconfigured (%s)"
-msgstr "Klarte ikke � l�se '%s': en annen prosess holder sannsynligvis l�sen, eller s� er fill�sing for NFS feilkonfigurert p� ditt system (%s)"
+msgstr ""
+"Klarte ikke � l�se '%s': en annen prosess holder sannsynligvis l�sen, eller "
+"s� er fill�sing for NFS feilkonfigurert p� ditt system (%s)"
 
 #: gconf/gconf-internals.c:2548
 #, c-format
@@ -661,12 +663,12 @@ msgstr ""
 "Feil under oppretting av r�r for kommunikasjon med underliggende gconf "
 "daemon: %s\n"
 
-#: gconf/gconf-internals.c:3060
+#: gconf/gconf-internals.c:3064
 #, c-format
 msgid "Failed to launch configuration server: %s\n"
 msgstr "Feil under starting av konfigurasjonstjener: %s\n"
 
-#: gconf/gconf-internals.c:3084
+#: gconf/gconf-internals.c:3088
 msgid ""
 "Failed to contact configuration server (a likely cause of this is that you "
 "have an existing configuration server (gconfd) running, but it isn't "
@@ -678,46 +680,46 @@ msgstr ""
 "herfra - hvis du er logget inn fra to maskiner samtidig vil du kanskje m�tte "
 "aktivere TCP for ORBit)\n"
 
-#: gconf/gconf-internals.c:3720
+#: gconf/gconf-internals.c:3724
 #, c-format
 msgid "Failed to read from child pipe (%s)"
 msgstr "Feil under lesing fra underr�r: (%s)"
 
-#: gconf/gconf-internals.c:3785
+#: gconf/gconf-internals.c:3789
 #, c-format
 msgid "Failed to fork (%s)"
 msgstr "Feil under kj�ring av fork (%s)"
 
-#: gconf/gconf-internals.c:3925
+#: gconf/gconf-internals.c:3929
 #, c-format
 msgid "Failed to change to directory '%s' (%s)"
 msgstr "Feil under skifte til katalog '%s' (%s)"
 
-#: gconf/gconf-internals.c:3935
+#: gconf/gconf-internals.c:3939
 #, c-format
 msgid "Failed to execute child process (%s)"
 msgstr "Feil under kj�ring av underprosess (%s)"
 
-#: gconf/gconf-internals.c:3944
+#: gconf/gconf-internals.c:3948
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
 msgstr "Feil under omdirigering av utdata eller indata for underprosess (%s)"
 
-#: gconf/gconf-internals.c:3953
+#: gconf/gconf-internals.c:3957
 #, c-format
 msgid "Failed to fork child process (%s)"
 msgstr "Feil under kj�ring av fork for underprosess (%s)"
 
-#: gconf/gconf-internals.c:3961
+#: gconf/gconf-internals.c:3965
 msgid "Unknown error executing child process"
 msgstr "Ukjent feil under kj�ring av underprosess"
 
-#: gconf/gconf-internals.c:3982
+#: gconf/gconf-internals.c:3986
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr "Klarte ikke � lese nok data fra underprosess' r�r (%s)"
 
-#: gconf/gconf-internals.c:4032
+#: gconf/gconf-internals.c:4036
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr "Feil under oppretting av r�r for kommunikasjon med underprosess (%s)"
@@ -727,17 +729,17 @@ msgstr "Feil under oppretting av r�r for kommunikasjon med underprosess (%s)"
 msgid "Failed to load source `%s': %s"
 msgstr "Kunne ikke lese kilde `%s': %s"
 
-#: gconf/gconf-sources.c:510
+#: gconf/gconf-sources.c:544
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 "Schema `%s' spesifisert for  `%s' lagrer en verdi som ikke er for schema"
 
-#: gconf/gconf-sources.c:567
+#: gconf/gconf-sources.c:601
 msgid "The '/' name can only be a directory, not a key"
 msgstr "Navnet '/' kan kun v�re en katalog, ikke en n�kkel"
 
-#: gconf/gconf-sources.c:596
+#: gconf/gconf-sources.c:630
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -746,7 +748,7 @@ msgstr ""
 "Verdi for `%s' satt i en skrivebeskyttet kilde i begynnelsen av din "
 "konfigurasjonssti."
 
-#: gconf/gconf-sources.c:608
+#: gconf/gconf-sources.c:642
 #, c-format
 msgid ""
 "Unable to store a value at key '%s', as the configuration server has no "
@@ -771,17 +773,17 @@ msgstr ""
 "CORBA-forbindelser? Som alltid, sjekk user.* systemloggene for detaljer om "
 "problemer som gconfd har st�tt p�."
 
-#: gconf/gconf-sources.c:1164
+#: gconf/gconf-sources.c:1198
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Feil under s�k etter metainfo: %s"
 
-#: gconf/gconf-sources.c:1233
+#: gconf/gconf-sources.c:1267
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Feil under henting av metainfo: %s"
 
-#: gconf/gconf-sources.c:1257
+#: gconf/gconf-sources.c:1291
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr "N�kkel `%s' listet som schema for n�kkel `%s' lagrer type `%s'"
@@ -1142,19 +1144,19 @@ msgid ""
 msgstr ""
 "En klient fjernet seg selv fra GConf-tjeneren uten at den var lagt til."
 
-#: gconf/gconftool.c:72
+#: gconf/gconftool.c:68
 msgid "Help options"
 msgstr "Alternativer for hjelp"
 
-#: gconf/gconftool.c:81
+#: gconf/gconftool.c:77
 msgid "Set a key to a value and sync. Use with --type."
 msgstr "Sett en n�kkel til en verdi ok synkroniser. Bruk med --type."
 
-#: gconf/gconftool.c:90
+#: gconf/gconftool.c:86
 msgid "Print the value of a key to standard output."
 msgstr "Skriv ut verdien for en n�kkel til standard ut."
 
-#: gconf/gconftool.c:99
+#: gconf/gconftool.c:95
 msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and --"
 "type."
@@ -1162,36 +1164,36 @@ msgstr ""
 "Sett et schema og synkroniser. Bruk med --short-desc, --long-desc, --owner, "
 "og --type."
 
-#: gconf/gconftool.c:109
+#: gconf/gconftool.c:105
 msgid "Unset the keys on the command line"
 msgstr "Nullstill n�klene fra kommandolinjen"
 
-#: gconf/gconftool.c:118
+#: gconf/gconftool.c:114
 msgid "Print all key/value pairs in a directory."
 msgstr "Skriv ut alle n�kkel/verdi par i en  katalog."
 
-#: gconf/gconftool.c:127
+#: gconf/gconftool.c:123
 msgid "Print all subdirectories in a directory."
 msgstr "Skriv ut alle underkataloger i en katalog."
 
-#: gconf/gconftool.c:136
+#: gconf/gconftool.c:132
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr ""
 "Skriv ut alle underkataloger og oppf�ringer under en katalog, rekursivt."
 
-#: gconf/gconftool.c:145
+#: gconf/gconftool.c:141
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "Returner 0 hvis katalogen eksisterer, 2 hvis ikke."
 
-#: gconf/gconftool.c:154
+#: gconf/gconftool.c:150
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr "Steng ned gconfd. IKKE BRUK DETTE VALGET UTEN GOD GRUNN."
 
-#: gconf/gconftool.c:163
+#: gconf/gconftool.c:159
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "Returner 0 hvis gconfd kj�rer, 2 hvis ikke."
 
-#: gconf/gconftool.c:172
+#: gconf/gconftool.c:168
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -1199,7 +1201,7 @@ msgstr ""
 "Start konfigurasjonstjeneren (gconfd). (Skjer normalt automatisk n�r det er "
 "n�dvendig.)"
 
-#: gconf/gconftool.c:181
+#: gconf/gconftool.c:177
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -1207,11 +1209,11 @@ msgstr ""
 "Spesifiser typen verdi som settes, eller typen for verdien et schema "
 "beskriver. Unike forkortelser er OK."
 
-#: gconf/gconftool.c:182
+#: gconf/gconftool.c:178
 msgid "int|bool|float|string|list|pair"
 msgstr "int|bool|float|string|liste|par"
 
-#: gconf/gconftool.c:190
+#: gconf/gconftool.c:186
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1219,11 +1221,11 @@ msgstr ""
 "Spesifiser type listeverdi som settes, eller typen for verdien et schema "
 "beskriver. Unike forkortelser er OK."
 
-#: gconf/gconftool.c:191 gconf/gconftool.c:200 gconf/gconftool.c:209
+#: gconf/gconftool.c:187 gconf/gconftool.c:196 gconf/gconftool.c:205
 msgid "int|bool|float|string"
 msgstr "int|bool|float|string"
 
-#: gconf/gconftool.c:199
+#: gconf/gconftool.c:195
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1231,7 +1233,7 @@ msgstr ""
 "Spesifiser car-type verdi som settes, eller typen for verdien et schema "
 "beskriver. Unike forkortelser er OK."
 
-#: gconf/gconftool.c:208
+#: gconf/gconftool.c:204
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1239,45 +1241,45 @@ msgstr ""
 "Spesifiser type verdi for cdr-par som settes, eller typen for verdien et "
 "schema beskriver. Unike forkortelser er OK."
 
-#: gconf/gconftool.c:217
+#: gconf/gconftool.c:213
 msgid "Specify a short half-line description to go in a schema."
 msgstr ""
 "Spesifiser en kort beskrivelse p� en halv linje som skal brukes i et schema."
 
-#: gconf/gconftool.c:218 gconf/gconftool.c:227
+#: gconf/gconftool.c:214 gconf/gconftool.c:223
 msgid "DESCRIPTION"
 msgstr "BESKRIVELSE"
 
-#: gconf/gconftool.c:226
+#: gconf/gconftool.c:222
 msgid "Specify a several-line description to go in a schema."
 msgstr "Spesifiser en beskrivelse p� flere linjer som skal brukes i et schema."
 
-#: gconf/gconftool.c:235
+#: gconf/gconftool.c:231
 msgid "Specify the owner of a schema"
 msgstr "Spesifiser eieren av et schema"
 
-#: gconf/gconftool.c:236
+#: gconf/gconftool.c:232
 msgid "OWNER"
 msgstr "EIER"
 
-#: gconf/gconftool.c:244
+#: gconf/gconftool.c:240
 msgid "Specify a schema file to be installed"
 msgstr "Spesifiser en schema fil som skal installeres"
 
-#: gconf/gconftool.c:245
+#: gconf/gconftool.c:241
 msgid "FILENAME"
 msgstr "FILNAVN"
 
-#: gconf/gconftool.c:253
+#: gconf/gconftool.c:249
 msgid "Specify a configuration source to use rather than the default path"
 msgstr ""
 "Spesifiser en konfigurasjonskilde som skal brukes i stedet for standard sti"
 
-#: gconf/gconftool.c:254
+#: gconf/gconftool.c:250
 msgid "SOURCE"
 msgstr "KILDE"
 
-#: gconf/gconftool.c:262
+#: gconf/gconftool.c:258
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1285,7 +1287,7 @@ msgstr ""
 "Aksepter konfigurasjonsdatabasen direkte, g�r utenom tjeneren. Det kreves at "
 "gconfd ikke kj�rer."
 
-#: gconf/gconftool.c:271
+#: gconf/gconftool.c:267
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1296,7 +1298,7 @@ msgstr ""
 "standardverdien for konfigurasjonskilde eller v�re tom for at "
 "standardverdien skal brukes."
 
-#: gconf/gconftool.c:280
+#: gconf/gconftool.c:276
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1304,7 +1306,7 @@ msgstr ""
 "Utf�r en torturtest av en applikasjon ved � sette og t�mme en rekke verdier "
 "av forskjellige typer for n�kler fra kommandolinjen."
 
-#: gconf/gconftool.c:289
+#: gconf/gconftool.c:285
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1312,28 +1314,28 @@ msgstr ""
 "Utf�r en torturtest av en applikasjon ved � sette og t�mme en rekke n�kler "
 "inne i katalogene fra kommandolinjen."
 
-#: gconf/gconftool.c:298
+#: gconf/gconftool.c:294
 msgid "Get the short doc string for a key"
 msgstr "Hent kort doc-streng for en n�kkel"
 
-#: gconf/gconftool.c:307
+#: gconf/gconftool.c:303
 msgid "Get the long doc string for a key"
 msgstr "Hent lang doc-streng for en n�kkel"
 
-#: gconf/gconftool.c:316
+#: gconf/gconftool.c:312
 msgid "Get the name of the schema applied to this key"
 msgstr "Hent navn p� schema som er p�f�rt denne n�kkelen"
 
-#: gconf/gconftool.c:325
+#: gconf/gconftool.c:321
 msgid "Specify the schema name followed by the key to apply the schema name to"
 msgstr ""
 "Spesifiser schema-navn fulgt av n�kkelen som schema-navnet skal p�f�res"
 
-#: gconf/gconftool.c:334
+#: gconf/gconftool.c:330
 msgid "Get the name of the default source"
 msgstr "Hent navn p� forvalgt kilde"
 
-#: gconf/gconftool.c:386
+#: gconf/gconftool.c:382
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -1343,23 +1345,23 @@ msgstr ""
 "Kj�r '%s --help' for � se en full liste over tilgjengelige "
 "kommandolinjeflagg.\n"
 
-#: gconf/gconftool.c:398
+#: gconf/gconftool.c:394
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "Kan ikke hente og sette/nullstille samtidig\n"
 
-#: gconf/gconftool.c:405
+#: gconf/gconftool.c:401
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "Kan ikke sette og hente/nullstille samtidig\n"
 
-#: gconf/gconftool.c:413
+#: gconf/gconftool.c:409
 msgid "Can't use --all-entries with --get or --set\n"
 msgstr "Kan ikke bruke --all-entries sammen med --get eller --set\n"
 
-#: gconf/gconftool.c:421
+#: gconf/gconftool.c:417
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "Kan ikke bruke --all-dirs sammen med --get eller --set\n"
 
-#: gconf/gconftool.c:431
+#: gconf/gconftool.c:427
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-"
 "entries, or --all-dirs\n"
@@ -1367,7 +1369,7 @@ msgstr ""
 "--recursive-list b�r ikke brukes sammen med --get, --set, --unset, --all-"
 "entries, eller --all-dirs\n"
 
-#: gconf/gconftool.c:441
+#: gconf/gconftool.c:437
 msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-entries, --"
 "all-dirs\n"
@@ -1375,350 +1377,352 @@ msgstr ""
 "--set-schema b�r ikke brukes sammen med --get, --set, --unset, --all-"
 "entries, eller --all-dirs\n"
 
-#: gconf/gconftool.c:447
+#: gconf/gconftool.c:443
 msgid "Value type is only relevant when setting a value\n"
 msgstr "Verditypen er kun relevant n�r en verdi settes\n"
 
-#: gconf/gconftool.c:453
+#: gconf/gconftool.c:449
 msgid "Must specify a type when setting a value\n"
 msgstr "M� spesifisere en type n�r en verdi settes\n"
 
-#: gconf/gconftool.c:463
+#: gconf/gconftool.c:459
 msgid "Ping option must be used by itself.\n"
 msgstr "Ping flagget m� brukes alene.\n"
 
-#: gconf/gconftool.c:473
+#: gconf/gconftool.c:469
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "--dir-exists flagget m� brukes alene.\n"
 
-#: gconf/gconftool.c:483
+#: gconf/gconftool.c:479
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "--install-schema-file m� brukes alene.\n"
 
-#: gconf/gconftool.c:494
+#: gconf/gconftool.c:490
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr "--makefile-install-rule m� brukes alene.\n"
 
-#: gconf/gconftool.c:505
+#: gconf/gconftool.c:501
 msgid "--break-key must be used by itself.\n"
 msgstr "--break-key m� brukes alene.\n"
 
-#: gconf/gconftool.c:516
+#: gconf/gconftool.c:512
 msgid "--break-directory must be used by itself.\n"
 msgstr "--break-directory m� brukes alene.\n"
 
-#: gconf/gconftool.c:523
+#: gconf/gconftool.c:519
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 "Du m� spesifisere en konfigurasjonskilde med --config-source n�r du bruker --"
 "direct\n"
 
-#: gconf/gconftool.c:529
+#: gconf/gconftool.c:525
 msgid "You should use --direct when using a non-default configuration source\n"
-msgstr "Du b�r bruke --direct n�r du bruker en annen konfigurasjonskilde enn den forvalgte\n"
+msgstr ""
+"Du b�r bruke --direct n�r du bruker en annen konfigurasjonskilde enn den "
+"forvalgte\n"
 
-#: gconf/gconftool.c:535
+#: gconf/gconftool.c:531
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "Kunne ikke initialisere GConf: %s\n"
 
-#: gconf/gconftool.c:570
+#: gconf/gconftool.c:566
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "GCONF_CONFIG_SOURCE milj�variabelen m� v�re satt\n"
 
-#: gconf/gconftool.c:599
+#: gconf/gconftool.c:595
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Kunne ikke aksessere konfigurasjonskilden(e): %s\n"
 
-#: gconf/gconftool.c:800
+#: gconf/gconftool.c:796
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Feil ved nedstenging: %s\n"
 
-#: gconf/gconftool.c:843
+#: gconf/gconftool.c:839
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr "M� spesifisere en eller flere kataloger som skal vises rekursivt.\n"
 
-#: gconf/gconftool.c:877
+#: gconf/gconftool.c:873
 #, c-format
 msgid "Failure listing entries in `%s': %s\n"
 msgstr "Feil under listing av oppf�ringer i `%s': %s\n"
 
-#: gconf/gconftool.c:895
+#: gconf/gconftool.c:891
 msgid "(no value set)"
 msgstr "(ingen verdi satt)"
 
-#: gconf/gconftool.c:950
+#: gconf/gconftool.c:946
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Feil under splitting av konfigurasjonstjeneren (gconfd): %s\n"
 
-#: gconf/gconftool.c:964
+#: gconf/gconftool.c:960
 msgid "Must specify a key or keys to get\n"
 msgstr "M� spesifisere en eller flere n�kler som skal hentes\n"
 
-#: gconf/gconftool.c:999
+#: gconf/gconftool.c:995
 #, c-format
 msgid "Type: %s\n"
 msgstr "Type: %s\n"
 
-#: gconf/gconftool.c:1000
+#: gconf/gconftool.c:996
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Listetype: %s\n"
 
-#: gconf/gconftool.c:1001
+#: gconf/gconftool.c:997
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Car-type: %s\n"
 
-#: gconf/gconftool.c:1002
+#: gconf/gconftool.c:998
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Cdr-type: %s\n"
 
-#: gconf/gconftool.c:1007
+#: gconf/gconftool.c:1003
 #, c-format
 msgid "Default Value: %s\n"
 msgstr "Standardverdi: %s\n"
 
-#: gconf/gconftool.c:1007 gconf/gconftool.c:1009 gconf/gconftool.c:1010
-#: gconf/gconftool.c:1011
+#: gconf/gconftool.c:1003 gconf/gconftool.c:1005 gconf/gconftool.c:1006
+#: gconf/gconftool.c:1007
 msgid "Unset"
 msgstr "Nullstill"
 
-#: gconf/gconftool.c:1009
+#: gconf/gconftool.c:1005
 #, c-format
 msgid "Owner: %s\n"
 msgstr "Eier: %s\n"
 
-#: gconf/gconftool.c:1010
+#: gconf/gconftool.c:1006
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Kort beskrivelse: %s\n"
 
-#: gconf/gconftool.c:1011
+#: gconf/gconftool.c:1007
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Lang beskrivelse: %s\n"
 
-#: gconf/gconftool.c:1020 gconf/gconftool.c:1314
+#: gconf/gconftool.c:1016 gconf/gconftool.c:1310
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Ingen verdi satt for `%s'\n"
 
-#: gconf/gconftool.c:1024 gconf/gconftool.c:1318
+#: gconf/gconftool.c:1020 gconf/gconftool.c:1314
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Kunne ikke hente verdi for `%s': %s\n"
 
-#: gconf/gconftool.c:1067 gconf/gconftool.c:1079
+#: gconf/gconftool.c:1063 gconf/gconftool.c:1075
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "Forst�r ikke type `%s'\n"
 
-#: gconf/gconftool.c:1091
+#: gconf/gconftool.c:1087
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "M� spesifisere vekselvis n�kler/verdier som argumenter\n"
 
-#: gconf/gconftool.c:1111
+#: gconf/gconftool.c:1107
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Ingen verdi satt for n�kkel: `%s'\n"
 
-#: gconf/gconftool.c:1139
+#: gconf/gconftool.c:1135
 msgid "Cannot set schema as value\n"
 msgstr "Kan ikke sette schema som verdi\n"
 
-#: gconf/gconftool.c:1149
+#: gconf/gconftool.c:1145
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr "N�r en liste settes m� du spesifisere en primitiv liste-type\n"
 
-#: gconf/gconftool.c:1163
+#: gconf/gconftool.c:1159
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr "N�r et par settes m� du spesifisere en primitiv car-type og cdr-type\n"
 
-#: gconf/gconftool.c:1178
+#: gconf/gconftool.c:1174
 #, c-format
 msgid "Error: %s\n"
 msgstr "Feil: %s\n"
 
-#: gconf/gconftool.c:1191
+#: gconf/gconftool.c:1187
 #, c-format
 msgid "Error setting value: %s\n"
 msgstr "Feil under setting av verdi: %s\n"
 
-#: gconf/gconftool.c:1209
+#: gconf/gconftool.c:1205
 #, c-format
 msgid "Error syncing: %s\n"
 msgstr "Feil under synkronisering: %s\n"
 
-#: gconf/gconftool.c:1232
+#: gconf/gconftool.c:1228
 msgid "Must specify a key or keys on the command line\n"
 msgstr "M� spesifisere en eller flere n�kler p� kommandolinjen\n"
 
-#: gconf/gconftool.c:1252
+#: gconf/gconftool.c:1248
 #, c-format
 msgid "No schema known for `%s'\n"
 msgstr "Ingen kjente schema for `%s'\n"
 
-#: gconf/gconftool.c:1285
+#: gconf/gconftool.c:1281
 #, c-format
 msgid "No doc string stored in schema at '%s'\n"
 msgstr "Ingen doc-streng lagret i schema ved '%s'\n"
 
-#: gconf/gconftool.c:1290
+#: gconf/gconftool.c:1286
 #, c-format
 msgid "Error getting schema at '%s': %s\n"
 msgstr "Feil under henting av schema ved `%s': %s\n"
 
-#: gconf/gconftool.c:1297
+#: gconf/gconftool.c:1293
 #, c-format
 msgid "No schema stored at '%s'\n"
 msgstr "Ingen schema lagret i `%s'\n"
 
-#: gconf/gconftool.c:1300
+#: gconf/gconftool.c:1296
 #, c-format
 msgid "Value at '%s' is not a schema\n"
 msgstr "Verdien i '%s' er ikke et schema\n"
 
-#: gconf/gconftool.c:1356
+#: gconf/gconftool.c:1352
 msgid "Must specify a schema name followed by the key name to apply it to\n"
 msgstr "M� spesifisere et schema-navn fulgt av n�kkelnavnet det skal p�f�res\n"
 
-#: gconf/gconftool.c:1363
+#: gconf/gconftool.c:1359
 #, c-format
 msgid "Error associating schema name '%s' with key name '%s': %s\n"
 msgstr "Feil under assosiering av schema-navn '%s' med n�kkelnavn '%s': %s\n"
 
-#: gconf/gconftool.c:1383
+#: gconf/gconftool.c:1379
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "M� spesifisere n�kkel (schema navn) som eneste argument\n"
 
-#: gconf/gconftool.c:1425
+#: gconf/gconftool.c:1421
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr "Listetyp m� v�re en primitiv type: string, int, float eller bool\n"
 
-#: gconf/gconftool.c:1445
+#: gconf/gconftool.c:1441
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Parets car-type m� v�re en primitiv type: string, int, float eller bool\n"
 
-#: gconf/gconftool.c:1465
+#: gconf/gconftool.c:1461
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Parets cdr-type m� v�re en primitiv type: string, int, float eller bool\n"
 
-#: gconf/gconftool.c:1480
+#: gconf/gconftool.c:1476
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Feil under setting av verdi: %s"
 
-#: gconf/gconftool.c:1494
+#: gconf/gconftool.c:1490
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Feil under synkronisering: %s"
 
-#: gconf/gconftool.c:1509
+#: gconf/gconftool.c:1505
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "Det m� spesifiseres en eller flere kataloger � hente n�kkel/verdi par fra.\n"
 
-#: gconf/gconftool.c:1523
+#: gconf/gconftool.c:1519
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Det m� spesifiseres en eller flere n�kler som skal nullstilles.\n"
 
-#: gconf/gconftool.c:1534
+#: gconf/gconftool.c:1530
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Feil under nullstilling av `%s': %s\n"
 
-#: gconf/gconftool.c:1557
+#: gconf/gconftool.c:1553
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "Det m� spesifiseres en eller flere kataloger som det skal hentes "
 "underkataloger fra.\n"
 
-#: gconf/gconftool.c:1591
+#: gconf/gconftool.c:1587
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Feil ved vising av kataloger: %s\n"
 
-#: gconf/gconftool.c:1633
+#: gconf/gconftool.c:1629
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "ADVARSEL: ugyldig eller manglende type for schema (%s)\n"
 
-#: gconf/gconftool.c:1642
+#: gconf/gconftool.c:1638
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "ADVARSEL: ugyldig eller manglende list_type for schema (%s)\n"
 
-#: gconf/gconftool.c:1653 gconf/gconftool.c:1683 gconf/gconftool.c:1712
+#: gconf/gconftool.c:1649 gconf/gconftool.c:1679 gconf/gconftool.c:1708
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr "ADVARSEL: Kunne ikke fortolke standardverdi `%s' for schema (%s)\n"
 
-#: gconf/gconftool.c:1671
+#: gconf/gconftool.c:1667
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr "ADVARSEL: ugyldig eller manglende car_type for schema (%s)\n"
 
-#: gconf/gconftool.c:1696
+#: gconf/gconftool.c:1692
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "ADVARSEL: Du kan ikke sette en standardverdi for et schema\n"
 
-#: gconf/gconftool.c:1725
+#: gconf/gconftool.c:1721
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "ADVARSEL: gconftool, intern feil, ukjent GConfValueType\n"
 
-#: gconf/gconftool.c:1772 gconf/gconftool.c:1793 gconf/gconftool.c:1814
-#: gconf/gconftool.c:1835
+#: gconf/gconftool.c:1768 gconf/gconftool.c:1789 gconf/gconftool.c:1810
+#: gconf/gconftool.c:1831
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "ADVARSEL: kunne ikke forst� typenavnet `%s'\n"
 
-#: gconf/gconftool.c:1789
+#: gconf/gconftool.c:1785
 #, 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:1810
+#: gconf/gconftool.c:1806
 #, 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:1831
+#: gconf/gconftool.c:1827
 #, 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:1859
+#: gconf/gconftool.c:1855
 msgid "WARNING: empty <applyto> node"
 msgstr "ADVARSEL: tom <applyto> node"
 
-#: gconf/gconftool.c:1862 gconf/gconftool.c:2125
+#: gconf/gconftool.c:1858 gconf/gconftool.c:2121
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "ADVARSEL: node <%s> ikke forst�tt under <schema>\n"
 
-#: gconf/gconftool.c:1872
+#: gconf/gconftool.c:1868
 msgid "WARNING: no key specified for schema\n"
 msgstr "ADVARSEL: ingen n�kkel spesifisert for schema\n"
 
-#: gconf/gconftool.c:1905
+#: gconf/gconftool.c:1901
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "ADVARSEL: <locale> node har ingen `navn=\"locale\"' attributt, ignorerer\n"
 
-#: gconf/gconftool.c:1911
+#: gconf/gconftool.c:1907
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1726,51 +1730,51 @@ msgstr ""
 "ADVARSEL: flere <locale> noder for locale `%s', ignorerer alle etter den "
 "f�rste\n"
 
-#: gconf/gconftool.c:1992
+#: gconf/gconftool.c:1988
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "ADVARSEL: Ugyldig node <%s> i en <locale> node\n"
 
-#: gconf/gconftool.c:2021
+#: gconf/gconftool.c:2017
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "ADVARSEL: kunne ikke installere schema `%s' locale `%s': %s\n"
 
-#: gconf/gconftool.c:2029
+#: gconf/gconftool.c:2025
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Installert schema `%s' for locale `%s'\n"
 
-#: gconf/gconftool.c:2051
+#: gconf/gconftool.c:2047
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "ADVARSEL: kunne ikke assosiere schema `%s' med n�kkel `%s': %s\n"
 
-#: gconf/gconftool.c:2059
+#: gconf/gconftool.c:2055
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Lagt ved schema `%s' til n�kkel `%s'\n"
 
-#: gconf/gconftool.c:2138
+#: gconf/gconftool.c:2134
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "Du m� ha minst en <locale> oppf�ring i et <schema>\n"
 
-#: gconf/gconftool.c:2169
+#: gconf/gconftool.c:2165
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "ADVARSEL: node <%s> ikke forst�tt under <schemaliste>\n"
 
-#: gconf/gconftool.c:2192
+#: gconf/gconftool.c:2188
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Kunne ikke �pne `%s': %s\n"
 
-#: gconf/gconftool.c:2199
+#: gconf/gconftool.c:2195
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Dokument `%s' er tomt?\n"
 
-#: gconf/gconftool.c:2211
+#: gconf/gconftool.c:2207
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1779,26 +1783,26 @@ msgstr ""
 "Dokumentet `%s' har feil type rot-node (<%s>, skulle v�rt "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:2224
+#: gconf/gconftool.c:2220
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "Dokumentet `%s' har ingen topp-niv� <gconfschemafile> node\n"
 
-#: gconf/gconftool.c:2238
+#: gconf/gconftool.c:2234
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "ADVARSEL: node <%s> under <gconfschemafile> ikke forst�tt\n"
 
-#: gconf/gconftool.c:2249 gconf/gconftool.c:2281
+#: gconf/gconftool.c:2245 gconf/gconftool.c:2277
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Feil under synkronisering av konfigurasjonsdata: %s"
 
-#: gconf/gconftool.c:2265
+#: gconf/gconftool.c:2261
 msgid "Must specify some schema files to install\n"
 msgstr "Spesifiser schema filer som skal installeres\n"
 
-#: gconf/gconftool.c:2302
+#: gconf/gconftool.c:2298
 #, c-format
 msgid ""
 "\n"
@@ -1807,16 +1811,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2322
+#: gconf/gconftool.c:2318
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Kunne ikke nullstille brytningsn�kkel %s: %s\n"
 
-#: gconf/gconftool.c:2448
+#: gconf/gconftool.c:2444
 msgid "Must specify some keys to break\n"
 msgstr "M� spesifisere n�kler som skal brytes\n"
 
-#: gconf/gconftool.c:2454
+#: gconf/gconftool.c:2450
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1825,11 +1829,11 @@ msgstr ""
 "Pr�ver � knekke din applikasjon ved � sette ugyldige verdier for n�kkel:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2472
+#: gconf/gconftool.c:2468
 msgid "Must specify some directories to break\n"
 msgstr "M� spesifisere kataloger som skal brytes\n"
 
-#: gconf/gconftool.c:2491
+#: gconf/gconftool.c:2487
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
diff --git a/po/pl.po b/po/pl.po
index 26dcf383..251077c8 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
-"POT-Creation-Date: 2001-12-30 20:34+0100\n"
+"POT-Creation-Date: 2002-02-04 18:21-0500\n"
 "PO-Revision-Date: 2001-12-30 20:36+0100\n"
 "Last-Translator: GNOME PL Team <translators@gnome.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -17,71 +17,71 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/bdb-backend.c:1
+#: backends/bdb-backend.c:211
 msgid "Unloading BerkeleyDB (BDB) backend module."
 msgstr "Usuwanie modu�u przetwarzaj�cego BerkeleyDB (BDB)."
 
-#: backends/bdb-backend.c:1
+#: backends/bdb-backend.c:234
 #, c-format
 msgid "Opened BerkeleyDB source at root %s"
 msgstr "Otwarto �r�d�o BerkeleyDB g��wnym katalogiem %s"
 
-#: backends/bdb-backend.c:1
+#: backends/bdb-backend.c:574
 msgid "Initializing BDB backend module"
 msgstr "Inicjowanie modu�u przetwarzaj�cego BerkeleyDB (BDB)"
 
-#: backends/dir-utils.c:1
+#: backends/dir-utils.c:108
 #, c-format
 msgid "Couldn't find the %s root directory in the address `%s'"
 msgstr "Nie mo�na odnale�� g��wnego katalogu %s pod adresem \"%s\""
 
-#: backends/dir-utils.c:1 backends/xml-backend.c:1 backends/xml-dir.c:1
+#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1050
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Nie mo�na stworzy� katalogu \"%s\": %s"
 
-#: backends/dir-utils.c:1
+#: backends/dir-utils.c:212
 #, c-format
 msgid "Can't read from or write to the %s root directory in the address `%s'"
 msgstr ""
 "Nie mo�na odczyta� lub zapisa� do g��wnego katalogu %sv pod adresem \"%s\""
 
-#: backends/xml-backend.c:1
+#: backends/xml-backend.c:233
 msgid "Unloading XML backend module."
 msgstr "Usuni�cie pracuj�cego w tle modu�u XML."
 
-#: backends/xml-backend.c:1
+#: backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Nie mo�na znale�� katalogu g��wnego XML pod adresem `%s'"
 
-#: backends/xml-backend.c:1
+#: backends/xml-backend.c:414
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
 msgstr ""
 "Nie mo�na odczyta� lub zapisywa� do katalogu g��wnego XML-a pod adresem `%s'"
 
-#: backends/xml-backend.c:1
+#: backends/xml-backend.c:424
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "Uprawnienia do katalogu/pliku dla �r�d�a XML dla roota %s s�: %o/%o"
 
-#: backends/xml-backend.c:1
+#: backends/xml-backend.c:708
 msgid "Initializing XML backend module"
 msgstr "Inicjacja pracuj�cego w tle modu�u XML"
 
-#: backends/xml-backend.c:1
+#: backends/xml-backend.c:773
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "Nie udana pr�ba usuni�cia blokady na katalog XML `%s': %s"
 
-#: backends/xml-cache.c:1
+#: backends/xml-cache.c:119
 msgid "Unsynced directory deletions when shutting down XML backend"
 msgstr ""
 "Niezsynchronizowane usuni�cia katalog�w przy zamykaniu modu�u operuj�cego na "
 "XML-u"
 
-#: backends/xml-cache.c:1
+#: backends/xml-cache.c:229
 #, c-format
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
@@ -90,230 +90,230 @@ msgstr ""
 "Nie mo�na usun�� katalogu \"%s\" z cache modu�u operuj�cego na XML-u, "
 "poniewa� nie zosta� on pomy�lnie zsynchronizowany z dyskiem"
 
-#: backends/xml-cache.c:1
+#: backends/xml-cache.c: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 ""
 "W cache pozosta�o %u element�w po wyczyszczeniu element�w starszych ni� %u "
 "sekund"
 
-#: backends/xml-dir.c:1
+#: backends/xml-dir.c:164
 #, c-format
 msgid "Could not stat `%s': %s"
 msgstr "Nie mo�na odczyta� `%s': %s"
 
-#: backends/xml-dir.c:1
+#: backends/xml-dir.c:174
 #, c-format
 msgid "XML filename `%s' is a directory"
 msgstr "Plik XML `%s' jest katalogiem"
 
-#: backends/xml-dir.c:1 backends/xml-dir.c:1
+#: backends/xml-dir.c:298 backends/xml-dir.c:305
 #, c-format
 msgid "Failed to delete `%s': %s"
 msgstr "Nie mo�na usun�� \"%s\": %s"
 
-#: backends/xml-dir.c:1
+#: backends/xml-dir.c:346
 #, c-format
 msgid "Failed to write file `%s': %s"
 msgstr "Nie mo�na zapisa� do pliku \"%s\": %s"
 
-#: backends/xml-dir.c:1
+#: backends/xml-dir.c:359
 #, c-format
 msgid "Failed to set mode on `%s': %s"
 msgstr "Nie mo�na ustawi� uprawnie� pliku \"%s\": %s"
 
-#: backends/xml-dir.c:1 backends/xml-dir.c:1
+#: backends/xml-dir.c:373 backends/xml-dir.c:383
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
 msgstr "Nie mo�na zmieni� nazwy \"%s\" na \"%s\": %s"
 
-#: backends/xml-dir.c:1
+#: backends/xml-dir.c:389
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
 msgstr "Nie mo�na odtworzy� \"%s\" z \"%s\": %s"
 
-#: backends/xml-dir.c:1
+#: backends/xml-dir.c:401
 #, c-format
 msgid "Failed to delete old file `%s': %s"
 msgstr "Nie mo�na usun�� starego pliku \"%s\": %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:1
+#: backends/xml-dir.c:803
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Nie mo�na uzyska� informacji o \"%s\" : %s"
 
-#: backends/xml-dir.c:1
+#: backends/xml-dir.c:947
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Zduplikowane wpisy \"%s\" w \"%s\":, ignorowanie"
 
-#: backends/xml-dir.c:1
+#: backends/xml-dir.c:969
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "Wpis bez nazwy w pliku XML \"%s\", ignorowanie"
 
-#: backends/xml-dir.c:1
+#: backends/xml-dir.c:977
 #, c-format
 msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
 msgstr ""
 "G��wnym w�z�em w pliku XML \"%s\" jest <%s> zamiast <entry>, ignorowanie"
 
-#: backends/xml-dir.c:1
+#: backends/xml-dir.c:1066
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Nie mo�na stworzy� pliku \"%s\": %s"
 
-#: backends/xml-dir.c:1
+#: backends/xml-dir.c:1074
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Nie mo�na zamkn�� pliku \"%s\": %s"
 
 #. There was an error
-#: backends/xml-entry.c:1
+#: backends/xml-entry.c:149
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "Ignorowanie w�z�a XML o nazwie \"%s\": %s"
 
-#: backends/xml-entry.c:1
+#: backends/xml-entry.c:327
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr "Ignorowanie nazwy schematu `%s', niew�a�ciwy: %s"
 
-#: backends/xml-entry.c:1
+#: backends/xml-entry.c:375
 #, c-format
 msgid "Ignoring XML node `%s': %s"
 msgstr "Zignorowano weze� XML-a \"%s\": %s"
 
-#: backends/xml-entry.c:1
+#: backends/xml-entry.c:726
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr "B��d odczytu domy�lnej warto�ci dla schematu: %s"
 
-#: backends/xml-entry.c:1
+#: backends/xml-entry.c:940
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr "Brak atrybutu \"type\" dla w�z�a <%s>"
 
-#: backends/xml-entry.c:1
+#: backends/xml-entry.c:954
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr "W�ze� posiada nieznany \"typ\" atrybutu `%s', ignorowanie"
 
-#: backends/xml-entry.c:1
+#: backends/xml-entry.c:969
 msgid "No \"value\" attribute for node"
 msgstr "Brak atrybutu \"value\" dla w�z�a"
 
-#: backends/xml-entry.c:1 backends/xml-entry.c:1
+#: backends/xml-entry.c:1017 backends/xml-entry.c:1093
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr "Niezrozumia�y w�ze� XML-a <%s> wewn�trz w�z�a listy"
 
-#: backends/xml-entry.c:1
+#: backends/xml-entry.c:1051
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr "Niew�a�ciwy typ (lista, para, lub co� innego) w li�cie w�z��w"
 
-#: backends/xml-entry.c:1
+#: backends/xml-entry.c:1074
 #, c-format
 msgid "Bad XML node: %s"
 msgstr "Niepoprawny w�ze� XML-a: %s"
 
-#: backends/xml-entry.c:1
+#: backends/xml-entry.c:1082
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr "Lista zawiera w�ze� niew�a�ciwego typu (%s, powinno by� %s)"
 
-#: backends/xml-entry.c:1
+#: backends/xml-entry.c:1134
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr "Zignorowano niepoprawny pierwszy element pary w XML-u: %s"
 
-#: backends/xml-entry.c:1 backends/xml-entry.c:1
+#: backends/xml-entry.c:1143 backends/xml-entry.c:1166
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 "analiza pliku XML: listy oraz pary nie mog� by� umieszczane wewn�trz par"
 
-#: backends/xml-entry.c:1
+#: backends/xml-entry.c:1156
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr "Zignorowano niepoprawny drugi element pary w XML-u: %s"
 
-#: backends/xml-entry.c:1
+#: backends/xml-entry.c:1175
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr "Niezrozumia�y w�ze� XML-a <%s> wewn�trz w�z�a pary"
 
-#: backends/xml-entry.c:1
+#: backends/xml-entry.c:1193
 msgid "Didn't find car and cdr for XML pair node"
 msgstr "Nie odnaleziono w XML-u cz�ci car i cdr wewn�trz w�z�a pary"
 
-#: backends/xml-entry.c:1
+#: backends/xml-entry.c:1199
 msgid "Missing cdr from pair of values in XML file"
 msgstr "Brak drugiego elementu pary warto�ci w XML-u"
 
-#: backends/xml-entry.c:1
+#: backends/xml-entry.c:1206
 msgid "Missing car from pair of values in XML file"
 msgstr "Brak pierwszego elementu pary warto�ci w XML-u"
 
-#: backends/xml-entry.c:1
+#: backends/xml-entry.c:1211
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr "Brak pierwszego i drugiego elementu pary warto�ci w XML-u"
 
 #. -- end debug only
-#: gconf/gconf-backend.c:1
+#: gconf/gconf-backend.c:167
 #, c-format
 msgid "No such file `%s'\n"
 msgstr "Plik \"%s\" nie istnieje\n"
 
-#: gconf/gconf-backend.c:1
+#: gconf/gconf-backend.c:195
 #, c-format
 msgid "Bad address `%s'"
 msgstr "Niepoprawny adres \"%s\""
 
-#: gconf/gconf-backend.c:1
+#: gconf/gconf-backend.c:220
 msgid "GConf won't work without dynamic module support (gmodule)"
 msgstr "GConf nie mo�e dzia�a� bez obs�ugi dynamicznych modu��w (gmodule)"
 
-#: gconf/gconf-backend.c:1
+#: gconf/gconf-backend.c:230
 #, c-format
 msgid "Error opening module `%s': %s\n"
 msgstr "B��d przy otwieraniu modu�u \"%s\": %s\n"
 
-#: gconf/gconf-backend.c:1
+#: gconf/gconf-backend.c:262
 #, c-format
 msgid "Couldn't locate backend module for `%s'"
 msgstr "Nie mo�na znale�� modu��w pracuj�cych w tle dla `%s'"
 
-#: gconf/gconf-backend.c:1
+#: gconf/gconf-backend.c:299
 msgid "Failed to shut down backend"
 msgstr "B��d zamykania proces�w t�a"
 
-#: gconf/gconf-database.c:1
+#: gconf/gconf-database.c:232
 msgid "Received invalid value in set request"
 msgstr "Otrzymano niew�a�ciw� warto�� w zbiorze ��dania"
 
-#: gconf/gconf-database.c:1
+#: gconf/gconf-database.c:240
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr ""
 "Nie mo�na zinterpretowa� warto�ci Corby otrzymanej z ��daniem przypisania do "
 "klucza \"%s\""
 
-#: gconf/gconf-database.c:1
+#: gconf/gconf-database.c:518
 msgid "Received request to drop all cached data"
 msgstr "Otrzymano ��danie aby odrzuci� wszystkie cache'owane dane"
 
-#: gconf/gconf-database.c:1
+#: gconf/gconf-database.c:535
 msgid "Received request to sync synchronously"
 msgstr "Otrzymano ��danie synchronicznej synchronizacji"
 
-#: gconf/gconf-database.c:1
+#: gconf/gconf-database.c:770
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr "Powa�ny b��d: nie mo�na uzyska� referencji obiektu ConfigDatabase"
 
-#: gconf/gconf-database.c:1
+#: gconf/gconf-database.c:929
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "B��d przy synchronizowaniu jednego lub wi�cej �r�de�: %s"
@@ -322,7 +322,7 @@ msgstr "B��d przy synchronizowaniu jednego lub wi�cej �r�de�: %s"
 #. * Because it's likely the right thing for the client
 #. * app to simply continue.
 #.
-#: gconf/gconf-database.c:1
+#: gconf/gconf-database.c:1015
 #, c-format
 msgid ""
 "Failed to log addition of listener (%s); will not be able to restore this "
@@ -333,12 +333,12 @@ msgstr ""
 "uruchomieniu gconfd nie b�dzie mo�na go przywr�ci�, co spowoduje niew�a�ciwe "
 "funkcjonowanie powiadamiania o zmianach w konfiguracji."
 
-#: gconf/gconf-database.c:1
+#: gconf/gconf-database.c:1042
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "ID nas�uchiwacza %lu nie istnieje"
 
-#: gconf/gconf-database.c:1
+#: gconf/gconf-database.c:1051
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -347,261 +347,261 @@ msgstr ""
 "Nie mo�na zapisa� w dzienniku usuni�cia nas�uchiwacza (mo�e to spowodowa� "
 "dziwne ponawianie powiadomie�): %s"
 
-#: gconf/gconf-database.c:1 gconf/gconf-sources.c:1
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1328
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "B��d przy pobieraniu warto�ci dla \"%s\": %s"
 
-#: gconf/gconf-database.c:1
+#: gconf/gconf-database.c:1216
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "B��d przy ustawianiu warto�ci dla \"%s\": %s"
 
-#: gconf/gconf-database.c:1
+#: gconf/gconf-database.c:1259
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "B��d przy czyszczeniu \"%s\": %s"
 
-#: gconf/gconf-database.c:1
+#: gconf/gconf-database.c:1283
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "B��d przy pobieraniu domy�lnej warto�ci \"%s\": %s"
 
-#: gconf/gconf-database.c:1
+#: gconf/gconf-database.c:1323
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "B��d przy sprawdzaniu istnienia \"%s\": %s"
 
-#: gconf/gconf-database.c:1
+#: gconf/gconf-database.c:1347
 #, c-format
 msgid "Error removing dir `%s': %s"
 msgstr "B��d przy usuwaniu katalogu \"%s\": %s"
 
-#: gconf/gconf-database.c:1
+#: gconf/gconf-database.c:1374
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "Nie mo�na pobra� wszystkich element�w z \"%s\": %s"
 
-#: gconf/gconf-database.c:1
+#: gconf/gconf-database.c:1400
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "B��d przy pobieraniu zawarto�ci katalog�w w \"%s\": %s"
 
-#: gconf/gconf-database.c:1
+#: gconf/gconf-database.c:1421
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "B��d przy ustawianiu schematu dla \"%s\": %s"
 
-#: gconf/gconf-error.c:1
+#: gconf/gconf-error.c:25
 msgid "Success"
 msgstr "Sukces"
 
-#: gconf/gconf-error.c:1
+#: gconf/gconf-error.c:26
 msgid "Failed"
 msgstr "Niepowodzenie"
 
-#: gconf/gconf-error.c:1
+#: gconf/gconf-error.c:27
 msgid "Configuration server couldn't be contacted"
 msgstr "Nie mo�na nawi�za� po��czenia z serwerem konfiguracji"
 
-#: gconf/gconf-error.c:1
+#: gconf/gconf-error.c:28
 msgid "Permission denied"
 msgstr "Brak dost�pu"
 
-#: gconf/gconf-error.c:1
+#: gconf/gconf-error.c:29
 msgid "Couldn't resolve address for configuration source"
 msgstr "Nie mo�na uzyska� adresu �r�d�a konfiguracji"
 
-#: gconf/gconf-error.c:1
+#: gconf/gconf-error.c:30
 msgid "Bad key or directory name"
 msgstr "Niepoprawna nazwa klucz lub katalogu"
 
-#: gconf/gconf-error.c:1
+#: gconf/gconf-error.c:31
 msgid "Parse error"
 msgstr "B��d sk�adniowy"
 
-#: gconf/gconf-error.c:1
+#: gconf/gconf-error.c:32
 msgid "Corrupt data in configuration source database"
 msgstr "Uszkodzone dane w bazie danych �r�d�a konfiguracji"
 
-#: gconf/gconf-error.c:1
+#: gconf/gconf-error.c:33
 msgid "Type mismatch"
 msgstr "Niezgodno�� typ�w"
 
-#: gconf/gconf-error.c:1
+#: gconf/gconf-error.c:34
 msgid "Key operation on directory"
 msgstr "Operacja dotycz�ca klucza na katalogu"
 
-#: gconf/gconf-error.c:1
+#: gconf/gconf-error.c:35
 msgid "Directory operation on key"
 msgstr "Operacja dotycz�ca katalogu na kluczu"
 
-#: gconf/gconf-error.c:1
+#: gconf/gconf-error.c:36
 msgid "Can't overwrite existing read-only value"
 msgstr "Nie mo�na nadpisa� istniej�cej warto�ci przeznaczonej tylko do odczytu"
 
-#: gconf/gconf-error.c:1
+#: gconf/gconf-error.c:37
 msgid "Object Activation Framework error"
 msgstr "B��d systemu aktywacji objekt�w (OAF)"
 
-#: gconf/gconf-error.c:1
+#: gconf/gconf-error.c:38
 msgid "Operation not allowed without configuration server"
 msgstr "Operacja nie jest dozwolona bez serwera konfiguracji"
 
-#: gconf/gconf-error.c:1
+#: gconf/gconf-error.c:39
 msgid "Failed to get a lock"
 msgstr "Nie mo�na uzyska� blokady"
 
-#: gconf/gconf-error.c:1
+#: gconf/gconf-error.c:40
 msgid "No database available to save your configuration"
 msgstr "Brak dost�pnej bazy danych do zapisu konfiguracji"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:114
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "Brak znaku \"/\" w kluczu \"%s\""
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:227
 #, c-format
 msgid "Invalid UTF-8 in string value in '%s'"
 msgstr "Niepoprawny UTF-8 w warto�ci napisu w \"%s\""
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:286
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "Nie mo�na zinterpretowa� warto�ci Corby elementu listy"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:288
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "Niepoprawny typ elementu listy w %s"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:301
 msgid "Received list from gconfd with a bad list type"
 msgstr "Otrzymano od procesu gconfd list� niew�a�ciwego typu"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:482
 msgid "Failed to convert object to IOR"
 msgstr "Nie mo�na przekonwertowa� obiektu na IOR"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:619
 msgid "Invalid UTF-8 in locale for schema"
 msgstr "Niepoprawny napis UTF-8 jako kod j�zyka schematu"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:627
 msgid "Invalid UTF-8 in short description for schema"
 msgstr "Niepoprawny UTF-8 w kr�tkim opisie schematu"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:635
 msgid "Invalid UTF-8 in long description for schema"
 msgstr "Niepoprawny UTF-8 w d�ugim opisie schematu"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:643
 msgid "Invalid UTF-8 in owner for schema"
 msgstr "Niepoprawny UTF-8 w nazwie w�a�ciciela schematu"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:868
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "Nie mo�na otworzy� pliku \"%s\": %s\n"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:928
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "Dodanie �r�d�a \"%s\"\n"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:940
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "B��d przy odczycie pliku \"%s\": %s\n"
 
-#: gconf/gconf-internals.c:1 gconf/gconf-internals.c:1
-#: gconf/gconf-value.c:1 gconf/gconf-value.c:1 gconf/gconf-value.c:1
-#: gconf/gconf-value.c:1
+#: gconf/gconf-internals.c:1271 gconf/gconf-internals.c:1337
+#: gconf/gconf-value.c:125 gconf/gconf-value.c:224 gconf/gconf-value.c:366
+#: gconf/gconf-value.c:1084
 msgid "Text contains invalid UTF-8"
 msgstr "Tekst zawiera niepoprawn� sekwencj� UTF-8"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:1422
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Oczekiwano listy, otrzymano %s"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:1432
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "Oczekiwano listy %s, otrzymano list� %s"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:1571
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Oczekiwano pary, otrzymano %s"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:1585
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "Oczekiwano pary (%s,%s), otrzymano par� z brakuj�c� jedn� lub obiema "
 "warto�ciami"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:1601
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "Oczekiwano pary (%s,%s), otrzymano par� (%s,%s)"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:1717
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "Zacytowany napis nie rozpoczyna si� znakiem cytowania"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:1779
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "Zacytowany napis nie ko�czy si� znakiem cytowania"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:1915
 msgid "Encoded value is not valid UTF-8"
 msgstr "Zakodowana warto�� nie jest poprawnym napisem UTF-8"
 
-#: gconf/gconf-internals.c:1 gconf/gconf.c:1
+#: gconf/gconf-internals.c:2265 gconf/gconf.c:3082
 #, c-format
 msgid "CORBA error: %s"
 msgstr "B��d Corby: %s"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2281
 #, c-format
 msgid "OAF problem description: '%s'"
 msgstr "Opis b��du otrzymany od OAF-a: \"%s\""
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2287
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "pr�ba usuni�cia katalogu obiekt�w OAF-a, kt�rego nie ma na li�cie"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2292
 msgid "attempt to add already-listed OAF directory"
 msgstr "pr�ba dodania katalogu obiekt�w OAF-a, b�d�cego ju� na li�cie"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2299
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "B�ad sk��dniowy OAF-a: %s"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2304
 msgid "Unknown OAF error"
 msgstr "Nieznany b��d OAF-a"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2437
 #, c-format
 msgid "Could not lock temporary file '%s': %s"
 msgstr "Nie mo�na zablokowa� tymczasowego pliku \"%s\": %s"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2464
 #, c-format
 msgid "Could not create file '%s', probably because it already exists"
 msgstr "Nie mo�na stworzy� pliku \"%s\", prawdopodobnie ju� on istnieje"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2510
 #, c-format
 msgid "Failed to create or open '%s'"
 msgstr "Nie mo�na stworzy� lub otworzy� \"%s\""
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2520
 #, c-format
 msgid ""
 "Failed to lock '%s': probably another process has the lock, or your "
@@ -610,74 +610,74 @@ msgstr ""
 "Nie mo�na zablokowa� \"%s\": prawdopodobnie blokad� przetrzymuje inny proces "
 "lub w systemie zosta�o niepoprawnie skonfigurowane blokowanie po NFS-ie (%s)"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2548
 #, c-format
 msgid "IOR file '%s' not opened successfully, no gconfd located: %s"
 msgstr "nie uda�o si� otworzy� pliku \"%s\" z IOR, nie odnaleziono gconfd: %s"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2578
 #, c-format
 msgid "gconftool or other non-gconfd process has the lock file '%s'"
 msgstr ""
 "plik blokady \"%s\" jest przetrzymywany przez gconftol lub inny proces (nie "
 "gconfd)"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2595
 msgid "couldn't contact ORB to resolve existing gconfd object reference"
 msgstr "nie mo�na uzyska� od ORB-a odwo�ania do istniej�cego obiektu gconfd"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2627
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "Nie mo�na stworzy� katalogu \"%s\": %s"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2686
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Nie mo�na zapisa� do pliku \"%s\": %s"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2727
 #, c-format
 msgid "We didn't have the lock on file `%s', but we should have"
 msgstr "Program nie posiada blokady na plik \"%s\", cho� powinien"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2748
 #, c-format
 msgid "Failed to link '%s' to '%s': %s"
 msgstr "Nie mo�na dowi�za� \"%s\" do \"%s\": %s"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2760
 #, c-format
 msgid "Failed to remove lock file `%s': %s"
 msgstr "Nie mo�na usun�� pliku blokady \"%s\": %s"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2779
 #, c-format
 msgid "Failed to clean up file '%s': %s"
 msgstr "Nie mo�na wyczy�ci� pliku \"%s\": %s"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:2793
 #, c-format
 msgid "Failed to remove lock directory `%s': %s"
 msgstr "Nie mo�na usun�� katalogu blokady \"%s\": %s"
 
-#: gconf/gconf-internals.c:1 gconf/gconfd.c:1
+#: gconf/gconf-internals.c:3003 gconf/gconfd.c:580
 #, c-format
 msgid "Failed to create %s: %s"
 msgstr "Nie mo�na stworzy� %s: %s"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:3036
 #, c-format
 msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
 msgstr ""
 "Nie mo�na stworzy� potoku do komunikacji z uruchomionym demonem gconf: %s\n"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:3064
 #, c-format
 msgid "Failed to launch configuration server: %s\n"
 msgstr "Nie mo�na uruchomi� serwera konfiguracji: %s\n"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:3088
 msgid ""
 "Failed to contact configuration server (a likely cause of this is that you "
 "have an existing configuration server (gconfd) running, but it isn't "
@@ -689,68 +689,68 @@ msgstr ""
 "co mo�e si� zdarzy� przy zalogowaniu z dw�ch maszyn jednocze�nie - konieczne "
 "mo�e by� uaktywnienie obs�ugi TCP w serwerze ORBit.\n"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:3724
 #, c-format
 msgid "Failed to read from child pipe (%s)"
 msgstr "Nie mo�na odczyta� od potomka przez potok (%s)"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:3789
 #, c-format
 msgid "Failed to fork (%s)"
 msgstr "Nie mo�na stworzy� procesu (%s)"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:3929
 #, c-format
 msgid "Failed to change to directory '%s' (%s)"
 msgstr "Nie mo�na zmieni� katalogu na \"%s\" (%s)"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:3939
 #, c-format
 msgid "Failed to execute child process (%s)"
 msgstr "Nie mo�na wykona� programu w procesie potomnym (%s)"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:3948
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
 msgstr "Nie mo�na przekierowa� wyj�cia lub wej�cia procesu potomnego (%s)"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:3957
 #, c-format
 msgid "Failed to fork child process (%s)"
 msgstr "Nie mo�na stworzy� procesu potomnego (%s)"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:3965
 msgid "Unknown error executing child process"
 msgstr ""
 "Przy pr�bie wykonania programu w procesie potomnym wyst�pi� nieznany b��d"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:3986
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr ""
 "Nie mo�na odczyta� wystarczaj�co danych przez potok od procesu potomnego (%s)"
 
-#: gconf/gconf-internals.c:1
+#: gconf/gconf-internals.c:4036
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr "Nie mo�na stworzy� potoku do komunikacji z procesem potomnym (%s)"
 
-#: gconf/gconf-sources.c:1
+#: gconf/gconf-sources.c:320
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "Nie mo�na wczyta� �r�d�a \"%s\": %s"
 
-#: gconf/gconf-sources.c:1
+#: gconf/gconf-sources.c:544
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 "Schemat \"%s\" podany dla \"%s\" przechowuje warto�� nie nale��c� do schematu"
 
-#: gconf/gconf-sources.c:1
+#: gconf/gconf-sources.c:601
 msgid "The '/' name can only be a directory, not a key"
 msgstr "Nazwa \"/\" mo�e dotyczy� tylko katalogu, nie klucza"
 
-#: gconf/gconf-sources.c:1
+#: gconf/gconf-sources.c:630
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -759,7 +759,7 @@ msgstr ""
 "Warto�� \"%s\" jest ustawiona w �r�dle tylko od odczytu na pocz�tku �cie�ki "
 "konfiguracji."
 
-#: gconf/gconf-sources.c:1
+#: gconf/gconf-sources.c:642
 #, c-format
 msgid ""
 "Unable to store a value at key '%s', as the configuration server has no "
@@ -784,171 +784,171 @@ msgstr ""
 "zdalne po��czenia Corby. Aby pozna� szczeg�y na temat powsta�ego problemu, "
 "przejrzyj user.* w syslogu."
 
-#: gconf/gconf-sources.c:1
+#: gconf/gconf-sources.c:1198
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "B��d przy wyszukiwaniu metainformacji: %s"
 
-#: gconf/gconf-sources.c:1
+#: gconf/gconf-sources.c:1267
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "B��d przy pobieraniu metainformacji: %s"
 
-#: gconf/gconf-sources.c:1
+#: gconf/gconf-sources.c:1291
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
 "Klucz \"%s\" okre�liny jako schemat dla klucza \"%s\" przechowuje warto�� "
 "typu \"%s\""
 
-#: gconf/gconf-value.c:1
+#: gconf/gconf-value.c:81
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Niezrozumia�a warto�� \"%s\" (oczekiwano liczby ca�kowitej)"
 
-#: gconf/gconf-value.c:1
+#: gconf/gconf-value.c:91
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Warto�� ca�kowita \"%s\" jest zbyt du�a lub zbyt ma�a"
 
-#: gconf/gconf-value.c:1
+#: gconf/gconf-value.c:112
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Niezrozumia�a warto�� \"%s\" (oczekiwano liczby rzeczywistej)"
 
-#: gconf/gconf-value.c:1
+#: gconf/gconf-value.c:156
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Niezrozumia�a warto�� \"%s\" (oczekiwano warto�ci logicznej)"
 
-#: gconf/gconf-value.c:1
+#: gconf/gconf-value.c:232
 #, c-format
 msgid "Didn't understand `%s' (list must start with a '[')"
 msgstr ""
 "Niezrozumia�a warto�� \"%s\" (lista musi si� rozpoczyna� znakiem \"[\")"
 
-#: gconf/gconf-value.c:1
+#: gconf/gconf-value.c:245
 #, c-format
 msgid "Didn't understand `%s' (list must end with a ']')"
 msgstr "Niezrozumia�a warto�� \"%s\" (lista musi si� ko�czy� znakiem \"]\")"
 
-#: gconf/gconf-value.c:1
+#: gconf/gconf-value.c:296
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
 msgstr "Niezrozumia�a warto�� \"%s\" (dodatkowy znak \"%]\" wewn�trz listy)"
 
-#: gconf/gconf-value.c:1 gconf/gconf-value.c:1
+#: gconf/gconf-value.c:327 gconf/gconf-value.c:488
 #, c-format
 msgid "Didn't understand `%s' (extra trailing characters)"
 msgstr "Nie zrozumiano \"%s\" (dodatkowe znaki na ko�cu)"
 
-#: gconf/gconf-value.c:1
+#: gconf/gconf-value.c:374
 #, c-format
 msgid "Didn't understand `%s' (pair must start with a '(')"
 msgstr "Niezrozumia�a warto�� \"%s\" (para musi si� zaczyna� znakiem \"(\")"
 
-#: gconf/gconf-value.c:1
+#: gconf/gconf-value.c:387
 #, c-format
 msgid "Didn't understand `%s' (pair must end with a ')')"
 msgstr "Niezrozumia�a warto�� \"%s\" (para musi si� ko�czy� znakiem \")\")"
 
-#: gconf/gconf-value.c:1 gconf/gconf-value.c:1
+#: gconf/gconf-value.c:417 gconf/gconf-value.c:503
 #, c-format
 msgid "Didn't understand `%s' (wrong number of elements)"
 msgstr "Niezrozumia�a warto�� \"%s\" (niew�a�ciwa liczba element�)"
 
-#: gconf/gconf-value.c:1
+#: gconf/gconf-value.c:457
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr "Nie zrozumiano \"%s\" (dodatkowy \")\" wewn�trz pary)"
 
-#: gconf/gconf.c:1
+#: gconf/gconf.c:54
 #, c-format
 msgid "`%s': %s"
 msgstr "\"%s\": %s"
 
-#: gconf/gconf.c:1
+#: gconf/gconf.c:287
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "Serwer nie mo�e odnale�� adresu \"%s\""
 
-#: gconf/gconf.c:1
+#: gconf/gconf.c:572
 msgid "Can't add notifications to a local configuration source"
 msgstr "Nie mo�na doda� powiadomie� do lokalnego �r�d�a konfiguracji"
 
-#: gconf/gconf.c:1
+#: gconf/gconf.c:1868
 #, c-format
 msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr "Nie mo�na doda� klienta do listy na serwerze. B��d Corby: %s"
 
-#: gconf/gconf.c:1
+#: gconf/gconf.c:2183
 msgid "Failed to init GConf, exiting\n"
 msgstr "Nie mo�na zainicjowa� GConfa, zako�czenie\n"
 
-#: gconf/gconf.c:1
+#: gconf/gconf.c:2220
 msgid "Must begin with a slash (/)"
 msgstr "Musi si� rozpoczyna� uko�nikiem (/)"
 
-#: gconf/gconf.c:1
+#: gconf/gconf.c:2242
 msgid "Can't have two slashes (/) in a row"
 msgstr "Dwa uko�niki nie mog� wyst�powa� bezpo�rednio po sobie (/)"
 
-#: gconf/gconf.c:1
+#: gconf/gconf.c:2244
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "Kropka (.) nie mo�e by� umieszczona bezpo�rednio po uko�niku (/)"
 
-#: gconf/gconf.c:1
+#: gconf/gconf.c:2265
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "Znak \"%c\" jest niedozwolony w nazwach kluczy lub katalog�w"
 
-#: gconf/gconf.c:1
+#: gconf/gconf.c:2279
 msgid "Key/directory may not end with a slash (/)"
 msgstr "Klucz lub katalog nie mo�e ko�czy� si� uko�nikiem (/)"
 
-#: gconf/gconf.c:1
+#: gconf/gconf.c:2520
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "B��d przy ko�czeniu pracy serwera konfiguracji: %s"
 
-#: gconf/gconf.c:1
+#: gconf/gconf.c:2581
 #, c-format
 msgid "Expected float, got %s"
 msgstr "Oczekiwano liczby zmiennoprzecinkowej, otrzymano %s"
 
-#: gconf/gconf.c:1
+#: gconf/gconf.c:2616
 #, c-format
 msgid "Expected int, got %s"
 msgstr "Oczekiwano liczby ca�kowitej, otrzymano %s"
 
-#: gconf/gconf.c:1
+#: gconf/gconf.c:2651
 #, c-format
 msgid "Expected string, got %s"
 msgstr "Oczekiwano napisu, otrzymano %s"
 
-#: gconf/gconf.c:1
+#: gconf/gconf.c:2688
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "Oczekiwano warto�ci logicznej, otrzymano %s"
 
-#: gconf/gconf.c:1
+#: gconf/gconf.c:2721
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "Oczekiwano schematu, otrzymano %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:247
 msgid "Shutdown request received"
 msgstr "Otrzymano ��danie zako�czenia"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:279
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr ""
-"Demon gconfd zosta� skompilowany z obs�ug� debugowania; pr�ba odczytu "
-"gconf.path z katalogu �r�d�owego"
+"Demon gconfd zosta� skompilowany z obs�ug� debugowania; pr�ba odczytu gconf."
+"path z katalogu �r�d�owego"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:297
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -956,7 +956,7 @@ msgstr ""
 "Nie odnaleziono plik�w konfiguracyjnych; pr�ba u�ycia domy�lnego �r�d�a "
 "konfiguracji \"%s\""
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:306
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -964,16 +964,16 @@ msgstr ""
 "Brak �r�de� konfiguracji na �cie�ce �r�d�owej; konfiguracja nie zostanie "
 "zapisana. Zmodyfikuj plik "
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:306
 msgid "/path"
 msgstr "/�cie�ka"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:320
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "B��d przy wczytywaniu pewnych �r�de� konfiguracji: %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:332
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -981,7 +981,7 @@ msgstr ""
 "Nie uzyskano �adnego �r�d�a konfiguracji, nie mo�na wi�c odczyta� ani "
 "zapisa� danych konfiguracyjnych"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:349
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -989,12 +989,12 @@ msgstr ""
 "Nie uzyskano �adnego zapisywalnego �r�d�a konfiguracji, zapis zmian w "
 "konfiguracji mo�e wi�c nie by� mo�liwy"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:375
 #, c-format
 msgid "Received signal %d, dumping core. Please report a GConf bug."
 msgstr "Otrzymano sygna� %d, zapis pliku core. Zg�o� b��d GConfa."
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:391
 #, c-format
 msgid ""
 "Received signal %d, shutting down abnormally. Please file a GConf bug report."
@@ -1002,53 +1002,53 @@ msgstr ""
 "Otrzymano sygna� %d, przeprowadzono awaryjne zako�czenie. Powiadom o b��dzie "
 "o GConfie."
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:408
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
 msgstr "Otrzymano sygna� %d, poprawne zako�czenie"
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:526
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "uruchamianie (wersja %s), pid %u, u�ytkownik \"%s\""
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:567
 msgid "Failed to get object reference for ConfigServer"
 msgstr "Nie mo�na uzyska� referencji obiektu ConfigServer"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:605
 #, c-format
 msgid "Failed to write byte to pipe fd %d so client program may hang: %s"
 msgstr ""
 "Nie mo�na zapisa� bajtu do potoku poprzez deskryptor %d, co mo�e zawiesi� "
 "klienta: %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:615
 #, c-format
 msgid "Failed to get lock for daemon, exiting: %s"
 msgstr "Nie mo�na uzyska� blokady od demona, zako�czenie: %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:657
 #, c-format
 msgid "Error releasing lockfile: %s"
 msgstr "B��d przy zwalnianiu pliku blokady: %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:665
 msgid "Exiting"
 msgstr "Zako�czenie"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:690
 msgid "GConf server is not in use, shutting down."
 msgstr "Serwer GConf nie jest u�ywany, zako�czenie."
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:1059
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Zwracanie wyj�tku: %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:1159
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -1057,7 +1057,7 @@ msgstr ""
 "Nie mo�na otworzy� pliku dziennika gconfd; po zako�zceniu gconfd nie b�dzie "
 "mo�liwe przywr�cenie nas�uchiwaczy (%s)"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:1194
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
@@ -1065,40 +1065,40 @@ msgstr ""
 "Nie mo�na zamkn�� pliku dziennika gconfd, dane mog�y nie zosta� poprawnie "
 "zapisane (%s)"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:1263
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "Nie mo�na otworzy� pliku \"%s\" z zapisem stanu do zapisu: %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:1277
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "Nie mo�na zapisa� do pliku \"%s\" (fd: %d) z zapisem stanu: %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:1286
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Nie mo�na zamkn�� nowego pliku \"%s\" z zapisem stanu: %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:1300
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "Nie mo�na przenie�� starego pliku \"%s\" z sapisem stanu: %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:1310
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "Nie mo�na przenie�� nowego pliku z sapisem stanu: %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:1319
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
-"Nie mo�na przywr�ci� oryginalnego pliku z zapisem stanu przeniesionego do "
-"\"%s\": %s"
+"Nie mo�na przywr�ci� oryginalnego pliku z zapisem stanu przeniesionego do \"%"
+"s\": %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:1794
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
@@ -1106,111 +1106,111 @@ msgstr ""
 "Nie mo�na przywr�ci� nas�uchiwacza spod adresu \"%s\" - nie mo�na odnale�� "
 "bazy danych"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:1840
 #, c-format
 msgid "Error reading saved state file: %s"
 msgstr "B��d przy odczycie pliku z zapisem stanu: %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:1893
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "Nie mo�na otworzy� pliku \"%s\" z zapisem stanu: %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:2010
 #, c-format
 msgid ""
-"Failed to log addition of listener to gconfd logfile; won't be able to "
-"re-add the listener if gconfd exits or shuts down (%s)"
+"Failed to log addition of listener to gconfd logfile; won't be able to re-"
+"add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 "Nie mo�na zapisa� dodania nas�uchiwacza w pliku dziennika gconfd; po "
 "zako�zceniu gconfd nie b�dzie mo�liwe jego ponowne dodanie (%s)"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:2015
 #, c-format
 msgid ""
-"Failed to log removal of listener to gconfd logfile; might erroneously "
-"re-add the listener if gconfd exits or shuts down (%s)"
+"Failed to log removal of listener to gconfd logfile; might erroneously re-"
+"add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 "Nie mo�na zapisa� usuni�cia nas�uchiwacza w pliku dziennika gconfd; po "
 "zako�czeniu gconfd mo�e to spowodowa� b��dne ponowne jego dodanie (%s)"
 
-#: gconf/gconfd.c:1 gconf/gconfd.c:1
+#: gconf/gconfd.c:2038 gconf/gconfd.c:2203
 #, c-format
 msgid "Failed to get IOR for client: %s"
 msgstr "Nie mo�na pobra� warto�ci IOR dla klienta: %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:2053
 #, c-format
 msgid "Failed to open saved state file: %s"
 msgstr "Odczytanie zapisanego stanu z pliku nie powiod�o si�: %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:2066
 #, c-format
 msgid "Failed to write client add to saved state file: %s"
 msgstr "Nie mo�na zapisa� dodania klienta w pliku z zapisem stanu: %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:2074
 #, c-format
 msgid "Failed to flush client add to saved state file: %s"
 msgstr "Nie mo�na zrzuci� dodania klienta do pliku z zapisem stanu: %s"
 
-#: gconf/gconfd.c:1
+#: gconf/gconfd.c:2164
 msgid ""
 "Some client removed itself from the GConf server when it hadn't been added."
 msgstr "Klient, kt�ry nie by� dodany, usun�� si� z serwera."
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:68
 msgid "Help options"
 msgstr "Opcje pomocy"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:77
 msgid "Set a key to a value and sync. Use with --type."
 msgstr "Ustawia klucz na warto�� i synchronizuje. U�ywane z --type."
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:86
 msgid "Print the value of a key to standard output."
 msgstr "Wypisuje na standardowe wyj�cie warto�� klucza."
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:95
 msgid ""
-"Set a schema and sync. Use with --short-desc, --long-desc, --owner, and "
-"--type."
+"Set a schema and sync. Use with --short-desc, --long-desc, --owner, and --"
+"type."
 msgstr ""
-"Ustawia schemat i synchronizuje. U�ywane z --short-desc, --long-desc, "
-"--owner oraz --type."
+"Ustawia schemat i synchronizuje. U�ywane z --short-desc, --long-desc, --"
+"owner oraz --type."
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:105
 msgid "Unset the keys on the command line"
 msgstr "Czy�ci klucze z wiersza polece�"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:114
 msgid "Print all key/value pairs in a directory."
 msgstr "Wypisuje wszystkie pary klucz/warto�� z katalogu"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:123
 msgid "Print all subdirectories in a directory."
 msgstr "Wypisuje wszystkie podkatalogi danego katalogu."
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:132
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr ""
 "Wypisuje rekurencyjnie wszystkie podkatalogi i elementy spod podanego "
 "katalogu."
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:141
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "Zwraca 0, je�li katalog istnieje, 2 - w przeciwnym wypadku"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:150
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr ""
 "Ko�czy dzia�anie gconfd. NIE U�YWAJ TEJ OPCJI BEZ NAPRAWD� WA�NEGO POWODU."
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:159
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "Zwraca 0, je�li gconf jest aktywny, 2 - w przeciwnym wypadku"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:168
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -1218,7 +1218,7 @@ msgstr ""
 "Uruchamia serwer konfiguracji (gconfd). (Normalnie uruchamiany jest on "
 "automatycznie w razie potrzeby.)"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:177
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -1226,11 +1226,11 @@ msgstr ""
 "Okre�la typ ustawianej warto�ci lub warto�ci opisywanej przez schemat. "
 "Dopuszczalne s� jednoznaczne skr�ty."
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:178
 msgid "int|bool|float|string|list|pair"
 msgstr "int|bool|float|string|list|pair"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:186
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1238,11 +1238,11 @@ msgstr ""
 "Okre�la typ elementu ustawianej warto�ci listy lub warto�ci opisywanej przez "
 "schemat. Dopuszczalne s� jednoznaczne skr�ty."
 
-#: gconf/gconftool.c:1 gconf/gconftool.c:1 gconf/gconftool.c:1
+#: gconf/gconftool.c:187 gconf/gconftool.c:196 gconf/gconftool.c:205
 msgid "int|bool|float|string"
 msgstr "int|bool|float|string"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:195
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1250,7 +1250,7 @@ msgstr ""
 "Okre�la typ pierwszego elementu ustawianej warto�ci pary lub warto�ci "
 "opisywanej przez schemat. Dopuszczalne s� jednoznaczne skr�ty."
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:204
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1258,43 +1258,43 @@ msgstr ""
 "Okre�la typ drugiego elementu ustawianej warto�ci pary lub warto�ci "
 "opisywanej przez schemat. Dopuszczalne s� jednoznaczne skr�ty."
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:213
 msgid "Specify a short half-line description to go in a schema."
 msgstr "Okre�la kr�tki, kilkudziesi�cioznakowy opis, umieszczany w schemacie."
 
-#: gconf/gconftool.c:1 gconf/gconftool.c:1
+#: gconf/gconftool.c:214 gconf/gconftool.c:223
 msgid "DESCRIPTION"
 msgstr "OPIS"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:222
 msgid "Specify a several-line description to go in a schema."
 msgstr "Okre�la wielowierszowy opis schematu."
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:231
 msgid "Specify the owner of a schema"
 msgstr "Okre�la w�a�ciciela schematu"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:232
 msgid "OWNER"
 msgstr "W�A�CICIEL"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:240
 msgid "Specify a schema file to be installed"
 msgstr "Okre�la nazw� pliku instalowanego schematu"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:241
 msgid "FILENAME"
 msgstr "NAZWAPLIKU"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:249
 msgid "Specify a configuration source to use rather than the default path"
 msgstr "Okre�la �r�d�o konfiguracji wykorzystywane zamiast domy�lnej �cie�ki"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:250
 msgid "SOURCE"
 msgstr "�R�D�O"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:258
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1302,7 +1302,7 @@ msgstr ""
 "Powoduje bezpo�rednie odwo�ywanie si� do bazy danych konfiguracji, z "
 "pomini�ciem serwera. Opcja wymaga, aby nie by� uruchomiony gconfd."
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:267
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1312,7 +1312,7 @@ msgstr ""
 "�r�d�a konfiguracji innego, ni� domy�lne, powinna na nie wskazywa� zmienna "
 "�rodowiskowa GCONF_CONFIG_SOURCE, pusta warto�� oznacza domy�lne �r�d�o."
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:276
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1320,7 +1320,7 @@ msgstr ""
 "Przeprowadza intensywny test aplikacji, ustawiaj�c i czyszcz�c mn�stwo "
 "warto�ci r�nych typ�w dla kluczy podanych w wierszu polece�."
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:285
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1329,29 +1329,29 @@ msgstr ""
 "warto�ci r�nych typ�w dla kluczy wewn�trz katalog�w, podanych w wierszu "
 "polece�."
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:294
 msgid "Get the short doc string for a key"
 msgstr "Pobiera kr�tki napis dokumentuj�cy powi�zany z kluczem"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:303
 msgid "Get the long doc string for a key"
 msgstr "Pobiera d�ugi napis dokumentuj�cy powi�zany z kluczem"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:312
 msgid "Get the name of the schema applied to this key"
 msgstr "Pobiera nazw� schematu zastosowanego do tego klucza"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:321
 msgid "Specify the schema name followed by the key to apply the schema name to"
 msgstr ""
 "Okre�la nazw� schematu z wyst�puj�c� po nim nazw� klucza, do kt�rego "
 "powinien by� wykorzystany"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:330
 msgid "Get the name of the default source"
 msgstr "Pobiera nazw� domy�lnego �r�d�a"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:382
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -1361,357 +1361,357 @@ msgstr ""
 "Uruchom \"%s --help\", aby wypisa� pe�n� list� opcji dost�pnych z wiersza "
 "polece�.\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:394
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "Nie mo�na jednocze�nie pobra� i ustawi� warto�ci\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:401
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "Nie mo�na jednocze�nie ustawi� i pobra� warto�ci\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:409
 msgid "Can't use --all-entries with --get or --set\n"
 msgstr "Nie mo�na u�ywa� --all-entries wraz z --get lub --set\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:417
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "Nie mo�na u�ywa� --all-pairs wraz z --get lub --set\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:427
 msgid ""
-"--recursive-list should not be used with --get, --set, --unset, "
-"--all-entries, or --all-dirs\n"
+"--recursive-list should not be used with --get, --set, --unset, --all-"
+"entries, or --all-dirs\n"
 msgstr ""
-"--recursive-list nie powinno by� u�ywane wraz z --get, --set, --unset, "
-"--all-entries lub --all-dirs\n"
+"--recursive-list nie powinno by� u�ywane wraz z --get, --set, --unset, --all-"
+"entries lub --all-dirs\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:437
 msgid ""
-"--set_schema should not be used with --get, --set, --unset, --all-entries, "
-"--all-dirs\n"
+"--set_schema should not be used with --get, --set, --unset, --all-entries, --"
+"all-dirs\n"
 msgstr ""
-"--set_schema nie powinno by� u�ywane wraz z --get, --set, --unset, "
-"--all-entries, --all-dirs\n"
+"--set_schema nie powinno by� u�ywane wraz z --get, --set, --unset, --all-"
+"entries, --all-dirs\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:443
 msgid "Value type is only relevant when setting a value\n"
 msgstr "Typ warto�ci ma sens tylko przy ustawianiu warto�ci\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:449
 msgid "Must specify a type when setting a value\n"
 msgstr "Przy ustawianiu warto�ci nale�y okre�li� typ\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:459
 msgid "Ping option must be used by itself.\n"
 msgstr "Opcja ping musi wyst�powa� samodzielnie.\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:469
 msgid "--dir-exists option must be used by itself.\n"
 msgstr "Opcja --dir-exists musi wyst�powa� samodzielnie.\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:479
 msgid "--install-schema-file must be used by itself.\n"
 msgstr "Opcja --install-schema-file musi wyst�powa� samodzielnie.\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:490
 msgid "--makefile-install-rule must be used by itself.\n"
 msgstr "Opcja --makefile-install-rule musi wyst�powa� samodzielnie.\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:501
 msgid "--break-key must be used by itself.\n"
 msgstr "Opcja --break-key musi wyst�powa� samodzielnie.\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:512
 msgid "--break-directory must be used by itself.\n"
 msgstr "Opcja --break-directory musi wyst�powa� samodzielnie.\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:519
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
-"Przy u�yciu --direct nale�y poda� �r�d�o konfiguracji przy u�yciu "
-"--config-source\n"
+"Przy u�yciu --direct nale�y poda� �r�d�o konfiguracji przy u�yciu --config-"
+"source\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:525
 msgid "You should use --direct when using a non-default configuration source\n"
 msgstr ""
-"Przy korzystaniu z �r�d�a konfiguracji innego ni� domy�lne nale�y u�y� "
-"--direct\n"
+"Przy korzystaniu z �r�d�a konfiguracji innego ni� domy�lne nale�y u�y� --"
+"direct\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:531
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "Inicjacja GConfa nie powiod�a si�: %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:566
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "Nale�y ustawi� zmienn� �rodowiskow� GCONF_CONFIG_SOURCE\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:595
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "B��d przy dost�pie do �r�d�a konfiguracji: %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:796
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "B��d przy zamykaniu: %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:839
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 "Nale�y poda� jeden lub wi�cej katalog�w przeznaczonych do rekurencyjnego "
 "wypisania.\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:873
 #, c-format
 msgid "Failure listing entries in `%s': %s\n"
 msgstr "B��d przy wypisywaniu element�w spod \"%s\": %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:891
 msgid "(no value set)"
 msgstr "(nie ustawiono warto�ci)"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:946
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Uruchomienie serwera konfiguracji (gconfd) nie powiod�o si�: %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:960
 msgid "Must specify a key or keys to get\n"
 msgstr "Nale�y poda� klucz lub klucze przeznaczone do pobrania\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:995
 #, c-format
 msgid "Type: %s\n"
 msgstr "Typ: %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:996
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Typ listy: %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:997
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Typ pierwszego elementu: %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:998
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Typ drugiego elementu: %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1003
 #, c-format
 msgid "Default Value: %s\n"
 msgstr "Warto�� domy�lna: %s\n"
 
-#: gconf/gconftool.c:1 gconf/gconftool.c:1 gconf/gconftool.c:1
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1003 gconf/gconftool.c:1005 gconf/gconftool.c:1006
+#: gconf/gconftool.c:1007
 msgid "Unset"
 msgstr "Brak warto�ci"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1005
 #, c-format
 msgid "Owner: %s\n"
 msgstr "W�a�ciciel: %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1006
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Kr�tki opis: %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1007
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "D�ugi opis: %s\n"
 
-#: gconf/gconftool.c:1 gconf/gconftool.c:1
+#: gconf/gconftool.c:1016 gconf/gconftool.c:1310
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Nie ustawiono warto�ci dla \"%s\"\n"
 
-#: gconf/gconftool.c:1 gconf/gconftool.c:1
+#: gconf/gconftool.c:1020 gconf/gconftool.c:1314
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Nie mo�na pobra� warto�ci \"%s\": %s\n"
 
-#: gconf/gconftool.c:1 gconf/gconftool.c:1
+#: gconf/gconftool.c:1063 gconf/gconftool.c:1075
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "Niezrozumia�y typ \"%s\"\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1087
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Jako argumenty nale�y poda� alternatywne klucze/warto�ci\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1107
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Nie ustawiono warto�ci dla klucza: \"%s\"\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1135
 msgid "Cannot set schema as value\n"
 msgstr "Nie mo�na ustawi� schematu jako warto�ci\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1145
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr "Przy ustawianiu listy nale�y poda� typ podstawowy list-type\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1159
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 "Przy ustawianiu pary nale�y poda� typy podstawowe car-type i cdr-type\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1174
 #, c-format
 msgid "Error: %s\n"
 msgstr "B��d: %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1187
 #, c-format
 msgid "Error setting value: %s\n"
 msgstr "B��d przy ustawianiu warto�ci: %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1205
 #, c-format
 msgid "Error syncing: %s\n"
 msgstr "B��d przy synchronizacji: %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1228
 msgid "Must specify a key or keys on the command line\n"
 msgstr "Nale�y poda� w wierszy polece� klucz lub klucze\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1248
 #, c-format
 msgid "No schema known for `%s'\n"
 msgstr "Brak znanego schematu dla \"%s\"\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1281
 #, c-format
 msgid "No doc string stored in schema at '%s'\n"
 msgstr "W schemacie pod \"%s\" nie zapisano dokumentacji\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1286
 #, c-format
 msgid "Error getting schema at '%s': %s\n"
 msgstr "B��d przy pobieraniu schematu spod \"%s\": %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1293
 #, c-format
 msgid "No schema stored at '%s'\n"
 msgstr "Brak schematu zapisanego pod \"%s\"\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1296
 #, c-format
 msgid "Value at '%s' is not a schema\n"
 msgstr "Warto�� pod \"%s\" nie jest schematem\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1352
 msgid "Must specify a schema name followed by the key name to apply it to\n"
 msgstr ""
 "Nale�y poda� nazw� schematu i wyst�puj�c� po nim nazw� klucza, do kt�rego "
 "powinien by� wykorzystany\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1359
 #, c-format
 msgid "Error associating schema name '%s' with key name '%s': %s\n"
 msgstr "B��d przy wi�zaniu schematu \"%s\" z kluczem \"%s\": %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1379
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "Nale�y poda� klucz (nazw� schematu) jako jedyny argument\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1421
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr "Typ listy musi by� typem podstawowym: string, int, float lub bool\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1441
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Typ pierwszego elementu pary musi by� typem podstawowym: string, int, float "
 "lub bool\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1461
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Typ drugiego elementu pary musi by� typem podstawowym: string, int, float "
 "lub bool\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1476
 #, c-format
 msgid "Error setting value: %s"
 msgstr "B��d przy ustawianiu warto�ci: %s"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1490
 #, c-format
 msgid "Error syncing: %s"
 msgstr "B��d przy synchronizacji: %s"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1505
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "Nale�y poda� co najmniej jeden katalog, z kt�rego powinny by� pobrane pary "
 "klucz/warto��.\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1519
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Nale�y poda� co najmniej jeden klucz przeznaczony do wyczyszczenia.\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1530
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "B��d przy czyszczeniu \"%s\": %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1553
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "Nale�y poda� co najmniej jeden katalog, z kt�rego powinny by� pobrane "
 "podkatalogi.\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1587
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "B��d przy wypisywaniu katalog�w: %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1629
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "UWAGA: Niepoprawny lub brakuj�cy typ schematu (%s)\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1638
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "UWAGA: Niepoprawna lub brakuj�ca warto�� list_type schematu (%s)\n"
 
-#: gconf/gconftool.c:1 gconf/gconftool.c:1 gconf/gconftool.c:1
+#: gconf/gconftool.c:1649 gconf/gconftool.c:1679 gconf/gconftool.c:1708
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr "UWAGA: Niezrozumia�a warto�� \"%s\" schematu (%s)\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1667
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
-"UWAGA: Niepoprawna lub brakuj�ca warto�� car_type lub cdr_type schematu "
-"(%s)\n"
+"UWAGA: Niepoprawna lub brakuj�ca warto�� car_type lub cdr_type schematu (%"
+"s)\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1692
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "UWAGA: Nie mo�na ustawi� domy�lnej warto�ci schematu\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1721
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "UWAGA: wewn�trzny b��d gconftoola, nieznany GConfValueType\n"
 
-#: gconf/gconftool.c:1 gconf/gconftool.c:1 gconf/gconftool.c:1
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1768 gconf/gconftool.c:1789 gconf/gconftool.c:1810
+#: gconf/gconftool.c:1831
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "UWAGA: Nie mo�na rozpozna� nazwy typu \"%s\"\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1785
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
@@ -1719,39 +1719,39 @@ msgstr ""
 "UWAGA: Warto�ci� list_type mo�e by� tylko int, float, string lub bool, nie "
 "za� \"%s\"\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1806
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "UWAGA: Warto�ci� car_type mo�e by� tylko int, float, string lub bool, nie "
 "za� \"%s\"\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1827
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "UWAGA: Warto�ci� cdr_type mo�e by� tylko int, float, string lub bool, nie "
 "za� \"%s\"\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1855
 msgid "WARNING: empty <applyto> node"
 msgstr "UWAGA: Pusty w�ze� <applyto>"
 
-#: gconf/gconftool.c:1 gconf/gconftool.c:1
+#: gconf/gconftool.c:1858 gconf/gconftool.c:2121
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "UWAGA: W�ze� <%s> nie jest zrozumia�y wewn�trz <schema>\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1868
 msgid "WARNING: no key specified for schema\n"
 msgstr "UWAGA: nie okre�lono klucza dla schematu\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1901
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "UWAGA: W�ze� <locale> nie zawiera atrybutu name=\"locale\", zignorowano\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1907
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1759,54 +1759,54 @@ msgstr ""
 "UWAGA: Wiele w�z��w <locale> z warto�ci� \"%s\", Zignorowano wszystkie, poza "
 "pierwszym.\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:1988
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "UWAGA: Niepoprawny w�ze� <%s> wewn�trz w�z�a <locale>\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2017
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 "UWAGA: zainstalowanie schematu \"%s\" dla ustawie� narodowych \"%s\" nie "
 "powiod�o si�: %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2025
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Zainstalowano schemat \"%s\" dla ustawie� narodowych \"%s\"\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2047
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 "UWAGA: powi�zanie schematu \"%s\" z kluczem \"%s\" nie powiod�o si�: %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2055
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Schemat \"%s\" zosta� przy��czony do klucza \"%s\"\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2134
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "Wewn�trz <schema> musi wyst�powa� co najmniej jedno <locale>\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2165
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "UWAGA: niezrozumia�y w�ze� <%s> poni�ej w�z�a <schemalist>\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2188
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Nie mo�na otworzy� \"%s\": %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2195
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Dokument \"%s\" jest pusty?\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2207
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1815,26 +1815,26 @@ msgstr ""
 "Dokument \"%s\" zawiera nieprawid�owy w�ze� g��wny (<%s>, powinno by� "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2220
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "G��wnym w�z�em dokumentu \"%s\" nie jest gconfschemafile\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2234
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "UWAGA: niezrozumia�y w�ze� <%s> poni�ej w�z�a <gconfschemafile>\n"
 
-#: gconf/gconftool.c:1 gconf/gconftool.c:1
+#: gconf/gconftool.c:2245 gconf/gconftool.c:2277
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "B��d przy synchronizacji danych konfiguracji: %s"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2261
 msgid "Must specify some schema files to install\n"
 msgstr "Nale�y poda� jakie� pliki schemat�w do zainstalowania\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2298
 #, c-format
 msgid ""
 "\n"
@@ -1843,16 +1843,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2318
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Nie mo�na wyczy�ci� klucza %s: %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2444
 msgid "Must specify some keys to break\n"
 msgstr "Nale�y poda� klucze przeznaczone do uszkodzenia\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2450
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1862,11 +1862,11 @@ msgstr ""
 "klucza:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2468
 msgid "Must specify some directories to break\n"
 msgstr "Nale�y poda� katalogi przeznaczone do uszkodzenia\n"
 
-#: gconf/gconftool.c:1
+#: gconf/gconftool.c:2487
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1877,17 +1877,17 @@ msgstr ""
 "kluczy w katalogu:\n"
 "  %s\n"
 
-#: wrappers/gtk/gconf-client.c:1 wrappers/gtk/gconf-client.c:1
+#: wrappers/gtk/gconf-client.c:287 wrappers/gtk/gconf-client.c:304
 #, c-format
 msgid "GConf Error: %s\n"
 msgstr "B��d GConfa: %s\n"
 
-#: wrappers/gtk/gconf-client.c:1
+#: wrappers/gtk/gconf-client.c:795
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "Ostrze�enie GConfa: b��d przy wypisywaniu par w \"%s\": %s"
 
-#: wrappers/gtk/gconf-client.c:1
+#: wrappers/gtk/gconf-client.c:997
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "Oczekiwano \"%s\", otrzymano \"%s\" dla klucza %s"
diff --git a/po/pt.po b/po/pt.po
index c3eef2e9..bec7d385 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.4.1\n"
-"POT-Creation-Date: 2001-12-07 00:31+0000\n"
+"POT-Creation-Date: 2002-02-04 18:21-0500\n"
 "PO-Revision-Date: 2001-12-07 00:32+0000\n"
 "Last-Translator: Duarte Loreto <happyguy_pt@hotmail.com>\n"
 "Language-Team: Portuguese <none@none.org>\n"
@@ -31,7 +31,7 @@ msgstr "A inicializar m�dulo de suporte BDB"
 msgid "Couldn't find the %s root directory in the address `%s'"
 msgstr "Direct�rio ra�z %s n�o encontrado no endere�o `%s'"
 
-#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1053
+#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1050
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Imposs�vel criar direct�rio `%s': %s"
@@ -134,34 +134,34 @@ msgid "Failed to delete old file `%s': %s"
 msgstr "Falha ao apagar ficheiro antigo `%s': %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:806
+#: backends/xml-dir.c:803
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Falha no estado `%s': %s"
 
-#: backends/xml-dir.c:950
+#: backends/xml-dir.c:947
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Entrada duplicada `%s' em `%s', a ignorar"
 
-#: backends/xml-dir.c:972
+#: backends/xml-dir.c:969
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "Entrada sem nome no ficheiro XML `%s', a ignorar"
 
-#: backends/xml-dir.c:980
+#: backends/xml-dir.c:977
 #, c-format
 msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
 msgstr ""
 "Um n� de n�vel superior no ficheiro XML `%s' � <%s> em vez de <entry>, a "
 "ignorar"
 
-#: backends/xml-dir.c:1069
+#: backends/xml-dir.c:1066
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Falha ao criar ficheiro `%s': %s"
 
-#: backends/xml-dir.c:1077
+#: backends/xml-dir.c:1074
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Falha ao fechar ficheiro `%s': %s"
@@ -343,7 +343,7 @@ msgstr ""
 "Falha ao registar no ficheiro log remo��o do listener (inofensivo, poder� "
 "resultar em a notifica��o surgir novamente): %s"
 
-#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1328
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Erro ao obter (get) valor para `%s': %s"
@@ -602,8 +602,9 @@ msgid ""
 "Failed to lock '%s': probably another process has the lock, or your "
 "operating system has NFS file locking misconfigured (%s)"
 msgstr ""
-"Falha ao obter exclusividade de '%s': provavelmente outro processo tem a exclusividade "
-"ou o seu sistema operativo tem a exclusividade de ficheiro NFS mal configurada (%s)"
+"Falha ao obter exclusividade de '%s': provavelmente outro processo tem a "
+"exclusividade ou o seu sistema operativo tem a exclusividade de ficheiro NFS "
+"mal configurada (%s)"
 
 #: gconf/gconf-internals.c:2548
 #, c-format
@@ -667,12 +668,12 @@ msgstr "Falha ao criar %s: %s"
 msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
 msgstr "Falha ao criar canal (pipe) para comunicar com deamon gconf: %s\n"
 
-#: gconf/gconf-internals.c:3060
+#: gconf/gconf-internals.c:3064
 #, c-format
 msgid "Failed to launch configuration server: %s\n"
 msgstr "Falha ao lan�ar servidor de configura��o: %s\n"
 
-#: gconf/gconf-internals.c:3084
+#: gconf/gconf-internals.c:3088
 msgid ""
 "Failed to contact configuration server (a likely cause of this is that you "
 "have an existing configuration server (gconfd) running, but it isn't "
@@ -684,46 +685,46 @@ msgstr ""
 "alcan�avel daqui - se estiver ligado a duas m�quinas simultaneamente, poder� "
 "ter de activar redes TCP para o ORBit)\n"
 
-#: gconf/gconf-internals.c:3720
+#: gconf/gconf-internals.c:3724
 #, c-format
 msgid "Failed to read from child pipe (%s)"
 msgstr "Falha na leitura de canal (pipe) filho (%s)"
 
-#: gconf/gconf-internals.c:3785
+#: gconf/gconf-internals.c:3789
 #, c-format
 msgid "Failed to fork (%s)"
 msgstr "Falha no fork (%s)"
 
-#: gconf/gconf-internals.c:3925
+#: gconf/gconf-internals.c:3929
 #, c-format
 msgid "Failed to change to directory '%s' (%s)"
 msgstr "Falha ao mudar para direct�rio '%s' (%s)"
 
-#: gconf/gconf-internals.c:3935
+#: gconf/gconf-internals.c:3939
 #, c-format
 msgid "Failed to execute child process (%s)"
 msgstr "Falha ao executar processo filho (%s)"
 
-#: gconf/gconf-internals.c:3944
+#: gconf/gconf-internals.c:3948
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
 msgstr "Falha ao redireccionar sa�da ou entrada de processo filho (%s)"
 
-#: gconf/gconf-internals.c:3953
+#: gconf/gconf-internals.c:3957
 #, c-format
 msgid "Failed to fork child process (%s)"
 msgstr "Falha no fork de processo filho (%s)"
 
-#: gconf/gconf-internals.c:3961
+#: gconf/gconf-internals.c:3965
 msgid "Unknown error executing child process"
 msgstr "Erro desconhecido ao executar processo filho"
 
-#: gconf/gconf-internals.c:3982
+#: gconf/gconf-internals.c:3986
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr "Insuficiencia de dados lidos de canal (pipe) pid do filho (%s)"
 
-#: gconf/gconf-internals.c:4032
+#: gconf/gconf-internals.c:4036
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr "Falha ao criar canal (pipe) para comunicar com processo filho (%s)"
@@ -733,16 +734,16 @@ msgstr "Falha ao criar canal (pipe) para comunicar com processo filho (%s)"
 msgid "Failed to load source `%s': %s"
 msgstr "Falha ao carregar fonte `%s': %s"
 
-#: gconf/gconf-sources.c:510
+#: gconf/gconf-sources.c:544
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr "Esquema `%s' especificado para `%s' armazena um valor n�o-esquema"
 
-#: gconf/gconf-sources.c:567
+#: gconf/gconf-sources.c:601
 msgid "The '/' name can only be a directory, not a key"
 msgstr "O nome '/' apenas pode ser um direct�rio, n�o uma chave"
 
-#: gconf/gconf-sources.c:596
+#: gconf/gconf-sources.c:630
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -751,7 +752,7 @@ msgstr ""
 "Valor para `%s' definido numa fonte apenas de leitura no in�cio do seu "
 "cominho de configura��o."
 
-#: gconf/gconf-sources.c:608
+#: gconf/gconf-sources.c:642
 #, c-format
 msgid ""
 "Unable to store a value at key '%s', as the configuration server has no "
@@ -776,17 +777,17 @@ msgstr ""
 "que impede liga��es CORBA remotas? Como sempre, verifique o user.* syslog "
 "fopara detalhes sobre o problema encontrado pelo gconfd."
 
-#: gconf/gconf-sources.c:1164
+#: gconf/gconf-sources.c:1198
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Erro ao procurar metainfo: %s"
 
-#: gconf/gconf-sources.c:1233
+#: gconf/gconf-sources.c:1267
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Erro ao obter metainfo: %s"
 
-#: gconf/gconf-sources.c:1257
+#: gconf/gconf-sources.c:1291
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -1429,7 +1430,8 @@ msgstr ""
 
 #: gconf/gconftool.c:525
 msgid "You should use --direct when using a non-default configuration source\n"
-msgstr "Deve utilizar --direct quando utiliza uma fonte de configura��o n�o-defeito\n"
+msgstr ""
+"Deve utilizar --direct quando utiliza uma fonte de configura��o n�o-defeito\n"
 
 #: gconf/gconftool.c:531
 #, c-format
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f78b4977..9ab10208 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf 1.0.7\n"
-"POT-Creation-Date: 2001-11-08 22:20-0200\n"
+"POT-Creation-Date: 2002-02-04 18:21-0500\n"
 "PO-Revision-Date: 2001-11-08 22:22-0200\n"
 "Last-Translator: Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -32,7 +32,7 @@ msgstr "Iniciando m�dulo BDB"
 msgid "Couldn't find the %s root directory in the address `%s'"
 msgstr "N�o foi poss�vel encontrar o diret�rio raiz %s no endere�o `%s'"
 
-#: backends/dir-utils.c:124 backends/xml-backend.c:301 backends/xml-dir.c:1053
+#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1050
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "N�o foi poss�vel criar diret�rio `%s': %s"
@@ -46,27 +46,27 @@ msgstr "N�o � poss�vel ler ou escrever no diret�rio raiz %s no endere�o `%s'"
 msgid "Unloading XML backend module."
 msgstr "Descarregando m�dulo XML"
 
-#: backends/xml-backend.c:286
+#: backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "N�o foi poss�vel encontrar o diret�rio raiz XML no endere�o `%s'"
 
-#: backends/xml-backend.c:386
+#: backends/xml-backend.c:414
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
 msgstr "N�o � poss�vel ler ou escrever no diret�rio raiz XML no endere�o `%s'"
 
-#: backends/xml-backend.c:396
+#: backends/xml-backend.c:424
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
 "As permiss�es de diret�rio/arquivo para a fonte XML com raiz %s s�o: %o/%o"
 
-#: backends/xml-backend.c:680
+#: backends/xml-backend.c:708
 msgid "Initializing XML backend module"
 msgstr "Iniciando m�dulo XML"
 
-#: backends/xml-backend.c:745
+#: backends/xml-backend.c:773
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "Falha ao liberar bloqueio no diret�rio XML `%s': %s"
@@ -134,33 +134,33 @@ msgid "Failed to delete old file `%s': %s"
 msgstr "Falha ao excluir arquivo antigo `%s': %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:806
+#: backends/xml-dir.c:803
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Falha ao obter status `%s': %s"
 
-#: backends/xml-dir.c:950
+#: backends/xml-dir.c:947
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Entrada duplicada `%s' em `%s', ignorando"
 
-#: backends/xml-dir.c:972
+#: backends/xml-dir.c:969
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "Entrada sem nome no arquivo XML `%s', ignorando"
 
-#: backends/xml-dir.c:980
+#: backends/xml-dir.c:977
 #, c-format
 msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
 msgstr ""
 "Um n� de n�vel principal no arquivo XML `%s' � <%s> e n�o <entry>, ignorando"
 
-#: backends/xml-dir.c:1069
+#: backends/xml-dir.c:1066
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Falha ao criar arquivo `%s': %s"
 
-#: backends/xml-dir.c:1077
+#: backends/xml-dir.c:1074
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Falha ao fechar arquivo `%s': %s"
@@ -343,7 +343,7 @@ msgstr ""
 "inofensivo, pode resultar em uma notifica��o reaparecendo de forma "
 "estranha): %s"
 
-#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1328
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Erro ao obter valor para `%s': %s"
@@ -598,8 +598,10 @@ msgid "Failed to create or open '%s'"
 msgstr "Falha ao criar ou abrir '%s'"
 
 #: gconf/gconf-internals.c:2520
-#, c-format
-msgid "Failed to lock '%s': another process has the lock (%s)"
+#, fuzzy, c-format
+msgid ""
+"Failed to lock '%s': probably another process has the lock, or your "
+"operating system has NFS file locking misconfigured (%s)"
 msgstr "Falha ao bloquear '%s': outro processo possui o bloqueio (%s)"
 
 #: gconf/gconf-internals.c:2548
@@ -667,12 +669,12 @@ msgstr "Falha ao criar %s: %s"
 msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
 msgstr "Falha ao criar pipe para se comunicar com o daemon gconf filho: %s\n"
 
-#: gconf/gconf-internals.c:3060
+#: gconf/gconf-internals.c:3064
 #, c-format
 msgid "Failed to launch configuration server: %s\n"
 msgstr "Falha ao lan�ar servidor de configura��o: %s\n"
 
-#: gconf/gconf-internals.c:3084
+#: gconf/gconf-internals.c:3088
 msgid ""
 "Failed to contact configuration server (a likely cause of this is that you "
 "have an existing configuration server (gconfd) running, but it isn't "
@@ -684,46 +686,46 @@ msgstr ""
 "acess�vel daqui - se voc� estiver em duas m�quinas ao mesmo tempo, voc� pode "
 "precisar ativar comunica��o em rede TCP para o ORBit)\n"
 
-#: gconf/gconf-internals.c:3720
+#: gconf/gconf-internals.c:3724
 #, c-format
 msgid "Failed to read from child pipe (%s)"
 msgstr "Falha ao ler do pipe filho (%s)"
 
-#: gconf/gconf-internals.c:3785
+#: gconf/gconf-internals.c:3789
 #, c-format
 msgid "Failed to fork (%s)"
 msgstr "Falha ao executar fork (%s)"
 
-#: gconf/gconf-internals.c:3925
+#: gconf/gconf-internals.c:3929
 #, c-format
 msgid "Failed to change to directory '%s' (%s)"
 msgstr "Falha ao mudar para o diret�rio '%s' (%s)"
 
-#: gconf/gconf-internals.c:3935
+#: gconf/gconf-internals.c:3939
 #, c-format
 msgid "Failed to execute child process (%s)"
 msgstr "Falha ao executar processo filho (%s)"
 
-#: gconf/gconf-internals.c:3944
+#: gconf/gconf-internals.c:3948
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
 msgstr "Falha ao redirecionar sa�da ou entrada do processo filho (%s)"
 
-#: gconf/gconf-internals.c:3953
+#: gconf/gconf-internals.c:3957
 #, c-format
 msgid "Failed to fork child process (%s)"
 msgstr "Falha ao executar fork para processo filho (%s)"
 
-#: gconf/gconf-internals.c:3961
+#: gconf/gconf-internals.c:3965
 msgid "Unknown error executing child process"
 msgstr "Erro desconhecido executando processo filho"
 
-#: gconf/gconf-internals.c:3982
+#: gconf/gconf-internals.c:3986
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr "N�o foi poss�vel ler dados suficientes do pipe filho (%s)"
 
-#: gconf/gconf-internals.c:4032
+#: gconf/gconf-internals.c:4036
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr "Falha ao criar pipe para se comunicar com processo filho (%s)"
@@ -733,16 +735,16 @@ msgstr "Falha ao criar pipe para se comunicar com processo filho (%s)"
 msgid "Failed to load source `%s': %s"
 msgstr "Falha ao carregar fonte `%s': %s"
 
-#: gconf/gconf-sources.c:510
+#: gconf/gconf-sources.c:544
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr "Schema `%s' especificado para `%s' armazena um valor de n�o-schema"
 
-#: gconf/gconf-sources.c:567
+#: gconf/gconf-sources.c:601
 msgid "The '/' name can only be a directory, not a key"
 msgstr "O nome '/' pode ser apenas um diret�rio, n�o uma chave"
 
-#: gconf/gconf-sources.c:596
+#: gconf/gconf-sources.c:630
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -751,7 +753,7 @@ msgstr ""
 "Valor para `%s' atribu�do em fonte somente leitura no in�cio do seu caminho "
 "de configura��o."
 
-#: gconf/gconf-sources.c:608
+#: gconf/gconf-sources.c:642
 #, c-format
 msgid ""
 "Unable to store a value at key '%s', as the configuration server has no "
@@ -777,17 +779,17 @@ msgstr ""
 "conex�es CORBA remotas? Como sempre, verifique no syslog user.* detalhes "
 "sobre os problemas que o gconfd encontrou."
 
-#: gconf/gconf-sources.c:1164
+#: gconf/gconf-sources.c:1198
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Erro ao localizar metainfo: %s"
 
-#: gconf/gconf-sources.c:1233
+#: gconf/gconf-sources.c:1267
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Erro ao obter metainfo: %s"
 
-#: gconf/gconf-sources.c:1257
+#: gconf/gconf-sources.c:1291
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -1035,12 +1037,12 @@ msgstr "Terminando"
 msgid "GConf server is not in use, shutting down."
 msgstr "Servidor GConf n�o est� sendo usado, desligando."
 
-#: gconf/gconfd.c:1049
+#: gconf/gconfd.c:1059
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Levantando exce��o: %s"
 
-#: gconf/gconfd.c:1149
+#: gconf/gconfd.c:1159
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -1049,7 +1051,7 @@ msgstr ""
 "Falha ao abrir arquivo de registro do gconfd; n�o ser� poss�vel restaurar "
 "listeners ap�s uma parada do gconfd (%s)"
 
-#: gconf/gconfd.c:1184
+#: gconf/gconfd.c:1194
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
@@ -1057,39 +1059,39 @@ msgstr ""
 "Falha ao fechar arquivo de registro do gconfd; dados podem n�o ter sido "
 "salvos corretamente (%s)"
 
-#: gconf/gconfd.c:1253
+#: gconf/gconfd.c:1263
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "N�o foi poss�vel abrir arquivo de estado '%s' para escrita: %s"
 
-#: gconf/gconfd.c:1267
+#: gconf/gconfd.c:1277
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "N�o foi poss�vel escrever arquivo de estado '%s' fd: %d: %s"
 
-#: gconf/gconfd.c:1276
+#: gconf/gconfd.c:1286
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "Falha ao fechar novo arquivo de estado '%s': %s"
 
-#: gconf/gconfd.c:1290
+#: gconf/gconfd.c:1300
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "N�o foi poss�vel mover arquivo de estado antigo '%s': %s"
 
-#: gconf/gconfd.c:1300
+#: gconf/gconfd.c:1310
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "Falha ao mover novo arquivo de estado: %s"
 
-#: gconf/gconfd.c:1309
+#: gconf/gconfd.c:1319
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
 "Falha ao restaurar arquivo de estado original que foi movido para '%s': %s"
 
-#: gconf/gconfd.c:1784
+#: gconf/gconfd.c:1794
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
@@ -1097,17 +1099,17 @@ msgstr ""
 "N�o � poss�vel restaurar um listener no endere�o '%s', n�o foi poss�vel "
 "resolver o banco de dados"
 
-#: gconf/gconfd.c:1830
+#: gconf/gconfd.c:1840
 #, c-format
 msgid "Error reading saved state file: %s"
 msgstr "Erro ao lerr arquivo de estado: %s"
 
-#: gconf/gconfd.c:1883
+#: gconf/gconfd.c:1893
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "N�o � poss�vel abrir arquivo de estado '%s': %s"
 
-#: gconf/gconfd.c:2000
+#: gconf/gconfd.c:2010
 #, c-format
 msgid ""
 "Failed to log addition of listener to gconfd logfile; won't be able to re-"
@@ -1116,7 +1118,7 @@ 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)"
 
-#: gconf/gconfd.c:2005
+#: gconf/gconfd.c:2015
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously re-"
@@ -1126,27 +1128,27 @@ msgstr ""
 "pode ocorrer uma re-inclus�o errada do listener se o gconfd for desligado (%"
 "s)"
 
-#: gconf/gconfd.c:2028 gconf/gconfd.c:2193
+#: gconf/gconfd.c:2038 gconf/gconfd.c:2203
 #, c-format
 msgid "Failed to get IOR for client: %s"
 msgstr "Falha ao ler IOR para cliente: %s"
 
-#: gconf/gconfd.c:2043
+#: gconf/gconfd.c:2053
 #, c-format
 msgid "Failed to open saved state file: %s"
 msgstr "Falha ao abrir arquivo de estado: %s"
 
-#: gconf/gconfd.c:2056
+#: gconf/gconfd.c:2066
 #, c-format
 msgid "Failed to write client add to saved state file: %s"
 msgstr "Falha ao escrever inclus�o de cliente no arquivo de estado: %s"
 
-#: gconf/gconfd.c:2064
+#: gconf/gconfd.c:2074
 #, c-format
 msgid "Failed to flush client add to saved state file: %s"
 msgstr "Falha ao descarregar inclus�o de cliente no arquivo de estado: %s"
 
-#: gconf/gconfd.c:2154
+#: gconf/gconfd.c:2164
 msgid ""
 "Some client removed itself from the GConf server when it hadn't been added."
 msgstr "Algum cliente se excluiu do servidor GConf sem ter sido inclu�do."
@@ -1422,311 +1424,315 @@ msgstr ""
 "--direct\n"
 
 #: gconf/gconftool.c:525
+msgid "You should use --direct when using a non-default configuration source\n"
+msgstr ""
+
+#: gconf/gconftool.c:531
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "Falha ao iniciar GConf: %s\n"
 
-#: gconf/gconftool.c:560
+#: gconf/gconftool.c:566
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "A vari�vel de ambiente GCONF_CONFIG_SOURCE deve ser configurada\n"
 
-#: gconf/gconftool.c:589
+#: gconf/gconftool.c:595
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Falha ao acessar a(s) fonte(s) de configura��o: %s\n"
 
-#: gconf/gconftool.c:790
+#: gconf/gconftool.c:796
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Erro ao desligar: %s\n"
 
-#: gconf/gconftool.c:833
+#: gconf/gconftool.c:839
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 "Devem ser especificados um ou mais diret�rios para listar recursivamente.\n"
 
-#: gconf/gconftool.c:867
+#: gconf/gconftool.c:873
 #, c-format
 msgid "Failure listing entries in `%s': %s\n"
 msgstr "Falha ao listar entradas em `%s': %s\n"
 
-#: gconf/gconftool.c:885
+#: gconf/gconftool.c:891
 msgid "(no value set)"
 msgstr "(sem valor atribu�do)"
 
-#: gconf/gconftool.c:940
+#: gconf/gconftool.c:946
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Falha ao criar o servidor de configura��o (gconfd): %s\n"
 
-#: gconf/gconftool.c:954
+#: gconf/gconftool.c:960
 msgid "Must specify a key or keys to get\n"
 msgstr "Devem ser especificadas uma chave ou chaves para ler\n"
 
-#: gconf/gconftool.c:989
+#: gconf/gconftool.c:995
 #, c-format
 msgid "Type: %s\n"
 msgstr "Tipo: %s\n"
 
-#: gconf/gconftool.c:990
+#: gconf/gconftool.c:996
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Tipo de lista: %s\n"
 
-#: gconf/gconftool.c:991
+#: gconf/gconftool.c:997
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Tipo do car: %s\n"
 
-#: gconf/gconftool.c:992
+#: gconf/gconftool.c:998
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Tipo do cdr: %s\n"
 
-#: gconf/gconftool.c:997
+#: gconf/gconftool.c:1003
 #, c-format
 msgid "Default Value: %s\n"
 msgstr "Valor padr�o: %s\n"
 
-#: gconf/gconftool.c:997 gconf/gconftool.c:999 gconf/gconftool.c:1000
-#: gconf/gconftool.c:1001
+#: gconf/gconftool.c:1003 gconf/gconftool.c:1005 gconf/gconftool.c:1006
+#: gconf/gconftool.c:1007
 msgid "Unset"
 msgstr "Limpar"
 
-#: gconf/gconftool.c:999
+#: gconf/gconftool.c:1005
 #, c-format
 msgid "Owner: %s\n"
 msgstr "Dono: %s\n"
 
-#: gconf/gconftool.c:1000
+#: gconf/gconftool.c:1006
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Descr. Curta: %s\n"
 
-#: gconf/gconftool.c:1001
+#: gconf/gconftool.c:1007
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Descr. Longa: %s\n"
 
-#: gconf/gconftool.c:1010 gconf/gconftool.c:1304
+#: gconf/gconftool.c:1016 gconf/gconftool.c:1310
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Sem valor atribuido para `%s'\n"
 
-#: gconf/gconftool.c:1014 gconf/gconftool.c:1308
+#: gconf/gconftool.c:1020 gconf/gconftool.c:1314
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Falha ao ler valor para `%s': %s\n"
 
-#: gconf/gconftool.c:1057 gconf/gconftool.c:1069
+#: gconf/gconftool.c:1063 gconf/gconftool.c:1075
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "N�o � poss�vel entender tipo `%s'\n"
 
-#: gconf/gconftool.c:1081
+#: gconf/gconftool.c:1087
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Devem ser especificados chaves/valores alternados como argumentos\n"
 
-#: gconf/gconftool.c:1101
+#: gconf/gconftool.c:1107
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Sem valor a atribuir para chave: `%s'\n"
 
-#: gconf/gconftool.c:1129
+#: gconf/gconftool.c:1135
 msgid "Cannot set schema as value\n"
 msgstr "N�o � poss�vel atribuir um schema como valor\n"
 
-#: gconf/gconftool.c:1139
+#: gconf/gconftool.c:1145
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 "Ao atribuir a uma lista voc� deve especificar um tipo de lista primitivo\n"
 
-#: gconf/gconftool.c:1153
+#: gconf/gconftool.c:1159
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 "Ao atribuir a uma par voc� deve especificar um tipo de car e de cdr "
 "primitivos\n"
 
-#: gconf/gconftool.c:1168
+#: gconf/gconftool.c:1174
 #, c-format
 msgid "Error: %s\n"
 msgstr "Erro: %s\n"
 
-#: gconf/gconftool.c:1181
+#: gconf/gconftool.c:1187
 #, c-format
 msgid "Error setting value: %s\n"
 msgstr "Erro ao atribuir valor: %s\n"
 
-#: gconf/gconftool.c:1199
+#: gconf/gconftool.c:1205
 #, c-format
 msgid "Error syncing: %s\n"
 msgstr "Erro ao sincronizar: %s\n"
 
-#: gconf/gconftool.c:1222
+#: gconf/gconftool.c:1228
 msgid "Must specify a key or keys on the command line\n"
 msgstr "Devem ser especificadas uma chave ou chaves na linha de comando\n"
 
-#: gconf/gconftool.c:1242
+#: gconf/gconftool.c:1248
 #, c-format
 msgid "No schema known for `%s'\n"
 msgstr "N�o existe schema conhecido para `%s'\n"
 
-#: gconf/gconftool.c:1275
+#: gconf/gconftool.c:1281
 #, c-format
 msgid "No doc string stored in schema at '%s'\n"
 msgstr "N�o existe linha de documenta��o no schema em '%s'\n"
 
-#: gconf/gconftool.c:1280
+#: gconf/gconftool.c:1286
 #, c-format
 msgid "Error getting schema at '%s': %s\n"
 msgstr "Erro obtendo schema em '%s': %s\n"
 
-#: gconf/gconftool.c:1287
+#: gconf/gconftool.c:1293
 #, c-format
 msgid "No schema stored at '%s'\n"
 msgstr "N�o existe schema armazenado em '%s'\n"
 
-#: gconf/gconftool.c:1290
+#: gconf/gconftool.c:1296
 #, c-format
 msgid "Value at '%s' is not a schema\n"
 msgstr "Valor em '%s' n�o � um schema\n"
 
-#: gconf/gconftool.c:1346
+#: gconf/gconftool.c:1352
 msgid "Must specify a schema name followed by the key name to apply it to\n"
 msgstr ""
 "Deve ser especificado um nome de schema seguido por um nome de chave onde "
 "aplic�-lo\n"
 
-#: gconf/gconftool.c:1353
+#: gconf/gconftool.c:1359
 #, c-format
 msgid "Error associating schema name '%s' with key name '%s': %s\n"
 msgstr "Erro ao associar nome de schema '%s' com nome de chave '%s': %s\n"
 
-#: gconf/gconftool.c:1373
+#: gconf/gconftool.c:1379
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "Deve ser especificada chave (nome do schema) como �nico argumento\n"
 
-#: gconf/gconftool.c:1415
+#: gconf/gconftool.c:1421
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr "Tipo de lista deve ser um tipo primitivo: string, int, float or bool\n"
 
-#: gconf/gconftool.c:1435
+#: gconf/gconftool.c:1441
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Tipo de car de par deve ser um tipo primitivo: string, int, float or bool\n"
 
-#: gconf/gconftool.c:1455
+#: gconf/gconftool.c:1461
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "Tipo de cdr de par deve ser um tipo primitivo: string, int, float or bool\n"
 
-#: gconf/gconftool.c:1470
+#: gconf/gconftool.c:1476
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Erro ao atribuir valor: %s"
 
-#: gconf/gconftool.c:1484
+#: gconf/gconftool.c:1490
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Erro ao sincronizar: %s"
 
-#: gconf/gconftool.c:1499
+#: gconf/gconftool.c:1505
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "Devem ser especificados um ou mais diret�rios de onde obter pares chave/"
 "valor.\n"
 
-#: gconf/gconftool.c:1513
+#: gconf/gconftool.c:1519
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Devem ser especificadas uma ou mais chaves para limpar.\n"
 
-#: gconf/gconftool.c:1524
+#: gconf/gconftool.c:1530
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Erro ao limpar `%s': %s\n"
 
-#: gconf/gconftool.c:1547
+#: gconf/gconftool.c:1553
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "Devem ser especificados um ou mais diret�rios de onde obter subdiret�rios.\n"
 
-#: gconf/gconftool.c:1581
+#: gconf/gconftool.c:1587
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Erro ao listar diret�rios: %s\n"
 
-#: gconf/gconftool.c:1623
+#: gconf/gconftool.c:1629
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "ALERTA: tipo inv�lido ou faltante para schema (%s)\n"
 
-#: gconf/gconftool.c:1632
+#: gconf/gconftool.c:1638
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "ALERTA: tipo de lista inv�lido ou faltante para schema (%s)\n"
 
-#: gconf/gconftool.c:1643 gconf/gconftool.c:1673 gconf/gconftool.c:1702
+#: gconf/gconftool.c:1649 gconf/gconftool.c:1679 gconf/gconftool.c:1708
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr "ALERTA: Falha ao analisar valor padr�o `%s' para schema (%s)\n"
 
-#: gconf/gconftool.c:1661
+#: gconf/gconftool.c:1667
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr "ALERTA: tipo de car ou de cdr inv�lido ou faltante para schema (%s)\n"
 
-#: gconf/gconftool.c:1686
+#: gconf/gconftool.c:1692
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "ALERTA: Voc� n�o pode atribuir uma valor padr�o a um schema\n"
 
-#: gconf/gconftool.c:1715
+#: gconf/gconftool.c:1721
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "ALERTA: Erro interno do gconftool, GConfValueType desconhecido\n"
 
-#: gconf/gconftool.c:1762 gconf/gconftool.c:1783 gconf/gconftool.c:1804
-#: gconf/gconftool.c:1825
+#: gconf/gconftool.c:1768 gconf/gconftool.c:1789 gconf/gconftool.c:1810
+#: gconf/gconftool.c:1831
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "ALERTA: falha ao analisar nome do tipo `%s'\n"
 
-#: gconf/gconftool.c:1779
+#: gconf/gconftool.c:1785
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "ALERTA: tipo de lista s� pode ser int, float, string ou bool e n�o `%s'\n"
 
-#: gconf/gconftool.c:1800
+#: gconf/gconftool.c:1806
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "ALERTA: tipo de car s� pode ser int, float, string ou bool e n�o `%s'\n"
 
-#: gconf/gconftool.c:1821
+#: gconf/gconftool.c:1827
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 "ALERTA: tipo de cdr s� pode ser int, float, string ou bool e n�o `%s'\n"
 
-#: gconf/gconftool.c:1849
+#: gconf/gconftool.c:1855
 msgid "WARNING: empty <applyto> node"
 msgstr "ALERTA: n� <applyto> vazio"
 
-#: gconf/gconftool.c:1852 gconf/gconftool.c:2115
+#: gconf/gconftool.c:1858 gconf/gconftool.c:2121
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "ALERTA: n� <%s> n�o entendido sob <schema>\n"
 
-#: gconf/gconftool.c:1862
+#: gconf/gconftool.c:1868
 msgid "WARNING: no key specified for schema\n"
 msgstr "ALERTA: sem chave especificada para schema\n"
 
-#: gconf/gconftool.c:1895
+#: gconf/gconftool.c:1901
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr "ALERTA: n� <locale> n�o possui atributo `name=\"locale\"', ignorando\n"
 
-#: gconf/gconftool.c:1901
+#: gconf/gconftool.c:1907
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1734,51 +1740,51 @@ msgstr ""
 "ALERTA: m�ltiplos n�s <locale> para o locale `%s', ignorando todos ap�s o "
 "primeiro\n"
 
-#: gconf/gconftool.c:1982
+#: gconf/gconftool.c:1988
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "ALERTA: N� inv�lido <%s> em um n� <locale>\n"
 
-#: gconf/gconftool.c:2011
+#: gconf/gconftool.c:2017
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "ALERTA: falha ao instalar schema `%s' locale `%s': %s\n"
 
-#: gconf/gconftool.c:2019
+#: gconf/gconftool.c:2025
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Instalado schema `%s' para locale `%s'\n"
 
-#: gconf/gconftool.c:2041
+#: gconf/gconftool.c:2047
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "ALERTA: falha ao associar schema `%s' com chave `%s': %s\n"
 
-#: gconf/gconftool.c:2049
+#: gconf/gconftool.c:2055
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Anexado schema `%s' � chave `%s'\n"
 
-#: gconf/gconftool.c:2128
+#: gconf/gconftool.c:2134
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "Voc� deve ter pelo menos um item <locale> em um <schema>\n"
 
-#: gconf/gconftool.c:2157
+#: gconf/gconftool.c:2165
 #, c-format
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "ALERTA: n� <%s> n�o entendido abaixo de <schemalist>\n"
 
-#: gconf/gconftool.c:2179
+#: gconf/gconftool.c:2188
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Falha ao abrir `%s': %s\n"
 
-#: gconf/gconftool.c:2186
+#: gconf/gconftool.c:2195
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Documento `%s' est� vazio?\n"
 
-#: gconf/gconftool.c:2198
+#: gconf/gconftool.c:2207
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1787,26 +1793,26 @@ msgstr ""
 "Documento `%s' possui o tipo errado de n� raiz (<%s>, deveria ser "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:2211
+#: gconf/gconftool.c:2220
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "Documento `%s' n�o possui n� <gconfschemafile> de n�vel principal\n"
 
-#: gconf/gconftool.c:2225
+#: gconf/gconftool.c:2234
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "ALERTA: n� <%s> abaixo de <gconfschemafile> n�o entendido\n"
 
-#: gconf/gconftool.c:2236 gconf/gconftool.c:2268
+#: gconf/gconftool.c:2245 gconf/gconftool.c:2277
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Erro ao sincronizar dados de configura��o: %s"
 
-#: gconf/gconftool.c:2252
+#: gconf/gconftool.c:2261
 msgid "Must specify some schema files to install\n"
 msgstr "Devem ser especificados alguns arquivos de schema a instalar\n"
 
-#: gconf/gconftool.c:2289
+#: gconf/gconftool.c:2298
 #, c-format
 msgid ""
 "\n"
@@ -1815,16 +1821,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2309
+#: gconf/gconftool.c:2318
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Falha ao limpar chave de quebra %s: %s\n"
 
-#: gconf/gconftool.c:2435
+#: gconf/gconftool.c:2444
 msgid "Must specify some keys to break\n"
 msgstr "Devem ser especificadas algumas chaves para serem quebradas\n"
 
-#: gconf/gconftool.c:2441
+#: gconf/gconftool.c:2450
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1833,11 +1839,11 @@ msgstr ""
 "Tentando quebrar o seu aplicativo atribu�ndo valores inv�lidos para chave:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2459
+#: gconf/gconftool.c:2468
 msgid "Must specify some directories to break\n"
 msgstr "Devem ser especificados alguns diret�rios para serem quebrados\n"
 
-#: gconf/gconftool.c:2478
+#: gconf/gconftool.c:2487
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
diff --git a/po/ru.po b/po/ru.po
index 34a43535..072ccc0e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf\n"
-"POT-Creation-Date: 2001-08-15 18:01-0400\n"
+"POT-Creation-Date: 2002-02-04 18:21-0500\n"
 "PO-Revision-Date: 2001-03-16 11:21+03:00\n"
 "Last-Translator: Valek Filippov <frob@df.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -30,7 +30,7 @@ msgstr "������������� ���������� ������ BDB"
 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
+#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1050
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "�� ������� ������� ������� '%s': %s"
@@ -45,27 +45,27 @@ msgstr ""
 msgid "Unloading XML backend module."
 msgstr "�������� ���������� ������ XML."
 
-#: backends/xml-backend.c:286
+#: backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "�� ������� ����� �������� ������� XML �� ������ '%s'"
 
-#: backends/xml-backend.c:386
+#: backends/xml-backend.c:414
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
 msgstr ""
 "���������� ��������� �� ��� ��������� �������� ������� XML �� ������ '%s'"
 
-#: backends/xml-backend.c:396
+#: backends/xml-backend.c:424
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "����� �� �������/���� ��� ��������� XML � ������ %s: %o/%o"
 
-#: backends/xml-backend.c:680
+#: backends/xml-backend.c:708
 msgid "Initializing XML backend module"
 msgstr "������������� ���������� ������ XML"
 
-#: backends/xml-backend.c:745
+#: backends/xml-backend.c:773
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "�� ������� ������������� XML ������� \"%s\": %s"
@@ -134,32 +134,32 @@ msgid "Failed to delete old file `%s': %s"
 msgstr "�� ������� ������� ������ ���� \"%s\": %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:806
+#: backends/xml-dir.c:803
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "�� ������� ��������� stat ��� \"%s\": %s"
 
-#: backends/xml-dir.c:950
+#: backends/xml-dir.c:947
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "��������� ������ \"%s\" � \"%s\", ������������"
 
-#: backends/xml-dir.c:972
+#: backends/xml-dir.c:969
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "������ ��� ����� � XML-����� \"%s\", ������������"
 
-#: backends/xml-dir.c:979
-#, c-format
-msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
+#: backends/xml-dir.c:977
+#, fuzzy, c-format
+msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
 msgstr "���� �������� ������ � XML-����� \"%s\" �� <entry>, ������������"
 
-#: backends/xml-dir.c:1067
+#: backends/xml-dir.c:1066
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "�� ������� ������� ���� \"%s\": %s"
 
-#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2494
+#: backends/xml-dir.c:1074
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "�� ������� ������� ���� '%s': %s"
@@ -170,11 +170,6 @@ msgstr "�� ������� ������� ���� '%s': %s"
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "������������� XML-���� � ��������� \"%s\": %s"
 
-#: backends/xml-entry.c:200
-#, c-format
-msgid "%s"
-msgstr "%s"
-
 #: backends/xml-entry.c:327
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
@@ -338,7 +333,7 @@ msgid ""
 "result in a notification weirdly reappearing): %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1328
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "������ ��������� �������� ��� \"%s\": %s"
@@ -449,287 +444,383 @@ msgstr "�� ������� ������� lock"
 msgid "No database available to save your configuration"
 msgstr "���� ������ ��� ���������� ����� ������������ �� ��������"
 
-#: gconf/gconf-internals.c:87
+#: gconf/gconf-internals.c:114
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "��� '/' � ����� '%s'"
 
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:227
+#, c-format
+msgid "Invalid UTF-8 in string value in '%s'"
+msgstr ""
+
+#: gconf/gconf-internals.c:286
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "�� ������� ���������������� CORBA-�������� ��� �������� ������"
 
-#: gconf/gconf-internals.c:253
+#: gconf/gconf-internals.c:288
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "������������ ��� ��� �������� ������ � %s"
 
-#: gconf/gconf-internals.c:266
+#: gconf/gconf-internals.c:301
 msgid "Received list from gconfd with a bad list type"
 msgstr "�� gconfd ������� ������ � ������ ����� ������"
 
-#: gconf/gconf-internals.c:447
+#: gconf/gconf-internals.c:482
 msgid "Failed to convert object to IOR"
 msgstr "�� ������� ������������� ������ � IOR"
 
-#: gconf/gconf-internals.c:813
+#: gconf/gconf-internals.c:619
+msgid "Invalid UTF-8 in locale for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:627
+msgid "Invalid UTF-8 in short description for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:635
+msgid "Invalid UTF-8 in long description for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:643
+msgid "Invalid UTF-8 in owner for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:868
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "�� ������� ������� ���� ���� '%s': %s\n"
 
-#: gconf/gconf-internals.c:873
+#: gconf/gconf-internals.c:928
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "���������� ��������� '%s'\n"
 
-#: gconf/gconf-internals.c:885
+#: gconf/gconf-internals.c:940
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "������ ������ ����� '%s': %s\n"
 
-#: gconf/gconf-internals.c:1327
+#: gconf/gconf-internals.c:1271 gconf/gconf-internals.c:1337
+#: gconf/gconf-value.c:125 gconf/gconf-value.c:224 gconf/gconf-value.c:366
+#: gconf/gconf-value.c:1084
+msgid "Text contains invalid UTF-8"
+msgstr ""
+
+#: gconf/gconf-internals.c:1422
 #, c-format
 msgid "Expected list, got %s"
 msgstr "�������� ������, ������� %s"
 
-#: gconf/gconf-internals.c:1337
+#: gconf/gconf-internals.c:1432
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "�������� ������ %s, ������� ������ %s"
 
-#: gconf/gconf-internals.c:1476
+#: gconf/gconf-internals.c:1571
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "��������� ����, ������� %s"
 
-#: gconf/gconf-internals.c:1490
+#: gconf/gconf-internals.c:1585
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "��������� ���� (%s,%s), �������� ���� � ��������� ����� ��� ������ ����������"
 
-#: gconf/gconf-internals.c:1506
+#: gconf/gconf-internals.c:1601
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "��������� ���� ���� (%s,%s) �������� ���� (%s,%s)"
 
-#: gconf/gconf-internals.c:1622
+#: gconf/gconf-internals.c:1717
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "������ � �������� �� ���������� � �������"
 
-#: gconf/gconf-internals.c:1684
+#: gconf/gconf-internals.c:1779
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "������ � �������� �� ������������� ��������"
 
-#: gconf/gconf-internals.c:2164 gconf/gconf.c:3092
+#: gconf/gconf-internals.c:1915
+msgid "Encoded value is not valid UTF-8"
+msgstr ""
+
+#: gconf/gconf-internals.c:2265 gconf/gconf.c:3082
 #, c-format
 msgid "CORBA error: %s"
 msgstr "������ CORBA: %s"
 
-#: gconf/gconf-internals.c:2180
+#: gconf/gconf-internals.c:2281
 #, c-format
 msgid "OAF problem description: '%s'"
 msgstr "�������� �������� OAF: \"%s\""
 
-#: gconf/gconf-internals.c:2186
+#: gconf/gconf-internals.c:2287
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "������� ������� �� ��������� � ������ ������� �������� OAF"
 
-#: gconf/gconf-internals.c:2191
+#: gconf/gconf-internals.c:2292
 msgid "attempt to add already-listed OAF directory"
 msgstr "������� �������� ��� ��������� � ������ ������� OAF"
 
-#: gconf/gconf-internals.c:2198
+#: gconf/gconf-internals.c:2299
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "������ ������� OAF: %s"
 
-#: gconf/gconf-internals.c:2203
+#: gconf/gconf-internals.c:2304
 msgid "Unknown OAF error"
 msgstr "����������� ������ OAF"
 
-#: gconf/gconf-internals.c:2290
-#, c-format
-msgid "No ior file in `%s'"
-msgstr "��� ior-����� � '%s'"
-
-#: gconf/gconf-internals.c:2321
-#, c-format
-msgid "gconfd taking lock `%s' from some other process"
-msgstr "gconfd ������������ '%s' �� ��������� ������ ���������"
+#: gconf/gconf-internals.c:2437
+#, fuzzy, c-format
+msgid "Could not lock temporary file '%s': %s"
+msgstr "�� ������� ������� ���� ���� '%s': %s\n"
 
-#: gconf/gconf-internals.c:2332
+#: gconf/gconf-internals.c:2464
 #, c-format
-msgid "Another program has lock `%s'"
-msgstr "������ ��������� ������������� '%s'"
+msgid "Could not create file '%s', probably because it already exists"
+msgstr ""
 
-#: gconf/gconf-internals.c:2351
-msgid "couldn't contact ORB to ping existing gconfd"
-msgstr "���������� ������������ � ORB, ����� ��������� ������������ gconfd"
+#: gconf/gconf-internals.c:2510
+#, fuzzy, c-format
+msgid "Failed to create or open '%s'"
+msgstr "�� ������� ������� ���� \"%s\": %s"
 
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2520
 #, c-format
 msgid ""
-"Removing stale lock `%s' because IOR couldn't be converted to object "
-"reference, IOR `%s'"
+"Failed to lock '%s': probably another process has the lock, or your "
+"operating system has NFS file locking misconfigured (%s)"
 msgstr ""
-"�������� ����������� lock \"%s\", ��� ��� IOR �� ����� ���� ������������ � "
-"������ �� ������, IOR \"%s\""
 
-#: gconf/gconf-internals.c:2371
+#: gconf/gconf-internals.c:2548
 #, c-format
-msgid "Removing stale lock `%s' because of error pinging server: %s"
+msgid "IOR file '%s' not opened successfully, no gconfd located: %s"
 msgstr ""
-"�������� ����������� lock \"%s\", � ����� � ��������� ping �������: %s "
 
-#: gconf/gconf-internals.c:2383
+#: gconf/gconf-internals.c:2578
 #, c-format
-msgid "GConf configuration daemon (gconfd) has lock `%s'"
-msgstr "����� ������������ GConf (gconfd) ������������ '%s'"
+msgid "gconftool or other non-gconfd process has the lock file '%s'"
+msgstr ""
 
-#: gconf/gconf-internals.c:2397
+#: gconf/gconf-internals.c:2595
+#, fuzzy
+msgid "couldn't contact ORB to resolve existing gconfd object reference"
+msgstr "���������� ������������ � ORB, ����� ��������� ������������ gconfd"
+
+#: gconf/gconf-internals.c:2627
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "�� ������� ������� ������� '%s': %s"
 
-#: gconf/gconf-internals.c:2446
-#, c-format
-msgid "Can't create lock `%s': %s"
-msgstr "���������� ������� ���������� '%s': %s"
-
-#: gconf/gconf-internals.c:2482
+#: gconf/gconf-internals.c:2686
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "���������� �������� � ���� '%s': %s"
 
-#: gconf/gconf-internals.c:2532
+#: gconf/gconf-internals.c:2727
 #, c-format
-msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
-msgstr "���������� ������� ���� ���������� \"%s\"; �������� �� �� ���: %s"
+msgid "We didn't have the lock on file `%s', but we should have"
+msgstr ""
 
-#: gconf/gconf-internals.c:2549
-#, c-format
-msgid "Corrupt lock file `%s', removing anyway"
-msgstr "������������ lock-���� \"%s\", ���������"
+#: gconf/gconf-internals.c:2748
+#, fuzzy, c-format
+msgid "Failed to link '%s' to '%s': %s"
+msgstr "�� ������� ������������� \"%s\" � \"%s\": %s"
+
+#: gconf/gconf-internals.c:2760
+#, fuzzy, c-format
+msgid "Failed to remove lock file `%s': %s"
+msgstr "�� ������� ������� ���� \"%s\": %s"
+
+#: gconf/gconf-internals.c:2779
+#, fuzzy, c-format
+msgid "Failed to clean up file '%s': %s"
+msgstr "�� ������� ������� ���� '%s': %s"
+
+#: gconf/gconf-internals.c:2793
+#, fuzzy, c-format
+msgid "Failed to remove lock directory `%s': %s"
+msgstr "�� ������� ���������� ��������������� ������� \"%s\": %s"
+
+#: gconf/gconf-internals.c:3003 gconf/gconfd.c:580
+#, fuzzy, c-format
+msgid "Failed to create %s: %s"
+msgstr "�� ������� ������� ���� \"%s\": %s"
 
-#: gconf/gconf-internals.c:2559
+#: gconf/gconf-internals.c:3036
 #, c-format
+msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
+msgstr ""
+
+#: gconf/gconf-internals.c:3064
+#, fuzzy, c-format
+msgid "Failed to launch configuration server: %s\n"
+msgstr "���� ������� � ���������� ������������: %s\n"
+
+#: gconf/gconf-internals.c:3088
 msgid ""
-"Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
-"took our lock"
+"Failed to contact configuration server (a likely cause of this is that you "
+"have an existing configuration server (gconfd) running, but it isn't "
+"reachable from here - if you're logged in from two machines at once, you may "
+"need to enable TCP networking for ORBit)\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:2576
-#, c-format
-msgid "Failed to release lock directory `%s': %s"
+#: gconf/gconf-internals.c:3724
+#, fuzzy, c-format
+msgid "Failed to read from child pipe (%s)"
+msgstr "�� ������� ���������� ��������������� ������� \"%s\": %s"
+
+#: gconf/gconf-internals.c:3789
+#, fuzzy, c-format
+msgid "Failed to fork (%s)"
+msgstr "�� ������� ������� ���� \"%s\": %s"
+
+#: gconf/gconf-internals.c:3929
+#, fuzzy, c-format
+msgid "Failed to change to directory '%s' (%s)"
 msgstr "�� ������� ���������� ��������������� ������� \"%s\": %s"
 
+#: gconf/gconf-internals.c:3939
+#, fuzzy, c-format
+msgid "Failed to execute child process (%s)"
+msgstr "�� ������� ������� ������ ���� \"%s\": %s"
+
+#: gconf/gconf-internals.c:3948
+#, c-format
+msgid "Failed to redirect output or input of child process (%s)"
+msgstr ""
+
+#: gconf/gconf-internals.c:3957
+#, fuzzy, c-format
+msgid "Failed to fork child process (%s)"
+msgstr "�� ������� ������� �������� \"%s\": %s"
+
+#: gconf/gconf-internals.c:3965
+msgid "Unknown error executing child process"
+msgstr ""
+
+#: gconf/gconf-internals.c:3986
+#, c-format
+msgid "Failed to read enough data from child pid pipe (%s)"
+msgstr ""
+
+#: gconf/gconf-internals.c:4036
+#, c-format
+msgid "Failed to create pipe for communicating with child process (%s)"
+msgstr ""
+
 #: gconf/gconf-sources.c:320
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "�� ������� ������� �������� \"%s\": %s"
 
-#: gconf/gconf-sources.c:510
+#: gconf/gconf-sources.c:544
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr "����� \"%s\" ��������� ��� \"%s\" ������ �������� �� ���������� ������"
 
-#: gconf/gconf-sources.c:567
+#: gconf/gconf-sources.c:601
 msgid "The '/' name can only be a directory, not a key"
 msgstr "��� \"/\" ����� ���� ������ ���������, � �� ������"
 
-#: gconf/gconf-sources.c:596
+#: gconf/gconf-sources.c:630
 #, 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
+#: gconf/gconf-sources.c:642
 #, 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 "
+"somehow we mistakenly created two gconfd processes. If you have two gconfd "
+"processes (or had two at the time the second was launched), logging out, "
+"killing all copies of gconfd, and logging back in may help. Perhaps the "
+"problem is that you attempted to use GConf from two machines at once, and "
+"ORBit still has its default configuration that prevents remote CORBA "
+"connections? As always, check the user.* syslog for details on problems "
 "gconfd encountered."
 msgstr ""
 
-#: gconf/gconf-sources.c:1164
+#: gconf/gconf-sources.c:1198
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "������ ������ ��������������: %s"
 
-#: gconf/gconf-sources.c:1233
+#: gconf/gconf-sources.c:1267
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "������ ��������� ��������������: %s"
 
-#: gconf/gconf-sources.c:1257
+#: gconf/gconf-sources.c:1291
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
 "���� \"%s\" ��������� ��� ����� ��� ����� \"%s\" � ���������������� ������ "
 "��� \"%s\""
 
-#: gconf/gconf-value.c:82
+#: gconf/gconf-value.c:81
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "�� ������ \"%s\" (��������� �����)"
 
-#: gconf/gconf-value.c:92
+#: gconf/gconf-value.c:91
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "����� \"%s\" ������� ������� ��� ���������"
 
-#: gconf/gconf-value.c:113
+#: gconf/gconf-value.c:112
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "�� ������ \"%s\" (��������� �������� �����)"
 
-#: gconf/gconf-value.c:146
+#: gconf/gconf-value.c:156
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "�� ������ \"%s\" (��������� ���������� ��������)"
 
-#: gconf/gconf-value.c:214
+#: gconf/gconf-value.c:232
 #, c-format
 msgid "Didn't understand `%s' (list must start with a '[')"
 msgstr "�� ������ \"%s\" (������ ������ ���������� � \"[\")"
 
-#: gconf/gconf-value.c:227
+#: gconf/gconf-value.c:245
 #, c-format
 msgid "Didn't understand `%s' (list must end with a ']')"
 msgstr "�� ������ \"%s\" (������ ������ ������������� \"]\")"
 
-#: gconf/gconf-value.c:278
+#: gconf/gconf-value.c:296
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
 msgstr "�� ������ \"%s\" (������� ������ \"]\" � ������)"
 
-#: gconf/gconf-value.c:309 gconf/gconf-value.c:462
+#: gconf/gconf-value.c:327 gconf/gconf-value.c:488
 #, c-format
 msgid "Didn't understand `%s' (extra trailing characters)"
 msgstr "�� ������ \"%s\" (������ ����������� ������)"
 
-#: gconf/gconf-value.c:348
+#: gconf/gconf-value.c:374
 #, c-format
 msgid "Didn't understand `%s' (pair must start with a '(')"
 msgstr "�� ������ \"%s\" (���� ������ ���������� � \"(\")"
 
-#: gconf/gconf-value.c:361
+#: gconf/gconf-value.c:387
 #, c-format
 msgid "Didn't understand `%s' (pair must end with a ')')"
 msgstr "�� ������ \"%s\" (���� ������ ������������� \")\")"
 
-#: gconf/gconf-value.c:391 gconf/gconf-value.c:477
+#: gconf/gconf-value.c:417 gconf/gconf-value.c:503
 #, c-format
 msgid "Didn't understand `%s' (wrong number of elements)"
 msgstr "�� ������ \"%s\" (��������� ����� ���������)"
 
-#: gconf/gconf-value.c:431
+#: gconf/gconf-value.c:457
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr "�� ������ \"%s\" (������ \")\" ������� ������ ����)"
@@ -739,90 +830,80 @@ msgstr "�� ������ \"%s\" (������ \")\" ������� ������ ����)"
 msgid "`%s': %s"
 msgstr "\"%s\": %s"
 
-#: gconf/gconf.c:289
+#: gconf/gconf.c:287
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "������ �� ���� ���������� ����� '%s'"
 
-#: gconf/gconf.c:574
+#: gconf/gconf.c:572
 msgid "Can't add notifications to a local configuration source"
 msgstr "���������� �������� ��������� � ���������� ��������� ������������"
 
-#: gconf/gconf.c:1870
+#: gconf/gconf.c:1868
 #, c-format
 msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr "���� ���������� ������� � ������ ��������, ������ CORBA: %s"
 
-#: 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. "
-"This is a bug in the OAF package; something went wrong in OAF, and no error "
-"was reported. This is not a bug in the GConf package. Do not report a GConf "
-"bug unless you have information indicating what went wrong with OAF that was "
-"caused by GConf."
-msgstr ""
-
-#: gconf/gconf.c:2198
+#: gconf/gconf.c:2183
 msgid "Failed to init GConf, exiting\n"
 msgstr "�� ������� ���������������� GConf, �����\n"
 
-#: gconf/gconf.c:2235
+#: gconf/gconf.c:2220
 msgid "Must begin with a slash (/)"
 msgstr "������ ���������� � '/'"
 
-#: gconf/gconf.c:2257
+#: gconf/gconf.c:2242
 msgid "Can't have two slashes (/) in a row"
 msgstr "�� ������ ���� ��� '/' � ������"
 
-#: gconf/gconf.c:2259
+#: gconf/gconf.c:2244
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "�������� ���� ����� ����� '/'"
 
-#: gconf/gconf.c:2280
+#: gconf/gconf.c:2265
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "'%c' ������������ ������ � �������� �����/��������"
 
-#: gconf/gconf.c:2294
+#: gconf/gconf.c:2279
 msgid "Key/directory may not end with a slash (/)"
 msgstr "����/������� �� ����� ������������� �� '/'"
 
-#: gconf/gconf.c:2547
+#: gconf/gconf.c:2520
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "���� ���������� ����������������� �������: %s"
 
-#: gconf/gconf.c:2608
+#: gconf/gconf.c:2581
 #, c-format
 msgid "Expected float, got %s"
 msgstr "��������� � ����.������, �������� %s"
 
-#: gconf/gconf.c:2643
+#: gconf/gconf.c:2616
 #, c-format
 msgid "Expected int, got %s"
 msgstr "��������� �����, �������� %s"
 
-#: gconf/gconf.c:2678
+#: gconf/gconf.c:2651
 #, c-format
 msgid "Expected string, got %s"
 msgstr "��������� ������, �������� %s"
 
-#: gconf/gconf.c:2715
+#: gconf/gconf.c:2688
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "��������� ������, �������� %s"
 
-#: gconf/gconf.c:2748
+#: gconf/gconf.c:2721
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "��������� schema, �������� %s"
 
-#: gconf/gconfd.c:248
+#: gconf/gconfd.c:247
 msgid "Shutdown request received"
 msgstr "������� ������ �� ����������"
 
-#: gconf/gconfd.c:280
+#: gconf/gconfd.c:279
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -830,7 +911,7 @@ msgstr ""
 "gconfd ������������� � ��������; ���������� ��������� gconf.path �� "
 "��������� ��������"
 
-#: gconf/gconfd.c:298
+#: gconf/gconfd.c:297
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -838,7 +919,7 @@ msgstr ""
 "����� �������� �� �������, ���������� ������������ �������� �������� �� "
 "��������� \"%s\""
 
-#: gconf/gconfd.c:307
+#: gconf/gconfd.c:306
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -846,16 +927,16 @@ msgstr ""
 "��� ���������� ������������ � ���� ����������, ������������ �� ���� "
 "���������; ��������������� "
 
-#: gconf/gconfd.c:307
+#: gconf/gconfd.c:306
 msgid "/path"
 msgstr ""
 
-#: gconf/gconfd.c:321
+#: gconf/gconfd.c:320
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "������ �������� ��������� ���������� ��������: %s"
 
-#: gconf/gconfd.c:333
+#: gconf/gconfd.c:332
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -863,7 +944,7 @@ msgstr ""
 "����� ������������ �� ��� ������� ���������, ���������� ��������� ��� "
 "��������� ���������������� ������"
 
-#: gconf/gconfd.c:350
+#: gconf/gconfd.c:349
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -871,13 +952,13 @@ msgstr ""
 "�� ���� ������� ���������� ������������ ���������� ������������, �������� "
 "��������� ��������� ������������ �� ������� ���������"
 
-#: gconf/gconfd.c:376
+#: gconf/gconfd.c:375
 #, c-format
 msgid "Received signal %d, dumping core. Please report a GConf bug."
 msgstr ""
 "������� ������ %d, ���� ��������. ���������� �������� �� ������ � GConf."
 
-#: gconf/gconfd.c:392
+#: gconf/gconfd.c:391
 #, c-format
 msgid ""
 "Received signal %d, shutting down abnormally. Please file a GConf bug report."
@@ -885,99 +966,51 @@ msgstr ""
 "������� ������ %d, ������������ ����������. ���������� �������� �� ������ � "
 "GConf."
 
-#: gconf/gconfd.c:409
+#: gconf/gconfd.c:408
 #, 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:513
+#: gconf/gconfd.c:526
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "������ (������ %s), pid %u ������������ \"%s\""
 
-#: gconf/gconfd.c:540
-msgid ""
-"Failed to init Object Activation Framework: please mail bug report to OAF "
-"maintainers"
-msgstr ""
-"�� ������� ���������������� Object Activation Framework: ����������, "
-"��������� ��������� �� ������ ������������� OAF"
-
-#: gconf/gconfd.c:560
+#: gconf/gconfd.c:567
 msgid "Failed to get object reference for ConfigServer"
 msgstr "�� ������� �������� ������ �� ������ ��� ConfigServer"
 
-#: gconf/gconfd.c:573
-#, fuzzy, c-format
-msgid "Failed to create %s: %s"
-msgstr "�� ������� ������� ���� \"%s\": %s"
+#: gconf/gconfd.c:605
+#, c-format
+msgid "Failed to write byte to pipe fd %d so client program may hang: %s"
+msgstr ""
 
-#. Bad hack alert - register the current lockholder with oafd,
-#. * since oafd seems to have forgotten about us.
-#.
-#: gconf/gconfd.c:588
+#: gconf/gconfd.c:615
 #, fuzzy, c-format
-msgid "Failed to get lock for daemon: %s"
+msgid "Failed to get lock for daemon, exiting: %s"
 msgstr "�� ������� �������� IOR ��� �������: %s"
 
-#: gconf/gconfd.c:594
-msgid ""
-"Registering existing server with oafd, since OAF appears to have leaked it"
-msgstr ""
-
-#: gconf/gconfd.c:603
-msgid ""
-"OAF doesn't know about our IID; indicates broken installation; can't "
-"register existing server."
-msgstr ""
-
-#: gconf/gconfd.c:607
-#, fuzzy
-msgid ""
-"Another gconfd already registered with OAF, so we can't register the "
-"existing server"
-msgstr "������ gconfd ��� ��������������� � OAF; �����\n"
-
-#: gconf/gconfd.c:612
-#, fuzzy
-msgid "Unknown error registering existing gconfd with OAF; exiting"
-msgstr "����������� ������ ��� ����������� gconfd c OAF; �����\n"
-
-#: gconf/gconfd.c:639
-msgid ""
-"OAF doesn't know about our IID; indicates broken installation; can't "
-"register; exiting\n"
-msgstr ""
-
-#: gconf/gconfd.c:643
-msgid "Another gconfd already registered with OAF; exiting\n"
-msgstr "������ gconfd ��� ��������������� � OAF; �����\n"
-
-#: gconf/gconfd.c:648
-msgid "Unknown error registering gconfd with OAF; exiting\n"
-msgstr "����������� ������ ��� ����������� gconfd c OAF; �����\n"
-
-#: gconf/gconfd.c:692
+#: gconf/gconfd.c:657
 #, fuzzy, c-format
-msgid "Failed to release lockfile: %s"
+msgid "Error releasing lockfile: %s"
 msgstr "�� ������� ���������� ��������������� ������� \"%s\": %s"
 
-#: gconf/gconfd.c:700
+#: gconf/gconfd.c:665
 msgid "Exiting"
 msgstr "����������"
 
-#: gconf/gconfd.c:725
+#: gconf/gconfd.c:690
 msgid "GConf server is not in use, shutting down."
 msgstr "������ GConf �� ������������, ����������."
 
-#: gconf/gconfd.c:1084
+#: gconf/gconfd.c:1059
 #, c-format
 msgid "Returning exception: %s"
 msgstr "������� ����������: %s"
 
-#: gconf/gconfd.c:1184
+#: gconf/gconfd.c:1159
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -986,7 +1019,7 @@ msgstr ""
 "���� �������� ����������� ����� gconfd; ����� ���������� gconfd ������������ "
 "���������� ����� ���������� (%s)"
 
-#: gconf/gconfd.c:1219
+#: gconf/gconfd.c:1194
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
@@ -994,32 +1027,32 @@ msgstr ""
 "���� ��� �������� ����������� ����� gconfd; ������ ����� ���� �� ��������� "
 "��������� (%s)"
 
-#: gconf/gconfd.c:1288
+#: gconf/gconfd.c:1263
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "�� ������� ������� ����������� ���� ��������� \"%s\" ��� ������: %s"
 
-#: gconf/gconfd.c:1302
+#: gconf/gconfd.c:1277
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "�� ������� �������� � ���� ������������ ��������� \"%s\" fd: %d: %s"
 
-#: gconf/gconfd.c:1311
+#: gconf/gconfd.c:1286
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "�� ������� ������� ����� ���� ������������ ��������� \"%s\": %s"
 
-#: gconf/gconfd.c:1325
+#: gconf/gconfd.c:1300
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1335
+#: gconf/gconfd.c:1310
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "�� ������� ����������� ����� ����������� ���� ��������� �: %s"
 
-#: gconf/gconfd.c:1344
+#: gconf/gconfd.c:1319
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
@@ -1027,57 +1060,57 @@ msgstr ""
 "�� ������� ������������ �������� ����������� ���� ���������, ������� ��� "
 "��������� � \"%s\": %s"
 
-#: gconf/gconfd.c:1819
+#: gconf/gconfd.c:1794
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr ""
 
-#: gconf/gconfd.c:1865
+#: gconf/gconfd.c:1840
 #, c-format
 msgid "Error reading saved state file: %s"
 msgstr "������ ��� ������ ������������ ����� ���������: %s"
 
-#: gconf/gconfd.c:1918
+#: gconf/gconfd.c:1893
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "�� ������� ������� ����������� ���� ��������� \"%s\": %s"
 
-#: gconf/gconfd.c:2035
+#: gconf/gconfd.c:2010
 #, 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:2040
+#: gconf/gconfd.c:2015
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously re-"
 "add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:2063 gconf/gconfd.c:2228
+#: gconf/gconfd.c:2038 gconf/gconfd.c:2203
 #, c-format
 msgid "Failed to get IOR for client: %s"
 msgstr "�� ������� �������� IOR ��� �������: %s"
 
-#: gconf/gconfd.c:2078
+#: gconf/gconfd.c:2053
 #, c-format
 msgid "Failed to open saved state file: %s"
 msgstr "�� ������� ������� ����������� ���� ���������: %s"
 
-#: gconf/gconfd.c:2091
+#: gconf/gconfd.c:2066
 #, c-format
 msgid "Failed to write client add to saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:2099
+#: gconf/gconfd.c:2074
 #, c-format
 msgid "Failed to flush client add to saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:2189
+#: gconf/gconfd.c:2164
 msgid ""
 "Some client removed itself from the GConf server when it hadn't been added."
 msgstr "��������� ����� ������ ���� � ������� GConf, ���� �� �� ��� ��������."
@@ -1340,327 +1373,320 @@ msgstr ""
 "���� ����������� �������� --direct\n"
 
 #: gconf/gconftool.c:525
+msgid "You should use --direct when using a non-default configuration source\n"
+msgstr ""
+
+#: gconf/gconftool.c:531
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "�� ������� ���������������� GConf: %s\n"
 
-#: gconf/gconftool.c:550
+#: gconf/gconftool.c:566
 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:565
-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 ""
-
-#: gconf/gconftool.c:587
+#: gconf/gconftool.c:595
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "���� ������� � ���������� ������������: %s\n"
 
-#: gconf/gconftool.c:798
+#: gconf/gconftool.c:796
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "������ ����������: %s\n"
 
-#: gconf/gconftool.c:841
+#: gconf/gconftool.c:839
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr "��������� ������� ���� ��� ����� ��������� ��� ������������ ������.\n"
 
-#: gconf/gconftool.c:875
+#: gconf/gconftool.c:873
 #, fuzzy, c-format
 msgid "Failure listing entries in `%s': %s\n"
 msgstr "������ ������������ ��� � \"%s\": %s"
 
-#: gconf/gconftool.c:893
+#: gconf/gconftool.c:891
 msgid "(no value set)"
 msgstr "(�� ����������� ��������)"
 
-#: gconf/gconftool.c:948
+#: gconf/gconftool.c:946
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:962
+#: gconf/gconftool.c:960
 msgid "Must specify a key or keys to get\n"
 msgstr "���������� ������� ���� ��� ����� ��� ���������\n"
 
-#: gconf/gconftool.c:997
+#: gconf/gconftool.c:995
 #, c-format
 msgid "Type: %s\n"
 msgstr "���: %s\n"
 
-#: gconf/gconftool.c:998
+#: gconf/gconftool.c:996
 #, c-format
 msgid "List Type: %s\n"
 msgstr "��� ������: %s\n"
 
-#: gconf/gconftool.c:999
+#: gconf/gconftool.c:997
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "��� Car: %s\n"
 
-#: gconf/gconftool.c:1000
+#: gconf/gconftool.c:998
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "��� Cdr: %s\n"
 
-#: gconf/gconftool.c:1005
+#: gconf/gconftool.c:1003
 #, c-format
 msgid "Default Value: %s\n"
 msgstr "�������� ��������: %s\n"
 
-#: gconf/gconftool.c:1005 gconf/gconftool.c:1007 gconf/gconftool.c:1008
-#: gconf/gconftool.c:1009
+#: gconf/gconftool.c:1003 gconf/gconftool.c:1005 gconf/gconftool.c:1006
+#: gconf/gconftool.c:1007
 msgid "Unset"
 msgstr ""
 
-#: gconf/gconftool.c:1007
+#: gconf/gconftool.c:1005
 #, c-format
 msgid "Owner: %s\n"
 msgstr "��������: %s\n"
 
-#: gconf/gconftool.c:1008
+#: gconf/gconftool.c:1006
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "������� ��������: %s\n"
 
-#: gconf/gconftool.c:1009
+#: gconf/gconftool.c:1007
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "������ ��������: %s\n"
 
-#: gconf/gconftool.c:1018 gconf/gconftool.c:1312
+#: gconf/gconftool.c:1016 gconf/gconftool.c:1310
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "�� ����������� �������� ��� '%s'\n"
 
-#: gconf/gconftool.c:1022 gconf/gconftool.c:1316
+#: gconf/gconftool.c:1020 gconf/gconftool.c:1314
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "�� ������� �������� �������� ��� '%s': %s\n"
 
-#: gconf/gconftool.c:1065 gconf/gconftool.c:1077
+#: gconf/gconftool.c:1063 gconf/gconftool.c:1075
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "���������� ��� '%s'\n"
 
-#: gconf/gconftool.c:1089
+#: gconf/gconftool.c:1087
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "����� ������� ������������� �����/�������� � �������� ����������\n"
 
-#: gconf/gconftool.c:1109
+#: gconf/gconftool.c:1107
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "�� ����������� �������� ��� �����: '%s'\n"
 
-#: gconf/gconftool.c:1137
+#: gconf/gconftool.c:1135
 msgid "Cannot set schema as value\n"
 msgstr "���������� ���������� schema ��� ��������\n"
 
-#: gconf/gconftool.c:1147
+#: gconf/gconftool.c:1145
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr "��� ��������� ������ �� ������ ������� ����������� ��� ������\n"
 
-#: gconf/gconftool.c:1161
+#: gconf/gconftool.c:1159
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 "��� ��������� ���� �� ������ ������� ����������� ��� ��������� � ��� "
 "���������\n"
 
-#: gconf/gconftool.c:1176
+#: gconf/gconftool.c:1174
 #, c-format
 msgid "Error: %s\n"
 msgstr "������: %s\n"
 
-#: gconf/gconftool.c:1189
+#: gconf/gconftool.c:1187
 #, fuzzy, c-format
 msgid "Error setting value: %s\n"
 msgstr "������ ��������� ��������: %s"
 
-#: gconf/gconftool.c:1207
+#: gconf/gconftool.c:1205
 #, fuzzy, c-format
 msgid "Error syncing: %s\n"
 msgstr "������ �������������: %s"
 
-#: gconf/gconftool.c:1230
+#: gconf/gconftool.c:1228
 #, fuzzy
 msgid "Must specify a key or keys on the command line\n"
 msgstr "���������� ������� ���� ��� ����� ��� ���������\n"
 
-#: gconf/gconftool.c:1250
+#: gconf/gconftool.c:1248
 #, fuzzy, c-format
 msgid "No schema known for `%s'\n"
 msgstr "��� ������ ����� '%s'\n"
 
-#: gconf/gconftool.c:1283
+#: gconf/gconftool.c:1281
 #, c-format
 msgid "No doc string stored in schema at '%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1288
+#: gconf/gconftool.c:1286
 #, fuzzy, c-format
 msgid "Error getting schema at '%s': %s\n"
 msgstr "������ ��������� ����� ��� \"%s\": %s"
 
-#: gconf/gconftool.c:1295
+#: gconf/gconftool.c:1293
 #, fuzzy, c-format
 msgid "No schema stored at '%s'\n"
 msgstr "��� ������ ����� '%s'\n"
 
-#: gconf/gconftool.c:1298
+#: gconf/gconftool.c:1296
 #, c-format
 msgid "Value at '%s' is not a schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1354
+#: gconf/gconftool.c:1352
 #, fuzzy
 msgid "Must specify a schema name followed by the key name to apply it to\n"
 msgstr "���������� ��������� ���� (�������� �����) ��� ������������ ��������\n"
 
-#: gconf/gconftool.c:1361
+#: gconf/gconftool.c:1359
 #, fuzzy, c-format
 msgid "Error associating schema name '%s' with key name '%s': %s\n"
 msgstr "��������: ���� ��� �������������� ����� \"%s\" � ������ \"%s\": %s\n"
 
-#: gconf/gconftool.c:1381
+#: gconf/gconftool.c:1379
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "���������� ��������� ���� (�������� �����) ��� ������������ ��������\n"
 
-#: gconf/gconftool.c:1423
+#: gconf/gconftool.c:1421
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "��� ������ ������ ���� �����������: �������, �����, ��������� ��� �������\n"
 
-#: gconf/gconftool.c:1443
+#: gconf/gconftool.c:1441
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "��� ��������� ���� ������ ���� �����������: �������, �����, ��������� ��� "
 "�������\n"
 
-#: gconf/gconftool.c:1463
+#: gconf/gconftool.c:1461
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 "��� ��������� ���� ������ ���� �����������: �������, �����, ��������� ��� "
 "�������\n"
 
-#: gconf/gconftool.c:1478
+#: gconf/gconftool.c:1476
 #, c-format
 msgid "Error setting value: %s"
 msgstr "������ ��������� ��������: %s"
 
-#: gconf/gconftool.c:1492
+#: gconf/gconftool.c:1490
 #, c-format
 msgid "Error syncing: %s"
 msgstr "������ �������������: %s"
 
-#: gconf/gconftool.c:1507
+#: gconf/gconftool.c:1505
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "���������� ������� ���� ��� ����� ���������, ��� ��������� ��� ����/"
 "��������.\n"
 
-#: gconf/gconftool.c:1521
+#: gconf/gconftool.c:1519
 msgid "Must specify one or more keys to unset.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1532
+#: gconf/gconftool.c:1530
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1555
+#: gconf/gconftool.c:1553
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "��������� ������� ���� ��� ����� ��������� ��� ��������� �� ��� "
 "������������.\n"
 
-#: gconf/gconftool.c:1589
+#: gconf/gconftool.c:1587
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "������ ������������ ���������: %s\n"
 
-#: gconf/gconftool.c:1631
+#: gconf/gconftool.c:1629
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "��������������: ������������ ��� ��������� ��� ��� ����� (%s)\n"
 
-#: gconf/gconftool.c:1640
+#: gconf/gconftool.c:1638
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "��������������: ������������ ��� ��������� ��� ������ ��� ����� (%s)\n"
 
-#: gconf/gconftool.c:1651 gconf/gconftool.c:1681 gconf/gconftool.c:1710
+#: gconf/gconftool.c:1649 gconf/gconftool.c:1679 gconf/gconftool.c:1708
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 "��������������: �� ������� ��������� �������� �������� '%s' ��� ����� (%s)\n"
 
-#: gconf/gconftool.c:1669
+#: gconf/gconftool.c:1667
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 "��������������: ������������ ��� ��������� ��� CAR ��� CDR ��� ����� (%s)\n"
 
-#: gconf/gconftool.c:1694
+#: gconf/gconftool.c:1692
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr ""
 "��������������: �� �� ������ ���������� �������� �� ��������� ��� �����\n"
 
-#: gconf/gconftool.c:1723
+#: gconf/gconftool.c:1721
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr ""
 "��������������: ���������� ������ gconftool, ����������� GConfValueType\n"
 
-#: gconf/gconftool.c:1770 gconf/gconftool.c:1791 gconf/gconftool.c:1812
-#: gconf/gconftool.c:1833
+#: gconf/gconftool.c:1768 gconf/gconftool.c:1789 gconf/gconftool.c:1810
+#: gconf/gconftool.c:1831
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1787
+#: gconf/gconftool.c:1785
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1808
+#: gconf/gconftool.c:1806
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1829
+#: gconf/gconftool.c:1827
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1857
+#: gconf/gconftool.c:1855
 msgid "WARNING: empty <applyto> node"
 msgstr "��������: ������ ���� <applyto>"
 
-#: gconf/gconftool.c:1860 gconf/gconftool.c:2123
+#: gconf/gconftool.c:1858 gconf/gconftool.c:2121
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "��������: ���� <%s> �� ����� ��� <schema>\n"
 
-#: gconf/gconftool.c:1870
+#: gconf/gconftool.c:1868
 msgid "WARNING: no key specified for schema\n"
 msgstr "��������: �� ������ ���� ��� �����\n"
 
-#: gconf/gconftool.c:1903
+#: gconf/gconftool.c:1901
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 "�������: ���� <locale> �� ����� ��������� `name=\\\"locale\\\"', "
 "������������\n"
 
-#: gconf/gconftool.c:1909
+#: gconf/gconftool.c:1907
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1668,32 +1694,32 @@ msgstr ""
 "��������: ������������� ���� <locale> ��� ������ \"%s\", ������������ ��� "
 "����� �������\n"
 
-#: gconf/gconftool.c:1990
+#: gconf/gconftool.c:1988
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "��������: ������������ ���� <%s> � ���� <locale>\n"
 
-#: gconf/gconftool.c:2019
+#: gconf/gconftool.c:2017
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "��������: ���� ��� ��������� ����� \"%s\" ������ \"%s\": %s\n"
 
-#: gconf/gconftool.c:2027
+#: gconf/gconftool.c:2025
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "����������� ����� \"%s\" ��� locale \"%s\"\n"
 
-#: gconf/gconftool.c:2049
+#: gconf/gconftool.c:2047
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "��������: ���� ��� �������������� ����� \"%s\" � ������ \"%s\": %s\n"
 
-#: gconf/gconftool.c:2057
+#: gconf/gconftool.c:2055
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "������������ ����� \"%s\" � ����� \"%s\"\n"
 
-#: gconf/gconftool.c:2136
+#: gconf/gconftool.c:2134
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "� ��� ������ ���� ���� �� ���� ������ <locale> � <schema>\n"
 
@@ -1702,17 +1728,17 @@ msgstr "� ��� ������ ���� ���� �� ���� ������ <locale> � <schema>\n"
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr ""
 
-#: gconf/gconftool.c:2187
+#: gconf/gconftool.c:2188
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "�� ������� ������� `%s': %s\n"
 
-#: gconf/gconftool.c:2194
+#: gconf/gconftool.c:2195
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "�������� `%s' ����?\n"
 
-#: gconf/gconftool.c:2206
+#: gconf/gconftool.c:2207
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1721,26 +1747,26 @@ msgstr ""
 "�������� \"%s\" ����� ��������� ��� ��������� ���� (<%s>, ������ ���� "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:2219
+#: gconf/gconftool.c:2220
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "�������� `%s' �� ����� �������� ������ ���� <gconfschemafile>\n"
 
-#: gconf/gconftool.c:2233
+#: gconf/gconftool.c:2234
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "��������������: ���� <%s> ���� <gconfschemafile> �� ��� �����\n"
 
-#: gconf/gconftool.c:2244 gconf/gconftool.c:2276
+#: gconf/gconftool.c:2245 gconf/gconftool.c:2277
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "������ ������������� ���������������� ������: %s"
 
-#: gconf/gconftool.c:2260
+#: gconf/gconftool.c:2261
 msgid "Must specify some schema files to install\n"
 msgstr "���������� ������� ��������� ������ ����� ��� ���������\n"
 
-#: gconf/gconftool.c:2297
+#: gconf/gconftool.c:2298
 #, c-format
 msgid ""
 "\n"
@@ -1749,16 +1775,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2317
+#: gconf/gconftool.c:2318
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2443
+#: gconf/gconftool.c:2444
 msgid "Must specify some keys to break\n"
 msgstr "���������� ������� ��������� ����� ��� ����������\n"
 
-#: gconf/gconftool.c:2449
+#: gconf/gconftool.c:2450
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1767,11 +1793,11 @@ msgstr ""
 "������� �������� ���� ���������� ���������� ������ �������� ��� �����:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2467
+#: gconf/gconftool.c:2468
 msgid "Must specify some directories to break\n"
 msgstr "���������� ������� ��������� �������� ��� ����������\n"
 
-#: gconf/gconftool.c:2486
+#: gconf/gconftool.c:2487
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1797,6 +1823,64 @@ msgstr "�������������� GConf: ������ ������������ ��� � \"%s\": %s"
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "��������� \"%s\" �������� \"%s\" ��� ����� %s"
 
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "No ior file in `%s'"
+#~ msgstr "��� ior-����� � '%s'"
+
+#~ msgid "gconfd taking lock `%s' from some other process"
+#~ msgstr "gconfd ������������ '%s' �� ��������� ������ ���������"
+
+#~ msgid "Another program has lock `%s'"
+#~ msgstr "������ ��������� ������������� '%s'"
+
+#~ msgid ""
+#~ "Removing stale lock `%s' because IOR couldn't be converted to object "
+#~ "reference, IOR `%s'"
+#~ msgstr ""
+#~ "�������� ����������� lock \"%s\", ��� ��� IOR �� ����� ���� ������������ "
+#~ "� ������ �� ������, IOR \"%s\""
+
+#~ msgid "Removing stale lock `%s' because of error pinging server: %s"
+#~ msgstr ""
+#~ "�������� ����������� lock \"%s\", � ����� � ��������� ping �������: %s "
+
+#~ msgid "GConf configuration daemon (gconfd) has lock `%s'"
+#~ msgstr "����� ������������ GConf (gconfd) ������������ '%s'"
+
+#~ msgid "Can't create lock `%s': %s"
+#~ msgstr "���������� ������� ���������� '%s': %s"
+
+#~ msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
+#~ msgstr "���������� ������� ���� ���������� \"%s\"; �������� �� �� ���: %s"
+
+#~ msgid "Corrupt lock file `%s', removing anyway"
+#~ msgstr "������������ lock-���� \"%s\", ���������"
+
+#~ msgid ""
+#~ "Failed to init Object Activation Framework: please mail bug report to OAF "
+#~ "maintainers"
+#~ msgstr ""
+#~ "�� ������� ���������������� Object Activation Framework: ����������, "
+#~ "��������� ��������� �� ������ ������������� OAF"
+
+#, fuzzy
+#~ msgid ""
+#~ "Another gconfd already registered with OAF, so we can't register the "
+#~ "existing server"
+#~ msgstr "������ gconfd ��� ��������������� � OAF; �����\n"
+
+#, fuzzy
+#~ msgid "Unknown error registering existing gconfd with OAF; exiting"
+#~ msgstr "����������� ������ ��� ����������� gconfd c OAF; �����\n"
+
+#~ msgid "Another gconfd already registered with OAF; exiting\n"
+#~ msgstr "������ gconfd ��� ��������������� � OAF; �����\n"
+
+#~ msgid "Unknown error registering gconfd with OAF; exiting\n"
+#~ msgstr "����������� ������ ��� ����������� gconfd c OAF; �����\n"
+
 #~ msgid "Ignoring XML node `%s', except for possible schema name: %s"
 #~ msgstr "������������� XML-���� \"%s\", �������� ��������� ����� schema: %s"
 
diff --git a/po/sk.po b/po/sk.po
index 313d6324..08975a63 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf 0.12\n"
-"POT-Creation-Date: 2001-12-11 15:43+0100\n"
+"POT-Creation-Date: 2002-02-04 18:21-0500\n"
 "PO-Revision-Date: 2001-12-07 21:12CET\n"
 "Last-Translator: Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>\n"
 "Language-Team: Slovak <sk-i18n@linux.sk>\n"
@@ -32,7 +32,7 @@ msgstr "Inicializujem BDB modul"
 msgid "Couldn't find the %s root directory in the address `%s'"
 msgstr "Nie je možné nájsť koreňový priečinok pre %s na adrese `%s'"
 
-#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1053
+#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1050
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Nie je možné vytvoriť priečinok '%s': %s"
@@ -137,33 +137,33 @@ msgid "Failed to delete old file `%s': %s"
 msgstr "Nepodarilo sa odstrániť starý súbor `%s': %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:806
+#: backends/xml-dir.c:803
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Nepodarilo sa zistiť stav `%s': %s"
 
-#: backends/xml-dir.c:950
+#: backends/xml-dir.c:947
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Duplikovaná položka `%s' v `%s', ignorujem"
 
-#: backends/xml-dir.c:972
+#: backends/xml-dir.c:969
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "Položka bez mena v súbore XML `%s', ignorujem"
 
-#: backends/xml-dir.c:980
+#: backends/xml-dir.c:977
 #, c-format
 msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
 msgstr ""
 "Uzol na najvyššej úrovni v súbore XML `%s' je <%s> a nie <entry>, ignorujem"
 
-#: backends/xml-dir.c:1069
+#: backends/xml-dir.c:1066
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Nepodarilo sa vytvoriť súbor `%s': %s"
 
-#: backends/xml-dir.c:1077
+#: backends/xml-dir.c:1074
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Nepodarilo sa zavrieť súbor `%s': %s"
@@ -341,7 +341,7 @@ msgstr ""
 "Nepodarilo sa zaznamenať odstránenie listenera do súboru so záznamom (asi "
 "neškodné, ale môže sa objaviť divné opakovanie upozornení): %s"
 
-#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1328
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Chyba pri získavaní hodnoty pre `%s': %s"
@@ -665,12 +665,12 @@ msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
 msgstr ""
 "Nepodarilo sa vytvoriť rúru pre komunikáciu s potomkami démona gconf: %s\n"
 
-#: gconf/gconf-internals.c:3060
+#: gconf/gconf-internals.c:3064
 #, c-format
 msgid "Failed to launch configuration server: %s\n"
 msgstr "Nepodarilo sa spustiť konfiguračný server: %s\n"
 
-#: gconf/gconf-internals.c:3084
+#: gconf/gconf-internals.c:3088
 msgid ""
 "Failed to contact configuration server (a likely cause of this is that you "
 "have an existing configuration server (gconfd) running, but it isn't "
@@ -682,46 +682,46 @@ msgstr ""
 "dostupný - ak ste prihlásený na dvoj počítačoch naraz, možno budete musieť "
 "povoliť sieť TCP pre ORBit)\n"
 
-#: gconf/gconf-internals.c:3720
+#: gconf/gconf-internals.c:3724
 #, c-format
 msgid "Failed to read from child pipe (%s)"
 msgstr "Nepodarilo sa čítať z rúry potomka (%s)"
 
-#: gconf/gconf-internals.c:3785
+#: gconf/gconf-internals.c:3789
 #, c-format
 msgid "Failed to fork (%s)"
 msgstr "Nepodarilo sa vytvoriť proces (%s)"
 
-#: gconf/gconf-internals.c:3925
+#: gconf/gconf-internals.c:3929
 #, c-format
 msgid "Failed to change to directory '%s' (%s)"
 msgstr "Nepodarilo sa prejsť do priečinku '%s' (%s)"
 
-#: gconf/gconf-internals.c:3935
+#: gconf/gconf-internals.c:3939
 #, c-format
 msgid "Failed to execute child process (%s)"
 msgstr "Nepodarilo sa spustiť potomka (%s)"
 
-#: gconf/gconf-internals.c:3944
+#: gconf/gconf-internals.c:3948
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
 msgstr "Nepodarilo sa presmerovať výstup alebo vstup potomka (%s)"
 
-#: gconf/gconf-internals.c:3953
+#: gconf/gconf-internals.c:3957
 #, c-format
 msgid "Failed to fork child process (%s)"
 msgstr "Nepodarilo sa spustiť potomka (%s)"
 
-#: gconf/gconf-internals.c:3961
+#: gconf/gconf-internals.c:3965
 msgid "Unknown error executing child process"
 msgstr "Neznáma chyba počas spustenia potomka"
 
-#: gconf/gconf-internals.c:3982
+#: gconf/gconf-internals.c:3986
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr "Nepodarilo sa prečítať dosť dát z rúry potomka (%s)"
 
-#: gconf/gconf-internals.c:4032
+#: gconf/gconf-internals.c:4036
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr "Nepodarilo sa vytvoriť rúru pre komunikáciu s potomkom (%s)"
@@ -731,16 +731,16 @@ msgstr "Nepodarilo sa vytvoriť rúru pre komunikáciu s potomkom (%s)"
 msgid "Failed to load source `%s': %s"
 msgstr "Nepodarilo sa načítať zdroj `%s': %s"
 
-#: gconf/gconf-sources.c:510
+#: gconf/gconf-sources.c:544
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr "Schéme `%s' uvedená pre `%s' udržiava hodnotu, ktorá nie je schéma"
 
-#: gconf/gconf-sources.c:567
+#: gconf/gconf-sources.c:601
 msgid "The '/' name can only be a directory, not a key"
 msgstr "Meno '/' môže byť iba pre priečinok, nie pre kľúč"
 
-#: gconf/gconf-sources.c:596
+#: gconf/gconf-sources.c:630
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -749,7 +749,7 @@ msgstr ""
 "Hodnota pre `%s' nastavená v zdroji určenom iba pre čítanie pred vašou "
 "konfiguračnou cestou."
 
-#: gconf/gconf-sources.c:608
+#: gconf/gconf-sources.c:642
 #, c-format
 msgid ""
 "Unable to store a value at key '%s', as the configuration server has no "
@@ -773,17 +773,17 @@ msgstr ""
 "stále štandardné nastavenie, ktoré bráni vzdialeným spojeniam CORBA. Ako "
 "obvykle, skontrolujte súbor so záznamom user.* pre detaily o chybe."
 
-#: gconf/gconf-sources.c:1164
+#: gconf/gconf-sources.c:1198
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Chyba pri hľadaní meta-informácií: %s"
 
-#: gconf/gconf-sources.c:1233
+#: gconf/gconf-sources.c:1267
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Chyba pri získavaní meta-informácií: %s"
 
-#: gconf/gconf-sources.c:1257
+#: gconf/gconf-sources.c:1291
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 252c15bc..1ac601f8 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
-"POT-Creation-Date: 2002-01-26 22:16+0100\n"
+"POT-Creation-Date: 2002-02-04 18:21-0500\n"
 "PO-Revision-Date: 2001-02-12 20:02+0100\n"
 "Last-Translator: Andraz Tori <andraz.tori1@guest.arnes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -592,10 +592,13 @@ msgid "Failed to create or open '%s'"
 msgstr "Nisem uspel ustvariti ali odpreti '%s'"
 
 #: gconf/gconf-internals.c:2520
+#, c-format
 msgid ""
 "Failed to lock '%s': probably another process has the lock, or your "
 "operating system has NFS file locking misconfigured (%s)"
-msgstr "Nisem uspel zakleniti '%s': verjetno ima klju�avnico drug proces ali pa ima va� operacijski sistem nepravilno nastavljeno zaklepanje datotek NFS (%s)"
+msgstr ""
+"Nisem uspel zakleniti '%s': verjetno ima klju�avnico drug proces ali pa ima "
+"va� operacijski sistem nepravilno nastavljeno zaklepanje datotek NFS (%s)"
 
 #: gconf/gconf-internals.c:2548
 #, c-format
@@ -1415,7 +1418,8 @@ msgstr "Ob uporabi --direct morate navesti vir nastavitev z --config-source\n"
 
 #: gconf/gconftool.c:525
 msgid "You should use --direct when using a non-default configuration source\n"
-msgstr "Kadar uporabljate neprivzet vir nastavitev, bi morali uporabljati --direct\n"
+msgstr ""
+"Kadar uporabljate neprivzet vir nastavitev, bi morali uporabljati --direct\n"
 
 #: gconf/gconftool.c:531
 #, c-format
diff --git a/po/sv.po b/po/sv.po
index 3fe6ad91..91447ee3 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf\n"
-"POT-Creation-Date: 2001-12-06 02:39+0100\n"
+"POT-Creation-Date: 2002-02-04 18:21-0500\n"
 "PO-Revision-Date: 2001-12-06 02:43+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -35,7 +35,7 @@ msgstr "Initierar BDB-backendmodulen"
 msgid "Couldn't find the %s root directory in the address `%s'"
 msgstr "Kunde inte hitta %s-rotkatalogen i adressen \"%s\""
 
-#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1053
+#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1050
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Kunde inte skapa katalogen \"%s\": %s"
@@ -136,33 +136,33 @@ msgid "Failed to delete old file `%s': %s"
 msgstr "Misslyckades med att ta bort den gamla filen \"%s\": %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:806
+#: backends/xml-dir.c:803
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Misslyckades med att ta status p� \"%s\": %s"
 
-#: backends/xml-dir.c:950
+#: backends/xml-dir.c:947
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "Dubbla \"%s\"-poster i \"%s\", ignorerar"
 
-#: backends/xml-dir.c:972
+#: backends/xml-dir.c:969
 #, 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:980
+#: backends/xml-dir.c:977
 #, c-format
 msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
 msgstr ""
 "�versta noden i XML-filen \"%s\" �r <%s> ist�llet f�r <entry>, ignorerar"
 
-#: backends/xml-dir.c:1069
+#: backends/xml-dir.c:1066
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Misslyckades med att skapa filen \"%s\": %s"
 
-#: backends/xml-dir.c:1077
+#: backends/xml-dir.c:1074
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "Misslyckades med att st�nga filen \"%s\": %s"
@@ -343,7 +343,7 @@ msgstr ""
 "Misslyckades med att logga borttagningen av lyssnare i loggfilen (troligtvis "
 "ofarligt, men kan resultera i att ett meddelande pl�tsligt �terkommer): %s"
 
-#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1328
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Fel vid h�mtning av v�rde f�r \"%s\": %s"
@@ -667,12 +667,12 @@ msgstr ""
 "Misslyckades med att skapa r�r f�r kommunikation med startad gconf-demon: %"
 "s\n"
 
-#: gconf/gconf-internals.c:3060
+#: gconf/gconf-internals.c:3064
 #, c-format
 msgid "Failed to launch configuration server: %s\n"
 msgstr "Misslyckades med att starta konfigurationsservern: %s\n"
 
-#: gconf/gconf-internals.c:3084
+#: gconf/gconf-internals.c:3088
 msgid ""
 "Failed to contact configuration server (a likely cause of this is that you "
 "have an existing configuration server (gconfd) running, but it isn't "
@@ -684,47 +684,47 @@ msgstr ""
 "men att den inte �r n�bar h�rifr�n - om du �r inloggad fr�n tv� maskiner "
 "samtidigt kan du beh�va aktivera TCP-n�tverksst�d f�r ORBit)\n"
 
-#: gconf/gconf-internals.c:3720
+#: gconf/gconf-internals.c:3724
 #, c-format
 msgid "Failed to read from child pipe (%s)"
 msgstr "Misslyckades med att l�sa fr�n barnr�r (%s)"
 
-#: gconf/gconf-internals.c:3785
+#: gconf/gconf-internals.c:3789
 #, c-format
 msgid "Failed to fork (%s)"
 msgstr "Misslyckades med att grena (%s)"
 
-#: gconf/gconf-internals.c:3925
+#: gconf/gconf-internals.c:3929
 #, c-format
 msgid "Failed to change to directory '%s' (%s)"
 msgstr "Misslyckades med att byta till katalogen \"%s\" (%s)"
 
-#: gconf/gconf-internals.c:3935
+#: gconf/gconf-internals.c:3939
 #, c-format
 msgid "Failed to execute child process (%s)"
 msgstr "Misslyckades med att k�ra barnprocess (%s)"
 
-#: gconf/gconf-internals.c:3944
+#: gconf/gconf-internals.c:3948
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
 msgstr ""
 "Misslyckades med att omdirigera utdata eller indata till barnprocess (%s)"
 
-#: gconf/gconf-internals.c:3953
+#: gconf/gconf-internals.c:3957
 #, c-format
 msgid "Failed to fork child process (%s)"
 msgstr "Misslyckades med att grena barnprocess (%s)"
 
-#: gconf/gconf-internals.c:3961
+#: gconf/gconf-internals.c:3965
 msgid "Unknown error executing child process"
 msgstr "Ok�nt fel vid k�rning av barnprocess"
 
-#: gconf/gconf-internals.c:3982
+#: gconf/gconf-internals.c:3986
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr "Misslyckades med att l�sa tillr�ckligt med pid-barnr�r (%s)"
 
-#: gconf/gconf-internals.c:4032
+#: gconf/gconf-internals.c:4036
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr "Misslyckades med att skapa r�r f�r kommunikation med barnprocess (%s)"
@@ -734,16 +734,16 @@ msgstr "Misslyckades med att skapa r�r f�r kommunikation med barnprocess (%s)"
 msgid "Failed to load source `%s': %s"
 msgstr "Misslyckades med att l�sa in k�llan \"%s\": %s"
 
-#: gconf/gconf-sources.c:510
+#: gconf/gconf-sources.c:544
 #, 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:567
+#: gconf/gconf-sources.c:601
 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:596
+#: gconf/gconf-sources.c:630
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -752,7 +752,7 @@ 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:608
+#: gconf/gconf-sources.c:642
 #, c-format
 msgid ""
 "Unable to store a value at key '%s', as the configuration server has no "
@@ -777,17 +777,17 @@ msgstr ""
 "fj�rranslutningar? Som alltid, kontrollera user.*-systemloggen f�r detaljer "
 "om problem om problem som gconfd har st�tt p�."
 
-#: gconf/gconf-sources.c:1164
+#: gconf/gconf-sources.c:1198
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Fel vid s�kning av metainformation: %s"
 
-#: gconf/gconf-sources.c:1233
+#: gconf/gconf-sources.c:1267
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Fel vid h�mtning av metainformation: %s"
 
-#: gconf/gconf-sources.c:1257
+#: gconf/gconf-sources.c:1291
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 8f79c570..1eae6d9c 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-11-14 14:14-0500\n"
+"POT-Creation-Date: 2002-02-04 18:21-0500\n"
 "PO-Revision-Date: 2001-11-15 02:50+0200\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@fide.org>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
@@ -32,7 +32,7 @@ msgstr "BDB modülü başlatılıyor"
 msgid "Couldn't find the %s root directory in the address `%s'"
 msgstr "`%s' kök dizini `%s' adresinde bulunamadı"
 
-#: backends/dir-utils.c:124 backends/xml-backend.c:301 backends/xml-dir.c:1053
+#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1050
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "`%s' dizini oluşturulamadı: %s"
@@ -46,26 +46,26 @@ msgstr "%s dizini (%s adresindeki) okunamaz/yazılamaz"
 msgid "Unloading XML backend module."
 msgstr "XML modülü kaldırılıyor."
 
-#: backends/xml-backend.c:286
+#: backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "`%s' adresinde XML kök dizini bulunamadı."
 
-#: backends/xml-backend.c:386
+#: backends/xml-backend.c:414
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
 msgstr "`%s' adresinde XML kök dizini okunamaz/yazılamaz."
 
-#: backends/xml-backend.c:396
+#: backends/xml-backend.c:424
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "%s kökündeki XML kaynak dizin/dosya erişim izinleri: %o/%o"
 
-#: backends/xml-backend.c:680
+#: backends/xml-backend.c:708
 msgid "Initializing XML backend module"
 msgstr "XML modülü başlatılıyor"
 
-#: backends/xml-backend.c:745
+#: backends/xml-backend.c:773
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "`%s' XML dizininde kilitleme yapılamadı: %s"
@@ -88,7 +88,8 @@ msgstr ""
 msgid ""
 "%u items remain in the cache after cleaning already-synced items older than %"
 "u seconds"
-msgstr "%u öğe arabellekte kaldı. %u saniyeden daha eski eşzamanlı öğeler silindi."
+msgstr ""
+"%u öğe arabellekte kaldı. %u saniyeden daha eski eşzamanlı öğeler silindi."
 
 #: backends/xml-dir.c:164
 #, c-format
@@ -131,32 +132,32 @@ msgid "Failed to delete old file `%s': %s"
 msgstr "Eski dosya `%s' silinemedi: %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:806
+#: backends/xml-dir.c:803
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "`%s' durumlanamadı: %s"
 
-#: backends/xml-dir.c:950
+#: backends/xml-dir.c:947
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "`%s' girdisi `%s' içinde tekrarlandı, yoksayılıyor"
 
-#: backends/xml-dir.c:972
+#: backends/xml-dir.c:969
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "`%s' XML dosyasında isimsiz girdi var, yoksayılıyor"
 
-#: backends/xml-dir.c:980
+#: backends/xml-dir.c:977
 #, c-format
 msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
 msgstr "`%s' XML dosyasındaki ilk düğüm <%s> bir <entry> değil, yoksayılıyor"
 
-#: backends/xml-dir.c:1069
+#: backends/xml-dir.c:1066
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "`%s' dosyası oluşturulamadı: %s"
 
-#: backends/xml-dir.c:1077
+#: backends/xml-dir.c:1074
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "`%s' dosyası kapatılamadı: %s"
@@ -203,7 +204,8 @@ msgstr "Bir XML liste düğümü içindeki <%s> XML düğümü anlaşılamadı"
 
 #: backends/xml-entry.c:1051
 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"
+msgstr ""
+"Bir liste düğümü içindeki tür (liste, değer çifti ya da  her neyse) geçersiz"
 
 #: backends/xml-entry.c:1074
 #, c-format
@@ -336,7 +338,7 @@ msgstr ""
 "Dinleyicinin kaldırılması günlük dosyasına kaydedilemedi (genelde zararsız, "
 "ara sıra ortaya çıkan bir sistem bildiriminin sonucu): %s"
 
-#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1328
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "`%s' için değer alınırken hata: %s"
@@ -589,8 +591,10 @@ msgid "Failed to create or open '%s'"
 msgstr "%s oluşturulması ve açılması başarısız oldu"
 
 #: gconf/gconf-internals.c:2520
-#, c-format
-msgid "Failed to lock '%s': another process has the lock (%s)"
+#, fuzzy, c-format
+msgid ""
+"Failed to lock '%s': probably another process has the lock, or your "
+"operating system has NFS file locking misconfigured (%s)"
 msgstr "'%s' kilitlenemedi: başka bir süreç kilitlemiş olabilir (%s)"
 
 #: gconf/gconf-internals.c:2548
@@ -601,7 +605,8 @@ msgstr "'%s' IOR dosyası başarıyla açılamadı, gconfd bulunamadı: %s"
 #: gconf/gconf-internals.c:2578
 #, c-format
 msgid "gconftool or other non-gconfd process has the lock file '%s'"
-msgstr "gconftool ya da başka bir gconfd olmayan süreç '%s' kilit dosyası oluşturmuş"
+msgstr ""
+"gconftool ya da başka bir gconfd olmayan süreç '%s' kilit dosyası oluşturmuş"
 
 #: gconf/gconf-internals.c:2595
 msgid "couldn't contact ORB to resolve existing gconfd object reference"
@@ -652,12 +657,12 @@ msgstr "%s oluşturulamadı: %s"
 msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
 msgstr "gconfd ile haberleşmek için veri yolu oluşturulamadı: %s\n"
 
-#: gconf/gconf-internals.c:3060
+#: gconf/gconf-internals.c:3064
 #, c-format
 msgid "Failed to launch configuration server: %s\n"
 msgstr "Yapılandırma sunucusu çalıştırılamadı: %s\n"
 
-#: gconf/gconf-internals.c:3084
+#: gconf/gconf-internals.c:3088
 msgid ""
 "Failed to contact configuration server (a likely cause of this is that you "
 "have an existing configuration server (gconfd) running, but it isn't "
@@ -666,49 +671,49 @@ msgid ""
 msgstr ""
 "Yapılandırma sunucusuna bağlanılamadı ( bu durum halen çalışmakta olan bir "
 "yapılandırma sunucusu - gconfd - varsa ancak ona erişilemiyorsa oluşur. Aynı "
-"anda iki makineden birden giriş yaptıysanız, ORBit için TCP ağ yapılandırmasını "
-"etkinleştirmeniz gerekli olabilir. )\n"
+"anda iki makineden birden giriş yaptıysanız, ORBit için TCP ağ "
+"yapılandırmasını etkinleştirmeniz gerekli olabilir. )\n"
 
-#: gconf/gconf-internals.c:3720
+#: gconf/gconf-internals.c:3724
 #, c-format
 msgid "Failed to read from child pipe (%s)"
 msgstr "ast veri yolundan okuma yapılamadı (%s)"
 
-#: gconf/gconf-internals.c:3785
+#: gconf/gconf-internals.c:3789
 #, c-format
 msgid "Failed to fork (%s)"
 msgstr "Ast süreç oluşturulamadı (%s)"
 
-#: gconf/gconf-internals.c:3925
+#: gconf/gconf-internals.c:3929
 #, c-format
 msgid "Failed to change to directory '%s' (%s)"
 msgstr "`%s' kilit dizinine geçilemedi: %s"
 
-#: gconf/gconf-internals.c:3935
+#: gconf/gconf-internals.c:3939
 #, c-format
 msgid "Failed to execute child process (%s)"
 msgstr "Ast süreç çalıştırılamadı (%s)"
 
-#: gconf/gconf-internals.c:3944
+#: gconf/gconf-internals.c:3948
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
 msgstr "Ast sürecin girdi ya da çıktısı yönlendirilemedi (%s)"
 
-#: gconf/gconf-internals.c:3953
+#: gconf/gconf-internals.c:3957
 #, c-format
 msgid "Failed to fork child process (%s)"
 msgstr "Ast süreç astını oluşturamadı (%s)"
 
-#: gconf/gconf-internals.c:3961
+#: gconf/gconf-internals.c:3965
 msgid "Unknown error executing child process"
 msgstr "Ast süreç çalışırken anlaşılamayan hata"
 
-#: gconf/gconf-internals.c:3982
+#: gconf/gconf-internals.c:3986
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr "Ast süreç kimlikli veri yolundan yeterli veri okunamadı (%s)"
 
-#: gconf/gconf-internals.c:4032
+#: gconf/gconf-internals.c:4036
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr "Ast süreç ile haberleşmek için veri yolu oluşturulamadı (%s)"
@@ -718,16 +723,16 @@ msgstr "Ast süreç ile haberleşmek için veri yolu oluşturulamadı (%s)"
 msgid "Failed to load source `%s': %s"
 msgstr "`%s' kaynağı yüklenemedi: %s"
 
-#: gconf/gconf-sources.c:510
+#: gconf/gconf-sources.c:544
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr "`%s' şeması (`%s' için belirtilen) şema olmayan bir değer içeriyor"
 
-#: gconf/gconf-sources.c:567
+#: gconf/gconf-sources.c:601
 msgid "The '/' name can only be a directory, not a key"
 msgstr "'/' ile sadece bir dizin belirtilebilir, bir anahtar değil."
 
-#: gconf/gconf-sources.c:596
+#: gconf/gconf-sources.c:630
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -736,7 +741,7 @@ msgstr ""
 "`%s'in değeri yapılandırma dizinlerinden birindeki bir salt-okunur kaynak "
 "içinde belirtiliyor"
 
-#: gconf/gconf-sources.c:608
+#: gconf/gconf-sources.c:642
 #, c-format
 msgid ""
 "Unable to store a value at key '%s', as the configuration server has no "
@@ -761,17 +766,17 @@ msgstr ""
 "öntanımlı ayarlara sahipse oluşur. Sorunlar hakkındaki ayrıntıları görmek "
 "için user.* sistem günlük dosyasına bakınız."
 
-#: gconf/gconf-sources.c:1164
+#: gconf/gconf-sources.c:1198
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "Meta bilgilerinin bulunmasında hata: %s"
 
-#: gconf/gconf-sources.c:1233
+#: gconf/gconf-sources.c:1267
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "Meta bilgileri alırken hata: %s"
 
-#: gconf/gconf-sources.c:1257
+#: gconf/gconf-sources.c:1291
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
@@ -926,7 +931,8 @@ msgstr ""
 
 #: gconf/gconfd.c:297
 #, 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"
@@ -973,7 +979,8 @@ msgstr ""
 
 #: gconf/gconfd.c:391
 #, 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"
@@ -997,7 +1004,8 @@ msgstr "ConfigServer için nesne başvurusu alınamadı"
 #: gconf/gconfd.c:605
 #, c-format
 msgid "Failed to write byte to pipe fd %d so client program may hang: %s"
-msgstr "fd %d veri yoluna bayt yazılamadı, istemci uygulama çökmüş olabilir: %s"
+msgstr ""
+"fd %d veri yoluna bayt yazılamadı, istemci uygulama çökmüş olabilir: %s"
 
 #: gconf/gconfd.c:615
 #, c-format
@@ -1017,12 +1025,12 @@ msgstr "Kapanıyor"
 msgid "GConf server is not in use, shutting down."
 msgstr "GConf sunucusu kullanımda değil, kapanıyor."
 
-#: gconf/gconfd.c:1049
+#: gconf/gconfd.c:1059
 #, c-format
 msgid "Returning exception: %s"
 msgstr "Dönen olağandışılık: %s"
 
-#: gconf/gconfd.c:1149
+#: gconf/gconfd.c:1159
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -1031,59 +1039,63 @@ msgstr ""
 "gconfd günlük dosyası açılamadı; gconfd kapandıktan sonra dinleyiciler "
 "etkinleştirilemeyecek (%s)"
 
-#: gconf/gconfd.c:1184
+#: gconf/gconfd.c:1194
 #, 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:1253
+#: gconf/gconfd.c:1263
 #, 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:1267
+#: gconf/gconfd.c:1277
 #, 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:1276
+#: gconf/gconfd.c:1286
 #, 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:1290
+#: gconf/gconfd.c:1300
 #, 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:1300
+#: gconf/gconfd.c:1310
 #, 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:1309
+#: gconf/gconfd.c:1319
 #, c-format
-msgid "Failed to restore original saved state file that had been moved to '%s': %s"
+msgid ""
+"Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr "'%s' e taşınmış olan durum kayıt dosyası özgün haline getirilemedi: %s"
 
-#: gconf/gconfd.c:1784
+#: gconf/gconfd.c:1794
 #, 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:1830
+#: gconf/gconfd.c:1840
 #, c-format
 msgid "Error reading saved state file: %s"
 msgstr "Durum kayıt dosyası okunurken hata: %s"
 
-#: gconf/gconfd.c:1883
+#: gconf/gconfd.c:1893
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "Durum kayıt dosyası '%s' açılamadı: %s"
 
-#: gconf/gconfd.c:2000
+#: gconf/gconfd.c:2010
 #, c-format
 msgid ""
 "Failed to log addition of listener to gconfd logfile; won't be able to re-"
@@ -1092,7 +1104,7 @@ msgstr ""
 "gconfd günlük dosyasına dinleyici eklenmesi kaydedilemedi; gconfd "
 "kapandığında dinleyici tekrar eklenemeyecek (%s)"
 
-#: gconf/gconfd.c:2005
+#: gconf/gconfd.c:2015
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously re-"
@@ -1101,28 +1113,30 @@ msgstr ""
 "gconfd günlük dosyasına dinleyici kaldırılması kaydedilemedi; gconfd "
 "kapandığında dinleyici istenmediği halde tekrar eklenebilir (%s)"
 
-#: gconf/gconfd.c:2028 gconf/gconfd.c:2193
+#: gconf/gconfd.c:2038 gconf/gconfd.c:2203
 #, c-format
 msgid "Failed to get IOR for client: %s"
 msgstr "İstemci için IOR alınamadı: %s"
 
-#: gconf/gconfd.c:2043
+#: gconf/gconfd.c:2053
 #, c-format
 msgid "Failed to open saved state file: %s"
 msgstr "Durum kayıt dosyası açılamadı: %s"
 
-#: gconf/gconfd.c:2056
+#: gconf/gconfd.c:2066
 #, 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:2064
+#: gconf/gconfd.c:2074
 #, 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:2154
-msgid "Some client removed itself from the GConf server when it hadn't been added."
+#: gconf/gconfd.c:2164
+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
@@ -1131,7 +1145,8 @@ msgstr "Yardım seçenekleri"
 
 #: gconf/gconftool.c:77
 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
 msgid "Print the value of a key to standard output."
@@ -1308,7 +1323,8 @@ msgstr "Bu anahtara uygulanan şemanın ismi alınır"
 
 #: gconf/gconftool.c:321
 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
 msgid "Get the name of the default source"
@@ -1389,394 +1405,404 @@ 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"
+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
+msgid "You should use --direct when using a non-default configuration source\n"
+msgstr ""
+
+#: gconf/gconftool.c:531
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "GConf başlatılamadı: %s\n"
 
-#: gconf/gconftool.c:560
+#: gconf/gconftool.c:566
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "GCONF_CONFIG_SOURCE çevre değişkeni ayarlanmış olmalı\n"
 
-#: gconf/gconftool.c:589
+#: gconf/gconftool.c:595
 #, 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:790
+#: gconf/gconftool.c:796
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Kapanma hatası: %s\n"
 
-#: gconf/gconftool.c:833
+#: gconf/gconftool.c:839
 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:867
+#: gconf/gconftool.c:873
 #, c-format
 msgid "Failure listing entries in `%s': %s\n"
 msgstr "`%s' içinde girdiler listelenemedi: %s\n"
 
-#: gconf/gconftool.c:885
+#: gconf/gconftool.c:891
 msgid "(no value set)"
 msgstr "(belirtilmiş değer yok)"
 
-#: gconf/gconftool.c:940
+#: gconf/gconftool.c:946
 #, 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:954
+#: gconf/gconftool.c:960
 msgid "Must specify a key or keys to get\n"
 msgstr "Alınacak anahtar ya da anahtarlar belirtilmelidir.\n"
 
-#: gconf/gconftool.c:989
+#: gconf/gconftool.c:995
 #, c-format
 msgid "Type: %s\n"
 msgstr "Tür: %s\n"
 
-#: gconf/gconftool.c:990
+#: gconf/gconftool.c:996
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Liste Türü: %s\n"
 
-#: gconf/gconftool.c:991
+#: gconf/gconftool.c:997
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Car Türü: %s\n"
 
-#: gconf/gconftool.c:992
+#: gconf/gconftool.c:998
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Cdr Türü: %s\n"
 
-#: gconf/gconftool.c:997
+#: gconf/gconftool.c:1003
 #, c-format
 msgid "Default Value: %s\n"
 msgstr "Öntanımlı Değer: %s\n"
 
-#: gconf/gconftool.c:997 gconf/gconftool.c:999 gconf/gconftool.c:1000
-#: gconf/gconftool.c:1001
+#: gconf/gconftool.c:1003 gconf/gconftool.c:1005 gconf/gconftool.c:1006
+#: gconf/gconftool.c:1007
 msgid "Unset"
 msgstr "Tanımsız"
 
-#: gconf/gconftool.c:999
+#: gconf/gconftool.c:1005
 #, c-format
 msgid "Owner: %s\n"
 msgstr "Sahibi: %s\n"
 
-#: gconf/gconftool.c:1000
+#: gconf/gconftool.c:1006
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Özet: %s\n"
 
-#: gconf/gconftool.c:1001
+#: gconf/gconftool.c:1007
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Açıklama: %s\n"
 
-#: gconf/gconftool.c:1010 gconf/gconftool.c:1304
+#: gconf/gconftool.c:1016 gconf/gconftool.c:1310
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "%s için belirtilmiş bir değer yok\n"
 
-#: gconf/gconftool.c:1014 gconf/gconftool.c:1308
+#: gconf/gconftool.c:1020 gconf/gconftool.c:1314
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "`%s' için değer alınamadı: %s\n"
 
-#: gconf/gconftool.c:1057 gconf/gconftool.c:1069
+#: gconf/gconftool.c:1063 gconf/gconftool.c:1075
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "`%s' türü anlaşılamadı\n"
 
-#: gconf/gconftool.c:1081
+#: gconf/gconftool.c:1087
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Argüman olarak değişik anahtarlar/değerler belirtilmelidir\n"
 
-#: gconf/gconftool.c:1101
+#: gconf/gconftool.c:1107
 #, 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:1129
+#: gconf/gconftool.c:1135
 msgid "Cannot set schema as value\n"
 msgstr "Bir değer olarak şema belirtilemez\n"
 
-#: gconf/gconftool.c:1139
+#: gconf/gconftool.c:1145
 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:1153
-msgid "When setting a pair you must specify a primitive car-type and cdr-type\n"
+#: gconf/gconftool.c:1159
+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:1168
+#: gconf/gconftool.c:1174
 #, c-format
 msgid "Error: %s\n"
 msgstr "Hata: %s\n"
 
-#: gconf/gconftool.c:1181
+#: gconf/gconftool.c:1187
 #, c-format
 msgid "Error setting value: %s\n"
 msgstr "Değer belirlenirken hata: %s\n"
 
-#: gconf/gconftool.c:1199
+#: gconf/gconftool.c:1205
 #, c-format
 msgid "Error syncing: %s\n"
 msgstr "Eşzamanlamada hata: %s\n"
 
-#: gconf/gconftool.c:1222
+#: gconf/gconftool.c:1228
 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:1242
+#: gconf/gconftool.c:1248
 #, c-format
 msgid "No schema known for `%s'\n"
 msgstr "`%s' için bilinen bir şema yok\n"
 
-#: gconf/gconftool.c:1275
+#: gconf/gconftool.c:1281
 #, 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:1280
+#: gconf/gconftool.c:1286
 #, c-format
 msgid "Error getting schema at '%s': %s\n"
 msgstr "`%s' de şema alınırken hata: %s\n"
 
-#: gconf/gconftool.c:1287
+#: gconf/gconftool.c:1293
 #, c-format
 msgid "No schema stored at '%s'\n"
 msgstr "`%s' de kayıtlı şema yok\n"
 
-#: gconf/gconftool.c:1290
+#: gconf/gconftool.c:1296
 #, c-format
 msgid "Value at '%s' is not a schema\n"
 msgstr "'%s' deki değer bir şema değil\n"
 
-#: gconf/gconftool.c:1346
+#: gconf/gconftool.c:1352
 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:1353
+#: gconf/gconftool.c:1359
 #, 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:1373
+#: gconf/gconftool.c:1379
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "Tek argüman olarak anahtar (şema ismi) belirtilmelidir\n"
 
-#: gconf/gconftool.c:1415
+#: gconf/gconftool.c:1421
 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:1435
+#: gconf/gconftool.c:1441
 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:1455
+#: gconf/gconftool.c:1461
 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:1470
+#: gconf/gconftool.c:1476
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Değer belirlenirken hata: %s"
 
-#: gconf/gconftool.c:1484
+#: gconf/gconftool.c:1490
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Eşzamanlamada hata: %s"
 
-#: gconf/gconftool.c:1499
+#: gconf/gconftool.c:1505
 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:1513
+#: gconf/gconftool.c:1519
 msgid "Must specify one or more keys to unset.\n"
 msgstr "Kaldırılacak anahtarlar belirtilmelidir.\n"
 
-#: gconf/gconftool.c:1524
+#: gconf/gconftool.c:1530
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "`%s' kaldırılırken hata: %s\n"
 
-#: gconf/gconftool.c:1547
+#: gconf/gconftool.c:1553
 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:1581
+#: gconf/gconftool.c:1587
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Dizinler listelenirken hata: %s\n"
 
-#: gconf/gconftool.c:1623
+#: gconf/gconftool.c:1629
 #, 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:1632
+#: gconf/gconftool.c:1638
 #, 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:1643 gconf/gconftool.c:1673 gconf/gconftool.c:1702
+#: gconf/gconftool.c:1649 gconf/gconftool.c:1679 gconf/gconftool.c:1708
 #, 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:1661
+#: gconf/gconftool.c:1667
 #, 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:1686
+#: gconf/gconftool.c:1692
 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:1715
+#: gconf/gconftool.c:1721
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "UYARI: gconftoool hatası GConfValueType bilinmiyor\n"
 
-#: gconf/gconftool.c:1762 gconf/gconftool.c:1783 gconf/gconftool.c:1804
-#: gconf/gconftool.c:1825
+#: gconf/gconftool.c:1768 gconf/gconftool.c:1789 gconf/gconftool.c:1810
+#: gconf/gconftool.c:1831
 #, 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:1779
+#: gconf/gconftool.c:1785
 #, 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:1800
+#: gconf/gconftool.c:1806
 #, 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:1821
+#: gconf/gconftool.c:1827
 #, 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:1849
+#: gconf/gconftool.c:1855
 msgid "WARNING: empty <applyto> node"
 msgstr "UYARI: boş <applyto> düğümü"
 
-#: gconf/gconftool.c:1852 gconf/gconftool.c:2115
+#: gconf/gconftool.c:1858 gconf/gconftool.c:2121
 #, 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:1862
+#: gconf/gconftool.c:1868
 msgid "WARNING: no key specified for schema\n"
 msgstr "UYARI: şema için belirtilmiş bir anahtar yok\n"
 
-#: gconf/gconftool.c:1895
+#: gconf/gconftool.c:1901
 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:1901
+#: gconf/gconftool.c:1907
 #, 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:1982
+#: gconf/gconftool.c:1988
 #, 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:2011
+#: gconf/gconftool.c:2017
 #, 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:2019
+#: gconf/gconftool.c:2025
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "`%s' konumu için `%s' şeması yüklendi\n"
 
-#: gconf/gconftool.c:2041
+#: gconf/gconftool.c:2047
 #, 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:2049
+#: gconf/gconftool.c:2055
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "`%s' şeması `%s' anahtarına iliştirildi\n"
 
-#: gconf/gconftool.c:2128
+#: gconf/gconftool.c:2134
 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:2157
+#: gconf/gconftool.c:2165
 #, 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:2179
+#: gconf/gconftool.c:2188
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "`%s' açılamadı: %s\n"
 
-#: gconf/gconftool.c:2186
+#: gconf/gconftool.c:2195
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Belge %s boş mu?\n"
 
-#: gconf/gconftool.c:2198
+#: gconf/gconftool.c:2207
 #, 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:2211
+#: gconf/gconftool.c:2220
 #, 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:2225
+#: gconf/gconftool.c:2234
 #, 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:2236 gconf/gconftool.c:2268
+#: gconf/gconftool.c:2245 gconf/gconftool.c:2277
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Yapılandırma verisini eşzamanlarken hata: %s"
 
-#: gconf/gconftool.c:2252
+#: gconf/gconftool.c:2261
 msgid "Must specify some schema files to install\n"
 msgstr "Yüklenecek şema dosyaları belirtilmeli\n"
 
-#: gconf/gconftool.c:2289
+#: gconf/gconftool.c:2298
 #, c-format
 msgid ""
 "\n"
@@ -1785,16 +1811,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2309
+#: gconf/gconftool.c:2318
 #, 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:2435
+#: gconf/gconftool.c:2444
 msgid "Must specify some keys to break\n"
 msgstr "Kırılacak anahtarlar belirtilmeli\n"
 
-#: gconf/gconftool.c:2441
+#: gconf/gconftool.c:2450
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1803,11 +1829,11 @@ msgstr ""
 "Uygulamanız anahtara hatalı değerler atayarak kırmaya çalışıyor:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2459
+#: gconf/gconftool.c:2468
 msgid "Must specify some directories to break\n"
 msgstr "Kırılacak dizinler belirtilmeli\n"
 
-#: gconf/gconftool.c:2478
+#: gconf/gconftool.c:2487
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1832,4 +1858,3 @@ msgstr "GConf uyarısı: `%s' içindeki çiftlerin listelenmesi başarısız old
 #, 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 e2f84f52..06a5f35f 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
-"POT-Creation-Date: 2001-08-15 18:01-0400\n"
+"POT-Creation-Date: 2002-02-04 18:21-0500\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"
@@ -31,7 +31,7 @@ msgstr "�Φæ�̦��æ� ���������� ������ BDB"
 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
+#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1050
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "��������� �������� ������� \"%s\": %s"
@@ -47,27 +47,27 @@ msgstr ""
 msgid "Unloading XML backend module."
 msgstr "������������ ���������� ������ XML."
 
-#: backends/xml-backend.c:286
+#: backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "�� ������� צ������ ��������� ������� XML �� ������� \"%s\""
 
-#: backends/xml-backend.c:386
+#: backends/xml-backend.c:414
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
 msgstr ""
 "��������� ������� � �� �������� � ��������� ������� XML �� ������� \"%s\""
 
-#: backends/xml-backend.c:396
+#: backends/xml-backend.c:424
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "����� ������� ��� ������� XML � %s: %o/%o"
 
-#: backends/xml-backend.c:680
+#: backends/xml-backend.c:708
 msgid "Initializing XML backend module"
 msgstr "�Φæ�̦��æ� ���������� ������ XML"
 
-#: backends/xml-backend.c:745
+#: backends/xml-backend.c:773
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "�� ������� צ�������� צ� ���������� �������� XML \"%s\": %s"
@@ -136,32 +136,32 @@ msgid "Failed to delete old file `%s': %s"
 msgstr "�� ������� ������ ������ ���� \"%s\": %s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:806
+#: backends/xml-dir.c:803
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "�� ������� �������� ���������Ԧ \"%s\": %s"
 
-#: backends/xml-dir.c:950
+#: backends/xml-dir.c:947
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "���������� ��������� \"%s\" � \"%s\", ��Ϧ���������"
 
-#: backends/xml-dir.c:972
+#: backends/xml-dir.c:969
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "��������� ��� ����� � XML-���̦ \"%s\", ��Ϧ���������"
 
-#: backends/xml-dir.c:979
-#, c-format
-msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
+#: backends/xml-dir.c:977
+#, fuzzy, c-format
+msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
 msgstr "����� ��������� Ҧ��� � XML-���̦ \"%s\" �� <entry>, �����������"
 
-#: backends/xml-dir.c:1067
+#: backends/xml-dir.c:1066
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "�� ������� �������� ���� \"%s\": %s"
 
-#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2494
+#: backends/xml-dir.c:1074
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "�� ������� ������� ���� \"%s\": %s"
@@ -172,11 +172,6 @@ msgstr "�� ������� ������� ���� \"%s\": %s"
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "����������� XML-����� � ������ \"%s\": %s"
 
-#: backends/xml-entry.c:200
-#, c-format
-msgid "%s"
-msgstr "%s"
-
 #: backends/xml-entry.c:327
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
@@ -342,7 +337,7 @@ msgid ""
 "result in a notification weirdly reappearing): %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1328
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "������� ��������� �������� \"%s\": %s"
@@ -451,198 +446,290 @@ msgstr "�� ������� �����������"
 msgid "No database available to save your configuration"
 msgstr "����� ��������� ��� ����� ��� ������ ���ϧ ���Ʀ����æ�"
 
-#: gconf/gconf-internals.c:87
+#: gconf/gconf-internals.c:114
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr "����� \"/\" � ���ަ \"%s\""
 
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:227
+#, c-format
+msgid "Invalid UTF-8 in string value in '%s'"
+msgstr ""
+
+#: gconf/gconf-internals.c:286
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "�� ������� �������������� CORBA-�������� �������� ������"
 
-#: gconf/gconf-internals.c:253
+#: gconf/gconf-internals.c:288
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "����������� ��� �������� ������ � %s"
 
-#: gconf/gconf-internals.c:266
+#: gconf/gconf-internals.c:301
 msgid "Received list from gconfd with a bad list type"
 msgstr "��� gconfd �������� ������ � ������� ����� ������"
 
-#: gconf/gconf-internals.c:447
+#: gconf/gconf-internals.c:482
 msgid "Failed to convert object to IOR"
 msgstr "�� ������� ����������� ��'��� � IOR"
 
-#: gconf/gconf-internals.c:813
+#: gconf/gconf-internals.c:619
+msgid "Invalid UTF-8 in locale for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:627
+msgid "Invalid UTF-8 in short description for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:635
+msgid "Invalid UTF-8 in long description for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:643
+msgid "Invalid UTF-8 in owner for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:868
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "�� ������� צ������ ���� ����� \"%s\": %s\n"
 
-#: gconf/gconf-internals.c:873
+#: gconf/gconf-internals.c:928
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "��������� ������� \"%s\"\n"
 
-#: gconf/gconf-internals.c:885
+#: gconf/gconf-internals.c:940
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "������� ���������� � ����� \"%s\": %s\n"
 
-#: gconf/gconf-internals.c:1327
+#: gconf/gconf-internals.c:1271 gconf/gconf-internals.c:1337
+#: gconf/gconf-value.c:125 gconf/gconf-value.c:224 gconf/gconf-value.c:366
+#: gconf/gconf-value.c:1084
+msgid "Text contains invalid UTF-8"
+msgstr ""
+
+#: gconf/gconf-internals.c:1422
 #, c-format
 msgid "Expected list, got %s"
 msgstr "�ަ������� ������, �������� %s"
 
-#: gconf/gconf-internals.c:1337
+#: gconf/gconf-internals.c:1432
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "���������� ������ %s, �������� ������ %s"
 
-#: gconf/gconf-internals.c:1476
+#: gconf/gconf-internals.c:1571
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "�ަ�������� ����, �������� %s"
 
-#: gconf/gconf-internals.c:1490
+#: gconf/gconf-internals.c:1585
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 "�ަ�������� ���� (%s,%s), �������� ���� � ��צ����� ����� ��� ����� "
 "����������"
 
-#: gconf/gconf-internals.c:1506
+#: gconf/gconf-internals.c:1601
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "�ަ�������� ���� ���� (%s,%s) �������� ���� (%s,%s)"
 
-#: gconf/gconf-internals.c:1622
+#: gconf/gconf-internals.c:1717
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "����� � ������ �� ����������� � �����"
 
-#: gconf/gconf-internals.c:1684
+#: gconf/gconf-internals.c:1779
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "����� � ������ �� ˦�������� ������"
 
-#: gconf/gconf-internals.c:2164 gconf/gconf.c:3092
+#: gconf/gconf-internals.c:1915
+msgid "Encoded value is not valid UTF-8"
+msgstr ""
+
+#: gconf/gconf-internals.c:2265 gconf/gconf.c:3082
 #, c-format
 msgid "CORBA error: %s"
 msgstr "������� CORBA: %s"
 
-#: gconf/gconf-internals.c:2180
+#: gconf/gconf-internals.c:2281
 #, c-format
 msgid "OAF problem description: '%s'"
 msgstr "���� �������� OAF: \"%s\""
 
-#: gconf/gconf-internals.c:2186
+#: gconf/gconf-internals.c:2287
 msgid "attempt to remove not-listed OAF object directory"
 msgstr "������ �������� ���������� � ������ ������� ��'��Ԧ� OAF"
 
-#: gconf/gconf-internals.c:2191
+#: gconf/gconf-internals.c:2292
 msgid "attempt to add already-listed OAF directory"
 msgstr "������ ������ ��� �������� � ������ ������� OAF"
 
-#: gconf/gconf-internals.c:2198
+#: gconf/gconf-internals.c:2299
 #, c-format
 msgid "OAF parse error: %s"
 msgstr "������� ���̦�� OAF: %s"
 
-#: gconf/gconf-internals.c:2203
+#: gconf/gconf-internals.c:2304
 msgid "Unknown OAF error"
 msgstr "��צ���� ������� OAF"
 
-#: gconf/gconf-internals.c:2290
-#, c-format
-msgid "No ior file in `%s'"
-msgstr "��צ���� ���� ior � \"%s\""
-
-#: gconf/gconf-internals.c:2321
-#, c-format
-msgid "gconfd taking lock `%s' from some other process"
-msgstr "gconfd ����դ \"%s\" צ� ������ ����� �����Ӧ�"
+#: gconf/gconf-internals.c:2437
+#, fuzzy, c-format
+msgid "Could not lock temporary file '%s': %s"
+msgstr "�� ������� צ������ ���� ����� \"%s\": %s\n"
 
-#: gconf/gconf-internals.c:2332
+#: gconf/gconf-internals.c:2464
 #, c-format
-msgid "Another program has lock `%s'"
-msgstr "���� �������� ����������� \"%s\""
+msgid "Could not create file '%s', probably because it already exists"
+msgstr ""
 
-#: gconf/gconf-internals.c:2351
-msgid "couldn't contact ORB to ping existing gconfd"
-msgstr "�� ������� �'�������� � ORB, ��� ������������ gconfd"
+#: gconf/gconf-internals.c:2510
+#, fuzzy, c-format
+msgid "Failed to create or open '%s'"
+msgstr "�� ������� �������� ���� \"%s\": %s"
 
-#: gconf/gconf-internals.c:2359
+#: gconf/gconf-internals.c:2520
 #, c-format
 msgid ""
-"Removing stale lock `%s' because IOR couldn't be converted to object "
-"reference, IOR `%s'"
+"Failed to lock '%s': probably another process has the lock, or your "
+"operating system has NFS file locking misconfigured (%s)"
 msgstr ""
-"��������� �����Ҧ���� ���������� \"%s\" ����, �� IOR �� ������� ����������� "
-"� ��������� �� ��'���, IOR \"%s\""
 
-#: gconf/gconf-internals.c:2371
+#: gconf/gconf-internals.c:2548
 #, c-format
-msgid "Removing stale lock `%s' because of error pinging server: %s"
+msgid "IOR file '%s' not opened successfully, no gconfd located: %s"
 msgstr ""
-"��������� �����Ҧ���� ���������� \"%s\" ����� ������� ���������� �������: %s"
 
-#: gconf/gconf-internals.c:2383
+#: gconf/gconf-internals.c:2578
 #, c-format
-msgid "GConf configuration daemon (gconfd) has lock `%s'"
-msgstr "����� ���Ʀ����æ� GConf (gconfd) ���������� \"%s\""
+msgid "gconftool or other non-gconfd process has the lock file '%s'"
+msgstr ""
+
+#: gconf/gconf-internals.c:2595
+#, fuzzy
+msgid "couldn't contact ORB to resolve existing gconfd object reference"
+msgstr "�� ������� �'�������� � ORB, ��� ������������ gconfd"
 
-#: gconf/gconf-internals.c:2397
+#: gconf/gconf-internals.c:2627
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "�� ������� �������� ������� \"%s\": %s"
 
-#: gconf/gconf-internals.c:2446
-#, c-format
-msgid "Can't create lock `%s': %s"
-msgstr "��������� �������� ���������� \"%s\": %s"
-
-#: gconf/gconf-internals.c:2482
+#: gconf/gconf-internals.c:2686
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "��������� �������� � ���� \"%s\": %s"
 
-#: gconf/gconf-internals.c:2532
+#: gconf/gconf-internals.c:2727
 #, c-format
-msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
-msgstr "��������� צ������ ���� ���������� \"%s\"; ������� צ� �� ���: %s"
+msgid "We didn't have the lock on file `%s', but we should have"
+msgstr ""
 
-#: gconf/gconf-internals.c:2549
-#, c-format
-msgid "Corrupt lock file `%s', removing anyway"
-msgstr "���������� ���� ���������� \"%s\", �����Ѥ����"
+#: gconf/gconf-internals.c:2748
+#, fuzzy, c-format
+msgid "Failed to link '%s' to '%s': %s"
+msgstr "�� ������� ������������� \"%s\" � \"%s\": %s"
 
-#: gconf/gconf-internals.c:2559
+#: gconf/gconf-internals.c:2760
+#, fuzzy, c-format
+msgid "Failed to remove lock file `%s': %s"
+msgstr "�� ������� �������� ���� \"%s\": %s"
+
+#: gconf/gconf-internals.c:2779
+#, fuzzy, c-format
+msgid "Failed to clean up file '%s': %s"
+msgstr "�� ������� ������� ���� \"%s\": %s"
+
+#: gconf/gconf-internals.c:2793
+#, fuzzy, c-format
+msgid "Failed to remove lock directory `%s': %s"
+msgstr "�� ������� �צ������ ������������ ������� \"%s\": %s"
+
+#: gconf/gconf-internals.c:3003 gconf/gconfd.c:580
+#, fuzzy, c-format
+msgid "Failed to create %s: %s"
+msgstr "�� ������� �������� ���� \"%s\": %s"
+
+#: gconf/gconf-internals.c:3036
 #, c-format
+msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
+msgstr ""
+
+#: gconf/gconf-internals.c:3064
+#, fuzzy, c-format
+msgid "Failed to launch configuration server: %s\n"
+msgstr "�� ������� �������� ������ �� ������ ���Ʀ����æ�: %s\n"
+
+#: gconf/gconf-internals.c:3088
 msgid ""
-"Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
-"took our lock"
+"Failed to contact configuration server (a likely cause of this is that you "
+"have an existing configuration server (gconfd) running, but it isn't "
+"reachable from here - if you're logged in from two machines at once, you may "
+"need to enable TCP networking for ORBit)\n"
 msgstr ""
-"�� �������� ���������� ����� \"%s\" (������Ʀ����� ������� ���������� - %u, "
-"��� ������Ʀ����� - pid %u; �������� ����� ������ ���� ����������"
 
-#: gconf/gconf-internals.c:2576
-#, c-format
-msgid "Failed to release lock directory `%s': %s"
+#: gconf/gconf-internals.c:3724
+#, fuzzy, c-format
+msgid "Failed to read from child pipe (%s)"
 msgstr "�� ������� �צ������ ������������ ������� \"%s\": %s"
 
+#: gconf/gconf-internals.c:3789
+#, fuzzy, c-format
+msgid "Failed to fork (%s)"
+msgstr "�� ������� �������� ���� \"%s\": %s"
+
+#: gconf/gconf-internals.c:3929
+#, fuzzy, c-format
+msgid "Failed to change to directory '%s' (%s)"
+msgstr "�� ������� �צ������ ������������ ������� \"%s\": %s"
+
+#: gconf/gconf-internals.c:3939
+#, fuzzy, c-format
+msgid "Failed to execute child process (%s)"
+msgstr "�� ������� ������ ������ ���� \"%s\": %s"
+
+#: gconf/gconf-internals.c:3948
+#, c-format
+msgid "Failed to redirect output or input of child process (%s)"
+msgstr ""
+
+#: gconf/gconf-internals.c:3957
+#, fuzzy, c-format
+msgid "Failed to fork child process (%s)"
+msgstr "������� ������������ ������� \"%s\": %s"
+
+#: gconf/gconf-internals.c:3965
+msgid "Unknown error executing child process"
+msgstr ""
+
+#: gconf/gconf-internals.c:3986
+#, c-format
+msgid "Failed to read enough data from child pid pipe (%s)"
+msgstr ""
+
+#: gconf/gconf-internals.c:4036
+#, c-format
+msgid "Failed to create pipe for communicating with child process (%s)"
+msgstr ""
+
 #: gconf/gconf-sources.c:320
 #, c-format
 msgid "Failed to load source `%s': %s"
 msgstr "������� ������������ ������� \"%s\": %s"
 
-#: gconf/gconf-sources.c:510
+#: gconf/gconf-sources.c:544
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr "����� \"%s\" ������� ��� \"%s\" ͦ����� �� ����Φ ��������"
 
-#: gconf/gconf-sources.c:567
+#: gconf/gconf-sources.c:601
 msgid "The '/' name can only be a directory, not a key"
 msgstr "����� \"/\" ���� ���� ���� ���������, �� ������"
 
-#: gconf/gconf-sources.c:596
+#: gconf/gconf-sources.c:630
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
@@ -651,91 +738,93 @@ msgstr ""
 "�������� ��� \"%s\" ����������� � �����̦ ���� ��� ���������� �� ������� "
 "������ ���Ʀ����æ����� �����."
 
-#: gconf/gconf-sources.c:608
+#: gconf/gconf-sources.c:642
 #, 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 "
+"somehow we mistakenly created two gconfd processes. If you have two gconfd "
+"processes (or had two at the time the second was launched), logging out, "
+"killing all copies of gconfd, and logging back in may help. Perhaps the "
+"problem is that you attempted to use GConf from two machines at once, and "
+"ORBit still has its default configuration that prevents remote CORBA "
+"connections? As always, check the user.* syslog for details on problems "
 "gconfd encountered."
 msgstr ""
 
-#: gconf/gconf-sources.c:1164
+#: gconf/gconf-sources.c:1198
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr "������� ������ �����������æ�: %s"
 
-#: gconf/gconf-sources.c:1233
+#: gconf/gconf-sources.c:1267
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr "������� ��������� �����������æ�: %s"
 
-#: gconf/gconf-sources.c:1257
+#: gconf/gconf-sources.c:1291
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
 "���� \"%s\" �������� �� ����� ��� ����� \"%s\" �������Ħ ͦ����� ��� \"%s\""
 
-#: gconf/gconf-value.c:82
+#: gconf/gconf-value.c:81
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "�� �����ͦ�� \"%s\" (�ަ�������� æ�� �����)"
 
-#: gconf/gconf-value.c:92
+#: gconf/gconf-value.c:91
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "��� \"%s\" ����� ������ �� ����"
 
-#: gconf/gconf-value.c:113
+#: gconf/gconf-value.c:112
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "�� �����ͦ�� \"%s\" (�ަ�������� Ħ���� �����)"
 
-#: gconf/gconf-value.c:146
+#: gconf/gconf-value.c:156
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "�� �����ͦ�� \"%s\" (�ަ�������� ��Ǧ��� ��������)"
 
-#: gconf/gconf-value.c:214
+#: gconf/gconf-value.c:232
 #, c-format
 msgid "Didn't understand `%s' (list must start with a '[')"
 msgstr "�� �����ͦ�� \"%s\" (������ ��� ���������� � \"[\")"
 
-#: gconf/gconf-value.c:227
+#: gconf/gconf-value.c:245
 #, c-format
 msgid "Didn't understand `%s' (list must end with a ']')"
 msgstr "�� �����ͦ�� \"%s\" (������ ��� ��˦��������� �� \"]\")"
 
-#: gconf/gconf-value.c:278
+#: gconf/gconf-value.c:296
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
 msgstr "�� �����ͦ�� \"%s\" (�������� ������ ������ \"]\" � ������)"
 
-#: gconf/gconf-value.c:309 gconf/gconf-value.c:462
+#: gconf/gconf-value.c:327 gconf/gconf-value.c:488
 #, c-format
 msgid "Didn't understand `%s' (extra trailing characters)"
 msgstr "�� �����ͦ�� \"%s\" (�������� ���צ ������� � ˦�æ)"
 
-#: gconf/gconf-value.c:348
+#: gconf/gconf-value.c:374
 #, c-format
 msgid "Didn't understand `%s' (pair must start with a '(')"
 msgstr "�� �����ͦ�� \"%s\" (���� ��� ���������� � \"(\")"
 
-#: gconf/gconf-value.c:361
+#: gconf/gconf-value.c:387
 #, c-format
 msgid "Didn't understand `%s' (pair must end with a ')')"
 msgstr "�� �����ͦ�� \"%s\" (���� ��� ��˦��������� �� \")\")"
 
-#: gconf/gconf-value.c:391 gconf/gconf-value.c:477
+#: gconf/gconf-value.c:417 gconf/gconf-value.c:503
 #, c-format
 msgid "Didn't understand `%s' (wrong number of elements)"
 msgstr "�� �����ͦ�� \"%s\" (��צ��� ˦��˦��� ������Ԧ�)"
 
-#: gconf/gconf-value.c:431
+#: gconf/gconf-value.c:457
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr "�� �����ͦ�� \"%s\" (�������� ������ ������ \")\" � ��Ҧ)"
@@ -745,90 +834,80 @@ msgstr "�� �����ͦ�� \"%s\" (�������� ������ ������ \")\" � ��Ҧ)"
 msgid "`%s': %s"
 msgstr "\"%s\": %s"
 
-#: gconf/gconf.c:289
+#: gconf/gconf.c:287
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "������ �� �ͦ� ���Ц����� ������ \"%s\""
 
-#: gconf/gconf.c:574
+#: gconf/gconf.c:572
 msgid "Can't add notifications to a local configuration source"
 msgstr "��������� ������ ���צ����� �� ���������� ������� ���Ʀ����æ�"
 
-#: gconf/gconf.c:1870
+#: gconf/gconf.c:1868
 #, c-format
 msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr "�� ������� ������ �̦���� � ������ �������, ������� CORBA: %s"
 
-#: 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. "
-"This is a bug in the OAF package; something went wrong in OAF, and no error "
-"was reported. This is not a bug in the GConf package. Do not report a GConf "
-"bug unless you have information indicating what went wrong with OAF that was "
-"caused by GConf."
-msgstr ""
-
-#: gconf/gconf.c:2198
+#: gconf/gconf.c:2183
 msgid "Failed to init GConf, exiting\n"
 msgstr "�� ������� �Φæ�̦������ GConf: %s, ��Ȧ�\n"
 
-#: gconf/gconf.c:2235
+#: gconf/gconf.c:2220
 msgid "Must begin with a slash (/)"
 msgstr "������ ���������� � \"/\""
 
-#: gconf/gconf.c:2257
+#: gconf/gconf.c:2242
 msgid "Can't have two slashes (/) in a row"
 msgstr "�� ���� ���� ��� \"/\" � �����"
 
-#: gconf/gconf.c:2259
+#: gconf/gconf.c:2244
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr "�� ���� ���� ������ ��� \"/\""
 
-#: gconf/gconf.c:2280
+#: gconf/gconf.c:2265
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "\"%c\" - ��צ���� ������ � ���צ ���ަ�/������Ǧ�"
 
-#: gconf/gconf.c:2294
+#: gconf/gconf.c:2279
 msgid "Key/directory may not end with a slash (/)"
 msgstr "����/������� �� ���� ��˦��������� ������ (/)"
 
-#: gconf/gconf.c:2547
+#: gconf/gconf.c:2520
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr "��������� צ�������� ������ ���Ʀ����æ�: %s"
 
-#: gconf/gconf.c:2608
+#: gconf/gconf.c:2581
 #, c-format
 msgid "Expected float, got %s"
 msgstr "�ަ�������� ����� � ��������� ������, �������� %s"
 
-#: gconf/gconf.c:2643
+#: gconf/gconf.c:2616
 #, c-format
 msgid "Expected int, got %s"
 msgstr "�ަ�������� æ��, �������� %s"
 
-#: gconf/gconf.c:2678
+#: gconf/gconf.c:2651
 #, c-format
 msgid "Expected string, got %s"
 msgstr "�ަ������� �����, �������� %s"
 
-#: gconf/gconf.c:2715
+#: gconf/gconf.c:2688
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "�ަ�������� ��Ǧ���, �������� %s"
 
-#: gconf/gconf.c:2748
+#: gconf/gconf.c:2721
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "�ަ�������� �����, �������� %s"
 
-#: gconf/gconfd.c:248
+#: gconf/gconfd.c:247
 msgid "Shutdown request received"
 msgstr "�������� ����� �� ���������� ������"
 
-#: gconf/gconfd.c:280
+#: gconf/gconfd.c:279
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
@@ -836,7 +915,7 @@ msgstr ""
 "gconfd ����������� � �������������; ������ ����������� gconf.path � "
 "��Ȧ����� ��������"
 
-#: gconf/gconfd.c:298
+#: gconf/gconfd.c:297
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
@@ -844,7 +923,7 @@ msgstr ""
 "�� �������� ���Ʀ����æ���� ���̦�, ������ ����������� ������ ������� "
 "���Ʀ����æ� \"%s\""
 
-#: gconf/gconfd.c:307
+#: gconf/gconfd.c:306
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
@@ -852,16 +931,16 @@ msgstr ""
 "�� �������� ������ ���Ʀ����æ� � ��Ȧ����� ������ڦ, ���Ʀ����æ� �� ���� "
 "���������; ���������� "
 
-#: gconf/gconfd.c:307
+#: gconf/gconfd.c:306
 msgid "/path"
 msgstr ""
 
-#: gconf/gconfd.c:321
+#: gconf/gconfd.c:320
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr "������� ������������ ������ ������ ���Ʀ����æ�: %s"
 
-#: gconf/gconfd.c:333
+#: gconf/gconfd.c:332
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
@@ -869,7 +948,7 @@ msgstr ""
 "������ ���������æ� �� ���� ��Ц��� ���Ц�����, ��������� ����������� �� "
 "�������� ���Ʀ����æ�Φ ��Φ"
 
-#: gconf/gconfd.c:350
+#: gconf/gconfd.c:349
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
@@ -877,13 +956,13 @@ msgstr ""
 "�� ���� ��Ц��� ���Ц����� ������ ���Ʀ����æ�, � �˦ ����� ����������, "
 "������� ���˦ �ͦ�� ���Ʀ����æ� �� �������� ��������"
 
-#: gconf/gconfd.c:376
+#: gconf/gconfd.c:375
 #, c-format
 msgid "Received signal %d, dumping core. Please report a GConf bug."
 msgstr ""
 "�������� �ɭ��� %d, ���� �������. ���� �����, ��צ����� ��� ������� � GConf."
 
-#: gconf/gconfd.c:392
+#: gconf/gconfd.c:391
 #, c-format
 msgid ""
 "Received signal %d, shutting down abnormally. Please file a GConf bug report."
@@ -891,104 +970,51 @@ msgstr ""
 "�������� �ɭ��� %d, ����������� ���������� ������. ���� �����, �צ����� ��� "
 "������� GConf."
 
-#: gconf/gconfd.c:409
+#: gconf/gconfd.c:408
 #, 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:513
+#: gconf/gconfd.c:526
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "������ (���Ӧ� %s), ������ %u ����������� \"%s\""
 
-#: gconf/gconfd.c:540
-msgid ""
-"Failed to init Object Activation Framework: please mail bug report to OAF "
-"maintainers"
-msgstr ""
-"�¦� �Φæ�̦��æ� OAF: ���� �����, ��צ����� ��� ������� ���Φ� "
-"������������� OAF"
-
-#: gconf/gconfd.c:560
+#: gconf/gconfd.c:567
 msgid "Failed to get object reference for ConfigServer"
 msgstr "�� ������� �������� ��������� �� ��'��� ��� ConfigServer"
 
-#: gconf/gconfd.c:573
-#, fuzzy, c-format
-msgid "Failed to create %s: %s"
-msgstr "�� ������� �������� ���� \"%s\": %s"
+#: gconf/gconfd.c:605
+#, c-format
+msgid "Failed to write byte to pipe fd %d so client program may hang: %s"
+msgstr ""
 
-#. Bad hack alert - register the current lockholder with oafd,
-#. * since oafd seems to have forgotten about us.
-#.
-#: gconf/gconfd.c:588
+#: gconf/gconfd.c:615
 #, fuzzy, c-format
-msgid "Failed to get lock for daemon: %s"
+msgid "Failed to get lock for daemon, exiting: %s"
 msgstr "�� ������� �������� IOR ��� �̦����: %s"
 
-#: gconf/gconfd.c:594
-msgid ""
-"Registering existing server with oafd, since OAF appears to have leaked it"
-msgstr ""
-
-#: gconf/gconfd.c:603
-#, fuzzy
-msgid ""
-"OAF doesn't know about our IID; indicates broken installation; can't "
-"register existing server."
-msgstr ""
-"OAF �� ���� ��� ��� IID; �� �צ����� ��� ��צ��� ������������; ��������� "
-"���Ť����������; ��Ȧ�\n"
-
-#: gconf/gconfd.c:607
-#, fuzzy
-msgid ""
-"Another gconfd already registered with OAF, so we can't register the "
-"existing server"
-msgstr "����� gconf ��� ���Ť�������� � OAF; ��Ȧ�\n"
-
-#: gconf/gconfd.c:612
-#, fuzzy
-msgid "Unknown error registering existing gconfd with OAF; exiting"
-msgstr "��צ���� ������� �Ť����æ� gconfd � OAF; ��Ȧ�\n"
-
-#: gconf/gconfd.c:639
-msgid ""
-"OAF doesn't know about our IID; indicates broken installation; can't "
-"register; exiting\n"
-msgstr ""
-"OAF �� ���� ��� ��� IID; �� �צ����� ��� ��צ��� ������������; ��������� "
-"���Ť����������; ��Ȧ�\n"
-
-#: gconf/gconfd.c:643
-msgid "Another gconfd already registered with OAF; exiting\n"
-msgstr "����� gconf ��� ���Ť�������� � OAF; ��Ȧ�\n"
-
-#: gconf/gconfd.c:648
-msgid "Unknown error registering gconfd with OAF; exiting\n"
-msgstr "��צ���� ������� �Ť����æ� gconfd � OAF; ��Ȧ�\n"
-
-#: gconf/gconfd.c:692
+#: gconf/gconfd.c:657
 #, fuzzy, c-format
-msgid "Failed to release lockfile: %s"
+msgid "Error releasing lockfile: %s"
 msgstr "�� ������� �צ������ ������������ ������� \"%s\": %s"
 
-#: gconf/gconfd.c:700
+#: gconf/gconfd.c:665
 msgid "Exiting"
 msgstr "����������"
 
-#: gconf/gconfd.c:725
+#: gconf/gconfd.c:690
 msgid "GConf server is not in use, shutting down."
 msgstr "������ GConf �� ����������դ����, ���������."
 
-#: gconf/gconfd.c:1084
+#: gconf/gconfd.c:1059
 #, c-format
 msgid "Returning exception: %s"
 msgstr "���������� ����������: %s"
 
-#: gconf/gconfd.c:1184
+#: gconf/gconfd.c:1159
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -997,39 +1023,39 @@ msgstr ""
 "�¦� צ��������� ������� gconfd; �� ���� ��������Ԧ צ������� "
 "������������ަ� Ц��� ��������� gconfd (%s)"
 
-#: gconf/gconfd.c:1219
+#: gconf/gconfd.c:1194
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 "�¦� ���������� ������� gconfd; ��Φ ���� ���� ������ �� �������� ����� (%s)"
 
-#: gconf/gconfd.c:1288
+#: gconf/gconfd.c:1263
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "�� ������� צ������ ���� ����������� ����� \"%s\" ��� ������: %s"
 
-#: gconf/gconfd.c:1302
+#: gconf/gconfd.c:1277
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "�� ������� �������� ���� ����������� ����� \"%s\" (���������� %d): %s"
 
-#: gconf/gconfd.c:1311
+#: gconf/gconfd.c:1286
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "�� ������� ������� ����� ���� ����������� ����� \"%s\": %s"
 
-#: gconf/gconfd.c:1325
+#: gconf/gconfd.c:1300
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "�� ������� ������� ������ ���� ����������� ����� \"%s\": %s"
 
-#: gconf/gconfd.c:1335
+#: gconf/gconfd.c:1310
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr "�� ������� ��������� ����� ���� ����������� ����� �� ͦ���: %s"
 
-#: gconf/gconfd.c:1344
+#: gconf/gconfd.c:1319
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
@@ -1037,7 +1063,7 @@ msgstr ""
 "�� ������� צ������� ��ɭ�������� ���� ����������� �����, ���� ���� "
 "���������� � \"%s\": %s"
 
-#: gconf/gconfd.c:1819
+#: gconf/gconfd.c:1794
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
@@ -1045,51 +1071,51 @@ msgstr ""
 "��������� צ������� �������������� �� ����Ӧ \"%s\", �� ������� ����'����� "
 "���� �����"
 
-#: gconf/gconfd.c:1865
+#: gconf/gconfd.c:1840
 #, c-format
 msgid "Error reading saved state file: %s"
 msgstr "������� ���������� ����� ����������� �����: %s"
 
-#: gconf/gconfd.c:1918
+#: gconf/gconfd.c:1893
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "�� ������� צ������ ���� ����������� ����� \"%s\": %s"
 
-#: gconf/gconfd.c:2035
+#: gconf/gconfd.c:2010
 #, 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:2040
+#: gconf/gconfd.c:2015
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously re-"
 "add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:2063 gconf/gconfd.c:2228
+#: gconf/gconfd.c:2038 gconf/gconfd.c:2203
 #, c-format
 msgid "Failed to get IOR for client: %s"
 msgstr "�� ������� �������� IOR ��� �̦����: %s"
 
-#: gconf/gconfd.c:2078
+#: gconf/gconfd.c:2053
 #, c-format
 msgid "Failed to open saved state file: %s"
 msgstr "�� ������� צ������ ���� ����������� �����: %s"
 
-#: gconf/gconfd.c:2091
+#: gconf/gconfd.c:2066
 #, c-format
 msgid "Failed to write client add to saved state file: %s"
 msgstr "�� ������� �������� �̦���� � ���� ����������� �����: %s"
 
-#: gconf/gconfd.c:2099
+#: gconf/gconfd.c:2074
 #, c-format
 msgid "Failed to flush client add to saved state file: %s"
 msgstr "�� ������� ������� �̦���� � ���� ����������� �����: %s"
 
-#: gconf/gconfd.c:2189
+#: gconf/gconfd.c:2164
 msgid ""
 "Some client removed itself from the GConf server when it hadn't been added."
 msgstr "������ �̦��� ������� ���� � ������� GConf, ��� ���� �� ���� ������."
@@ -1367,318 +1393,311 @@ msgstr ""
 "source, ���� ����������դ�� �������� --direct\n"
 
 #: gconf/gconftool.c:525
+msgid "You should use --direct when using a non-default configuration source\n"
+msgstr ""
+
+#: gconf/gconftool.c:531
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "�� ������� �Φæ�̦������ GConf: %s\n"
 
-#: gconf/gconftool.c:550
+#: gconf/gconftool.c:566
 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:565
-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 ""
-
-#: gconf/gconftool.c:587
+#: gconf/gconftool.c:595
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "�� ������� �������� ������ �� ������ ���Ʀ����æ�: %s\n"
 
-#: gconf/gconftool.c:798
+#: gconf/gconftool.c:796
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "������� ���������: %s\n"
 
-#: gconf/gconftool.c:841
+#: gconf/gconftool.c:839
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr "���Ҧ��� ������� ���� �� ¦���� ������Ǧ� ��� ������������ ������.\n"
 
-#: gconf/gconftool.c:875
+#: gconf/gconftool.c:873
 #, fuzzy, c-format
 msgid "Failure listing entries in `%s': %s\n"
 msgstr "��������� �������� ������ ��� � \"%s\": %s"
 
-#: gconf/gconftool.c:893
+#: gconf/gconftool.c:891
 msgid "(no value set)"
 msgstr "(�� ����������� ��������)"
 
-#: gconf/gconftool.c:948
+#: gconf/gconftool.c:946
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "��������� ����������� ������ ���Ʀ����æ� (gconfd): %s\n"
 
-#: gconf/gconftool.c:962
+#: gconf/gconftool.c:960
 msgid "Must specify a key or keys to get\n"
 msgstr "���Ҧ��� ������� ���� ��� ���ަ ��� ���������\n"
 
-#: gconf/gconftool.c:997
+#: gconf/gconftool.c:995
 #, c-format
 msgid "Type: %s\n"
 msgstr "���: %s\n"
 
-#: gconf/gconftool.c:998
+#: gconf/gconftool.c:996
 #, c-format
 msgid "List Type: %s\n"
 msgstr "��� ������: %s\n"
 
-#: gconf/gconftool.c:999
+#: gconf/gconftool.c:997
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "��� CAR: %s\n"
 
-#: gconf/gconftool.c:1000
+#: gconf/gconftool.c:998
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "��� CDR: %s\n"
 
-#: gconf/gconftool.c:1005
+#: gconf/gconftool.c:1003
 #, c-format
 msgid "Default Value: %s\n"
 msgstr "������ ��������: %s\n"
 
-#: gconf/gconftool.c:1005 gconf/gconftool.c:1007 gconf/gconftool.c:1008
-#: gconf/gconftool.c:1009
+#: gconf/gconftool.c:1003 gconf/gconftool.c:1005 gconf/gconftool.c:1006
+#: gconf/gconftool.c:1007
 msgid "Unset"
 msgstr "����� ��������"
 
-#: gconf/gconftool.c:1007
+#: gconf/gconftool.c:1005
 #, c-format
 msgid "Owner: %s\n"
 msgstr "�������: %s\n"
 
-#: gconf/gconftool.c:1008
+#: gconf/gconftool.c:1006
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "�������� ����: %s\n"
 
-#: gconf/gconftool.c:1009
+#: gconf/gconftool.c:1007
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "������ ����: %s\n"
 
-#: gconf/gconftool.c:1018 gconf/gconftool.c:1312
+#: gconf/gconftool.c:1016 gconf/gconftool.c:1310
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "�� ����������� �������� ��� \"%s\"\n"
 
-#: gconf/gconftool.c:1022 gconf/gconftool.c:1316
+#: gconf/gconftool.c:1020 gconf/gconftool.c:1314
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "�� ������� �������� �������� ��� \"%s\": %s\n"
 
-#: gconf/gconftool.c:1065 gconf/gconftool.c:1077
+#: gconf/gconftool.c:1063 gconf/gconftool.c:1075
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "�������ͦ��� ��� \"%s\"\n"
 
-#: gconf/gconftool.c:1089
+#: gconf/gconftool.c:1087
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "���Ҧ��� ������� ��צ �������� ���ަ� � ������� �� �ҭ������\n"
 
-#: gconf/gconftool.c:1109
+#: gconf/gconftool.c:1107
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "����� �������� ��� ������������ ���� �����: \"%s\"\n"
 
-#: gconf/gconftool.c:1137
+#: gconf/gconftool.c:1135
 msgid "Cannot set schema as value\n"
 msgstr "������� ������������� ����� �� ��������\n"
 
-#: gconf/gconftool.c:1147
+#: gconf/gconftool.c:1145
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 "�� ��� ������������ ������ ����Ȧ��� ������� ���ͦ������ ��� list-type\n"
 
-#: gconf/gconftool.c:1161
+#: gconf/gconftool.c:1159
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 "�� ��� ������������ ���� ��� ���Ҧ��� ������� ���ͦ���Φ ���� CAR � CDR\n"
 
-#: gconf/gconftool.c:1176
+#: gconf/gconftool.c:1174
 #, c-format
 msgid "Error: %s\n"
 msgstr "�������: %s\n"
 
-#: gconf/gconftool.c:1189
+#: gconf/gconftool.c:1187
 #, fuzzy, c-format
 msgid "Error setting value: %s\n"
 msgstr "������� ������������ ��������: %s"
 
-#: gconf/gconftool.c:1207
+#: gconf/gconftool.c:1205
 #, fuzzy, c-format
 msgid "Error syncing: %s\n"
 msgstr "������� ������Φ��æ�: %s"
 
-#: gconf/gconftool.c:1230
+#: gconf/gconftool.c:1228
 #, fuzzy
 msgid "Must specify a key or keys on the command line\n"
 msgstr "���Ҧ��� ������� ���� ��� ���ަ ��� ���������\n"
 
-#: gconf/gconftool.c:1250
+#: gconf/gconftool.c:1248
 #, fuzzy, c-format
 msgid "No schema known for `%s'\n"
 msgstr "����� ����� \"%s\"\n"
 
-#: gconf/gconftool.c:1283
+#: gconf/gconftool.c:1281
 #, c-format
 msgid "No doc string stored in schema at '%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1288
+#: gconf/gconftool.c:1286
 #, fuzzy, c-format
 msgid "Error getting schema at '%s': %s\n"
 msgstr "������ ��������� ����� ��� \"%s\": %s"
 
-#: gconf/gconftool.c:1295
+#: gconf/gconftool.c:1293
 #, fuzzy, c-format
 msgid "No schema stored at '%s'\n"
 msgstr "����� ����� \"%s\"\n"
 
-#: gconf/gconftool.c:1298
+#: gconf/gconftool.c:1296
 #, c-format
 msgid "Value at '%s' is not a schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1354
+#: gconf/gconftool.c:1352
 #, fuzzy
 msgid "Must specify a schema name followed by the key name to apply it to\n"
 msgstr "���Ҧ��� ������� ���� (����� �����) � ����Ԧ ������� �ҭ������\n"
 
-#: gconf/gconftool.c:1361
+#: gconf/gconftool.c:1359
 #, fuzzy, c-format
 msgid "Error associating schema name '%s' with key name '%s': %s\n"
 msgstr "�����: �� ������� ������� ����� \"%s\" � ������ \"%s\": %s\n"
 
-#: gconf/gconftool.c:1381
+#: gconf/gconftool.c:1379
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "���Ҧ��� ������� ���� (����� �����) � ����Ԧ ������� �ҭ������\n"
 
-#: gconf/gconftool.c:1423
+#: gconf/gconftool.c:1421
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr "��� ������ ��� ���� ���ͦ������� ����: string, int, float �� bool\n"
 
-#: gconf/gconftool.c:1443
+#: gconf/gconftool.c:1441
 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:1463
+#: gconf/gconftool.c:1461
 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:1478
+#: gconf/gconftool.c:1476
 #, c-format
 msgid "Error setting value: %s"
 msgstr "������� ������������ ��������: %s"
 
-#: gconf/gconftool.c:1492
+#: gconf/gconftool.c:1490
 #, c-format
 msgid "Error syncing: %s"
 msgstr "������� ������Φ��æ�: %s"
 
-#: gconf/gconftool.c:1507
+#: gconf/gconftool.c:1505
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 "���Ҧ��� ������� ���� �� ¦���� ������Ǧ� ��� ��������� ��� ����-��������.\n"
 
-#: gconf/gconftool.c:1521
+#: gconf/gconftool.c:1519
 msgid "Must specify one or more keys to unset.\n"
 msgstr "���Ҧ��� ������� ���� ��� ¦���� ���ަ� ��� ������ ��������.\n"
 
-#: gconf/gconftool.c:1532
+#: gconf/gconftool.c:1530
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "������� ������ �������� \"%s\": %s\n"
 
-#: gconf/gconftool.c:1555
+#: gconf/gconftool.c:1553
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 "���Ҧ��� ������� ���� �� ¦���� ������Ǧ� ��� ��������� Ц�������Ǧ�.\n"
 
-#: gconf/gconftool.c:1589
+#: gconf/gconftool.c:1587
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "������� ��������� ������ ������Ǧ�: %s\n"
 
-#: gconf/gconftool.c:1631
+#: gconf/gconftool.c:1629
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "�����: ��צ���� �� צ����Φ� ��� ��� ����� (%s)\n"
 
-#: gconf/gconftool.c:1640
+#: gconf/gconftool.c:1638
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "�����: ��צ���� �� צ����Φ� ��� list_type ��� ����� (%s)\n"
 
-#: gconf/gconftool.c:1651 gconf/gconftool.c:1681 gconf/gconftool.c:1710
+#: gconf/gconftool.c:1649 gconf/gconftool.c:1679 gconf/gconftool.c:1708
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 "�����: �� ������� ������̦������ ������ �������� \"%s\" ��� ����� (%s)\n"
 
-#: gconf/gconftool.c:1669
+#: gconf/gconftool.c:1667
 #, 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:1694
+#: gconf/gconftool.c:1692
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "�����: �� ������� �������� �������� ���� ��� �����\n"
 
-#: gconf/gconftool.c:1723
+#: gconf/gconftool.c:1721
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "�����: ����Ҧ��� ������� gconftool, ��צ����� GConfValueType\n"
 
-#: gconf/gconftool.c:1770 gconf/gconftool.c:1791 gconf/gconftool.c:1812
-#: gconf/gconftool.c:1833
+#: gconf/gconftool.c:1768 gconf/gconftool.c:1789 gconf/gconftool.c:1810
+#: gconf/gconftool.c:1831
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "�����: �� ������� ������̦������ ����� ���� \"%s\"\n"
 
-#: gconf/gconftool.c:1787
+#: gconf/gconftool.c:1785
 #, 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:1808
+#: gconf/gconftool.c:1806
 #, 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:1829
+#: gconf/gconftool.c:1827
 #, 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:1857
+#: gconf/gconftool.c:1855
 msgid "WARNING: empty <applyto> node"
 msgstr "�����: ������ ����� <applyto>"
 
-#: gconf/gconftool.c:1860 gconf/gconftool.c:2123
+#: gconf/gconftool.c:1858 gconf/gconftool.c:2121
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "�����: ����� <%s> �������ͦ��� Ц��� <schema>\n"
 
-#: gconf/gconftool.c:1870
+#: gconf/gconftool.c:1868
 msgid "WARNING: no key specified for schema\n"
 msgstr "�����: �� ������� ���� ��� �����\n"
 
-#: gconf/gconftool.c:1903
+#: gconf/gconftool.c:1901
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr "�����: ����� <locale> �� ��� ������ \"name=\"locale\", ��Ϧ���������\n"
 
-#: gconf/gconftool.c:1909
+#: gconf/gconftool.c:1907
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
@@ -1686,32 +1705,32 @@ msgstr ""
 "�����: ������ ���̦� <locale> ��� ����̦��æ� \"%s\", ����������� �Ӧ �Ҧ� "
 "�������\n"
 
-#: gconf/gconftool.c:1990
+#: gconf/gconftool.c:1988
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "�����: ��צ���� ����� <%s> � ���̦ <locale>\n"
 
-#: gconf/gconftool.c:2019
+#: gconf/gconftool.c:2017
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "�����: �¦� ������������ ����� \"%s\" ����̦��æ� \"%s\": %s\n"
 
-#: gconf/gconftool.c:2027
+#: gconf/gconftool.c:2025
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "����������� ����� \"%s\" ��� ����̦��æ� \"%s\"\n"
 
-#: gconf/gconftool.c:2049
+#: gconf/gconftool.c:2047
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "�����: �� ������� ������� ����� \"%s\" � ������ \"%s\": %s\n"
 
-#: gconf/gconftool.c:2057
+#: gconf/gconftool.c:2055
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "�������� ����� \"%s\" �� ����� \"%s\"\n"
 
-#: gconf/gconftool.c:2136
+#: gconf/gconftool.c:2134
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "����Ȧ��� ��� ���� ���� � ���� ��������� <locale> � <schema>\n"
 
@@ -1720,17 +1739,17 @@ msgstr "����Ȧ��� ��� ���� ���� � ���� ��������� <locale> � <schema>\n"
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr "�����: ����� <%s> ����� <schemalist> - �������ͦ���\n"
 
-#: gconf/gconftool.c:2187
+#: gconf/gconftool.c:2188
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "�� ������� צ������ \"%s\": %s\n"
 
-#: gconf/gconftool.c:2194
+#: gconf/gconftool.c:2195
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "�������� \"%s\" ������?\n"
 
-#: gconf/gconftool.c:2206
+#: gconf/gconftool.c:2207
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
@@ -1739,26 +1758,26 @@ msgstr ""
 "�������� \"%s\" ��� ��צ���� ��� ��Ҧ����� ����� (<%s>, ��� ���� "
 "<gconfschemafile>)\n"
 
-#: gconf/gconftool.c:2219
+#: gconf/gconftool.c:2220
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr "�������� \"%s\" ����� ����� ��������� Ҧ��� <gconfschemafile>\n"
 
-#: gconf/gconftool.c:2233
+#: gconf/gconftool.c:2234
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr "�����: ����� <%s> ����� <gconfschemafile> - �������ͦ���\n"
 
-#: gconf/gconftool.c:2244 gconf/gconftool.c:2276
+#: gconf/gconftool.c:2245 gconf/gconftool.c:2277
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "������� ������Φ��æ� ����� ���Ʀ����æ�: %s"
 
-#: gconf/gconftool.c:2260
+#: gconf/gconftool.c:2261
 msgid "Must specify some schema files to install\n"
 msgstr "���Ҧ��� ������� ��˦���� ���̦� ����� ��� �������æ�\n"
 
-#: gconf/gconftool.c:2297
+#: gconf/gconftool.c:2298
 #, c-format
 msgid ""
 "\n"
@@ -1767,16 +1786,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:2317
+#: gconf/gconftool.c:2318
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "�¦� ������ ����� ���Ҧ� %s: %s\n"
 
-#: gconf/gconftool.c:2443
+#: gconf/gconftool.c:2444
 msgid "Must specify some keys to break\n"
 msgstr "���Ҧ��� ������� ���˦ ���ަ ��� �����������\n"
 
-#: gconf/gconftool.c:2449
+#: gconf/gconftool.c:2450
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -1785,11 +1804,11 @@ msgstr ""
 "������ ��������� ���� �������� ������������� ������� ������� ��� �����:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:2467
+#: gconf/gconftool.c:2468
 msgid "Must specify some directories to break\n"
 msgstr "����Ȧ��� ������� ���˦ �������� ��� ��� �����������\n"
 
-#: gconf/gconftool.c:2486
+#: gconf/gconftool.c:2487
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1815,6 +1834,87 @@ msgstr "������������ GConf: �� ������� �������� ������ ��� � \"%s\": %s"
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "�ަ�������� \"%s\", �������� \"%s\" ��� ����� %s"
 
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "No ior file in `%s'"
+#~ msgstr "��צ���� ���� ior � \"%s\""
+
+#~ msgid "gconfd taking lock `%s' from some other process"
+#~ msgstr "gconfd ����դ \"%s\" צ� ������ ����� �����Ӧ�"
+
+#~ msgid "Another program has lock `%s'"
+#~ msgstr "���� �������� ����������� \"%s\""
+
+#~ msgid ""
+#~ "Removing stale lock `%s' because IOR couldn't be converted to object "
+#~ "reference, IOR `%s'"
+#~ msgstr ""
+#~ "��������� �����Ҧ���� ���������� \"%s\" ����, �� IOR �� ������� "
+#~ "����������� � ��������� �� ��'���, IOR \"%s\""
+
+#~ msgid "Removing stale lock `%s' because of error pinging server: %s"
+#~ msgstr ""
+#~ "��������� �����Ҧ���� ���������� \"%s\" ����� ������� ���������� �������: "
+#~ "%s"
+
+#~ msgid "GConf configuration daemon (gconfd) has lock `%s'"
+#~ msgstr "����� ���Ʀ����æ� GConf (gconfd) ���������� \"%s\""
+
+#~ msgid "Can't create lock `%s': %s"
+#~ msgstr "��������� �������� ���������� \"%s\": %s"
+
+#~ msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
+#~ msgstr "��������� צ������ ���� ���������� \"%s\"; ������� צ� �� ���: %s"
+
+#~ msgid "Corrupt lock file `%s', removing anyway"
+#~ msgstr "���������� ���� ���������� \"%s\", �����Ѥ����"
+
+#~ msgid ""
+#~ "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming "
+#~ "someone took our lock"
+#~ msgstr ""
+#~ "�� �������� ���������� ����� \"%s\" (������Ʀ����� ������� ���������� - %"
+#~ "u, ��� ������Ʀ����� - pid %u; �������� ����� ������ ���� ����������"
+
+#~ msgid ""
+#~ "Failed to init Object Activation Framework: please mail bug report to OAF "
+#~ "maintainers"
+#~ msgstr ""
+#~ "�¦� �Φæ�̦��æ� OAF: ���� �����, ��צ����� ��� ������� ���Φ� "
+#~ "������������� OAF"
+
+#, fuzzy
+#~ msgid ""
+#~ "OAF doesn't know about our IID; indicates broken installation; can't "
+#~ "register existing server."
+#~ msgstr ""
+#~ "OAF �� ���� ��� ��� IID; �� �צ����� ��� ��צ��� ������������; ��������� "
+#~ "���Ť����������; ��Ȧ�\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Another gconfd already registered with OAF, so we can't register the "
+#~ "existing server"
+#~ msgstr "����� gconf ��� ���Ť�������� � OAF; ��Ȧ�\n"
+
+#, fuzzy
+#~ msgid "Unknown error registering existing gconfd with OAF; exiting"
+#~ msgstr "��צ���� ������� �Ť����æ� gconfd � OAF; ��Ȧ�\n"
+
+#~ msgid ""
+#~ "OAF doesn't know about our IID; indicates broken installation; can't "
+#~ "register; exiting\n"
+#~ msgstr ""
+#~ "OAF �� ���� ��� ��� IID; �� �צ����� ��� ��צ��� ������������; ��������� "
+#~ "���Ť����������; ��Ȧ�\n"
+
+#~ msgid "Another gconfd already registered with OAF; exiting\n"
+#~ msgstr "����� gconf ��� ���Ť�������� � OAF; ��Ȧ�\n"
+
+#~ msgid "Unknown error registering gconfd with OAF; exiting\n"
+#~ msgstr "��צ���� ������� �Ť����æ� gconfd � OAF; ��Ȧ�\n"
+
 #~ msgid "Ignoring XML node `%s', except for possible schema name: %s"
 #~ msgstr ""
 #~ "����������� XML-����� \"%s\", �� ����������� ������ϧ ����� �����: %s"
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index ae08f1c8..8b8c79e4 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
-"POT-Creation-Date: 2001-08-15 18:01-0400\n"
+"POT-Creation-Date: 2002-02-04 18:21-0500\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"
@@ -32,7 +32,7 @@ msgstr "���ڳ�ʼ�� BDB ���ģ��"
 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
+#: backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1050
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "�޷�����Ŀ¼��%s����%s"
@@ -46,26 +46,26 @@ msgstr ""
 msgid "Unloading XML backend module."
 msgstr "����ж�� XML ���ģ�顣"
 
-#: backends/xml-backend.c:286
+#: backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr ""
 
-#: backends/xml-backend.c:386
+#: backends/xml-backend.c:414
 #, c-format
 msgid "Can't read from or write to the XML root directory in the address `%s'"
 msgstr ""
 
-#: backends/xml-backend.c:396
+#: backends/xml-backend.c:424
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
 
-#: backends/xml-backend.c:680
+#: backends/xml-backend.c:708
 msgid "Initializing XML backend module"
 msgstr "���ڳ�ʼ�� XML ���ģ��"
 
-#: backends/xml-backend.c:745
+#: backends/xml-backend.c:773
 #, c-format
 msgid "Failed to give up lock on XML dir `%s': %s"
 msgstr "�޷�ȡ�� XML Ŀ¼��%s���ϵ�������%s"
@@ -129,32 +129,32 @@ msgid "Failed to delete old file `%s': %s"
 msgstr "�޷�ɾ�����ļ���%s����%s"
 
 #. These are all fatal errors
-#: backends/xml-dir.c:806
+#: backends/xml-dir.c:803
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr ""
 
-#: backends/xml-dir.c:950
+#: backends/xml-dir.c:947
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr "�ظ����%s���ڡ�%s���У�����"
 
-#: backends/xml-dir.c:972
+#: backends/xml-dir.c:969
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr "�� XML �ļ���%s���е���Ŀû�����֣�����"
 
-#: backends/xml-dir.c:979
+#: backends/xml-dir.c:977
 #, c-format
-msgid "Toplevel node in XML file `%s' is not an <entry>, ignoring"
+msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
 msgstr ""
 
-#: backends/xml-dir.c:1067
+#: backends/xml-dir.c:1066
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "�޷������ļ���%s����%s"
 
-#: backends/xml-dir.c:1075 gconf/gconf-internals.c:2494
+#: backends/xml-dir.c:1074
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr "�޷��ر��ļ���%s����%s"
@@ -165,11 +165,6 @@ msgstr "�޷��ر��ļ���%s����%s"
 msgid "Ignoring XML node with name `%s': %s"
 msgstr "������Ϊ��%s���� XML ��㣺%s"
 
-#: backends/xml-entry.c:200
-#, c-format
-msgid "%s"
-msgstr "%s"
-
 #: backends/xml-entry.c:327
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
@@ -332,7 +327,7 @@ msgid ""
 "result in a notification weirdly reappearing): %s"
 msgstr ""
 
-#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1294
+#: gconf/gconf-database.c:1169 gconf/gconf-sources.c:1328
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "��ȡ��%s����ֵʱ��������%s"
@@ -441,174 +436,270 @@ msgstr "�޷���ȡ����"
 msgid "No database available to save your configuration"
 msgstr "û�п��õ����ݿ���������������"
 
-#: gconf/gconf-internals.c:87
+#: gconf/gconf-internals.c:114
 #, c-format
 msgid "No '/' in key `%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:251
+#: gconf/gconf-internals.c:227
+#, c-format
+msgid "Invalid UTF-8 in string value in '%s'"
+msgstr ""
+
+#: gconf/gconf-internals.c:286
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "�޷�Ϊ�б�Ԫ�ؽ��� CORBA ֵ"
 
-#: gconf/gconf-internals.c:253
+#: gconf/gconf-internals.c:288
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:266
+#: gconf/gconf-internals.c:301
 msgid "Received list from gconfd with a bad list type"
 msgstr "���յ����� gconfd �л�õ��б����д�����б����͡�"
 
-#: gconf/gconf-internals.c:447
+#: gconf/gconf-internals.c:482
 msgid "Failed to convert object to IOR"
 msgstr "�޷�ת������ IOR"
 
-#: gconf/gconf-internals.c:813
+#: gconf/gconf-internals.c:619
+msgid "Invalid UTF-8 in locale for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:627
+msgid "Invalid UTF-8 in short description for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:635
+msgid "Invalid UTF-8 in long description for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:643
+msgid "Invalid UTF-8 in owner for schema"
+msgstr ""
+
+#: gconf/gconf-internals.c:868
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:873
+#: gconf/gconf-internals.c:928
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "��������Դ��%s��\n"
 
-#: gconf/gconf-internals.c:885
+#: gconf/gconf-internals.c:940
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:1327
+#: gconf/gconf-internals.c:1271 gconf/gconf-internals.c:1337
+#: gconf/gconf-value.c:125 gconf/gconf-value.c:224 gconf/gconf-value.c:366
+#: gconf/gconf-value.c:1084
+msgid "Text contains invalid UTF-8"
+msgstr ""
+
+#: gconf/gconf-internals.c:1422
 #, c-format
 msgid "Expected list, got %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1337
+#: gconf/gconf-internals.c:1432
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1476
+#: gconf/gconf-internals.c:1571
 #, c-format
 msgid "Expected pair, got %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:1490
+#: gconf/gconf-internals.c:1585
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
 
-#: gconf/gconf-internals.c:1506
+#: gconf/gconf-internals.c:1601
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:1622
+#: gconf/gconf-internals.c:1717
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:1684
+#: gconf/gconf-internals.c:1779
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr ""
 
-#: gconf/gconf-internals.c:2164 gconf/gconf.c:3092
+#: gconf/gconf-internals.c:1915
+msgid "Encoded value is not valid UTF-8"
+msgstr ""
+
+#: gconf/gconf-internals.c:2265 gconf/gconf.c:3082
 #, c-format
 msgid "CORBA error: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2180
+#: gconf/gconf-internals.c:2281
 #, c-format
 msgid "OAF problem description: '%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2186
+#: gconf/gconf-internals.c:2287
 msgid "attempt to remove not-listed OAF object directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2191
+#: gconf/gconf-internals.c:2292
 msgid "attempt to add already-listed OAF directory"
 msgstr ""
 
-#: gconf/gconf-internals.c:2198
+#: gconf/gconf-internals.c:2299
 #, c-format
 msgid "OAF parse error: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2203
+#: gconf/gconf-internals.c:2304
 msgid "Unknown OAF error"
 msgstr ""
 
-#: gconf/gconf-internals.c:2290
+#: gconf/gconf-internals.c:2437
+#, fuzzy, c-format
+msgid "Could not lock temporary file '%s': %s"
+msgstr "�޷�����Ŀ¼��%s����%s"
+
+#: gconf/gconf-internals.c:2464
 #, c-format
-msgid "No ior file in `%s'"
+msgid "Could not create file '%s', probably because it already exists"
 msgstr ""
 
-#: gconf/gconf-internals.c:2321
+#: gconf/gconf-internals.c:2510
+#, fuzzy, c-format
+msgid "Failed to create or open '%s'"
+msgstr "�޷������ļ���%s����%s"
+
+#: gconf/gconf-internals.c:2520
 #, c-format
-msgid "gconfd taking lock `%s' from some other process"
+msgid ""
+"Failed to lock '%s': probably another process has the lock, or your "
+"operating system has NFS file locking misconfigured (%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:2332
+#: gconf/gconf-internals.c:2548
 #, c-format
-msgid "Another program has lock `%s'"
+msgid "IOR file '%s' not opened successfully, no gconfd located: %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2351
-msgid "couldn't contact ORB to ping existing gconfd"
+#: gconf/gconf-internals.c:2578
+#, c-format
+msgid "gconftool or other non-gconfd process has the lock file '%s'"
 msgstr ""
 
-#: gconf/gconf-internals.c:2359
-#, c-format
-msgid ""
-"Removing stale lock `%s' because IOR couldn't be converted to object "
-"reference, IOR `%s'"
+#: gconf/gconf-internals.c:2595
+msgid "couldn't contact ORB to resolve existing gconfd object reference"
 msgstr ""
 
-#: gconf/gconf-internals.c:2371
+#: gconf/gconf-internals.c:2627
 #, c-format
-msgid "Removing stale lock `%s' because of error pinging server: %s"
+msgid "couldn't create directory `%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2383
+#: gconf/gconf-internals.c:2686
 #, c-format
-msgid "GConf configuration daemon (gconfd) has lock `%s'"
+msgid "Can't write to file `%s': %s"
 msgstr ""
 
-#: gconf/gconf-internals.c:2397
+#: gconf/gconf-internals.c:2727
 #, c-format
-msgid "couldn't create directory `%s': %s"
+msgid "We didn't have the lock on file `%s', but we should have"
 msgstr ""
 
-#: gconf/gconf-internals.c:2446
+#: gconf/gconf-internals.c:2748
+#, fuzzy, c-format
+msgid "Failed to link '%s' to '%s': %s"
+msgstr "�޷�����%s������Ϊ��%s����%s"
+
+#: gconf/gconf-internals.c:2760
+#, fuzzy, c-format
+msgid "Failed to remove lock file `%s': %s"
+msgstr "�޷������ļ���%s����%s"
+
+#: gconf/gconf-internals.c:2779
+#, fuzzy, c-format
+msgid "Failed to clean up file '%s': %s"
+msgstr "�޷��ر��ļ���%s����%s"
+
+#: gconf/gconf-internals.c:2793
+#, fuzzy, c-format
+msgid "Failed to remove lock directory `%s': %s"
+msgstr "�޷�����%s������Ϊ��%s����%s"
+
+#: gconf/gconf-internals.c:3003 gconf/gconfd.c:580
+#, fuzzy, c-format
+msgid "Failed to create %s: %s"
+msgstr "�޷������ļ���%s����%s"
+
+#: gconf/gconf-internals.c:3036
 #, c-format
-msgid "Can't create lock `%s': %s"
+msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:2482
-#, c-format
-msgid "Can't write to file `%s': %s"
+#: gconf/gconf-internals.c:3064
+#, fuzzy, c-format
+msgid "Failed to launch configuration server: %s\n"
+msgstr "�޷�ͬ��һ������Դ��%s"
+
+#: gconf/gconf-internals.c:3088
+msgid ""
+"Failed to contact configuration server (a likely cause of this is that you "
+"have an existing configuration server (gconfd) running, but it isn't "
+"reachable from here - if you're logged in from two machines at once, you may "
+"need to enable TCP networking for ORBit)\n"
 msgstr ""
 
-#: gconf/gconf-internals.c:2532
+#: gconf/gconf-internals.c:3724
+#, fuzzy, c-format
+msgid "Failed to read from child pipe (%s)"
+msgstr "�޷������ļ���%s����%s"
+
+#: gconf/gconf-internals.c:3789
+#, fuzzy, c-format
+msgid "Failed to fork (%s)"
+msgstr "�޷������ļ���%s����%s"
+
+#: gconf/gconf-internals.c:3929
+#, fuzzy, c-format
+msgid "Failed to change to directory '%s' (%s)"
+msgstr "�޷������ļ���%s����%s"
+
+#: gconf/gconf-internals.c:3939
+#, fuzzy, c-format
+msgid "Failed to execute child process (%s)"
+msgstr "�޷�ɾ�����ļ���%s����%s"
+
+#: gconf/gconf-internals.c:3948
 #, c-format
-msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
+msgid "Failed to redirect output or input of child process (%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:2549
-#, c-format
-msgid "Corrupt lock file `%s', removing anyway"
+#: gconf/gconf-internals.c:3957
+#, fuzzy, c-format
+msgid "Failed to fork child process (%s)"
+msgstr "�޷�д�ļ���%s����%s"
+
+#: gconf/gconf-internals.c:3965
+msgid "Unknown error executing child process"
 msgstr ""
 
-#: gconf/gconf-internals.c:2559
+#: gconf/gconf-internals.c:3986
 #, c-format
-msgid ""
-"Didn't create lock file `%s' (creator pid %u, our pid %u; assuming someone "
-"took our lock"
+msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr ""
 
-#: gconf/gconf-internals.c:2576
+#: gconf/gconf-internals.c:4036
 #, c-format
-msgid "Failed to release lock directory `%s': %s"
+msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr ""
 
 #: gconf/gconf-sources.c:320
@@ -616,106 +707,108 @@ msgstr ""
 msgid "Failed to load source `%s': %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:510
+#: gconf/gconf-sources.c:544
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 
-#: gconf/gconf-sources.c:567
+#: gconf/gconf-sources.c:601
 msgid "The '/' name can only be a directory, not a key"
 msgstr ""
 
-#: gconf/gconf-sources.c:596
+#: gconf/gconf-sources.c:630
 #, 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
+#: gconf/gconf-sources.c:642
 #, 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 "
+"somehow we mistakenly created two gconfd processes. If you have two gconfd "
+"processes (or had two at the time the second was launched), logging out, "
+"killing all copies of gconfd, and logging back in may help. Perhaps the "
+"problem is that you attempted to use GConf from two machines at once, and "
+"ORBit still has its default configuration that prevents remote CORBA "
+"connections? As always, check the user.* syslog for details on problems "
 "gconfd encountered."
 msgstr ""
 
-#: gconf/gconf-sources.c:1164
+#: gconf/gconf-sources.c:1198
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:1233
+#: gconf/gconf-sources.c:1267
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr ""
 
-#: gconf/gconf-sources.c:1257
+#: gconf/gconf-sources.c:1291
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
 
-#: gconf/gconf-value.c:82
+#: gconf/gconf-value.c:81
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr ""
 
-#: gconf/gconf-value.c:92
+#: gconf/gconf-value.c:91
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr ""
 
-#: gconf/gconf-value.c:113
+#: gconf/gconf-value.c:112
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr ""
 
-#: gconf/gconf-value.c:146
+#: gconf/gconf-value.c:156
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr ""
 
-#: gconf/gconf-value.c:214
+#: gconf/gconf-value.c:232
 #, c-format
 msgid "Didn't understand `%s' (list must start with a '[')"
 msgstr ""
 
-#: gconf/gconf-value.c:227
+#: gconf/gconf-value.c:245
 #, c-format
 msgid "Didn't understand `%s' (list must end with a ']')"
 msgstr ""
 
-#: gconf/gconf-value.c:278
+#: gconf/gconf-value.c:296
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
 msgstr ""
 
-#: gconf/gconf-value.c:309 gconf/gconf-value.c:462
+#: gconf/gconf-value.c:327 gconf/gconf-value.c:488
 #, c-format
 msgid "Didn't understand `%s' (extra trailing characters)"
 msgstr ""
 
-#: gconf/gconf-value.c:348
+#: gconf/gconf-value.c:374
 #, c-format
 msgid "Didn't understand `%s' (pair must start with a '(')"
 msgstr ""
 
-#: gconf/gconf-value.c:361
+#: gconf/gconf-value.c:387
 #, c-format
 msgid "Didn't understand `%s' (pair must end with a ')')"
 msgstr ""
 
-#: gconf/gconf-value.c:391 gconf/gconf-value.c:477
+#: gconf/gconf-value.c:417 gconf/gconf-value.c:503
 #, c-format
 msgid "Didn't understand `%s' (wrong number of elements)"
 msgstr ""
 
-#: gconf/gconf-value.c:431
+#: gconf/gconf-value.c:457
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr ""
@@ -725,322 +818,268 @@ msgstr ""
 msgid "`%s': %s"
 msgstr ""
 
-#: gconf/gconf.c:289
+#: gconf/gconf.c:287
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr ""
 
-#: gconf/gconf.c:574
+#: gconf/gconf.c:572
 msgid "Can't add notifications to a local configuration source"
 msgstr ""
 
-#: gconf/gconf.c:1870
+#: gconf/gconf.c:1868
 #, c-format
 msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr ""
 
-#: 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. "
-"This is a bug in the OAF package; something went wrong in OAF, and no error "
-"was reported. This is not a bug in the GConf package. Do not report a GConf "
-"bug unless you have information indicating what went wrong with OAF that was "
-"caused by GConf."
-msgstr ""
-
-#: gconf/gconf.c:2198
+#: gconf/gconf.c:2183
 msgid "Failed to init GConf, exiting\n"
 msgstr ""
 
-#: gconf/gconf.c:2235
+#: gconf/gconf.c:2220
 msgid "Must begin with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2257
+#: gconf/gconf.c:2242
 msgid "Can't have two slashes (/) in a row"
 msgstr ""
 
-#: gconf/gconf.c:2259
+#: gconf/gconf.c:2244
 msgid "Can't have a period (.) right after a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2280
+#: gconf/gconf.c:2265
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr ""
 
-#: gconf/gconf.c:2294
+#: gconf/gconf.c:2279
 msgid "Key/directory may not end with a slash (/)"
 msgstr ""
 
-#: gconf/gconf.c:2547
+#: gconf/gconf.c:2520
 #, c-format
 msgid "Failure shutting down config server: %s"
 msgstr ""
 
-#: gconf/gconf.c:2608
+#: gconf/gconf.c:2581
 #, c-format
 msgid "Expected float, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2643
+#: gconf/gconf.c:2616
 #, c-format
 msgid "Expected int, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2678
+#: gconf/gconf.c:2651
 #, c-format
 msgid "Expected string, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2715
+#: gconf/gconf.c:2688
 #, c-format
 msgid "Expected bool, got %s"
 msgstr ""
 
-#: gconf/gconf.c:2748
+#: gconf/gconf.c:2721
 #, c-format
 msgid "Expected schema, got %s"
 msgstr ""
 
-#: gconf/gconfd.c:248
+#: gconf/gconfd.c:247
 msgid "Shutdown request received"
 msgstr ""
 
-#: gconf/gconfd.c:280
+#: gconf/gconfd.c:279
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr ""
 
-#: gconf/gconfd.c:298
+#: gconf/gconfd.c:297
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
 msgstr ""
 
-#: gconf/gconfd.c:307
+#: gconf/gconfd.c:306
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit "
 msgstr ""
 
-#: gconf/gconfd.c:307
+#: gconf/gconfd.c:306
 msgid "/path"
 msgstr ""
 
-#: gconf/gconfd.c:321
+#: gconf/gconfd.c:320
 #, c-format
 msgid "Error loading some config sources: %s"
 msgstr ""
 
-#: gconf/gconfd.c:333
+#: gconf/gconfd.c:332
 msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
 msgstr ""
 
-#: gconf/gconfd.c:350
+#: gconf/gconfd.c:349
 msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
 
-#: gconf/gconfd.c:376
+#: gconf/gconfd.c:375
 #, c-format
 msgid "Received signal %d, dumping core. Please report a GConf bug."
 msgstr ""
 
-#: gconf/gconfd.c:392
+#: gconf/gconfd.c:391
 #, c-format
 msgid ""
 "Received signal %d, shutting down abnormally. Please file a GConf bug report."
 msgstr ""
 
-#: gconf/gconfd.c:409
+#: gconf/gconfd.c:408
 #, 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:513
+#: gconf/gconfd.c:526
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr ""
 
-#: gconf/gconfd.c:540
-msgid ""
-"Failed to init Object Activation Framework: please mail bug report to OAF "
-"maintainers"
-msgstr ""
-
-#: gconf/gconfd.c:560
+#: gconf/gconfd.c:567
 msgid "Failed to get object reference for ConfigServer"
 msgstr ""
 
-#: gconf/gconfd.c:573
-#, fuzzy, c-format
-msgid "Failed to create %s: %s"
-msgstr "�޷������ļ���%s����%s"
+#: gconf/gconfd.c:605
+#, c-format
+msgid "Failed to write byte to pipe fd %d so client program may hang: %s"
+msgstr ""
 
-#. Bad hack alert - register the current lockholder with oafd,
-#. * since oafd seems to have forgotten about us.
-#.
-#: gconf/gconfd.c:588
+#: gconf/gconfd.c:615
 #, fuzzy, c-format
-msgid "Failed to get lock for daemon: %s"
+msgid "Failed to get lock for daemon, exiting: %s"
 msgstr "�޷����á�%s����Ŀ¼��%s"
 
-#: gconf/gconfd.c:594
-msgid ""
-"Registering existing server with oafd, since OAF appears to have leaked it"
-msgstr ""
-
-#: gconf/gconfd.c:603
-msgid ""
-"OAF doesn't know about our IID; indicates broken installation; can't "
-"register existing server."
-msgstr ""
-
-#: gconf/gconfd.c:607
-msgid ""
-"Another gconfd already registered with OAF, so we can't register the "
-"existing server"
-msgstr ""
-
-#: gconf/gconfd.c:612
-msgid "Unknown error registering existing gconfd with OAF; exiting"
-msgstr ""
-
-#: gconf/gconfd.c:639
-msgid ""
-"OAF doesn't know about our IID; indicates broken installation; can't "
-"register; exiting\n"
-msgstr ""
-
-#: gconf/gconfd.c:643
-msgid "Another gconfd already registered with OAF; exiting\n"
-msgstr ""
-
-#: gconf/gconfd.c:648
-msgid "Unknown error registering gconfd with OAF; exiting\n"
-msgstr ""
-
-#: gconf/gconfd.c:692
+#: gconf/gconfd.c:657
 #, fuzzy, c-format
-msgid "Failed to release lockfile: %s"
+msgid "Error releasing lockfile: %s"
 msgstr "�޷������ļ���%s����%s"
 
-#: gconf/gconfd.c:700
+#: gconf/gconfd.c:665
 msgid "Exiting"
 msgstr ""
 
-#: gconf/gconfd.c:725
+#: gconf/gconfd.c:690
 msgid "GConf server is not in use, shutting down."
 msgstr ""
 
-#: gconf/gconfd.c:1084
+#: gconf/gconfd.c:1059
 #, c-format
 msgid "Returning exception: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1184
+#: gconf/gconfd.c:1159
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
 "gconfd shutdown (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1219
+#: gconf/gconfd.c:1194
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:1288
+#: gconf/gconfd.c:1263
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1302
+#: gconf/gconfd.c:1277
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1311
+#: gconf/gconfd.c:1286
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1325
+#: gconf/gconfd.c:1300
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1335
+#: gconf/gconfd.c:1310
 #, c-format
 msgid "Failed to move new save state file into place: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1344
+#: gconf/gconfd.c:1319
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:1819
+#: gconf/gconfd.c:1794
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr ""
 
-#: gconf/gconfd.c:1865
+#: gconf/gconfd.c:1840
 #, c-format
 msgid "Error reading saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:1918
+#: gconf/gconfd.c:1893
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr ""
 
-#: gconf/gconfd.c:2035
+#: gconf/gconfd.c:2010
 #, 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:2040
+#: gconf/gconfd.c:2015
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously re-"
 "add the listener if gconfd exits or shuts down (%s)"
 msgstr ""
 
-#: gconf/gconfd.c:2063 gconf/gconfd.c:2228
+#: gconf/gconfd.c:2038 gconf/gconfd.c:2203
 #, c-format
 msgid "Failed to get IOR for client: %s"
 msgstr ""
 
-#: gconf/gconfd.c:2078
+#: gconf/gconfd.c:2053
 #, c-format
 msgid "Failed to open saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:2091
+#: gconf/gconfd.c:2066
 #, c-format
 msgid "Failed to write client add to saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:2099
+#: gconf/gconfd.c:2074
 #, c-format
 msgid "Failed to flush client add to saved state file: %s"
 msgstr ""
 
-#: gconf/gconfd.c:2189
+#: gconf/gconfd.c:2164
 msgid ""
 "Some client removed itself from the GConf server when it hadn't been added."
 msgstr ""
@@ -1283,339 +1322,332 @@ msgid ""
 msgstr ""
 
 #: gconf/gconftool.c:525
+msgid "You should use --direct when using a non-default configuration source\n"
+msgstr ""
+
+#: gconf/gconftool.c:531
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:550
+#: gconf/gconftool.c:566
 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:565
-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 ""
-
-#: gconf/gconftool.c:587
+#: gconf/gconftool.c:595
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:798
+#: gconf/gconftool.c:796
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:841
+#: gconf/gconftool.c:839
 msgid "Must specify one or more dirs to recursively list.\n"
 msgstr ""
 
-#: gconf/gconftool.c:875
+#: gconf/gconftool.c:873
 #, fuzzy, c-format
 msgid "Failure listing entries in `%s': %s\n"
 msgstr "�г���%s���е�Ŀ¼ʱ��������%s"
 
-#: gconf/gconftool.c:893
+#: gconf/gconftool.c:891
 msgid "(no value set)"
 msgstr ""
 
-#: gconf/gconftool.c:948
+#: gconf/gconftool.c:946
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:962
+#: gconf/gconftool.c:960
 msgid "Must specify a key or keys to get\n"
 msgstr ""
 
-#: gconf/gconftool.c:997
+#: gconf/gconftool.c:995
 #, c-format
 msgid "Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:998
+#: gconf/gconftool.c:996
 #, c-format
 msgid "List Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:999
+#: gconf/gconftool.c:997
 #, c-format
 msgid "Car Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1000
+#: gconf/gconftool.c:998
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1005
+#: gconf/gconftool.c:1003
 #, c-format
 msgid "Default Value: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1005 gconf/gconftool.c:1007 gconf/gconftool.c:1008
-#: gconf/gconftool.c:1009
+#: gconf/gconftool.c:1003 gconf/gconftool.c:1005 gconf/gconftool.c:1006
+#: gconf/gconftool.c:1007
 msgid "Unset"
 msgstr ""
 
-#: gconf/gconftool.c:1007
+#: gconf/gconftool.c:1005
 #, c-format
 msgid "Owner: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1008
+#: gconf/gconftool.c:1006
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1009
+#: gconf/gconftool.c:1007
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1018 gconf/gconftool.c:1312
+#: gconf/gconftool.c:1016 gconf/gconftool.c:1310
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1022 gconf/gconftool.c:1316
+#: gconf/gconftool.c:1020 gconf/gconftool.c:1314
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1065 gconf/gconftool.c:1077
+#: gconf/gconftool.c:1063 gconf/gconftool.c:1075
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1089
+#: gconf/gconftool.c:1087
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr ""
 
-#: gconf/gconftool.c:1109
+#: gconf/gconftool.c:1107
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1137
+#: gconf/gconftool.c:1135
 msgid "Cannot set schema as value\n"
 msgstr ""
 
-#: gconf/gconftool.c:1147
+#: gconf/gconftool.c:1145
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1161
+#: gconf/gconftool.c:1159
 msgid ""
 "When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr ""
 
-#: gconf/gconftool.c:1176
+#: gconf/gconftool.c:1174
 #, c-format
 msgid "Error: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1189
+#: gconf/gconftool.c:1187
 #, fuzzy, c-format
 msgid "Error setting value: %s\n"
 msgstr "���á�%s����ֵʱ��������%s"
 
-#: gconf/gconftool.c:1207
+#: gconf/gconftool.c:1205
 #, fuzzy, c-format
 msgid "Error syncing: %s\n"
 msgstr "��ͬ����������ʱ��������%s"
 
-#: gconf/gconftool.c:1230
+#: gconf/gconftool.c:1228
 msgid "Must specify a key or keys on the command line\n"
 msgstr ""
 
-#: gconf/gconftool.c:1250
+#: gconf/gconftool.c:1248
 #, fuzzy, c-format
 msgid "No schema known for `%s'\n"
 msgstr "û���ļ���%s��\n"
 
-#: gconf/gconftool.c:1283
+#: gconf/gconftool.c:1281
 #, c-format
 msgid "No doc string stored in schema at '%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1288
+#: gconf/gconftool.c:1286
 #, fuzzy, c-format
 msgid "Error getting schema at '%s': %s\n"
 msgstr "��ȡ��%s����ֵʱ��������%s"
 
-#: gconf/gconftool.c:1295
+#: gconf/gconftool.c:1293
 #, fuzzy, c-format
 msgid "No schema stored at '%s'\n"
 msgstr "û���ļ���%s��\n"
 
-#: gconf/gconftool.c:1298
+#: gconf/gconftool.c:1296
 #, c-format
 msgid "Value at '%s' is not a schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1354
+#: gconf/gconftool.c:1352
 msgid "Must specify a schema name followed by the key name to apply it to\n"
 msgstr ""
 
-#: gconf/gconftool.c:1361
+#: gconf/gconftool.c:1359
 #, c-format
 msgid "Error associating schema name '%s' with key name '%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1381
+#: gconf/gconftool.c:1379
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr ""
 
-#: gconf/gconftool.c:1423
+#: gconf/gconftool.c:1421
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1443
+#: gconf/gconftool.c:1441
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1463
+#: gconf/gconftool.c:1461
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
 
-#: gconf/gconftool.c:1478
+#: gconf/gconftool.c:1476
 #, c-format
 msgid "Error setting value: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1492
+#: gconf/gconftool.c:1490
 #, c-format
 msgid "Error syncing: %s"
 msgstr ""
 
-#: gconf/gconftool.c:1507
+#: gconf/gconftool.c:1505
 msgid "Must specify one or more dirs to get key/value pairs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1521
+#: gconf/gconftool.c:1519
 msgid "Must specify one or more keys to unset.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1532
+#: gconf/gconftool.c:1530
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1555
+#: gconf/gconftool.c:1553
 msgid "Must specify one or more dirs to get subdirs from.\n"
 msgstr ""
 
-#: gconf/gconftool.c:1589
+#: gconf/gconftool.c:1587
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:1631
+#: gconf/gconftool.c:1629
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1640
+#: gconf/gconftool.c:1638
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1651 gconf/gconftool.c:1681 gconf/gconftool.c:1710
+#: gconf/gconftool.c:1649 gconf/gconftool.c:1679 gconf/gconftool.c:1708
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1669
+#: gconf/gconftool.c:1667
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
 msgstr ""
 
-#: gconf/gconftool.c:1694
+#: gconf/gconftool.c:1692
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1723
+#: gconf/gconftool.c:1721
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr ""
 
-#: gconf/gconftool.c:1770 gconf/gconftool.c:1791 gconf/gconftool.c:1812
-#: gconf/gconftool.c:1833
+#: gconf/gconftool.c:1768 gconf/gconftool.c:1789 gconf/gconftool.c:1810
+#: gconf/gconftool.c:1831
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1787
+#: gconf/gconftool.c:1785
 #, c-format
 msgid ""
 "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1808
+#: gconf/gconftool.c:1806
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1829
+#: gconf/gconftool.c:1827
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:1857
+#: gconf/gconftool.c:1855
 msgid "WARNING: empty <applyto> node"
 msgstr ""
 
-#: gconf/gconftool.c:1860 gconf/gconftool.c:2123
+#: gconf/gconftool.c:1858 gconf/gconftool.c:2121
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr ""
 
-#: gconf/gconftool.c:1870
+#: gconf/gconftool.c:1868
 msgid "WARNING: no key specified for schema\n"
 msgstr ""
 
-#: gconf/gconftool.c:1903
+#: gconf/gconftool.c:1901
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr ""
 
-#: gconf/gconftool.c:1909
+#: gconf/gconftool.c:1907
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
 
-#: gconf/gconftool.c:1990
+#: gconf/gconftool.c:1988
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:2019
+#: gconf/gconftool.c:2017
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2027
+#: gconf/gconftool.c:2025
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:2049
+#: gconf/gconftool.c:2047
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2057
+#: gconf/gconftool.c:2055
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr ""
 
-#: gconf/gconftool.c:2136
+#: gconf/gconftool.c:2134
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr ""
 
@@ -1624,70 +1656,70 @@ msgstr ""
 msgid "WARNING: node <%s> not understood below <schemalist>\n"
 msgstr ""
 
-#: gconf/gconftool.c:2187
+#: gconf/gconftool.c:2188
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "�޷��򿪡�%s����%s\n"
 
-#: gconf/gconftool.c:2194
+#: gconf/gconftool.c:2195
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "�ĵ���%s���ǿյģ�\n"
 
-#: gconf/gconftool.c:2206
+#: gconf/gconftool.c:2207
 #, c-format
 msgid ""
 "Document `%s' has the wrong type of root node (<%s>, should be "
 "<gconfschemafile>)\n"
 msgstr ""
 
-#: gconf/gconftool.c:2219
+#: gconf/gconftool.c:2220
 #, c-format
 msgid "Document `%s' has no top level <gconfschemafile> node\n"
 msgstr ""
 
-#: gconf/gconftool.c:2233
+#: gconf/gconftool.c:2234
 #, c-format
 msgid "WARNING: node <%s> below <gconfschemafile> not understood\n"
 msgstr ""
 
-#: gconf/gconftool.c:2244 gconf/gconftool.c:2276
+#: gconf/gconftool.c:2245 gconf/gconftool.c:2277
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "��ͬ����������ʱ��������%s"
 
-#: gconf/gconftool.c:2260
+#: gconf/gconftool.c:2261
 msgid "Must specify some schema files to install\n"
 msgstr ""
 
-#: gconf/gconftool.c:2297
+#: gconf/gconftool.c:2298
 #, c-format
 msgid ""
 "\n"
 "%s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2317
+#: gconf/gconftool.c:2318
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2443
+#: gconf/gconftool.c:2444
 msgid "Must specify some keys to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2449
+#: gconf/gconftool.c:2450
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
 "  %s\n"
 msgstr ""
 
-#: gconf/gconftool.c:2467
+#: gconf/gconftool.c:2468
 msgid "Must specify some directories to break\n"
 msgstr ""
 
-#: gconf/gconftool.c:2486
+#: gconf/gconftool.c:2487
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -1709,3 +1741,6 @@ msgstr ""
 #, fuzzy, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "��Ҫ��%s���õ���%s��Ϊ�� %s"
+
+#~ msgid "%s"
+#~ msgstr "%s"