Version 2.7.91.1.GCONF_2_7_91_1

2004-08-19 Mark McLoughlin <mark@skynet.ie> * configure.in: Version 2.7.91.1.
author: Mark McLoughlin <mark@skynet.ie> 2004-08-19 11:43:42 +0000
committer: Mark McLoughlin <markmc@src.gnome.org> 2004-08-19 11:43:42 +0000
commit: d2c597a0e3b35f915a7c8b42c0e77a871fc69899 (patch)
tree: 0df89584462ac0323394d9e543da68620fac7d84
parent: 2dc7f99881c9b04725374f38b1edcd13fb2ca33d (diff)
download: gconf-d2c597a0e3b35f915a7c8b42c0e77a871fc69899.tar.gz
63 files changed, 3570 insertions, 3498 deletions
diff --git a/ChangeLog b/ChangeLog
index 79a0d44d..cfb7e278 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-08-19  Mark McLoughlin  <mark@skynet.ie>
 
+	* configure.in: Version 2.7.91.1.
+
+2004-08-19  Mark McLoughlin  <mark@skynet.ie>
+
 	Revert the patch to make use of the merge-subtree feature at
 	specific points in the tree. Not clear that it solves the
 	problems we thought it solved. Patch archived in bug #138498
diff --git a/NEWS b/NEWS
index 12c1a880..1a735b3e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,19 @@
+2.7.91.1
+========
+
+ Features
+
+  - Switch off the "subtree-in-a-file" thing again (Mark)
+      See: http://mail.gnome.org/archives/desktop-devel-list/2004-August/msg00393.html
+
+ Translators
+
+  - Kenan Hadžiavdić (bs)
+  - Martin Willemoes Hansen (da)
+  - Pauli Virtanen (fi)
+  - Takeshi AIHANA (ja)
+  - Laurent Dhima (sq)
+
 2.7.91
 ======
 
diff --git a/configure.in b/configure.in
index a5e590a5..5205a911 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, 2.7.92)
+AM_INIT_AUTOMAKE(GConf, 2.7.91.1)
 
 AM_MAINTAINER_MODE
 
diff --git a/po/am.po b/po/am.po
index 3abb8be1..15e2d96a 100644
--- a/po/am.po
+++ b/po/am.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2003-01-14 11:02+EDT\n"
 "Last-Translator: Ge'ez Frontier Foundation <locales@geez.org>\n"
 "Language-Team: Amharic <locales@geez.org>\n"
@@ -16,22 +16,22 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr ""
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr ""
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr ""
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -43,214 +43,214 @@ msgid ""
 "    dir/%%gconf-tree.xml\n"
 msgstr ""
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr ""
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr ""
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr ""
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr ""
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
 msgstr ""
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr ""
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr ""
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr ""
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr ""
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 msgid "Failed to write some configuration data to disk\n"
 msgstr ""
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr ""
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr ""
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr ""
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr ""
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr ""
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr ""
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr ""
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr ""
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr ""
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr ""
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr ""
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr ""
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr ""
diff --git a/po/ar.po b/po/ar.po
index a972a2b3..cac9201c 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-02-10 22:22+0100\n"
 "Last-Translator: Arafat Medini <lumina@silverpen.de>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -17,22 +17,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "لم يمكن ايجاد الدليل %s\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "خطأ حفظ شجرة GConf إلى '%s': %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "الاستخدام: %s·<dir>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -51,217 +51,217 @@ msgstr ""
 "··مع:\n"
 "····dir/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 #, fuzzy
 msgid "Unloading text markup backend module."
 msgstr "إلغاء تحميل وحدة XML الخلفية."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "لم يمكن ايجاد دليل XML الجذري في العنوان `%s'"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "لم يمكن انشاء الدليل`%s': %s "
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr "لا يمكن القراءة من أو الكتابة على دليل XML الجذري في العنوان \"%s\""
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "تصاريح الدليل/الملف لمصدر XML عند الجذر%s هي : %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
 msgstr "عملية حذف الدليل لم تعد مدعومة،فقط أزل جميع القيم الموجودة في الدليل"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr "لم يمكن فتح دليل الأقفال لـ %s لحذف الأقفال: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "لم يمكن حذف الملف %s: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 #, fuzzy
 msgid "Initializing Markup backend module"
 msgstr "ابتداء الوحدة البرمجية الأساسية لـ XML"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "فشل التخلص من القفل على دليل XML \"%s\": %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 #, fuzzy
 msgid "Failed to write some configuration data to disk\n"
 msgstr "فشل البلوغ إلى مصـ(ا)در اﻻعداد: %s\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "لم يمكن انشاء الدليل \"%s\": %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, fuzzy, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "لم يمكن حذف الملف %s: %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, fuzzy, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "فشل مسح \"%s\": %s"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, fuzzy, c-format
 msgid "Line %d character %d: %s"
 msgstr "فشل انشاء %s: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "لم افهم `%s' (توقعت عددا صحيحا)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "العدد الصحيح `%s' كبير أو صغير جدا"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "لم افهم `%s' (توقعت صحيح أو خطأ)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "لم افهم `%s' (ترقبت عددا حقيقيا)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, fuzzy, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "لا \"نوع\" منسوب للعقدة <%s>"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr ""
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr ""
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, fuzzy, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "فشل فتح %s:·%s"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, fuzzy, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "خطأ عند إلغاء الضبط \"%s\": %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, fuzzy, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "فشل تحويل ملف تسجيل الحالة المحفوظ آنفا إلى مكانه: %s"
diff --git a/po/az.po b/po/az.po
index 7b44595a..9ea1057c 100644
--- a/po/az.po
+++ b/po/az.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-02-05 23:05+0200\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani Turkish <gnome@azitt.com>\n"
@@ -17,22 +17,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "%s qovluğu tapıla bilmir\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "'%s' üstünə GConf ağacı qeyd etmə xətası: %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "İstifadə qaydası: %s <cərgə>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -51,33 +51,33 @@ msgstr ""
 "  to:\n"
 "    dir/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 #, fuzzy
 msgid "Unloading text markup backend module."
 msgstr "XML modulunu çıxarıram ."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "`%s' ünvanda XML ana cərgəsini tapa bilmədim"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "`%s' qovluğunu yarada bilmədim : %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr "`%s' ünvanındaki XML ana qovluğunu oxuya və yaza bilmədim ."
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, 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/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -85,185 +85,185 @@ msgstr ""
 "Remove directory əməliyyatı artıq dəstəklənmir. Sadəcə olaraq qovluğun "
 "içindəki bütün qiymətləri silin"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr "Qıfılları silmək üçün %s üçün qıfıl cərgəsi açıla bilmədi: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "%s faylı silinə bilmədi: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 #, fuzzy
 msgid "Initializing Markup backend module"
 msgstr "XML modulunu əlavə edirəm"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "\"%s\" XML qovluğunda qıfıllama edilə bilmədi: %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 #, fuzzy
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Quraşdırma fayllarına yetişirkən xəta oldu : %s\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "`%s' qovluğunu yarada bilmədim : %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, fuzzy, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "%s faylı silinə bilmədi: %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, fuzzy, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "`%s''yi silə bilmədim : %s"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, fuzzy, c-format
 msgid "Line %d character %d: %s"
 msgstr "%s yaradılması bacarılmadı: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "`%s''yi başa düşmədim ( onluq gözləyirdim )"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "`%s' onlusu çox balaca ya da böyükdür"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "`%s''yi başa düşmədim (true/false - düzgün/səhv gözləyirdim )"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "`%s''yi başa düşmədim ( normal bir rəqəm gözləyirdim )"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, fuzzy, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "<%s> üzvü üçün \"type\" xüsusiyyəti bildirilməmişdir"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr ""
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr ""
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, fuzzy, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "%s -i aça bilmədim: %s"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, fuzzy, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "\"%s\"yi silə bilmədim : %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, fuzzy, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "Təzə qeyd edilmiş  hal faylını buraya köçürə bilmədim: %s"
diff --git a/po/be.po b/po/be.po
index 2086e809..5ba6b0b3 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2003-12-11 08:46EET\n"
 "Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -16,23 +16,23 @@ msgstr ""
 "X-Generator: KBabel 0.9.5\n"
 
 # backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1176
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, fuzzy, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Немагчыма стварыць тэчку \"%s\": %s"
 
 # gconf/gconftool.c:1341
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, fuzzy, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Памылка атрыманьня схемы па \"%s\": %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr ""
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -45,38 +45,38 @@ msgid ""
 msgstr ""
 
 # backends/xml-backend.c:233
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 #, fuzzy
 msgid "Unloading text markup backend module."
 msgstr "Выгрузка модуля паслужніка XML."
 
 # backends/xml-backend.c:289
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Неатрымалася адшукаць каранёвы каталёг XML на адрэсе '%s'"
 
 # backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1176
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Немагчыма стварыць тэчку \"%s\": %s"
 
 # backends/xml-backend.c:414
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, 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:424
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "Правы каталёга/файла крыніцы XML з каранём %s: %o/%o"
 
 # backends/xml-backend.c:651
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -85,201 +85,201 @@ msgstr ""
 "тэчкі"
 
 # backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1176
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr "Немагчыма патрапіць у тэчку з замкамі %s каб выдаліць замок: %s\n"
 
 # gconf/gconf-internals.c:2569
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Немагчыма выдаліць файл %s: %s\n"
 
 # backends/xml-backend.c:718
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 #, fuzzy
 msgid "Initializing Markup backend module"
 msgstr "Ініцыялізацыя модулю паслужніка XML"
 
 # backends/xml-backend.c:786
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Немагчыма атрымаць замок для XML-тэчкі \"%s\": %s"
 
 # gconf/gconftool.c:629
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 #, fuzzy
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Збой пад час доступу да крыніцы(-аў) канфігурацыі: %s\n"
 
 # backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1176
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Неатрымалася стварыць каталёг '%s': %s"
 
 # gconf/gconf-internals.c:2569
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, fuzzy, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Немагчыма выдаліць файл %s: %s\n"
 
 # backends/xml-dir.c:369 backends/xml-dir.c:376
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, fuzzy, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Збой пад час выдаленьня \"%s\": %s"
 
 # gconf/gconf-internals.c:2842 gconf/gconfd.c:583
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, fuzzy, c-format
 msgid "Line %d character %d: %s"
 msgstr "Збой пад час стварэньня %s: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
 # gconf/gconf-value.c:81
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Не зразумелае значэньне \"%s\" (чакалася цэлае)"
 
 # gconf/gconf-value.c:91
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Целае \"%s\" завялікае ці маленькае"
 
 # gconf/gconf-value.c:156
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Не зразумелае значэньне \"%s\" (чакалася лягічнае значэньне)"
 
 # gconf/gconf-value.c:112
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Не зразумелае значэньне \"%s\" (чакаўся рэальны лік)"
 
 # backends/xml-entry.c:941
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, fuzzy, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Няма атрыбута \"type\" для вузла <%s>"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr ""
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr ""
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
 # gconf/gconftool.c:2305
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, fuzzy, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Немагчыма адкрыць %s: %s"
 
 # gconf/gconf-database.c:1405
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, fuzzy, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Памылка выдаленьня значэньня \"%s\": %s"
 
 # gconf/gconfd.c:1310
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, fuzzy, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 60663dce..75beb8d5 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-07-27 11:05+0300\n"
 "Last-Translator: Rostislav Raykov <zbrox@i-space.org>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -17,22 +17,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Не може да се намери папката %s\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Грешка при запазване на GConf дървото в '%s': %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "Употреба: %s <папка>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -44,32 +44,32 @@ msgid ""
 "    dir/%%gconf-tree.xml\n"
 msgstr ""
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr ""
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Не може да се намери XML основна папка в адреса `%s'"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Не може да се създаде папката \"%s\": %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr "Не може да се чете или пише в главната XML папка в адреса \"%s\""
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "Правата за достъп до папка/файл с XML изходен код в %s са: %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -77,184 +77,184 @@ msgstr ""
 "Операцията по изтриването на папка вече не се поддържа. Просто премахнете "
 "всички стойности в папката"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr ""
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Не може да се премахне файл %s: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr ""
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Грешка при поставяне на заключване на XML папката \"%s\": %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Неуспех при запазването на част от конфигурацията\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Не може да се създаде папка \"%s\": %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Не може да се премахне файл \"%s\": %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Неуспех при писане в \"%s\": %s\n"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "Ред %d символ %d: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "Атрибута \"%s\" е повторен два пъти в същия <%s> елемент"
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "Атрибутът \"%s\" е невалиден при <%s> елемента в този контекст"
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Не се разбира \"%s\" (очакваше се цяло число)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Цялото число \"%s\" е твърде голямо или малко"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Не се разбира \"%s\" (очакваше се истина или лъжа)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Не се разбира \"%s\" (очакваше се реално число)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Липсва атрибута \"%s\" на елемента <%s>"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr "Непозната стойност \"%s\" за \"%s\" атрибута на елемента <%s>"
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr "Невалиден вид \"%s\" в <%s>"
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, fuzzy, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr "Невалиден списъчен вид \"%s\" в <%s>"
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr "Невалиден cdr_вид \"%s\" в <%s>"
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr "Невалиден списъчен вид \"%s\" в <%s>"
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr "Два <default> елемента под <local_schema>"
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr "Два <longdesc> елемента под <local_schema>"
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "Елементът <%s> не е позволен под <%s>"
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "<%s> доставен, но текущия елемент няма вид %s"
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr "Два <car> елемента дадени за една и съща двойка"
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr "Два <cдr> елемента дадени за една и съща двойка"
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr "<li> има грешен вид %s"
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr "<%s> доставен, но висшестоящия запис няма стойност"
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "Елемента <%s> не е позволен в текущия елемент"
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr ""
 "Най-външният елемент във файла на менюто трябва да е <gconf>, а не <%s>"
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "Елемента <%s> не е позволен в <%s> елемент"
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "Не е позволен текст в елемента <%s>"
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Неуспех при отваряне на \"%s\": %s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Грешка при писане във файл \"%s\": %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr ""
diff --git a/po/bn.po b/po/bn.po
index 5e0454df..373838b8 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf.gnome-2-2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2003-6-12 12:30+0600\n"
 "Last-Translator: Muhammad Mahmudur Rahman Khan  <mrk_ju@yahoo.com>\n"
 "Language-Team: Bengali <gnome-translation@bengalinux.org>\n"
@@ -15,22 +15,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "%s নামক ডিরেকটরী খূঁজে পাওয়া যাইনি\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "'%s' তে GConf ট্রি সেভ করতে ত্রুটি:%s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "ব্যাবহার: %s <dir>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -42,219 +42,219 @@ msgid ""
 "    dir/%%gconf-tree.xml\n"
 msgstr ""
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 #, fuzzy
 msgid "Unloading text markup backend module."
 msgstr "XML এর ব্যাকএন্ড মডিউল আনলোড করছে।"
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "%s  ঠিকানায় XML রুট ডিরেকটরী খুজে পাওয়া যায়নি "
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "'%s' নামক ডিরেকটরী তৈরি করতে পারেনি: %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr ""
 "\"%s\" ঠিকানায়  XML এর রুট ডিরেকটরি থেকে পড়তে কিংবা ডিরেকটরিতে লিখতে পারেনি"
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "%s রুটে   XML সোর্সের ডিরেকটরি/ফাইল ব্যবহারের অনুমতি : %o/%o "
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
 msgstr ""
 "সম্পূর্ণ ডিরেকটরি অপসারণ করা এখন অসমর্থিত, ডিরেকটরির সব মান অপসারণ করলেই হবে"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr ""
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "ফাইল '%s'কে অপসারণ করা যায়নি:%s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 #, fuzzy
 msgid "Initializing Markup backend module"
 msgstr "একস,এম,এল(XML) এর  ব্যাকএন্ড মডিউল চালু করছে"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "XML ডিরেকটরি \"%s\" এর লক বাদ দেওয়া যাইনি:%s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 #, fuzzy
 msgid "Failed to write some configuration data to disk\n"
 msgstr "কনফিগারেশন চালু করতে পারেনি:%s\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "\"%s\" ডিরেকটরি তৈরি করতে পারেনি :%s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, fuzzy, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "ফাইল '%s'কে অপসারণ করা যায়নি:%s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, fuzzy, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr " মুছে ফেলতে পারেনি \"%s\" :%s"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, fuzzy, c-format
 msgid "Line %d character %d: %s"
 msgstr "%s তৈরি করতে ব্যর্থ:%s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "`%s' বুঝা যায়নি (ইনটিজার আশা করা হয়েছিল)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "ইনটিজার `%s' খুব ছোট অথবা বড়"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "`%s' বুঝা যায়নি (সত্য [true] অথবা মিথ্যা [false] আশা করা হয়েছিল)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "`%s' বুঝা যায়নি (রিয়াল আশা করা হয়েছিল)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, fuzzy, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "<%s> নোডের কোন \"type\" বৈশিষ্ট্য নেই"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr ""
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr ""
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, fuzzy, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "%s খুলতে ব্যর্থ: %s"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, fuzzy, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "\"%s\" মান সরানোতে ত্রুটি:%s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, fuzzy, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "'নতূন সংরক্ষিত অবস্থা ফাইল ঠিক স্থানে সরানে যায়নি: %s"
diff --git a/po/bs.po b/po/bs.po
index 73b8bac8..705b203b 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf.HEAD.bs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-25 20:02+0200\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-07-31 16:12+0200\n"
 "Last-Translator: Kenan Hadžiavdić <kenan@bgnett.no>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -19,22 +19,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Ne mogu naći direktorij %s\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Greška tokom snimanja GConf stabla u `%s': %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "Upotreba: %s <dir>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -53,31 +53,33 @@ msgstr ""
 "  u:\n"
 "    dir/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr "Istovaram modul za označavanje teksta."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Nisam mogao naći XML root direktorij na adresi `%s'"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Nisam mogao napraviti direktorij `%s': %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
-msgid "Can't read from or write to the XML root directory in the address \"%s\""
+msgid ""
+"Can't read from or write to the XML root directory in the address \"%s\""
 msgstr "Ne mogu čitati iz ili pisati u XML root direktorij na adresi \"%s\""
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
-msgstr "Direktorijske/datotečne doyvole za XML izvorni kod u korijenu %s su: %o/%o"
+msgstr ""
+"Direktorijske/datotečne doyvole za XML izvorni kod u korijenu %s su: %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -85,186 +87,189 @@ msgstr ""
 "Uklanjanje direktorija više nije podržano, samo uklonite sve vrijednosti u "
 "direktoriju"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
-msgstr "Nisam mogao otvoriti direktorij sa ključem za %s da bih otključao: %s\n"
+msgstr ""
+"Nisam mogao otvoriti direktorij sa ključem za %s da bih otključao: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Nisam mogao ukloniti datoteku %s: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr "Inicijaliziram modul Markup-backend"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Neuspješno otključavanje XML direktorija \"%s\": %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Neuspješno pisanje nekih podataka o podešavanjima na disk\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Nisam mogao napraviti direktorij \"%s\": %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Nisam mogao ukloniti \"%s\": %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Neuspješno pisanje \"%s\": %s\n"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "Linija %d znak %d: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "Atribut \"%s\" je dvaput ponovljen na istom elementu <%s>"
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "U ovom slučaju je atribut \"%s\" nevažeći na elementu <%s>"
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Nisam razumio `%s' (očekivan cijeli broj)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Cijeli broj `%s' je prevelik ili premal"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Nisam razumio `%s' (očekivan true ili false)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Nisam razumio `%s' (očekivan realni broj)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Nema atributa \"%s\" na elementu <%s>"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr "Nepoznata vrijednost \"%s\" za atribut \"%s\" na elementu <%s>"
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr "Nevažeći ltype \"%s\" na <%s>"
 
-#: backends/markup-tree.c:2342
-#, c-format
-msgid "Invalid car_type \"%s\" on <%s>"
-msgstr "Nevažeći car_type \"%s\" na <%s>"
+#: backends/markup-tree.c:2240
+#, fuzzy, c-format
+msgid "Invalid first-element type \"%s\" on <%s>"
+msgstr "Nevažeći list_type \"%s\" na <%s>"
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr "Nevažeći cdr_type \"%s\" na <%s>"
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr "Nevažeći list_type \"%s\" na <%s>"
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr "Dva <default> elementa ispod <local_schema>"
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr "Dva <longdesc> elementa ispod <local_schema>"
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "Element <%s> nije dozvoljen ispod <%s>"
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "<%s> je obezbjeđen ali trenutni element nije tipa %s"
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr "Dva <car> elementa su data za isti par"
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr "Dva <cdr> elementa su data za isti par"
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr "<li> je pogrešnog tipa %s"
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr "<%s> je obezbjeđen ali nadređeni <entry> nema vrijednost"
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "Element <%s> nije dozvoljen unutar trenutnog elementa"
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr "Vanjski element u meni datoteci mora biti <gconf>, a ne <%s>"
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "Element <%s> nije dozvoljen unutar elementa <%s>"
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "Tekst nije dozvoljen u elementu <%s>"
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Neuspješno otvaranje \"%s\": %s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Greška pri pisanju datoteke \"%s\": %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
-msgstr "Nisam uspio pomjeriti privremenu datoteku \"%s\" na konačnu lokaciju \"%s\": %s"
+msgstr ""
+"Nisam uspio pomjeriti privremenu datoteku \"%s\" na konačnu lokaciju \"%s\": "
+"%s"
 
 #: backends/xml-backend.c:240
 msgid "Unloading XML backend module."
@@ -552,7 +557,8 @@ msgstr "Primljen zahtjev za ujednačeno sinhroniziranje"
 
 #: gconf/gconf-database.c:807
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
-msgstr "Fatalna greška: neuspješno dobivanje referanse objekta za ConfigDatabase"
+msgstr ""
+"Fatalna greška: neuspješno dobivanje referanse objekta za ConfigDatabase"
 
 #: gconf/gconf-database.c:973
 #, c-format
@@ -564,7 +570,9 @@ msgstr "Neuspješno sinhroniziranje jednog ili više izvora: %s"
 msgid ""
 "Error obtaining new value for `%s' after change notification from backend `%"
 "s': %s"
-msgstr "Greška pri dobavljanju nove vrijednosti za `%s' nakon obavijesti o promjeni od backend `%s': %s"
+msgstr ""
+"Greška pri dobavljanju nove vrijednosti za `%s' nakon obavijesti o promjeni "
+"od backend `%s': %s"
 
 #: gconf/gconf-database.c:1119
 #, c-format
@@ -768,65 +776,65 @@ msgstr "Dodajem izvor `%s'\n"
 msgid "Read error on file `%s': %s\n"
 msgstr "Greška u čitanju datoteke `%s': %s\n"
 
-#: gconf/gconf-internals.c:1279 gconf/gconf-internals.c:1345
+#: gconf/gconf-internals.c:1235 gconf/gconf-internals.c:1301
 #: gconf/gconf-value.c:154 gconf/gconf-value.c:253 gconf/gconf-value.c:395
 #: gconf/gconf-value.c:1681
 msgid "Text contains invalid UTF-8"
 msgstr "Tekst sadrži nevažeći UTF-8"
 
-#: gconf/gconf-internals.c:1430
+#: gconf/gconf-internals.c:1386
 #, c-format
 msgid "Expected list, got %s"
 msgstr "Očekivana lista, dobijena %s"
 
-#: gconf/gconf-internals.c:1440
+#: gconf/gconf-internals.c:1396
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "Očekivan lista od %s, dobijena lista od %s"
 
-#: gconf/gconf-internals.c:1568
+#: gconf/gconf-internals.c:1524
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "Očekivan par, dobijen %s"
 
-#: gconf/gconf-internals.c:1582
+#: gconf/gconf-internals.c:1538
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr "Očekivan par (%s,%s), dobijen par bez jedne ili obje vrijednosti"
 
-#: gconf/gconf-internals.c:1598
+#: gconf/gconf-internals.c:1554
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "Očekivan par tipa (%s,%s), dobijen tip (%s,%s)"
 
-#: gconf/gconf-internals.c:1714
+#: gconf/gconf-internals.c:1670
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "String pod navodnim znacima ne počinje navodnim znakom"
 
-#: gconf/gconf-internals.c:1776
+#: gconf/gconf-internals.c:1732
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "String pod navodnim znacima ne završava navodnim znakom"
 
-#: gconf/gconf-internals.c:1912
+#: gconf/gconf-internals.c:1868
 msgid "Encoded value is not valid UTF-8"
 msgstr "Kodirana vrijednost nije važeći UTF-8"
 
-#: gconf/gconf-internals.c:2371
+#: gconf/gconf-internals.c:2327
 #, c-format
 msgid "Could not lock temporary file '%s': %s"
 msgstr "Nisam mogao zaključati privremenu datoteku '%s': %s"
 
-#: gconf/gconf-internals.c:2398
+#: gconf/gconf-internals.c:2354
 #, c-format
 msgid "Could not create file '%s', probably because it already exists"
 msgstr "Nisam mogao napraviti datoteku '%s', vjerovatno jer već postoji"
 
-#: gconf/gconf-internals.c:2444
+#: gconf/gconf-internals.c:2400
 #, c-format
 msgid "Failed to create or open '%s'"
 msgstr "Neuspješno pravljenje ili otvaranje '%s'"
 
-#: gconf/gconf-internals.c:2454
+#: gconf/gconf-internals.c:2410
 #, c-format
 msgid ""
 "Failed to lock '%s': probably another process has the lock, or your "
@@ -835,88 +843,89 @@ msgstr ""
 "Nisam mogao zaključati '%s': vjerovatno drugi proces ima bravu ili vaš "
 "operativni sistem ima pogrešno podešeno zaključavanje NFS datoteka (%s)"
 
-#: gconf/gconf-internals.c:2484
+#: gconf/gconf-internals.c:2440
 #, c-format
 msgid "IOR file '%s' not opened successfully, no gconfd located: %s"
 msgstr "IOR datoteka '%s' nije uspješno otvorena, gconfd nije lociran: %s"
 
-#: gconf/gconf-internals.c:2514
+#: gconf/gconf-internals.c:2470
 #, c-format
 msgid "gconftool or other non-gconfd process has the lock file '%s'"
 msgstr "gconftool ili drugi ne-gconfd proces ima datoteku sa bravom '%s'"
 
-#: gconf/gconf-internals.c:2531
+#: gconf/gconf-internals.c:2487
 msgid "couldn't contact ORB to resolve existing gconfd object reference"
-msgstr "nisam mogao kontaktirati ORG da razložim postojeću referencu gconfd objekta"
+msgstr ""
+"nisam mogao kontaktirati ORG da razložim postojeću referencu gconfd objekta"
 
-#: gconf/gconf-internals.c:2541
+#: gconf/gconf-internals.c:2497
 #, c-format
 msgid "Failed to convert IOR '%s' to an object reference"
 msgstr "Neuspješno konvertiranje IOR '%s' u referansi objekta"
 
-#: gconf/gconf-internals.c:2591
+#: gconf/gconf-internals.c:2547
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "nisam mogao napraviti direktorij `%s': %s"
 
-#: gconf/gconf-internals.c:2650
+#: gconf/gconf-internals.c:2606
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "Ne mogu pisati u datoteku `%s': %s"
 
-#: gconf/gconf-internals.c:2691
+#: gconf/gconf-internals.c:2647
 #, c-format
 msgid "We didn't have the lock on file `%s', but we should have"
 msgstr "Nismo imali bravu na datoteci `%s', a trebali smo"
 
-#: gconf/gconf-internals.c:2712
+#: gconf/gconf-internals.c:2668
 #, c-format
 msgid "Failed to link '%s' to '%s': %s"
 msgstr "Nisam mogao povezati '%s' sa '%s': %s"
 
-#: gconf/gconf-internals.c:2724
+#: gconf/gconf-internals.c:2680
 #, c-format
 msgid "Failed to remove lock file `%s': %s"
 msgstr "Nisam mogao ukloniti datoteku brave `%s': %s"
 
-#: gconf/gconf-internals.c:2743
+#: gconf/gconf-internals.c:2699
 #, c-format
 msgid "Failed to clean up file '%s': %s"
 msgstr "Nisam mogao očistiti datoteku '%s': %s"
 
-#: gconf/gconf-internals.c:2757
+#: gconf/gconf-internals.c:2713
 #, c-format
 msgid "Failed to remove lock directory `%s': %s"
 msgstr "Nisam mogao ukloniti direktorij brave `%s': %s"
 
-#: gconf/gconf-internals.c:2799
+#: gconf/gconf-internals.c:2755
 #, c-format
 msgid "Failed to unlink lock file %s: %s\n"
 msgstr "Nisam mogao ukloniti link do datoteke brave %s: %s\n"
 
-#: gconf/gconf-internals.c:2938 gconf/gconfd.c:541
+#: gconf/gconf-internals.c:2894 gconf/gconfd.c:541
 #, c-format
 msgid "Failed to stat %s: %s"
 msgstr "Nisam mogao izvršiti stat() %s: %s"
 
-#: gconf/gconf-internals.c:2960
+#: gconf/gconf-internals.c:2916
 #, c-format
 msgid "Server ping error: %s"
 msgstr "Greška tokom poziva servera: %s"
 
-#: gconf/gconf-internals.c:2985
+#: gconf/gconf-internals.c:2941
 #, c-format
 msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
 msgstr ""
 "Nisam mogao napraviti cijev za komuniciranje s novopokrenutim gconf daemon-"
 "om: %s\n"
 
-#: gconf/gconf-internals.c:3009
+#: gconf/gconf-internals.c:2965
 #, c-format
 msgid "Failed to launch configuration server: %s\n"
 msgstr "Neuspješno pokretanje servera s podešavanjima: %s\n"
 
-#: gconf/gconf-internals.c:3034
+#: gconf/gconf-internals.c:2990
 #, c-format
 msgid ""
 "Failed to contact configuration server; some possible causes are that you "
@@ -929,15 +938,15 @@ msgstr ""
 "pada sistema. Pogledajte http://www.gnome.org/projects/gconf/ za više "
 "informacija. (Detalji - %s)"
 
-#: gconf/gconf-internals.c:3035
+#: gconf/gconf-internals.c:2991
 msgid "none"
 msgstr "ništa"
 
-#: gconf/gconf-sanity-check.c:40 gconf/gconftool.c:86
+#: gconf/gconf-sanity-check.c:40 gconf/gconftool.c:88
 msgid "Help options"
 msgstr "Opcije pomoći"
 
-#: gconf/gconf-sanity-check.c:76 gconf/gconftool.c:525
+#: gconf/gconf-sanity-check.c:76 gconf/gconftool.c:527
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -1053,7 +1062,8 @@ msgid "Schema contains invalid UTF-8"
 msgstr "Šema sadrži nevažeći UTF-8"
 
 #: gconf/gconf-schema.c:254
-msgid "Schema specifies type list but doesn't specify the type of the list elements"
+msgid ""
+"Schema specifies type list but doesn't specify the type of the list elements"
 msgstr "Šema navodi tip liste ali ne navodi tip elemenata liste"
 
 #: gconf/gconf-schema.c:264
@@ -1068,18 +1078,22 @@ msgid "Failed to load source \"%s\": %s"
 msgstr "Nisam mogao učitati izvor \"%s\": %s"
 
 #: gconf/gconf-sources.c:408
-#, c-format
-msgid "Resolved address \"%s\" to a writable config source at position %d"
+#, fuzzy, c-format
+msgid ""
+"Resolved address \"%s\" to a writable configuration source at position %d"
 msgstr "Razriješena adresa \"%s\" do izvora podešavanja na poziciji %d"
 
 #: gconf/gconf-sources.c:414
-#, c-format
-msgid "Resolved address \"%s\" to a read-only config source at position %d"
-msgstr "Razriješena adresa \"%s\" do izvora podešavanja samo za čitanjena poziciji %d"
+#, fuzzy, c-format
+msgid ""
+"Resolved address \"%s\" to a read-only configuration source at position %d"
+msgstr ""
+"Razriješena adresa \"%s\" do izvora podešavanja samo za čitanjena poziciji %d"
 
 #: gconf/gconf-sources.c:421
 #, c-format
-msgid "Resolved address \"%s\" to a partially writable config source at position %d"
+msgid ""
+"Resolved address \"%s\" to a partially writable config source at position %d"
 msgstr ""
 "Razriješena adresa \"%s\" do izvora podešavanja djelimično za pisanje na "
 "poziciji %d"
@@ -1302,7 +1316,8 @@ msgstr ""
 
 #: gconf/gconfd.c:344
 #, 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 ""
 "Datoteka sa podešavanjim nije pronađena, pokušavam koristiti uobičajeni "
 "izvor za podešavanja `%s'"
@@ -1347,7 +1362,8 @@ msgstr "Primljen signal %d, ispisujem core. Molim prijavite grešku na GConf-u."
 
 #: gconf/gconfd.c:438
 #, 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 ""
 "Primljen signal %d, gasim računar nenormalno. Molim pošaljite izvještaj o "
 "grešci."
@@ -1394,8 +1410,10 @@ msgid "Directory %s has a problem, gconfd can't use it"
 msgstr "Problem sa direktorijem %s, gconfd ga ne može koristiti"
 
 #: gconf/gconfd.c:729
-#, c-format
-msgid "Failed to write byte to pipe fd %d so client program may hang: %s"
+#, fuzzy, c-format
+msgid ""
+"Failed to write byte to pipe file descriptor %d so client program may hang: %"
+"s"
 msgstr ""
 "Neuspješno upisivanje bajta u cijev fd %d . Program klijent se može "
 "zakočiti: %s"
@@ -1443,7 +1461,8 @@ msgstr ""
 
 #: gconf/gconfd.c:1389
 #, c-format
-msgid "Failed to close gconfd logfile; data may not have been properly saved (%s)"
+msgid ""
+"Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr ""
 "Neuspješno zatvaranje log datoteke za gconfd, podaci možda nisu ispravno "
 "snimljeni (%s)"
@@ -1475,14 +1494,16 @@ msgstr "Nisam mogao postaviti novu snimljenu datoteku stanja na mjesto: %s"
 
 #: gconf/gconfd.c:1507
 #, 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 ""
 "Nisam uspio povratiti originalnu snimljenu datoteku stanja koja je "
 "premještena u '%s': %s"
 
 #: gconf/gconfd.c:1986
 #, 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 ""
 "Ne mogu povratiti slušatelja na adresi '%s', nisam mogao razriješiti bazu "
 "podataka"
@@ -1533,21 +1554,23 @@ msgstr "Nisam uspio upisati dodavanje klijenta u snimljenu datoteku stanja: %s"
 #: gconf/gconfd.c:2269
 #, c-format
 msgid "Failed to flush client add to saved state file: %s"
-msgstr "Nisam mogao sinhronizirati dodavanje klijenta u snimljenu datoteku stanja: %s"
+msgstr ""
+"Nisam mogao sinhronizirati dodavanje klijenta u snimljenu datoteku stanja: %s"
 
 #: gconf/gconfd.c:2368
-msgid "Some client removed itself from the GConf server when it hadn't been added."
+msgid ""
+"Some client removed itself from the GConf server when it hadn't been added."
 msgstr "Klijent je napustio GConf server nakon što nije bio dodan."
 
-#: gconf/gconftool.c:95
+#: gconf/gconftool.c:97
 msgid "Set a key to a value and sync. Use with --type."
 msgstr "Postavi ključ na vrijednost i sinhroniziraj. Koristi sa --type."
 
-#: gconf/gconftool.c:104
+#: gconf/gconftool.c:106
 msgid "Print the value of a key to standard output."
 msgstr "Štampaj vrijednost ključa na standardni izlaz."
 
-#: gconf/gconftool.c:113
+#: gconf/gconftool.c:115
 msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and --"
 "type."
@@ -1555,11 +1578,11 @@ msgstr ""
 "Postavi šemu i sinhroniziraj. Koristi sa --short-desc, --long-desc, --owner "
 "i --type."
 
-#: gconf/gconftool.c:123
+#: gconf/gconftool.c:125
 msgid "Unset the keys on the command line"
 msgstr "Poništi postavljanje ključeva na komandnoj liniji"
 
-#: gconf/gconftool.c:132
+#: gconf/gconftool.c:134
 msgid ""
 "Recursively unset all keys at or below the key/directory names on the "
 "command line"
@@ -1567,49 +1590,53 @@ msgstr ""
 "Rekuryivno poniåti sve postavljene ključeve na ili ispod imena ključeva/"
 "direktorija na komandnoj liniji"
 
-#: gconf/gconftool.c:141
+#: gconf/gconftool.c:143
 msgid "Print all key/value pairs in a directory."
 msgstr "Ispiši sve ključ/vrijednost parove u direktoriju."
 
-#: gconf/gconftool.c:150
+#: gconf/gconftool.c:152
 msgid "Print all subdirectories in a directory."
 msgstr "Ispiši sve podređene direktorije u direktoriju."
 
-#: gconf/gconftool.c:159
+#: gconf/gconftool.c:161
+#, fuzzy
 msgid ""
-"Dump to standard out an XML description of all entries under a dir, "
+"Dump to standard output an XML description of all entries under a directory, "
 "recursively."
-msgstr "Ispiši na standardni izlaz XML opis svih unosa ispod direktorija, rekurzivno"
+msgstr ""
+"Ispiši na standardni izlaz XML opis svih unosa ispod direktorija, rekurzivno"
 
-#: gconf/gconftool.c:168
+#: gconf/gconftool.c:170
+#, fuzzy
 msgid ""
 "Load from the specified file an XML description of values and set them "
-"relative to a dir."
+"relative to a directory."
 msgstr ""
 "Učitaj iz navedene datoteke XML opis vrijednosti i postavi ih relativno od "
 "direktorija."
 
-#: gconf/gconftool.c:177
+#: gconf/gconftool.c:179
 msgid "Unload a set of values described in an XML file."
 msgstr "Istovari skup vrijednosti opisanih u XML datoteci."
 
-#: gconf/gconftool.c:186
-msgid "Print all subdirectories and entries under a dir, recursively."
+#: gconf/gconftool.c:188
+#, fuzzy
+msgid "Print all subdirectories and entries under a directory, recursively."
 msgstr "Ispiši sve podređene direktorije i unose pod direktorijem, rekurzivno."
 
-#: gconf/gconftool.c:195
+#: gconf/gconftool.c:197
 msgid "Return 0 if the directory exists, 2 if it does not."
 msgstr "Vrati 0 ako direktorij postoji, 2 ako ne postoji."
 
-#: gconf/gconftool.c:204
+#: gconf/gconftool.c:206
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr "Ugasi gconfd. NEMOJTE KORISTITI OVU OPCIJU BEZ DOBROG RAZLOGA."
 
-#: gconf/gconftool.c:213
+#: gconf/gconftool.c:215
 msgid "Return 0 if gconfd is running, 2 if not."
 msgstr "Vrati 0 ako je gconfd pokrenut, 2 ako nije."
 
-#: gconf/gconftool.c:222
+#: gconf/gconftool.c:224
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
@@ -1617,7 +1644,7 @@ msgstr ""
 "Pokreni server za podešavanja (gconfd). (Obično se događa automatski kad je "
 "potrebno.)"
 
-#: gconf/gconftool.c:231
+#: gconf/gconftool.c:233
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
@@ -1625,23 +1652,23 @@ msgstr ""
 "Navedi tip vrijednosti koja se postavlja ili tip vrijednosti koju schema "
 "opisuje. Jedinstvene skraćenice OK."
 
-#: gconf/gconftool.c:232
+#: gconf/gconftool.c:234
 msgid "int|bool|float|string|list|pair"
 msgstr "int|bool|float|string|list|pair"
 
-#: gconf/gconftool.c:240
+#: gconf/gconftool.c:242
 msgid "Print the data type of a key to standard output."
 msgstr "Ispiši tip podataka ključa na standardni izlaz."
 
-#: gconf/gconftool.c:249
+#: gconf/gconftool.c:251
 msgid "Get the number of elements in a list key."
 msgstr "Dobavi broj elemenata u ključu liste."
 
-#: gconf/gconftool.c:258
+#: gconf/gconftool.c:260
 msgid "Get a specific element from a list key, numerically indexed."
 msgstr "Dobavi određeni element u ključu liste, brojčano poredane."
 
-#: gconf/gconftool.c:267
+#: gconf/gconftool.c:269
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1649,11 +1676,11 @@ msgstr ""
 "Navedi tip vrijednosti liste koji se postavlja ili tip vrijednosti koji "
 "schema opisuje. Jedinstvene skraćenice OK."
 
-#: gconf/gconftool.c:268 gconf/gconftool.c:277 gconf/gconftool.c:286
+#: gconf/gconftool.c:270 gconf/gconftool.c:279 gconf/gconftool.c:288
 msgid "int|bool|float|string"
 msgstr "int|bool|float|string"
 
-#: gconf/gconftool.c:276
+#: gconf/gconftool.c:278
 msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1661,7 +1688,7 @@ msgstr ""
 "Navedi tip vrijednosti car tipa koji se postavlja ili tip vrijednosti koji "
 "schema opisuje. Jedinstvene skraćenice OK."
 
-#: gconf/gconftool.c:285
+#: gconf/gconftool.c:287
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
@@ -1669,43 +1696,44 @@ msgstr ""
 "Navedi tip vrijednosti cdr tipa koji se postavlja ili tip vrijednosti koji "
 "schema opisuje. Jedinstvene skraćenice OK."
 
-#: gconf/gconftool.c:294
+#: gconf/gconftool.c:296
 msgid "Specify a short half-line description to go in a schema."
 msgstr "Navedi kratki na pola linije opis koji ide u schema-u."
 
-#: gconf/gconftool.c:295 gconf/gconftool.c:304
+#: gconf/gconftool.c:297 gconf/gconftool.c:306
 msgid "DESCRIPTION"
 msgstr "OPIS"
 
-#: gconf/gconftool.c:303
+#: gconf/gconftool.c:305
 msgid "Specify a several-line description to go in a schema."
 msgstr "Navedi na više linija opis koji ide u schema-u."
 
-#: gconf/gconftool.c:312
+#: gconf/gconftool.c:314
 msgid "Specify the owner of a schema"
 msgstr "Navedi clasnika šeme"
 
-#: gconf/gconftool.c:313
+#: gconf/gconftool.c:315
 msgid "OWNER"
 msgstr "VLASNIK"
 
-#: gconf/gconftool.c:321
+#: gconf/gconftool.c:323
 msgid "Specify a schema file to be installed"
 msgstr "Navedi datoteku šeme koja će se instalirati"
 
-#: gconf/gconftool.c:322
+#: gconf/gconftool.c:324
 msgid "FILENAME"
 msgstr "IME DATOTEKE"
 
-#: gconf/gconftool.c:330
+#: gconf/gconftool.c:332
 msgid "Specify a configuration source to use rather than the default path"
-msgstr "Navedi izvor podešavanja koji će se koristiti umjesto uobičajene putanje"
+msgstr ""
+"Navedi izvor podešavanja koji će se koristiti umjesto uobičajene putanje"
 
-#: gconf/gconftool.c:331
+#: gconf/gconftool.c:333
 msgid "SOURCE"
 msgstr "IZVOR"
 
-#: gconf/gconftool.c:339
+#: gconf/gconftool.c:341
 msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
@@ -1713,7 +1741,7 @@ msgstr ""
 "Direktan pristup bazi podataka s podešavanjima, preskačući server. Zahtijeva "
 "da gconfd nije pokrenut."
 
-#: gconf/gconftool.c:348
+#: gconf/gconftool.c:350
 msgid ""
 "Properly installs schema files on the command line into the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1723,7 +1751,7 @@ msgstr ""
 "Varijabla okoline GCONF_CONFIG_SOURCE bi trebala biti postavljena na izvor "
 "koji nije uobičajeni ili na prazan string da bi se koristio uobičajeni."
 
-#: gconf/gconftool.c:357
+#: gconf/gconftool.c:359
 msgid ""
 "Properly uninstalls schema files on the command line from the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
@@ -1733,7 +1761,7 @@ msgstr ""
 "Varijabla okoline GCONF_CONFIG_SOURCE bi trebala biti postavljena na izvor "
 "koji nije uobičajeni ili na prazan string da bi se koristio uobičajeni."
 
-#: gconf/gconftool.c:366
+#: gconf/gconftool.c:368
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
@@ -1741,7 +1769,7 @@ msgstr ""
 "Izvršite test mučenja aplikacije postavljanjem i poništavanjem raznih "
 "postavljenih vrijednosti različitih tipova za ključeve na komandnoj liniji."
 
-#: gconf/gconftool.c:375
+#: gconf/gconftool.c:377
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
@@ -1749,59 +1777,60 @@ msgstr ""
 "Izvršite test mučenja aplikacije postavljanjem i poništavanjem raznih "
 "postavljenih ključeva unutar direktorija na komandnoj liniji."
 
-#: gconf/gconftool.c:384
+#: gconf/gconftool.c:386
 msgid "Get the short doc string for a key"
 msgstr "Dobavi kratki doc string za ključ"
 
-#: gconf/gconftool.c:393
+#: gconf/gconftool.c:395
 msgid "Get the long doc string for a key"
 msgstr "Dobavi dugi doc string za ključ"
 
-#: gconf/gconftool.c:402
+#: gconf/gconftool.c:404
 msgid "Get the name of the schema applied to this key"
 msgstr "Dobavi ime šeme primijenjene na ovom ključu"
 
-#: gconf/gconftool.c:411
+#: gconf/gconftool.c:413
 msgid "Specify the schema name followed by the key to apply the schema name to"
 msgstr "Navedi ime šeme praćeno ključem na koji će se šema primijeniti"
 
-#: gconf/gconftool.c:420
+#: gconf/gconftool.c:422
 msgid "Remove any schema name applied to the given keys"
 msgstr "Uklonite sva imena šema primijenjena datim ključevima"
 
-#: gconf/gconftool.c:429
+#: gconf/gconftool.c:431
 msgid "Ignore schema defaults when reading values."
 msgstr "Zanemari uobičajeno od schema pri čitanju vrijednosti."
 
-#: gconf/gconftool.c:438
+#: gconf/gconftool.c:440
 msgid "Get the name of the default source"
 msgstr "Dobavi ime uobičajenog izvora"
 
-#: gconf/gconftool.c:447
+#: gconf/gconftool.c:449
 msgid "Print version"
 msgstr "Ispiši verziju"
 
-#: gconf/gconftool.c:543
+#: gconf/gconftool.c:545
 msgid "Can't get and set/unset simultaneously\n"
 msgstr "Ne mogu istovremeno dobaviti i postaviti odn. poništiti postavljeno\n"
 
-#: gconf/gconftool.c:553
+#: gconf/gconftool.c:555
 msgid "Can't set and get/unset simultaneously\n"
 msgstr "Ne mogu istovreeno postaviti i dobaviti odn. poništiti postavljeno\n"
 
-#: gconf/gconftool.c:560
+#: gconf/gconftool.c:562
 msgid "Can't get type and set/unset simultaneously\n"
-msgstr "Ne mogu istovremeno dobaviti tip i postaviti odn. poništiti postavljeno\n"
+msgstr ""
+"Ne mogu istovremeno dobaviti tip i postaviti odn. poništiti postavljeno\n"
 
-#: gconf/gconftool.c:571
+#: gconf/gconftool.c:573
 msgid "Can't use --all-entries with --get or --set\n"
 msgstr "Ne mogu koristiti --all-entries sa --get ili --set\n"
 
-#: gconf/gconftool.c:582
+#: gconf/gconftool.c:584
 msgid "Can't use --all-dirs with --get or --set\n"
 msgstr "Ne mogu koristiti --all-dirs sa --get ili --set\n"
 
-#: gconf/gconftool.c:595
+#: gconf/gconftool.c:597
 msgid ""
 "--recursive-list should not be used with --get, --set, --unset, --all-"
 "entries, or --all-dirs\n"
@@ -1809,7 +1838,7 @@ msgstr ""
 "--recursive-list se ne bi trebalo koristiti sa --get, --set, --unset, --all-"
 "entries ili --all-dirs\n"
 
-#: gconf/gconftool.c:608
+#: gconf/gconftool.c:610
 msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-entries, --"
 "all-dirs\n"
@@ -1817,15 +1846,15 @@ msgstr ""
 "--set_schema se ne bi trebalo koristiti sa --get, --set, --unset, --all-"
 "entries, --all-dirs\n"
 
-#: gconf/gconftool.c:614
+#: gconf/gconftool.c:616
 msgid "Value type is only relevant when setting a value\n"
 msgstr "Tip vrijednosti je važan samo kod postavljanja vrijednosti\n"
 
-#: gconf/gconftool.c:620
+#: gconf/gconftool.c:622
 msgid "Must specify a type when setting a value\n"
 msgstr "Mora se navesti tip kod postavljanja vrijednosti\n"
 
-#: gconf/gconftool.c:628
+#: gconf/gconftool.c:630
 msgid ""
 "--ignore-schema-defaults is only relevant with --get, --all-entries, --dump, "
 "--recursive-list, --get-list-size or --get-list-element\n"
@@ -1833,513 +1862,528 @@ msgstr ""
 "--ignore-schema-defaults je relevantno samo sa --get, --all-entries, --dump, "
 "--recursive-list, --get-list-size or --get-list-element\n"
 
-#: gconf/gconftool.c:640 gconf/gconftool.c:653 gconf/gconftool.c:666
-#: gconf/gconftool.c:680 gconf/gconftool.c:693 gconf/gconftool.c:706
-#: gconf/gconftool.c:720
+#: gconf/gconftool.c:642 gconf/gconftool.c:655 gconf/gconftool.c:668
+#: gconf/gconftool.c:682 gconf/gconftool.c:695 gconf/gconftool.c:708
+#: gconf/gconftool.c:722
 #, c-format
 msgid "%s option must be used by itself.\n"
 msgstr "Opcija %s mora sama sebe koristiti.\n"
 
-#: gconf/gconftool.c:729
-msgid "You must specify a config source with --config-source when using --direct\n"
+#: gconf/gconftool.c:731
+msgid ""
+"You must specify a config source with --config-source when using --direct\n"
 msgstr ""
 "Morate navesti izvor podešavanja pomoću --config-source pri korištenju --"
 "direct\n"
 
-#: gconf/gconftool.c:735
+#: gconf/gconftool.c:737
 #, c-format
 msgid "Failed to init GConf: %s\n"
 msgstr "Nisam uspio inicijalizirati GConf: %s\n"
 
-#: gconf/gconftool.c:764
+#: gconf/gconftool.c:766
 msgid "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, not installing schemas\n"
-msgstr "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL je postavljeno, neću instalirati šeme\n"
+msgstr ""
+"GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL je postavljeno, neću instalirati šeme\n"
 
-#: gconf/gconftool.c:771
-msgid "GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL is set, not uninstalling schemas\n"
+#: gconf/gconftool.c:773
+msgid ""
+"GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL is set, not uninstalling schemas\n"
 msgstr ""
 "GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL je postavljeno, neću instalirati "
 "šeme\n"
 
-#: gconf/gconftool.c:784
+#: gconf/gconftool.c:786
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
 msgstr "Varijabla okoline GCONF_CONFIG_SOURCE mora biti postavljena\n"
 
-#: gconf/gconftool.c:819
+#: gconf/gconftool.c:821
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
 msgstr "Neuspješan pristup izvoru podešavanja: %s\n"
 
-#: gconf/gconftool.c:1116
+#: gconf/gconftool.c:1124
 #, c-format
 msgid "Shutdown error: %s\n"
 msgstr "Greška tokom gašenja: %s\n"
 
-#: gconf/gconftool.c:1159
+#: gconf/gconftool.c:1167
 msgid "Must specify one or more directories to recursively list.\n"
-msgstr "Morate navesti jedan ili više direktorija za rekurzivno izlistavanje.\n"
+msgstr ""
+"Morate navesti jedan ili više direktorija za rekurzivno izlistavanje.\n"
 
-#: gconf/gconftool.c:1211
+#: gconf/gconftool.c:1219
 msgid "Must specify one or more directories to dump.\n"
 msgstr "Morate navesti jedan ili više direktorija za ispis.\n"
 
-#: gconf/gconftool.c:1253 gconf/gconftool.c:1519
+#: gconf/gconftool.c:1261 gconf/gconftool.c:1527
 #, c-format
 msgid "Failure listing entries in `%s': %s\n"
 msgstr "Neuspješno listanje unosa u `%s': %s\n"
 
-#: gconf/gconftool.c:1272
+#: gconf/gconftool.c:1280
 msgid "(no value set)"
 msgstr "(vrijednost nije postavljena)"
 
-#: gconf/gconftool.c:1578
+#: gconf/gconftool.c:1586
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
 msgstr "Neuspješno pokretanje servera (gconfd): %s\n"
 
-#: gconf/gconftool.c:1607
+#: gconf/gconftool.c:1615
 msgid "Must specify a key or keys to get\n"
 msgstr "Morate navesti ključ ili ključeve za dobavljanje\n"
 
-#: gconf/gconftool.c:1642
+#: gconf/gconftool.c:1650
 #, c-format
 msgid "Type: %s\n"
 msgstr "Tip: %s\n"
 
-#: gconf/gconftool.c:1643
+#: gconf/gconftool.c:1651
 #, c-format
 msgid "List Type: %s\n"
 msgstr "Tip lista: %s\n"
 
-#: gconf/gconftool.c:1644
+#: gconf/gconftool.c:1652
 #, c-format
 msgid "Car Type: %s\n"
 msgstr "Tip car: %s\n"
 
-#: gconf/gconftool.c:1645
+#: gconf/gconftool.c:1653
 #, c-format
 msgid "Cdr Type: %s\n"
 msgstr "Tip cdr: %s\n"
 
-#: gconf/gconftool.c:1650
+#: gconf/gconftool.c:1658
 #, c-format
 msgid "Default Value: %s\n"
 msgstr "Uobičajena vrijednost: %s\n"
 
-#: gconf/gconftool.c:1650 gconf/gconftool.c:1652 gconf/gconftool.c:1653
-#: gconf/gconftool.c:1654
+#: gconf/gconftool.c:1658 gconf/gconftool.c:1660 gconf/gconftool.c:1661
+#: gconf/gconftool.c:1662
 msgid "Unset"
 msgstr "Poništi postavljeno"
 
-#: gconf/gconftool.c:1652
+#: gconf/gconftool.c:1660
 #, c-format
 msgid "Owner: %s\n"
 msgstr "Vlasnik: %s\n"
 
-#: gconf/gconftool.c:1653
+#: gconf/gconftool.c:1661
 #, c-format
 msgid "Short Desc: %s\n"
 msgstr "Kratki opis: %s\n"
 
-#: gconf/gconftool.c:1654
+#: gconf/gconftool.c:1662
 #, c-format
 msgid "Long Desc: %s\n"
 msgstr "Dugi opis: %s\n"
 
-#: gconf/gconftool.c:1663 gconf/gconftool.c:1887 gconf/gconftool.c:1921
-#: gconf/gconftool.c:1966 gconf/gconftool.c:2111
+#: gconf/gconftool.c:1671 gconf/gconftool.c:1895 gconf/gconftool.c:1929
+#: gconf/gconftool.c:1974 gconf/gconftool.c:2119
 #, c-format
 msgid "No value set for `%s'\n"
 msgstr "Nije postavljena vrijednost za `%s'\n"
 
-#: gconf/gconftool.c:1667 gconf/gconftool.c:1891 gconf/gconftool.c:1925
-#: gconf/gconftool.c:1970 gconf/gconftool.c:2115
+#: gconf/gconftool.c:1675 gconf/gconftool.c:1899 gconf/gconftool.c:1933
+#: gconf/gconftool.c:1978 gconf/gconftool.c:2123
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
 msgstr "Nisam uspio dobaviti vrijednost za `%s': %s\n"
 
-#: gconf/gconftool.c:1710 gconf/gconftool.c:1722
+#: gconf/gconftool.c:1718 gconf/gconftool.c:1730
 #, c-format
 msgid "Don't understand type `%s'\n"
 msgstr "Ne razumijem tip: `%s'\n"
 
-#: gconf/gconftool.c:1734
+#: gconf/gconftool.c:1742
 msgid "Must specify alternating keys/values as arguments\n"
 msgstr "Moraju se navesti alternativni ključevi/vrijednosti\n"
 
-#: gconf/gconftool.c:1754
+#: gconf/gconftool.c:1762
 #, c-format
 msgid "No value to set for key: `%s'\n"
 msgstr "Nema vrijednosti da se postavi za ključ: `%s'\n"
 
-#: gconf/gconftool.c:1782
+#: gconf/gconftool.c:1790
 msgid "Cannot set schema as value\n"
 msgstr "Ne mogu postaviti šemu kao vrijednost\n"
 
-#: gconf/gconftool.c:1792
+#: gconf/gconftool.c:1800
 msgid "When setting a list you must specify a primitive list-type\n"
 msgstr "Pri postavljanju liste morate navesti primitivan tip liste\n"
 
-#: gconf/gconftool.c:1806
-msgid "When setting a pair you must specify a primitive car-type and cdr-type\n"
+#: gconf/gconftool.c:1814
+msgid ""
+"When setting a pair you must specify a primitive car-type and cdr-type\n"
 msgstr "Kod postavljanja para morate navesti primitivni car-tip i cdr-tip\n"
 
-#: gconf/gconftool.c:1821
+#: gconf/gconftool.c:1829
 #, c-format
 msgid "Error: %s\n"
 msgstr "Greška: %s\n"
 
-#: gconf/gconftool.c:1834 gconf/gconftool.c:2866
+#: gconf/gconftool.c:1842 gconf/gconftool.c:2874
 #, c-format
 msgid "Error setting value: %s\n"
 msgstr "Greška tokom postavljanja vrijednosti: %s\n"
 
-#: gconf/gconftool.c:1852
+#: gconf/gconftool.c:1860
 #, c-format
 msgid "Error syncing: %s\n"
 msgstr "Greška tokom sinhroniziranja: %s\n"
 
-#: gconf/gconftool.c:1867
+#: gconf/gconftool.c:1875
 msgid "Must specify a key or keys to get type\n"
 msgstr "Morate navesti ključ ili ključeve da biste dobili tip\n"
 
-#: gconf/gconftool.c:1911
+#: gconf/gconftool.c:1919
 msgid "Must specify a key to lookup size of.\n"
 msgstr "Morate navesti ključ da potražite njgovu veličinu.\n"
 
-#: gconf/gconftool.c:1936 gconf/gconftool.c:1981
+#: gconf/gconftool.c:1944 gconf/gconftool.c:1989
 #, c-format
 msgid "Key %s is not a list.\n"
 msgstr "Ključ %s nije lista.\n"
 
-#: gconf/gconftool.c:1956
+#: gconf/gconftool.c:1964
 msgid "Must specify a key from which to get list element.\n"
 msgstr "Morate navesti ključ iz kojeg će se dobaviti element liste.\n"
 
-#: gconf/gconftool.c:1987
+#: gconf/gconftool.c:1995
 msgid "Must specify list index.\n"
 msgstr "Mora se navesti indeks liste.\n"
 
-#: gconf/gconftool.c:1994
+#: gconf/gconftool.c:2002
 msgid "List index must be non-negative.\n"
 msgstr "Indeks liste ne može biti negativan.\n"
 
-#: gconf/gconftool.c:2003
+#: gconf/gconftool.c:2011
 msgid "List index is out of bounds.\n"
 msgstr "Indeks liste je izvan ograničenja.\n"
 
-#: gconf/gconftool.c:2029
+#: gconf/gconftool.c:2037
 msgid "Must specify a key or keys on the command line\n"
 msgstr "Mora se navesti ključ ili ključevi na komandnoj liniji\n"
 
-#: gconf/gconftool.c:2049
+#: gconf/gconftool.c:2057
 #, c-format
 msgid "No schema known for `%s'\n"
 msgstr "Nema poznate šeme za `%s'\n"
 
-#: gconf/gconftool.c:2082
+#: gconf/gconftool.c:2090
 #, c-format
 msgid "No doc string stored in schema at '%s'\n"
 msgstr "Nema doc stringa pohranjenog u šemi na '%s'\n"
 
-#: gconf/gconftool.c:2087
+#: gconf/gconftool.c:2095
 #, c-format
 msgid "Error getting schema at '%s': %s\n"
 msgstr "Greška tokom dobavljanja šeme na '%s': %s\n"
 
-#: gconf/gconftool.c:2094
+#: gconf/gconftool.c:2102
 #, c-format
 msgid "No schema stored at '%s'\n"
 msgstr "Šema nije pohranjena na '%s'\n"
 
-#: gconf/gconftool.c:2097
+#: gconf/gconftool.c:2105
 #, c-format
 msgid "Value at '%s' is not a schema\n"
 msgstr "Vrijednost na '%s' nije šema\n"
 
-#: gconf/gconftool.c:2153
+#: gconf/gconftool.c:2161
 msgid "Must specify a schema name followed by the key name to apply it to\n"
-msgstr "Mora se navesti ime šeme praćeno imenom ključa koji će se primijeniti\n"
+msgstr ""
+"Mora se navesti ime šeme praćeno imenom ključa koji će se primijeniti\n"
 
-#: gconf/gconftool.c:2160
+#: gconf/gconftool.c:2168
 #, c-format
 msgid "Error associating schema name '%s' with key name '%s': %s\n"
 msgstr "Greška tokom pridruživanja imena šeme '%s' s imenom ključa '%s': %s\n"
 
-#: gconf/gconftool.c:2178
+#: gconf/gconftool.c:2186
 msgid "Must specify keys to unapply schema from\n"
 msgstr "Moraju se navesti ključevi s kojih će se poništiti primijenjena šema\n"
 
-#: gconf/gconftool.c:2188
+#: gconf/gconftool.c:2196
 #, c-format
 msgid "Error removing schema name from '%s': %s\n"
 msgstr "Greška tokom uklanjanja imena šeme iz '%s': %s\n"
 
-#: gconf/gconftool.c:2213
+#: gconf/gconftool.c:2221
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr "Mora se navesti ključ (ime šeme) kao jedini argument\n"
 
-#: gconf/gconftool.c:2255
+#: gconf/gconftool.c:2263
 msgid "List type must be a primitive type: string, int, float or bool\n"
 msgstr "Tip liste mora biti primitivan tip: string, int, float ili bool\n"
 
-#: gconf/gconftool.c:2275
+#: gconf/gconftool.c:2283
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr "Par car tip mora biti primitivan tip: string, int, float ili bool\n"
 
-#: gconf/gconftool.c:2295
+#: gconf/gconftool.c:2303
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr "Par cdr tip mora biti primitivan tip: string, int, float ili bool\n"
 
-#: gconf/gconftool.c:2310
+#: gconf/gconftool.c:2318
 #, c-format
 msgid "Error setting value: %s"
 msgstr "Greška tokom postavljanja vrijednosti: %s"
 
-#: gconf/gconftool.c:2324
+#: gconf/gconftool.c:2332
 #, c-format
 msgid "Error syncing: %s"
 msgstr "Greška tokom sinkroniziranja: %s"
 
-#: gconf/gconftool.c:2339
+#: gconf/gconftool.c:2347
 msgid "Must specify one or more directories to get key/value pairs from.\n"
 msgstr ""
 "Mora se navesti jedan ili više direktorija iz kojih će se dobiti ključ/"
 "vrijednost parovi.\n"
 
-#: gconf/gconftool.c:2353
+#: gconf/gconftool.c:2361
 msgid "Must specify one or more keys to unset.\n"
-msgstr "Mora se navesti jedan ili više postavljenih ključeva za poništavanje.\n"
+msgstr ""
+"Mora se navesti jedan ili više postavljenih ključeva za poništavanje.\n"
 
-#: gconf/gconftool.c:2364
+#: gconf/gconftool.c:2372
 #, c-format
 msgid "Error unsetting `%s': %s\n"
 msgstr "Greška tokom poništavanja postavljenog `%s': %s\n"
 
-#: gconf/gconftool.c:2384
+#: gconf/gconftool.c:2392
 msgid "Must specify one or more keys to recursively unset.\n"
 msgstr ""
 "Mora se navesti jedan ili više postavljenih ključeva da se rekurzivno "
 "ponište.\n"
 
-#: gconf/gconftool.c:2398
+#: gconf/gconftool.c:2406
 #, c-format
 msgid "Failure during recursive unset of \"%s\": %s\n"
 msgstr "Neuspješno rekurzivno poništavanja postavljenog \"%s\": %s\n"
 
-#: gconf/gconftool.c:2418
+#: gconf/gconftool.c:2426
 msgid "Must specify one or more directories to get subdirs from.\n"
 msgstr ""
 "Mora se navesti jedan ili više direktorija iz kojih će se dobaviti podređeni "
 "direktoriji.\n"
 
-#: gconf/gconftool.c:2452
+#: gconf/gconftool.c:2460
 #, c-format
 msgid "Error listing dirs: %s\n"
 msgstr "Greška tokom listanja direktorija: %s\n"
 
-#: gconf/gconftool.c:2588
+#: gconf/gconftool.c:2596
 msgid "WARNING: must specify both a <car> and a <cdr> in a <pair>\n"
 msgstr "UPOZORENJE: u <pair> se mora specifirati i <car> i <cdr>\n"
 
-#: gconf/gconftool.c:2615
+#: gconf/gconftool.c:2623
 #, c-format
 msgid "WARNING: key specified (%s) for schema under a <value> - ignoring\n"
 msgstr "UPOZORENJE: naveden ključ (%s) za šemu pod <value> - ignorišem\n"
 
-#: gconf/gconftool.c:2648
+#: gconf/gconftool.c:2656
 msgid "WARNING: must have a child node under <value>\n"
 msgstr "UPOZORENJE: mora postojati podređeni nod pod <valua>\n"
 
-#: gconf/gconftool.c:2654
+#: gconf/gconftool.c:2662
 #, c-format
 msgid "WARNING: node <%s> not understood\n"
 msgstr "UPOZORENJE: nod <%s> nije razumljiv\n"
 
-#: gconf/gconftool.c:2672
+#: gconf/gconftool.c:2680
 #, c-format
 msgid "WARNING: Failed to parse int value `%s'\n"
 msgstr "UPOZORENJE: Neuspješno tumačenje int vrijednosti `%s'\n"
 
-#: gconf/gconftool.c:2693
+#: gconf/gconftool.c:2701
 #, c-format
 msgid "WARNING: Failed to parse float value `%s'\n"
 msgstr "UPOZORENJE: Neuspješno tumačenje float vrijednosti `%s'\n"
 
-#: gconf/gconftool.c:2715
+#: gconf/gconftool.c:2723
 #, c-format
 msgid "WARNING: Failed to parse string value `%s'\n"
 msgstr "UPOZORENJE: Neuspješno tumačenje string vrijednosti `%s'\n"
 
-#: gconf/gconftool.c:2736
+#: gconf/gconftool.c:2744
 #, c-format
 msgid "WARNING: Failed to parse boolean value `%s'\n"
 msgstr "UPOZORENJE: Neuspješno tumačenje boolean vrijednosti `%s'\n"
 
-#: gconf/gconftool.c:2845 gconf/gconftool.c:3387
+#: gconf/gconftool.c:2853 gconf/gconftool.c:3395
 #, c-format
 msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
 msgstr "UPOZORENJE: neuspješno združivanje šeme `%s' sa kjučem `%s': %s\n"
 
-#: gconf/gconftool.c:2960
+#: gconf/gconftool.c:2968
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
 msgstr "UPOZORENJE: nevažeći ili nedostaje tip šeme (%s)\n"
 
-#: gconf/gconftool.c:2969
+#: gconf/gconftool.c:2977
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
 msgstr "UPOZORENJE: nevažeći ili nedostaje list_type za šemu (%s)\n"
 
-#: gconf/gconftool.c:2980 gconf/gconftool.c:3010 gconf/gconftool.c:3039
+#: gconf/gconftool.c:2988 gconf/gconftool.c:3018 gconf/gconftool.c:3047
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
-msgstr "UPOZORENJE: Neuspješno tumačenje uobičajene vrijednosti `%s' za šemu (%s)\n"
+msgstr ""
+"UPOZORENJE: Neuspješno tumačenje uobičajene vrijednosti `%s' za šemu (%s)\n"
 
-#: gconf/gconftool.c:2998
+#: gconf/gconftool.c:3006
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
-msgstr "UPOZORENJE: nevažeći ili nedostaje car_type ili cdr_type za šemu (%s)\n"
+msgstr ""
+"UPOZORENJE: nevažeći ili nedostaje car_type ili cdr_type za šemu (%s)\n"
 
-#: gconf/gconftool.c:3023
+#: gconf/gconftool.c:3031
 msgid "WARNING: You cannot set a default value for a schema\n"
 msgstr "UPOZORENJE: Ne možete postaviti uobičajenu vrijednost za šemu\n"
 
-#: gconf/gconftool.c:3052
+#: gconf/gconftool.c:3060
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
 msgstr "UPOZORENJE: interna gconftool greška, nepoznat GConfValueType\n"
 
-#: gconf/gconftool.c:3100 gconf/gconftool.c:3121 gconf/gconftool.c:3142
-#: gconf/gconftool.c:3163
+#: gconf/gconftool.c:3108 gconf/gconftool.c:3129 gconf/gconftool.c:3150
+#: gconf/gconftool.c:3171
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
 msgstr "UPOZORENJE: neuspješno tumačenje imena tipa `%s'\n"
 
-#: gconf/gconftool.c:3117
+#: gconf/gconftool.c:3125
 #, c-format
-msgid "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
-msgstr "UPOZORENJE: list_type može biti samo int, float, string ili bool, a ne `%s'\n"
+msgid ""
+"WARNING: list_type can only be int, float, string or bool and not `%s'\n"
+msgstr ""
+"UPOZORENJE: list_type može biti samo int, float, string ili bool, a ne `%s'\n"
 
-#: gconf/gconftool.c:3138
+#: gconf/gconftool.c:3146
 #, c-format
 msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
-msgstr "UPOZORENJE: car_type može biti samo int, float, string ili bool, a ne `%s'\n"
+msgstr ""
+"UPOZORENJE: car_type može biti samo int, float, string ili bool, a ne `%s'\n"
 
-#: gconf/gconftool.c:3159
+#: gconf/gconftool.c:3167
 #, c-format
 msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
-msgstr "UPOZORENJE: cdr_type može biti samo int, float, string ili bool, a ne `%s'\n"
+msgstr ""
+"UPOZORENJE: cdr_type može biti samo int, float, string ili bool, a ne `%s'\n"
 
-#: gconf/gconftool.c:3199
+#: gconf/gconftool.c:3207
 msgid "WARNING: empty <applyto> node"
 msgstr "UPOZORENJE: prazan <applyto> nod"
 
-#: gconf/gconftool.c:3202 gconf/gconftool.c:3460
+#: gconf/gconftool.c:3210 gconf/gconftool.c:3468
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
 msgstr "UPOZORENJE: nod <%s> nije razumljiv ispod <schema>\n"
 
-#: gconf/gconftool.c:3213
+#: gconf/gconftool.c:3221
 msgid "WARNING: no <list_type> specified for schema of type list\n"
 msgstr "UPOZORENJE: <list_type> nije naveden za šemu tipa list\n"
 
-#: gconf/gconftool.c:3219
+#: gconf/gconftool.c:3227
 msgid "WARNING: no <car_type> specified for schema of type pair\n"
 msgstr "UPOZORENJE: <car_type> nije naveden za šemu tipa pair\n"
 
-#: gconf/gconftool.c:3225
+#: gconf/gconftool.c:3233
 msgid "WARNING: no <cdr_type> specified for schema of type pair\n"
 msgstr "UPOZORENJE: <cdr_type> nije naveden za šemu tipa pair\n"
 
-#: gconf/gconftool.c:3254
+#: gconf/gconftool.c:3262
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
 msgstr "UPOZORENJE: nod <locale> nema atribut `name=\"locale\"', ignorišem\n"
 
-#: gconf/gconftool.c:3260
+#: gconf/gconftool.c:3268
 #, 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 ""
 "UPOZORENJE: višestruki <locale> nodovi za locale `%s', ignorišem sve nakon "
 "prvog\n"
 
-#: gconf/gconftool.c:3358
+#: gconf/gconftool.c:3366
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
 msgstr "UPOZORENJE: Nevažeći nod <%s> u nodu <locale>\n"
 
-#: gconf/gconftool.c:3395
+#: gconf/gconftool.c:3403
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
 msgstr "Dodata šema `%s' ključu `%s'\n"
 
-#: gconf/gconftool.c:3469
+#: gconf/gconftool.c:3477
 msgid "You must have at least one <locale> entry in a <schema>\n"
 msgstr "Morate imati barem jedan unos <locale> unutar <schema>\n"
 
-#: gconf/gconftool.c:3504
+#: gconf/gconftool.c:3512
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
 msgstr "UPOZORENJE: neuspješno instaliranje šeme `%s' locale `%s': %s\n"
 
-#: gconf/gconftool.c:3512
+#: gconf/gconftool.c:3520
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
 msgstr "Instalirana šema `%s' za locale `%s'\n"
 
-#: gconf/gconftool.c:3522
+#: gconf/gconftool.c:3530
 #, c-format
 msgid "WARNING: failed to uninstall schema `%s' locale `%s': %s\n"
 msgstr "UPOZORENJE: neuspješno deinstaliranje šeme `%s' locale `%s': %s\n"
 
-#: gconf/gconftool.c:3530
+#: gconf/gconftool.c:3538
 #, c-format
 msgid "Uninstalled schema `%s' from locale `%s'\n"
 msgstr "Deinstalirana šema `%s' iz locale `%s'\n"
 
-#: gconf/gconftool.c:3568
+#: gconf/gconftool.c:3576
 msgid "WARNING: no key specified for schema\n"
 msgstr "UPOZORENJE: ključ nije naveden za šemu\n"
 
-#: gconf/gconftool.c:3609
+#: gconf/gconftool.c:3617
 #, c-format
 msgid "WARNING: node <%s> not understood below <%s>\n"
 msgstr "UPOZORENJE: nod <%s> nije razumljiv ispod <%s>\n"
 
-#: gconf/gconftool.c:3640
+#: gconf/gconftool.c:3648
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Neuspješno otvaranje `%s': %s\n"
 
-#: gconf/gconftool.c:3647
+#: gconf/gconftool.c:3655
 #, c-format
 msgid "Document `%s' is empty?\n"
 msgstr "Dokument `%s' je prazan?\n"
 
-#: gconf/gconftool.c:3659
+#: gconf/gconftool.c:3667
 #, c-format
 msgid "Document `%s' has the wrong type of root node (<%s>, should be <%s>)\n"
-msgstr "Dokument `%s' ima pogrešan tip root noda (<%s>, trebalo bi biti <%s>)\n"
+msgstr ""
+"Dokument `%s' ima pogrešan tip root noda (<%s>, trebalo bi biti <%s>)\n"
 
-#: gconf/gconftool.c:3672
+#: gconf/gconftool.c:3680
 #, c-format
 msgid "Document `%s' has no top level <%s> node\n"
 msgstr "Dokument `%s' nema nod najvišeg nivoa <%s>\n"
 
-#: gconf/gconftool.c:3686
+#: gconf/gconftool.c:3694
 #, c-format
 msgid "WARNING: node <%s> below <%s> not understood\n"
 msgstr "UPOZORENJE: nod <%s> ispod <%s> nije razumljiv\n"
 
-#: gconf/gconftool.c:3697 gconf/gconftool.c:3732
+#: gconf/gconftool.c:3705 gconf/gconftool.c:3740
 #, c-format
 msgid "Error syncing config data: %s"
 msgstr "Greška tokom sinhroniziranja podataka za podešavanja: %s"
 
-#: gconf/gconftool.c:3716
+#: gconf/gconftool.c:3724
 msgid "Must specify some schema files to install\n"
 msgstr "Moraju se navesti neke šema datoteke za instaliranje\n"
 
-#: gconf/gconftool.c:3753
+#: gconf/gconftool.c:3761
 #, c-format
 msgid ""
 "\n"
@@ -2348,16 +2392,16 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: gconf/gconftool.c:3773
+#: gconf/gconftool.c:3781
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
 msgstr "Neuspješno poništavanje postavljenog ključa preloma %s: %s\n"
 
-#: gconf/gconftool.c:3899
+#: gconf/gconftool.c:3907
 msgid "Must specify some keys to break\n"
 msgstr "Moraju se navesti neki ključevi za prelom\n"
 
-#: gconf/gconftool.c:3905
+#: gconf/gconftool.c:3913
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for key:\n"
@@ -2367,11 +2411,11 @@ msgstr ""
 "ključ:\n"
 "  %s\n"
 
-#: gconf/gconftool.c:3923
+#: gconf/gconftool.c:3931
 msgid "Must specify some directories to break\n"
 msgstr "Moraju se navesti neki direktoriji za prelom\n"
 
-#: gconf/gconftool.c:3942
+#: gconf/gconftool.c:3950
 #, c-format
 msgid ""
 "Trying to break your application by setting bad values for keys in "
@@ -2382,3 +2426,5 @@ msgstr ""
 "ključeve u direktoriju:\n"
 "  %s\n"
 
+#~ msgid "Invalid car_type \"%s\" on <%s>"
+#~ msgstr "Nevažeći car_type \"%s\" na <%s>"
diff --git a/po/ca.po b/po/ca.po
index 5f636fb3..d7b0dd54 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf 2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-04-27 13:14+0200\n"
 "Last-Translator: Gisela Carbonell <gcarbonell@arrakis.es>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
@@ -16,23 +16,23 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "No s'ha pogut trobar el directori %s\n"
 
 #
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "S'ha produït un error en desar el arbre de GConf a «%s»: %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "Forma d'ús: %s <dir>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -51,36 +51,36 @@ msgstr ""
 "  a:\n"
 "    dir/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 #, fuzzy
 msgid "Unloading text markup backend module."
 msgstr "S'està descarregant el mòdul de rerefons de l'XML"
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 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 de l'XML a l'adreça '%s'"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "No s'ha pogut crear el directori '%s': %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr ""
 "No es pot llegir des de/escriure al directori arrel de l'XML a l'adreça «%s»"
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
 "Els permisos del directori o fitxer per a la font de l'XML a l'arrel %s són: "
 "%o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -88,187 +88,187 @@ msgstr ""
 "L'operació de supressió de directoris ja no és permesa, simplement suprimiu "
 "tots els valors del directori"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr ""
 "No s'ha pogut obrir el directori de blocatges per a que %s elimine els "
 "blocatges: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "No s'ha pogut eliminar el fitxer %s: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 #, fuzzy
 msgid "Initializing Markup backend module"
 msgstr "S'està inicialitzant el mòdul de rerefons de l'XML"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "No s'ha pogut abandonar el blocatge en el directori de l'XML «%s»: %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 #, fuzzy
 msgid "Failed to write some configuration data to disk\n"
 msgstr "No s'ha pogut accedir als fonts de configuració: %s\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "No s'ha pogut crear el directori «%s»: %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, fuzzy, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "No s'ha pogut eliminar el fitxer %s: %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, fuzzy, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "No s'ha pogut suprimir «%s»: %s"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, fuzzy, c-format
 msgid "Line %d character %d: %s"
 msgstr "No s'ha pogut crear %s: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "No s'ha comprès '%s' (s'esperava un enter)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "L'enter '%s' és massa gran o massa petit"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "No s'ha comprès '%s' (s'esperava cert o fals)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "No s'ha comprès '%s' (s'esperava un nombre real)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, fuzzy, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "No hi ha atribut \"type\" per al node <%s>"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr ""
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr ""
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, fuzzy, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "No s'ha pogut obrir %s: %s"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, fuzzy, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "S'ha produït un error en esborrar el valor de \"%s\": %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, fuzzy, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "No s'ha pogut moure el fitxer d'estat desat nou a l'emplaçament: %s"
diff --git a/po/cs.po b/po/cs.po
index afe583c8..e7f2b269 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-08-07 17:28+0200\n"
 "Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -17,22 +17,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Nemohu najít adresář %s\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Chyba při ukládání stromu GConf do '%s': %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "Použití: %s <adresář>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -51,32 +51,32 @@ msgstr ""
 "  to:\n"
 "    adr/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr "Uvolňuji modul pro provoz nad textem se značkami."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Nemohu nalézt kořenový adresář XML na adrese `%s'"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Nemohu vytvořit adresář `%s': %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr "Nemohu číst nebo zapisovat do kořenového adresáře XML na adrese \"%s\""
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "Oprávnění k adresáři/souboru pro zdroj XML v kořeni %s jsou: %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -84,183 +84,183 @@ msgstr ""
 "Operace odstranění adresáře již není podporována, jednoduše odstraňte "
 "všechny hodnoty z adresáře"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr "Nemohu otevřít adresář zámků pro %s pro odstranění zámků: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Nemohu odstranit soubor %s: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr "Inicializuji modul pro provoz nad textem se značkami"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Nemohu uvolnit zámek na adresář XML \"%s\": %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Nemohu zapsat některá data nastavení na disk\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Nemohu vytvořit adresář \"%s\": %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Nemohu odstranit \"%s\": %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Nemohu zapsat \"%s\": %s\n"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "Řádek %d znak %d: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "Atribut \"%s\" opakován dvakrát u jednoho elementu <%s>"
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "Atribut \"%s\" u elementu <%s> není v tomto kontextu platný"
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Nerozpoznáno `%s' (očekáváno celé číslo)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Celé číslo `%s' je příliš velké nebo příliš malé"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Nerozpoznáno `%s' (očekáváno true nebo false)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Nerozpoznáno `%s' (očekáváno reálné číslo)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Chybí \"%s\" atribut u elementu <%s>"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr "Neznámá hodnota \"%s\" atributu \"%s\" u elementu <%s>"
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr "Neplatný ltype \"%s\" u <%s>"
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr "Neplatný typ first-element \"%s\" u <%s>"
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr "Neplatný cdr_type \"%s\" u <%s>"
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr "Neplatný list_type \"%s\" u <%s>"
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr "Dva elementy <default> pod <local_schema>"
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr "Dva elementy <longdesc> pod <local_schema>"
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "Element <%s> není povolen pod <%s>"
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "Poskytnuto <%s>, ale aktuální element nemá typ %s"
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr "Uvedeny dva elementy <car> u jednoho páru"
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr "Uvedeny dva elementy <cdr> u jednoho páru"
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr "<li> má špatný typ %s"
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr "Poskytnuto <%s>, ale rodičovský <entry> nemá hodnotu"
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "Element <%s> není uvnitř aktuálního elementu povolen"
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr "Vnější element v soubor menu musí být <gconf>, ne <%s>"
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "Element <%s> není uvnitř elementu <%s> povolen"
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "Uvnitř elementu <%s> není povolen text"
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Nemohu otevřít \"%s\": %s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Chyba při zápisu souboru \"%s\": %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "Nemohu přesunout dočasný soubor \"%s\" na konečné umístění \"%s\": %s"
diff --git a/po/cy.po b/po/cy.po
index 0ff38527..cf6fa76f 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-03-20 09:30+0000\n"
 "Last-Translator: Rhys Jones <rhys@sucs.org>\n"
 "Language-Team: Cymraeg <gnome-cy@pengwyn.linux.org.uk>\n"
@@ -16,22 +16,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Methu darganfod y cyfeiriadur %s\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Gwall wrth arbed coeden GConf at '%s': %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "Defnydd: %s <cyfeiriadur>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -50,22 +50,22 @@ msgstr ""
 "  i mewn i:\n"
 "    cyf/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 #, fuzzy
 msgid "Unloading text markup backend module."
 msgstr "Dadlwytho modiwl ochr gefn XML."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Methu canfod cyfeiriadur gwraidd XML yn y cyfeiriad `%s'"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Methu creu cyfeiriadur `%s': %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
@@ -73,13 +73,13 @@ msgstr ""
 "Methu darllen o neu ysgrifennu i'r gyfeiriadur gwraidd XML yn y cyfeiriad \"%"
 "s\""
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
 "Caniatâd cyfeiriadur/ffeil i'r ffynhonnell XML wrth gwreiddyn %s: %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -87,187 +87,187 @@ msgstr ""
 "Ni chynhelir y weithred dileu cyfeiriadur bellach; dilëwch pob gwerth yn y "
 "cyfeiriadur yn lle hynny"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr "Methu agor y cyfeiriadur clo er mwyn i %s dynnu'r cloeon: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Methu dileu ffeil %s: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 #, fuzzy
 msgid "Initializing Markup backend module"
 msgstr "Cychwyn modiwl ochr gefn XML"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Methu rhoi'r clo ar gyfeiriadur XML \"%s\" i fyny: %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 #, fuzzy
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Methwyd cyrchu y ffynhonnell(au) cyfluniad: %s\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Methu creu cyfeiriadur \"%s\": %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, fuzzy, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Methu dileu ffeil %s: %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, fuzzy, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Methu dileu \"%s\": %s"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, fuzzy, c-format
 msgid "Line %d character %d: %s"
 msgstr "Methwyd creu %s: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Ddim yn daeall `%s' (disgwylwyd cyfanrif)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Mae'r cyfanrif `%s' yn rhy fawr neu'n rhy fach"
 
 # EFALLAI
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Ddim yn daeall `%s' (disgwylwyd gwir neu anwir)"
 
 # EFALLAI (real?)
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Ddim yn daeall `%s' (disgwylwyd rhif real)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, fuzzy, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Dim priodoledd \"type\" i nôd <%s>"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr ""
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr ""
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, fuzzy, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Methwyd agor %s: %s"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, fuzzy, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Gwall wrth ddatosod \"%s\": %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, fuzzy, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "Methwyd sumud ffeil cadw cyflwr newydd i'w le: %s"
diff --git a/po/da.po b/po/da.po
index 730ba58f..3e4b1f61 100644
--- a/po/da.po
+++ b/po/da.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GConf 1.0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-17 14:49+0200\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-08-17 14:43+0200\n"
 "Last-Translator: Martin Willemoes Hansen <mwh@sysrq.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -30,22 +30,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Kan ikke finde mappen %s\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Fejl ved gemning af GConf-træ til '%s': %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "Brug: %s <mappe>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -65,33 +65,33 @@ msgstr ""
 "    dir/%%gconf-tree.xml\n"
 
 #
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr "Fjerner tekst-opmærknings-bagendemodulet fra hukommelsen."
 
 # første %s er databasetypen
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Kunne ikke finde XML-rodmappen i adressen '%s'"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Kunne ikke oprette mappen '%s': %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr "Kunne ikke læse fra eller skrive til XML-rodmappe adressen '%s'"
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "Mappe-/filrettigheder for XML-kilde ved roden %s er %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -99,183 +99,183 @@ msgstr ""
 "Fjernelse af mappe er ikke længere understøttet, fjern blot alle værdier i "
 "mappen"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr "Kunne ikke oprette låsemappen til '%s' for at fjerne låse: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Kunne ikke slette filen '%s': %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr "Klargører opmærknings-bagendemodul"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Kunne ikke opgive lås på XML-mappen \"%s\": %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Kunne ikke få fat i konfigurationskilde(r): %s\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Kunne ikke oprette mappen '%s': %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Kunne ikke slette filen '%s': %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Kunne ikke slette \"%s\": %s\n"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "Linje %d tegn %d: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "Attribut \"%s\" gentaget to gange på det samme <%s>-element"
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "Attribut \"%s\" kan ikke bruges på <%s>-element i denne sammenhæng"
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Forstod ikke '%s' (forventede heltal)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Heltal '%s' er for stort eller lille"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Forstod ikke '%s' (forventede sand eller falsk)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Forstod ikke '%s' (forventet kommatal)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Ingen \"%s\" attribut på element <%s>"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr "Værdien \"%s\" for \"%s\" attributten på elementet <%s> er ukendt"
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr "Ugyldig ltype \"%s\" på <%s>"
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr "Ugyldig type på første element \"%s\" på <%s>"
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr "Ugyldig cdr_type \"%s\" på <%s>"
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr "Ugyldig list_type \"%s\" på <%s>"
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr "To <default>-elementer under et <local_schema>"
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr "To <longdesc>-elementer under et <local_schema>"
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "Element <%s> er ikke tilladt under <%s>"
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "<%s> givet, men nuværende element har ikke typen %s"
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr "To <car>-elementer givet for samme par"
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr "To <cdr>-elementer givet for samme par"
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr "<li> har forkert type %s"
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr "<%s> givet men forældre <entry> har ikke en værdi"
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "Element <%s> er ikke tilladt inden i nuværende element"
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr "Yderste element i menuen filer skal være <gconf> ikke <%s>"
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "Element <%s> er ikke tilladt inden i et <%s>-element"
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "Ingen tekst er tilladt inden i element <%s>"
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Kunne ikke åbne \"%s\": %s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Fejl ved skrivning af fil \"%s\": %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index bf2db136..c2d4a229 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GConf 2.7.91\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-08-13 17:52+0200\n"
 "Last-Translator: Christian Neumair <chris@gnome-de.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -18,23 +18,23 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Das Verzeichnis »%s« konnte nicht gefunden werden\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Der GConf-Baum konnte nicht nach »%s« gespeichert werden: %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "Aufruf: %s <Verzeichnis>\n"
 
 # CHECK
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -53,22 +53,22 @@ msgstr ""
 "  zu:\n"
 "    Verzeichnis/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr "Das Text-Markup-Backend-Modul wird aus dem Speicher entfernt."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr ""
 "Das XML-Wurzelverzeichnis konnte nicht unter der Adresse »%s« gefunden werden"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Das Verzeichnis »%s« konnte nicht angelegt werden: %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
@@ -76,14 +76,14 @@ msgstr ""
 "Im XML-Wurzelverzeichnis konnte nicht unter der Adresse »%s« gelesen oder "
 "geschrieben werden"
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
 "Die Verzeichnis-/Dateiberechtigungen für die XML-Quelle bei der Wurzel %s "
 "sind %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -91,188 +91,188 @@ msgstr ""
 "Die Verzeichnis entfernen-Operation wird nicht mehr unterstützt, entfernen "
 "Sie einfach alle Schlüssel in dem Verzeichnis"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr ""
 "Das Sperrverzeichnis für %s konnte nicht zum Entfernen der Sperren geöffnet "
 "werden: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Die Datei %s konnte nicht entfernt werden: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr "Das Markup-Backend-Modul wird initialisiert"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Die Sperre für das XML-Verzeichnis »%s« konnte nicht gelöst werden: %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Schreiben von Konfigurationsdaten auf Platte gescheitert\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Das Verzeichnis »%s« konnte nicht angelegt werden: %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "»%s« konnte nicht entfernt werden: %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "»%s« konnte nicht geschrieben werden: %s\n"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "Zeile %d, Zeichen %d: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "Das Attribut »%s« kommt im selben Element <%s> zweimal vor"
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "Das Attribut »%s« ist in diesem Zusammenhang im Element <%s> ungültg"
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "»%s« konnte nicht interpretiert werden (Ganzzahl erwartet)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Die Ganzzahl »%s« ist zu groß oder zu klein"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "»%s« konnte nicht interpretiert werden (wahr oder falsch erwartet)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "»%s« konnte nicht interpretiert werden (Real-Zahl erwartet)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Das Element <%2$s> stellt kein »%1$s«-Attribut bereit"
 
 # CHECK
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr ""
 "Der Wert »%1$s« des »%2$s«-Attributs ist bezüglich des Elements <%3$s> "
 "unbekannt"
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr "Ungültiger ltype »%s« in <%s>"
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr "Ungültiger first-element-Typ »%s« in <%s>"
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr "Ungültiger cdr_type »%s« in <%s>"
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr "Ungültiger list_type »%s« in <%s>"
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr "Zwei <default>-Elemente unterhalb von <local_schema>"
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr "Zwei <longdesc>-Elemente unterhalb von <local_schema>"
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "Das Element <%s> ist unterhalb von <%s> nicht zulässig"
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "<%s> übergeben, der Typ des derzeitigen Elements ist jedoch nicht %s"
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr "Zwei <car>-Elemente für dasselbe Paar übergeben"
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr "Zwei <cdr>-Elemente für dasselbe Paar übergeben"
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr "Der Typ %s von <li> ist falsch"
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr "<%s> übergeben, aber das Elternelement <entry> hat keinen Wert"
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "Das Element <%s> ist im derzeitigen Element nicht zulässig"
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr "Das äußerste Element in Menüdateien muss <gconf> sein, nicht <%s>"
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "Das Element <%s> ist in einem <%s>-Element nicht zulässig"
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "Im Element <%s> ist kein Text zulässig"
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "»%s« konnte nicht geöffnet werden: %s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Fehler beim Schreiben der Datei »%s«: %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr ""
diff --git a/po/el.po b/po/el.po
index a603f2a8..3a4b0d95 100644
--- a/po/el.po
+++ b/po/el.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-03-16 15:25-0200\n"
 "Last-Translator: Nikos Charonitakis <charosn@her.fothnet.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -24,23 +24,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 # backends/xml-backend.c:315
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Αδυναμία εύρεσης καταλόγου %s\n"
 
 # gconf/gconfd.c:1725
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Σφάλμα αποθήκευσης δένδρου GConf '%s': %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "Χρήση: %s <dir>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -60,25 +60,25 @@ msgstr ""
 "    dir/%%gconf-tree.xml\n"
 
 # backends/xml-backend.c:247
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 #, fuzzy
 msgid "Unloading text markup backend module."
 msgstr "Εκφορτώνεται η μονάδα υποστήριξης XML."
 
 # backends/xml-backend.c:300
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 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:315
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Αδύνατη η δημιουργία καταλόγου `%s': %s"
 
 # backends/xml-backend.c:400
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
@@ -86,14 +86,14 @@ msgstr ""
 "Αδύνατη η ανάγνωση ή εγγραφή στο ριζικό κατάλογο XML στη διεύθυνση \"%s\""
 
 # backends/xml-backend.c:410
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
 "Τα δικαιώματα για καταλόγους/αρχεία για τον πηγαίο κώδικα XML στη ρίζα %s "
 "είναι: %o%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -102,7 +102,7 @@ msgstr ""
 "στον κατάλογο"
 
 # backends/xml-backend.c:315
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr ""
@@ -110,190 +110,190 @@ msgstr ""
 "κλειδωμάτων: %s\n"
 
 # gconf/gconf-internals.c:2404
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Αδύνατη η απομάκρυνση αρχείου %s: %s\n"
 
 # backends/xml-backend.c:694
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 #, fuzzy
 msgid "Initializing Markup backend module"
 msgstr "Αρχικοποιείται η μονάδα υποστήριξης XML"
 
 # backends/xml-backend.c:759
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Αποτυχία παράδοσης κλειδώματος στον κατάλογο XML \"%s\": %s"
 
 # gconf/gconftool.c:510
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 #, fuzzy
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Αποτυχία πρόσβασης στην(ις) πηγή(ές) διαμόρφωσης: %s\n"
 
 # backends/xml-backend.c:315
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Δημιουργία καταλόγου αδύνατη \"%s\": %s"
 
 # gconf/gconf-internals.c:2404
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, fuzzy, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Αδύνατη η απομάκρυνση αρχείου %s: %s\n"
 
 # gconf/gconftool.c:1639
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, fuzzy, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Αποτυχία διαγραφής του  \"%s\": %s"
 
 # gconf/gconf-internals.c:2416
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, fuzzy, c-format
 msgid "Line %d character %d: %s"
 msgstr "Αδύνατη η δημιουργία %s: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Δεν έγινε κατανοητό  `%s' (αναμενόταν ακέραιος)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Ο ακέραιος  `%s' είναι ή πολύ μεγάλος ή μικρός"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Δεν έγινε κατανοητό `%s' (αναμένεται true or false)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Δεν έγινε κατανοητό `%s' (αναμένεται αληθινός αριθμός)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, fuzzy, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Δεν υπάρχει γνώρισμα \"είδος\" για τον κόμβο <%s>"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr ""
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr ""
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
 # gconf/gconftool.c:1639
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, fuzzy, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Αποτυχία ανοίγματος `%s': %s"
 
 # gconf/gconfd.c:1593
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, fuzzy, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Σφάλμα αποδέσμευσης  \"%s\": %s"
 
 # gconf/gconf-internals.c:2416
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, fuzzy, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "Αδύνατη η μεταφορά νέου αποθηκευμένου αρχείου κατάστασης στη θέση: %s"
diff --git a/po/en_CA.po b/po/en_CA.po
index c70dea7d..c3acdad7 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-08-07 13:12-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: English/Canada <adamw@FreeBSD.org>\n"
@@ -16,22 +16,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Cannot find directory %s\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Error saving GConf tree to '%s': %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "Usage: %s <dir>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -50,33 +50,33 @@ msgstr ""
 "  to:\n"
 "    dir/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr "Unloading text markup backend module."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Couldn't find the XML root directory in the address `%s'"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Could not make directory `%s': %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "Directory/file permissions for XML source at root %s are: %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -84,183 +84,183 @@ msgstr ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr "Could not open lock directory for %s to remove locks: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Could not remove file %s: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr "Initializing Markup backend module"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Failed to give up lock on XML directory \"%s\": %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Failed to write some configuration data to disk\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Could not make directory \"%s\": %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Could not remove \"%s\": %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Failed to write \"%s\": %s\n"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "Line %d character %d: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "Attribute \"%s\" repeated twice on the same <%s> element"
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "Attribute \"%s\" is invalid on <%s> element in this context"
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Didn't understand `%s' (expected integer)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Integer `%s' is too large or small"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Didn't understand `%s' (expected true or false)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Didn't understand `%s' (expected real number)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "No \"%s\" attribute on element <%s>"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr "Invalid ltype \"%s\" on <%s>"
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr "Invalid first-element type \"%s\" on <%s>"
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr "Invalid cdr_type \"%s\" on <%s>"
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr "Invalid list_type \"%s\" on <%s>"
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr "Two <default> elements below a <local_schema>"
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr "Two <longdesc> elements below a <local_schema>"
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "Element <%s> is not allowed below <%s>"
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "<%s> provided but current element does not have type %s"
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr "Two <car> elements given for same pair"
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr "Two <cdr> elements given for same pair"
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr "<li> has wrong type %s"
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr "<%s> provided but parent <entry> does not have a value"
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "Element <%s> is not allowed inside current element"
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr "Outermost element in menu file must be <gconf> not <%s>"
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "Element <%s> is not allowed inside a <%s> element"
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "No text is allowed inside element <%s>"
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Failed to open \"%s\": %s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Error writing file \"%s\": %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "Failed to move temporary file \"%s\" to final location \"%s\": %s"
diff --git a/po/en_GB.po b/po/en_GB.po
index e84b0851..e8f4ee2f 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GCONF\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-08-09 20:02+0100\n"
 "Last-Translator: David Lodge <dave@cirt.net>\n"
 "Language-Team: English/GB <en@li.org>\n"
@@ -16,22 +16,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Cannot find directory %s\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Error saving GConf tree to '%s': %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "Usage: %s <dir>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -50,33 +50,33 @@ msgstr ""
 "  to:\n"
 "    dir/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr "Unloading text markup backend module."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Couldn't find the XML root directory in the address `%s'"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Could not make directory `%s': %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "Directory/file permissions for XML source at root %s are: %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -84,183 +84,183 @@ msgstr ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr "Could not open lock directory for %s to remove locks: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Could not remove file %s: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr "Initialising Markup backend module"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Failed to give up lock on XML directory \"%s\": %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Failed to write some configuration data to disk\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Could not make directory \"%s\": %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Could not remove \"%s\": %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Failed to write \"%s\": %s\n"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "Line %d character %d: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "Attribute \"%s\" repeated twice on the same <%s> element"
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "Attribute \"%s\" is invalid on <%s> element in this context"
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Didn't understand `%s' (expected integer)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Integer `%s' is too large or small"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Didn't understand `%s' (expected true or false)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Didn't understand `%s' (expected real number)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "No \"%s\" attribute on element <%s>"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr "Invalid ltype \"%s\" on <%s>"
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr "Invalid first-element type \"%s\" on <%s>"
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr "Invalid cdr_type \"%s\" on <%s>"
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr "Invalid list_type \"%s\" on <%s>"
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr "Two <default> elements below a <local_schema>"
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr "Two <longdesc> elements below a <local_schema>"
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "Element <%s> is not allowed below <%s>"
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "<%s> provided but current element does not have type %s"
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr "Two <car> elements given for same pair"
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr "Two <cdr> elements given for same pair"
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr "<li> has wrong type %s"
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr "<%s> provided but parent <entry> does not have a value"
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "Element <%s> is not allowed inside current element"
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr "Outermost element in menu file must be <gconf> not <%s>"
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "Element <%s> is not allowed inside a <%s> element"
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "No text is allowed inside element <%s>"
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Failed to open \"%s\": %s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Error writing file \"%s\": %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "Failed to move temporary file \"%s\" to final location \"%s\": %s"
diff --git a/po/es.po b/po/es.po
index 1bf7c5ac..21ee7a3b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-08-08 21:09+0200\n"
 "Last-Translator: Francisco Javier F. Serrador <serrador@cvs.gnome.org>\n"
 "Language-Team: Spanish <traductores@es.gnome.org>\n"
@@ -21,22 +21,22 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "No se pudo encontrar el directorio %s \n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Error al guardar el árbol Gconf en «%s»: %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "Uso: %s <dir>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -55,33 +55,33 @@ msgstr ""
 "  a:\n"
 "    dir/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr "Descargando el backend del módulo de marcado de texto."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "No se pudo encontrar el directorio raíz XML en la dirección «%s»"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "No se pudo crear el directorio «%s»: %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr ""
 "No se puede leer ni escribir el directorio raíz XML en la dirección «%s»"
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, 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/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -89,186 +89,186 @@ msgstr ""
 "La operación de eliminar directorio ya no está admitida, elimine todos los "
 "valores en el directorio"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr ""
 "No se pudo abrir el bloqueo del directorio para %s para quitar bloqueos: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "No se pudo eliminar al archivo %s: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr "Inicializando el backend del módulo de marcado de texto"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr ""
 "Ha ocurrido un error al liberar el bloqueo en el directorio XML «%s»: %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 msgid "Failed to write some configuration data to disk\n"
 msgstr ""
 "Ha ocurrido un error al escribir algunos datos de configuración al disco\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "No se pudo crear el directorio «%s»: %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "No se pudo eliminar al archivo \"%s\": %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Ha ocurrido un error al escribir \"%s\": %s\n"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "La línea %d carácter %d: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "El atributo «%s» se repitió dos veces en el mismo elemento <%s>"
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "El atributo «%s» es inválido en el elemento <%s> en este contexto"
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "No se puede procesar «%s» (se esperaba un entero)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "El entero «%s» es demasiado grande o demasiado pequeño"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "No se puede procesar «%s» (se esperaba verdadero o falso)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "No se puede procesar «%s» (se esperaba un número real)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "No está definido el atributo \"%s\" en el elemento <%s>"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr "Valor desconocido «%s» para el atributo «%s» en el elemento <%s>"
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr "Ltype inválido «%s» en <%s>"
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr "El tipo «%s» del primer elemento es inválido en <%s>"
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr "Cdr_type «%s» inválido en <%s>"
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr "list_type «%s» inválido en <%s>"
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr "Dos elementos <default> bajo un <local_schema>"
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr "Des elementos <longdesc> bajo un <local_schema>"
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "El elemento <%s> no se permite bajo <%s>"
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "<%s> proporciado pero el elemento actual no tiene el tipo %s"
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr "Se han dado dos elementos <car> para el mismo par"
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr "Se han dado dos elementos <cdr> para el mismo par"
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr "<li> tiene tipo inválido %s"
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr "<%s> proporcionado pero <entry> antecesor no tiene un valor"
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "El elemento <%s> no se permite dentro del elemento actual"
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr "El elemento más externo en el archivo de menú debe ser <gconf> no <%s>"
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "El elemento <%s> no se permite dentro de un elemento <%s>"
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "No se permite texto dentro del elemento <%s>"
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Falló al abrir «%s»: %s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Error al escribir «%s»: %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr ""
diff --git a/po/eu.po b/po/eu.po
index 27d438bb..532b71fe 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-03-08 12:19GMT\n"
 "Last-Translator: Hizkuntza Politikarako Sailburuordetza <hizpol@ej-gv.es>\n"
 "Language-Team: basque <itzulpena@euskalgnu.org>\n"
@@ -15,22 +15,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, fuzzy, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Ezin izan du `%s' direktorioa egin: %s"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, fuzzy, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Errorea `%s'(e)n eskema lortzean:  %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr ""
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -42,35 +42,35 @@ msgid ""
 "    dir/%%gconf-tree.xml\n"
 msgstr ""
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 #, fuzzy
 msgid "Unloading text markup backend module."
 msgstr "XML euskarri-modulua deskargatzen."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Ezin izan du `%s' helbideko XML erro-direktorioa aurkitu"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Ezin izan du `%s' direktorioa egin: %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr "Ezin da \"%s\" helbideko XML erro-direktorioan idatzi edo irakurri"
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
 "%s erroko XML iturburuaren direktorioko/fitxategiko baimenak hauek dira:  %o/"
 "%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 #, fuzzy
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
@@ -78,185 +78,185 @@ msgid ""
 msgstr ""
 "dir kentzeko eragiketa ez da onartzen, kendu direktorioko balio guztiak"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr "Ezin izan da %s direktorioaren blokeoa ireki blokeoak kentzeko: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Ezin izan da %s fitxategia kendu: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 #, fuzzy
 msgid "Initializing Markup backend module"
 msgstr "XML euskarri-modulua hasieratzen"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, fuzzy, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Ezin izan zaio XML \"%s\" direktorioaren blokeoari jaregin:  %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 #, fuzzy
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Ezin izan dira konfigurazio-iturburu hauek atzitu:  %s\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Ezin izan du \"%s\" direktorioa egin:  %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, fuzzy, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Ezin izan da %s fitxategia kendu: %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, fuzzy, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Ezin izan da \"%s\" ezabatu: %s"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, fuzzy, c-format
 msgid "Line %d character %d: %s"
 msgstr "Ezin izan da %s sortu:  %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Ez dut `%s' ulertu (osokoa espero nuen)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "`%s' osoko zenbakia handiegia edo txikiegia da"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Ez dut `%s' ulertu (egiazkoa edo faltsua espero nuen)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Ez dut `%s' ulertu (zenbaki erreala espero nuen)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, fuzzy, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "<%s> nodoak ez du \"mota\" atributurik"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr ""
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr ""
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, fuzzy, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Huts egin du %s irekitzean:  %s"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, fuzzy, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Errorea \"%s\" ezabatzean:  %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, fuzzy, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "Huts egin du gordetako egoera-fitxategi berria hona mugitzean:  %s"
diff --git a/po/fa.po b/po/fa.po
index dc0ebcfd..cd59f4d6 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-01-03 19:10+0330\n"
 "Last-Translator: Roozbeh Pournader <roozbeh@sharif.edu>\n"
 "Language-Team: Persian <farsi@lists.sharif.edu>\n"
@@ -14,22 +14,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, fuzzy, c-format
 msgid "Cannot find directory %s\n"
 msgstr "نمی توان شاخه‌ی «%s» را ایجاد کرد: %s"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, fuzzy, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "نمی‌توان شاخه‌ی «%s» را ایجاد کرد: %s"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr ""
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -41,214 +41,214 @@ msgid ""
 "    dir/%%gconf-tree.xml\n"
 msgstr ""
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr ""
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, fuzzy, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "نمی‌توان شاخه‌ی ریشه‌ی %s را در نشانی %s یافت"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "نمی توان شاخه‌ی «%s» را ایجاد کرد: %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr ""
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
 msgstr ""
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, fuzzy, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr "نمی توان شاخه‌ی «%s» را ایجاد کرد: %s"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, fuzzy, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "نمی توان شاخه‌ی «%s» را ایجاد کرد: %s"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr ""
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, fuzzy, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "شکست در بار کردن منبع \"%s\": %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 msgid "Failed to write some configuration data to disk\n"
 msgstr ""
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "نمی‌توان شاخه‌ی «%s» را ایجاد کرد: %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, fuzzy, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "نمی توان شاخه‌ی «%s» را ایجاد کرد: %s"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, fuzzy, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "پاک کردن \"%s\" شکست خورد: %s"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, fuzzy, c-format
 msgid "Line %d character %d: %s"
 msgstr "شکست در ایجاد %s: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr ""
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "عدد صحیح \"%s\" خیلی بزرگ یا خیلی کوچک است"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr ""
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr ""
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr ""
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr ""
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, fuzzy, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "شکست در باز کردن \"%s\": %s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, fuzzy, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "نمی‌توان شاخه‌ی «%s» را ایجاد کرد: %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 17b5fc67..7c2b80da 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf 1.1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-18 23:06+0300\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-08-18 23:28+0300\n"
 "Last-Translator: Pauli Virtanen <pauli.virtanen@hut.fi>\n"
 "Language-Team: Gnome Finnish Translation Team <gnome-fi-laatu@lists."
@@ -23,22 +23,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Kansiota \"%s\" ei löydy\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "GConf-puun tallennus tiedostoon \"%s\" epäonnistui: %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "Käyttö: %s <kansio>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -57,33 +57,33 @@ msgstr ""
 "  tuloksena:\n"
 "    hak/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr "Tekstimerkintäkielen taustamoduuli poistuu muistista."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "XML-juurikansiota ei löytynyt osoitteesta \"%s\""
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Kansion \"%s\" luonti epäonnistui: %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr ""
 "XML-juurikansiosta osoitteessa \"%s\" ei voi lukea eikä sinne voi kirjoittaa"
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "XML-lähteen kansion tai tiedoston oikeudet juuressa %s ovat: %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -91,184 +91,184 @@ msgstr ""
 "Kansion poistotoiminto ei ole enää tuettu: poista vain kaikki kansion "
 "sisältämät arvot"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr ""
 "\"%s\":n lukituskansion avaaminen lukkojen poistamiseksi epäonnistui: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Tiedoston \"%s\" poisto epäonnistui: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr "Tekstimerkintäkielen taustamoduuli käynnistyy"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "XML-kansion \"%s\" lukituksen luovutus epäonnistui: %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Asetustietojen kirjoittaminen levylle ei onnistunut\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Kansion \"%s\" luonti epäonnistui: %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Kohteen \"%s\" poistaminen epäonnistui: %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Kohteen \"%s\" kirjoittaminen epäonnistui: %s\n"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "Rivi %d, merkki %d: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "Määre \"%s\" toistuu kahdesti samassa elementissä <%s>"
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "Määre \"%s\" ei kelpaa elementtiin <%s> tässä asiayhteydessä"
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Arvo \"%s\" ei ole tulkittavissa (odotettiin kokonaislukua)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Kokonaisluku \"%s\" on liian suuri tai pieni"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Arvo \"%s\" ei ole tulkittavissa (odotettiin \"true\" tai \"false\")"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Arvo \"%s\" ei ole tulkittavissa (odotettiin reaalilukua)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Elementillä <%2$s> ei ole määrettä \"%1$s\""
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr "Tuntematon arvo \"%1$s\" elementin <%3$s> määreelle \"%2$s\""
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr "Virheellinen l-tyyppi \"%s\" elementissä <%s>"
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr "Virheellinen ensimmäisen elementin tyyppi \"%s\" elementissä <%s>"
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr "Virheellinen cdr-tyyppi \"%s\" elementissä <%s>"
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr "Virheellinen listatyyppi \"%s\" elementissä <%s>"
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr "Kaksi <default>-elementtiä <local_schema>:n jälkeen"
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr "Kaksi <longdesc>-elementtiä <local_schema>:n jälkeen"
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "Elementti <%s> ei käy elementin <%s> jälkeen"
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "<%s> annettu, mutta nykyinen elementti ei ole tyypiltään %s"
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr "Kaksi <car>-elementtiä samassa parissa"
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr "Kaksi <cdr>-elementtiä samassa parissa"
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr "<li>:n tyyppi %s on väärä"
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr "<%s> annettu, mutta isän <entry>:ssä ei ole arvoa"
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "Elementti <%s> ei käy nykyisen elementin sisään"
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr "Valikkotiedoston uloimman elementin on oltava <gconf>, ei <%s>"
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "Elementti <%s> ei käy elementin <%s> sisään"
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "Elementin <%s> sisällä ei voi olla tekstiä"
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Kohteen \"%s\" avaaminen epäonnistui: %s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Tiedoston \"%s\" kirjoittaminen epäonnistui: %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr ""
@@ -1430,7 +1430,9 @@ msgstr "Kansiossa %s on ongelma, joten gconfd ei voi käyttää sitä"
 msgid ""
 "Failed to write byte to pipe file descriptor %d so client program may hang: %"
 "s"
-msgstr "Tavun kirjoitus putkeen (tiedostokahva %d) epäonnistui, joten asiakasohjelma saattaa pysähtyä: %s"
+msgstr ""
+"Tavun kirjoitus putkeen (tiedostokahva %d) epäonnistui, joten asiakasohjelma "
+"saattaa pysähtyä: %s"
 
 #: gconf/gconfd.c:739
 #, c-format
@@ -1601,7 +1603,9 @@ msgstr "Poista annetut avaimet."
 msgid ""
 "Recursively unset all keys at or below the key/directory names on the "
 "command line"
-msgstr "Poista rekursiivisesti kaikki avaimet, jotka ovat komentorivillä annettujen avaimien tai kansioiden kohdalla tai alla"
+msgstr ""
+"Poista rekursiivisesti kaikki avaimet, jotka ovat komentorivillä annettujen "
+"avaimien tai kansioiden kohdalla tai alla"
 
 #: gconf/gconftool.c:143
 msgid "Print all key/value pairs in a directory."
@@ -1615,7 +1619,9 @@ msgstr "Tulosta kansion kaikki alikansiot."
 msgid ""
 "Dump to standard output an XML description of all entries under a directory, "
 "recursively."
-msgstr "Tulosta vakiotulosteeseen XML-kuvaus kansion ja alikansioiden kaikista arvoista."
+msgstr ""
+"Tulosta vakiotulosteeseen XML-kuvaus kansion ja alikansioiden kaikista "
+"arvoista."
 
 #: gconf/gconftool.c:170
 msgid ""
diff --git a/po/fr.po b/po/fr.po
index 24d5e04f..59deccdf 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GConf 2.7.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-04-24 18:54+0200\n"
 "Last-Translator: Christophe Merlet (RedFox) <redfox@redfoxcenter.org>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
@@ -18,23 +18,23 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Impossible de trouver le répertoire %s\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr ""
 "Erreur lors de l'enregistrement de l'arborescence GConf dans « %s » : %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "Usage : %s <rép>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -53,22 +53,22 @@ msgstr ""
 "  en :\n"
 "    rép/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 #, fuzzy
 msgid "Unloading text markup backend module."
 msgstr "Déchargement du module XML."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Impossible de trouver le répertoire racine XML à l'adresse « %s »"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Impossible de créer le répertoire « %s » : %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
@@ -76,14 +76,14 @@ msgstr ""
 "Impossible de lire ou d'écrire dans le répertoire racine XML à l'adresse « %"
 "s »"
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
 "Les permissions du répertoire/fichier pour la source XML à la racine %s "
 "sont : %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -91,187 +91,187 @@ msgstr ""
 "L'opération de suppression de répertoire n'est plus supportée, enlevez juste "
 "toutes les valeurs dans le répertoire"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr ""
 "Impossible d'ouvrir le répertoire de verrous de %s afin de supprimer les "
 "verrous : %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Impossible de supprimer le fichier %s : %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 #, fuzzy
 msgid "Initializing Markup backend module"
 msgstr "Initialisation du module XML"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Le déverrouillage du répertoire XML « %s » a échoué : %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 #, fuzzy
 msgid "Failed to write some configuration data to disk\n"
 msgstr "L'accès a(ux) source(s) de configuration a échoué : %s\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Impossible de créer le répertoire « %s » : %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, fuzzy, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Impossible de supprimer le fichier %s : %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, fuzzy, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "La suppression de « %s » a échoué : %s"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, fuzzy, c-format
 msgid "Line %d character %d: %s"
 msgstr "La création de %s a échoué : %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Impossible de comprendre « %s » (entier attendu)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "L'entier « %s » est trop grand ou trop petit"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Impossible de comprendre « %s » (true ou false attendu)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Impossible de comprendre « %s » (nombre réél attendu)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, fuzzy, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Aucun attribut \"type\" pour le noeud <%s>"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr ""
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr ""
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, fuzzy, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "L'ouverture de %s a échoué : %s"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, fuzzy, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Erreur lors de l'annulation de « %s » : %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr ""
diff --git a/po/ga.po b/po/ga.po
index bd33962b..082b21e7 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GConf.pot HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-03-08  18:23+0000\n"
 "Last-Translator:  Alastair McKinstry <mckinstry@computer.org>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -14,22 +14,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Teip ag cuardaigh eolaire %s\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Teip ag sábhail crann Gconf do '%s': %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "Úsáid: %s <eolaire>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -41,215 +41,215 @@ msgid ""
 "    dir/%%gconf-tree.xml\n"
 msgstr ""
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr ""
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr ""
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Teip ag cruthaigh eolaire '%s': %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr ""
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
 msgstr ""
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr ""
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Teip ag scr;ios comhad %s: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr ""
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr ""
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 #, fuzzy
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Teip ag scríobh sonraí XML do '%s': %s"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Teip ag deánamh eolaire \"%s\": %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, fuzzy, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Teip ag scr;ios comhad %s: %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, fuzzy, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Teip ag dealaigh \"%s\": %s"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, fuzzy, c-format
 msgid "Line %d character %d: %s"
 msgstr "Teip ag cruthaigh %s: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr ""
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr ""
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr ""
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr ""
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr ""
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr ""
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, fuzzy, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Teip ag oscailt %s: %s"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, fuzzy, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Teip ag tógtha luach do '%s': %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index ae814d97..05173ce4 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2001-08-19 15:21+0200\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -19,22 +19,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, fuzzy, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Non foi posible crear o directorio `%s': %s"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, fuzzy, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Erro listando os directorios en `%s': %s"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr ""
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -46,217 +46,217 @@ msgid ""
 "    dir/%%gconf-tree.xml\n"
 msgstr ""
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 #, fuzzy
 msgid "Unloading text markup backend module."
 msgstr "Descargando o módulo XML."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 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/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Non foi posible crear o directorio `%s': %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, fuzzy, 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/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, 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/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
 msgstr ""
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, fuzzy, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr "Non foi posible crear o directorio `%s': %s"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, fuzzy, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Non se pode escribir ao ficheiro `%s': %s"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 #, fuzzy
 msgid "Initializing Markup backend module"
 msgstr "Inicializando o módulo XML"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, fuzzy, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Erro ao eliminar o bloqueo no directorio de XML `%s': %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 #, fuzzy
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Erro ao acceder a(s) fonte(s) da configuración: %s\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, fuzzy, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Non foi posible crear o directorio `%s': %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, fuzzy, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Non se pode escribir ao ficheiro `%s': %s"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, fuzzy, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Erro ao borrar `%s': %s"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, fuzzy, c-format
 msgid "Line %d character %d: %s"
 msgstr "Erro ao crear %s: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Non se entendeu `%s' (agardábase un enteiro)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "O enteiro `%s' é demasiado grande ou pequeno"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Non se entendeu `%s' (agardábase true ou false)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Non se entendeu `%s' (agardábase un número real)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, fuzzy, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "O nó <%s> non ten o atributo \"type\""
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr ""
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr ""
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, fuzzy, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Erro ao abrir `%s': %s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, fuzzy, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Erro desestablecendo `%s': %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, fuzzy, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "Erro ao mover o novo ficheiro co estado gardado ao sitio: %s"
diff --git a/po/gu.po b/po/gu.po
index b6f42bff..1c54156b 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf.HEAD.gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-08-09 15:34+0530\n"
 "Last-Translator: Ankit Patel <ankit@redhat.com>\n"
 "Language-Team: Gujarati\n"
@@ -20,22 +20,22 @@ msgstr ""
 "\n"
 "\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "%s ડિરેક્ટરી શોધી શકાતી નથી\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "'%s' પર જૂકોન્ફ ટ્રીનો સંગ્રહ કરવામાં ભૂલ: %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "વપરાશ: %s <ડિરેક્ટરી>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -54,215 +54,215 @@ msgstr ""
 "  to:\n"
 "    dir/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr "લખાણ માર્કઅપના પાશ્વભાગના મોડ્યુલો લાવી રહ્યા નથી."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "'%s' સરનામામાં XML રુટ ડિરેક્ટરી શોધી શકાઇ નથી"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "'%s' ડિરેક્ટરી બનાવી શકાઇ નહિ: %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr "\"%s\" સરનામામાં XML રુટ ડિરેક્ટરીમાં લખી કે વાંચી શકાતું નથી"
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "રુટ %s આગળ XML સ્ત્રોત માટેની ડિરેક્ટરી/ફાઇલની પરવાનગી: %o/%o છે"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
 msgstr ""
 "ડિરેક્ટરી દૂર કરવા માટેની પ્રક્રિયા માટે આધાર નથી, ડિરેક્ટરીમાંથી બધી કિંમતો કાઢી નાખો"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr "તાળા દૂર કરવા માટે %s માટેની તાળાની ડિરેક્ટરીને ખોલી શકાઇ નહિ: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "%s ફાઇલ દૂર કરી શકાઇ નહિ: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr "માર્કઅપના પાશ્વભાગના મોડ્યુલોની શરુઆત કરી રહ્યા છીએ"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "XML ડિરેક્ટરી \"%s\" પરનું તાળુ દૂર કરવામાં નિષ્ફળ: %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 msgid "Failed to write some configuration data to disk\n"
 msgstr "ડિસ્કમાં અમુક રુપરેખાંકન માહિતી લખવામાં નિષ્ફળ\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "ડિરેક્ટરી \"%s\" બનાવી શકાઇ નહિ: %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "\"%s\" દૂર કરી શકાઇ નહિ: %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "\"%s\" લખવામાં નિષ્ફળતા: %s\n"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "લીટી %d અક્ષર %d: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "લક્ષણ \"%s\" આ જ વસ્તુ <%s> પર બે વખત પુનરાવર્તન થયો"
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "લક્ષણ \"%s\" એ વસ્તુ <%s> પર આ સંદર્ભે અયોગ્ય છે"
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "`%s' ને સમજી શકાતુ નથી (પૂર્ણાંકની આશા છે)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "પૂર્ણાંક `%s' એ ખૂબ માેટો કે નાનો છે"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "%s' ને સમજી શકાતુ નથી (ખરા કે ખોટાની આશા છે)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "`%s' ને સમજી શકાતુ નથી (વાસ્તવિક સંખ્યાની આશા છે)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "કોઈ \"%s\" લક્ષણ વસ્તુ <%s> પર નથી"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr "અજ્ઞાત કિંમત \"%s\" એ \"%s\" માટે વસ્તુ <%s> પર"
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr "અયોગ્ય ltype \"%s\" એ <%s> પર"
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr "અયોગ્ય પ્રથમ વસ્તુનો પ્રકાર \"%s\" એ <%s> પર"
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr "અયોગ્ય cdr_type \"%s\" એ <%s> પર"
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr "અયોગ્ય list_type \"%s\" એ <%s> પર"
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr "બે <default> વસ્તુઓ <local_schema> ની નીચે"
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr "બે <longdesc> વસ્તુઓ <local_schema> ની નીચે"
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "વસ્તુ <%s> એ <%s> ની નીચે માન્ય નથી"
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "<%s> પૂરુ પાડવામાં આવેલ છે પરંતુ વર્તમાન વસ્તુને %s પ્રકાર નથી"
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr "બે <car> વસ્તુઓ અમુક જોડી માટે આપેલ છે"
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr "બે <cdr> વસ્તુઓ અમુક જોડી માટે આપેલ છે"
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr "<li> નો પ્રકાર %s ખોટો છે"
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr "<%s> પૂરુ પાડવામાં આવેલ છે પરંતુ <entry> પાસે કિંમત નથી"
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "વસ્તુ <%s> એ વર્તમાન વસ્તુની અંદર માન્ય નથી"
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr "મેનુ ફાઈલની બહારની વસ્તુઓ <gconf> જ હોવી જોઈએ નહિં કે <%s>"
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "વસ્તુ <%s> એ વસ્તુ <%s> અંદર માન્ય નથી"
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "વસ્તુ <%s> ની અંદર કોઈ લખાણ માન્ય નથી"
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "\"%s\" ખોલવામાં નિષ્ફળ: %s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "ફાઈલ \"%s\" લખવામાં ભૂલ: %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "કામચલાઉ ફાઈલ \"%s\" ને પરિણામી જગ્યા \"%s\" પર ખસેડવામાં નિષ્ફળ: %s"
diff --git a/po/hi.po b/po/hi.po
index ca4a0182..4ee6803c 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf.HEAD.hi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-07-19 16:16+0530\n"
 "Last-Translator: Ravishankar Shrivastava <raviratlami@yahoo.com>\n"
 "Language-Team: Hindi <indlinux-hindi@lists.sourceforge.net>\n"
@@ -17,22 +17,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, fuzzy, c-format
 msgid "Cannot find directory %s\n"
 msgstr "होस्ट नही ढूंढ पाए"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, fuzzy, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "फ़ाइल सहेजने में त्रुटि. \"%1\" को पहुँच अनुमति चेक करें"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, fuzzy, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "पसन्द डिरेक्ट्रीः"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -44,219 +44,219 @@ msgid ""
 "    dir/%%gconf-tree.xml\n"
 msgstr ""
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 #, fuzzy
 msgid "Unloading text markup backend module."
 msgstr "लेबल के पाठ में XML मार्कअप संयुक्त है, Pango-Parse.markup() देखें"
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "एक्सएमएल रूट डिरेक्ट्री पता '%s' में नहीं मिला"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "डिरेक्ट्री '%s' बना नहीं पाया: %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr ""
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
 msgstr ""
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr "%s हेतु लॉक मिटाने हेतु लॉक डिरेक्ट्री खोल नहीं पाया: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "फ़ाइल %s को मिटा नहीं पाया: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 #, fuzzy
 msgid "Initializing Markup backend module"
 msgstr "एक अतिरिक्त जीटीके मॉड्यूल लोड करें"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, fuzzy, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "सोर्स लोड करने में असफल \"%s\": %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 #, fuzzy
 msgid "Failed to write some configuration data to disk\n"
 msgstr "कॉन्फ़िगरेशन सोर्सेज में प्रवेश में असफलः %s\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "डिरेक्ट्री \"%s\" बना नहीं पाया: %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, fuzzy, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr ""
 "%s को नहीं हटा पाया\n"
 "%s"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, fuzzy, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "फ़ाइल '%s' पर लिख नहीं पायाः %s"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "पंक्ति %d अक्षर %d: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "गुण \"%s\" दो बार इसी <%s> तत्व पर दोहराया गया"
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "गुण \"%s\", <%s> तत्व इस संदर्भ में अवैध है "
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, fuzzy, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "PNM लोडर को एक पूर्णांक संख्या चाहिए जो नहीं मिल रही है"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "पूर्णांक '%s' या तो बहुत छोटा या बहुत बड़ा है"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, fuzzy, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "बूलियन मूल्य होने चाहिएँ - \"सही\" या \"गलत\" न कि \"%s\""
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, fuzzy, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "वास्तविक संख्या को पूर्णांक में नहीं बदल सका"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, fuzzy, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "कोई \"%s\" गुण, तत्व <%s> पर नहीं"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, fuzzy, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr "अज्ञात विशेषता %s <मेटासिटी-सत्र> तत्व पर"
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, fuzzy, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr "स्क्रीन %d जो प्रदर्शक '%s' पर है वह अवैध है\n"
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, fuzzy, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr "अवैध सूची_प्रकार \"%s\" इस पर <%s> नहीं "
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, fuzzy, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr "अज्ञात प्रकार \"%s\" तत्व <%s> पर नहीं "
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr "अवैध सूची_प्रकार \"%s\" इस पर <%s> नहीं "
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "तत्व <%s>,  <%s>से नीचे स्वीकार्य नहीं है"
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, fuzzy, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "सर्वर निवेदित प्रकार के बॉडी समर्थित नहीं करते."
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr "<li> में ग़लत प्रकार है %s"
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, fuzzy, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr "विंडो कार्य पट्टी में प्रविष्टि नहीं पाया"
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "तत्व <%s> वर्तमान तत्व के भीतर स्वीकार्य नहीं है"
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "तत्व <%s>, एक <%s> तत्व के भीतर स्वीकार्य नहीं है"
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "कोई पाठ तत्व <%s> के भीतर स्वीकार्य नहीं है"
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "\"%s\" खोलने में असफल: %s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "\"%s\" फ़ाइल में लिखने में त्रुटि: %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, fuzzy, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "XBM इमेज को लोड करते समय अस्थायी फाइल में लिखने में असफल"
diff --git a/po/hr.po b/po/hr.po
index 00fdd55a..e3205913 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf 0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-03-29 18:42+CEST\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -14,22 +14,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: TransDict server\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Ne mogu naći mapu %s\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Greška kod spremanja stabla GConf-a u \"%s\": %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "Uporaba: %s <mapa>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -48,33 +48,33 @@ msgstr ""
 "  u:\n"
 "    mapa/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 #, fuzzy
 msgid "Unloading text markup backend module."
 msgstr "Brišem XML pozadinski modul."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Ne mogu naći XML početnu mapu na adresi `%s'"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Ne mogu stvoriti mapu `%s': %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr "Ne mogu čitati iz ili pisati u XML korijensku mapu na adresi \"%s\""
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "Prava mape/datoteke za izvor XML-a u početnoj mapi %s su: %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -82,185 +82,185 @@ msgstr ""
 "Više nije podržana aktivnost brisanja mapa, samo obrišite sve vrijednosti u "
 "mapi"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr "Ne mogu otvoriti zaključanu mapu za %s kako bi ju otključao: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Ne mogu maknuti datoteku %s: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 #, fuzzy
 msgid "Initializing Markup backend module"
 msgstr "Pokrećem pozadinski XML modul"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Nisam uspio otpustiti ključeve XML mape \"%s\": %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 #, fuzzy
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Nisam uspio pristupiti izvoru(ima) postavki: %s\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Ne mogu stvoriti mapu \"%s\": %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, fuzzy, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Ne mogu maknuti datoteku %s: %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, fuzzy, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Nisam uspio obrisati \"%s\": %s"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, fuzzy, c-format
 msgid "Line %d character %d: %s"
 msgstr "Nisam uspio stvoriti %s: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Nisam razumio `%s' (očekivao sam cijeli broj)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Cijeli broj `%s' je ili prevelik ili premali"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Nisam razumio `%s' (očekivao sam točno ili netočno)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Nisam razumio `%s' (očekivao sam realni broj)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, fuzzy, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Nema \"vrste\" atributa za <%s> čvor"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr ""
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr ""
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, fuzzy, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Nisam uspio otvoriti %s: %s"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, fuzzy, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Greška kod micanja postavki \"%s\": %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, fuzzy, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index fe60ea06..bde4c9d4 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-07-20 14:30+0200\n"
 "Last-Translator: Laszlo Dvornik <dvornik@gnome.hu>\n"
 "Language-Team: Hungarian <gnome@gnome.hu>\n"
@@ -16,22 +16,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "A(z) %s könyvtár nem található\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr ""
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr ""
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -43,215 +43,215 @@ msgid ""
 "    dir/%%gconf-tree.xml\n"
 msgstr ""
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr ""
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 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érkönyvtár a(z) `%s' címen"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Nem lehet létrehozni a(z) `%s' könyvtárat: %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr "Nem lehet olvasni vagy írni az XML-gyökérkönyvtárat a(z) \"%s\" címen"
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
 "Az XML-forrás könyvtár/fájl jogosultságai a(z) %s gyökérben ezek: %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
 msgstr ""
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr ""
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Nem lehet eltávolítani a(z) %s fájlt: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr ""
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "A(z) \"%s\" XML-könyvtár zárolásának feloldása sikertelen: %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 msgid "Failed to write some configuration data to disk\n"
 msgstr ""
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Nem lehet létrehozni a(z) \"%s\" könyvtárat: %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Nem lehet eltávolítani a(z) \"%s\"-t: %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "\"%s\" írása sikertelen: %s\n"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "%d. sor %d. karakter: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr ""
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr ""
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr ""
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr ""
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr ""
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr ""
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "A(z) \"%s\" megnyitása sikertelen: %s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Hiba a(z) \"%s\" fájl írása közben: %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 1a0c8f7e..e7252e2d 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2003-06-22 22:15+0700\n"
 "Last-Translator: Mohammad DAMT <mdamt@bisnisweb.com>\n"
 "Language-Team: Indonesia <id@li.org>\n"
@@ -15,22 +15,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, fuzzy, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Tidak dapat membuat direktori baru `%s': %s"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, fuzzy, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Error mengambil skema pada `%s': %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr ""
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -42,34 +42,34 @@ msgid ""
 "    dir/%%gconf-tree.xml\n"
 msgstr ""
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 #, fuzzy
 msgid "Unloading text markup backend module."
 msgstr "Sedang lakukan unload modul backend XML"
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Tidak dapat menemukan direktori root XML pada alamat `%s'"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Tidak dapat membuat direktori baru `%s': %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr ""
 "Tidak dapat membaca atau menulisi direktori root XML pada alamat \"%s\""
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "Hak akses direktori/file pada sumber XML di root %s adalah %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 #, fuzzy
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
@@ -78,187 +78,187 @@ msgstr ""
 "Operasi penghapusan direktori tidak lagi dapat dilakukan. Hapus saja semua "
 "nilai pada direktori untuk melakukan hal tersebut"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr ""
 "Tidak dapat membuka kunci direktori untuk %s saat ingin menghapus kunci "
 "tersebut: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Tidak dapat menghapus file %s:%s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 #, fuzzy
 msgid "Initializing Markup backend module"
 msgstr "Sedang lakukan inisialisasi modul backend XML"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, fuzzy, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Gagal saat menyerahkan kunci pada direktori XML \"%s\": %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 #, fuzzy
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Gagal saat mengakses sumber-sumber konfigurasi: %s\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Tidak dapat membuat direktori baru \"%s\": %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, fuzzy, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Tidak dapat menghapus file %s:%s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, fuzzy, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Gagal saat menghapus \"%s\": %s"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, fuzzy, c-format
 msgid "Line %d character %d: %s"
 msgstr "Gagal membuat %s: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Tidak mengerti apa maksud dari `%s' (harusnya bernilai integer)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Integer `%s' terlalu besar atau terlalu kecil"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Tidak mengerti maksud dari `%s' (seharusnya bernilai true atau false)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Tidak mengerti apa maksud `%s' (seharusnya bernilai bilangan nyata)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, fuzzy, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Tidak ada atribut \"type\" untuk node <%s>"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr ""
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr ""
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, fuzzy, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Gagal untuk membuka %s: %s"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, fuzzy, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Error saat melakukan unset \"%s\": %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, fuzzy, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 85fe50b5..c1d97843 100644
--- a/po/it.po
+++ b/po/it.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-04-14 11:03+0200\n"
 "Last-Translator: Alessio Frusciante <algol@firenze.linux.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -18,22 +18,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Impossibile trovare la directory %s\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Errore nel salvataggio dell'albero GConf su '%s': %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "Uso: %s <dir>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -52,22 +52,22 @@ msgstr ""
 "  in:\n"
 "    dir/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 #, fuzzy
 msgid "Unloading text markup backend module."
 msgstr "Scaricamento del modulo backend XML."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Impossibile trovare la directory radice XML all'indirizzo \"%s\""
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Impossibile creare la directory \"%s\": %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
@@ -75,12 +75,12 @@ msgstr ""
 "Impossibile leggere o scrivere nella directory radice XML all'indirizzo \"%s"
 "\""
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "I permessi directory/file per la fonte XML alla radice %s sono: %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -88,187 +88,187 @@ msgstr ""
 "L'operazione di cancellazione directory non è più supportata, cancellare "
 "tutti i valori nella directory"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr ""
 "Impossibile aprire la directory di lock perché %s rimuova i file di lock: %"
 "s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Impossibile eliminare il file %s: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 #, fuzzy
 msgid "Initializing Markup backend module"
 msgstr "Inizializzazione del modulo backend XML"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Errore durante il rilascio del lock sulla directory XML \"%s\": %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 #, fuzzy
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Errore nell'accesso alla fonte (o alle fonti) di configurazione: %s\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Impossibile creare la directory \"%s\": %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, fuzzy, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Impossibile eliminare il file %s: %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, fuzzy, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Errore nella cancellazione di \"%s\": %s"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, fuzzy, c-format
 msgid "Line %d character %d: %s"
 msgstr "Errore nella creazione di %s: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Errore di interpretazione di `%s' (atteso un intero)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "L'intero `%s' è troppo grande o troppo piccolo"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Errore di interpretazione di `%s' (atteso un booleano)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Errore di interpretazione di `%s' (atteso un numero reale)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, fuzzy, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Attributo \"type\" mancante per il nodo <%s>"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr ""
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr ""
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, fuzzy, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Errore nell'apertura di %s: %s"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, fuzzy, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Errore nell'annullare \"%s\": %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, fuzzy, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "Impossibile spostare il nuovo file del salvataggio di stato: %s"
diff --git a/po/ja.po b/po/ja.po
index 7f061e79..721eea57 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GConf HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-17 22:30+0900\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-08-17 22:29+0900\n"
 "Last-Translator: Takeshi AIHANA <aihana@gnome.gr.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@@ -15,22 +15,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "ディレクトリ %s が見つかりません\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "'%s' への GConf ツリーの保存エラー: %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "用法: %s <ディレクトリ>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -50,21 +50,21 @@ msgstr ""
 "  マージ後:\n"
 "    dir/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr "テキスト・マークアップ・バックエンド・モジュールを解放中です。"
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "アドレス '%s' 中に XML ルート・ディレクトリが見つかりませんでした。"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "ディレクトリ '%s' を作成できませんでした: %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
@@ -72,12 +72,12 @@ msgstr ""
 "アドレス \"%s\" 中の XML ルートディレクトリへの読み取り/書き込みができませ"
 "ん。"
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "ルートにある %s の XML ソース用のディレクトリ/ファイル権限: %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -85,183 +85,183 @@ msgstr ""
 "ディレクトリの削除はもはやサポートしていません。ディレクトリ内の全ての値を削"
 "除してみて下さい。"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr "ロック削除のため %s のロック・ディレクトリを開けませんでした: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "ファイル %s を削除できませんでした: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr "マークアップ・バックエンド・モジュールの初期化中です。"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "XML ディレクトリ \"%s\" のロックの解除に失敗しました: %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 msgid "Failed to write some configuration data to disk\n"
 msgstr "設定データのディスクへの書き込みに失敗しました\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "ディレクトリ \"%s\" を作成できませんでした: %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "\"%s\" を削除できませんでした: %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "\"%s\" の書き込みに失敗しました: %s\n"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "%d 行 %d 桁: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "属性 \"%s\" が同じ要素 <%s> で二回繰り返されています"
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "属性 \"%s\" はこのコンテキストの要素 <%s> には不適切です"
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "'%s' を解釈しませんでした。(整数と期待された)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "整数 '%s' は大きすぎるか、もしくは小さすぎます。"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "'%s' を解釈しませんでした。(真または偽と期待された)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "'%s' を解釈しませんでした。(実数と期待された)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "属性 \"%s\" が要素 <%s> にありません"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr "\"%s\" が属性 \"%s\" (要素 <%s>) に対して不明な値です"
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr "ltype \"%s\" (要素 <%s>) が間違っています"
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr "first-element の種類 \"%s\" (要素 <%s>) が間違っています"
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr "cdr_type \"%s\" (要素 <%s>) が間違っています"
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr "list_type \"%s\" (要素 <%s>) が間違っています"
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr "要素 <default> が <local_schema> の下に二つあります"
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr "要素 <longdesc> が <local_schema> の下に二つあります"
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "要素 <%s> は <%s> の下に格納できません"
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "<%s> を与えましたが、この要素には %s 型がありません"
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr "要素 <car> が同じペアに対して二回与えられています"
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr "要素 <cdr> が同じペアに対して二回与えられています"
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr "<li> に間違った型 %s があります"
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr "<%s> を与えましたが、親の要素 <entry> には値がありません"
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "要素 <%s> はこの要素の内側に格納できません"
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr "メニューファイルの一番外側の要素は <%s> ではなく <gconf> にして下さい"
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "要素 <%s> は要素 <%s> の内側に格納できません"
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "要素 <%s> の内側にテキストを格納できません"
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "\"%s\" のオープンに失敗しました: %s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "ファイル \"%s\" の書き込みでエラー: %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "作業ファイル \"%s\" を最終格納場所 \"%s\" へ移動できませんでした: %s"
diff --git a/po/ko.po b/po/ko.po
index ac0ad992..d3b3d2ae 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf 2.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-08-08 21:31+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: GNOME Korea <gnome-kr-hackers@lists.kldp.net>\n"
@@ -14,22 +14,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "%s 디렉토리를 찾을 수 없습니다\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "GConf 트리를 '%s'에 저장하는 데 오류가 발생했습니다: %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "사용법: %s <디렉토리>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -48,33 +48,33 @@ msgstr ""
 "  다음과 같이 합칩니다:\n"
 "    dir/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr "텍스트 마크업 백엔드 모듈을 해제합니다."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "주소 `%2s'의 XML 루트 디렉토리를 찾을 수 없습니다"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "`%s'디렉토리를 만들 수가 없습니다: %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr ""
 "주소 `%s'의 XML 루트 디렉토리에서 읽거나 XML 루트 디렉토리를 쓸 수 없습니다"
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "루트 디렉토리 %s에 있는 XML 소스의 디렉토리/파일 허가권이: %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -82,183 +82,183 @@ msgstr ""
 "디렉토리 지우기 작업은 더 이상 지원되지 않습니다. 디렉토리 내의 모든 값을 지"
 "우면 됩니다"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr "잠금을 지울 때, %s에 대한 잠금 디렉토리를 열 수 없습니다: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "`%s' 파일을 지울 수 없습니다: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr "마크업 백엔드 모듈을 초기화합니다"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "XML 디렉토리 \"%s\"에 잠금을 포기하는 데 실패했습니다: %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 msgid "Failed to write some configuration data to disk\n"
 msgstr "설정 데이터를 디스크에 쓰는 데 실패했습니다\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "\"%s\" 디렉토리를 만들 수가 없습니다: %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "\"%s\" 파일을 지울 수 없습니다: %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "\"%s\" 파일을 지우는 데 실패했습니다: %s\n"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "줄 %d, 문자 %d: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "\"%s\" 속성이 같은 <%s> 원소에서 두 번 반복되었습니다"
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "이 컨텍스트에서 \"%s\" 속성은 <%s> 원소에서 쓸 수 없습니다"
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "`%s'을(를) 해석할 수가 없습니다 (정수가 와야합니다)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "정수값 `%s'이(가) 너무 크거나 아니면 너무 작습니다"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "`%s'을(를) 해석할 수가 없습니다 (true나 false가 와야합니다)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "`%s'을(를) 해석할 수가 없습니다 (실수가 와야합니다)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "<%s> 원소에 \"%s\"속성값이 없습니다"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr "<%3$s> 원소의 \"%2$s\" 속성에 알 수 없는 값 \"%1$s\"이(가) 있습니다"
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr "<%2$s>에 ltype(\"%1$s\")이 잘못되었습니다"
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr "<%2$s>에 first-element type(\"%1$s\")이 잘못되었습니다"
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr "<%2$s>에 cdr_type(\"%1$s\")이 잘못되었습니다"
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr "<%2$s>에 list_type(\"%1$s\")이 잘못되었습니다"
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr "<local_schema> 아래에 <default> 원소가 두 개 있습니다"
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr "<local_schema> 아래에 <longdesc> 원소가 두 개 있습니다"
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "<%2$s> 아래에 <%1$s> 원소가 올 수 없습니다"
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "<%s>이(가) 있지만 현재 원소는 %s 타입이 아닙니다"
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr "같은 페어에 두 개의 <car> 원소가 들어 있습니다"
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr "같은 페어에 두 개의 <cdr> 원소가 들어 있습니다"
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr "<li>의 타입이 잘못되었습니다 (%s)"
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr "<%s>이(가) 있지만 그 상위의 <entry>에 값이 들어 있지 않습니다"
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "<%s> 원소는 현재 원소 안에 들어갈 수 없습니다"
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr "메뉴 파일의 맨 바깥쪽 원소는 <%s>이(가) 아니라 <gconf>여야 합니다"
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "<%s> 원소는 <%s> 원소 안에 쓸 수 없습니다"
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "<%s> 원소 안에는 텍스트를 쓸 수 없습니다"
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "\"%s\" 파일을 여는 데 실패했습니다: %s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "\"%s\" 파일을 쓰는 데 실패했습니다: %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "\"%s\" 임시 파일을 제 위치 \"%s\"에 옮겨 놓는 데 실패했습니다: %s"
diff --git a/po/lt.po b/po/lt.po
index 5b8f2ea4..d27c62af 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-07-27 17:52+0300\n"
 "Last-Translator: Žygimantas Beručka <uid0@akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -16,22 +16,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Nepavyko rasti aplanko: %s\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Klaida saugant GConf medį į „%s“: %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "Naudojimas: %s <dir>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -50,21 +50,21 @@ msgstr ""
 "  į:\n"
 "    dir/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr ""
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Adresu „%s“ nepavyko rasti pagrindinio XML katalogo"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Nepavyko sukurti katalogo „%s“: %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
@@ -72,13 +72,13 @@ msgstr ""
 "Nepavyko perskaityti iš arva įrašyti į pagrindinį XML katalogą, esantį "
 "adresu „%s“"
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
 "XML pradinio teksto katalogo/bylos priėjimo teises adresu %s yra: %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -86,185 +86,185 @@ msgstr ""
 "Katalogo pašalinimo operacija yra nebepalaikoma, paprasčiausiai pašalinkite "
 "visus elementus saugomus tame kataloge"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr ""
 "Nepavyko atidaryti %s skirto rezervavimo katalogo, kad atšaukti "
 "rezervavimus: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Nepavyko pašalinti bylos %s: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr "Paleidžiamas Markup posistemės modulis"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Nepavyko atšaukti XML katalogo „%s“ rezervavimo: %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Nepavyko į diską įrašyti kai kurių konfigūracijos duomenų\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Nepavyko sukurti katalogo „%s“: %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Nepavyko pašalinti „%s“: %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Nepavyko įrašyti „%s“: %s\n"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "Eilutės %d simbolis %d: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "Atributas „%s“ pakartotas du kartus tam pačiam <%s> elementui"
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "Atributas „%s“ šiame kontekste yra netinkamas <%s> elementui"
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Nesuprantama „%s“ reikšmė (laukta sveiko skaičiaus)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Sveikas skaičius „%s“ yra per didelis arba per mažas"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Nesuprantama „%s“ reikšmė (laukta loginės reikšmės)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Nesuprantama „%s“ reikšmė (laukta realaus skaičiaus)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Elemente <%s> trūksta „%s“ požymio"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr "Nežinoma vertė „%s“ atributui „%s“ elemente <%s>"
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr "Netinkamas ltype „%s“ esantis <%s>"
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, fuzzy, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr "Invalid list_type „%s“ esantis <%s>"
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr "Netinkamas cdr_type „%s“ esantis <%s>"
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr "Invalid list_type „%s“ esantis <%s>"
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr "Du <default> elementai esantys žemiau <local_schema>"
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr "Du <longdesc> elementai esantys žemiau <local_shema>"
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "Elementas <%s> žemiau <%s> yra neleidžiamas"
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "<%s> pateiktas, bet esamas elementas nėra %s tipo"
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr "Du <car> elementai suteikti tai pačiai porai"
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr "Du <cdr> elementai suteikti tai pačiai porai"
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr "<li> turi netinkamą tipą %s"
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr "<%s> pateiktas, bet motininis <entry> neturi jokios reikšmės"
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "Elementas <%s> neleidžiamas esamo elemento viduje"
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr "Tolimiausias meniu bylos elementas turi būti <gconf>, ne <%s>"
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "Elementas <%s> yra neleidžiamas <%s> elemento viduje"
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "Tekstas <%s> elemento viduje yra neleidžiamas"
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Nepavyko atidaryti „%s“: %s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Klaida rašant bylą „%s“: %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "Nepavyko perkelti laikinos bylos „%s“ į galutinę vietą „%s“: %s"
diff --git a/po/lv.po b/po/lv.po
index 7fbdaa49..1e00a230 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2002-12-21 02:04+0200\n"
 "Last-Translator: Artis Trops <hornet@navigators.lv>\n"
 "Language-Team: Latvian <ll10nt@os.lv>\n"
@@ -15,22 +15,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, fuzzy, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Nevarēju izveidot direktoriju `%s' : %s"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, fuzzy, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Kļūda dabūnot shēmu no '%s': %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr ""
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -42,33 +42,33 @@ msgid ""
 "    dir/%%gconf-tree.xml\n"
 msgstr ""
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 #, fuzzy
 msgid "Unloading text markup backend module."
 msgstr "Izlādējam XML atbalstošo moduli."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, fuzzy, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Nevarēju atrast %s saknes direktoriju adresē `%s'"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Nevarēju izveidot direktoriju `%s' : %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr "Nevaru nolasīt vai ierakstīt XML saknes direktorijā adresē \"%s\""
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "Direktorijas/faila atļaujas XML avotam saknē %s ir: %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 #, fuzzy
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
@@ -77,185 +77,185 @@ msgstr ""
 "Direktorijas Dzēšanas operācija nav vairāk atbalstīta, vienkārši izdzēsiet "
 "visas vērtības šajā direktorijā"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, fuzzy, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr "Nevarēju izveidot direktoriju `%s' : %s"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, fuzzy, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Nevaru izņemt failu %s: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 #, fuzzy
 msgid "Initializing Markup backend module"
 msgstr "Inicializēju XML atbalstošo moduli"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, fuzzy, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Neizdevās atmest XML dir slēgšanu \"%s\": %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 #, fuzzy
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Nevarēju piekļūt konfigurācijas avotam(iem): %s\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Nevarēju izveidot direktoriju \"%s\": %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, fuzzy, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Nevaru izņemt failu %s: %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, fuzzy, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Neizdevās izdzēst \"%s\": %s"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, fuzzy, c-format
 msgid "Line %d character %d: %s"
 msgstr "Neizdevās izveidot %s: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Nesapratu `%s' (gaidīju veselu skaitli (integer))"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Vesels skaitlis `%s' ir par lielu vai mazu"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Nesapratu `%s' (gaidīju patiesi vai nepatiesi)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Nesapratu `%s' (gaidīju reālu skaitli)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, fuzzy, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Nav \"type\" atribūta <%s> nodei"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr ""
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr ""
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, fuzzy, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Nevarēju atvērt `%s': %s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, fuzzy, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Kļūda atstādot \"%s\": %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, fuzzy, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "Neizdevās novietot vietā jauno saglabātā stāvokļa failu: %s"
diff --git a/po/mk.po b/po/mk.po
index eddeea2f..73f72e30 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf.HEAD.mk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2003-06-15 21:59+0000\n"
 "Last-Translator: Vladislav Bidikov <bidikovi@mail.com.mk>\n"
 "Language-Team: Macedonian <lug@lists.linux.net.mk>\n"
@@ -22,22 +22,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, fuzzy, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Не можев да го направам директориумот `%s': %s"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, fuzzy, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Грешка земајќи ја схемата на '%s': %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr ""
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -49,34 +49,34 @@ msgid ""
 "    dir/%%gconf-tree.xml\n"
 msgstr ""
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 #, fuzzy
 msgid "Unloading text markup backend module."
 msgstr "Го одвчитувам XML позадинскиот модул."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Не можев да го пронајдам XML root директориумот во адресата `%s'"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Не можев да го направам директориумот `%s': %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr ""
 "Не можам да читам или пишувам во XML root директориумот во адресата \"%s\""
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "Директориум/датотека дозволите за XML сорс на root %s се: %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 #, fuzzy
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
@@ -85,186 +85,186 @@ msgstr ""
 "Операцијата за отстранување на директориумот не е повеќе поддржана, само "
 "отстранете ги сите вредности од директориумот"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr ""
 "Не можев да го отворам лок директориумот за %s да ги отстрани бравите: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Не можев да ја отстранам датотеката %s: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 #, fuzzy
 msgid "Initializing Markup backend module"
 msgstr "Иницијализирам XML позадински модул "
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, fuzzy, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Не успеав да го откажам заклучувањето на XML директориум \"%s\": %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 #, fuzzy
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Грешка при пристап на конфигурационите изворни датотеки: %s\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Не можев да направам директориум \"%s\": %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, fuzzy, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Не можев да ја отстранам датотеката %s: %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, fuzzy, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Не успеав да избришам \"%s\": %s"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, fuzzy, c-format
 msgid "Line %d character %d: %s"
 msgstr "Не успеав да создадам %s: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Не разбрав `%s' (очекував цел број)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Цел број `%s' е преголем или премалl"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Не разбрав `%s' (очекував точно или неточно)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Не разбрав `%s' (очекував реален број)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, fuzzy, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Нема \"type\" атрибут за <%s> јазолот"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr ""
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr ""
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, fuzzy, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Неможеше да се отвори %s: %s"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, fuzzy, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Грешка одсетирајќи \"%s\": %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, fuzzy, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "Не успеав да ја поместам новата зачуваната state датотека на место: %s"
diff --git a/po/ml.po b/po/ml.po
index 7434ad32..a88e439e 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:gconf.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2003-07-05 10:29+0530\n"
 "Last-Translator: FSF-India <locale@gnu.org.in>\n"
 "Language-Team: Malayalam <locale@gnu.org.in>\n"
@@ -15,22 +15,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, fuzzy, c-format
 msgid "Cannot find directory %s\n"
 msgstr "'%s'എന്ന കൂട് ഉണ്ടാക്കാന്‌ കഴിയുന്നില്ല: %s\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, fuzzy, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "%s വായിക്കുന്നതില്‌ പരാജയം : %s"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr ""
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -42,215 +42,215 @@ msgid ""
 "    dir/%%gconf-tree.xml\n"
 msgstr ""
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr ""
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr ""
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, fuzzy, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "'%s'എന്ന കൂട് ഉണ്ടാക്കാന്‌ കഴിയുന്നില്ല: %s\n"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr ""
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
 msgstr ""
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr ""
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr ""
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr ""
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, fuzzy, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "%s കൊണ്ട് വരാന് കഴിഞ്ഞില്ല: %s\n"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 #, fuzzy
 msgid "Failed to write some configuration data to disk\n"
 msgstr "%s കൊണ്ട് വരാന് കഴിഞ്ഞില്ല: %s\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, fuzzy, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "%s എന്ന കൂട് ഉണ്ടാക്കാന്‌ കഴിയുന്നില്ല: %s\n"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, fuzzy, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "%s എന്ന കൂട് ഉണ്ടാക്കാന്‌ കഴിയുന്നില്ല: %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, fuzzy, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "പ്രമേയം %s കൊണ്ട് വരാന് കഴിഞ്ഞില്ല: %s\n"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, fuzzy, c-format
 msgid "Line %d character %d: %s"
 msgstr "%s കൊണ്ട് വരാന് കഴിഞ്ഞില്ല: %s\n"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr ""
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr ""
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr ""
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr ""
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr ""
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr ""
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, fuzzy, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "%s തുറക്കുന്നതില്‌ പരാജയം : %s"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, fuzzy, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "രചന നശിപ്പിക്കുന്നതില്‌ തെറ്റ് \"%s\": %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, fuzzy, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "രചന %sലെ പ്രമേയം വായിക്കുന്നതില്‌ പരാജയപ്പെട്ടു: %s\n"
diff --git a/po/mn.po b/po/mn.po
index 688d5cd6..a1a3bf15 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf.HEAD.mn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-08-09 00:14+0200\n"
 "Last-Translator: Sanlig Badral <badral@users.sourceforge.net>\n"
 "Language-Team: Mongolian <openmn-translation@lists.sourceforge.net>\n"
@@ -20,22 +20,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "»%s« лавлах олдсонгүй\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "GConf модыг »%s« рүү хадгалах үед алдаа: %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "дуудалт: %s <лавлах>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -54,32 +54,32 @@ msgstr ""
 "  тийш:\n"
 "    лавлах/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr "Текст маркап бакэнд модул санах ойгоос арчигдав."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "%s хаяг дах эзний лавлахаас XML олдсонгүй"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "»%s« лавлах үүсгэгдсэнгүй: %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr "»%s« хаяг дахь XML-Лавлах руу уншиж бичиж болохгүй байна"
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "%s үндсэн дэх XML-эхийн хувьд Лавлах/файлд хандах эрхүүд: %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -87,183 +87,183 @@ msgstr ""
 "Лавлах устгах үйлдэл дэмжигдэхээ больсон, Та зүгээр л лавлах доторхи бүх "
 "утгуудыг устгана уу"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr "Түлхүүр устгах гээд »%s« -н түлхүүр лавлахыг нээж чадсангүй: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "%s файлыг устгаж чадсангүй: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr "Текст-Бакэнд модул инициацлагдаж байна"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "»%s« XML-Лавлахыг түлхүүрлэх оролдлого бүтсэнгүй: %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Зарим тохиргооны өгөгдлийг диск рүү бичиж болохгүй байна\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "»%s« лавлах үүсгэгдсэнгүй: %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "\"%s\" файлыг устгаж чадсангүй: %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "»%s« руу бичиж болсонгүй: %s\n"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "Мөр %d Тэмдэгт %d: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "\"%s\" аттрибут нэгэн ижил <%s> элементэд хоёр давтагдлаа"
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "\"%s\" аттрибут <%s> элементийн текстэд хүчингүй"
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "%s ойлгогдсонгүй (Integer хүлээгдэж байна)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "»%s« Integer хэт том эсвэл хэт жижиг"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "%s ойлгогдсонгүй (үнэн эсвэл худал хүлээгдэж байна)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "%s ойлгогдсонгүй (Бодит тоо хүлээгдэж байна)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "<%s> элементэд \"%s\" аттрибут алга"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr "\"%s\" мэдэгдэхгүй утга <%s> элементийн \"%s\" аттрибутын хувьд"
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr "<%s> дэх \"%s\" ltype хүчингүй"
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr "<%s> дэх хүчингүй first-element \"%s\""
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr "<%s> дэх cdr_type \"%s\" хүчингүй"
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr "<%s> дэх \"%s\" list_type хүчингүй"
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr "Нэг <local_schema> доор хоёр <default> элемент"
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr "Нэг <local_schema> доор хоёр <longdesc> элемент"
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "<%s> элемент <%s> доор зөвшөөрөгдөөгүй"
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "<%s> нийлүүлэгдсэн боловч идэвхитэй элемент %s төрөлгүй байна"
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr "Ижил хосын хувьд хоёр <car> элемент өгөгджээ"
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr "Ижил хосын хувьд хоёр <cdr> элемент өгөгджээ"
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr "<li> буруу %s төрөлтэй байна"
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr "<%s> нийлүүлэгдсэн боловч эцэг <entry> утгагүй байна"
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "<%s> элемент идэвхитэй элемент дотор зөвшөөрөгдөхгүй"
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr "Цэс файлын хамгийн гадар элемент <%s> бус <gconf> байх ёстой"
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "<%s> элемент <%s> элемент дотор зөвшөөрөгдөөгүй"
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "<%s> элемент дотор текст зөвшөөрөгдөөгүй"
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "»%s« нээгдсэнгүй: %s \n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "»%s« файл руу бичиж байхад алдаа: %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "Түр хадгалагч файл \"%s\" төгсгөл байрлал \"%s\" рүү зөөгдсөнгүй: %s"
diff --git a/po/ms.po b/po/ms.po
index ce752be2..d1f6f765 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2002-11-26 01:44+0800\n"
 "Last-Translator: Hasbullah Bin Pit <sebol@ikhlas.com>\n"
 "Language-Team: Projek Gabai <gabai-penyumbang@lists.sourceforge.org>\n"
@@ -14,22 +14,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, fuzzy, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Tak dapat mencipta direktori '%s': '%s'"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, fuzzy, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Ralat menulis fail '%s': %s"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr ""
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -41,219 +41,219 @@ msgid ""
 "    dir/%%gconf-tree.xml\n"
 msgstr ""
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 #, fuzzy
 msgid "Unloading text markup backend module."
 msgstr "Nyahmuat module backend XML"
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, fuzzy, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Tak menjumpai direktori pangkal %s pada  alamat '%s'"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Tak dapat mencipta direktori '%s': '%s'"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, fuzzy, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr ""
 "Tak dapat membaca atau menulis ke direktori pangkal XML pada alamat `%s'"
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "Keizinan direktori/fail bagi sumber XML pada pangkal %s adalah: %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
 msgstr ""
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, fuzzy, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr "Tak dapat mencipta direktori '%s': '%s'"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, fuzzy, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Tak dapat membuang fail %s: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 #, fuzzy
 msgid "Initializing Markup backend module"
 msgstr "Meninitialisasi modul backend XML"
 
 # libgnorba/orbitgtk.c:171
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, fuzzy, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Gagal menulis fail cecikut CORBA ke `%s': %s\n"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 #, fuzzy
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Gagal untuk mengakses sumber konfiguraso: %s\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Tak dapat mencipta direktori \"%s\": '%s'"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, fuzzy, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Tak dapat membuang fail %s: %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, fuzzy, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Gagal dapat memadam \"%s\": %s"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, fuzzy, c-format
 msgid "Line %d character %d: %s"
 msgstr "Gagal mencipta  %s: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Tidak memahami  `%s' (menjangka integer)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Integer `%s' adalah terlalu besar atau terlalu kecil"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Tidak memahami '%s' (dijangka benar atau palsu)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Tidak memahami `%s' (dijangka nombor nyata)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, fuzzy, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Tiada attribut \"Jenis\" bagi nod <%s>"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr ""
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr ""
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, fuzzy, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Gagal membuka '%s': %s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, fuzzy, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Ralat mengosongkan \"%s\": %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, fuzzy, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "Gagal dapat baca fail sessi yang disimpan %s: %s\n"
diff --git a/po/nb.po b/po/nb.po
index 0210846a..3a220eca 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GConf 2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-08-12 11:27+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
@@ -14,22 +14,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Kunne ikke finne katalog «%s»\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Feil under lagring av GConf-tre til «%s»: %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "Bruk: %s <katalog>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -48,32 +48,32 @@ msgstr ""
 "  til:\n"
 "    dir/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr "Laster ut modul for tekstmerking."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Kunne ikke finne XML-rotkatalogen i adressen «%s»"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Kunne ikke opprette katalogen «%s»: %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr "Kunne ikke lese fra eller skrive til XML-rotkatalogen i adressen «%s»"
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "Katalog/fil rettigheter for XML kildekode ved rot %s er: %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -81,183 +81,183 @@ msgstr ""
 "Operasjonen fjern katalog er ikke støttet lengre, bare fjern alle verdiene i "
 "katalogen"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr "Kunne ikke åpne låskatalog for %s for å fjerne låser: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Kunne ikke fjerne fil %s: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr "Initialiserer Markup-backend modulen"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Kunne ikke gi opp lås på XML-katalog «%s»: %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Kunne ikke skrive deler av konfigurasjonsdata til disk\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Kunne ikke opprette katalogen «%s»: %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Kunne ikke fjerne «%s»: %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Kunne ikke skrive «%s»: %s\n"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "Linje %d, tegn %d : %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "Attributt «%s» gjentatt to ganger i samme <%s>-element"
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "Attributt «%s» er ugyldig i <%s>-element i denne sammenhengen"
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Forsto ikke «%s» (forventet heltall)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Heltall «%s» er for stort eller lite"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Forsto ikke «%s» (forventet sann eller usann)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Forsto ikke «%s» (forventet flyttall)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Ingen «%s»-attributt på element <%s>"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr "Ukjent verdi «%s» for «%s»-attributt på element <%s>"
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr "Ugyldig ltype «%s» på <%s>"
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr "Ugyldig type for first-element «%s» på <%s>"
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr "Ugyldig cdr_type «%s» på <%s>"
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr "Ugyldig list_type «%s» på <%s>"
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr "To <default>-elementer under en <local_schema>"
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr "To <longdesc>-elementer under en <local_schema>"
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "Element <%s> er ikke tillatt under <%s>"
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "<%s> gitt men dette elementet har ikke type %s"
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr "To <car>-elementer oppgitt for samme par"
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr "To <cdr>-elementer oppgitt for samme par"
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr "<li> har feil type %s"
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr "<%s> oppgitt men opphav <entry> har ikke en verdi"
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "Element <%s> er ikke tillatt inne i dette elementet"
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr "Ytterste element i menyfilen må være <gconf> ikke <%s>"
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "Element <%s> er ikke tillatt inne i et <%s>-element"
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "Ingen tekst tillatt inne i element <%s>"
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Kunne ikke åpne «%s»: %s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Feil under skriving av fil «%s»: %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "Kunne ikke flytte midlertidig fil «%s» til endelig lokasjon «%s»: %s"
diff --git a/po/ne.po b/po/ne.po
index 56ce58dc..657b28b7 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-06-30 02:20+0545\n"
 "Last-Translator: KU <info@mpp.org.np>\n"
 "Language-Team: Nepali <info@mpp.org.np> \n"
@@ -15,22 +15,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "%s निर्देशिका पत्ता लागाउन सकिएन \n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr " जिकोन्फ ट्रि '%s': %s बचत गर्नेक्रममा गल्ती छ \n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "प्रयोग : %s <dir>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, fuzzy, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -48,33 +48,33 @@ msgstr ""
 "    subdir2/%%gconf.xml\n"
 "    to:\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr "मार्कअप ब्याकेण्ड नमुनाको पाठ अनलोड हुँदैछ"
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "`%s'ठेगानामा  एक्सएमएल  निर्देशिका पत्ता लागाउन सकिएन"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "`%s': %s निर्देशिका बानाउन सकिएन"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr "\"%s\"ठेगानामा भएको एक्सएमएल मुख्य निर्देशिका पढ्न अथवा लेख्न सकिएन"
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
 "एक्सएमएल स्रोतका लागि निर्देशिका/लेखपत्र अनुमतिका लागि मुख्य %sसम्बन्ध :  %o/%o हुन। "
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -82,183 +82,183 @@ msgstr ""
 "निर्देशिका संचालन हटाउनेले लामो समयसम्म सहयोग नगर्ने हुदा निर्देशिकामा भएका सबै मूल्यहरु "
 "तत्काल हटाऊ"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr "%s का लागि बन्द निर्देशिका खुलेन : %s लक हटाऊ\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "%s: %s मिसिल हटाउन सकेन\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr "मार्कअप ब्याकेण्ड नमुना सुरुआत क्रममा छ"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "एक्सएमएल निर्देशिका\"%s\": %s मा लक त्याग्न असफल भयो"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 msgid "Failed to write some configuration data to disk\n"
 msgstr "केहि तथ्यांक संरचना डिस्केटमा लेख्न असफल भयो \n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "\"%s\": %s निर्देशिका बनाउन सकिएन"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "\"%s\": %s हटाउन सकेन \n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "\"%s\": %s लेख्नको लागि असफल\n"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "रेखा %d वर्ण %d: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "प्रारुप \"%s\" गुण उस्तै<%s>तत्वमा दुइ पटक दोहोरियो "
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "यो स्थितिमा <%s> तत्वमा \"%s\"गुण अमान्य छ "
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "`%s'बुझिएन (इच्छाईएको संख्या)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "संख्या `%s' धेरै ठूलो अथवा सानो छ"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "`%s' बुझिएन (ईच्छाएको सत्य अथवा झूठ)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "`%s' बुझिएन (ईच्छाएको वास्तविक संख्या)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "<%s>तत्वमा प्रारुप\"%s\"  छैन"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr "<%s> तत्वमा प्रारुप \"%s\"का लागि \"%s\"अज्ञात मूल्य हो "
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, fuzzy, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr "<%s>मा \"%s\"अमान्य प्रकार "
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, fuzzy, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr "<%s>मा \"%s\"अमान्य सूची_प्रकार"
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr "<%s>मा \"%s\"अमान्य सिडिआर_प्रकार"
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr "<%s>मा \"%s\"अमान्य सूची_प्रकार"
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr "<स्थानीय_रुपरेखा>का मुनिपट्टि दुइटा <पूर्वनिर्धारित> तत्वहरु"
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr "<स्थानीय_रुपरेखा>का मुनिपट्टि दुइटा <पूर्वनिर्धारित> तत्वहरु"
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "<%s>को तल <%s> तत्वलाइ अनुमति छैन"
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "<%s> उपलब्ध गराइयो तर हालको तत्वसँग %s प्रकार छैन"
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr "उस्तै जोडिको लागि दुइटा <स्वन> तत्व दिइयो"
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr "उस्तै जोडिको लागि दुइटा <स्वन> तत्व दिइयो"
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr "<एलआइ> सँग  गलत %s प्रकार छ"
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr "<%s> उपलब्ध गराइयो तर मूल <प्रविष्टि>को महत्व छैन"
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "हालको तत्व भित्र  <%s>तत्वलाइ अनुमति छैऩ"
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr "मिसिल सुचीको टाढाको तत्वभित्र <%s> नभएर <जीकन्फ> हुनु पर्छ"
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "<%s>तत्वभित्र <%s>तत्वलाइ जाने अनुमति छैन"
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "<%s>तत्वभित्र कुनै पाठलाइ अनुमति छैन"
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "\"%s\": %s खोल्न असफल \n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "\"%s\": %sमिसिल लेख्नेक्रममा गल्ती"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "अस्थायी मिसिल\"%s\" अन्तिम स्थानसम्म \"%s\": %s सार्न असफल "
diff --git a/po/nl.po b/po/nl.po
index 2102fef5..e2556508 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GConf cvs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-07-04 17:22+0200\n"
 "Last-Translator: Tino Meinen <a.t.meinen@chello.nl>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
@@ -18,22 +18,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Kan map niet vinden: %s\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Fout bij het opslaan van GConf boom voor `%s': %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "Gebruik: %s <map>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -52,32 +52,32 @@ msgstr ""
 "  naar:\n"
 "    map/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr "Bezig met uitladen tekst-opmaak backend module."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Kan de XML root-map niet vinden op het adres `%s'"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Kan map `%s' niet aanmaken: %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr "Kan niet lezen of schrijven naar de XML root-map op het adres \"%s\""
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "Map/bestands-permissies voor XML-bron bij root %s zijn: %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -85,186 +85,186 @@ msgstr ""
 "Map-verwijderen is niet langer ondersteund, verwijder gewoon alle waardes in "
 "de map"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr ""
 "Kan de blokkerings-map niet openen voor %s voor het verwijderen van "
 "blokkeringen: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Kan bestand %s niet verwijderen: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr "Bezig met initialiseren opmaak backend-module"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Ontgrendelen van XML-map \"%s\" mislukt: %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Fout bij schrijven van enige configuratiedata naar de schijf\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Kan map \"%s\" niet aanmaken: %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Kon \"%s\" niet verwijderen: %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Schrijven van \"%s\" mislukt: %s\n"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "Regel %d teken %d: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "Attribuut \"%s\" twee maal herhaald op hetzelfde <%s> element"
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "Attribuut \"%s\" is ongeldig op <%s> element in deze context"
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "`%s' niet begrepen (integer verwacht)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Integer `%s' is te groot of te klein"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "`%s' niet begrepen (verwachtte waar of onwaar)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "`%s' niet begrepen (verwachtte een echt nummer)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Geen attribuut \"%s\" op knooppunt <%s>"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr "Onbekende waarde \"%s\" voor attribuut \"%s\" op element <%s>"
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr "Ongeldig ltype \"%s\" op <%s>"
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, fuzzy, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr "Ongeldig list_type \"%s\" op <%s>"
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr "Ongeldig cdr_type \"%s\" op <%s>"
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr "Ongeldig list_type \"%s\" op <%s>"
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr "Twee <standaard> elementen onder een <local_schema>"
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr "Twee <longdesc> elementen onder een <local_schema>"
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "Element <%s> is niet toegestaan onder <%s>"
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "gegeven werd <%s>  maar huidige element heeft niet het type %s"
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr "Twee <car> elementen gegeven voor hetzelfde paar"
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr "Twee <cdr> elementen gegeven voor hetzelfde paar"
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr "<li> heeft een verkeerd type %s"
 
 # heeft (nog) geen waarde
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr "gegeven werd <%s> maar moeder-<veld> heeft geen waarde"
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "Element <%s> is niet toegestaan binnen het huidige element"
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr "Buitenste element in menubestand moet zijn: <gconf> en niet <%s>"
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "Element <%s> is niet toegestaan binnen een <%s> element"
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "Geen tekst toegestaan binnen element <%s>"
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Openen van \"%s\" is mislukt: %s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Fout bij het schrijven van bestand \"%s\": %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr ""
diff --git a/po/nn.po b/po/nn.po
index eb066550..39333f69 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-08-10 21:14+0200\n"
 "Last-Translator: Åsmund Skjæveland <aasmunds@fys.uio.no>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -19,22 +19,22 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Kan ikkje finna katalogen «%s»\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Feil under lagring av GConf-tre til «%s»: %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "Bruk: %s <katalog>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -53,32 +53,32 @@ msgstr ""
 "  til:\n"
 "    kat/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr "Fjernar modulen for tekstoppmerking."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Fann ikkje XML-rotkatalogen i adressa «%s»"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Kunne ikkje laga katalogen «%s»: %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr "Klarar ikkje å lesa eller skriva til XML-rotkatalogen i adressa «%s»"
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "Katalog/fil-løyve for XML-kjelda ved rota %s er: %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -86,184 +86,184 @@ msgstr ""
 "Å fjerna katalogen er ikkje støtta lenger. Fjern alle verdiane i katalogen i "
 "staden"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr "Kunne ikkje opna låskatalogen for %s for å fjerna låsar: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Kan ikkje fjerna fila «%s»: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr "Startar merkingsmotormodulen"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Klarte ikkje å gje opp lås på XML-katalogen «%s»: %s"
 
 # TRN: Treng plural-fjas.
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Noko oppsettsdata kunne ikkje skrivast til disk\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Klarte ikkje å laga katalogen «%s»: %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Kan ikkje fjerna «%s»: %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Klarte ikkje å skriva «%s»: %s\n"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "Linje %d teikn %d: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "Attributten «%s» gjenteken to gongar på det same elementet <%s>"
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "Attributten «%s» er ugyldig på elementet <%s> i denne konteksten"
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Forstod ikkje «%s» (venta heiltal)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Heiltalet «%s» er for lite eller for stort"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Forstod ikkje «%s» (venta sann eller usann)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Forstod ikkje «%s» (venta eit reellt tal)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Elementet <%2$s> har ingen attributt «%1$s»"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr "Ukjend verdi «%s» på attributten «%s» i elementet <%s>"
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr "Ugyldig ltype «%s» på «%s»"
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr "Ugyldig fyrste elementtype «%s» på <%s>"
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr "Ugyldig cdr_type «%s» på <%s>"
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr "Ugyldig list_type «%s» på <%s>"
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr "To <default>-element under eit <local_schema>"
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr "To -element <longdesc>under eit <local_schema>"
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "Elementet <%s> er ikkje tillatt under <%s>"
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "<%s> oppgitt, men det noverande elementet har ikkje typen %s"
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr "To <car>-element oppgjevne for same par"
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr "To <cdr>-element oppgjevne for same par"
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr "<li> har feil type %s"
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr "<%s> oppgjeven, men forelderen <entry> har ikkje nokon verdi"
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "Elementet <%s> er ikkje tillate inni det noverande elementet"
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr "Det ytterste elementet i menyfila må vera <gconf>, ikkje <%s>"
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "Elementet <%s> er ikkje tillate inni eit <%s>-element"
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "Tekst er ikkje tillate inni elementet <%s>"
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Klarte ikke å opna «%s»: %s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Feil under skriving av fila «%s»: %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr ""
diff --git a/po/no.po b/po/no.po
index 0210846a..3a220eca 100644
--- a/po/no.po
+++ b/po/no.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GConf 2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-08-12 11:27+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
@@ -14,22 +14,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Kunne ikke finne katalog «%s»\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Feil under lagring av GConf-tre til «%s»: %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "Bruk: %s <katalog>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -48,32 +48,32 @@ msgstr ""
 "  til:\n"
 "    dir/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr "Laster ut modul for tekstmerking."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Kunne ikke finne XML-rotkatalogen i adressen «%s»"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Kunne ikke opprette katalogen «%s»: %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr "Kunne ikke lese fra eller skrive til XML-rotkatalogen i adressen «%s»"
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "Katalog/fil rettigheter for XML kildekode ved rot %s er: %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -81,183 +81,183 @@ msgstr ""
 "Operasjonen fjern katalog er ikke støttet lengre, bare fjern alle verdiene i "
 "katalogen"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr "Kunne ikke åpne låskatalog for %s for å fjerne låser: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Kunne ikke fjerne fil %s: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr "Initialiserer Markup-backend modulen"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Kunne ikke gi opp lås på XML-katalog «%s»: %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Kunne ikke skrive deler av konfigurasjonsdata til disk\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Kunne ikke opprette katalogen «%s»: %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Kunne ikke fjerne «%s»: %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Kunne ikke skrive «%s»: %s\n"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "Linje %d, tegn %d : %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "Attributt «%s» gjentatt to ganger i samme <%s>-element"
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "Attributt «%s» er ugyldig i <%s>-element i denne sammenhengen"
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Forsto ikke «%s» (forventet heltall)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Heltall «%s» er for stort eller lite"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Forsto ikke «%s» (forventet sann eller usann)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Forsto ikke «%s» (forventet flyttall)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Ingen «%s»-attributt på element <%s>"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr "Ukjent verdi «%s» for «%s»-attributt på element <%s>"
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr "Ugyldig ltype «%s» på <%s>"
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr "Ugyldig type for first-element «%s» på <%s>"
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr "Ugyldig cdr_type «%s» på <%s>"
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr "Ugyldig list_type «%s» på <%s>"
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr "To <default>-elementer under en <local_schema>"
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr "To <longdesc>-elementer under en <local_schema>"
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "Element <%s> er ikke tillatt under <%s>"
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "<%s> gitt men dette elementet har ikke type %s"
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr "To <car>-elementer oppgitt for samme par"
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr "To <cdr>-elementer oppgitt for samme par"
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr "<li> har feil type %s"
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr "<%s> oppgitt men opphav <entry> har ikke en verdi"
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "Element <%s> er ikke tillatt inne i dette elementet"
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr "Ytterste element i menyfilen må være <gconf> ikke <%s>"
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "Element <%s> er ikke tillatt inne i et <%s>-element"
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "Ingen tekst tillatt inne i element <%s>"
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Kunne ikke åpne «%s»: %s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Feil under skriving av fil «%s»: %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "Kunne ikke flytte midlertidig fil «%s» til endelig lokasjon «%s»: %s"
diff --git a/po/pa.po b/po/pa.po
index 3a5dc300..8f0dc0cd 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-07-22 11:36+0530\n"
 "Last-Translator: Amanpreet Singh Alam <aalam@redhat.com>\n"
 "Language-Team: Punjabi <pa@li.org>\n"
@@ -17,22 +17,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "ਡਾਇਰੈਕਟਰੀ %s ਲੱਭੀ ਨਹੀ ਹੈ\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "ਗਲਤੀ ਜੀ-ਕਾਨਫ ਟਰੀ ਨੂੰ  '%s' ਤੇ ਸੰਭਾਲਣ ਵਿੱਚ: %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "ਵਰਤੋ: %s <dir>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -51,215 +51,215 @@ msgstr ""
 "  ਨੂੰ:\n"
 "    ਡਾਇ/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr "ਪਿੱਠਵਰਤੀ ਮੈਡਲਿਊ ਨੂੰ ਅਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ "
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "ਰੂਟ ਡਾਇਰੈਕਟਰੀ XML ਪਤੇ `%s' ਤੇ ਨਹੀ ਲੱਭੀ ਹੈ"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "ਡਾਇਰੈਕਟਰੀ `%s' ਬਣ ਨਹੀ ਸਕੀ ਹੈ: %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr ""
 "ਰੂਟ ਡਾਇਰੈਕਟਰੀ XML ਪਤੇ  \"%s\" ਨੂੰ ਖੋਲਿਆ ਨਹੀ ਜਾ ਸਕਦਾ ਹੈ ਜਾਂ ਲਿਖਿਆ ਨਹੀ ਜਾ ਸਕਦਾ ਹੈ "
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "ਡਾਇਰੈਕਟਰੀ/ਫਾਇਲ ਅਧਿਕਾਰ XML ਸਰੋਤ ਤੇ ਰੂਟ %s ਵਜੋ ਹਨ: %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
 msgstr "ਡਾਇਰੈਕਟਰੀ ਕਾਰਵਾਈ ਨੂੰ ਹਟਾਉਣ ਹੁਣ ਸਹਾਇਕ ਨਹੀ ਹੈ , ਡਾਇਰੈਕਟਰੀ ਵਿੱਚਲੇ ਸਾਰੇ ਮੁੱਲ ਹਟਾ ਦਿਉ"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr "%s ਲਈ ਲਾਕ ਡਾਇਰੈਕਟਰੀ ਨੂੰ ਖੋਲਿਆ ਨਹੀ ਜਾ ਸਕਿਆ ਹੈ ਤਾਂ ਕਿ ਲਾਕ ਹਟਾਏ  ਜਾ ਸਕਣ: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "ਫਾਇਲ %s ਨੂੰ ਹਟਾਇਆ ਨਹੀ ਜਾ ਸਕਿਆ: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr "ਪਿੱਠਵਰਤੀ ਮੈਡਊਲ ਦੀ ਸ਼ੁਰੂਆਤ"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "ਡਾਇਰੈਕਟਰੀ XML \"%s\" ਲਈ ਲਾਕ ਛੱਡਣਾ ਅਸਫਲ ਰਿਹਾ: %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 msgid "Failed to write some configuration data to disk\n"
 msgstr "ਅਸਫਲ, ਸੰਰਚਨਾ ਡਾਟਾ ਡਿਸਕ ਤੇ ਲਿਖਣ ਵਿੱਚ ਅਸਫਲ\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "ਡਾਇਰੈਕਟਰੀ \"%s\" ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ: %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "%s ਨੂੰ ਹਟਾਇਆ ਨਹੀ ਜਾ ਸਕਿਆ: %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "\"%s\" ਨੂੰ ਲਿਖਣ ਵਿੱਚ ਅਸਫਲ: %s\n"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "ਸਤਰ %d ਅੱਖਰ %d: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "ਇੱਕੋ ਇਕਾਈ <2%s> ਲਈ ਗੁਣ \"%1s\" ਦੋ ਵਾਰ ਦੁਹਰਾਇਆ ਗਿਆ ਹੈ"
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "ਇਸ ਪ੍ਰਸੰਗ ਵਿੱਚ ਇਕਾਈ <%2s> ਤੇ ਗੁਣ \"%1s\" ਜਾਇਜ ਨਹੀਂ ਹੈ"
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "ਸਮਝਿਆ ਨਾ ਜਾ ਸਕਿਆ `%s' (ਪੂਰਨ-ਅੰਕ ਲੋੜੀਦਾ ਸੀ)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "ਪੂਰਨ ਅੰਕ `%s'  ਬਹੁਤ ਵੱਡਾ ਹੈ"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "ਸਮਝਿਆ ਨਾ ਜਾ ਸਕਿਆ `%s' (ਸੱਚ ਜਾਂ ਝੂਠ ਲੋੜੀਦਾ ਸੀ)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "ਸਮਝਿਆ ਨਾ ਜਾ ਸਕਿਆ `%s' ( ਪੂਰਨ-ਅੰਕ ਲੋੜੀਦਾ ਸੀ)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "ਇਕਾਈ <%2s> ਤੇ ਕੋਈ ਗੁਣ \"%1s\"  ਨਹੀਂ ਹੈ"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr "ਇਕਾਈ <%3s> ਤੇ ਗੁਣ \"%2s\" ਲਈ ਅਣਪਛਾਤਾ ਮੁੱਲ \"%1s\" ਹੈ"
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr "<%2s> ਲਈ ਅਣਪਛਾਤੀ ਕਿਸਮ \"%1s\" ਹੈ"
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, fuzzy, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr "<%2s> ਤੇ ਗਲਤ ਸੂਚੀ ਕਿਸਮ \"%1s\""
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr "<%2s> ਤੇ ਗਲਤ cdr_type \"%1s\""
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr "<%2s> ਤੇ ਗਲਤ ਸੂਚੀ ਕਿਸਮ \"%1s\""
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr "ਦੋ<default> ਇਕਾਈਆਂ ਹੇਠ ਦਿੱਤੀਆਂ ਹਨ <local_schema>"
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr "ਦੋ <longdesc> ਇਕਾਈਆਂ ਹੇਠ ਦਿੱਤੀਆਂ ਹਨ  <local_schema>"
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "ਇਕਾਈ <%s> ਹੇਠਾਂ ਅਨੁਸਾਰ ਸਹਾਇਕ ਨਹੀਂ ਹੈ <%s>"
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "<%s> ਹੈ, ਪਰ ਮੌਜੂਦਾ ਇਕਾਈ ਦੀ ਕਿਸਮ %s ਨਹੀਂ ਹੈ"
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr "ਦੋ <car> ਇਕਾਈਆਂ ਇੱਕੋ ਜੋੜੇ ਲਈ ਹਨ"
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr "ਦੋ <cdr> ਇਕਾਈਆਂ ਇੱਕੋ ਜੋੜੇ ਲਈ ਹਨ"
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr "<li> ਦੀ ਗਲਤ ਕਿਸਮ %s ਹੈ"
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr "<%s> ਸਹਾਇਕ ਹੈ, ਪਰ ਮੂਲ <entry> ਦਾ ਮੁੱਲ ਨਹੀਂ ਹੈ"
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "ਮੌਜੂਦਾ ਇਕਾਈ ਦੇ ਅੰਦਰ ਇਕਾਈ <%s> ਦੀ ਇਜ਼ਾਜਤ ਨਹੀਂ ਹੈ"
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr "ਮੇਨੂ ਫਾਇਲ ਵਿੱਚ ਬਾਹਰੀ ਇਕਾਈਆਂ <gconf> ਵਿੱਚ ਲਾਜ਼ਮੀ ਹਮ, ਪਰ <%s> ਨਹੀਂ"
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "<%2s>ਇਕਾਈ ਦੇ ਅੰਦਰ <%1s>ਇਕਾਈ ਸੰਭਵ ਨਹੀਂ ਹੈ"
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "ਇਕਾਈ <%s> ਦੇ ਅੰਦਰ ਪਾਠ ਦੀ ਇਜ਼ਾਜਤ ਨਹੀਂ ਹੈ"
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "ਅਸਫਲ \"%s\"  ਨੂੰ ਖੋਲਣ ਵਿੱਚ: %s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "ਗਲਤੀ \"%s\" ਨੂੰ ਲਿਖਣ ਵਿੱਚ: %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "ਆਰਜ਼ੀ ਫਾਇਲ਼ ਸਥਿਤੀ \"%s\" ਤੋਂ ਅਖੀਰ ਸਥਿਤੀ \"%s\" ਤੇ ਭੇਜਣ ਵਿੱਚ ਅਸਫਲਤਾ: %s"
diff --git a/po/pl.po b/po/pl.po
index 82059b98..96d6b3b6 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2003-10-26 22:46+0100\n"
 "Last-Translator: Gnome PL Team <translators@gnome.pl>\n"
 "Language-Team: GNOME PL Team <translation-team-pl@lists.sourceforge.net>\n"
@@ -18,22 +18,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Nie można znaleźć katalogu %s\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Błąd podczas zapisu drzewa GConf do \"%s\": %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "Użycie: %s <katalog>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -52,21 +52,21 @@ msgstr ""
 "  do postaci:\n"
 "    katalog/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr "Usuwanie z pamięci modułu oznaczania tekstu."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 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/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Nie można utworzyć katalogu \"%s\": %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
@@ -74,12 +74,12 @@ msgstr ""
 "Nie można odczytać lub zapisywać do katalogu głównego XML-a pod adresem \"%s"
 "\""
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, 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/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -87,184 +87,184 @@ msgstr ""
 "Operacja usuwania katalogu nie jest już obsługiwana, należy po prostu usunąć "
 "wszystkie wartości z katalogu"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr ""
 "Nie można otworzyć katalogu blokad dla %s w celu usunięcia blokad: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Nie można usunąć pliku %s: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr "Inicjowanie modułu odznaczania"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Nieudana próba zwolnienia blokady na katalogu XML \"%s\": %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Nie można zapisać pewnych danych konfiguracyjnych na dysk\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Nie można utworzyć katalogu \"%s\": %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Nie można usunąć pliku \"%s\": %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Nie można zapisać \"%s\": %s\n"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "Wiersz %d znak %d: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "Atrybut \"%s\" powtórzony dwukrotnie dla tego samego elementu <%s>"
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "Atrybut \"%s\" jest nieprawidłowy dla elementu <%s> w tym kontekście"
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Niezrozumiała wartość \"%s\" (oczekiwano liczby całkowitej)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Wartość całkowita \"%s\" jest zbyt duża lub zbyt mała"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Niezrozumiała wartość \"%s\" (oczekiwano wartości logicznej)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Niezrozumiała wartość \"%s\" (oczekiwano liczby rzeczywistej)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Brak atrybutu \"%s\" dla elementu <%s>"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr "Nieznana wartość \"%s\" dla atrubutu \"%s\" elementu <%s>"
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr "Nieprawidłowa wartość ltype \"%s\" dla <%s>"
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr "Nieprawidłowy rodzaj wartości first-element \"%s\" dla <%s>"
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr "Nieprawidłowa wartość cdr_type \"%s\" dla <%s>"
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr "Nieprawidłowa wartość list_type \"%s\" dla <%s>"
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr "Dwa elementy <default> poniżej <local_schema>"
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr "Dwa elementy <longdesc> poniżej <local_schema>"
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "Element <%s> nie jest dozwolony poniżej <%s>"
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "Podano <%s> lecz aktualny element nie posiada typu %s"
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr "Dwa elementy <car> podano dla tej samej pary"
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr "Dwa elementy <cdr> podane dla tej samej pary"
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr "<li> posiada nieprawidłowy typ %s"
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr "Dostarczono <%s> lecz rodzic <entry> nie posiada wartości"
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "Element <%s> jest niedozwolony wewnątrz bieżącego elementu"
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr "Skrajnym elementem w pliku menu musi być <gconf> nie <%s>"
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "Element <%s> jest niedozwolony wewnątrz elementu <%s>"
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "Tekst jest niedozwolony wewnątrz elementu <%s>"
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Nie można otworzyć pliku \"%s\": %s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Błąd przy zapisywaniu pliku \"%s\": %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 2aed13e6..ff82a3f6 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-08-13 21:40+0000\n"
 "Last-Translator: Duarte Loreto <happyguy_pt@hotmail.com>\n"
 "Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
@@ -15,22 +15,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Incapaz de encontrar o directório %s\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Erro ao gravar árvore GConf para '%s': %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "Utilização: %s <dir>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -50,33 +50,33 @@ msgstr ""
 "  em:\n"
 "    dir/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr "A libertar o módulo de suporte de texto etiquetado."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Incapaz de encontrar o directório raíz do XML no endereço `%s'"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Incapaz de criar directório `%s': %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr "Incapaz de escrever ou ler no directório raíz XML no endereço \"%s\""
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
 "Permissões de directório/ficheiro para origem XML na raíz %s são: %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -84,185 +84,185 @@ msgstr ""
 "Operação de remoção de directório deixou de ser suportada, remova todos os "
 "valores no directório"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr ""
 "Incapaz de abrir directório de ficheiros de exclusividade para %s para os "
 "remover: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Incapaz de remover ficheiro %s: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr "A inicializar o módulo de suporte de Texto Etiquetado"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Falha ao libertar exclusividade sobre directório XML \"%s\": %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Falha ao gravar alguns dados de configuração no disco\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Incapaz de criar directório \"%s\": %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Incapaz de remover \"%s\": %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Falha ao escrever \"%s\": %s\n"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "Linha %d caracter %d: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "Atributo \"%s\" repetido duas vezes no mesmo elemento <%s>"
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "Atributo \"%s\" é inválido no elemento <%s> neste contexto"
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Incapaz de compreender `%s' (esperado valor inteiro)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Inteiro `%s' é demasiado grande ou pequeno"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Incapaz de compreender `%s' (esperado verdadeiro ou falso)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Incapaz de compreender `%s' (esperado número real)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Nenhum atributo \"%s\" no elemento <%s>"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr "Valor \"%s\" desconhecido para o atributo \"%s\" no elemento <%s>"
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr "ltype \"%s\" inválido em <%s>"
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr "Tipo primeiro-elemento \"%s\" inválido em <%s>"
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr "cdr_type \"%s\" inválido em <%s>"
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr "list_type \"%s\" inválido em <%s>"
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr "Dois elementos <default> abaixo de um <local_schema>"
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr "Dois elementos <longdesc> abaixo de um <local_schema>"
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "O elemento <%s> não é permitido abaixo de <%s>"
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "<%s> especificado mas elemento actual não tem o tipo %s"
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr "Especificados dois elementos <car> para o mesmo par"
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr "Especificados dois elementos <cdr> para o mesmo par"
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr "<li> possui o tipo incorrecto %s"
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr "<%s> especificado mas a <entry> pai não possui um valor"
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "O elemento <%s> não é permitido dentro do elemento actual"
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr "Elemento externo no ficheiro de menu tem de ser <gconf> e não <%s>"
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "O elemento <%s> não é permitido dentro de um elemento <%s>"
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "Nenhum texto é permitido dentro do elemento <%s>"
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Falha ao abrir \"%s\": %s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Erro ao escrever o ficheiro \"%s\": %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e168796b..7fd01956 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf 2.4.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-03-14 23:51-0300\n"
 "Last-Translator: Evandro Fernandes Giovanini <evandrofg@ig.com.br>\n"
 "Language-Team: Brazilian Portuguese <gnome-l10n-br@listas.cipsga.org.br>\n"
@@ -16,22 +16,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Não foi possível encontrar o diretório %s\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Erro ao salvar a árvore GConf para '%s': %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "Utilização: %s <dir>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -51,35 +51,35 @@ msgstr ""
 "  para:\n"
 "    dir/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 #, fuzzy
 msgid "Unloading text markup backend module."
 msgstr "Descarregando módulo backend XML"
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 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/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Não foi possível criar diretório `%s': %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, 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/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, 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 na raiz %s são: %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -87,187 +87,187 @@ msgstr ""
 "A operação de remoção de diretório não é mais suportada, apenas remova todos "
 "os valores no diretório."
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr ""
 "Não foi possível abrir o diretório de bloqueio para %s remover as travas: %"
 "s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Não foi possível remover o arquivo %s: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 #, fuzzy
 msgid "Initializing Markup backend module"
 msgstr "Iniciando módulo backend XML"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Falha ao liberar bloqueio no diretório XML \"%s\": %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 #, fuzzy
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Falha ao acessar a(s) fonte(s) de configuração: %s\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Não foi possível criar o diretório \"%s\": %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, fuzzy, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Não foi possível remover o arquivo %s: %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, fuzzy, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Falha ao excluir \"%s\": %s"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, fuzzy, c-format
 msgid "Line %d character %d: %s"
 msgstr "Falha ao criar %s: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Não foi possível entender `%s' (era esperado um inteiro)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "O inteiro `%s' é muito grande ou pequeno"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Não foi possível entender `%s' (esperado verdadeiro ou falso)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Não foi possível entender `%s' (número real esperado)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, fuzzy, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Sem atributo \"tipo\" para o nó <%s>"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr ""
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr ""
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, fuzzy, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Falha ao abrir %s: %s"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, fuzzy, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Erro ao limpar \"%s\": %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, fuzzy, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "Falha ao mover novo arquivo de estado: %s"
diff --git a/po/ro.po b/po/ro.po
index 88f7248d..3f77b10f 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2001-02-24 13:06+0100\n"
 "Last-Translator: Robert Claudiu Gheorghe <rgheorghe@writeme.com>\n"
 "Language-Team: Română <ro@li.org>\n"
@@ -14,22 +14,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, fuzzy, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Nu am putut crea directorul `%s': %s"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, fuzzy, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Eroare la listarea directorelor în `%s': %s"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr ""
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -41,218 +41,218 @@ msgid ""
 "    dir/%%gconf-tree.xml\n"
 msgstr ""
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 #, fuzzy
 msgid "Unloading text markup backend module."
 msgstr "Descarc modulul XML."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Nu pot găsi directorul rădăcină pentru XML la adresa `%s'"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Nu am putut crea directorul `%s': %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, fuzzy, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr "Nu pot citi sau scrie în directorul rădăcină pentru XML la adresa `%s'"
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
 "Drepturile pentru sursa XML pe director/fişierele la rădăcină %s sunt: %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
 msgstr ""
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, fuzzy, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr "Nu am putut crea directorul `%s': %s"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, fuzzy, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Nu pot scrie în fişier `%s': %s"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 #, fuzzy
 msgid "Initializing Markup backend module"
 msgstr "Iniţializez modulul XML"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, fuzzy, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Încercarea de a ridica blocarea directorului XML `%s': %s a eşuat"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 #, fuzzy
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Operaţia nu este permisă fară un server de configuraţii"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, fuzzy, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Nu am putut crea directorul `%s': %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, fuzzy, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Nu pot scrie în fişier `%s': %s"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, fuzzy, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Ştergere eşuata pentru `%s': %s"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, fuzzy, c-format
 msgid "Line %d character %d: %s"
 msgstr "Nu am reuşit să creez fişierul `%s': %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Nu am înţeles `%s' (aşteptam un întreg)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Întregul `%s' este prea mare sau prea mic"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Nu am înţeles `%s' (aşteptam true sau false)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Nu am înţeles `%s' (aşteptam un număr real)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, fuzzy, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Nu există atributul de \"tip\" pentru nodul <%s>"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr ""
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr ""
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, fuzzy, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Nu am reuşit să creez fişierul `%s': %s"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, fuzzy, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Eroare la resetarea `%s': %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 9c9adada..9db51e6d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GConf\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-08-11 12:17+0400\n"
 "Last-Translator: Dmitry G. Mastrukov <dmitry@taurussoft.org>\n"
 "Language-Team: Russian <gnome-cyr@gnome.org>\n"
@@ -15,22 +15,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Невозможно найти каталог \"%s\"\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Произошла ошибка сохранения дерева GConf в \"%s\": %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "Использование: %s <каталог>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -49,33 +49,33 @@ msgstr ""
 "  в\n"
 "    каталог/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr "Выгружается серверный модуль разметки текста."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Не удалось найти корневой каталог XML по адресу \"%s\""
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Не удалось создать каталог \"%s\": %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr ""
 "Невозможно прочитать из или записать в корневой каталог XML по адресу \"%s\""
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "Права каталога/файла для источника XML с корнем \"%s\": %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -83,186 +83,186 @@ msgstr ""
 "Операция удаления каталога больше не поддерживается, просто удалите все "
 "значения в каталоге"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr ""
 "Не удалось открыть каталог блокировок для \"%s\" с целью удаления "
 "блокировок: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Не удалось удалить файл \"%s\": %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr "Инициализируется серверный модуль разметки"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Произошёл сбой при разблокировке XML-каталога \"%s\": %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Произошёл сбой при записи некоторых конфигурационных данных на диск\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Не удалось создать каталог \"%s\": %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Не удалось удалить \"%s\": %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Произошёл сбой при записи \"%s\": %s\n"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "Строка %d, символ %d: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "Атрибут \"%s\" повторяется дважды в том же самом элементе <%s>"
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "Атрибут \"%s\" не допустим в элементе <%s> в этом контексте"
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Значение \"%s\" не понято (ожидалось целое)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Целое \"%s\" слишком большое или маленькое"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Значение \"%s\" не понято (ожидалось логическое значение)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Значение \"%s\" не понято (ожидалось дробное число)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Аттрибут \"%s\" отсутствует в элементе <%s>"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr "Значение \"%s\" для атрибута \"%s\" элемента <%s> неизвестно"
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr "Тип \"%s\" для <%s> недопустим"
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr "Тип первого элемента \"%s\" для <%s> недопустим"
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr "Тип значения \"%s\" для <%s> недопустим"
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr "Тип списка \"%s\" для <%s> недопустим"
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr "Два элемента <default>  находятся в узле <local_schema>"
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr "Два элемента <longdesc>  находятся в узле <local_schema>"
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "Элементу <%s> не позволено находится в узле <%s>"
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "Элемент <%s> используется, но текущий элемент не имеет типа \"%s\""
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr "Два элемента <car> звдвны для одной пары"
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr "Два элемента <cdr> звдвны для одной пары"
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr "Элемент <li> имеет неверный тип \"%s\""
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr ""
 "Элемент <%s> используется, но родительский элемент <entry> не имеет значения"
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "Элементу <%s> не позволено находится внутри текущего элемента"
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr "Самый внешний элемент в файле меню должен быть <gconf>, а не <%s>"
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "Элементу <%s> не позволено находится элемента <%s>"
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "Тексту не позволено находится внутри элемента <%s>"
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Произошёл сбой при открытии файла \"%s\": %s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Произошла ошибка при записи в файл \"%s\": %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr ""
diff --git a/po/sk.po b/po/sk.po
index d8fa781e..a32bfb65 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-03-09 17:53+0100\n"
 "Last-Translator: Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>\n"
 "Language-Team: Slovak <sk-i18n@linux.sk>\n"
@@ -21,22 +21,22 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Nie je možné nájsť priečinok %s\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Chyba pri ukladaní stromu GConf do '%s': %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "Použitie: %s <dir>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -55,22 +55,22 @@ msgstr ""
 "  do:\n"
 "    dir/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 #, fuzzy
 msgid "Unloading text markup backend module."
 msgstr "Uvoľňujem modul pre XML."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Nie je možné nájsť koreňový priečinok XML na adrese `%s'"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Nie je možné vytvoriť priečinok '%s': %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
@@ -78,12 +78,12 @@ msgstr ""
 "Nie je možné prečítať alebo zapisovať do koreňového priečinku XML na adrese "
 "\"%s\""
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "Práva k priečinku/súboru pre zdroj XML v koreni %s sú: %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -91,186 +91,186 @@ msgstr ""
 "Operácia odstránenia priečinku už nie je podporovaná, jednoducho odstráňte "
 "hodnoty v priečinku"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr ""
 "Nie je možné otvoriť priečinok zámkov pre '%s' na odstránenie zámkov: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Nie je možné odstrániť súbor %s: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 #, fuzzy
 msgid "Initializing Markup backend module"
 msgstr "Inicializujem XML modul"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Zlyhalo uvoľnenie zámku na priečinku XML \"%s\": %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 #, fuzzy
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Nepodaril sa prístup ku konfiguračnému zdroju: %s\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Nie je možné vytvoriť priečinok \"%s\": %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, fuzzy, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Nie je možné odstrániť súbor %s: %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, fuzzy, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Nepodarilo sa odstrániť \"%s\": %s"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, fuzzy, c-format
 msgid "Line %d character %d: %s"
 msgstr "Nepodarilo sa vytvoriť %s: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Nerozpoznané `%s' (očakávané celé číslo)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Celé číslo `%s' je príliš veľké alebo príliš malé"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Nerozpoznané `%s' (očakávané true alebo false)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Nerozpoznané `%s' (očakávané reálne číslo)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, fuzzy, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "V uzle  <%s> chýba atribút \"type\""
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr ""
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr ""
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, fuzzy, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Nepodarilo sa otvoriť `%s': %s"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, fuzzy, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Chyba pri mazaní hodnoty pre \"%s\": %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, fuzzy, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "Nepodarilo sa presunúť nový súbor s uloženým stavom na miesto: %s"
diff --git a/po/sl.po b/po/sl.po
index b0c8e134..927d396a 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\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"
@@ -14,22 +14,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, fuzzy, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Nisem mogel ustvariti imenika '%s': %s"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, fuzzy, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Napaka ob izpisu seznama podimenikov '%s': %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr ""
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -41,33 +41,33 @@ msgid ""
 "    dir/%%gconf-tree.xml\n"
 msgstr ""
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 #, fuzzy
 msgid "Unloading text markup backend module."
 msgstr "Sproščam ozadni modul XML."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Nisem mogel najti korenskega imenika XML na naslovu `%s'"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Nisem mogel ustvariti imenika '%s': %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr "Ne morem brati iz ali pisati v korenski imenik XML na naslovu \"%s\""
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "Dovoljenja imenika/datoteke za vir XML na korenu %s so: %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 #, fuzzy
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
@@ -76,186 +76,186 @@ msgstr ""
 "Operacija odstranjevanja imenika ni več podprta. Preprosto odstranite vse "
 "vrednosti v imeniku"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr ""
 "Nisem mogel odpreti imenika ključavnic za %s za odstranitev ključavnic:: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Ne morem zbrisati datoteke %s: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 #, fuzzy
 msgid "Initializing Markup backend module"
 msgstr "Inicializiram ozadni XML modul"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, fuzzy, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Nisem uspel sprostiti ključavnice v imeniku XML \"%s\": %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 #, fuzzy
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Nisem uspel dostopati do vira(ov) nastavitev: %s\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Nisem mogel ustvariti imenika \"%s\": %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, fuzzy, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Ne morem zbrisati datoteke %s: %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, fuzzy, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Nisem uspel zbrisati \"%s\": %s"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, fuzzy, c-format
 msgid "Line %d character %d: %s"
 msgstr "Nisem uspel ustvariti %s: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Nisem razumel  `%s' (pričakoval celo število)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Celo število  `%s' je preveliko ali premajhno"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Nisem razumel `%s' (pričakoval resnično ali neresnično)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Nisem razumel `%s' (pričakoval realno število)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, fuzzy, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Za vozlišče <%s> ni atributa \"type\""
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr ""
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr ""
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, fuzzy, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Nisem uspel odpreti %s: %s"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, fuzzy, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Napaka ob odnastavljanju \"%s\": %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, fuzzy, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr ""
diff --git a/po/sq.po b/po/sq.po
index 87e79748..dcfee2f8 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-18 03:22+0200\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-08-07 15:55+0200\n"
 "Last-Translator: Laurent Dhima <laurenti@alblinux.net>\n"
 "Language-Team: Albanian <gnome-albanian-perkthyesit@lists.sourceforge.net>\n"
@@ -15,22 +15,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "E pamundur gjetja e directory %s\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Gabim gjatë ruajtjes së degëzimit GConf tek '%s': %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "Përdorimi: %s <dir>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -49,33 +49,33 @@ msgstr ""
 "  në:\n"
 "    dir/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr "Duke shkarkuar modulin backend text markup."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Nuk arrij të gjej directory rrënjë XML tek adresa `%s'"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "I pamundur krijimi i directory `%s': %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr ""
 "Nuk arrij të lexoj apo të shkruaj në directory rrënjë XML tek adresa \"%s\""
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "Të drejtat directory/file për burimin XML në root %s janë: %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -83,184 +83,184 @@ msgstr ""
 "Operacioni i eleminimit të directory nuk është më i suportuar, mjafton të "
 "eleminosh të gjitha vlerat në directory"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr ""
 "E pamundur hapja e directory të lock për %s që të heqë files e locks: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "I pamundur eleminimi i file %s: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr "Duke filluar modulin backend Markup"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Gabim gjatë krijimit të lock në dir XML \"%s\": %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Gabim gjatë shkrimit në disk të disa prej të dhënave të konfigurimit\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Nuk arrij të krijoj directory \"%s\": %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "E pamundur heqja e \"%s\": %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Gabim gjatë shkrimit të \"%s\": %s\n"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "Rreshti %d gërma %d: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "Atributi \"%s\" është përsëritur dy herë tek i njëjti element <%s>"
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "Atributi \"%s\" tek elementi <%s> është i pavlefshëm për këtë kontekst"
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Gabim në interpretimin e `%s' (pritej një numër i plotë)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Numri i plotë `%s' është o shumë i madh o shumë i vogël"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Gabim në interpretimin e `%s' (pritej e vërtetë ose fallso)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Gabim në interpretimin e `%s' (pritej një numër i real)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Asnjë atribut \"%s\" tek elementi <%s>"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr "Vlerë \"%s\" e panjohur për atributin \"%s\" tek elementi <%s>"
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr "Lloj i pavlefshëm \"%s\" tek <%s>"
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr "Lloj i pavlefshëm first-element \"%s\" tek <%s>"
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr "cdr_type \"%s\" i pavlefshëm tek <%s>"
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr "list_type \"%s\" e pavlefshme tek <%s>"
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr "Dy elementë <default> para një <local_schema>"
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr "Dy elementë <longdesc> para një <local_schema>"
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "Elementi <%s> nuk lejohet para <%s>"
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "<%s> është dhënë por elementi aktual nuk është i llojit %s"
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr "Janë dhënë dy elemente <car> për të njëjtin çift"
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr "Janë dhënë dy elemente <cdr> për të njëjtin çift"
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr "<li> është i tipit të gabuar %s"
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr "<%s> është dhënë por <entry> prind nuk ka asnjë vlerë"
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "Elementi <%s> nuk lejohet në brendësi të elementit aktual"
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr "Elementi i jashtëm tek file menu duhet të jetë <gconf> e jo <%s>"
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "Elementi <%s> nuk lejohet brenda një elementi <%s>"
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "Nuk lejohet teksti në brendësi të elementit <%s>"
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Gabim gjatë hapjes së \"%s\": %s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Gabim gjatë shkrimit të file \"%s\": %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 5ecde244..8c740858 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-08-07 11:17+0200\n"
 "Last-Translator: Данило Шеган <danilo@prevod.org>\n"
 "Language-Team: Serbian (sr) <gnom@prevod.org>\n"
@@ -17,22 +17,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Не могу да нађем директоријум %s\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Грешка при чувању ГКонф стабла у „%s“: %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "Употреба: %s <дир>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -51,218 +51,218 @@ msgstr ""
 "  у:\n"
 "    дир/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr "Гаси део нижег нивоа за рад са означеним текстом."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Не може да пронађе XML корену категорију на адреси „%s“"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Не може да направи категорију „%s“: %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr "Не може да чита из или да пише у XML корену категорију на адреси „%s“"
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "Овлашћења за директоријум/датотеку извора XML-а у корену %s су: %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
 msgstr ""
 "Уклањање категорија више није подржано, само уклоните све вредности из ње"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr ""
 "Не може да отвори категорију за закључавање за „%s“ како би уклонио "
 "закључавања: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Не може да уклони датотеку „%s“: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr "Учитава део нижег нивоа за рад са означеним текстом"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Не могу да одбацим катанац за XML категорију „%s“: %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Нисам успео да упишем податке подешавања на диск\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Не могу да направим категорију „%s“: %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Не могу да уклоним „%s“: %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Нисам успео да обришем „%s“: %s\n"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "%d. ред, %d. знак: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "Атрибут „%s“ је наведен два пута на истом елементу <%s>"
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "Атрибут „%s“ је неисправан на елементу <%s> у овом случају"
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Није разумео „%s“ (очекивао је цео број)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Цео број „%s“ је или превелики или премали"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Није разумео „%s“ (очекивао је „јесте“ или „није“)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Није разумео „%s“ (очекивао је децимални број)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Није дефинисан „%s“ атрибут члана <%s>"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr "Непозната вредност „%s“ за атрибут „%s“ елемента <%s>"
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr "Неисправан ltype „%s“ за <%s>"
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr "Неисправан тип првог елемента „%s“ за <%s>"
 
 # bug: more lisp terminology?
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr "Неисправан cdr_type „%s“ за <%s>"
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr "Неисправна list_type „%s“ за <%s>"
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr "Два елемента <default> у оквиру <local_schema>"
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr "Два елемента <longdesc> у оквиру <local_schema>"
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "Елемент <%s> није дозвољен у оквиру <%s>"
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "<%s> је обезбеђен али текући елемент није врсте %s"
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr "Дата су два елемента <car> за исти пар"
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr "Дата су два елемента <cdr> за исти пар"
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr "<li> је погрешне врсте %s"
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr "<%s> је обезбеђен али садржалац <entry> нема вредност"
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "Елемент <%s> није дозвољен у оквиру текућег елемента"
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr "Спољни елемент у датотеци менија мора бити <gconf> а не <%s>"
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "Елемент <%s> није дозовољен у оквиру елемента <%s>"
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "Текст није допуштен у оквиру елемента <%s>"
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Нисам успео да отворим „%s“: %s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Грешка при упису датотеке „%s“: %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr ""
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 9cce19c0..658d295f 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-08-07 11:17+0200\n"
 "Last-Translator: Danilo Šegan <danilo@prevod.org>\n"
 "Language-Team: Serbian (sr) <gnom@prevod.org>\n"
@@ -17,22 +17,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Ne mogu da nađem direktorijum %s\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Greška pri čuvanju GKonf stabla u „%s“: %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "Upotreba: %s <dir>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -51,218 +51,218 @@ msgstr ""
 "  u:\n"
 "    dir/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr "Gasi deo nižeg nivoa za rad sa označenim tekstom."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Ne može da pronađe XML korenu kategoriju na adresi „%s“"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Ne može da napravi kategoriju „%s“: %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr "Ne može da čita iz ili da piše u XML korenu kategoriju na adresi „%s“"
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "Ovlašćenja za direktorijum/datoteku izvora XML-a u korenu %s su: %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
 msgstr ""
 "Uklanjanje kategorija više nije podržano, samo uklonite sve vrednosti iz nje"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr ""
 "Ne može da otvori kategoriju za zaključavanje za „%s“ kako bi uklonio "
 "zaključavanja: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Ne može da ukloni datoteku „%s“: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr "Učitava deo nižeg nivoa za rad sa označenim tekstom"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Ne mogu da odbacim katanac za XML kategoriju „%s“: %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Nisam uspeo da upišem podatke podešavanja na disk\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Ne mogu da napravim kategoriju „%s“: %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Ne mogu da uklonim „%s“: %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Nisam uspeo da obrišem „%s“: %s\n"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "%d. red, %d. znak: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "Atribut „%s“ je naveden dva puta na istom elementu <%s>"
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "Atribut „%s“ je neispravan na elementu <%s> u ovom slučaju"
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Nije razumeo „%s“ (očekivao je ceo broj)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Ceo broj „%s“ je ili preveliki ili premali"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Nije razumeo „%s“ (očekivao je „jeste“ ili „nije“)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Nije razumeo „%s“ (očekivao je decimalni broj)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Nije definisan „%s“ atribut člana <%s>"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr "Nepoznata vrednost „%s“ za atribut „%s“ elementa <%s>"
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr "Neispravan ltype „%s“ za <%s>"
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr "Neispravan tip prvog elementa „%s“ za <%s>"
 
 # bug: more lisp terminology?
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr "Neispravan cdr_type „%s“ za <%s>"
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr "Neispravna list_type „%s“ za <%s>"
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr "Dva elementa <default> u okviru <local_schema>"
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr "Dva elementa <longdesc> u okviru <local_schema>"
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "Element <%s> nije dozvoljen u okviru <%s>"
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "<%s> je obezbeđen ali tekući element nije vrste %s"
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr "Data su dva elementa <car> za isti par"
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr "Data su dva elementa <cdr> za isti par"
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr "<li> je pogrešne vrste %s"
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr "<%s> je obezbeđen ali sadržalac <entry> nema vrednost"
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "Element <%s> nije dozvoljen u okviru tekućeg elementa"
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr "Spoljni element u datoteci menija mora biti <gconf> a ne <%s>"
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "Element <%s> nije dozovoljen u okviru elementa <%s>"
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "Tekst nije dopušten u okviru elementa <%s>"
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Nisam uspeo da otvorim „%s“: %s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Greška pri upisu datoteke „%s“: %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 1a0876f0..f874e26d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-08-10 19:33+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -18,22 +18,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Kan inte hitta katalogen %s\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Fel vid sparande av GConf-träd till \"%s\": %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "Användning: %s <kat>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -52,32 +52,32 @@ msgstr ""
 "  till:\n"
 "    kat/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr "Kopplar bort bakändesmodulen för textmarkup."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Kunde inte hitta XML-rotkatalogen i adressen \"%s\""
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Kunde inte skapa katalogen \"%s\": %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr "Kan inte läsa eller skriva till XML-rotkatalogen i adressen \"%s\""
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "Katalog- och filrättigheterna för XML-koden vid roten %s är: %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -85,185 +85,185 @@ msgstr ""
 "Katalogborttagningsåtgärden stöds inte längre, ta bara bort alla värden i "
 "katalogen"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr "Kunde inte öppna låskatalogen för %s för att ta bort lås: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Kunde inte ta bort filen %s: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr "Initierar markupbakändesmodulen"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Misslyckades med att ge upp lås på XML-katalogen \"%s\": %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Misslyckades med att skriva en del konfigurationsdata till disk\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Kunde inte skapa katalogen \"%s\": %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Kunde inte ta bort filen \"%s\": %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Misslyckades med att skriva \"%s\": %s\n"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "Rad %d tecken %d: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "Attributet \"%s\" upprepat två gånger på samma <%s>-element"
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "Attributet \"%s\" är ogiltigt på <%s>-element i detta sammanhang"
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Förstod inte \"%s\" (ett heltal förväntades)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Heltalet \"%s\" är för stort eller för litet"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Förstod inte \"%s\" (true eller false förväntades)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Förstod inte \"%s\" (ett reellt tal förväntades)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Inget \"%s\"-attribut för elementet <%s>"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr "Okänt värde \"%s\" för \"%s\"-attributet på <%s>-elementet"
 
 # Osäker. Vad är ltype?
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr "Ogiltig ltype \"%s\" på <%s>"
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr "Ogiltig first-element-typ \"%s\" på <%s>"
 
 # Osäker. Vad är cdr?
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr "Ogiltig cdr_type \"%s\" på <%s>"
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr "Ogiltig list_type \"%s\" på <%s>"
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr "Två <default>-element under ett <local_schema>"
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr "Två <longdesc>-element under ett <local_schema>"
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "Elementet <%s> är inte tillåtet under <%s>"
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "<%s> tillhandahölls men aktuella elementet har inte typen %s"
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr "Två <car>-element angivna för samma par"
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr "Två <cdr>-element angivna för samma par"
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr "<li> har felaktig typ %s"
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr "<%s> tillhandahållet men förälder-<entry> har inget värde"
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "Elementet <%s> är inte tillåtet inuti det aktuella elementet"
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr "Det yttersta elementet i en menyfil måsta vara <gconf>, inte <%s>"
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "Elementet <%s> är inte tillåtet inuti ett <%s>-element"
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "Ingen text är tillåten inuti elementet <%s>"
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Misslyckades med att öppna \"%s\": %s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Fel vid skrivning av filen \"%s\": %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr ""
diff --git a/po/ta.po b/po/ta.po
index bab06976..18b5d892 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-08-16 12:47+0530\n"
 "Last-Translator: Jayaradha N <jaya@pune.redhat.com>\n"
 "Language-Team: Tamil <zhakanini@yahoogroups.com>\n"
@@ -18,22 +18,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "அடைவு %s காணவில்லை\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "சேமிப்பதில் பிழை Gஉள்ளமை மரம் '%s': %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "பயன்படுத்துதல்: %s <அடைவு>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -52,214 +52,214 @@ msgstr ""
 "  விற்கு:\n"
 "    அடைவு/%%gcஉள்ளமை-மரம்.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr "பின்நிலை பகுதி உரை குறியிட்ட ஏற்றபடாத உரை."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "`%s' விலாசத்தில் XML மூல அடைவை கண்டுபிடிக்க இயலவில்லை"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "`%s' அடைவு உருவாக்க முடியவில்லை: %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr "\"%s\" விலாசத்தில் இருந்து XML மூல அடைவை படிக்க அல்லது ஏழுத இயலவில்லை"
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "%s வந்து: %o/%o  முலத்தின் XML மூலத்துக்கான அடைவு/கோப்பு  அனுமதி "
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
 msgstr "அடைவு சேயல்களை நீக்கு அது அதறிக்க படாது.அடைவில் அனைத்து மதிப்பையும் நீக்கு"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr "பூட்டை திறக்க %s க்கான பூட்டு அடைவை திறக்க இயலவில்லை: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "%s கோப்பு கழட்ட முடியவில்லை: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr "பின்நிலை பகுதி குறிப்பை நிறுவிகிறது"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "XML அடைவில் பூட்டை கோடுக்கையில் தொல்வி \"%s\": %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 msgid "Failed to write some configuration data to disk\n"
 msgstr "வட்டுவிற்குத் தவறிலிருந்து எழுதும் சில உள்ளமைத் தரவு\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "\"%s\" அடைவு படைக்க முடியவில்லை: %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "\"%s\" கோப்பு கழட்ட முடியவில்லை: %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "\"%s\" அழிக்க முடியவில்லை: %s\n"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "கோடு %d எழுத்து %d: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "குணங்களை \"%s\" இதிலே இரண்டு தடவை சேய் <%s> உருப்பு"
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "குணங்கள் \"%s\" செல்லாதது <%s> சூழலிலின் உருப்புகள்"
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "ஆறியபடவில்லை `%s' (ஏதிர்பார்த்த எண்)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "எண் `%s' அது மிக சிறியது அல்லது பெறியது"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "அறியபடவில்லை `%s' (சரி அல்லது தவறு எதிர்பார்க்கிறது)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "அறியபடாத `%s' (எதிர்பார்த்த உன்மை எண்)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "இல்லை \"%s\" உருப்பின் குணன்ங்கள் <%s>"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr "\"%s\" க்கான \"%s\" தேரியாத மதிப்பு உருப்புன் குணம் <%s>"
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr "\"%s\" இன் <%s> சேல்லாத வகை"
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, fuzzy, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr "\"%s\" இன் <%s> சேல்லாத பட்டியல்_வகை"
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr "\"%s\" இன் <%s> சேல்லாத cdr_வகை"
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr "\"%s\" இன் <%s> சேல்லாத பட்டியல்_வகை"
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr "இரு <முன்னிருப்பு> உருப்பு கீழ் <உள்_சிகிமா>"
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr "இரு <பேறிய்அட்டை> உருப்பு கீழ் <உள்_சிகிமா>"
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "உருப்பு <%s> கீழ் அனுமதிக்க படாது <%s>"
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "<%s> தரபட்டுள்ளது ஆணால் தற்பொதைய உருப்பு %sவகை கோண்டு இல்லை "
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr "அதே ஜோடிக்கு இரு <கார்> உருப்பு கொடுக்கபட்டுள்ளது"
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr "அதே ஜோடிக்கு இரு <cdr> உருப்பு கொடுக்கபட்டுள்ளது"
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr "<li> தவறான் வகை %s"
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr "<%s> தரபட்டுள்ளது ஆணால் பேற்றோர் <உள்ளிடு> மதிப்பை கோண்டு இல்லை"
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "உருப்பு <%s> தற்பொதைய உருப்புக்குள் அனுமதி இல்லை "
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr "பட்டியின் வேளி உருப்பு கோப்பு கண்டிப்பாக <gconf> இப்படி இருக்கும் <%s>"
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "உருப்பு <%s> இந்த உருப்புக்குள் அனுமதி <%s> கிடையாது"
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "இந்த உருப்புகுள் எந்த உரை அனுமதி கிடையாது <%s>"
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "\"%s\"  திறக்க முடியவில்லை: %s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "\"%s\"  மதிப்பு அழிக்கும்போது பிழை: %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "தற்காலிக கோப்பை நகற்றுவதில் தொல்வி \"%s\" கடைசி இடம் \"%s\": %s"
diff --git a/po/tr.po b/po/tr.po
index 8621482a..0391df96 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-03-22 15:16+0200\n"
 "Last-Translator: Gurkan Aslan <gurkan@iaslan.com>\n"
 "Language-Team: Türkçe <tr@li.org>\n"
@@ -20,22 +20,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "%s dizini bulunamıyor\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "GConf ağacını kaydederken hata '%s': %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "Kullanım: %s <dir>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -54,33 +54,33 @@ msgstr ""
 "  şuraya:\n"
 "    dizin/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 #, fuzzy
 msgid "Unloading text markup backend module."
 msgstr "XML arkayüz modülü kaldırılıyor."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "XML kök dizini bulunamadı `%s' adresinde bulunamadı."
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Dizin oluşturulamadı `%s': %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr "\"%s\" adresindeki XML kök dizinine okuma veya yazma yapılamıyor"
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, 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/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -88,185 +88,185 @@ msgstr ""
 "Dizin kaldırma işlemi artık desteklenmiyor, sadece dizin içerisindeki tüm "
 "değerleri kaldırın."
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr "%s 'in kilitlerini kaldırmak için kilitli dizin açılamıyor: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Dosya kaldırılamadı %s: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 #, fuzzy
 msgid "Initializing Markup backend module"
 msgstr "XML arkayüz modülü başlatılıyor"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "XML dizininden kilit kaldırılması başarısız: \"%s\": %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 #, fuzzy
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Yapılandırma kaynağına/kaynaklarına erişilemedi: %s\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "\"%s\" dizini oluşturulamadı: %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, fuzzy, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Dosya kaldırılamadı %s: %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, fuzzy, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "\"%s\" silinemedi: %s"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, fuzzy, c-format
 msgid "Line %d character %d: %s"
 msgstr "%s oluşturulamadı: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "`%s' anlaşılamadı (tamsayı bekleniyor)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Tamsayı `%s' çok büyük ya da çok küçük"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "`%s' anlaşılamadı (Doğru ya da Yalnış bekleniyor)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "`%s' anlaşılamadı (gerçek sayı bekleniyor)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, fuzzy, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "<%s> düğümü için \"type\" özniteliği belirtilmemiş"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr ""
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr ""
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, fuzzy, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "%s açılamadı: %s"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, fuzzy, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "\"%s\" Kaldırılırken hata: %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, fuzzy, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "Yeni durum kayıt dosyası yerine taşınamadı: %s"
diff --git a/po/uk.po b/po/uk.po
index 036f469d..4607c839 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-08-03 12:50+0200\n"
 "Last-Translator: Maxim Dziumanenko <mvd@mylinux.com.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -18,22 +18,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Не вдається знайти каталог %s\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Помилка збереження схеми на \"%s\": %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "Використання: %s <каталог>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -52,21 +52,21 @@ msgstr ""
 "  у:\n"
 "    каталог/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr "Вивантаження серверного модуля розмітки."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Не вдається знайти кореневий каталог XML за адресою \"%s\""
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Не вдається створити каталог \"%s\": %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
@@ -74,12 +74,12 @@ msgstr ""
 "Неможливо виконати зчитування чи запис у кореневому каталозі XML за адресою "
 "\"%s\""
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "Права каталогу чи файлу для джерела XML з коренем %s: %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -87,184 +87,184 @@ msgstr ""
 "Операція видалення каталогу більше не підтримується, просто видаліть всі "
 "значення в каталозі"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr ""
 "Неможливо відкрити каталог блокувань для %s, щоб видалити блокування: %s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Неможливо видалити файл %s: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr "Ініціалізація серверного модуля розмітки"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Не вдається зняти блокування з каталогу XML \"%s\": %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Помилка запису конфігураційних даних на диск\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Не вдається створити каталог \"%s\": %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Не вдається видалити \"%s\": %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Не вдається записати \"%s\": %s\n"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "Рядок %d, символ %d: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "Ознака \"%s\" повторюється двічі в одному елементі <%s>"
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "Ознака \"%s\" є неправильною для елемента <%s> у цьому контексті"
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Незрозуміло \"%s\" (очікувалось ціле число)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Ціле число \"%s\" надто велике чи мале"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Незрозуміло \"%s\" (очікувалось логічне значення)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Незрозуміло \"%s\" (очікувалось дійсне число)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Немає ознаки \"%s\" у елементі <%s>"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr "Невідоме значення \"%s\" ознаки \"%s\" елемента <%s>"
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr "Неправильний тип \"%s\" у <%s>"
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, fuzzy, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr "Неправильне значення list_type \"%s\" у <%s>"
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr "Неправильне значення cdr_type \"%s\" у <%s>"
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr "Неправильне значення list_type \"%s\" у <%s>"
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr "Два елементи <default> під <local_schema>"
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr "Два елементи <longdesc> під <local_schema>"
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "Не дозволяється <%s> після <%s>"
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "Вказано <%s>, але тип поточного елементу не %s"
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr "Два елементи <car> у одній парі"
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr "Два елементи <cdr> у одній парі"
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr "<li> має неправильний тип %s"
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr "Вказано <%s>, але батьківський елемент не має значення"
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "Не дозволяється елемент <%s> у поточному"
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr "Зовнішнім елементом у файлі меню має бути <gconf>, а не <%s>"
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "Елемент <%s> не може бути в елементі <%s>"
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "Не може бути тексту в елементі <%s>"
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Не вдається відкрити \"%s\": %s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Помилка запису файлу \"%s\": %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 95dd3fdb..3fcfdb5e 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2002-09-20 19:45+0700\n"
 "Last-Translator: Trinh Minh Thanh <tmthanh@linuxmail.org>\n"
 "Language-Team: Gnome-Vi Team <Gnomevi-list@lists.sourceforge.net>\n"
@@ -16,22 +16,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "com>\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, fuzzy, c-format
 msgid "Cannot find directory %s\n"
 msgstr "Không thể tạo thư mục `%s': %s"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, fuzzy, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "Lỗi khi lấy giản đồ tại '%s': %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr ""
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -43,33 +43,33 @@ msgid ""
 "    dir/%%gconf-tree.xml\n"
 msgstr ""
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 #, fuzzy
 msgid "Unloading text markup backend module."
 msgstr "Không nạp mô-đun XML chạy ở nền."
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "Không thể tìm được thư mục XML của root trong địa chỉ `%s'"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "Không thể tạo thư mục `%s': %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr "Không thể đọc/ghi ở thư mục XML của root trong địa chỉ \"%s\""
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "Quyền sử dụng Thư mục/Tập tin cho nguồn XML tại %s của root là:%o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 #, fuzzy
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
@@ -77,185 +77,185 @@ msgid ""
 msgstr ""
 "Không còn hỗ trợ tính năng gỡ bỏ thư mục, hãy gỡ bỏ mọi giá trị trong thư mục"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, fuzzy, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr "Không thể tạo thư mục `%s': %s"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, fuzzy, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "Không thể gỡ bỏ tập tin %s: %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 #, fuzzy
 msgid "Initializing Markup backend module"
 msgstr "Sơ khởi mô-đun XML chạy ở nền"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, fuzzy, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Không bỏ được khóa trên thư mục XML \"%s\": %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 #, fuzzy
 msgid "Failed to write some configuration data to disk\n"
 msgstr "Không truy cập được nguồn cấu hình: %s\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Không thể tạo thư mục \"%s\": %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, fuzzy, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "Không thể gỡ bỏ tập tin %s: %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, fuzzy, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "Không xóa được \"%s\": %s"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, fuzzy, c-format
 msgid "Line %d character %d: %s"
 msgstr "không tạo được %s: %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "Không hiểu `%s' (số nguyên mong muốn)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "Số nguyên `%s' quá lớn hoặc quá nhỏ"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "Không hiểu `%s' (giá trị logic mong muốn)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "Không hiểu `%s' (số thực mong muốn)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, fuzzy, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Không có thuộc tính về \"loại\" cho nút <%s>"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr ""
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr ""
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, fuzzy, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Không mở được `%s': %s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, fuzzy, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Lỗi không đặt \"%s\": %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, fuzzy, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "Không chuyển được tập tin trạng thái mới đã lưu vào vị trí: %s"
diff --git a/po/yi.po b/po/yi.po
index d173e539..922248e0 100644
--- a/po/yi.po
+++ b/po/yi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2003-03-19\n"
 "Last-Translator: Raphael Finkel <raphael@cs.uky.edu>\n"
 "Language-Team: Yiddish <raphael@cs.uky.edu>\n"
@@ -14,22 +14,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr ""
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr ""
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr ""
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -41,214 +41,214 @@ msgid ""
 "    dir/%%gconf-tree.xml\n"
 msgstr ""
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr ""
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr ""
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr ""
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr ""
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
 msgstr ""
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr ""
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr ""
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr ""
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr ""
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 msgid "Failed to write some configuration data to disk\n"
 msgstr ""
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr ""
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr ""
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr ""
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr ""
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr ""
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr ""
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr ""
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr ""
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr ""
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr ""
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr ""
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr ""
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index cf1799c7..662f4165 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf 2.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2004-08-09 22:57+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -17,22 +17,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, c-format
 msgid "Cannot find directory %s\n"
 msgstr "无法找到目录 %s\n"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "将 GConf 树保存到“%s”时发生错误：%s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr "用法：%s <dir>\n"
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -51,214 +51,214 @@ msgstr ""
 "  成为：\n"
 "    dir/%%gconf-tree.xml\n"
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 msgid "Unloading text markup backend module."
 msgstr "正在卸载文本标记后端模块。"
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "无法在地址“%s”处找到 XML 根目录"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "无法创建目录“%s”：%s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr "无法读取或写入地址“%s”中的 XML 根目录"
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "位于根 %s 的 XML 源文件的目录/文件权限是：%o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
 msgstr "删除目录操作不再支持，仅删除目录中所有的值"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr "无法打开锁定目录以让 %s 删除锁定：%s\n"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "无法删除文件 %s：%s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 msgid "Initializing Markup backend module"
 msgstr "初始化标记语言后端模块"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "无法放弃 XML 目录“%s”上的锁定：%s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 msgid "Failed to write some configuration data to disk\n"
 msgstr "将某些配置数据写入磁盘失败\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "无法创建目录“%s”：%s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "无法删除文件“%s”：%s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "写入“%s”失败：%s\n"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "第%d行第%d个字符：%s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "属性“%s”在同一个 <%s> 元素上重复两次"
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "在此上下文中，<%2$s> 元素的属性“%1$s”无效"
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "不理解“%s”(需要整数)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "整数“%s”过大或过小"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "不理解“%s”(需要 true 或 false)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "不理解“%s”(需要实数)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "<%2$s> 元素没有“%1$s”属性"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr "元素 <%3$s> 上的“%2$s”属性设置了未知值“%1$s”"
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr "<%2$s> 类型“%1$s”未知"
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr "<%2$s> 上第一元素的类型“%1$s”无效"
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr "<%2$s> 上 cdr_type“%1$s”无效"
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr "<%2$s> 上 list_type“%1$s”无效"
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr "一个 <local_schema> 下有两个 <default> 元素"
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr "一个 <local_schema> 下有两个 <longdesc> 元素"
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "不允许在 <%2$s> 下出现元素 <%1$s>"
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "提供了 <%s> 但当前元素不拥有类型 %s"
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr "同一对给出了两个 <car> 元素"
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr "同一对给出了两个 <cdr> 元素"
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr "<li> 的类型 %s 错误"
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr "提供了 <%s> 但父 <entry> 没有值"
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "不允许在当前元素中出现元素 <%s>"
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr "菜单文件中的最里层元素应该是 <gconf> 而非 <%s>"
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "不允许在 <%2$s> 元素内出现元素 <%1$s>"
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "不允许在元素 <%s> 内出现文字"
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "打开“%s”失败：%s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "写入文件“%s”出错：%s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "将临时文件“%s”移至最终位置“%s”失败：%s"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index e29f69a3..66527944 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GConf 1.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-16 15:30+0100\n"
+"POT-Creation-Date: 2004-08-19 12:22+0100\n"
 "PO-Revision-Date: 2002-06-11 15:49+1000\n"
 "Last-Translator: Ben Wu <hpwu@redhat.com>\n"
 "Language-Team: traditional Chinese <zh-l10n@linux.org.tw>\n"
@@ -14,22 +14,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: backends/gconf-merge-tree.c:59
+#: backends/gconf-merge-tree.c:79
 #, fuzzy, c-format
 msgid "Cannot find directory %s\n"
 msgstr "無法建立目錄 `%s'： %s"
 
-#: backends/gconf-merge-tree.c:75
+#: backends/gconf-merge-tree.c:95
 #, fuzzy, c-format
 msgid "Error saving GConf tree to '%s': %s\n"
 msgstr "在 '%s' 取得概要發生錯誤： %s\n"
 
-#: backends/gconf-merge-tree.c:101
+#: backends/gconf-merge-tree.c:121
 #, c-format
 msgid "Usage: %s <dir>\n"
 msgstr ""
 
-#: backends/gconf-merge-tree.c:107
+#: backends/gconf-merge-tree.c:127
 #, c-format
 msgid ""
 "Usage: %s <dir>\n"
@@ -41,218 +41,218 @@ msgid ""
 "    dir/%%gconf-tree.xml\n"
 msgstr ""
 
-#: backends/markup-backend.c:165
+#: backends/markup-backend.c:163
 #, fuzzy
 msgid "Unloading text markup backend module."
 msgstr "卸載 XML 後端模組。"
 
-#: backends/markup-backend.c:228 backends/xml-backend.c:289
+#: backends/markup-backend.c:226 backends/xml-backend.c:289
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
 msgstr "無法找到在 `%s' 位址的 XML 根目錄"
 
-#: backends/markup-backend.c:285 backends/xml-backend.c:344
+#: backends/markup-backend.c:282 backends/xml-backend.c:344
 #, c-format
 msgid "Could not make directory `%s': %s"
 msgstr "無法建立目錄 `%s'： %s"
 
-#: backends/markup-backend.c:390 backends/xml-backend.c:443
+#: backends/markup-backend.c:382 backends/xml-backend.c:443
 #, fuzzy, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr "無法讀取或寫入到 `%s' 位址的 XML 根目錄"
 
-#: backends/markup-backend.c:404 backends/xml-backend.c:453
+#: backends/markup-backend.c:393 backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "在 %s 的 XML 原始檔之 目錄/檔案 權限設定為： %o/%o"
 
-#: backends/markup-backend.c:743 backends/xml-backend.c:684
+#: backends/markup-backend.c:732 backends/xml-backend.c:684
 #, fuzzy
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
 msgstr "已不再支援移除目錄的操作，只能移除目錄中的所有數值"
 
-#: backends/markup-backend.c:829 backends/xml-backend.c:770
+#: backends/markup-backend.c:818 backends/xml-backend.c:770
 #, fuzzy, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr "無法建立目錄 `%s'： %s"
 
-#: backends/markup-backend.c:847 backends/xml-backend.c:788
+#: backends/markup-backend.c:836 backends/xml-backend.c:788
 #, fuzzy, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "無法移除檔案 %s： %s\n"
 
-#: backends/markup-backend.c:868
+#: backends/markup-backend.c:857
 #, fuzzy
 msgid "Initializing Markup backend module"
 msgstr "初始化 XML 後端模組"
 
-#: backends/markup-backend.c:945 backends/xml-backend.c:877
+#: backends/markup-backend.c:931 backends/xml-backend.c:877
 #, fuzzy, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "無法放棄在 XML 目錄 `%s' 的鎖定： %s"
 
-#: backends/markup-tree.c:384
+#: backends/markup-tree.c:363
 #, fuzzy
 msgid "Failed to write some configuration data to disk\n"
 msgstr "存取設定原始檔失敗： %s\n"
 
-#: backends/markup-tree.c:821 backends/xml-dir.c:1255
+#: backends/markup-tree.c:800 backends/xml-dir.c:1255
 #, fuzzy, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "無法建立目錄 `%s'： %s"
 
-#: backends/markup-tree.c:859 backends/markup-tree.c:866
+#: backends/markup-tree.c:838 backends/markup-tree.c:845
 #, fuzzy, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "無法移除檔案 %s： %s\n"
 
-#: backends/markup-tree.c:1122
+#: backends/markup-tree.c:1020
 #, fuzzy, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "無法刪除 \"%s\"： %s"
 
-#: backends/markup-tree.c:1807
+#: backends/markup-tree.c:1705
 #, fuzzy, c-format
 msgid "Line %d character %d: %s"
 msgstr "建立 `%s' 失敗： %s"
 
-#: backends/markup-tree.c:2020
+#: backends/markup-tree.c:1918
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:2037 backends/markup-tree.c:2061
+#: backends/markup-tree.c:1935 backends/markup-tree.c:1959
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: backends/markup-tree.c:2086 gconf/gconf-value.c:110
+#: backends/markup-tree.c:1984 gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "無法了解 `%s' (預期是整數)"
 
-#: backends/markup-tree.c:2093 gconf/gconf-value.c:120
+#: backends/markup-tree.c:1991 gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "整數 `%s' 太大或太小"
 
-#: backends/markup-tree.c:2125 gconf/gconf-value.c:185
+#: backends/markup-tree.c:2023 gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "無法了解 `%s' (預期是真或假)"
 
-#: backends/markup-tree.c:2149 gconf/gconf-value.c:141
+#: backends/markup-tree.c:2047 gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "無法了解 `%s' (預期是實數)"
 
-#: backends/markup-tree.c:2219 backends/markup-tree.c:2248
-#: backends/markup-tree.c:2288 backends/markup-tree.c:2312
-#: backends/markup-tree.c:2320 backends/markup-tree.c:2375
-#: backends/markup-tree.c:2440 backends/markup-tree.c:2548
-#: backends/markup-tree.c:2627 backends/markup-tree.c:2739
+#: backends/markup-tree.c:2117 backends/markup-tree.c:2146
+#: backends/markup-tree.c:2186 backends/markup-tree.c:2210
+#: backends/markup-tree.c:2218 backends/markup-tree.c:2273
+#: backends/markup-tree.c:2338 backends/markup-tree.c:2446
+#: backends/markup-tree.c:2525 backends/markup-tree.c:2637
 #, fuzzy, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "<%s> 節點沒有 \"類型\" 的屬性"
 
-#: backends/markup-tree.c:2228
+#: backends/markup-tree.c:2126
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2262
+#: backends/markup-tree.c:2160
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2342
+#: backends/markup-tree.c:2240
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2356
+#: backends/markup-tree.c:2254
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2392
+#: backends/markup-tree.c:2290
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2673
+#: backends/markup-tree.c:2571
 msgid "Two <default> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2688
+#: backends/markup-tree.c:2586
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr ""
 
-#: backends/markup-tree.c:2695
+#: backends/markup-tree.c:2593
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:2719 backends/markup-tree.c:2811
-#: backends/markup-tree.c:2865 backends/markup-tree.c:2913
+#: backends/markup-tree.c:2617 backends/markup-tree.c:2709
+#: backends/markup-tree.c:2763 backends/markup-tree.c:2811
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2789
+#: backends/markup-tree.c:2687
 msgid "Two <car> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2803
+#: backends/markup-tree.c:2701
 msgid "Two <cdr> elements given for same pair"
 msgstr ""
 
-#: backends/markup-tree.c:2857
+#: backends/markup-tree.c:2755
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr ""
 
-#: backends/markup-tree.c:2886
+#: backends/markup-tree.c:2784
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr ""
 
-#: backends/markup-tree.c:2926 backends/markup-tree.c:2948
-#: backends/markup-tree.c:2970 backends/markup-tree.c:2987
+#: backends/markup-tree.c:2824 backends/markup-tree.c:2846
+#: backends/markup-tree.c:2868 backends/markup-tree.c:2885
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr ""
 
-#: backends/markup-tree.c:3019
+#: backends/markup-tree.c:2917
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3039 backends/markup-tree.c:3061
-#: backends/markup-tree.c:3066
+#: backends/markup-tree.c:2937 backends/markup-tree.c:2959
+#: backends/markup-tree.c:2964
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: backends/markup-tree.c:3146
+#: backends/markup-tree.c:3044
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
-#: backends/markup-tree.c:3824 backends/markup-tree.c:3838
+#: backends/markup-tree.c:3722 backends/markup-tree.c:3736
 #, fuzzy, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "無法開啟 `%s'： %s\n"
 
-#: backends/markup-tree.c:3912
+#: backends/markup-tree.c:3810
 #, fuzzy, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "解除設定 \"%s\" 發生錯誤： %s"
 
-#: backends/markup-tree.c:3919
+#: backends/markup-tree.c:3817
 #, fuzzy, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "無法移動新儲存的狀態檔到指定地方： %s"
author	Mark McLoughlin <mark@skynet.ie>	2004-08-19 11:43:42 +0000
committer	Mark McLoughlin <markmc@src.gnome.org>	2004-08-19 11:43:42 +0000
commit	d2c597a0e3b35f915a7c8b42c0e77a871fc69899 (patch)
tree	0df89584462ac0323394d9e543da68620fac7d84
parent	2dc7f99881c9b04725374f38b1edcd13fb2ca33d (diff)
download	gconf-d2c597a0e3b35f915a7c8b42c0e77a871fc69899.tar.gz