summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark McLoughlin <mark@skynet.ie>2004-02-24 16:24:48 +0000
committerMark McLoughlin <markmc@src.gnome.org>2004-02-24 16:24:48 +0000
commit2f88dbdada86410e83ca5fdb616cf8ae876fc0eb (patch)
treebf4e992600dc33d9607bd09f8c8a2f191bd0fa2c
parent6cb79de84a27f3237eb3a2e14b41b6ed2ef57c1d (diff)
downloadgconf-2f88dbdada86410e83ca5fdb616cf8ae876fc0eb.tar.gz
Version 2.5.90.GCONF_2_5_90
2004-02-24 Mark McLoughlin <mark@skynet.ie> * configure.in: Version 2.5.90.
-rw-r--r--ChangeLog4
-rw-r--r--configure.in2
-rw-r--r--po/am.po31
-rw-r--r--po/ar.po6
-rw-r--r--po/az.po121
-rw-r--r--po/be.po33
-rw-r--r--po/bg.po31
-rw-r--r--po/bn.po18
-rw-r--r--po/ca.po36
-rw-r--r--po/cs.po27
-rw-r--r--po/cy.po31
-rw-r--r--po/da.po4
-rw-r--r--po/de.po5
-rw-r--r--po/el.po125
-rw-r--r--po/es.po4
-rw-r--r--po/eu.po31
-rw-r--r--po/fa.po4
-rw-r--r--po/fi.po4
-rw-r--r--po/fr.po4
-rw-r--r--po/ga.po7
-rw-r--r--po/gl.po35
-rw-r--r--po/hi.po4
-rw-r--r--po/hr.po306
-rw-r--r--po/hu.po31
-rw-r--r--po/id.po31
-rw-r--r--po/it.po64
-rw-r--r--po/ja.po31
-rw-r--r--po/ko.po14
-rw-r--r--po/lt.po4
-rw-r--r--po/lv.po31
-rw-r--r--po/mk.po31
-rw-r--r--po/ml.po31
-rw-r--r--po/mn.po110
-rw-r--r--po/ms.po31
-rw-r--r--po/nl.po47
-rw-r--r--po/nn.po104
-rw-r--r--po/no.po4
-rw-r--r--po/pl.po4
-rw-r--r--po/pt.po7
-rw-r--r--po/pt_BR.po31
-rw-r--r--po/ro.po35
-rw-r--r--po/ru.po4
-rw-r--r--po/sk.po31
-rw-r--r--po/sl.po412
-rw-r--r--po/sq.po4
-rw-r--r--po/sr.po4
-rw-r--r--po/sr@Latn.po85
-rw-r--r--po/sv.po2
-rw-r--r--po/tr.po34
-rw-r--r--po/uk.po61
-rw-r--r--po/vi.po31
-rw-r--r--po/yi.po31
-rw-r--r--po/zh_CN.po31
-rw-r--r--po/zh_TW.po31
54 files changed, 1599 insertions, 676 deletions
diff --git a/ChangeLog b/ChangeLog
index a98b447c..c2fa81ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-24 Mark McLoughlin <mark@skynet.ie>
+
+ * configure.in: Version 2.5.90.
+
2004-02-01 Robert Sedak <robert.sedak@sk.htnet.hr>
* configure.in: Added "hr" (Croatian) to ALL_LINGUAS.
diff --git a/configure.in b/configure.in
index 1fd6efe0..f918e119 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.5.1)
+AM_INIT_AUTOMAKE(GConf, 2.5.90)
AM_MAINTAINER_MODE
diff --git a/po/am.po b/po/am.po
index 18144c71..9cffb80c 100644
--- a/po/am.po
+++ b/po/am.po
@@ -7,14 +7,14 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-14 21:55-0500\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
@@ -31,6 +31,33 @@ msgstr ""
msgid "Can't read from or write to the %s root directory in the address `%s'"
msgstr ""
+#: backends/gconf-merge-tree.c:78
+#, c-format
+msgid "Cannot find directory %s\n"
+msgstr ""
+
+#: backends/gconf-merge-tree.c:94
+#, c-format
+msgid "Error saving GConf tree to '%s': %s\n"
+msgstr ""
+
+#: backends/gconf-merge-tree.c:120
+#, c-format
+msgid "Usage: %s <dir>\n"
+msgstr ""
+
+#: backends/gconf-merge-tree.c:126
+#, c-format
+msgid ""
+"Usage: %s <dir>\n"
+" Merges a markup backend filesystem hierarchy like:\n"
+" dir/%%gconf.xml\n"
+" subdir1/%%gconf.xml\n"
+" subdir2/%%gconf.xml\n"
+" to:\n"
+" dir/%%gconf-tree.xml\n"
+msgstr ""
+
#: backends/xml-backend.c:236
msgid "Unloading XML backend module."
msgstr ""
diff --git a/po/ar.po b/po/ar.po
index 57e0f3b4..8dec573e 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,14 +8,14 @@
msgid ""
msgstr ""
"Project-Id-Version: ar\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-04 19:46+0100\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
diff --git a/po/az.po b/po/az.po
index aaa21686..443d89f9 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,14 +7,14 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf.HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-01 15:03+0100\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
"X-Generator: KBabel 1.0.2\n"
#: backends/dir-utils.c:108
@@ -77,7 +77,8 @@ msgstr "`%s' ünvanda XML ana cərgəsini tapa bilmədim"
#: 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 "`%s' ünvanındaki XML ana qovluğunu oxuya və yaza bilmədim ."
#: backends/xml-backend.c:453
@@ -88,15 +89,16 @@ msgstr "%s kökündəki XML qaynaq qovluq/fayl səlahiyyətləri : %o/%o"
#: backends/xml-backend.c:619
#, c-format
msgid "Error syncing the XML backend directory cache: %s"
-msgstr "XML arxa plan qovluğunun ön yaddaşı sinxronlaşdırılırkən xəta oldu : %s"
+msgstr ""
+"XML arxa plan qovluğunun ön yaddaşı sinxronlaşdırılırkən xəta oldu : %s"
#: backends/xml-backend.c:684
msgid ""
"Remove directory operation is no longer supported, just remove all the "
"values in the directory"
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"
+"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/xml-backend.c:770
#, c-format
@@ -248,7 +250,8 @@ msgstr "<%s> üzvü üçün \"type\" xüsusiyyəti bildirilməmişdir"
#: backends/xml-entry.c:966
#, c-format
msgid "A node has unknown \"type\" attribute `%s', ignoring"
-msgstr "Bir üzvün namə'lum bir \"type\" xüsusiyyəti `%s''yi daxil edir, keçirəm"
+msgstr ""
+"Bir üzvün namə'lum bir \"type\" xüsusiyyəti `%s''yi daxil edir, keçirəm"
#: backends/xml-entry.c:981
msgid "No \"value\" attribute for node"
@@ -261,7 +264,8 @@ msgstr "XML siyahı üzvündəki <%s> XML üzvünü başa düşmədim"
#: backends/xml-entry.c:1063
msgid "Invalid type (list, pair, or unknown) in a list node"
-msgstr "Siyahı üzvünün növü keçərsizdir ( siyahı, yoldaş ya da namə'lum ola bilər )"
+msgstr ""
+"Siyahı üzvünün növü keçərsizdir ( siyahı, yoldaş ya da namə'lum ola bilər )"
#: backends/xml-entry.c:1086
#, c-format
@@ -280,7 +284,8 @@ msgstr "XML yoldaşı üçün pis şəkilləndirilmiş `car''ı : %s"
#: backends/xml-entry.c:1155 backends/xml-entry.c:1178
msgid "parsing XML file: lists and pairs may not be placed inside a pair"
-msgstr "XML faylını oxuyuram : siyahı və yoldaşlar birlikdə bir yerdə ola bilməz"
+msgstr ""
+"XML faylını oxuyuram : siyahı və yoldaşlar birlikdə bir yerdə ola bilməz"
#: backends/xml-entry.c:1168
#, c-format
@@ -306,7 +311,8 @@ msgstr "XML faylındakı qiymət yoldaşları üçün `car' əksikdir"
#: backends/xml-entry.c:1223
msgid "Missing both car and cdr values from pair in XML file"
-msgstr "XML faylındakı qiymət yoldaşları üçün `cdr' və `cdr' qiymətləri əksikdir"
+msgstr ""
+"XML faylındakı qiymət yoldaşları üçün `cdr' və `cdr' qiymətləri əksikdir"
#. -- end debug only
#: gconf/gconf-backend.c:167
@@ -604,7 +610,8 @@ msgstr "Cütünü gözləyərkən, %s aldım"
#: gconf/gconf-internals.c:1506
#, c-format
msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
-msgstr "%s,%s cütünü gözləyərkən , bir ya da iki qiyməti olmayan bir oxşar aldım"
+msgstr ""
+"%s,%s cütünü gözləyərkən , bir ya da iki qiyməti olmayan bir oxşar aldım"
#: gconf/gconf-internals.c:1522
#, c-format
@@ -863,7 +870,8 @@ msgid "Schema contains invalid UTF-8"
msgstr "Sxem hökmsüz UTF-8 daxil edir"
#: 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 ""
"Sxem, növ siyahısını müəyyən edir, sıyahı elementlərinin növünü isə müəyyən "
"etməz"
@@ -884,7 +892,8 @@ msgstr "\"%s\" qaynağını yükləyə bilmədim : %s"
#: gconf/gconf-sources.c:346
#, c-format
msgid "Resolved address \"%s\" to a writable config source at position %d"
-msgstr "\"%s\" ünvanını %d mövqesindəki yazıla bilən quraşdırma mənbəyinə çözümlədim"
+msgstr ""
+"\"%s\" ünvanını %d mövqesindəki yazıla bilən quraşdırma mənbəyinə çözümlədim"
#: gconf/gconf-sources.c:352
#, c-format
@@ -895,7 +904,8 @@ msgstr ""
#: gconf/gconf-sources.c:359
#, 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 ""
"\"%s\" ünvanını %d mövqesindəki qismən yazıla bilən bilən quraşdırma "
"mənbəyinə çözümlədim"
@@ -915,7 +925,8 @@ msgstr "`%s' şəkli `%s' üçün bir şəkil qiyməti olmayan bir qiymət daxil
#: gconf/gconf-sources.c:642
msgid "The '/' name can only be a directory, not a key"
-msgstr "'/' adları sadəcə bir qovluq ola bilər, qətiyyan'iyyen bir açar ola bilməz"
+msgstr ""
+"'/' adları sadəcə bir qovluq ola bilər, qətiyyan'iyyen bir açar ola bilməz"
#: gconf/gconf-sources.c:680
#, c-format
@@ -1141,7 +1152,8 @@ msgstr ""
#: gconf/gconfd.c:296
#, 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 ""
"Quraşdırma faylları tapıla bilmədi , əsas quraşdırma qaynağı `%s''yi "
"istifadə edirəm"
@@ -1155,8 +1167,8 @@ msgid ""
"No configuration sources in the source path, configuration won't be saved; "
"edit %s"
msgstr ""
-"Mənbə qovluğunda quraşdırma mənbələri yoxdur, qurğular qeyd "
-"edilməyəcəkdir ; %s faylını təkmilləşdirin"
+"Mənbə qovluğunda quraşdırma mənbələri yoxdur, qurğular qeyd edilməyəcəkdir ; "
+"%s faylını təkmilləşdirin"
#: gconf/gconfd.c:317
#, c-format
@@ -1188,7 +1200,8 @@ msgstr ""
#: gconf/gconfd.c:390
#, c-format
-msgid "Received signal %d, shutting down abnormally. Please file a GConf bug report."
+msgid ""
+"Received signal %d, shutting down abnormally. Please file a GConf bug report."
msgstr ""
"%d siqnalını aldım, təmiz sürətdə qapana bilmirəm. Xahiş edirik GConf "
"xətasını raport edin."
@@ -1274,7 +1287,8 @@ msgstr ""
#: gconf/gconfd.c:1258
#, 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 "Gconf qeyd faylı qapadıla bilmədi; data düzgün qeyd edilə bilməz (%s)"
#: gconf/gconfd.c:1327
@@ -1304,13 +1318,17 @@ msgstr "Təzə qeyd edilmiş hal faylını buraya köçürə bilmədim: %s"
#: gconf/gconfd.c:1383
#, c-format
-msgid "Failed to restore original saved state file that had been moved to '%s': %s"
-msgstr "'%s' a(ə) köçürülmüş əsl qeyd edilmiş hal faylını bərpa eda bilmədim: %s"
+msgid ""
+"Failed to restore original saved state file that had been moved to '%s': %s"
+msgstr ""
+"'%s' a(ə) köçürülmüş əsl qeyd edilmiş hal faylını bərpa eda bilmədim: %s"
#: gconf/gconfd.c:1854
#, c-format
-msgid "Unable to restore a listener on address '%s', couldn't resolve the database"
-msgstr "'%s' ünvanındakı dinləyici bərpa edilə bilmir, database hall edilə bilmir"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
+msgstr ""
+"'%s' ünvanındakı dinləyici bərpa edilə bilmir, database hall edilə bilmir"
#: gconf/gconfd.c:1900
#, c-format
@@ -1361,12 +1379,15 @@ msgid "Failed to flush client add to saved state file: %s"
msgstr "Qeyd edilmiş hal faylına \"flush\" alıcı qeyd edilə bilmədi: %s"
#: gconf/gconfd.c:2236
-msgid "Some client removed itself from the GConf server when it hadn't been added."
-msgstr "Bir alıcı özünü GConf vericisindən çıxardıb və ona görə də əlavə edilməyib."
+msgid ""
+"Some client removed itself from the GConf server when it hadn't been added."
+msgstr ""
+"Bir alıcı özünü GConf vericisindən çıxardıb və ona görə də əlavə edilməyib."
#: gconf/gconftool.c:93
msgid "Set a key to a value and sync. Use with --type."
-msgstr "Bir açara bir qiymət ver və sinxronlaşdır . --type'la istifadə edilir ."
+msgstr ""
+"Bir açara bir qiymət ver və sinxronlaşdır . --type'la istifadə edilir ."
#: gconf/gconftool.c:102
msgid "Print the value of a key to standard output."
@@ -1412,11 +1433,13 @@ msgstr ""
msgid ""
"Load from the specified file an XML description of values and set them "
"relative to a dir."
-msgstr "Müəyyən edilən fayldan XML izahatlarını yüklə və onları cərgəyə görə düz."
+msgstr ""
+"Müəyyən edilən fayldan XML izahatlarını yüklə və onları cərgəyə görə düz."
#: gconf/gconftool.c:175
msgid "Print all subdirectories and entries under a dir, recursively."
-msgstr "Bir qovluğun bütün alt qovluqlarını və üzvlərini dərinliyi ilə göstər ."
+msgstr ""
+"Bir qovluğun bütün alt qovluqlarını və üzvlərini dərinliyi ilə göstər ."
#: gconf/gconftool.c:184
msgid "Return 0 if the directory exists, 2 if it does not."
@@ -1428,7 +1451,8 @@ msgstr "gconfd'yi bağla . BU SEÇƏNƏYİ YAXŞI BIR SƏBƏBİN OLMADAN İSTİF
#: gconf/gconftool.c:202
msgid "Return 0 if gconfd is running, 2 if not."
-msgstr "gconfd vericisi işləyirsə 0'ı nəticəsini ver, yoxsa 2'yi nəticəsini ver ."
+msgstr ""
+"gconfd vericisi işləyirsə 0'ı nəticəsini ver, yoxsa 2'yi nəticəsini ver ."
#: gconf/gconftool.c:211
msgid ""
@@ -1654,7 +1678,8 @@ msgid "%s option must be used by itself.\n"
msgstr "%s seçimi öz özünə istifadə edilmək məcburiyyətindədir.\n"
#: gconf/gconftool.c:702
-msgid "You must specify a config source with --config-source when using --direct\n"
+msgid ""
+"You must specify a config source with --config-source when using --direct\n"
msgstr ""
"--direct'lə --config-source istifadə edildiyi vaxt bir quraşdırma qaynağını "
"bildir \n"
@@ -1673,7 +1698,8 @@ msgid "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, not installing schemas\n"
msgstr "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL verilibdir, sxemləri qurmuram\n"
#: gconf/gconftool.c:750
-msgid "GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL is set, not uninstalling schemas\n"
+msgid ""
+"GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL is set, not uninstalling schemas\n"
msgstr "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL seçilib, sxemlər silinməyəcək\n"
#: gconf/gconftool.c:763
@@ -1798,8 +1824,10 @@ msgid "When setting a list you must specify a primitive list-type\n"
msgstr "Bir siyahıyı bildirirkən siyahı növünü bildirmək məcburiyyətindəsən\n"
#: gconf/gconftool.c:1750
-msgid "When setting a pair you must specify a primitive car-type and cdr-type\n"
-msgstr "Bir cütü bildirirkən car növünü və cdr növünü bildirmək məcburiyyətindəsən\n"
+msgid ""
+"When setting a pair you must specify a primitive car-type and cdr-type\n"
+msgstr ""
+"Bir cütü bildirirkən car növünü və cdr növünü bildirmək məcburiyyətindəsən\n"
#: gconf/gconftool.c:1765
#, c-format
@@ -1964,7 +1992,8 @@ msgstr "XƏBƏRDARLIQ: <pair> içində həm <car> həm də <cdr> verilməlidir\n
#: gconf/gconftool.c:2559
#, c-format
msgid "WARNING: key specified (%s) for schema under a <value> - ignoring\n"
-msgstr "XƏBƏRDARLIQ: <value> altındakı sxem üçün açar (%s) verilib - rədd edirəm\n"
+msgstr ""
+"XƏBƏRDARLIQ: <value> altındakı sxem üçün açar (%s) verilib - rədd edirəm\n"
#: gconf/gconftool.c:2592
msgid "WARNING: must have a child node under <value>\n"
@@ -1998,7 +2027,8 @@ msgstr "XƏBƏRDARLIQ: `%s'' bulean qiymətini təhlil edə bilmədim\n"
#: gconf/gconftool.c:2796 gconf/gconftool.c:3332
#, c-format
msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
-msgstr "XƏBƏRDARLIQ : `%s' şəkil faylını `%s' açarı ilə birləşdirə bilmədim : %s\n"
+msgstr ""
+"XƏBƏRDARLIQ : `%s' şəkil faylını `%s' açarı ilə birləşdirə bilmədim : %s\n"
#: gconf/gconftool.c:2901
#, c-format
@@ -2013,7 +2043,8 @@ msgstr "XƏBƏRDARLIQ : %s şəkli üçün keçərsiz ya da əksik siyahı növ
#: gconf/gconftool.c:2921 gconf/gconftool.c:2951 gconf/gconftool.c:2980
#, c-format
msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
-msgstr "XƏBƏRDARLIQ : şəkil %s üçün əsas qiymət `%s''yi daramasında xəta oldu\n"
+msgstr ""
+"XƏBƏRDARLIQ : şəkil %s üçün əsas qiymət `%s''yi daramasında xəta oldu\n"
#: gconf/gconftool.c:2939
#, c-format
@@ -2026,7 +2057,8 @@ msgstr "XƏBƏRDARLIQ : şəkil iÇin əsas qiyməti aturda bilmədim\n"
#: gconf/gconftool.c:2993
msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
-msgstr "XƏBƏRDARLIQ : gconftool'd daxili bir xəta oldu , namə'lum GConfValueType\n"
+msgstr ""
+"XƏBƏRDARLIQ : gconftool'd daxili bir xəta oldu , namə'lum GConfValueType\n"
#: gconf/gconftool.c:3041 gconf/gconftool.c:3062 gconf/gconftool.c:3083
#: gconf/gconftool.c:3104
@@ -2036,7 +2068,8 @@ msgstr "XƏBƏRDARLIQ : növ adı `%s''yi daraya bilmədim\n"
#: gconf/gconftool.c:3058
#, c-format
-msgid "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
+msgid ""
+"WARNING: list_type can only be int, float, string or bool and not `%s'\n"
msgstr ""
"XƏBƏRDARLIQ : siyahı növü int, float, string ya da bool ola bilər, fəqət `%"
"s' ola bilməz\n"
@@ -2066,7 +2099,8 @@ msgstr "XƏBƏRDARLIQ : <schema>'nın altındakı <%s> nöqtəsini başa düşm
#: gconf/gconftool.c:3154
msgid "WARNING: no <list_type> specified for schema of type list\n"
-msgstr "XƏBƏRDARLIQ: növ siyahısının sxemi üçün heç bir <list_type> verilməyib\n"
+msgstr ""
+"XƏBƏRDARLIQ: növ siyahısının sxemi üçün heç bir <list_type> verilməyib\n"
#: gconf/gconftool.c:3160
msgid "WARNING: no <car_type> specified for schema of type pair\n"
@@ -2084,7 +2118,8 @@ msgstr ""
#: gconf/gconftool.c:3201
#, 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 ""
"XƏBƏRDARLIQ : `%s' lokalizasiyası üçün çoxlu <locale> nöqtələri var, köhnə "
"ilkləri keçirəm\n"
@@ -2101,7 +2136,8 @@ msgstr "`%s' şekilni `%s' anahtarına ekledim\n"
#: gconf/gconftool.c:3414
msgid "You must have at least one <locale> entry in a <schema>\n"
-msgstr "Bir <schema>'da ən azından bir <locale> nöqtəsi olmaq məcburiyyətindədir\n"
+msgstr ""
+"Bir <schema>'da ən azından bir <locale> nöqtəsi olmaq məcburiyyətindədir\n"
#: gconf/gconftool.c:3446
#, c-format
@@ -2212,4 +2248,3 @@ msgid ""
msgstr ""
"Proqramı bə'zi xətalı qiymətləri bu qovuqda oturdaraq qırmağa cəhd edirəm :\n"
" %s\n"
-
diff --git a/po/be.po b/po/be.po
index de003308..947296a5 100644
--- a/po/be.po
+++ b/po/be.po
@@ -5,14 +5,14 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-14 21:55-0500\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\n"
"PO-Revision-Date: 2003-07-27 14:40+0300\n"
"Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n"
"Language-Team: Belarusian <i18n@mova.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
"X-Generator: KBabel 0.9.6\n"
# backends/dir-utils.c:108
@@ -33,6 +33,35 @@ msgstr "Не атрымалася стварыць тэчку \"%s\": %s"
msgid "Can't read from or write to the %s root directory in the address `%s'"
msgstr "Немагчыма чытаць ці пісаць у каранёвую тэчку %s у адрэсе \"%s\""
+# backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1176
+#: backends/gconf-merge-tree.c:78
+#, fuzzy, c-format
+msgid "Cannot find directory %s\n"
+msgstr "Не атрымалася стварыць тэчку \"%s\": %s"
+
+# gconf/gconftool.c:1341
+#: backends/gconf-merge-tree.c:94
+#, fuzzy, c-format
+msgid "Error saving GConf tree to '%s': %s\n"
+msgstr "Памылка атрыманьня схемы па \"%s\": %s\n"
+
+#: backends/gconf-merge-tree.c:120
+#, c-format
+msgid "Usage: %s <dir>\n"
+msgstr ""
+
+#: backends/gconf-merge-tree.c:126
+#, c-format
+msgid ""
+"Usage: %s <dir>\n"
+" Merges a markup backend filesystem hierarchy like:\n"
+" dir/%%gconf.xml\n"
+" subdir1/%%gconf.xml\n"
+" subdir2/%%gconf.xml\n"
+" to:\n"
+" dir/%%gconf-tree.xml\n"
+msgstr ""
+
# backends/xml-backend.c:233
#: backends/xml-backend.c:236
msgid "Unloading XML backend module."
diff --git a/po/bg.po b/po/bg.po
index 319bf200..0d93f9fb 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -5,14 +5,14 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-14 21:55-0500\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\n"
"PO-Revision-Date: 2003-01-14 18:48+0200\n"
"Last-Translator: Alexander Shopov <al_shopov@yahoo.com>\n"
"Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
"X-Generator: KBabel 0.9.6\n"
#: backends/dir-utils.c:108
@@ -30,6 +30,33 @@ msgstr "Не успях да създам директория \"%s\": %s"
msgid "Can't read from or write to the %s root directory in the address `%s'"
msgstr "Не мога да чета или пиша в главната директория %s в адреса: \"%s\""
+#: backends/gconf-merge-tree.c:78
+#, fuzzy, c-format
+msgid "Cannot find directory %s\n"
+msgstr "Не успях да създам директория \"%s\": %s"
+
+#: backends/gconf-merge-tree.c:94
+#, fuzzy, c-format
+msgid "Error saving GConf tree to '%s': %s\n"
+msgstr "Грешка при получаване на схема на \"%s\": %s\n"
+
+#: backends/gconf-merge-tree.c:120
+#, c-format
+msgid "Usage: %s <dir>\n"
+msgstr ""
+
+#: backends/gconf-merge-tree.c:126
+#, c-format
+msgid ""
+"Usage: %s <dir>\n"
+" Merges a markup backend filesystem hierarchy like:\n"
+" dir/%%gconf.xml\n"
+" subdir1/%%gconf.xml\n"
+" subdir2/%%gconf.xml\n"
+" to:\n"
+" dir/%%gconf-tree.xml\n"
+msgstr ""
+
#: backends/xml-backend.c:236
msgid "Unloading XML backend module."
msgstr "Освобождавам XML модул."
diff --git a/po/bn.po b/po/bn.po
index 61c9022f..65c39702 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -6,14 +6,14 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf.gnome-2-2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-01 22:02-0500\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
@@ -87,7 +87,8 @@ msgstr ""
msgid ""
"Remove directory operation is no longer supported, just remove all the "
"values in the directory"
-msgstr "সম্পূর্ণ ডিরেকটরি অপসারণ করা এখন অসমর্থিত, ডিরেকটরির সব মান অপসারণ করলেই হবে"
+msgstr ""
+"সম্পূর্ণ ডিরেকটরি অপসারণ করা এখন অসমর্থিত, ডিরেকটরির সব মান অপসারণ করলেই হবে"
#: backends/xml-backend.c:770
#, c-format
@@ -749,7 +750,8 @@ msgid ""
"in your home directory. The error was \"%s\" (errno = %d)."
msgstr ""
"নিম্নোক্ত সমস্যাগুলোর সমাধানের জন্য আপনার সিস্টেম অ্যাডমিনস্ট্রেটরের সাথে যোগাযোগ "
-"করুন:\n\"%s\" ফাইল তৈরি কিংবা খুলতে পারেনি যা নির্দেশ করে তোমার কনফিগারেশনে একটা "
+"করুন:\n"
+"\"%s\" ফাইল তৈরি কিংবা খুলতে পারেনি যা নির্দেশ করে তোমার কনফিগারেশনে একটা "
"সমস্যা আছে কারণ অনেক প্রোগ্রামেরই হোম ডিরেকটরিতেফাইল তৈরি করার দরকার হবে।ত্রুটিটা "
"হল \"%s\"(errno=%d)"
@@ -786,8 +788,9 @@ msgid ""
"preferences and other settings can't be saved. %s%s"
msgstr ""
"নিম্নোক্ত সমস্যাগুলোর সমাধানের জন্য আপনার সিস্টেম অ্যাডমিনস্ট্রেটরের সাথে যোগাযোগ "
-"করুন:\n কনফিগারেশ ফাইল \"%s\" এর ভিতর কোন কনফিগারেশ নেই; এই জন্য কোন সেটিং সংরক্ষন করা"
-"যাবে না. %s%s"
+"করুন:\n"
+" কনফিগারেশ ফাইল \"%s\" এর ভিতর কোন কনফিগারেশ নেই; এই জন্য কোন সেটিং সংরক্ষন "
+"করাযাবে না. %s%s"
#: gconf/gconf-sanity-check.c:236
msgid "Error reading the file: "
@@ -800,7 +803,8 @@ msgid ""
"Please contact your system administrator to resolve the following problem:\n"
"Could not resolve the address \"%s\" in the configuration file \"%s\": %s"
msgstr ""
-"নিম্নোক্ত সমস্যাগুলোর সমাধানের জন্য আপনার সিস্টেম অ্যাডমিনস্ট্রেটরের সাথে যোগাযোগ করুন:\n"
+"নিম্নোক্ত সমস্যাগুলোর সমাধানের জন্য আপনার সিস্টেম অ্যাডমিনস্ট্রেটরের সাথে যোগাযোগ "
+"করুন:\n"
"কনফিগারেশন ফাইল \"%s\" এর ঠিকানা \"%s\" সমাধান করা যাইনি: %s"
#: gconf/gconf-sanity-check.c:320
diff --git a/po/ca.po b/po/ca.po
index 9c83b793..99dad054 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,14 +7,14 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf 2.5.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-14 21:55-0500\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\n"
"PO-Revision-Date: 2003-11-13 16:08+0100\n"
"Last-Translator: Gisela Carbonell <gcarbonell@arrakis.es>\n"
"Language-Team: Catalan <tradgnome@softcatala.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
@@ -31,6 +31,34 @@ msgstr "No s'ha pogut crear el directori '%s': %s"
msgid "Can't read from or write to the %s root directory in the address `%s'"
msgstr "No es pot llegir des de/escriure al directori arrel %s a l'adreça `%s'"
+#: backends/gconf-merge-tree.c:78
+#, fuzzy, c-format
+msgid "Cannot find directory %s\n"
+msgstr "No s'ha pogut crear el directori '%s': %s"
+
+#
+#: backends/gconf-merge-tree.c:94
+#, fuzzy, c-format
+msgid "Error saving GConf tree to '%s': %s\n"
+msgstr "Error en llistar directoris en `%s': %s"
+
+#: backends/gconf-merge-tree.c:120
+#, c-format
+msgid "Usage: %s <dir>\n"
+msgstr ""
+
+#: backends/gconf-merge-tree.c:126
+#, c-format
+msgid ""
+"Usage: %s <dir>\n"
+" Merges a markup backend filesystem hierarchy like:\n"
+" dir/%%gconf.xml\n"
+" subdir1/%%gconf.xml\n"
+" subdir2/%%gconf.xml\n"
+" to:\n"
+" dir/%%gconf-tree.xml\n"
+msgstr ""
+
#: backends/xml-backend.c:236
msgid "Unloading XML backend module."
msgstr "S'està descarregant el mòdul de rerefons de l'XML"
@@ -2353,10 +2381,6 @@ msgstr ""
#~ "No es pot mostrar el quadre de diàleg de fallada: %s\n"
#
-#~ msgid "Error listing subdirs of '%s': %s\n"
-#~ msgstr "Error en llistar directoris en `%s': %s"
-
-#
#~ msgid "Error unsetting '%s': %s\n"
#~ msgstr "Error en desactivar `%s': %s\n"
diff --git a/po/cs.po b/po/cs.po
index bf3b4c87..639a085f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,14 +8,14 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-24 03:53+0100\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\n"
"PO-Revision-Date: 2004-01-25 01:55+0100\n"
"Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
@@ -934,7 +934,24 @@ msgid ""
"details on problems gconfd encountered. There can only be one gconfd per "
"home directory, and it must own a lockfile in ~/.gconfd and also lockfiles "
"in individual storage locations such as ~/.gconf"
-msgstr "Nemohu uložit hodnotu klíče '%s', protože server pro nastavení nemá žádnou zapisovatelnou databázi. Existuje několik častých příčin tohoto problému: 1) váš soubor cest s nastavením %s/path neobsahuje žádnou databázi nebo nebyl nalezen, 2) díky chybě byly nějakým způsobem vytvořeny dva procesy gconfd, 3) váš operační systém je špatně nastaven, takže zamykání souborů NFS nefunguje ve vašem domovském adresáři, nebo 4) vaše klientská stanice NFS havarovala a neuvědomila při restartu server, že by měl odstranit zámky na souborech. Pokud u vás běží dva procesy gconfd (nebo běžely v době, kdy byl spouštěn druhý), může pomoci odhlásit se, zabít všechny běžící procesy gconfd a přihlásit se znovu. Pokud máte staré zámky, odstraňte ~/.gconf*/*lock. Možná je problém v tom, že jste se pokusili použít GConf ze dvou počítačů současně a ORBit má stále implicitní nastavení, které zakazuje vzdálená připojení CORBA - dejte \"ORBIIOPIPv4=1\" do /etc/orbitrc. Jako obvykle prověřte syslog user.* a hledejte podrobnosti týkající se problémů v gconfd. Na jeden domovský adresář může existovat pouze jeden gconfd a musí vlastnit soubor zámku v ~/.gconfd a také soubory zámků v jednotlivých umístěních nastavení, například ~/.gconf"
+msgstr ""
+"Nemohu uložit hodnotu klíče '%s', protože server pro nastavení nemá žádnou "
+"zapisovatelnou databázi. Existuje několik častých příčin tohoto problému: 1) "
+"váš soubor cest s nastavením %s/path neobsahuje žádnou databázi nebo nebyl "
+"nalezen, 2) díky chybě byly nějakým způsobem vytvořeny dva procesy gconfd, "
+"3) váš operační systém je špatně nastaven, takže zamykání souborů NFS "
+"nefunguje ve vašem domovském adresáři, nebo 4) vaše klientská stanice NFS "
+"havarovala a neuvědomila při restartu server, že by měl odstranit zámky na "
+"souborech. Pokud u vás běží dva procesy gconfd (nebo běžely v době, kdy byl "
+"spouštěn druhý), může pomoci odhlásit se, zabít všechny běžící procesy "
+"gconfd a přihlásit se znovu. Pokud máte staré zámky, odstraňte ~/.gconf*/"
+"*lock. Možná je problém v tom, že jste se pokusili použít GConf ze dvou "
+"počítačů současně a ORBit má stále implicitní nastavení, které zakazuje "
+"vzdálená připojení CORBA - dejte \"ORBIIOPIPv4=1\" do /etc/orbitrc. Jako "
+"obvykle prověřte syslog user.* a hledejte podrobnosti týkající se problémů v "
+"gconfd. Na jeden domovský adresář může existovat pouze jeden gconfd a musí "
+"vlastnit soubor zámku v ~/.gconfd a také soubory zámků v jednotlivých "
+"umístěních nastavení, například ~/.gconf"
#: gconf/gconf-sources.c:1414
#, c-format
@@ -1613,7 +1630,9 @@ msgstr ""
msgid ""
"--set_schema should not be used with --get, --set, --unset, --all-entries, --"
"all-dirs\n"
-msgstr "--set_schema by nemělo být používáno s --get, --set, --unset, --all-entries, --all-dirs\n"
+msgstr ""
+"--set_schema by nemělo být používáno s --get, --set, --unset, --all-entries, "
+"--all-dirs\n"
#: gconf/gconftool.c:595
msgid "Value type is only relevant when setting a value\n"
diff --git a/po/cy.po b/po/cy.po
index 6221bb2d..9f164706 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -7,14 +7,14 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-14 21:55-0500\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\n"
"PO-Revision-Date: 2003-08-30 23:52+0100\n"
"Last-Translator: Dafydd Harries <daf@parnassus.ath.cx>\n"
"Language-Team: Cymraeg <gnome-cy@pengwyn.linux.org.uk>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
@@ -32,6 +32,33 @@ msgid "Can't read from or write to the %s root directory in the address `%s'"
msgstr ""
"Methu darllen o neu ysgrifennu i'r cyfeiriadur gwraid %s yn y cyfeiriad `%s'"
+#: backends/gconf-merge-tree.c:78
+#, fuzzy, c-format
+msgid "Cannot find directory %s\n"
+msgstr "Methu creu cyfeiriadur `%s': %s"
+
+#: backends/gconf-merge-tree.c:94
+#, fuzzy, c-format
+msgid "Error saving GConf tree to '%s': %s\n"
+msgstr "Gwall wrth gyrchu sgema at '%s': %s\n"
+
+#: backends/gconf-merge-tree.c:120
+#, c-format
+msgid "Usage: %s <dir>\n"
+msgstr ""
+
+#: backends/gconf-merge-tree.c:126
+#, c-format
+msgid ""
+"Usage: %s <dir>\n"
+" Merges a markup backend filesystem hierarchy like:\n"
+" dir/%%gconf.xml\n"
+" subdir1/%%gconf.xml\n"
+" subdir2/%%gconf.xml\n"
+" to:\n"
+" dir/%%gconf-tree.xml\n"
+msgstr ""
+
#: backends/xml-backend.c:236
msgid "Unloading XML backend module."
msgstr "Dadlwytho modiwl ochr gefn XML."
diff --git a/po/da.po b/po/da.po
index 8423d61c..8a3d4ee5 100644
--- a/po/da.po
+++ b/po/da.po
@@ -19,14 +19,14 @@
msgid ""
msgstr ""
"Project-Id-Version: GConf 1.0.4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-10 21:53+0100\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\n"
"PO-Revision-Date: 2004-02-10 21:53+0100\n"
"Last-Translator: Ole Laursen <olau@hardworking.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
# første %s er databasetypen
#: backends/dir-utils.c:108
diff --git a/po/de.po b/po/de.po
index fd2d1c9a..4e7d670f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,14 +9,14 @@
msgid ""
msgstr ""
"Project-Id-Version: GConf 2.5.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-29 12:39+0100\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\n"
"PO-Revision-Date: 2003-12-29 12:39+0100\n"
"Last-Translator: Christian Neumair <chris@gnome-de.org>\n"
"Language-Team: German <gnome-de@gnome.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
@@ -2388,4 +2388,3 @@ msgstr ""
"Es wird nun versucht, Ihre Anwendung durch Zuweisen fehlerhafter Werte für "
"Schlüssel im Verzeichnis zu beschädigen:\n"
" %s\n"
-
diff --git a/po/el.po b/po/el.po
index 7579f24d..56e62983 100644
--- a/po/el.po
+++ b/po/el.po
@@ -13,14 +13,14 @@
msgid ""
msgstr ""
"Project-Id-Version: el\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-03 18:59+0200\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\n"
"PO-Revision-Date: 2004-02-03 19:03+0200\n"
"Last-Translator: Kostas Papadimas <pkst@gnome.org>\n"
"Language-Team: Greek <nls@tux.hellug.gr>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
"X-Generator: KBabel 1.0.2\n"
# backends/xml-backend.c:300
@@ -91,8 +91,10 @@ msgstr "Εύρεση ριζικού καταλόγου XML αδύνατη στη
# backends/xml-backend.c:400
#: 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\""
+msgid ""
+"Can't read from or write to the XML root directory in the address \"%s\""
+msgstr ""
+"Αδύνατη η ανάγνωση ή εγγραφή στο ριζικό κατάλογο XML στη διεύθυνση \"%s\""
# backends/xml-backend.c:410
#: backends/xml-backend.c:453
@@ -367,7 +369,8 @@ msgstr "Λάθος διεύθυνση `%s'"
# gconf/gconf-backend.c:233
#: gconf/gconf-backend.c:220
msgid "GConf won't work without dynamic module support (gmodule)"
-msgstr "Το GConf δε θα λειτουργήσει χωρίς υποστήριξη δυναμικών μονάδων (gmodule)"
+msgstr ""
+"Το GConf δε θα λειτουργήσει χωρίς υποστήριξη δυναμικών μονάδων (gmodule)"
# gconf/gconf-backend.c:243
#: gconf/gconf-backend.c:230
@@ -430,7 +433,8 @@ msgstr "Λήφθηκε αίτηση για σύγχρονο συγχρονισμ
# gconf/gconfd.c:1056
#: gconf/gconf-database.c:826
msgid "Fatal error: failed to get object reference for ConfigDatabase"
-msgstr "Μοιραίο σφάλμα: αποτυχία λήψης αναφοράς αντικειμένου για το ConfigDatabase"
+msgstr ""
+"Μοιραίο σφάλμα: αποτυχία λήψης αναφοράς αντικειμένου για το ConfigDatabase"
# gconf/gconfd.c:1194
#: gconf/gconf-database.c:988
@@ -595,7 +599,8 @@ msgstr "Αποτυχία τοποθέτησης κλειδώματος"
#: gconf/gconf-error.c:40
msgid "No database available to save your configuration"
-msgstr "Δεν υπάρχει διάθεσιμη βάση δεδομένων για τη αποθήκευση των ρυθμίσεων σας"
+msgstr ""
+"Δεν υπάρχει διάθεσιμη βάση δεδομένων για τη αποθήκευση των ρυθμίσεων σας"
# gconf/gconf-internals.c:100
#: gconf/gconf-internals.c:86
@@ -724,7 +729,8 @@ msgstr "Αδυναμία κλειδώματος προσωρινού αρχεί
#: gconf/gconf-internals.c:2322
#, c-format
msgid "Could not create file '%s', probably because it already exists"
-msgstr "Δεν είναι δυνατή η δημιουργία του αρχείου '%s', πιθανόν να υπάρχει ήδη"
+msgstr ""
+"Δεν είναι δυνατή η δημιουργία του αρχείου '%s', πιθανόν να υπάρχει ήδη"
# gconf/gconf-internals.c:2416
#: gconf/gconf-internals.c:2368
@@ -750,12 +756,14 @@ msgstr "Το αρχείο IOR '%s' δεν ανοίχθηκε επιτυχώς,
#: gconf/gconf-internals.c:2438
#, c-format
msgid "gconftool or other non-gconfd process has the lock file '%s'"
-msgstr "Το gconftool ή άλλη μή-gconfd διεργασία λεχει το αρχείο κλειδώματος '%s'"
+msgstr ""
+"Το gconftool ή άλλη μή-gconfd διεργασία λεχει το αρχείο κλειδώματος '%s'"
# gconf/gconf-internals.c:2287
#: gconf/gconf-internals.c:2455
msgid "couldn't contact ORB to resolve existing gconfd object reference"
-msgstr "αδύνατη η επαφή με το ORB για επίλυση υπάρχοντος αντικείμενου αναφοράς gconfd"
+msgstr ""
+"αδύνατη η επαφή με το ORB για επίλυση υπάρχοντος αντικείμενου αναφοράς gconfd"
# gconf/gconfd.c:1194
#: gconf/gconf-internals.c:2465
@@ -981,8 +989,10 @@ msgid "Schema contains invalid UTF-8"
msgstr "Το σχήμα περιέχει μή έγκυρο UTF-8"
#: gconf/gconf-schema.c:254
-msgid "Schema specifies type list but doesn't specify the type of the list elements"
-msgstr "Το σχήμα ορίζει τύπο λίστας αλλά δεν ορίζει τον τύπο των στοιχείων της λίστας"
+msgid ""
+"Schema specifies type list but doesn't specify the type of the list elements"
+msgstr ""
+"Το σχήμα ορίζει τύπο λίστας αλλά δεν ορίζει τον τύπο των στοιχείων της λίστας"
#: gconf/gconf-schema.c:264
msgid ""
@@ -1006,12 +1016,15 @@ msgstr "Ανάλυση διευθύνσεως \"%s\" σε εγγράψιμη π
#: gconf/gconf-sources.c:352
#, c-format
msgid "Resolved address \"%s\" to a read-only config source at position %d"
-msgstr "Ανάλυση διευθύνσεως \"%s\" σε μόνο για ανάγνωση πηγή ρυθμίσεων στη θέση %d"
+msgstr ""
+"Ανάλυση διευθύνσεως \"%s\" σε μόνο για ανάγνωση πηγή ρυθμίσεων στη θέση %d"
#: gconf/gconf-sources.c:359
#, c-format
-msgid "Resolved address \"%s\" to a partially writable config source at position %d"
-msgstr "Ανάλυση διευθύνσεως \"%s\" σε μερικώς εγγράψιμη πηγή ρυθμίσεων στη θέση %d"
+msgid ""
+"Resolved address \"%s\" to a partially writable config source at position %d"
+msgstr ""
+"Ανάλυση διευθύνσεως \"%s\" σε μερικώς εγγράψιμη πηγή ρυθμίσεων στη θέση %d"
#: gconf/gconf-sources.c:368
msgid ""
@@ -1024,7 +1037,8 @@ msgstr ""
#: gconf/gconf-sources.c:584
#, c-format
msgid "Schema `%s' specified for `%s' stores a non-schema value"
-msgstr "Το σχήμα `%s' που καθορίστηκε για `%s' αποθηκεύει μια τιμή χωρίς σχήμα"
+msgstr ""
+"Το σχήμα `%s' που καθορίστηκε για `%s' αποθηκεύει μια τιμή χωρίς σχήμα"
#: gconf/gconf-sources.c:642
msgid "The '/' name can only be a directory, not a key"
@@ -1184,7 +1198,8 @@ msgstr "Αδύνατη η πρόσθεση ειδοποιήσεων σε ένα
#: gconf/gconf.c:2097
#, c-format
msgid "Adding client to server's list failed, CORBA error: %s"
-msgstr "Η προσθήκη του πελάτη στη λίστα του εξυπηρετητή απέτυχε, σφάλμα CORBA: %s"
+msgstr ""
+"Η προσθήκη του πελάτη στη λίστα του εξυπηρετητή απέτυχε, σφάλμα CORBA: %s"
# gconf/gconf.c:1689
#: gconf/gconf.c:2452
@@ -1279,7 +1294,8 @@ msgstr ""
# gconf/gconfd.c:879
#: gconf/gconfd.c:296
#, 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 ""
"Δε βρέθηκαν αρχεία διαμόρφωσης, προσπάθεια χρήσης της εξορισμού πηγαίας "
"διαμόρφωσης `%s'"
@@ -1332,7 +1348,8 @@ msgstr ""
# gconf/gconfd.c:955 gconf/gconfd.c:967
#: gconf/gconfd.c:390
#, c-format
-msgid "Received signal %d, shutting down abnormally. Please file a GConf bug report."
+msgid ""
+"Received signal %d, shutting down abnormally. Please file a GConf bug report."
msgstr "Λήφθηκε σήμα %d, απότομο κλείσιμο. Παρακαλώ αναφέρατε το σφάλμα GConf."
# gconf/gconfd.c:955 gconf/gconfd.c:967
@@ -1379,7 +1396,8 @@ msgstr "Αδύνατη η λήψη αναφοράς αντικειμένου γ
#: gconf/gconfd.c:646
#, c-format
msgid "Directory %s has a problem, gconfd can't use it"
-msgstr "Ο κατάλογος %s έχει πρόβλημα, το gconfd δεν μπορεί να τον χρησιμοποιήσει"
+msgstr ""
+"Ο κατάλογος %s έχει πρόβλημα, το gconfd δεν μπορεί να τον χρησιμοποιήσει"
#: gconf/gconfd.c:675
#, c-format
@@ -1427,7 +1445,8 @@ msgstr ""
#: gconf/gconfd.c:1258
#, 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 ""
"Αποτυχία κλεισίματος αρχείου καταγραφής gconfd ; Πιθανόν να μην έγινε σωστή "
"αποθήκευση δεδομένων (%s)"
@@ -1436,7 +1455,8 @@ msgstr ""
#: gconf/gconfd.c:1327
#, c-format
msgid "Could not open saved state file '%s' for writing: %s"
-msgstr "Αδύνατο το άνοιγμα αποθηκευμένου αρχείου κατάστασης `%s' για εγγραφή: %s"
+msgstr ""
+"Αδύνατο το άνοιγμα αποθηκευμένου αρχείου κατάστασης `%s' για εγγραφή: %s"
# gconf/gconf-internals.c:2404
#: gconf/gconfd.c:1341
@@ -1468,14 +1488,16 @@ msgstr "Αδύνατη η μεταφορά νέου αποθηκευμένου
#: gconf/gconfd.c:1383
#, c-format
-msgid "Failed to restore original saved state file that had been moved to '%s': %s"
+msgid ""
+"Failed to restore original saved state file that had been moved to '%s': %s"
msgstr ""
"Αποτυχία επαναφοράς αρχείου στην πρωτότυπη αποθηκευμένη κατάσταση που έχει "
"μετακινηθεί στο '%s': %s"
#: gconf/gconfd.c:1854
#, 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 ""
"Δεν είναι δυνατή η επαναφορά listener στη διεύθυνση '%s', αδυναμία "
"επίλυσης της βάσης δεδομένων"
@@ -1541,7 +1563,8 @@ msgstr ""
"s"
#: gconf/gconfd.c:2236
-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 ""
"Κάποιος πελάτης απομάκρυνε τον εαυτό του απί τον εξυπηρετητή GConf όταν δεν "
"είχε προστεθεί"
@@ -1662,7 +1685,8 @@ msgstr "Λήψη του αριθμού των στοιχείων σε ενα κ
#: gconf/gconftool.c:247
msgid "Get a specific element from a list key, numerically indexed."
-msgstr "Λήψη ενός καθορισμένου στοιχείου από κλειδί λίστας, με αριθμητική κατάταξη."
+msgstr ""
+"Λήψη ενός καθορισμένου στοιχείου από κλειδί λίστας, με αριθμητική κατάταξη."
# gconf/gconftool.c:182
#: gconf/gconftool.c:256
@@ -1734,7 +1758,8 @@ msgstr "ΟΝΟΜΑ ΑΡΧΕΙΟΥ"
# gconf/gconftool.c:227
#: gconf/gconftool.c:319
msgid "Specify a configuration source to use rather than the default path"
-msgstr "Καθορίστε μια πηγαία διαμόρφωση προς χρήση αντί για την εξ ορισμού διαδρομή"
+msgstr ""
+"Καθορίστε μια πηγαία διαμόρφωση προς χρήση αντί για την εξ ορισμού διαδρομή"
# gconf/gconftool.c:228
#: gconf/gconftool.c:320
@@ -1887,7 +1912,8 @@ msgstr "Η επιλογή %s πρέπει να χρησιμοποιείται μ
# gconf/gconftool.c:441
#: gconf/gconftool.c:702
-msgid "You must specify a config source with --config-source when using --direct\n"
+msgid ""
+"You must specify a config source with --config-source when using --direct\n"
msgstr ""
"Πρέπει να καθορίσετε μια πηγή διαμόρφωσης με την --config-source όταν "
"χρησιμοποιείτε την --direct\n"
@@ -1911,7 +1937,8 @@ msgstr ""
"σχήματα\n"
#: gconf/gconftool.c:750
-msgid "GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL is set, not uninstalling schemas\n"
+msgid ""
+"GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL is set, not uninstalling schemas\n"
msgstr ""
"Έχει ορισθεί GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL , για να μην "
"απεγκαθίστανται σχήματα\n"
@@ -2062,7 +2089,8 @@ msgstr ""
"λίστας\n"
#: gconf/gconftool.c:1750
-msgid "When setting a pair you must specify a primitive car-type and cdr-type\n"
+msgid ""
+"When setting a pair you must specify a primitive car-type and cdr-type\n"
msgstr ""
"Κατα το ορισμό ενός ζεύγους θα πρέπει να καθορίσετε έναν car-type και cdr-"
"type\n"
@@ -2182,7 +2210,8 @@ msgstr "Πρέπει να καθοριστεί κλειδί (όνομα σχήμ
#: gconf/gconftool.c:2199
msgid "List type must be a primitive type: string, int, float or bool\n"
-msgstr "Ο τύπος λίστας πρέπει να είναι πρωτόγονος τύπος: string, int, float ή bool\n"
+msgstr ""
+"Ο τύπος λίστας πρέπει να είναι πρωτόγονος τύπος: string, int, float ή bool\n"
#: gconf/gconftool.c:2219
msgid "Pair car type must be a primitive type: string, int, float or bool\n"
@@ -2229,7 +2258,8 @@ msgstr "Σφάλμα στην αφαίρεση `%s': %s\n"
# gconf/gconftool.c:715
#: gconf/gconftool.c:2328
msgid "Must specify one or more keys to recursively unset.\n"
-msgstr "Πρέπει να καθοριστεί ένα ή περισσότερα κλειδιά για αναδρομική αποδέσμευση.\n"
+msgstr ""
+"Πρέπει να καθοριστεί ένα ή περισσότερα κλειδιά για αναδρομική αποδέσμευση.\n"
# gconf/gconftool.c:749
#: gconf/gconftool.c:2342
@@ -2252,7 +2282,8 @@ msgstr "Σφάλμα στην απαρίθμηση καταλόγων: %s\n"
#: gconf/gconftool.c:2532
msgid "WARNING: must specify both a <car> and a <cdr> in a <pair>\n"
-msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: θα πρέπει να ορισθεί ένα <car> και ένα<cdr> σε ένα <pair>\n"
+msgstr ""
+"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: θα πρέπει να ορισθεί ένα <car> και ένα<cdr> σε ένα <pair>\n"
# gconf/gconftool.c:1340
#: gconf/gconftool.c:2559
@@ -2264,7 +2295,8 @@ msgstr ""
#: gconf/gconftool.c:2592
msgid "WARNING: must have a child node under <value>\n"
-msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ:θα πρέπει να υπάρχει μια θυγατρική node κάτω από <value>\n"
+msgstr ""
+"ΠΡΟΕΙΔΟΠΟΙΗΣΗ:θα πρέπει να υπάρχει μια θυγατρική node κάτω από <value>\n"
# gconf/gconftool.c:1330 gconf/gconftool.c:1575
#: gconf/gconftool.c:2598
@@ -2300,7 +2332,8 @@ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αποτυχία ανάλυσης boolean v
#: gconf/gconftool.c:2796 gconf/gconftool.c:3332
#, c-format
msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
-msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αποτυχία συσχέτισης σχήματος `%s' με το κλειδί `%s': %s\n"
+msgstr ""
+"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αποτυχία συσχέτισης σχήματος `%s' με το κλειδί `%s': %s\n"
# gconf/gconftool.c:1220
#: gconf/gconftool.c:2901
@@ -2331,12 +2364,14 @@ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: άκυρο ή απών car_type ή cdr_type
# gconf/gconftool.c:1243
#: gconf/gconftool.c:2964
msgid "WARNING: You cannot set a default value for a schema\n"
-msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Δεν είναι δυνατό να τεθεί εξ' ορισμού τιμή για ένα σχήμα\n"
+msgstr ""
+"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Δεν είναι δυνατό να τεθεί εξ' ορισμού τιμή για ένα σχήμα\n"
# gconf/gconftool.c:1256
#: gconf/gconftool.c:2993
msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
-msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Εσωτερικό σφάλμα του gconftool, άγνωστο GConfValueType\n"
+msgstr ""
+"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Εσωτερικό σφάλμα του gconftool, άγνωστο GConfValueType\n"
# gconf/gconftool.c:1304
#: gconf/gconftool.c:3041 gconf/gconftool.c:3062 gconf/gconftool.c:3083
@@ -2347,7 +2382,8 @@ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αποτυχία γραμματικής αν
#: gconf/gconftool.c:3058
#, c-format
-msgid "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
+msgid ""
+"WARNING: list_type can only be int, float, string or bool and not `%s'\n"
msgstr ""
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το list_type μπορεί να είναι μόνο int, float, string ή bool "
"and όχι `%s'\n"
@@ -2404,7 +2440,8 @@ msgstr ""
# gconf/gconftool.c:1379
#: gconf/gconftool.c:3201
#, 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 ""
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: πολλαπλοί κόμβοι <locale> για την τοπική ρύθμιση `%s', "
"αγνοούνται όλοι μετά τον πρώτο\n"
@@ -2424,7 +2461,8 @@ msgstr "Σχήμα `%s' επισυνάφτηκε στο κλειδί `%s'\n"
# gconf/gconftool.c:1588
#: gconf/gconftool.c:3414
msgid "You must have at least one <locale> entry in a <schema>\n"
-msgstr "Πρέπει να υπάρχει τουλάχιστον μία καταχώρηση <locale> σε ένα <schema>\n"
+msgstr ""
+"Πρέπει να υπάρχει τουλάχιστον μία καταχώρηση <locale> σε ένα <schema>\n"
# gconf/gconftool.c:1480
#: gconf/gconftool.c:3446
@@ -2463,7 +2501,8 @@ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δεν έχει καθοριστεί κλε
#: gconf/gconftool.c:3565
#, c-format
msgid "WARNING: node <%s> not understood below <%s>\n"
-msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Ο κόμβος <%s> δεν είναι κατανοητός χαμηλότερα από <%s>\n"
+msgstr ""
+"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Ο κόμβος <%s> δεν είναι κατανοητός χαμηλότερα από <%s>\n"
# gconf/gconftool.c:1639
#: gconf/gconftool.c:3596
@@ -2495,7 +2534,8 @@ msgstr "Το έγγραφο `%s' δεν έχει κόμβο <%s> κορυφαί
#: gconf/gconftool.c:3642
#, c-format
msgid "WARNING: node <%s> below <%s> not understood\n"
-msgstr "Προειδοποίηση: Ο κόμβος <%s> δεν είναι κατανοητός χαμηλότερα από το <%s>\n"
+msgstr ""
+"Προειδοποίηση: Ο κόμβος <%s> δεν είναι κατανοητός χαμηλότερα από το <%s>\n"
# gconf/gconftool.c:1696 gconf/gconftool.c:1728
#: gconf/gconftool.c:3653 gconf/gconftool.c:3688 gconf/gconftool.c:3720
@@ -2866,4 +2906,3 @@ msgstr ""
# gconf-editor/gconf-editor.c:42
#~ msgid "GEOMETRY"
#~ msgstr "ΓΕΩΜΕΤΡΙΑ"
-
diff --git a/po/es.po b/po/es.po
index fd4cd478..74aa72b4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,14 +7,14 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf.HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-03 23:03+0100\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\n"
"PO-Revision-Date: 2004-01-03 23:02+0100\n"
"Last-Translator: Francisco Javier F. Serrador <serrador@arrakis.es>\n"
"Language-Team: Spanish <traductores@es.gnome.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
"X-Generator: KBabel 1.0.2\n"
#: backends/dir-utils.c:108
diff --git a/po/eu.po b/po/eu.po
index 2f51107b..93095882 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -5,14 +5,14 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf-1-0 1.0.7\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-14 21:55-0500\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\n"
"PO-Revision-Date: 2001-05-25 13:35+0200\n"
"Last-Translator: Unmantained\n"
"Language-Team: Euskara\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
@@ -29,6 +29,33 @@ msgstr "Ezin izan du `%s' direktorioa egin: %s "
msgid "Can't read from or write to the %s root directory in the address `%s'"
msgstr "Ezin da `%s' helbidean %s erro-direktorioan idatzi edo irakurri"
+#: backends/gconf-merge-tree.c:78
+#, fuzzy, c-format
+msgid "Cannot find directory %s\n"
+msgstr "Ezin izan du `%s' direktorioa egin: %s "
+
+#: backends/gconf-merge-tree.c:94
+#, 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:120
+#, c-format
+msgid "Usage: %s <dir>\n"
+msgstr ""
+
+#: backends/gconf-merge-tree.c:126
+#, c-format
+msgid ""
+"Usage: %s <dir>\n"
+" Merges a markup backend filesystem hierarchy like:\n"
+" dir/%%gconf.xml\n"
+" subdir1/%%gconf.xml\n"
+" subdir2/%%gconf.xml\n"
+" to:\n"
+" dir/%%gconf-tree.xml\n"
+msgstr ""
+
#: backends/xml-backend.c:236
msgid "Unloading XML backend module."
msgstr "XML euskarri-modulua deskargatzen."
diff --git a/po/fa.po b/po/fa.po
index dee1a909..b0432701 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -5,14 +5,14 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-03 19:08+0330\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
diff --git a/po/fi.po b/po/fi.po
index daa6224b..2ad6d2f6 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -13,8 +13,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf 1.1.6\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-05 21:58+0200\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\n"
"PO-Revision-Date: 2004-02-05 23:33+0200\n"
"Last-Translator: Pauli Virtanen <pauli.virtanen@hut.fi>\n"
"Language-Team: Gnome Finnish Translation Team <gnome-fi-laatu@lists."
@@ -22,6 +21,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
diff --git a/po/fr.po b/po/fr.po
index f00c216d..17a1f1cc 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,14 +9,14 @@
msgid ""
msgstr ""
"Project-Id-Version: GConf 2.5.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-02 21:06+0100\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\n"
"PO-Revision-Date: 2004-01-02 20:55+0100\n"
"Last-Translator: Christophe Merlet (RedFox) <redfox@redfoxcenter.org>\n"
"Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
diff --git a/po/ga.po b/po/ga.po
index 6107c8d0..cf8b47f9 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -5,14 +5,14 @@
msgid ""
msgstr ""
"Project-Id-Version: GConf.pot HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-13 03:59+0100\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\n"
"PO-Revision-Date: 2004-01-13 18:23+0000\n"
"Last-Translator: Alastair McKinstry <mckinstry@computer.org>\n"
"Language-Team: Irish <ga@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8-bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
@@ -2049,6 +2049,3 @@ msgid ""
"directory:\n"
" %s\n"
msgstr ""
-
-msgid "%s"
-msgstr ""
diff --git a/po/gl.po b/po/gl.po
index dec188e2..2d9f13e0 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,14 +10,14 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-14 21:55-0500\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
@@ -34,6 +34,33 @@ msgstr "Non foi posible crear o directorio `%s': %s"
msgid "Can't read from or write to the %s root directory in the address `%s'"
msgstr "Non se pode ler ou escribir no directorio raíz de %s no enderezo `%s'"
+#: backends/gconf-merge-tree.c:78
+#, fuzzy, c-format
+msgid "Cannot find directory %s\n"
+msgstr "Non foi posible crear o directorio `%s': %s"
+
+#: backends/gconf-merge-tree.c:94
+#, 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:120
+#, c-format
+msgid "Usage: %s <dir>\n"
+msgstr ""
+
+#: backends/gconf-merge-tree.c:126
+#, c-format
+msgid ""
+"Usage: %s <dir>\n"
+" Merges a markup backend filesystem hierarchy like:\n"
+" dir/%%gconf.xml\n"
+" subdir1/%%gconf.xml\n"
+" subdir2/%%gconf.xml\n"
+" to:\n"
+" dir/%%gconf-tree.xml\n"
+msgstr ""
+
#: backends/xml-backend.c:236
msgid "Unloading XML backend module."
msgstr "Descargando o módulo XML."
@@ -2215,10 +2242,6 @@ msgstr ""
#~ "Eliminacións de directorios non sincronizadas ao desactivar o módulo XML"
#, fuzzy
-#~ msgid "Error listing subdirs of '%s': %s\n"
-#~ msgstr "Erro listando os directorios en `%s': %s"
-
-#, fuzzy
#~ msgid "Error unsetting '%s': %s\n"
#~ msgstr "Erro ao desestablecer `%s': %s\n"
diff --git a/po/hi.po b/po/hi.po
index 1a9f9e3e..53ae38bf 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -6,14 +6,14 @@
msgid ""
msgstr ""
"Project-Id-Version: GConf2.hi\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-24 17:25+0530\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\n"
"PO-Revision-Date: 2003-08-25 18:47+0530\n"
"Last-Translator: G Karunakar <karunakar@freedomink.org>\n"
"Language-Team: Hindi <indlinux-hindi-gnome@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
"net>\n"
"X-Generator: KBabel 1.0\n"
diff --git a/po/hr.po b/po/hr.po
index edd8a4ba..6e0725b5 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf 0\n"
-"POT-Creation-Date: 2004-02-01 16:54+0100\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\n"
"PO-Revision-Date: 2004-02-01 16:55+CET\n"
"Last-Translator: auto\n"
"Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -73,7 +73,8 @@ msgstr "Ne mogu naći XML početnu mapu na adresi `%s'"
#: 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 korjensku mapu na adresi \"%s\""
#: backends/xml-backend.c:453
@@ -90,7 +91,9 @@ msgstr "Greška kod sinkronizacije XML pozadinskog međuspremnika mapa: %s"
msgid ""
"Remove directory operation is no longer supported, just remove all the "
"values in the directory"
-msgstr "Više nije podržana aktivnost brisanja mapa, samo obrišite sve vrijednosti u mapi"
+msgstr ""
+"Više nije podržana aktivnost brisanja mapa, samo obrišite sve vrijednosti u "
+"mapi"
#: backends/xml-backend.c:770
#, c-format
@@ -193,7 +196,8 @@ msgstr "Stavka bez imena u XML datoteci `%s', zanemarujem"
#: backends/xml-dir.c:1182
#, c-format
msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
-msgstr "Vršni čvor u XML datoteci `%s' je <%s> radije nego <entry>, zanemarujem"
+msgstr ""
+"Vršni čvor u XML datoteci `%s' je <%s> radije nego <entry>, zanemarujem"
#: backends/xml-dir.c:1255
#, c-format
@@ -271,7 +275,8 @@ msgstr "Zanemarujem loš car iz XML para: %s"
#: backends/xml-entry.c:1155 backends/xml-entry.c:1178
msgid "parsing XML file: lists and pairs may not be placed inside a pair"
-msgstr "prevodim XML datoteku: popisi i parovi možda nisu smješteni unutar para"
+msgstr ""
+"prevodim XML datoteku: popisi i parovi možda nisu smješteni unutar para"
#: backends/xml-entry.c:1168
#, c-format
@@ -350,7 +355,8 @@ msgstr "Primljena ne neispravna vrijednost i zahtjevima postavki"
#: gconf/gconf-database.c:242
#, c-format
msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
-msgstr "Ne mogu shvatiti smisao CORBA vrijednosti primljenu u zahtjevu za tipku `%s'"
+msgstr ""
+"Ne mogu shvatiti smisao CORBA vrijednosti primljenu u zahtjevu za tipku `%s'"
#: gconf/gconf-database.c:524
msgid "Received request to drop all cached data"
@@ -362,7 +368,8 @@ msgstr "Primljen je zahtijev za sinkronizirano sinkroniziranje"
#: gconf/gconf-database.c:826
msgid "Fatal error: failed to get object reference for ConfigDatabase"
-msgstr "Kobna greška: Nisam uspio dohvatiti referencu objekta za ConfigDatabase"
+msgstr ""
+"Kobna greška: Nisam uspio dohvatiti referencu objekta za ConfigDatabase"
#: gconf/gconf-database.c:988
#, c-format
@@ -391,8 +398,8 @@ msgid ""
"Failed to log removal of listener to logfile (most likely harmless, may "
"result in a notification weirdly reappearing): %s"
msgstr ""
-"Nisam uspio zabilježiti micanje slušatelja u datoteku (najvjerojatnije bezopasno,"
-" može prouzročiti da se obavijest čudno ponavlja): %s "
+"Nisam uspio zabilježiti micanje slušatelja u datoteku (najvjerojatnije "
+"bezopasno, može prouzročiti da se obavijest čudno ponavlja): %s "
#: gconf/gconf-database.c:1246 gconf/gconf-sources.c:1541
#, c-format
@@ -635,8 +642,9 @@ msgid ""
"Failed to lock '%s': probably another process has the lock, or your "
"operating system has NFS file locking misconfigured (%s)"
msgstr ""
-"Nisam uspio zaključati '%s': vjerojatno drugi proces ima ključ ili je su loše "
-"postavke zaključavanja datoteka (%s) za NFS na vašem operativnom sustavu."
+"Nisam uspio zaključati '%s': vjerojatno drugi proces ima ključ ili je su "
+"loše postavke zaključavanja datoteka (%s) za NFS na vašem operativnom "
+"sustavu."
#: gconf/gconf-internals.c:2408
#, c-format
@@ -650,7 +658,8 @@ msgstr "gconftool ili drugi ne gconf proces ima datoteku zaključavanja '%s'"
#: gconf/gconf-internals.c:2455
msgid "couldn't contact ORB to resolve existing gconfd object reference"
-msgstr "Nisam mogao kontaktirati ORB za rješavanje postojeće reference gconfd objekta"
+msgstr ""
+"Nisam mogao kontaktirati ORB za rješavanje postojeće reference gconfd objekta"
#: gconf/gconf-internals.c:2465
#, c-format
@@ -710,7 +719,9 @@ msgstr "Greška kod ping-anja poslužitelja: %s "
#: gconf/gconf-internals.c:2899
#, c-format
msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
-msgstr "Nisam uspio stvoriti \"cijev\" za komunikaciju s ponovno pokrenutim gconf servisom: %s\n"
+msgstr ""
+"Nisam uspio stvoriti \"cijev\" za komunikaciju s ponovno pokrenutim gconf "
+"servisom: %s\n"
#: gconf/gconf-internals.c:2923
#, c-format
@@ -727,8 +738,8 @@ msgid ""
msgstr ""
"Nisam uspio spojiti se s poslužiteljem postavki; jedan od mogućih razloga je "
"da trebate omogućiti TCP/IP protokol za ORBit ili imate zaostale NFS "
-"zaključane datoteke zbog pada sustava. Za informacije pogledajte "
-"http://www.gnome.org/projects/gconf/. (Detalji - %s)"
+"zaključane datoteke zbog pada sustava. Za informacije pogledajte http://www."
+"gnome.org/projects/gconf/. (Detalji - %s)"
#: gconf/gconf-internals.c:2949
msgid "none"
@@ -745,9 +756,11 @@ msgid ""
"Run '%s --help' to see a full list of available command line options.\n"
msgstr ""
"Greška na opciji %s: %s.\n"
-"Pokrenite '%s --help' za potpuni popis svih opcija mogućih u naredbenoj liniji.\n"
+"Pokrenite '%s --help' za potpuni popis svih opcija mogućih u naredbenoj "
+"liniji.\n"
#: gconf/gconf-sanity-check.c:141 gconf/gconf-sanity-check.c:166
+#, c-format
msgid ""
"Please contact your system administrator to resolve the following problem:\n"
"Could not open or create the file \"%s\"; this indicates that there may be a "
@@ -756,10 +769,12 @@ msgid ""
msgstr ""
"Stupite u vezu s vašim administratorom radi razrješenja sljedećeg problema:\n"
"Nije moguće otvoriti ili napraviti datoteku „%s“; to znači da možda postoji "
-"problem sa vašim podešavanjima, s obzirom da mnogi programi trebaju napraviti "
-"datoteke u vašem osobnom direktoriju. Greška je bila „%s“ (errno = %d)."
+"problem sa vašim podešavanjima, s obzirom da mnogi programi trebaju "
+"napraviti datoteke u vašem osobnom direktoriju. Greška je bila „%s“ (errno "
+"= %d)."
#: gconf/gconf-sanity-check.c:180
+#, c-format
msgid ""
"Please contact your system administrator to resolve the following problem:\n"
"Could not lock the file \"%s\"; this indicates that there may be a problem "
@@ -770,9 +785,9 @@ msgid ""
"%d)."
msgstr ""
"Stupite u vezu s vašim administratorom radi razrješenja sljedećeg problema:\n"
-"Nije moguće zaključati datoteku „%s“; to znači da možda postoji problem "
-"u postavkama vašeg sustava. Ukoliko se vaš osobni direktorij montira preko "
-"NFS-a, moguće je da ili klijent ili poslužitelj nisu ispravno podešeni. "
+"Nije moguće zaključati datoteku „%s“; to znači da možda postoji problem u "
+"postavkama vašeg sustava. Ukoliko se vaš osobni direktorij montira preko NFS-"
+"a, moguće je da ili klijent ili poslužitelj nisu ispravno podešeni. "
"Pogledajte uputstva za rpc.statd i rpc.lockd. Česti uzrok ove greške je da "
"je onemogućen program „nfslock“. Greška je bila „%s“ (errno = %d)."
@@ -782,12 +797,14 @@ msgid "Can't remove file %s: %s\n"
msgstr "Ne mogu premjestiti datoteku %s: %s\n"
#: gconf/gconf-sanity-check.c:233
+#, c-format
msgid ""
"Please contact your system administrator to resolve the following problem:\n"
"No configuration sources in the configuration file \"%s\"; this means that "
"preferences and other settings can't be saved. %s%s"
msgstr ""
-"Stupite u vezu sa vašim administratorom radi razrješenja sljedećeg problema:\n"
+"Stupite u vezu sa vašim administratorom radi razrješenja sljedećeg "
+"problema:\n"
"Nema izvora podešavanja u datoteci sa postavkama „%s“; to znači da se "
"postavke i ostala podešavanja ne mogu sačuvati. %s%s"
@@ -796,11 +813,13 @@ msgid "Error reading the file: "
msgstr "Greška kod čitanja datoteke: "
#: gconf/gconf-sanity-check.c:259
+#, c-format
msgid ""
"Please contact your system administrator to resolve the following problem:\n"
"Could not resolve the address \"%s\" in the configuration file \"%s\": %s"
msgstr ""
-"Stupite u vezu sa vašim administratorom radi razrješenja sljedećeg problema:\n"
+"Stupite u vezu sa vašim administratorom radi razrješenja sljedećeg "
+"problema:\n"
"Nije moguće pronaći adresu „%s“ iz datoteke sa postavkama „%s“: %s"
#: gconf/gconf-sanity-check.c:320
@@ -820,8 +839,8 @@ msgstr ""
"Možda ste prijavljeni s nekog drugog računala, i vaša druga sesija koristi "
"datoteke s vašim postavkama.\n"
"\n"
-"Možete nastaviti koristiti tekuću sesiju, ali ovo može izazvati "
-"privremene probleme s postavkama u drugim sesijama.\n"
+"Možete nastaviti koristiti tekuću sesiju, ali ovo može izazvati privremene "
+"probleme s postavkama u drugim sesijama.\n"
"\n"
"Želite li nastaviti?"
@@ -844,7 +863,8 @@ msgid "Schema contains invalid UTF-8"
msgstr "Shema sadrži neispravni 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 "Shema navodi popis vrsta ali ne navodi vrstu popisa elemenata"
#: gconf/gconf-schema.c:264
@@ -866,12 +886,16 @@ msgstr "Riješena adresa \"%s\" u zapisivajućem izvoru postavki na mjestu %d"
#: gconf/gconf-sources.c:352
#, c-format
msgid "Resolved address \"%s\" to a read-only config source at position %d"
-msgstr "Riješena adresa \"%s\" u izvoru postavki koji se može samo čitati na mjestu %d"
+msgstr ""
+"Riješena adresa \"%s\" u izvoru postavki koji se može samo čitati na mjestu %"
+"d"
#: gconf/gconf-sources.c:359
#, c-format
-msgid "Resolved address \"%s\" to a partially writable config source at position %d"
-msgstr "Riješena adresa \"%s\" u djelomično zapisivajući izvor postavki na mjestu %d"
+msgid ""
+"Resolved address \"%s\" to a partially writable config source at position %d"
+msgstr ""
+"Riješena adresa \"%s\" u djelomično zapisivajući izvor postavki na mjestu %d"
#: gconf/gconf-sources.c:368
msgid ""
@@ -900,6 +924,7 @@ msgstr ""
"putanje vaših postavki"
#: gconf/gconf-sources.c:692
+#, c-format
msgid ""
"Unable to store a value at key '%s', as the configuration server has no "
"writable databases. There are some common causes of this problem: 1) your "
@@ -918,24 +943,24 @@ msgid ""
"home directory, and it must own a lockfile in ~/.gconfd and also lockfiles "
"in individual storage locations such as ~/.gconf"
msgstr ""
-"Ne može se spremiti vrijednost ključa „%s“, jer poslužitelj za podešavanja nema "
-"baza u koje može pisati. Postoji nekoliko uobičajenih uzroka ovog problema: 1) vaša "
-"datoteka sa putanjom podešavanja %s/path ne sadrži nijednu bazu ili nije "
-"nađena, 2) nekako smo pogrešno pokrenuli dva gconfd procesa, 3) vaš "
-"operativni sustav je neispravno podešen pa NFS zaključavanje datoteka ne radi u "
-"vašem osobnom direktoriju, ili 4) vaš NFS klijent računalo ne radi ispravno, pa nije "
-"odgovarajuće obavijestio poslužitelj pri ponovnom pokretanju kako bi ovaj otpustio "
-"zaključane datoteke. Ukoliko imate dva pokrenuta gconfd procesa (ili ste "
-"imali dva kada je pokrenut drugi), odjava, ubijanje svih primjeraka gconfd-a, "
-"i ponovna prijava mogu pomoći. Ukoliko imate zaostalih zaključavanja, "
-"uklonite ~/.gconf*/*lock. Možda je problem u tome da ste pokušali "
-"koristiti GKonf sa dva računala istovremeno, a ORBit-ova uobičajena "
-"podešavanja onemogućavaju udaljeni CORBA pristup — stavite „ORBIIOPIPv4=1“ "
-"u /etc/orbitrc. Kao i uvijek, provjerite user.* sustavski dnevnik za detalje o "
-"problemima na koje je gconfd naišao. Može postojati samo jedan gconfd za "
-"svaki osobni direktorij, i mora imati datoteku za zaključavanje u ~/.gconfd "
-"i datoteke za zaključavanje u pojedinačnim mjestima za pohranu kao što je "
-"~/.gconf"
+"Ne može se spremiti vrijednost ključa „%s“, jer poslužitelj za podešavanja "
+"nema baza u koje može pisati. Postoji nekoliko uobičajenih uzroka ovog "
+"problema: 1) vaša datoteka sa putanjom podešavanja %s/path ne sadrži nijednu "
+"bazu ili nije nađena, 2) nekako smo pogrešno pokrenuli dva gconfd procesa, "
+"3) vaš operativni sustav je neispravno podešen pa NFS zaključavanje datoteka "
+"ne radi u vašem osobnom direktoriju, ili 4) vaš NFS klijent računalo ne radi "
+"ispravno, pa nije odgovarajuće obavijestio poslužitelj pri ponovnom "
+"pokretanju kako bi ovaj otpustio zaključane datoteke. Ukoliko imate dva "
+"pokrenuta gconfd procesa (ili ste imali dva kada je pokrenut drugi), odjava, "
+"ubijanje svih primjeraka gconfd-a, i ponovna prijava mogu pomoći. Ukoliko "
+"imate zaostalih zaključavanja, uklonite ~/.gconf*/*lock. Možda je problem u "
+"tome da ste pokušali koristiti GKonf sa dva računala istovremeno, a ORBit-"
+"ova uobičajena podešavanja onemogućavaju udaljeni CORBA pristup — stavite "
+"„ORBIIOPIPv4=1“ u /etc/orbitrc. Kao i uvijek, provjerite user.* sustavski "
+"dnevnik za detalje o problemima na koje je gconfd naišao. Može postojati "
+"samo jedan gconfd za svaki osobni direktorij, i mora imati datoteku za "
+"zaključavanje u ~/.gconfd i datoteke za zaključavanje u pojedinačnim "
+"mjestima za pohranu kao što je ~/.gconf"
#: gconf/gconf-sources.c:1414
#, c-format
@@ -1034,7 +1059,8 @@ msgstr "Ne mogu dodati obavijest izvoru lokalne postavke"
#: gconf/gconf.c:2097
#, c-format
msgid "Adding client to server's list failed, CORBA error: %s"
-msgstr "Nije uspjelo dodavanje klijenta poslužiteljevom popisu, greška CORBA-e: %s"
+msgstr ""
+"Nije uspjelo dodavanje klijenta poslužiteljevom popisu, greška CORBA-e: %s"
#: gconf/gconf.c:2452
msgid "Must begin with a slash (/)"
@@ -1111,11 +1137,15 @@ msgstr ""
#: gconf/gconfd.c:296
#, c-format
-msgid "No configuration files found, trying to use the default config source `%s'"
-msgstr "Nisu nađene datoteke s postavkama, pokušavam koristiti uobičajeni izvor postavki `%s'"
+msgid ""
+"No configuration files found, trying to use the default config source `%s'"
+msgstr ""
+"Nisu nađene datoteke s postavkama, pokušavam koristiti uobičajeni izvor "
+"postavki `%s'"
#. We want to stay alive but do nothing, because otherwise every
-#. request would result in another failed gconfd being spawned.
+#. request would result in another failed gconfd being spawned.
+#.
#: gconf/gconfd.c:304
#, c-format
msgid ""
@@ -1149,12 +1179,16 @@ msgstr ""
#: gconf/gconfd.c:372
#, c-format
msgid "Received signal %d, dumping core. Please report a GConf bug."
-msgstr "Primljen je signal %d, ispisujem jezgru. Molim, prijavite grešku GConf-a."
+msgstr ""
+"Primljen je signal %d, ispisujem jezgru. Molim, prijavite grešku GConf-a."
#: gconf/gconfd.c:390
#, c-format
-msgid "Received signal %d, shutting down abnormally. Please file a GConf bug report."
-msgstr "Primljen je signal %d, nenormalno isključujem. Molim, evidentirajte izvještaj greške GConf-a"
+msgid ""
+"Received signal %d, shutting down abnormally. Please file a GConf bug report."
+msgstr ""
+"Primljen je signal %d, nenormalno isključujem. Molim, evidentirajte "
+"izvještaj greške GConf-a"
#: gconf/gconfd.c:407
#, c-format
@@ -1182,7 +1216,7 @@ msgid "Bad permissions %lo on directory %s"
msgstr "Loše dozvole %lo na mapi %s"
#. openlog() does not copy logname - what total brokenness.
-#. So we free it at the end of main()
+#. So we free it at the end of main()
#: gconf/gconfd.c:586
#, c-format
msgid "starting (version %s), pid %u user '%s'"
@@ -1200,7 +1234,9 @@ msgstr "Mapa %s ima problem, gconfd ju ne može koristiti"
#: gconf/gconfd.c:675
#, c-format
msgid "Failed to write byte to pipe fd %d so client program may hang: %s"
-msgstr "Nisam uspio zapisati bajt u cijevovod fd %d, stoga klijentov program može prestati raditi: %s"
+msgstr ""
+"Nisam uspio zapisati bajt u cijevovod fd %d, stoga klijentov program može "
+"prestati raditi: %s"
#: gconf/gconfd.c:685
#, c-format
@@ -1231,13 +1267,16 @@ msgid ""
"Failed to open gconfd logfile; won't be able to restore listeners after "
"gconfd shutdown (%s)"
msgstr ""
-"Nisam uspio otvoriti datoteku dnevnika gconfd-a; neću moći vratiti slučatelje "
-"nakon što se gconfd isključi (%s)"
+"Nisam uspio otvoriti datoteku dnevnika gconfd-a; neću moći vratiti "
+"slučatelje nakon što se gconfd isključi (%s)"
#: gconf/gconfd.c:1258
#, c-format
-msgid "Failed to close gconfd logfile; data may not have been properly saved (%s)"
-msgstr "Nisam uspio zatvoriti gconf datoteku s dnevnikom; podaci mogu biti neispravno spremljeni (%s)"
+msgid ""
+"Failed to close gconfd logfile; data may not have been properly saved (%s)"
+msgstr ""
+"Nisam uspio zatvoriti gconf datoteku s dnevnikom; podaci mogu biti "
+"neispravno spremljeni (%s)"
#: gconf/gconfd.c:1327
#, c-format
@@ -1262,17 +1301,23 @@ msgstr "Ne mogu premjestiti sa strane staru spremljenu datoteku '%s': %s"
#: gconf/gconfd.c:1374
#, c-format
msgid "Failed to move new save state file into place: %s"
-msgstr "Nisam uspio premjestiti novo spremljenu datoteku sa stanjima na mjesto: %s"
+msgstr ""
+"Nisam uspio premjestiti novo spremljenu datoteku sa stanjima na mjesto: %s"
#: gconf/gconfd.c:1383
#, c-format
-msgid "Failed to restore original saved state file that had been moved to '%s': %s"
-msgstr "Nisam uspio obnoviti izvorno spremljenu datoteku stanja koja je bila premještena u '%s': %s"
+msgid ""
+"Failed to restore original saved state file that had been moved to '%s': %s"
+msgstr ""
+"Nisam uspio obnoviti izvorno spremljenu datoteku stanja koja je bila "
+"premještena u '%s': %s"
#: gconf/gconfd.c:1854
#, c-format
-msgid "Unable to restore a listener on address '%s', couldn't resolve the database"
-msgstr "Ne mozu obnoviti slušatelja na adresi '%s', ne mogu riješiti baru podataka"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
+msgstr ""
+"Ne mozu obnoviti slušatelja na adresi '%s', ne mogu riješiti baru podataka"
#: gconf/gconfd.c:1900
#, c-format
@@ -1290,8 +1335,9 @@ msgid ""
"Failed to log addition of listener to gconfd logfile; won't be able to re-"
"add the listener if gconfd exits or shuts down (%s)"
msgstr ""
-"Nisam uspio zabilježiti dodatke slušatelja u datoteku dnevnika gconfd-a; neću "
-"moći ponovno dodati slušatelja ukoliko se gconfd isključi ili prekine (%s)"
+"Nisam uspio zabilježiti dodatke slušatelja u datoteku dnevnika gconfd-a; "
+"neću moći ponovno dodati slušatelja ukoliko se gconfd isključi ili prekine (%"
+"s)"
#: gconf/gconfd.c:2078
#, c-format
@@ -1299,8 +1345,9 @@ msgid ""
"Failed to log removal of listener to gconfd logfile; might erroneously re-"
"add the listener if gconfd exits or shuts down (%s)"
msgstr ""
-"Nisam uspio zabilježiti micanje slušatelja u datoteku dnevnika gconfd-a; moguće "
-"je s greškama ponovno dodavanje slušatelja ukoliko se gconfd isključi ili prekine (%s)"
+"Nisam uspio zabilježiti micanje slušatelja u datoteku dnevnika gconfd-a; "
+"moguće je s greškama ponovno dodavanje slušatelja ukoliko se gconfd isključi "
+"ili prekine (%s)"
#: gconf/gconfd.c:2101 gconf/gconfd.c:2275
#, c-format
@@ -1315,15 +1362,19 @@ msgstr "Nisam uspio otvoriti spremljenu datoteku sa stanjima: %s"
#: gconf/gconfd.c:2129
#, c-format
msgid "Failed to write client add to saved state file: %s"
-msgstr "Nisam uspio zapisati klijentove dodatke u spremljenu datoteku stanja: %s"
+msgstr ""
+"Nisam uspio zapisati klijentove dodatke u spremljenu datoteku stanja: %s"
#: gconf/gconfd.c:2137
#, c-format
msgid "Failed to flush client add to saved state file: %s"
-msgstr "Nisam uspio prebaciti klijentove dodatke u spremljenu datoteku sa stanjima: %s "
+msgstr ""
+"Nisam uspio prebaciti klijentove dodatke u spremljenu datoteku sa stanjima: %"
+"s "
#: gconf/gconfd.c:2236
-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 "Neki klijenti su se izbrisali i GConf poslužitelja kad nije bio dodan."
#: gconf/gconftool.c:93
@@ -1339,8 +1390,8 @@ msgid ""
"Set a schema and sync. Use with --short-desc, --long-desc, --owner, and --"
"type."
msgstr ""
-"Postavlja shemu i sinkronizira. Koristite s --short-desc, --long-desc, "
-"--owner i --type."
+"Postavlja shemu i sinkronizira. Koristite s --short-desc, --long-desc, --"
+"owner i --type."
#: gconf/gconftool.c:121
msgid "Unset the keys on the command line"
@@ -1405,8 +1456,8 @@ msgid ""
"Specify the type of the value being set, or the type of the value a schema "
"describes. Unique abbreviations OK."
msgstr ""
-"Odredite vrstu vrijednosti koja treba biti postavljena ili vrstu "
-"vrijednosti koji shema opisuje. Unikatne skraćenice su uredu."
+"Odredite vrstu vrijednosti koja treba biti postavljena ili vrstu vrijednosti "
+"koji shema opisuje. Unikatne skraćenice su uredu."
#: gconf/gconftool.c:221
msgid "int|bool|float|string|list|pair"
@@ -1502,9 +1553,9 @@ msgid ""
"GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
"config source or set to the empty string to use the default."
msgstr ""
-"Ispravno postavlja datoteke shema, date u naredbi, na odgovarajući način u bazu. "
-"GCONF_CONFIG_SOURCE varijabla okruženja treba biti postavljena na "
-"ne-predefinirani izvor podešavanja, ili biti prazna za upotrebu uobičajenog."
+"Ispravno postavlja datoteke shema, date u naredbi, na odgovarajući način u "
+"bazu. GCONF_CONFIG_SOURCE varijabla okruženja treba biti postavljena na ne-"
+"predefinirani izvor podešavanja, ili biti prazna za upotrebu uobičajenog."
#: gconf/gconftool.c:346
msgid ""
@@ -1513,8 +1564,8 @@ msgid ""
"config source or set to the empty string to use the default."
msgstr ""
"Uklanja datoteke shema, date u naredbi, na odgovarajući način iz baze. "
-"GCONF_CONFIG_SOURCE varijabla okruženja treba biti postavljena na "
-"ne-predefinirani izvor podešavanja, ili biti prazna za upotrebu uobičajenog."
+"GCONF_CONFIG_SOURCE varijabla okruženja treba biti postavljena na ne-"
+"predefinirani izvor podešavanja, ili biti prazna za upotrebu uobičajenog."
#: gconf/gconftool.c:355
msgid ""
@@ -1546,7 +1597,8 @@ msgstr "Dohvatite ime sheme primjenjenu na ovaj ključ"
#: gconf/gconftool.c:400
msgid "Specify the schema name followed by the key to apply the schema name to"
-msgstr "Odredite ime sheme za sljedeći ključ na koji se treba primjeniti ime sheme"
+msgstr ""
+"Odredite ime sheme za sljedeći ključ na koji se treba primjeniti ime sheme"
#: gconf/gconftool.c:409
msgid "Remove any schema name applied to the given keys"
@@ -1593,8 +1645,8 @@ msgid ""
"--set_schema should not be used with --get, --set, --unset, --all-entries, --"
"all-dirs\n"
msgstr ""
-"--set_schema nebi trebalo biti korišteno s --get, --set, --unset, "
-"--all-entries, --all-dirs\n"
+"--set_schema nebi trebalo biti korišteno s --get, --set, --unset, --all-"
+"entries, --all-dirs\n"
#: gconf/gconftool.c:595
msgid "Value type is only relevant when setting a value\n"
@@ -1612,12 +1664,15 @@ msgid "%s option must be used by itself.\n"
msgstr "%s opcija mora samu sebe koristiti.\n"
#: gconf/gconftool.c:702
-msgid "You must specify a config source with --config-source when using --direct\n"
-msgstr "Trebate odrediti izvor postavki s --config-source kad koristite --direct\n"
+msgid ""
+"You must specify a config source with --config-source when using --direct\n"
+msgstr ""
+"Trebate odrediti izvor postavki s --config-source kad koristite --direct\n"
#: gconf/gconftool.c:708
msgid "You should use --direct when using a non-default configuration source\n"
-msgstr "Trebali biste koristiti --direct kad koristite neuobičajene izvore postavki\n"
+msgstr ""
+"Trebali biste koristiti --direct kad koristite neuobičajene izvore postavki\n"
#: gconf/gconftool.c:714
#, c-format
@@ -1626,11 +1681,15 @@ msgstr "Nisam uspio pokrenuti GConf: %s\n"
#: gconf/gconftool.c:743
msgid "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, not installing schemas\n"
-msgstr "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL je postavljen, ne instaliram sheme\n"
+msgstr ""
+"GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL je postavljen, ne instaliram sheme\n"
#: gconf/gconftool.c:750
-msgid "GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL is set, not uninstalling schemas\n"
-msgstr "GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL je postavljen, ne mogu deinstalirati sheme\n"
+msgid ""
+"GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL is set, not uninstalling schemas\n"
+msgstr ""
+"GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL je postavljen, ne mogu deinstalirati "
+"sheme\n"
#: gconf/gconftool.c:763
msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
@@ -1752,7 +1811,8 @@ msgid "When setting a list you must specify a primitive list-type\n"
msgstr "Kod postavljanja popisa, morate odrediti osnovnu vrstu poste\n"
#: gconf/gconftool.c:1750
-msgid "When setting a pair you must specify a primitive car-type and cdr-type\n"
+msgid ""
+"When setting a pair you must specify a primitive car-type and cdr-type\n"
msgstr "Kod postavljanje para morate odrediti osnovne car-type cdr-type\n"
#: gconf/gconftool.c:1765
@@ -1830,7 +1890,9 @@ msgstr "Vrijednost na '%s' nije shema\n"
#: gconf/gconftool.c:2097
msgid "Must specify a schema name followed by the key name to apply it to\n"
-msgstr "Morate odrediti ime sheme koja slijedi nakon imena ključa na koji se primjenjuje\n"
+msgstr ""
+"Morate odrediti ime sheme koja slijedi nakon imena ključa na koji se "
+"primjenjuje\n"
#: gconf/gconftool.c:2104
#, c-format
@@ -1852,15 +1914,21 @@ msgstr "Morate odrediti ključ (ime sheme) kao jedini argument\n"
#: gconf/gconftool.c:2199
msgid "List type must be a primitive type: string, int, float or bool\n"
-msgstr "Vrsta popisa mora biti osnovne vrste: niz znakova, logička oznaka, cijeli ili broj s pomičnim zarezom\n"
+msgstr ""
+"Vrsta popisa mora biti osnovne vrste: niz znakova, logička oznaka, cijeli "
+"ili broj s pomičnim zarezom\n"
#: gconf/gconftool.c:2219
msgid "Pair car type must be a primitive type: string, int, float or bool\n"
-msgstr "Par vrste car mora biti osnovne vrste: niz znakova, logička oznaka, cijeli ili broj s pomičnim zarezom\n"
+msgstr ""
+"Par vrste car mora biti osnovne vrste: niz znakova, logička oznaka, cijeli "
+"ili broj s pomičnim zarezom\n"
#: gconf/gconftool.c:2239
msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
-msgstr "Par vrste cdr mora biti osnovne vrste: niz znakova, logička oznaka, cijeli ili broj s pomičnim zarezom\n"
+msgstr ""
+"Par vrste cdr mora biti osnovne vrste: niz znakova, logička oznaka, cijeli "
+"ili broj s pomičnim zarezom\n"
#: gconf/gconftool.c:2254
#, c-format
@@ -1874,11 +1942,14 @@ msgstr "Greška kod sinkronizacije: %s"
#: gconf/gconftool.c:2283
msgid "Must specify one or more directories to get key/value pairs from.\n"
-msgstr "Morate odrediti jedanu ili više mapa iz koje će biti dohvaćeno ključ/vrijednost para .\n"
+msgstr ""
+"Morate odrediti jedanu ili više mapa iz koje će biti dohvaćeno ključ/"
+"vrijednost para .\n"
#: gconf/gconftool.c:2297
msgid "Must specify one or more keys to unset.\n"
-msgstr "Za micanje postavki morate odrediti jednu ili više mapa za dohvaćanje.\n"
+msgstr ""
+"Za micanje postavki morate odrediti jednu ili više mapa za dohvaćanje.\n"
#: gconf/gconftool.c:2308
#, c-format
@@ -1929,7 +2000,8 @@ msgstr "UPOZORENJE: Nisam uspio prevesti vrijednost cijelog broja `%s'\n"
#: gconf/gconftool.c:2637
#, c-format
msgid "WARNING: Failed to parse float value `%s'\n"
-msgstr "UPOZORENJE: Nisam uspio prevesti vrijednost broja s pomičnim zarezom `%s'\n"
+msgstr ""
+"UPOZORENJE: Nisam uspio prevesti vrijednost broja s pomičnim zarezom `%s'\n"
#: gconf/gconftool.c:2659
#, c-format
@@ -1959,12 +2031,14 @@ msgstr "UPOZORENJE: neispravni ili nedostaje list_type za shemu (%s)\n"
#: gconf/gconftool.c:2921 gconf/gconftool.c:2951 gconf/gconftool.c:2980
#, c-format
msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
-msgstr "UPOZORENJE: Nisam uspio prevesti uobičajenu vrijednost `%s' za shemu (%s)\n"
+msgstr ""
+"UPOZORENJE: Nisam uspio prevesti uobičajenu vrijednost `%s' za shemu (%s)\n"
#: gconf/gconftool.c:2939
#, c-format
msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
-msgstr "UPOZORENJE: neispravni ili nedostaje car_type ili cdr_type za shemu (%s)\n"
+msgstr ""
+"UPOZORENJE: neispravni ili nedostaje car_type ili cdr_type za shemu (%s)\n"
#: gconf/gconftool.c:2964
msgid "WARNING: You cannot set a default value for a schema\n"
@@ -1982,18 +2056,25 @@ msgstr "UPOZORENJE: nisam uspio prevesti vrstu imena `%s'\n"
#: gconf/gconftool.c:3058
#, 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 cijeli broj, broj s pomičnim zarezom ili logička vrijednost, 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 cijeli broj, broj s pomičnim zarezom "
+"ili logička vrijednost, a ne `%s'\n"
#: gconf/gconftool.c:3079
#, c-format
msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
-msgstr "UPOZORENJE: vrsta car može biti samo cijeli broj, broj s pomičnim zarezom, niz znakova ili logička oznaka ali ne `%s'\n"
+msgstr ""
+"UPOZORENJE: vrsta car može biti samo cijeli broj, broj s pomičnim zarezom, "
+"niz znakova ili logička oznaka ali ne `%s'\n"
#: gconf/gconftool.c:3100
#, c-format
msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
-msgstr "UPOZORENJE: vrsta cdr može biti samo cijeli broj, broj s pomičnim zarezom, niz znakova ili logička oznaka ali ne `%s'\n"
+msgstr ""
+"UPOZORENJE: vrsta cdr može biti samo cijeli broj, broj s pomičnim zarezom, "
+"niz znakova ili logička oznaka ali ne `%s'\n"
#: gconf/gconftool.c:3140
msgid "WARNING: empty <applyto> node"
@@ -2018,12 +2099,16 @@ msgstr "UPOZORENJE: nije određen <cdr_type> za shemu u vrsti parova\n"
#: gconf/gconftool.c:3195
msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
-msgstr "UPOZORENJE: <locale> čvor nema `name=\"locale\"' atribut, zanemarujem\n"
+msgstr ""
+"UPOZORENJE: <locale> čvor nema `name=\"locale\"' atribut, zanemarujem\n"
#: gconf/gconftool.c:3201
#, c-format
-msgid "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
-msgstr "UPOZORENJE: višestruki <locale> čvorovi za lokale `%s', zanemarujem sve prošle\n"
+msgid ""
+"WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
+msgstr ""
+"UPOZORENJE: višestruki <locale> čvorovi za lokale `%s', zanemarujem sve "
+"prošle\n"
#: gconf/gconftool.c:3299
#, c-format
@@ -2081,7 +2166,8 @@ msgstr "Dokument `%s' je prazan?\n"
#: gconf/gconftool.c:3615
#, c-format
msgid "Document `%s' has the wrong type of root node (<%s>, should be <%s>)\n"
-msgstr "Dokument `%s' ima krivu vrstu početnog čvora (<%s>, a trebao bi biti <%s>)\n"
+msgstr ""
+"Dokument `%s' ima krivu vrstu početnog čvora (<%s>, a trebao bi biti <%s>)\n"
#: gconf/gconftool.c:3628
#, c-format
@@ -2130,7 +2216,8 @@ msgid ""
"Trying to break your application by setting bad values for key:\n"
" %s\n"
msgstr ""
-"Pokušavam prekinuti vaš program postavljajući neispravne vrijendosti za ključ:\n"
+"Pokušavam prekinuti vaš program postavljajući neispravne vrijendosti za "
+"ključ:\n"
" %s\n"
#: gconf/gconftool.c:3911
@@ -2147,4 +2234,3 @@ msgstr ""
"Pokušavam prekinuti vaš program postavljajući neispravne vrijendosti za "
"ključeve u mapi:\n"
" %s\n"
-
diff --git a/po/hu.po b/po/hu.po
index ab1c5eef..f17b859e 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,14 +7,14 @@
msgid ""
msgstr ""
"Project-Id-Version: GConf CVS\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-14 21:55-0500\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\n"
"PO-Revision-Date: 2003-07-11 12:44+0200\n"
"Last-Translator: Andras Timar <timar@gnome.hu>\n"
"Language-Team: Hungarian <hu@gnome.hu>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
@@ -31,6 +31,33 @@ msgstr "Nem lehet a könyvtárat létrehozni `%s': %s"
msgid "Can't read from or write to the %s root directory in the address `%s'"
msgstr "Nem lehet olvasni vagy írni a %s gyökérkönyvtárban a(z) `%s' címen"
+#: backends/gconf-merge-tree.c:78
+#, fuzzy, c-format
+msgid "Cannot find directory %s\n"
+msgstr "Nem lehet a könyvtárat létrehozni `%s': %s"
+
+#: backends/gconf-merge-tree.c:94
+#, fuzzy, c-format
+msgid "Error saving GConf tree to '%s': %s\n"
+msgstr "Hiba a séma beállításakor `%s': %s"
+
+#: backends/gconf-merge-tree.c:120
+#, c-format
+msgid "Usage: %s <dir>\n"
+msgstr ""
+
+#: backends/gconf-merge-tree.c:126
+#, c-format
+msgid ""
+"Usage: %s <dir>\n"
+" Merges a markup backend filesystem hierarchy like:\n"
+" dir/%%gconf.xml\n"
+" subdir1/%%gconf.xml\n"
+" subdir2/%%gconf.xml\n"
+" to:\n"
+" dir/%%gconf-tree.xml\n"
+msgstr ""
+
#: backends/xml-backend.c:236
msgid "Unloading XML backend module."
msgstr "Nincs betöltve az XML háttérmodul."
diff --git a/po/id.po b/po/id.po
index d0467f24..1d6cff88 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,14 +6,14 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-14 21:55-0500\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
@@ -30,6 +30,33 @@ msgstr "Tidak dapat membuat direktori baru `%s': %s"
msgid "Can't read from or write to the %s root directory in the address `%s'"
msgstr "Tidak dapat membaca dan menulisi direktori root %s pada alamat `%s'"
+#: backends/gconf-merge-tree.c:78
+#, fuzzy, c-format
+msgid "Cannot find directory %s\n"
+msgstr "Tidak dapat membuat direktori baru `%s': %s"
+
+#: backends/gconf-merge-tree.c:94
+#, 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:120
+#, c-format
+msgid "Usage: %s <dir>\n"
+msgstr ""
+
+#: backends/gconf-merge-tree.c:126
+#, c-format
+msgid ""
+"Usage: %s <dir>\n"
+" Merges a markup backend filesystem hierarchy like:\n"
+" dir/%%gconf.xml\n"
+" subdir1/%%gconf.xml\n"
+" subdir2/%%gconf.xml\n"
+" to:\n"
+" dir/%%gconf-tree.xml\n"
+msgstr ""
+
#: backends/xml-backend.c:236
msgid "Unloading XML backend module."
msgstr "Sedang lakukan unload modul backend XML"
diff --git a/po/it.po b/po/it.po
index 18875c80..b4ce8111 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,14 +9,14 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-22 19:39+0100\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\n"
"PO-Revision-Date: 2004-02-23 22:50+0100\n"
"Last-Translator: Alessio Frusciante <algol@firenze.linux.it>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
@@ -31,7 +31,8 @@ msgstr "Impossibile creare la directory \"%s\": %s"
#: backends/dir-utils.c:212
#, c-format
msgid "Can't read from or write to the %s root directory in the address `%s'"
-msgstr "Impossibile leggere o scrivere nella directory radice %s all'indirizzo \"%s\""
+msgstr ""
+"Impossibile leggere o scrivere nella directory radice %s all'indirizzo \"%s\""
#: backends/gconf-merge-tree.c:78
#, c-format
@@ -385,7 +386,8 @@ msgstr "Ricevuta richiesta di sincronizzare in modo sincrono"
#: gconf/gconf-database.c:826
msgid "Fatal error: failed to get object reference for ConfigDatabase"
-msgstr "Errore fatale: impossibile ottenere un riferimento valido per ConfigDatabase "
+msgstr ""
+"Errore fatale: impossibile ottenere un riferimento valido per ConfigDatabase "
#: gconf/gconf-database.c:988
#, c-format
@@ -671,7 +673,8 @@ msgstr "Errore nell'apertura del file IOR \"%s\", gconfd non trovato: %s"
#: gconf/gconf-internals.c:2438
#, c-format
msgid "gconftool or other non-gconfd process has the lock file '%s'"
-msgstr "gconftool o un altro processo che non sia gconfd, ha il file di lock \"%s\""
+msgstr ""
+"gconftool o un altro processo che non sia gconfd, ha il file di lock \"%s\""
#: gconf/gconf-internals.c:2455
msgid "couldn't contact ORB to resolve existing gconfd object reference"
@@ -681,7 +684,8 @@ msgstr ""
#: gconf/gconf-internals.c:2465
#, c-format
msgid "Failed to convert IOR '%s' to an object reference"
-msgstr "Errore nella conversione dello IOR \"%s\" ad un riferimento ad un oggetto"
+msgstr ""
+"Errore nella conversione dello IOR \"%s\" ad un riferimento ad un oggetto"
#: gconf/gconf-internals.c:2515
#, c-format
@@ -821,8 +825,10 @@ msgid ""
"No configuration sources in the configuration file \"%s\"; this means that "
"preferences and other settings can't be saved. %s%s"
msgstr ""
-"Contattare l'amministratore di sistema per la risoluzione del problema seguente:\n"
-"Nessuna fonte di configurazione nel file \"%s\"; questo indica che non è possibile salvare preferenze ed altre impostazioni. %s%s"
+"Contattare l'amministratore di sistema per la risoluzione del problema "
+"seguente:\n"
+"Nessuna fonte di configurazione nel file \"%s\"; questo indica che non è "
+"possibile salvare preferenze ed altre impostazioni. %s%s"
#: gconf/gconf-sanity-check.c:236
msgid "Error reading the file: "
@@ -923,7 +929,9 @@ msgstr ""
msgid ""
"None of the resolved addresses are writable; saving configuration settings "
"will not be possible"
-msgstr "Nessuno degli indirizzi risolti è scrivibile; non sarà possibile salvare le impostazioni di configurazione"
+msgstr ""
+"Nessuno degli indirizzi risolti è scrivibile; non sarà possibile salvare le "
+"impostazioni di configurazione"
#: gconf/gconf-sources.c:584
#, c-format
@@ -1198,7 +1206,9 @@ msgstr ""
msgid ""
"No writable config sources successfully resolved, may not be able to save "
"some configuration changes"
-msgstr "Nessuna fonte di configurazione scrivibile tra gli indirizzi risolti, potrebbe non essere possibile salvare alcune modifiche alla configurazione"
+msgstr ""
+"Nessuna fonte di configurazione scrivibile tra gli indirizzi risolti, "
+"potrebbe non essere possibile salvare alcune modifiche alla configurazione"
#: gconf/gconfd.c:372
#, c-format
@@ -2064,7 +2074,9 @@ msgstr "ATTENZIONE: errore nell'analisi del nome del valore boolean \"%s\"\n"
#: gconf/gconftool.c:2796 gconf/gconftool.c:3332
#, c-format
msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
-msgstr "ATTENZIONE: errore nell'associazione dello schema \"%s\" con la chiave \"%s\": %s\n"
+msgstr ""
+"ATTENZIONE: errore nell'associazione dello schema \"%s\" con la chiave \"%s"
+"\": %s\n"
#: gconf/gconftool.c:2901
#, c-format
@@ -2079,7 +2091,8 @@ msgstr "ATTENZIONE: list_type mancante o errato per lo schema (%s).\n"
#: gconf/gconftool.c:2921 gconf/gconftool.c:2951 gconf/gconftool.c:2980
#, c-format
msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
-msgstr "ATTENZIONE: errore nell'analisi del valore \"%s\" per lo schema (%s).\n"
+msgstr ""
+"ATTENZIONE: errore nell'analisi del valore \"%s\" per lo schema (%s).\n"
#: gconf/gconftool.c:2939
#, c-format
@@ -2106,17 +2119,23 @@ msgstr "ATTENZIONE: errore nell'analisi del nome del tipo \"%s\"\n"
#, c-format
msgid ""
"WARNING: list_type can only be int, float, string or bool and not `%s'\n"
-msgstr "ATTENZIONE: list_type può essere solo int, float, string o bool e non \"%s\".\n"
+msgstr ""
+"ATTENZIONE: list_type può essere solo int, float, string o bool e non \"%s"
+"\".\n"
#: gconf/gconftool.c:3079
#, c-format
msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
-msgstr "ATTENZIONE: car_type può essere solo int, float, string o bool e non \"%s\".\n"
+msgstr ""
+"ATTENZIONE: car_type può essere solo int, float, string o bool e non \"%s"
+"\".\n"
#: gconf/gconftool.c:3100
#, c-format
msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
-msgstr "ATTENZIONE: cdr_type può essere solo int, float, string o bool e non \"%s\".\n"
+msgstr ""
+"ATTENZIONE: cdr_type può essere solo int, float, string o bool e non \"%s"
+"\".\n"
#: gconf/gconftool.c:3140
msgid "WARNING: empty <applyto> node"
@@ -2149,7 +2168,9 @@ msgstr ""
#, c-format
msgid ""
"WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
-msgstr "ATTENZIONE: nodi <locale> multipli per il locale \"%s\", verrà considerato solo il primo.\n"
+msgstr ""
+"ATTENZIONE: nodi <locale> multipli per il locale \"%s\", verrà considerato "
+"solo il primo.\n"
#: gconf/gconftool.c:3299
#, c-format
@@ -2168,7 +2189,8 @@ msgstr "Deve esserci almeno una voce <locale> in uno <schema>\n"
#: gconf/gconftool.c:3446
#, c-format
msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
-msgstr "ATTENZIONE: errore nell'installazione dello schema \"%s\" locale \"%s\": %s\n"
+msgstr ""
+"ATTENZIONE: errore nell'installazione dello schema \"%s\" locale \"%s\": %s\n"
#: gconf/gconftool.c:3454
#, c-format
@@ -2178,7 +2200,9 @@ msgstr "Schema \"%s\" installato per il locale \"%s\".\n"
#: gconf/gconftool.c:3478
#, c-format
msgid "WARNING: failed to uninstall schema `%s' locale `%s': %s\n"
-msgstr "ATTENZIONE: errore nella disinstallazione dello schema \"%s\" locale \"%s\": %s\n"
+msgstr ""
+"ATTENZIONE: errore nella disinstallazione dello schema \"%s\" locale \"%s\": "
+"%s\n"
#: gconf/gconftool.c:3486
#, c-format
@@ -2207,7 +2231,9 @@ msgstr "Il documento \"%s\" è vuoto?\n"
#: gconf/gconftool.c:3615
#, c-format
msgid "Document `%s' has the wrong type of root node (<%s>, should be <%s>)\n"
-msgstr "Il documento \"%s\" ha il tipo del nodo radice sbagliato (<%s>, dovrebbe essere <%s>).\n"
+msgstr ""
+"Il documento \"%s\" ha il tipo del nodo radice sbagliato (<%s>, dovrebbe "
+"essere <%s>).\n"
#: gconf/gconftool.c:3628
#, c-format
diff --git a/po/ja.po b/po/ja.po
index 35f3d586..22ee8fc0 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,14 +6,14 @@
msgid ""
msgstr ""
"Project-Id-Version: GConf HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-14 21:55-0500\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\n"
"PO-Revision-Date: 2003-10-28 00:16+0900\n"
"Last-Translator: KAMAGASAKO Masatoshi <emerald@gnome.gr.jp>\n"
"Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
@@ -31,6 +31,33 @@ msgid "Can't read from or write to the %s root directory in the address `%s'"
msgstr ""
"%s ルートディレクトリへの読み取り/書き込みは アドレス '%s' ではできません。"
+#: backends/gconf-merge-tree.c:78
+#, fuzzy, c-format
+msgid "Cannot find directory %s\n"
+msgstr "ディレクトリ '%s' を作成できませんでした: %s"
+
+#: backends/gconf-merge-tree.c:94
+#, fuzzy, c-format
+msgid "Error saving GConf tree to '%s': %s\n"
+msgstr "'%s' でスキーマの取得のエラー: %s\n"
+
+#: backends/gconf-merge-tree.c:120
+#, c-format
+msgid "Usage: %s <dir>\n"
+msgstr ""
+
+#: backends/gconf-merge-tree.c:126
+#, c-format
+msgid ""
+"Usage: %s <dir>\n"
+" Merges a markup backend filesystem hierarchy like:\n"
+" dir/%%gconf.xml\n"
+" subdir1/%%gconf.xml\n"
+" subdir2/%%gconf.xml\n"
+" to:\n"
+" dir/%%gconf-tree.xml\n"
+msgstr ""
+
#: backends/xml-backend.c:236
msgid "Unloading XML backend module."
msgstr "XML バックエンドモジュールを解放中です。"
diff --git a/po/ko.po b/po/ko.po
index e392e778..46338e0a 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,14 +5,14 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf 2.5.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-10 06:03+0900\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\n"
"PO-Revision-Date: 2004-01-30 03:46+0900\n"
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
"Language-Team: GNOME Korea <gnome-kr-hackers@lists.kldp.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
@@ -835,9 +835,11 @@ msgid ""
msgstr ""
"기본 설정이 들어 있는 파일이 현재 사용중입니다.\n"
"\n"
-"다른 컴퓨터에서 세션에 로그인했을 수도 있고, 또 다른 로그인 세션이 기본 설정 파일을 사용중일 수도 있습니다.\n"
+"다른 컴퓨터에서 세션에 로그인했을 수도 있고, 또 다른 로그인 세션이 기본 설정 "
+"파일을 사용중일 수도 있습니다.\n"
"\n"
-"현재 세션을 계속 사용할 수도 있지만, 다른 세션에서 그 기본 설정을 이용할 때 일시적으로 문제가 발생할 수도 있습니다.\n"
+"현재 세션을 계속 사용할 수도 있지만, 다른 세션에서 그 기본 설정을 이용할 때 "
+"일시적으로 문제가 발생할 수도 있습니다.\n"
"\n"
"이 세션을 계속 사용하시겠습니까?"
@@ -1145,7 +1147,9 @@ msgstr "설정 파일을 찾을 수 ㅇ벗습니다. 기본 설정 소스 `%s'
msgid ""
"No configuration sources in the source path, configuration won't be saved; "
"edit %s"
-msgstr "소스 경로에 설정 소스가 없습니다. 설정을 저장할 수 없습니다; %s을(를) 편집하십시오"
+msgstr ""
+"소스 경로에 설정 소스가 없습니다. 설정을 저장할 수 없습니다; %s을(를) 편집하"
+"십시오"
#: gconf/gconfd.c:317
#, c-format
diff --git a/po/lt.po b/po/lt.po
index 7e9af9eb..4586fc46 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,14 +7,14 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-31 10:32+0200\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\n"
"PO-Revision-Date: 2003-12-31 10:32+0200\n"
"Last-Translator: Žygimantas Beručka <uid0@tuxfamily.org>\n"
"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
diff --git a/po/lv.po b/po/lv.po
index e2428519..a00eec49 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -6,14 +6,14 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-14 21:55-0500\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
@@ -30,6 +30,33 @@ msgstr "Nevarēju izveidot direktoriju `%s' : %s"
msgid "Can't read from or write to the %s root directory in the address `%s'"
msgstr "Nevaru nolasīt vai ierakstīt %s saknes direktorijā adresē `%s'"
+#: backends/gconf-merge-tree.c:78
+#, fuzzy, c-format
+msgid "Cannot find directory %s\n"
+msgstr "Nevarēju izveidot direktoriju `%s' : %s"
+
+#: backends/gconf-merge-tree.c:94
+#, 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:120
+#, c-format
+msgid "Usage: %s <dir>\n"
+msgstr ""
+
+#: backends/gconf-merge-tree.c:126
+#, c-format
+msgid ""
+"Usage: %s <dir>\n"
+" Merges a markup backend filesystem hierarchy like:\n"
+" dir/%%gconf.xml\n"
+" subdir1/%%gconf.xml\n"
+" subdir2/%%gconf.xml\n"
+" to:\n"
+" dir/%%gconf-tree.xml\n"
+msgstr ""
+
#: backends/xml-backend.c:236
msgid "Unloading XML backend module."
msgstr "Izlādējam XML atbalstošo moduli."
diff --git a/po/mk.po b/po/mk.po
index c80b1bcc..528fd6b7 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -12,14 +12,14 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf.HEAD.mk\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-14 21:55-0500\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
"X-Generator: KBabel 1.0.1\n"
#: backends/dir-utils.c:108
@@ -38,6 +38,33 @@ msgid "Can't read from or write to the %s root directory in the address `%s'"
msgstr ""
"Не можам да читам од или пишувам во %s root директориумот во адресата `%s'"
+#: backends/gconf-merge-tree.c:78
+#, fuzzy, c-format
+msgid "Cannot find directory %s\n"
+msgstr "Не можев да го направам директориумот `%s': %s"
+
+#: backends/gconf-merge-tree.c:94
+#, fuzzy, c-format
+msgid "Error saving GConf tree to '%s': %s\n"
+msgstr "Грешка земајќи ја схемата на '%s': %s\n"
+
+#: backends/gconf-merge-tree.c:120
+#, c-format
+msgid "Usage: %s <dir>\n"
+msgstr ""
+
+#: backends/gconf-merge-tree.c:126
+#, c-format
+msgid ""
+"Usage: %s <dir>\n"
+" Merges a markup backend filesystem hierarchy like:\n"
+" dir/%%gconf.xml\n"
+" subdir1/%%gconf.xml\n"
+" subdir2/%%gconf.xml\n"
+" to:\n"
+" dir/%%gconf-tree.xml\n"
+msgstr ""
+
#: backends/xml-backend.c:236
msgid "Unloading XML backend module."
msgstr "Го одвчитувам XML позадинскиот модул."
diff --git a/po/ml.po b/po/ml.po
index de723850..f4c6045e 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -6,14 +6,14 @@
msgid ""
msgstr ""
"Project-Id-Version:gconf.HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-14 21:55-0500\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
@@ -30,6 +30,33 @@ msgstr "'%s'എന്ന കൂട് ഉണ്ടാക്കാന്‌ ക
msgid "Can't read from or write to the %s root directory in the address `%s'"
msgstr ""
+#: backends/gconf-merge-tree.c:78
+#, fuzzy, c-format
+msgid "Cannot find directory %s\n"
+msgstr "'%s'എന്ന കൂട് ഉണ്ടാക്കാന്‌ കഴിയുന്നില്ല: %s\n"
+
+#: backends/gconf-merge-tree.c:94
+#, fuzzy, c-format
+msgid "Error saving GConf tree to '%s': %s\n"
+msgstr "%s വായിക്കുന്നതില്‌ പരാജയം : %s"
+
+#: backends/gconf-merge-tree.c:120
+#, c-format
+msgid "Usage: %s <dir>\n"
+msgstr ""
+
+#: backends/gconf-merge-tree.c:126
+#, c-format
+msgid ""
+"Usage: %s <dir>\n"
+" Merges a markup backend filesystem hierarchy like:\n"
+" dir/%%gconf.xml\n"
+" subdir1/%%gconf.xml\n"
+" subdir2/%%gconf.xml\n"
+" to:\n"
+" dir/%%gconf-tree.xml\n"
+msgstr ""
+
#: backends/xml-backend.c:236
msgid "Unloading XML backend module."
msgstr ""
diff --git a/po/mn.po b/po/mn.po
index 9dc4e1c9..f71cd858 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -8,14 +8,14 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf.HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-06 19:49+0100\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\n"
"PO-Revision-Date: 2004-01-07 01:05+0100\n"
"Last-Translator: Sanlig Badral <Badral@openmn.org>\n"
"Language-Team: Mongolian <openmn-core@lists.sf.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
"X-Generator: KBabel 1.0.2\n"
#: backends/dir-utils.c:108
@@ -78,7 +78,8 @@ msgstr "%s хаяг дах эзний лавлахаас XML олдсонгүй"
#: 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 "»%s« хаяг дахь XML-Лавлах руу уншиж бичиж болохгүй байна"
#: backends/xml-backend.c:453
@@ -200,7 +201,8 @@ msgstr "%s XML-файл доторхи нэргүй бичлэгийг хэрэ
#: backends/xml-dir.c:1182
#, c-format
msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
-msgstr "»%s« XML-файл доторхи хамгийн дээд элемент <%s> <entry> биш бол хэрэгсэхгүй"
+msgstr ""
+"»%s« XML-файл доторхи хамгийн дээд элемент <%s> <entry> биш бол хэрэгсэхгүй"
#: backends/xml-dir.c:1255
#, c-format
@@ -259,7 +261,8 @@ msgstr "XML жигсаалт элементүүдийн <%s> XML-Элемент
#: backends/xml-entry.c:1063
msgid "Invalid type (list, pair, or unknown) in a list node"
-msgstr "Хүчингүй төрлийг (Жигсаалт, Хос эсвэл тодорхойгүй) нэгэн жигсаалтын элементэд"
+msgstr ""
+"Хүчингүй төрлийг (Жигсаалт, Хос эсвэл тодорхойгүй) нэгэн жигсаалтын элементэд"
#: backends/xml-entry.c:1086
#, c-format
@@ -278,7 +281,8 @@ msgstr "XML-хосын хүчингүй car -г үл хэрэгсэх: %s"
#: backends/xml-entry.c:1155 backends/xml-entry.c:1178
msgid "parsing XML file: lists and pairs may not be placed inside a pair"
-msgstr "XML-файл задлан ялгал: Жигсаалт ба хосууд нэг хос дотор байрлаж болохгүй"
+msgstr ""
+"XML-файл задлан ялгал: Жигсаалт ба хосууд нэг хос дотор байрлаж болохгүй"
#: backends/xml-entry.c:1168
#, c-format
@@ -357,7 +361,8 @@ msgstr "Холбоотой хүсэлтэд хүчингүй утга хүлээ
#: gconf/gconf-database.c:242
#, c-format
msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
-msgstr "»%s« түлхүүрт холбоотой хүсэлтэд хүлээн авсан CORBA-утгын утга задарсангүй"
+msgstr ""
+"»%s« түлхүүрт холбоотой хүсэлтэд хүлээн авсан CORBA-утгын утга задарсангүй"
#: gconf/gconf-database.c:524
msgid "Received request to drop all cached data"
@@ -655,11 +660,13 @@ msgstr "»%s« IOR-файл амжилттай нээгдсэнгүй, gconfd о
#: gconf/gconf-internals.c:2438
#, c-format
msgid "gconftool or other non-gconfd process has the lock file '%s'"
-msgstr "gconftool эсвэл өөр нэгэн non-gconfd процесс »%s« түлхүүр файл үүсгэлээ."
+msgstr ""
+"gconftool эсвэл өөр нэгэн non-gconfd процесс »%s« түлхүүр файл үүсгэлээ."
#: gconf/gconf-internals.c:2455
msgid "couldn't contact ORB to resolve existing gconfd object reference"
-msgstr "Оршин буй »gconfd« объект хамааралын задаргаа руу ORB холболт хийж чадсангүй"
+msgstr ""
+"Оршин буй »gconfd« объект хамааралын задаргаа руу ORB холболт хийж чадсангүй"
#: gconf/gconf-internals.c:2465
#, c-format
@@ -856,7 +863,8 @@ msgid "Schema contains invalid UTF-8"
msgstr "Схем хүчингүй 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 ""
"Схем жигсаалт төрөл гэж тодорхойлсон боловч жигсаалт элементийн төрлийг "
"өгсөнгүй."
@@ -865,7 +873,8 @@ msgstr ""
msgid ""
"Schema specifies type pair but doesn't specify the type of the car/cdr "
"elements"
-msgstr "Схем хос төрөл гэж тодорхойлсон боловч car/cdr элементийн төрлийг өгсөнгүй."
+msgstr ""
+"Схем хос төрөл гэж тодорхойлсон боловч car/cdr элементийн төрлийг өгсөнгүй."
#: gconf/gconf-sources.c:319
#, c-format
@@ -884,8 +893,10 @@ msgstr "»%s« хаяг %d байрлал дахь зөвхөн уншигдах
#: gconf/gconf-sources.c:359
#, c-format
-msgid "Resolved address \"%s\" to a partially writable config source at position %d"
-msgstr "»%s« хаяг %d байрлал дахь хагас бичих боломжтой тохируулгын эх рүү холбоно"
+msgid ""
+"Resolved address \"%s\" to a partially writable config source at position %d"
+msgstr ""
+"»%s« хаяг %d байрлал дахь хагас бичих боломжтой тохируулгын эх рүү холбоно"
#: gconf/gconf-sources.c:368
msgid ""
@@ -907,7 +918,8 @@ msgstr "»/« нэр түлхүүр биш зөвхөн лавлах байх б
msgid ""
"Value for `%s' set in a read-only source at the front of your configuration "
"path"
-msgstr "»%s« -н утга таны тохируулгын замын өмнөх зөвхөн уншигдах эхэд тогтоогдсон."
+msgstr ""
+"»%s« -н утга таны тохируулгын замын өмнөх зөвхөн уншигдах эхэд тогтоогдсон."
#: gconf/gconf-sources.c:692
#, c-format
@@ -1123,7 +1135,8 @@ msgstr ""
#: gconf/gconfd.c:296
#, 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 ""
"Тохируулгын файлууд олдсонгүй, стандарт тохируулг эх »%s« -г хэрэглэхийг "
"оролдож байна"
@@ -1168,7 +1181,8 @@ msgstr "%d сигнал хүлээн авлаа, Гацаа. Та GConf-Bug -т
#: gconf/gconfd.c:390
#, c-format
-msgid "Received signal %d, shutting down abnormally. Please file a GConf bug report."
+msgid ""
+"Received signal %d, shutting down abnormally. Please file a GConf bug report."
msgstr ""
"%d сигнал хүлээн авлаа, Төлөвлөсөнөөр бус унтарлаа. Та GConf-Bug -т "
"мэдэгдэнэ үү."
@@ -1255,7 +1269,8 @@ msgstr ""
#: gconf/gconfd.c:1258
#, 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 ""
"gconfd-протоколл файл хаагдсангүй; Өгөгдөл ном ёсоороо хадгалагдаагүй байж "
"болно (%s)"
@@ -1287,12 +1302,15 @@ msgstr "Шинэ төлөв хадгалагч файл зөв байрлал р
#: gconf/gconfd.c:1383
#, c-format
-msgid "Failed to restore original saved state file that had been moved to '%s': %s"
-msgstr "»%s« рүү зөөгдсөн жинхэнэ төлөв хадгалагч файл эргэж сэргээгдсэнгүй: %s"
+msgid ""
+"Failed to restore original saved state file that had been moved to '%s': %s"
+msgstr ""
+"»%s« рүү зөөгдсөн жинхэнэ төлөв хадгалагч файл эргэж сэргээгдсэнгүй: %s"
#: gconf/gconfd.c:1854
#, c-format
-msgid "Unable to restore a listener on address '%s', couldn't resolve the database"
+msgid ""
+"Unable to restore a listener on address '%s', couldn't resolve the database"
msgstr "»%s« хаяг дахь сонсогч сэргээгдсэнгүй, өгөгдлийн бааз тайлж чадсангүй"
#: gconf/gconfd.c:1900
@@ -1344,7 +1362,8 @@ msgid "Failed to flush client add to saved state file: %s"
msgstr "Клиентийн устгалыг төлөв хагалагч файл руу бичих бүтсэнгүй: %s"
#: gconf/gconfd.c:2236
-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 ""
"Хэд хэдэн клиент өөрсдөө GConf-серверээс устлаа хэдийгээр тэд нэмэгдээгүй "
"байсан ч."
@@ -1639,14 +1658,16 @@ msgid "%s option must be used by itself.\n"
msgstr "%s тохируулга дангаараа хэрэглэгдэх ёстой.\n"
#: gconf/gconftool.c:702
-msgid "You must specify a config source with --config-source when using --direct\n"
+msgid ""
+"You must specify a config source with --config-source when using --direct\n"
msgstr ""
"Хэрвээ та --direct хэрэглэх бол тохируулгын эхийг --config-source -той өгөх "
"ёстой\n"
#: gconf/gconftool.c:708
msgid "You should use --direct when using a non-default configuration source\n"
-msgstr "Та стандарт бус тохируулгын эх хэрэглэх үедээ --direct -г хэрэглээрэй\n"
+msgstr ""
+"Та стандарт бус тохируулгын эх хэрэглэх үедээ --direct -г хэрэглээрэй\n"
#: gconf/gconftool.c:714
#, c-format
@@ -1655,11 +1676,14 @@ msgstr "GConf инициацилагдсангүй: %s\n"
#: gconf/gconftool.c:743
msgid "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, not installing schemas\n"
-msgstr "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL тогтоогдсон. Схемүүд суугаагүй байна\n"
+msgstr ""
+"GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL тогтоогдсон. Схемүүд суугаагүй байна\n"
#: gconf/gconftool.c:750
-msgid "GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL is set, not uninstalling schemas\n"
-msgstr "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL тогтоогдсон. Схемүүд устгагдахгүй\n"
+msgid ""
+"GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL is set, not uninstalling schemas\n"
+msgstr ""
+"GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL тогтоогдсон. Схемүүд устгагдахгүй\n"
#: gconf/gconftool.c:763
msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
@@ -1677,7 +1701,8 @@ msgstr "Унтрааж байхад алдаа: %s\n"
#: gconf/gconftool.c:1120
msgid "Must specify one or more directories to recursively list.\n"
-msgstr "Рекурсээр жагсаахдаа та нэг эсвэл хэд хэдэн лавлах тодорхойлох ёстой.\n"
+msgstr ""
+"Рекурсээр жагсаахдаа та нэг эсвэл хэд хэдэн лавлах тодорхойлох ёстой.\n"
#: gconf/gconftool.c:1172
msgid "Must specify one or more directories to dump.\n"
@@ -1781,7 +1806,8 @@ msgid "When setting a list you must specify a primitive list-type\n"
msgstr "Жигсаалтад утга олгох үед та энгийн жигсаалтын төрөл өгөх ёстой\n"
#: gconf/gconftool.c:1750
-msgid "When setting a pair you must specify a primitive car-type and cdr-type\n"
+msgid ""
+"When setting a pair you must specify a primitive car-type and cdr-type\n"
msgstr "Хосод утга олгох үед та car төрөл ба cdr төрөл өгөх ёстой\n"
#: gconf/gconftool.c:1765
@@ -1814,7 +1840,8 @@ msgstr "»%s« түлхүүр жагсаалт биш.\n"
#: gconf/gconftool.c:1900
msgid "Must specify a key from which to get list element.\n"
-msgstr "Та жагсаалтын элементүүдээс авахдаа нэг эсвэл хэд хэдэн түлхүүр өгөх ёстой\n"
+msgstr ""
+"Та жагсаалтын элементүүдээс авахдаа нэг эсвэл хэд хэдэн түлхүүр өгөх ёстой\n"
#: gconf/gconftool.c:1931
msgid "Must specify list index.\n"
@@ -1883,7 +1910,8 @@ msgstr "Та түлхүүрийг (Схем нэр) зөвхөн аргумен
#: gconf/gconftool.c:2199
msgid "List type must be a primitive type: string, int, float or bool\n"
-msgstr "Жигсаалтын төрөл энгийн төрөл байх ёстой: string, int, float эсвэл bool\n"
+msgstr ""
+"Жигсаалтын төрөл энгийн төрөл байх ёстой: string, int, float эсвэл bool\n"
#: gconf/gconftool.c:2219
msgid "Pair car type must be a primitive type: string, int, float or bool\n"
@@ -1995,12 +2023,14 @@ msgstr "САНУУЛГА: (%s) схемийн хувьд хүчингүй эсв
#: gconf/gconftool.c:2921 gconf/gconftool.c:2951 gconf/gconftool.c:2980
#, c-format
msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
-msgstr "САНУУЛГА: (%s) схемийн »%s« стандарт төрөлд задлан ялгал хийгдэхгүй байна\n"
+msgstr ""
+"САНУУЛГА: (%s) схемийн »%s« стандарт төрөлд задлан ялгал хийгдэхгүй байна\n"
#: gconf/gconftool.c:2939
#, c-format
msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
-msgstr "САНУУЛГА: (%s) схемийн хувьд хүчингүй эсвэл байхгүй car_type эсвэл cdr_type\n"
+msgstr ""
+"САНУУЛГА: (%s) схемийн хувьд хүчингүй эсвэл байхгүй car_type эсвэл cdr_type\n"
#: gconf/gconftool.c:2964
msgid "WARNING: You cannot set a default value for a schema\n"
@@ -2018,7 +2048,8 @@ msgstr "САНУУЛГА: »%s« төрлийн нэр задлан ялгагд
#: gconf/gconftool.c:3058
#, c-format
-msgid "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
+msgid ""
+"WARNING: list_type can only be int, float, string or bool and not `%s'\n"
msgstr ""
"САНУУЛГА: list_type зөвхөн int, float, string эсвэл bool байж болно. Харин »%"
"s« байж болохгүй\n"
@@ -2048,7 +2079,8 @@ msgstr "САНУУЛГА: <schema> доторхи <%s> зангилаа ойлг
#: gconf/gconftool.c:3154
msgid "WARNING: no <list_type> specified for schema of type list\n"
-msgstr "САНУУЛГА: Жигсаалт төрлийн схемд <list_type> түлхүүр өгөгдөөгүй байна\n"
+msgstr ""
+"САНУУЛГА: Жигсаалт төрлийн схемд <list_type> түлхүүр өгөгдөөгүй байна\n"
#: gconf/gconftool.c:3160
msgid "WARNING: no <car_type> specified for schema of type pair\n"
@@ -2060,11 +2092,13 @@ msgstr "САНУУЛГА: Хос төрлийн схемд <cdr_type> түлхү
#: gconf/gconftool.c:3195
msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
-msgstr "САНУУЛГА: <locale> зангилаанд »name='locale'« аттрибут алга, үл хэрэгсэх\n"
+msgstr ""
+"САНУУЛГА: <locale> зангилаанд »name='locale'« аттрибут алга, үл хэрэгсэх\n"
#: gconf/gconftool.c:3201
#, 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 ""
"САНУУЛГА: »%s« локалын хувьд олон <locale> зангилаа байна. Эхнийхээс хойшхи "
"бүгдийг үл хэрэгсэх\n"
@@ -2125,7 +2159,8 @@ msgstr "»%s« баримт хоосон юм уу?\n"
#: gconf/gconftool.c:3615
#, c-format
msgid "Document `%s' has the wrong type of root node (<%s>, should be <%s>)\n"
-msgstr "»%s« баримтад үндсэн зангилааны буруу төрөл байна (<%s>, <%s> байхсан)\n"
+msgstr ""
+"»%s« баримтад үндсэн зангилааны буруу төрөл байна (<%s>, <%s> байхсан)\n"
#: gconf/gconftool.c:3628
#, c-format
@@ -2234,4 +2269,3 @@ msgstr ""
#~ msgid "WARNING: node <%s> not understood below <schemalist>\n"
#~ msgstr "САНУУЛГА: <schemalist> доторхи <%s> зангилаа ойлгомжгүй\n"
-
diff --git a/po/ms.po b/po/ms.po
index 07fbff51..12bc8d05 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -5,14 +5,14 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-14 21:55-0500\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
@@ -30,6 +30,33 @@ msgid "Can't read from or write to the %s root directory in the address `%s'"
msgstr ""
"Tak dapat membaca atau menulis ke direktori pangkal %s pada alamat '%s'"
+#: backends/gconf-merge-tree.c:78
+#, fuzzy, c-format
+msgid "Cannot find directory %s\n"
+msgstr "Tak dapat mencipta direktori '%s': '%s'"
+
+#: backends/gconf-merge-tree.c:94
+#, fuzzy, c-format
+msgid "Error saving GConf tree to '%s': %s\n"
+msgstr "Ralat menulis fail '%s': %s"
+
+#: backends/gconf-merge-tree.c:120
+#, c-format
+msgid "Usage: %s <dir>\n"
+msgstr ""
+
+#: backends/gconf-merge-tree.c:126
+#, c-format
+msgid ""
+"Usage: %s <dir>\n"
+" Merges a markup backend filesystem hierarchy like:\n"
+" dir/%%gconf.xml\n"
+" subdir1/%%gconf.xml\n"
+" subdir2/%%gconf.xml\n"
+" to:\n"
+" dir/%%gconf-tree.xml\n"
+msgstr ""
+
#: backends/xml-backend.c:236
msgid "Unloading XML backend module."
msgstr "Nyahmuat module backend XML"
diff --git a/po/nl.po b/po/nl.po
index 916ddf5d..ea4ccc61 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,14 +9,14 @@
msgid ""
msgstr ""
"Project-Id-Version: GConf cvs\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-19 14:52+0100\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\n"
"PO-Revision-Date: 2004-01-20 16:57+0100\n"
"Last-Translator: Daniel van Eeden <daniel_e@dds.nl>\n"
"Language-Team: Dutch <vertaling@nl.linux.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
@@ -366,8 +366,8 @@ msgstr "Ongeldige waarde ontvangen in instelverzoek"
#, c-format
msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
msgstr ""
-"De CORBA waarde die ontvangen werd in een instelverzoek voor sleutel `%s' "
-"is onbegrijpelijk"
+"De CORBA waarde die ontvangen werd in een instelverzoek voor sleutel `%s' is "
+"onbegrijpelijk"
#: gconf/gconf-database.c:524
msgid "Received request to drop all cached data"
@@ -380,7 +380,8 @@ msgstr "Verzoek ontvangen om synchroon te synchroniseren"
#: gconf/gconf-database.c:826
msgid "Fatal error: failed to get object reference for ConfigDatabase"
msgstr ""
-"Fatale fout: fout bij het verkrijgen van object referentie naar ConfigDatabase"
+"Fatale fout: fout bij het verkrijgen van object referentie naar "
+"ConfigDatabase"
#: gconf/gconf-database.c:988
#, c-format
@@ -394,8 +395,8 @@ msgid ""
"listener on gconfd restart, resulting in unreliable notification of "
"configuration changes."
msgstr ""
-"Fout bij logaanvulling van listener %s (%s); niet in staat deze listener "
-"te herstellen bij herstart van gconfd, waardoor de doorgifte van "
+"Fout bij logaanvulling van listener %s (%s); niet in staat deze listener te "
+"herstellen bij herstart van gconfd, waardoor de doorgifte van "
"configuratiewijzingen onbetrouwbaar wordt."
#: gconf/gconf-database.c:1114
@@ -737,7 +738,8 @@ msgstr "Server ping-fout: %s"
#, c-format
msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
msgstr ""
-"Aanmaken pijp voor communiceren met gestartte gconf-voorziening, mislukt: %s\n"
+"Aanmaken pijp voor communiceren met gestartte gconf-voorziening, mislukt: %"
+"s\n"
#: gconf/gconf-internals.c:2923
#, c-format
@@ -753,8 +755,8 @@ msgid ""
"(Details - %s)"
msgstr ""
"Niet gelukt contact te leggen met de configuratie-server; een van de "
-"mogelijke redenen is dat u TCP/IP netwerken voor ORBit moet aanzetten, of "
-"er zijn verouderde NFS locks door een systeem crash. Bekijk http://www.gnome."
+"mogelijke redenen is dat u TCP/IP netwerken voor ORBit moet aanzetten, of er "
+"zijn verouderde NFS locks door een systeem crash. Bekijk http://www.gnome."
"org/projects/gconf/ voor informatie. (Details - %s) "
#: gconf/gconf-internals.c:2949
@@ -786,8 +788,8 @@ msgstr ""
"Vraag uw systeembeheerder om het volgende probleem op te lossen:\n"
"Kan het bestand \"%s\" niet maken of openen ; dit betekent dat er een "
"probleem kan zijn met de configuratie, omdat veel programma's bestanden "
-"moeten kunnen maken in uw persoonlijke map. De fout was \"%s\" "
-"(foutnummer = %d)."
+"moeten kunnen maken in uw persoonlijke map. De fout was \"%s\" (foutnummer = "
+"%d)."
#: gconf/gconf-sanity-check.c:180
#, c-format
@@ -882,8 +884,8 @@ msgstr "Schema bevat ongeldige UTF-8"
msgid ""
"Schema specifies type list but doesn't specify the type of the list elements"
msgstr ""
-"Schema specificeert het soort lijst, maar specificeert niet het type van "
-"de lijst-elementen"
+"Schema specificeert het soort lijst, maar specificeert niet het type van de "
+"lijst-elementen"
#: gconf/gconf-schema.c:264
msgid ""
@@ -969,13 +971,13 @@ msgstr ""
"gemeenschappelijke redenen voor dit probleem: 1) Het configuratiebestandpad %"
"s/path bevat geen databases of werd niet gevonden. 2) Er zijn per ongeluk 2 "
"gconfd processen gestart. 3) Uw besturingssysteem is verkeerd geconfigureerd "
-"waardoor NFS bestandsblokkering niet werkt op uw persoonlijke map. 4) Uw "
-"NFS-machine is gecrashed en heeft de server niet juist laten weten op reboot "
-"dat de bestandsblokkeringen opgeheven moesten worden. Als u 2 gconfd processen "
+"waardoor NFS bestandsblokkering niet werkt op uw persoonlijke map. 4) Uw NFS-"
+"machine is gecrashed en heeft de server niet juist laten weten op reboot dat "
+"de bestandsblokkeringen opgeheven moesten worden. Als u 2 gconfd processen "
"heeft (of 2 had op het moment dat de tweede werd gestart), kan uitloggen en "
"alle kopieën van gconfd killen helpen. Als u verouderde blokkeringen heeft, "
-"verwijder dan ~/.gconf*/*lock. Misschien is het probleem dat u GConf vanaf "
-"2 machines tegelijk probeert te gebruiken en ORBit nog zijn "
+"verwijder dan ~/.gconf*/*lock. Misschien is het probleem dat u GConf vanaf 2 "
+"machines tegelijk probeert te gebruiken en ORBit nog zijn "
"standaardconfiguratie heeft dat CORBA verbindingen tegenhoudt - zet "
"\"ORBIIOPIPv4=1\" in /etc/orbitrc. Zoals gewoonlijk, bekijk de user.* "
"syslogs voor details over problemen die gconfd tegenkwam. Er kan maar één "
@@ -1501,8 +1503,7 @@ msgstr "Haal het aantal elementen uit een lijst-sleutel"
#: gconf/gconftool.c:247
msgid "Get a specific element from a list key, numerically indexed."
msgstr ""
-"Haal een gespecificeerd element uit een lijst-sleuten, numeriek "
-"geïndexeerd."
+"Haal een gespecificeerd element uit een lijst-sleuten, numeriek geïndexeerd."
#: gconf/gconftool.c:256
msgid ""
@@ -1703,8 +1704,8 @@ msgstr "%s optie moet door zichzelf gebruikt worden.\n"
msgid ""
"You must specify a config source with --config-source when using --direct\n"
msgstr ""
-"U moet een configuratie bron specificeren met --config-source als u --"
-"direct gebruikt\n"
+"U moet een configuratie bron specificeren met --config-source als u --direct "
+"gebruikt\n"
#: gconf/gconftool.c:708
msgid "You should use --direct when using a non-default configuration source\n"
diff --git a/po/nn.po b/po/nn.po
index 2c7e0d61..d440be7f 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -8,14 +8,14 @@
msgid ""
msgstr ""
"Project-Id-Version: nn\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-02 12:43+0100\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\n"
"PO-Revision-Date: 2004-01-02 15:40+0100\n"
"Last-Translator: Åsmund Skjæveland <aasmunds@fys.uio.no>\n"
"Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
"X-Generator: KBabel 1.0.2\n"
#: backends/dir-utils.c:108
@@ -78,7 +78,8 @@ msgstr "Fann ikkje XML-rotkatalogen i adressa «%s»"
#: 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 "Klarar ikkje å lesa eller skriva til XML-rotkatalogen i adressa «%s»"
#: backends/xml-backend.c:453
@@ -200,7 +201,8 @@ msgstr "Oppføring utan namn i XML-fila «%s», overser"
#: backends/xml-dir.c:1182
#, c-format
msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
-msgstr "Ein toppnivå-node i XML-fila «%s» er <%s> i staden for <entry>, overser"
+msgstr ""
+"Ein toppnivå-node i XML-fila «%s» er <%s> i staden for <entry>, overser"
#: backends/xml-dir.c:1255
#, c-format
@@ -371,7 +373,8 @@ msgstr "Fekk førespurnad om å utføra synkron synkronisering"
#: gconf/gconf-database.c:826
msgid "Fatal error: failed to get object reference for ConfigDatabase"
-msgstr "Uoppretteleg feil: Klarte ikkje å henta objektreferanse for ConfigDatabase"
+msgstr ""
+"Uoppretteleg feil: Klarte ikkje å henta objektreferanse for ConfigDatabase"
#: gconf/gconf-database.c:988
#, c-format
@@ -721,7 +724,8 @@ msgstr "Feil under pinging av tenar: %s"
#: gconf/gconf-internals.c:2899
#, c-format
msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
-msgstr "Klarte ikkje å laga røyr for å kommunisera med nystarta gconf-nisse: %s\n"
+msgstr ""
+"Klarte ikkje å laga røyr for å kommunisera med nystarta gconf-nisse: %s\n"
#: gconf/gconf-internals.c:2923
#, c-format
@@ -859,14 +863,16 @@ msgid "Schema contains invalid UTF-8"
msgstr "Skjemaet inneheld ugyldig 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 "Skjemaet spesifiserer type liste, men ikkje typen av listeelementa"
#: gconf/gconf-schema.c:264
msgid ""
"Schema specifies type pair but doesn't specify the type of the car/cdr "
"elements"
-msgstr "Skjemaet oppgjev type par, men seier ikkje kva slags type verdiane i paret er"
+msgstr ""
+"Skjemaet oppgjev type par, men seier ikkje kva slags type verdiane i paret er"
#: gconf/gconf-sources.c:319
#, c-format
@@ -885,7 +891,8 @@ msgstr "Kopla adressa «%s» til ei skrivebeskytta oppsettkjelde i plass %d"
#: gconf/gconf-sources.c:359
#, 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 "Kopla adressa «%s» til ei delvis skrivbar oppsettkjelde i plass %d"
#: gconf/gconf-sources.c:368
@@ -899,7 +906,8 @@ msgstr ""
#: gconf/gconf-sources.c:584
#, c-format
msgid "Schema `%s' specified for `%s' stores a non-schema value"
-msgstr "Skjemaet «%s» spesifisert for «%s» lagrar ein verdi som ikkje er eit skjema"
+msgstr ""
+"Skjemaet «%s» spesifisert for «%s» lagrar ein verdi som ikkje er eit skjema"
#: gconf/gconf-sources.c:642
msgid "The '/' name can only be a directory, not a key"
@@ -910,7 +918,8 @@ msgstr "Namnet «/» kan berre vera ein katalog, ikkje ein nøkkel"
msgid ""
"Value for `%s' set in a read-only source at the front of your configuration "
"path"
-msgstr "Verdien til «%s» vart satt i ei skrivebeskytta kjelde tidleg i oppsettstien"
+msgstr ""
+"Verdien til «%s» vart satt i ei skrivebeskytta kjelde tidleg i oppsettstien"
#: gconf/gconf-sources.c:692
#, c-format
@@ -1123,7 +1132,8 @@ msgstr ""
#: gconf/gconfd.c:296
#, 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 "Fann ingen oppsettfiler. Prøver å bruka standardkjelda «%s»"
#. We want to stay alive but do nothing, because otherwise every
@@ -1166,7 +1176,8 @@ msgstr "Mottok signal %d, dumpar core. Rapporter denne GConf-feilen."
#: gconf/gconfd.c:390
#, 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 ""
"Fekk signal %d, unormal avslutting. Ver snill og send inn ein feilrapport om "
"GConf."
@@ -1253,7 +1264,8 @@ msgstr ""
#: gconf/gconfd.c:1258
#, 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 ""
"Klarte ikkje å stenga gconfd-loggfil. Data er kanskje ikkje lagra ordentleg "
"(%s)"
@@ -1261,7 +1273,8 @@ msgstr ""
#: gconf/gconfd.c:1327
#, c-format
msgid "Could not open saved state file '%s' for writing: %s"
-msgstr "Klarte ikkje å opna den lagra tilstandsfila «%s» for å skriva til henne: %s"
+msgstr ""
+"Klarte ikkje å opna den lagra tilstandsfila «%s» for å skriva til henne: %s"
#: gconf/gconfd.c:1341
#, c-format
@@ -1285,14 +1298,16 @@ msgstr "Klarte ikkje å setja den nye lagra tilstandsfila på rett plass: %s"
#: gconf/gconfd.c:1383
#, 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 ""
"Klarte ikkje å gjenoppretta den opprinnelege lagra tilstandsfila som hadde "
"vorte flytta til «%s»: %s"
#: gconf/gconfd.c:1854
#, 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 ""
"Klarte ikkje å gjenoppretta ein lyttar på adressa «%s»: Klarte ikkje å slå "
"opp databasen"
@@ -1352,8 +1367,10 @@ msgstr ""
"lagt til: %s"
#: gconf/gconfd.c:2236
-msgid "Some client removed itself from the GConf server when it hadn't been added."
-msgstr "Ein klient fjerna seg sjølv frå GConf-tenaren utan at han var lagt til."
+msgid ""
+"Some client removed itself from the GConf server when it hadn't been added."
+msgstr ""
+"Ein klient fjerna seg sjølv frå GConf-tenaren utan at han var lagt til."
#: gconf/gconftool.c:93
msgid "Set a key to a value and sync. Use with --type."
@@ -1395,7 +1412,8 @@ msgstr "Skriv ut alle underkatalogane i ein katalog."
msgid ""
"Dump to standard out an XML description of all entries under a dir, "
"recursively."
-msgstr "Skriv ei XML-skildring av alle oppføringane under ein katalog, rekursivt."
+msgstr ""
+"Skriv ei XML-skildring av alle oppføringane under ein katalog, rekursivt."
#: gconf/gconftool.c:166
msgid ""
@@ -1415,7 +1433,8 @@ msgstr "Returnerar 0 om katalogen finst, 2 om han ikkje gjer det."
#: gconf/gconftool.c:193
msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
-msgstr "Koplar ned gconfd. IKKJE BRUK DETTE VALET OM DU IKKJE HAR EIN GOD GRUNN."
+msgstr ""
+"Koplar ned gconfd. IKKJE BRUK DETTE VALET OM DU IKKJE HAR EIN GOD GRUNN."
#: gconf/gconftool.c:202
msgid "Return 0 if gconfd is running, 2 if not."
@@ -1642,12 +1661,15 @@ msgid "%s option must be used by itself.\n"
msgstr "Valet %s må brukast åleine.\n"
#: gconf/gconftool.c:702
-msgid "You must specify a config source with --config-source when using --direct\n"
-msgstr "Du på oppgje ei oppsettkjelde med --config-source når du brukar --direct\n"
+msgid ""
+"You must specify a config source with --config-source when using --direct\n"
+msgstr ""
+"Du på oppgje ei oppsettkjelde med --config-source når du brukar --direct\n"
#: gconf/gconftool.c:708
msgid "You should use --direct when using a non-default configuration source\n"
-msgstr "Du bør bruka --direct når du brukar ei anna oppsettkjelde enn standard\n"
+msgstr ""
+"Du bør bruka --direct når du brukar ei anna oppsettkjelde enn standard\n"
#: gconf/gconftool.c:714
#, c-format
@@ -1656,11 +1678,14 @@ msgstr "Klarte ikkje å starta GConf: %s\n"
#: gconf/gconftool.c:743
msgid "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, not installing schemas\n"
-msgstr "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL er stilt. Installerer ikkje skjema\n"
+msgstr ""
+"GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL er stilt. Installerer ikkje skjema\n"
#: gconf/gconftool.c:750
-msgid "GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL is set, not uninstalling schemas\n"
-msgstr "GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL er stilt. Fjernar ikkje skjema.\n"
+msgid ""
+"GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL is set, not uninstalling schemas\n"
+msgstr ""
+"GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL er stilt. Fjernar ikkje skjema.\n"
#: gconf/gconftool.c:763
msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
@@ -1783,7 +1808,8 @@ msgid "When setting a list you must specify a primitive list-type\n"
msgstr "Når du stiller ei liste må du oppgje ein primitiv listetype\n"
#: gconf/gconftool.c:1750
-msgid "When setting a pair you must specify a primitive car-type and cdr-type\n"
+msgid ""
+"When setting a pair you must specify a primitive car-type and cdr-type\n"
msgstr ""
"Når du stiller eit par, må du oppgje primitive typar til begge verdiane i "
"paret\n"
@@ -1885,7 +1911,8 @@ msgstr "Må oppgje nøkkel (skjemanamn) som einaste argument\n"
#: gconf/gconftool.c:2199
msgid "List type must be a primitive type: string, int, float or bool\n"
-msgstr "Listetypen må vera ein primitiv type: streng, heiltal, flyttal eller boolsk\n"
+msgstr ""
+"Listetypen må vera ein primitiv type: streng, heiltal, flyttal eller boolsk\n"
#: gconf/gconftool.c:2219
msgid "Pair car type must be a primitive type: string, int, float or bool\n"
@@ -1947,7 +1974,8 @@ msgstr "ÅTVARING: Må oppgje både <car> og <cdr> i eit <pair>\n"
#: gconf/gconftool.c:2559
#, c-format
msgid "WARNING: key specified (%s) for schema under a <value> - ignoring\n"
-msgstr "ÅTVARING: Nøkkel (%s) oppgjeven for skjema under ein <value> – overser\n"
+msgstr ""
+"ÅTVARING: Nøkkel (%s) oppgjeven for skjema under ein <value> – overser\n"
#: gconf/gconftool.c:2592
msgid "WARNING: must have a child node under <value>\n"
@@ -1996,12 +2024,14 @@ msgstr "ÅTVARING: Ugyldig eller manglande list_type for skjemaet (%s)\n"
#: gconf/gconftool.c:2921 gconf/gconftool.c:2951 gconf/gconftool.c:2980
#, c-format
msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
-msgstr "ÅTVARING: Klarte ikkje å tolka standardverdien «%s» for skjemaet (%s)\n"
+msgstr ""
+"ÅTVARING: Klarte ikkje å tolka standardverdien «%s» for skjemaet (%s)\n"
#: gconf/gconftool.c:2939
#, c-format
msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
-msgstr "ÅTVARING: Ugyldig eller manglande «car_type» eller «cdr_type» i skjema (%s)\n"
+msgstr ""
+"ÅTVARING: Ugyldig eller manglande «car_type» eller «cdr_type» i skjema (%s)\n"
#: gconf/gconftool.c:2964
msgid "WARNING: You cannot set a default value for a schema\n"
@@ -2019,7 +2049,8 @@ msgstr "ÅTVARING: Klarte ikkje å tolka typenamnet «%s»\n"
#: gconf/gconftool.c:3058
#, c-format
-msgid "WARNING: list_type can only be int, float, string or bool and not `%s'\n"
+msgid ""
+"WARNING: list_type can only be int, float, string or bool and not `%s'\n"
msgstr ""
"ÅTVARING: «list_type» kan berre vera heiltal, flyttal, streng eller boolsk "
"verdi. Ikkje «%s».\n"
@@ -2067,7 +2098,8 @@ msgstr ""
#: gconf/gconftool.c:3201
#, 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 ""
"ÅTVARING: Fleire <locale>-nodar for lokalet «%s». Overser alle utanom "
"fyrste\n"
@@ -2089,7 +2121,8 @@ msgstr "Må ha minst ei <locale>-oppføring i eit <schema>\n"
#: gconf/gconftool.c:3446
#, c-format
msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
-msgstr "ÅTVARING: Klarte ikkje å installera skjemaet «%s» med lokale «%s»: %s\n"
+msgstr ""
+"ÅTVARING: Klarte ikkje å installera skjemaet «%s» med lokale «%s»: %s\n"
#: gconf/gconftool.c:3454
#, c-format
@@ -2232,4 +2265,3 @@ msgstr ""
#, fuzzy
#~ msgid "Failed to fork child process (%s)"
#~ msgstr "Kunne ikkje lasta %1."
-
diff --git a/po/no.po b/po/no.po
index fb74d246..69e22041 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,14 +5,14 @@
msgid ""
msgstr ""
"Project-Id-Version: GConf 2.5.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-13 15:19+0100\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\n"
"PO-Revision-Date: 2004-01-13 15:21+0100\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8-bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
diff --git a/po/pl.po b/po/pl.po
index 43b533ed..b96b129c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,14 +9,14 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-30 10:17+0100\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
diff --git a/po/pt.po b/po/pt.po
index 9820043a..51c9de64 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,14 +6,14 @@
msgid ""
msgstr ""
"Project-Id-Version: 2.6\n"
-"Report-Msgid-Bugs-To: Duarte Loreto <happyguy_pt@hotmail.com>\n"
-"POT-Creation-Date: 2003-12-30 06:14+0000\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\n"
"PO-Revision-Date: 2003-12-30 06:15+0000\n"
"Last-Translator: Duarte Loreto <happyguy_pt@hotmail.com>\n"
"Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: Duarte Loreto <happyguy_pt@hotmail.com>\n"
#: backends/dir-utils.c:108
#, c-format
@@ -57,7 +57,8 @@ msgid ""
" dir/%%gconf-tree.xml\n"
msgstr ""
"Utilização: %s <dir>\n"
-" Reune uma hierarquia de sistema de ficheiros de suporte em etiquetas tipo:\n"
+" Reune uma hierarquia de sistema de ficheiros de suporte em etiquetas "
+"tipo:\n"
" dir/%%gconf.xml\n"
" subdir1/%%gconf.xml\n"
" subdir2/%%gconf.xml\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 09780843..d16edf29 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,14 +7,14 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf 2.4.0.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-14 21:55-0500\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\n"
"PO-Revision-Date: 2003-09-29 12:13-0400\n"
"Last-Translator: Evandro Fernandes Giovanini <evandrofg@ig.com.br>\n"
"Language-Team: Brazilian Portuguese <gnome-l10n-br@listas.cipsga.org.br>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
@@ -31,6 +31,33 @@ msgstr "Não foi possível criar diretório `%s': %s"
msgid "Can't read from or write to the %s root directory in the address `%s'"
msgstr "Não é possível ler ou escrever no diretório raiz %s no endereço `%s'"
+#: backends/gconf-merge-tree.c:78
+#, fuzzy, c-format
+msgid "Cannot find directory %s\n"
+msgstr "Não foi possível criar diretório `%s': %s"
+
+#: backends/gconf-merge-tree.c:94
+#, fuzzy, c-format
+msgid "Error saving GConf tree to '%s': %s\n"
+msgstr "Erro ao obter schema em '%s': %s\n"
+
+#: backends/gconf-merge-tree.c:120
+#, c-format
+msgid "Usage: %s <dir>\n"
+msgstr ""
+
+#: backends/gconf-merge-tree.c:126
+#, c-format
+msgid ""
+"Usage: %s <dir>\n"
+" Merges a markup backend filesystem hierarchy like:\n"
+" dir/%%gconf.xml\n"
+" subdir1/%%gconf.xml\n"
+" subdir2/%%gconf.xml\n"
+" to:\n"
+" dir/%%gconf-tree.xml\n"
+msgstr ""
+
#: backends/xml-backend.c:236
msgid "Unloading XML backend module."
msgstr "Descarregando módulo backend XML"
diff --git a/po/ro.po b/po/ro.po
index c76c61fd..bf24e957 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,14 +5,14 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-14 21:55-0500\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
@@ -29,6 +29,33 @@ msgstr "Nu am putut crea directorul `%s': %s"
msgid "Can't read from or write to the %s root directory in the address `%s'"
msgstr "Nu pot citi sau scrie in directorul rădăcină %s la adresa `%s'"
+#: backends/gconf-merge-tree.c:78
+#, fuzzy, c-format
+msgid "Cannot find directory %s\n"
+msgstr "Nu am putut crea directorul `%s': %s"
+
+#: backends/gconf-merge-tree.c:94
+#, 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:120
+#, c-format
+msgid "Usage: %s <dir>\n"
+msgstr ""
+
+#: backends/gconf-merge-tree.c:126
+#, c-format
+msgid ""
+"Usage: %s <dir>\n"
+" Merges a markup backend filesystem hierarchy like:\n"
+" dir/%%gconf.xml\n"
+" subdir1/%%gconf.xml\n"
+" subdir2/%%gconf.xml\n"
+" to:\n"
+" dir/%%gconf-tree.xml\n"
+msgstr ""
+
#: backends/xml-backend.c:236
msgid "Unloading XML backend module."
msgstr "Descarc modulul XML."
@@ -2075,10 +2102,6 @@ msgstr ""
#~ "Ştergere de directoare invalide(nesincronizate) la oprirea modulului XML"
#, fuzzy
-#~ msgid "Error listing subdirs of '%s': %s\n"
-#~ msgstr "Eroare la listarea directorelor în `%s': %s"
-
-#, fuzzy
#~ msgid "Error unsetting '%s': %s\n"
#~ msgstr "Eroare la resetarea `%s': %s"
diff --git a/po/ru.po b/po/ru.po
index 6766b900..a99967ee 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,14 +6,14 @@
msgid ""
msgstr ""
"Project-Id-Version: GConf\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-21 03:42+0100\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\n"
"PO-Revision-Date: 2004-01-21 16:38+0300\n"
"Last-Translator: Dmitry G. Mastrukov <dmitry@taurussoft.org>\n"
"Language-Team: Russian <gnome-cyr@gnome.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8-bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
diff --git a/po/sk.po b/po/sk.po
index d3ea77e9..7fbc46e3 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -9,14 +9,14 @@
msgid ""
msgstr ""
"Project-Id-Version: GNOME gconf.HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-14 21:55-0500\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\n"
"PO-Revision-Date: 2003-09-09 17:51+0200\n"
"Last-Translator: Stanislav Visnovsky <visnov@suse.cz>\n"
"Language-Team: Slovak <sk-i18n@linux.sk>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
"X-Generator: KBabel 1.2\n"
#: backends/dir-utils.c:108
@@ -36,6 +36,33 @@ msgstr ""
"Nie je možné prečítať alebo zapísať do koreňového priečinku pre %s na adrese "
"'%s'"
+#: backends/gconf-merge-tree.c:78
+#, fuzzy, c-format
+msgid "Cannot find directory %s\n"
+msgstr "Nie je možné vytvoriť priečinok '%s': %s"
+
+#: backends/gconf-merge-tree.c:94
+#, fuzzy, c-format
+msgid "Error saving GConf tree to '%s': %s\n"
+msgstr "Chyba pri získavaní schémy z '%s': %s\n"
+
+#: backends/gconf-merge-tree.c:120
+#, c-format
+msgid "Usage: %s <dir>\n"
+msgstr ""
+
+#: backends/gconf-merge-tree.c:126
+#, c-format
+msgid ""
+"Usage: %s <dir>\n"
+" Merges a markup backend filesystem hierarchy like:\n"
+" dir/%%gconf.xml\n"
+" subdir1/%%gconf.xml\n"
+" subdir2/%%gconf.xml\n"
+" to:\n"
+" dir/%%gconf-tree.xml\n"
+msgstr ""
+
#: backends/xml-backend.c:236
msgid "Unloading XML backend module."
msgstr "Uvoľňujem modul pre XML."
diff --git a/po/sl.po b/po/sl.po
index 1c72f8a9..fc2f5571 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,14 +5,14 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-24 21:34+0200\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
@@ -29,6 +29,33 @@ msgstr "Nisem mogel ustvariti imenika '%s': %s"
msgid "Can't read from or write to the %s root directory in the address `%s'"
msgstr "Ne morem brati iz ali pisati v korenski imenik %s na naslovu `%s'"
+#: backends/gconf-merge-tree.c:78
+#, fuzzy, c-format
+msgid "Cannot find directory %s\n"
+msgstr "Nisem mogel ustvariti imenika '%s': %s"
+
+#: backends/gconf-merge-tree.c:94
+#, 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:120
+#, c-format
+msgid "Usage: %s <dir>\n"
+msgstr ""
+
+#: backends/gconf-merge-tree.c:126
+#, c-format
+msgid ""
+"Usage: %s <dir>\n"
+" Merges a markup backend filesystem hierarchy like:\n"
+" dir/%%gconf.xml\n"
+" subdir1/%%gconf.xml\n"
+" subdir2/%%gconf.xml\n"
+" to:\n"
+" dir/%%gconf-tree.xml\n"
+msgstr ""
+
#: backends/xml-backend.c:236
msgid "Unloading XML backend module."
msgstr "Sproščam ozadni modul XML."
@@ -55,9 +82,10 @@ msgid "Error syncing the XML backend directory cache: %s"
msgstr "Napaka ob usklajevanju medpomnilnika imenikov XML: %s"
#: backends/xml-backend.c:684
+#, fuzzy
msgid ""
-"Remove dir operation is no longer supported, just remove all the values in "
-"the directory"
+"Remove directory operation is no longer supported, just remove all the "
+"values in the directory"
msgstr ""
"Operacija odstranjevanja imenika ni več podprta. Preprosto odstranite vse "
"vrednosti v imeniku"
@@ -78,8 +106,8 @@ msgid "Initializing XML backend module"
msgstr "Inicializiram ozadni XML modul"
#: backends/xml-backend.c:877
-#, c-format
-msgid "Failed to give up lock on XML dir \"%s\": %s"
+#, 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/xml-cache.c:286
@@ -95,15 +123,6 @@ msgstr ""
"Ne morem odstraniti imenika `%s' iz predpomnilnika modula XML, ker ni bil "
"uspešno usklajen na disk"
-#: backends/xml-cache.c:343
-#, c-format
-msgid ""
-"%u items remain in the cache after cleaning already-synced items older than %"
-"u seconds"
-msgstr ""
-"V predpomnilniku je po čiščenju že usklajenih predmetov starejših od %2$u "
-"sekund ostalo še %1$u predmetov"
-
#: backends/xml-dir.c:171
#, c-format
msgid "Could not stat `%s': %s"
@@ -160,11 +179,6 @@ msgstr "Nisem uspel zbrisati stare datoteke `%s': %s"
msgid "Failed to stat `%s': %s"
msgstr "Nisem uspel izvesti ukaza stat nad `%s': %s"
-#: backends/xml-dir.c:1002
-#, c-format
-msgid "%s"
-msgstr "%s"
-
#: backends/xml-dir.c:1152
#, c-format
msgid "Duplicate entry `%s' in `%s', ignoring"
@@ -314,17 +328,17 @@ msgstr "Nisem uspel najti ozadnega modula za `%s'"
msgid "Failed to shut down backend"
msgstr "Nisem uspel ustaviti ozadnega modula"
-#: gconf/gconf-client.c:343 gconf/gconf-client.c:361
+#: gconf/gconf-client.c:344 gconf/gconf-client.c:362
#, c-format
msgid "GConf Error: %s\n"
msgstr "Napaka gconf %s\n"
-#: gconf/gconf-client.c:895
+#: gconf/gconf-client.c:896
#, c-format
msgid "GConf warning: failure listing pairs in `%s': %s"
msgstr "Opozorilo GConf: napaka ob izpisovanju praov v `%s': %s"
-#: gconf/gconf-client.c:1180
+#: gconf/gconf-client.c:1181
#, c-format
msgid "Expected `%s' got `%s' for key %s"
msgstr "Za ključ %s pričakoval `%s' dobil `%s'"
@@ -418,8 +432,8 @@ msgid "Error checking existence of `%s': %s"
msgstr "Napaka ob preverjanju obstoja `%s': %s"
#: gconf/gconf-database.c:1520
-#, c-format
-msgid "Error removing dir `%s': %s"
+#, fuzzy, c-format
+msgid "Error removing directory \"%s\": %s"
msgstr "Napaka ob odstranjevanju imenika `%s': %s"
#: gconf/gconf-database.c:1547
@@ -690,7 +704,7 @@ msgstr "Nisem uspel odstraniti ključavničnega imenika `%s': %s"
msgid "Failed to unlink lock file %s: %s\n"
msgstr "Nisem uspel odstraniti (unlink) ključavnične datoteke %s: %s\n"
-#: gconf/gconf-internals.c:2856 gconf/gconfd.c:640
+#: gconf/gconf-internals.c:2856 gconf/gconfd.c:639
#, c-format
msgid "Failed to create %s: %s"
msgstr "Nisem uspel ustvariti %s: %s"
@@ -1032,68 +1046,68 @@ msgstr "Strežnik ni mogel razvozlati naslova `%s'"
msgid "Can't add notifications to a local configuration source"
msgstr "Krajevnemu viru nastavitev ne morem dodati obveščanj"
-#: gconf/gconf.c:2078
+#: gconf/gconf.c:2097
#, c-format
msgid "Adding client to server's list failed, CORBA error: %s"
msgstr "Dodajanje odjemalca v seznam strežnika ni uspelo, napaka CORBA: %s"
-#: gconf/gconf.c:2433
+#: gconf/gconf.c:2452
msgid "Must begin with a slash (/)"
msgstr "Mora se začeti s poševnico (/)"
-#: gconf/gconf.c:2455
+#: gconf/gconf.c:2474
msgid "Can't have two slashes (/) in a row"
msgstr "Ne more imeti dveh poševnic (/) zapored"
-#: gconf/gconf.c:2457
+#: gconf/gconf.c:2476
msgid "Can't have a period (.) right after a slash (/)"
msgstr "Ne more imeti pike (.) takoj za poševnico (/)"
-#: gconf/gconf.c:2476
+#: gconf/gconf.c:2495
#, c-format
msgid "'%c' is not an ASCII character, so isn't allowed in key names"
msgstr "znak '%c' je neveljaven ASCII znak, zato ni dovoljen v imenih ključev"
-#: gconf/gconf.c:2486
+#: gconf/gconf.c:2505
#, c-format
msgid "`%c' is an invalid character in key/directory names"
msgstr "znak '%c' je neveljaven v imenu ključev/imenikov"
-#: gconf/gconf.c:2500
+#: gconf/gconf.c:2519
msgid "Key/directory may not end with a slash (/)"
msgstr "Ključ/imenik se ne sme končati s poševnico (/)"
-#: gconf/gconf.c:2869
+#: gconf/gconf.c:2888
#, c-format
msgid "Failure shutting down config server: %s"
msgstr "Napaka ob ustavljanju strežnika nastavitev: %s"
-#: gconf/gconf.c:2930
+#: gconf/gconf.c:2949
#, c-format
msgid "Expected float, got %s"
msgstr "Pričakoval število s plavajočo vejico, dobil %s"
-#: gconf/gconf.c:2965
+#: gconf/gconf.c:2984
#, c-format
msgid "Expected int, got %s"
msgstr "Pričakoval celo število, dobil %s"
-#: gconf/gconf.c:3000
+#: gconf/gconf.c:3019
#, c-format
msgid "Expected string, got %s"
msgstr "Pričakoval niz, dobil %s"
-#: gconf/gconf.c:3034
+#: gconf/gconf.c:3053
#, c-format
msgid "Expected bool, got %s"
msgstr "Pričakoval booleanovo vrednost, dobil %s"
-#: gconf/gconf.c:3067
+#: gconf/gconf.c:3086
#, c-format
msgid "Expected schema, got %s"
msgstr "Pričakoval shemo, dobil %s"
-#: gconf/gconf.c:3424
+#: gconf/gconf.c:3443
#, c-format
msgid "CORBA error: %s"
msgstr "Napaka CORBA: %s"
@@ -1122,16 +1136,13 @@ msgstr ""
#. request would result in another failed gconfd being spawned.
#.
#: gconf/gconfd.c:304
+#, fuzzy, c-format
msgid ""
"No configuration sources in the source path, configuration won't be saved; "
-"edit "
+"edit %s"
msgstr ""
"Ni virov nastavitev v poti virov, nastavitve ne bodo shranjene; uredite "
-#: gconf/gconfd.c:304
-msgid "/path"
-msgstr "/pot"
-
#: gconf/gconfd.c:317
#, c-format
msgid "Error loading some config sources: %s"
@@ -1172,73 +1183,73 @@ msgstr ""
msgid "Received signal %d, shutting down cleanly"
msgstr "Prejel signal %d, ustavljam se po pravilih"
-#: gconf/gconfd.c:481
+#: gconf/gconfd.c:480
#, c-format
msgid "Failed to open %s: %s"
msgstr "Nisem uspel odpreti %s: %s"
-#: gconf/gconfd.c:488
+#: gconf/gconfd.c:487
#, c-format
msgid "Failed to stat %s: %s"
msgstr "Nisem uspel izvesti ukaza stat nad %s: %s"
-#: gconf/gconfd.c:497
+#: gconf/gconfd.c:496
#, c-format
msgid "Owner of %s is not the current user"
msgstr "Trenutni uporanbik ni lastnik %s"
-#: gconf/gconfd.c:505
-#, c-format
-msgid "Bad permissions %o on dir %s"
+#: gconf/gconfd.c:504
+#, fuzzy, c-format
+msgid "Bad permissions %lo on directory %s"
msgstr "Slaba dovoljenja %o imenika %s"
#. openlog() does not copy logname - what total brokenness.
#. So we free it at the end of main()
-#: gconf/gconfd.c:587
+#: gconf/gconfd.c:586
#, c-format
msgid "starting (version %s), pid %u user '%s'"
msgstr "pričenjam (različica %s), pid %u uporabnik '%s'"
-#: gconf/gconfd.c:627
+#: gconf/gconfd.c:626
msgid "Failed to get object reference for ConfigServer"
msgstr "Nisem uspel dobiti sklica predmeta za ConfigServer"
-#: gconf/gconfd.c:647
+#: gconf/gconfd.c:646
#, c-format
msgid "Directory %s has a problem, gconfd can't use it"
msgstr "Imenik %s ima težavo, zato ga gconf ne more uporabiti."
-#: gconf/gconfd.c:676
+#: gconf/gconfd.c:675
#, c-format
msgid "Failed to write byte to pipe fd %d so client program may hang: %s"
msgstr ""
"Nisem uspel vpisati bajta v pipo fd %d, morda se je odjemalski program "
"obesil: %s"
-#: gconf/gconfd.c:686
+#: gconf/gconfd.c:685
#, c-format
msgid "Failed to get lock for daemon, exiting: %s"
msgstr "Nisem uspel dobiti ključavnice za daemona: %s"
-#: gconf/gconfd.c:724
+#: gconf/gconfd.c:723
#, c-format
msgid "Error releasing lockfile: %s"
msgstr "Nisem uspel sprostiti ključavnične datoteke: %s"
-#: gconf/gconfd.c:732
+#: gconf/gconfd.c:731
msgid "Exiting"
msgstr "Končujem"
-#: gconf/gconfd.c:758
+#: gconf/gconfd.c:757
msgid "GConf server is not in use, shutting down."
msgstr "Strežnik GConf ni v uporabi, končujem."
-#: gconf/gconfd.c:1124
+#: gconf/gconfd.c:1123
#, c-format
msgid "Returning exception: %s"
msgstr "Vračam izjemo: %s"
-#: gconf/gconfd.c:1224
+#: gconf/gconfd.c:1223
#, c-format
msgid ""
"Failed to open gconfd logfile; won't be able to restore listeners after "
@@ -1247,7 +1258,7 @@ msgstr ""
"Nisem uspel odpreti dnevniške datoteke gconf; poslušalci ne bodo bili "
"obnovljeni po ustavitvi gconfd-ja (%s)"
-#: gconf/gconfd.c:1259
+#: gconf/gconfd.c:1258
#, c-format
msgid ""
"Failed to close gconfd logfile; data may not have been properly saved (%s)"
@@ -1255,33 +1266,33 @@ msgstr ""
"Nisem uspel zapreti dnevniške datoteke gconfd-ja; podatki morda niso "
"pravilno shranjeni (%s)"
-#: gconf/gconfd.c:1328
+#: gconf/gconfd.c:1327
#, c-format
msgid "Could not open saved state file '%s' for writing: %s"
msgstr "Za pisanje nisem uspel odpreti datoteke s shranjenim stanjem '%s': %s"
-#: gconf/gconfd.c:1342
+#: gconf/gconfd.c:1341
#, c-format
msgid "Could not write saved state file '%s' fd: %d: %s"
msgstr "Nisem mogel zapisati datoteke shranjenega stanja '%s' fd: %d: %s"
-#: gconf/gconfd.c:1351
+#: gconf/gconfd.c:1350
#, c-format
msgid "Failed to close new saved state file '%s': %s"
msgstr "Nisem uspel zapreti nove datoteke shranjenega stanja '%s': %s"
-#: gconf/gconfd.c:1365
+#: gconf/gconfd.c:1364
#, c-format
msgid "Could not move aside old saved state file '%s': %s"
msgstr "Nisem mogel odmakniti stare datoteke shranjenega stanja '%s': %s"
-#: gconf/gconfd.c:1375
+#: gconf/gconfd.c:1374
#, c-format
msgid "Failed to move new save state file into place: %s"
msgstr ""
"Nisem uspel premakniti nove datoteke shranjenega stanja na ustrezno mesto: %s"
-#: gconf/gconfd.c:1384
+#: gconf/gconfd.c:1383
#, c-format
msgid ""
"Failed to restore original saved state file that had been moved to '%s': %s"
@@ -1289,7 +1300,7 @@ msgstr ""
"Nisem uspel obnoviti izvorne datoteke shranjenega stanja, ki je bila "
"premaknjena v '%s': %s"
-#: gconf/gconfd.c:1855
+#: gconf/gconfd.c:1854
#, c-format
msgid ""
"Unable to restore a listener on address '%s', couldn't resolve the database"
@@ -1297,17 +1308,17 @@ msgstr ""
"Nisem mogel obnoviti poslušalca na naslovu '%s', nisem mogel razvozlati "
"zbirke podatkov"
-#: gconf/gconfd.c:1901
+#: gconf/gconfd.c:1900
#, c-format
msgid "Error reading saved state file: %s"
msgstr "Napaka ob branju datoteke s shranjenim stanjem: %s"
-#: gconf/gconfd.c:1955
+#: gconf/gconfd.c:1954
#, c-format
msgid "Unable to open saved state file '%s': %s"
msgstr "Ne morem odpreti datoteke s shranjenim stanjem '%s': %s"
-#: gconf/gconfd.c:2074
+#: gconf/gconfd.c:2073
#, c-format
msgid ""
"Failed to log addition of listener to gconfd logfile; won't be able to re-"
@@ -1316,7 +1327,7 @@ msgstr ""
"V dnevnik nisem uspel zapisati dodajanja poslušalca; ob novem zagonu gconfd-"
"ja poslušalca poslušalca ne bo možno dodati (%s)"
-#: gconf/gconfd.c:2079
+#: gconf/gconfd.c:2078
#, c-format
msgid ""
"Failed to log removal of listener to gconfd logfile; might erroneously re-"
@@ -1325,29 +1336,29 @@ msgstr ""
"V dnevnik nisem uspel zapisati odstranitve poslušalca; lahko se napačno doda "
"poslušalca ob novem zagonu gconfd-ja: (%s)"
-#: gconf/gconfd.c:2102 gconf/gconfd.c:2276
+#: gconf/gconfd.c:2101 gconf/gconfd.c:2275
#, c-format
msgid "Failed to get IOR for client: %s"
msgstr "Nisem uspel dobiti IOR za odjemalca: %s"
-#: gconf/gconfd.c:2117
+#: gconf/gconfd.c:2116
#, c-format
msgid "Failed to open saved state file: %s"
msgstr "Nisem uspel odpreti datoteke s shranjenim stanjem: %s"
-#: gconf/gconfd.c:2130
+#: gconf/gconfd.c:2129
#, c-format
msgid "Failed to write client add to saved state file: %s"
msgstr ""
"Nisem uspel zapisati dodajanja odjemalca v datoteko s shranjenim stanjem: %s"
-#: gconf/gconfd.c:2138
+#: gconf/gconfd.c:2137
#, c-format
msgid "Failed to flush client add to saved state file: %s"
msgstr ""
"Nisem uspel zapisati dodajanja odjemalca v datoteko s shranjenim stanjem: %s"
-#: gconf/gconfd.c:2237
+#: gconf/gconfd.c:2236
msgid ""
"Some client removed itself from the GConf server when it hadn't been added."
msgstr "Nek odjemalec se je odstranil z GConf strežnika, čeprav ni bil dodan."
@@ -1635,6 +1646,7 @@ msgstr "Ob nastavljanju vrednosti morate navesti vrsto\n"
#: gconf/gconftool.c:613 gconf/gconftool.c:626 gconf/gconftool.c:639
#: gconf/gconftool.c:653 gconf/gconftool.c:666 gconf/gconftool.c:679
#: gconf/gconftool.c:693
+#, c-format
msgid "%s option must be used by itself.\n"
msgstr "Možnost %s ni mogoče uporabiti skupaj z drugimi.\n"
@@ -1679,350 +1691,354 @@ msgid "Shutdown error: %s\n"
msgstr "Napaka ob ustavljanju: %s\n"
#: gconf/gconftool.c:1120
-msgid "Must specify one or more dirs to recursively list.\n"
+#, fuzzy
+msgid "Must specify one or more directories to recursively list.\n"
msgstr "Naveden mora biti en ali več imenikov za rekurziven izpis.\n"
-#: gconf/gconftool.c:1170
-msgid "Must specify one or more dirs to dump.\n"
+#: gconf/gconftool.c:1172
+#, fuzzy
+msgid "Must specify one or more directories to dump.\n"
msgstr "Navesti morate enega ali več imenikov za izpis.\n"
-#: gconf/gconftool.c:1211 gconf/gconftool.c:1469
+#: gconf/gconftool.c:1214 gconf/gconftool.c:1479
#, c-format
msgid "Failure listing entries in `%s': %s\n"
msgstr "Napaka ob izpisu vnosov v `%s': %s\n"
-#: gconf/gconftool.c:1229
+#: gconf/gconftool.c:1232
msgid "(no value set)"
msgstr "(vrednost ni nastavljena)"
-#: gconf/gconftool.c:1527
+#: gconf/gconftool.c:1537
#, c-format
msgid "Failed to spawn the config server (gconfd): %s\n"
msgstr "Nisem uspel pognati strežnika nastavitev (gconfd): %s\n"
-#: gconf/gconftool.c:1541
+#: gconf/gconftool.c:1551
msgid "Must specify a key or keys to get\n"
msgstr "Navedeni morajo biti ključ ali ključi, ki naj se dobijo\n"
-#: gconf/gconftool.c:1576
+#: gconf/gconftool.c:1586
#, c-format
msgid "Type: %s\n"
msgstr "Vrsta: %s\n"
-#: gconf/gconftool.c:1577
+#: gconf/gconftool.c:1587
#, c-format
msgid "List Type: %s\n"
msgstr "Vrsta seznama: %s\n"
-#: gconf/gconftool.c:1578
+#: gconf/gconftool.c:1588
#, c-format
msgid "Car Type: %s\n"
msgstr "Vrsta \"car\"-a: %s\n"
-#: gconf/gconftool.c:1579
+#: gconf/gconftool.c:1589
#, c-format
msgid "Cdr Type: %s\n"
msgstr "Vrsta \"cdr\"-a: %s\n"
-#: gconf/gconftool.c:1584
+#: gconf/gconftool.c:1594
#, c-format
msgid "Default Value: %s\n"
msgstr "Privzeta vrednost: %s\n"
-#: gconf/gconftool.c:1584 gconf/gconftool.c:1586 gconf/gconftool.c:1587
-#: gconf/gconftool.c:1588
+#: gconf/gconftool.c:1594 gconf/gconftool.c:1596 gconf/gconftool.c:1597
+#: gconf/gconftool.c:1598
msgid "Unset"
msgstr "Odnastavi"
-#: gconf/gconftool.c:1586
+#: gconf/gconftool.c:1596
#, c-format
msgid "Owner: %s\n"
msgstr "Lastnik: %s\n"
-#: gconf/gconftool.c:1587
+#: gconf/gconftool.c:1597
#, c-format
msgid "Short Desc: %s\n"
msgstr "Kratek opis: %s\n"
-#: gconf/gconftool.c:1588
+#: gconf/gconftool.c:1598
#, c-format
msgid "Long Desc: %s\n"
msgstr "Dolg opis: %s\n"
-#: gconf/gconftool.c:1597 gconf/gconftool.c:1821 gconf/gconftool.c:1855
-#: gconf/gconftool.c:1900 gconf/gconftool.c:2045
+#: gconf/gconftool.c:1607 gconf/gconftool.c:1831 gconf/gconftool.c:1865
+#: gconf/gconftool.c:1910 gconf/gconftool.c:2055
#, c-format
msgid "No value set for `%s'\n"
msgstr "Za `%s' vrednost ni nastavljena\n"
-#: gconf/gconftool.c:1601 gconf/gconftool.c:1825 gconf/gconftool.c:1859
-#: gconf/gconftool.c:1904 gconf/gconftool.c:2049
+#: gconf/gconftool.c:1611 gconf/gconftool.c:1835 gconf/gconftool.c:1869
+#: gconf/gconftool.c:1914 gconf/gconftool.c:2059
#, c-format
msgid "Failed to get value for `%s': %s\n"
msgstr "Nisem uspel prebrati vrednosti za `%s':%s\n"
-#: gconf/gconftool.c:1644 gconf/gconftool.c:1656
+#: gconf/gconftool.c:1654 gconf/gconftool.c:1666
#, c-format
msgid "Don't understand type `%s'\n"
msgstr "Ne razumem vrste `%s'\n"
-#: gconf/gconftool.c:1668
+#: gconf/gconftool.c:1678
msgid "Must specify alternating keys/values as arguments\n"
msgstr "Kot argumenti morajo biti navedeni pari ključ/vrednost\n"
-#: gconf/gconftool.c:1688
+#: gconf/gconftool.c:1698
#, c-format
msgid "No value to set for key: `%s'\n"
msgstr "Zak ljuč `%s' vrednost ni nastavljena\n"
-#: gconf/gconftool.c:1716
+#: gconf/gconftool.c:1726
msgid "Cannot set schema as value\n"
msgstr "Ne morem nastaviti sheme kot vrednosti\n"
-#: gconf/gconftool.c:1726
+#: gconf/gconftool.c:1736
msgid "When setting a list you must specify a primitive list-type\n"
msgstr "Kadar nastavljate seznam morate navesti osnovno vrsto seznama\n"
-#: gconf/gconftool.c:1740
+#: gconf/gconftool.c:1750
msgid ""
"When setting a pair you must specify a primitive car-type and cdr-type\n"
msgstr "Kadar nastavljate par morate navesti osnovni vrsti za car in cdr\n"
-#: gconf/gconftool.c:1755
+#: gconf/gconftool.c:1765
#, c-format
msgid "Error: %s\n"
msgstr "Napaka %s\n"
-#: gconf/gconftool.c:1768 gconf/gconftool.c:2796
+#: gconf/gconftool.c:1778 gconf/gconftool.c:2806
#, c-format
msgid "Error setting value: %s\n"
msgstr "Napaka ob nastavljanju vrednosti: %s\n"
-#: gconf/gconftool.c:1786
+#: gconf/gconftool.c:1796
#, c-format
msgid "Error syncing: %s\n"
msgstr "Napaka ob usklajevanju: %s\n"
-#: gconf/gconftool.c:1801
+#: gconf/gconftool.c:1811
msgid "Must specify a key or keys to get type\n"
msgstr "Za povpraševanje po vrsti morajo biti navedeni ključ ali ključi\n"
-#: gconf/gconftool.c:1845
+#: gconf/gconftool.c:1855
msgid "Must specify a key to lookup size of.\n"
msgstr "Za povpraševanje po velikosti mora biti naveden ključ\n"
-#: gconf/gconftool.c:1870 gconf/gconftool.c:1915
+#: gconf/gconftool.c:1880 gconf/gconftool.c:1925
#, c-format
msgid "Key %s is not a list.\n"
msgstr "Ključ %s ni seznam\n"
-#: gconf/gconftool.c:1890
+#: gconf/gconftool.c:1900
msgid "Must specify a key from which to get list element.\n"
msgstr "Naveden mora biti ključ iz katerega naj se pridobi element seznama\n"
-#: gconf/gconftool.c:1921
+#: gconf/gconftool.c:1931
msgid "Must specify list index.\n"
msgstr "Navedena mora biti številka elementa v seznamu\n"
-#: gconf/gconftool.c:1928
+#: gconf/gconftool.c:1938
msgid "List index must be non-negative.\n"
msgstr "Številka elementa v seznamu mora biti nenegativna.\n"
-#: gconf/gconftool.c:1937
+#: gconf/gconftool.c:1947
msgid "List index is out of bounds.\n"
msgstr "Številka elementa v seznamu je izven meja.\n"
-#: gconf/gconftool.c:1963
+#: gconf/gconftool.c:1973
msgid "Must specify a key or keys on the command line\n"
msgstr "Ključ ali ključi morajo biti navedeni v ukazni vrstici\n"
-#: gconf/gconftool.c:1983
+#: gconf/gconftool.c:1993
#, c-format
msgid "No schema known for `%s'\n"
msgstr "Shema za `%s' ni znana\n"
-#: gconf/gconftool.c:2016
+#: gconf/gconftool.c:2026
#, c-format
msgid "No doc string stored in schema at '%s'\n"
msgstr "Niz dokumentacije ni shranjen za shemo pri '%s'\n"
-#: gconf/gconftool.c:2021
+#: gconf/gconftool.c:2031
#, c-format
msgid "Error getting schema at '%s': %s\n"
msgstr "Napaka ob dobivanju sheme pri '%s': %s\n"
-#: gconf/gconftool.c:2028
+#: gconf/gconftool.c:2038
#, c-format
msgid "No schema stored at '%s'\n"
msgstr "Shema pri `%s' ni shranjena\n"
-#: gconf/gconftool.c:2031
+#: gconf/gconftool.c:2041
#, c-format
msgid "Value at '%s' is not a schema\n"
msgstr "Vrednost pri '%s' ni shema\n"
-#: gconf/gconftool.c:2087
+#: gconf/gconftool.c:2097
msgid "Must specify a schema name followed by the key name to apply it to\n"
msgstr ""
"Navesti morate ime sheme, ki mu sledi ime ključa na katerem naj se shema "
"uveljavi\n"
-#: gconf/gconftool.c:2094
+#: gconf/gconftool.c:2104
#, c-format
msgid "Error associating schema name '%s' with key name '%s': %s\n"
msgstr "Napaka pri povezovanju sheme '%s' s ključem '%s': %s\n"
-#: gconf/gconftool.c:2112
+#: gconf/gconftool.c:2122
msgid "Must specify keys to unapply schema from\n"
msgstr "Za oduveljavitev sheme morajo biti navedeni ključi\n"
-#: gconf/gconftool.c:2122
+#: gconf/gconftool.c:2132
#, c-format
msgid "Error removing schema name from '%s': %s\n"
msgstr "Napaka ob odstranjevanju imena sheme iz '%s': %s\n"
-#: gconf/gconftool.c:2147
+#: gconf/gconftool.c:2157
msgid "Must specify key (schema name) as the only argument\n"
msgstr "Navesti morate ključ (ime shema) kot edini argument\n"
-#: gconf/gconftool.c:2189
+#: gconf/gconftool.c:2199
msgid "List type must be a primitive type: string, int, float or bool\n"
msgstr "Vrsta seznama mora biti osnovna vrsta: niz, int, float ali bool\n"
-#: gconf/gconftool.c:2209
+#: gconf/gconftool.c:2219
msgid "Pair car type must be a primitive type: string, int, float or bool\n"
msgstr "Vrsta car mora biti osnovna vrsta: niz, int, float ali bool\n"
-#: gconf/gconftool.c:2229
+#: gconf/gconftool.c:2239
msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
msgstr "Vrsta cdr mora biti osnovna vrsta: niz, int, float ali bool\n"
-#: gconf/gconftool.c:2244
+#: gconf/gconftool.c:2254
#, c-format
msgid "Error setting value: %s"
msgstr "Napaka ob nastavljanju vrednosti: %s"
-#: gconf/gconftool.c:2258
+#: gconf/gconftool.c:2268
#, c-format
msgid "Error syncing: %s"
msgstr "Napaka ob usklajevanju: %s"
-#: gconf/gconftool.c:2273
-msgid "Must specify one or more dirs to get key/value pairs from.\n"
+#: gconf/gconftool.c:2283
+#, fuzzy
+msgid "Must specify one or more directories to get key/value pairs from.\n"
msgstr ""
"Navesti morate enega ali več imenikov iz katerih naj se preberejo pari ključ/"
"vrednost.\n"
-#: gconf/gconftool.c:2287
+#: gconf/gconftool.c:2297
msgid "Must specify one or more keys to unset.\n"
msgstr "Navesti morate enega ali več ključov za odnastavitev.\n"
-#: gconf/gconftool.c:2298
+#: gconf/gconftool.c:2308
#, c-format
msgid "Error unsetting `%s': %s\n"
msgstr "Napaka ob odnastavljanju `%s': %s\n"
-#: gconf/gconftool.c:2318
+#: gconf/gconftool.c:2328
msgid "Must specify one or more keys to recursively unset.\n"
msgstr "Naveden mora biti en ali več ključev za rekurzivno odnastavljanje.\n"
-#: gconf/gconftool.c:2332
+#: gconf/gconftool.c:2342
#, c-format
msgid "Failure during recursive unset of \"%s\": %s\n"
msgstr "Napaka ob rekurzivnem odnastavljanju \"%s\": %s\n"
-#: gconf/gconftool.c:2352
-msgid "Must specify one or more dirs to get subdirs from.\n"
+#: gconf/gconftool.c:2362
+#, fuzzy
+msgid "Must specify one or more directories to get subdirs from.\n"
msgstr ""
"Navesti morate enega ali več imenikov iz katerih naj se preberejo "
"podimeniki.\n"
-#: gconf/gconftool.c:2386
+#: gconf/gconftool.c:2396
#, c-format
msgid "Error listing dirs: %s\n"
msgstr "Napaka ob izpisovanju imenikov: %s\n"
-#: gconf/gconftool.c:2522
+#: gconf/gconftool.c:2532
msgid "WARNING: must specify both a <car> and a <cdr> in a <pair>\n"
msgstr "OPOZORILO: v <pair> morata biti navedena oba <car> in <cdr>\n"
-#: gconf/gconftool.c:2549
+#: gconf/gconftool.c:2559
#, c-format
msgid "WARNING: key specified (%s) for schema under a <value> - ignoring\n"
msgstr "OPOZORILO: naveden ključ (%s) za shemo pod <value> - preziram\n"
-#: gconf/gconftool.c:2582
+#: gconf/gconftool.c:2592
msgid "WARNING: must have a child node under <value>\n"
msgstr "OPOZORILO: pod <value> mora biti list otroka\n"
-#: gconf/gconftool.c:2588
+#: gconf/gconftool.c:2598
#, c-format
msgid "WARNING: node <%s> not understood\n"
msgstr "OPOZORILO: vozlišče <%s> ni bilo razumljeno\n"
-#: gconf/gconftool.c:2606
+#: gconf/gconftool.c:2616
#, c-format
msgid "WARNING: Failed to parse int value `%s'\n"
msgstr "OPOZORILO: nisem uspel razčleniti celoštevilčne vrednosti `%s'\n"
-#: gconf/gconftool.c:2627
+#: gconf/gconftool.c:2637
#, c-format
msgid "WARNING: Failed to parse float value `%s'\n"
msgstr "OPOZORILO: nisem uspel razčleniti števila s plavajočo vejico `%s'\n"
-#: gconf/gconftool.c:2649
+#: gconf/gconftool.c:2659
#, c-format
msgid "WARNING: Failed to parse string value `%s'\n"
msgstr "OPOZORILO: nisem uspel razčleniti vrednost niza `%s'\n"
-#: gconf/gconftool.c:2670
+#: gconf/gconftool.c:2680
#, c-format
msgid "WARNING: Failed to parse boolean value `%s'\n"
msgstr "OPOZORILO: nisem uspel razčleniti booleanovo vrednost `%s'\n"
-#: gconf/gconftool.c:2786 gconf/gconftool.c:3322
+#: gconf/gconftool.c:2796 gconf/gconftool.c:3332
#, c-format
msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
msgstr "OPOZORILO: nisem uspel povezati sheme `%s' s ključem `%s': %s\n"
-#: gconf/gconftool.c:2891
+#: gconf/gconftool.c:2901
#, c-format
msgid "WARNING: invalid or missing type for schema (%s)\n"
msgstr "OPOZORILO: neveljavna ali pogrešana vrsta za shemo (%s)\n"
-#: gconf/gconftool.c:2900
+#: gconf/gconftool.c:2910
#, c-format
msgid "WARNING: invalid or missing list_type for schema (%s)\n"
msgstr ""
"OPOZORILO: neveljaven ali pogrešan list_type (vrsta seznama) za shemo (%s)\n"
-#: gconf/gconftool.c:2911 gconf/gconftool.c:2941 gconf/gconftool.c:2970
+#: gconf/gconftool.c:2921 gconf/gconftool.c:2951 gconf/gconftool.c:2980
#, c-format
msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
msgstr ""
"OPOZORILO: Nisem uspel razčleniti privzete vrednosti `%s' za shemo (%s)\n"
-#: gconf/gconftool.c:2929
+#: gconf/gconftool.c:2939
#, c-format
msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
msgstr ""
"OPOZORILO: neveljaven ali pogrešan car_type ali cdr_type za shemo (%s)\n"
-#: gconf/gconftool.c:2954
+#: gconf/gconftool.c:2964
msgid "WARNING: You cannot set a default value for a schema\n"
msgstr "OPOZORILO: Ne morete nastaviti privzete vrednosti za shemo\n"
-#: gconf/gconftool.c:2983
+#: gconf/gconftool.c:2993
msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
msgstr "OPOZORILO: notranja napaka gconftool, neznan GConfValueType\n"
-#: gconf/gconftool.c:3031 gconf/gconftool.c:3052 gconf/gconftool.c:3073
-#: gconf/gconftool.c:3094
+#: gconf/gconftool.c:3041 gconf/gconftool.c:3062 gconf/gconftool.c:3083
+#: gconf/gconftool.c:3104
#, c-format
msgid "WARNING: failed to parse type name `%s'\n"
msgstr "OPOZORILO: nisem uspel razčleniti imena vrste '%s'\n"
-#: gconf/gconftool.c:3048
+#: gconf/gconftool.c:3058
#, c-format
msgid ""
"WARNING: list_type can only be int, float, string or bool and not `%s'\n"
@@ -2030,135 +2046,135 @@ msgstr ""
"OPOZORILO: list_type (vrsta seznama) je lahko le int, float, niz ali bool in "
"ne '%s'\n"
-#: gconf/gconftool.c:3069
+#: gconf/gconftool.c:3079
#, c-format
msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
msgstr "OPOZORILO: car_type je lahko le int, float, niz ali bool in ne '%s'\n"
-#: gconf/gconftool.c:3090
+#: gconf/gconftool.c:3100
#, c-format
msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
msgstr "OPOZORILO: cdr_type je lahko le int, float, niz ali bool in ne '%s'\n"
-#: gconf/gconftool.c:3130
+#: gconf/gconftool.c:3140
msgid "WARNING: empty <applyto> node"
msgstr "OPOZORILO: prazno vozlišče <applyto>"
-#: gconf/gconftool.c:3133 gconf/gconftool.c:3395
+#: gconf/gconftool.c:3143 gconf/gconftool.c:3405
#, c-format
msgid "WARNING: node <%s> not understood below <schema>\n"
msgstr "OPOZORILO: vozlišče <%s> ni bilo razumljeno pod <schema>\n"
-#: gconf/gconftool.c:3144
+#: gconf/gconftool.c:3154
msgid "WARNING: no <list_type> specified for schema of type list\n"
msgstr "OPOZORILO: za shemo vrste seznam ni bil naveden <list_type>\n"
-#: gconf/gconftool.c:3150
+#: gconf/gconftool.c:3160
msgid "WARNING: no <car_type> specified for schema of type pair\n"
msgstr "OPOZORILO: za shemo vrste par ni bil naveden <car_type>\n"
-#: gconf/gconftool.c:3156
+#: gconf/gconftool.c:3166
msgid "WARNING: no <cdr_type> specified for schema of type pair\n"
msgstr "OPOZORILO: za shemo vrste par ni bil naveden <cdr_type>\n"
-#: gconf/gconftool.c:3185
+#: gconf/gconftool.c:3195
msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
msgstr ""
"OPOZORILO: vozlišče <locale> nima lastnosti `name=\"locale\"', preziram\n"
-#: gconf/gconftool.c:3191
+#: gconf/gconftool.c:3201
#, c-format
msgid ""
"WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
msgstr "OPOZORILO: več vozlišč <locale> za locale `%s, prezrti vsi za prvim\n"
-#: gconf/gconftool.c:3289
+#: gconf/gconftool.c:3299
#, c-format
msgid "WARNING: Invalid node <%s> in a <locale> node\n"
msgstr "OPOZORILO: Neveljavno vozlišče <%s> v vozlišču <locale>\n"
-#: gconf/gconftool.c:3330
+#: gconf/gconftool.c:3340
#, c-format
msgid "Attached schema `%s' to key `%s'\n"
msgstr "Pripel shemo `%s' h ključu `%s'\n"
-#: gconf/gconftool.c:3404
+#: gconf/gconftool.c:3414
msgid "You must have at least one <locale> entry in a <schema>\n"
msgstr "V <schema> morate imeti vsaj en vnos <locale>\n"
-#: gconf/gconftool.c:3436
+#: gconf/gconftool.c:3446
#, c-format
msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
msgstr ""
"OPOZORILO: nisem uspel namestiti definicij locale `%2$s' sheme `%1$s': %3$s\n"
-#: gconf/gconftool.c:3444
+#: gconf/gconftool.c:3454
#, c-format
msgid "Installed schema `%s' for locale `%s'\n"
msgstr "Namestil shemo `%s' za definicije locale `%s'\n"
-#: gconf/gconftool.c:3468
+#: gconf/gconftool.c:3478
#, c-format
msgid "WARNING: failed to uninstall schema `%s' locale `%s': %s\n"
msgstr ""
"OPOZORILO: nisem uspel odnamestiti definicij locale `%2$s' sheme `%1$s': %3"
"$s\n"
-#: gconf/gconftool.c:3476
+#: gconf/gconftool.c:3486
#, c-format
msgid "Uninstalled schema `%s' from locale `%s'\n"
msgstr "Odnamestil sem shemo `%s' iz definicije locale `%s'\n"
-#: gconf/gconftool.c:3514
+#: gconf/gconftool.c:3524
msgid "WARNING: no key specified for schema\n"
msgstr "OPOZORILO: ključ za shemo ni naveden\n"
-#: gconf/gconftool.c:3555
+#: gconf/gconftool.c:3565
#, c-format
msgid "WARNING: node <%s> not understood below <%s>\n"
msgstr "OPOZORILO: vozlišče <%s> ni bilo razumljeno pod <%s>\n"
-#: gconf/gconftool.c:3586
+#: gconf/gconftool.c:3596
#, c-format
msgid "Failed to open `%s': %s\n"
msgstr "Nisem uspel odpreti `%s': %s\n"
-#: gconf/gconftool.c:3593
+#: gconf/gconftool.c:3603
#, c-format
msgid "Document `%s' is empty?\n"
msgstr "Dokument `%s' je prazen?\n"
-#: gconf/gconftool.c:3605
+#: gconf/gconftool.c:3615
#, c-format
msgid "Document `%s' has the wrong type of root node (<%s>, should be <%s>)\n"
msgstr ""
"Dokument `%s' ima napačno vrsto korenskega vozlišča (<%s>, moral bi biti <%"
"s>)\n"
-#: gconf/gconftool.c:3618
+#: gconf/gconftool.c:3628
#, c-format
msgid "Document `%s' has no top level <%s> node\n"
msgstr "Dokument `%s' nima vrhnjega vozlišča <%s>\n"
-#: gconf/gconftool.c:3632
+#: gconf/gconftool.c:3642
#, c-format
msgid "WARNING: node <%s> below <%s> not understood\n"
msgstr "OPOZORILO: vozlišče <%s> pod <%s> ni bilo razumljeno\n"
-#: gconf/gconftool.c:3643 gconf/gconftool.c:3678 gconf/gconftool.c:3710
+#: gconf/gconftool.c:3653 gconf/gconftool.c:3688 gconf/gconftool.c:3720
#, c-format
msgid "Error syncing config data: %s"
msgstr "Napaka ob usklajevanju podatkov nastavitev: %s"
-#: gconf/gconftool.c:3662
+#: gconf/gconftool.c:3672
msgid "Must specify some schema files to install\n"
msgstr "Navedene morajo biti datoteke shem, ki naj se namestijo\n"
-#: gconf/gconftool.c:3694
+#: gconf/gconftool.c:3704
msgid "Must specify some schema files to uninstall\n"
msgstr "Navedene morajo biti datoteke shem, ki naj se odnamestijo\n"
-#: gconf/gconftool.c:3731
+#: gconf/gconftool.c:3741
#, c-format
msgid ""
"\n"
@@ -2167,16 +2183,16 @@ msgstr ""
"\n"
"%s\n"
-#: gconf/gconftool.c:3751
+#: gconf/gconftool.c:3761
#, c-format
msgid "Failed to unset breakage key %s: %s\n"
msgstr "Nisem uspel odnastaviti problematičnega ključa %s: %s\n"
-#: gconf/gconftool.c:3877
+#: gconf/gconftool.c:3887
msgid "Must specify some keys to break\n"
msgstr "Navesti morate ključe, ki naj postanejo problematični\n"
-#: gconf/gconftool.c:3883
+#: gconf/gconftool.c:3893
#, c-format
msgid ""
"Trying to break your application by setting bad values for key:\n"
@@ -2185,11 +2201,11 @@ msgstr ""
"Poskušam zlomiti vaš program z nastavljanjem slabih vrednosti za ključ:\n"
" %s\n"
-#: gconf/gconftool.c:3901
+#: gconf/gconftool.c:3911
msgid "Must specify some directories to break\n"
msgstr "Navesti morate imenike, ki naj postanejo problematični\n"
-#: gconf/gconftool.c:3920
+#: gconf/gconftool.c:3930
#, c-format
msgid ""
"Trying to break your application by setting bad values for keys in "
@@ -2200,6 +2216,19 @@ msgstr ""
"imeniku:\n"
" %s\n"
+#~ msgid ""
+#~ "%u items remain in the cache after cleaning already-synced items older "
+#~ "than %u seconds"
+#~ msgstr ""
+#~ "V predpomnilniku je po čiščenju že usklajenih predmetov starejših od %2$u "
+#~ "sekund ostalo še %1$u predmetov"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "/path"
+#~ msgstr "/pot"
+
#~ msgid "--dir-exists option must be used by itself.\n"
#~ msgstr "Možnosti --dir-exits ni mogoče uporabljati hkrati z drugimi.\n"
@@ -2271,9 +2300,6 @@ msgstr ""
#~ msgid "Unsynced directory deletions when shutting down XML backend"
#~ msgstr "Neskladna brisanja imenikov ob zapiranju modula XML"
-#~ msgid "Error listing subdirs of '%s': %s\n"
-#~ msgstr "Napaka ob izpisu seznama podimenikov '%s': %s\n"
-
#~ msgid "Error unsetting '%s': %s\n"
#~ msgstr "Napaka ob odnastavljanju '%s': %s\n"
diff --git a/po/sq.po b/po/sq.po
index ca9080fb..05918797 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,14 +6,14 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf.HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-24 13:49+0100\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\n"
"PO-Revision-Date: 2004-02-24 13:52+0100\n"
"Last-Translator: Laurent Dhima <laurenti@alblinux.net>\n"
"Language-Team: Albanian <gnome-albanian-perkthyesit@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
diff --git a/po/sr.po b/po/sr.po
index 400a78da..81de5edd 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -8,14 +8,14 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf 2.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-30 12:23+0100\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\n"
"PO-Revision-Date: 2003-12-30 12:38+0100\n"
"Last-Translator: Данило Шеган <danilo@prevod.org>\n"
"Language-Team: Serbian (sr) <serbiangnome-lista@nongnu.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 180ec6da..880c2b9d 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -8,14 +8,14 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf 2.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-30 12:23+0100\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\n"
"PO-Revision-Date: 2003-12-30 12:38+0100\n"
"Last-Translator: Danilo Šegan <danilo@prevod.org>\n"
"Language-Team: Serbian (sr) <serbiangnome-lista@nongnu.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
@@ -359,8 +359,8 @@ msgstr "Primio je neispravnu vrednost u zahtevu za postavljanje"
#, c-format
msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
msgstr ""
-"Ne može da razgonetne primljenu CORBA vrednost u zahtevu za postavljanje ključa "
-"„%s“"
+"Ne može da razgonetne primljenu CORBA vrednost u zahtevu za postavljanje "
+"ključa „%s“"
#: gconf/gconf-database.c:524
msgid "Received request to drop all cached data"
@@ -402,8 +402,8 @@ msgid ""
"Failed to log removal of listener to logfile (most likely harmless, may "
"result in a notification weirdly reappearing): %s"
msgstr ""
-"Nije uspeo da zapiše uklanjanje osluškivača u dnevnik (najverovatnije nebitno, "
-"može proizvesti neočekivanu pojavu obaveštavanja): %s"
+"Nije uspeo da zapiše uklanjanje osluškivača u dnevnik (najverovatnije "
+"nebitno, može proizvesti neočekivanu pojavu obaveštavanja): %s"
#: gconf/gconf-database.c:1246 gconf/gconf-sources.c:1541
#, c-format
@@ -739,10 +739,10 @@ msgid ""
"to a system crash. See http://www.gnome.org/projects/gconf/ for information. "
"(Details - %s)"
msgstr ""
-"Ne može da stupi u vezu sa serverom za podešavanja; mogući uzroci su da treba "
-"nije omogućen TCP/IP za ORBit, ili imate zapuštene zaključane NFS datoteke "
-"usled pada sistema. Pogledajte http://www.gnome.org/projects/gconf/ za više "
-"podataka. (Detalji — %s)"
+"Ne može da stupi u vezu sa serverom za podešavanja; mogući uzroci su da "
+"treba nije omogućen TCP/IP za ORBit, ili imate zapuštene zaključane NFS "
+"datoteke usled pada sistema. Pogledajte http://www.gnome.org/projects/gconf/ "
+"za više podataka. (Detalji — %s)"
#: gconf/gconf-internals.c:2949
msgid "none"
@@ -957,14 +957,15 @@ msgstr ""
"odgovarajuće obavestio server pri ponovnom pokretanju da treba da otpusti "
"zaključavanja datoteka. Ukoliko imate dva pokrenuta gconfd procesa (ili ste "
"imali dva kada je pokrenut drugi), odjava, ubijanje svih primeraka gconfd-a, "
-"i ponovna prijava mogu pomoći. Ukoliko imate zaostalih zaključavanja, uklonite "
-"~/.gconf*/*lock. Možda je problem u tome da ste pokušali da koristite GKonf "
-"sa dva računara istovremeno, a ORBit-ova uobičajena podešavanja onemogućavaju "
-"udaljeni CORBA pristup — stavite „ORBIIOPIPv4=1“ u /etc/orbitrc. Kao i uvek, "
-"proverite user.* sistemski dnevnik za detalje o problemima na koje je gconfd "
-"naišao. Može postojati samo jedan gconfd za svaki lični direktorijum, i mora "
-"imati datoteku za zaključavanje u ~/.gconfd i datoteke za zaključavanje u "
-"pojedinačnim mestima za smeštanje kao što je ~/.gconf"
+"i ponovna prijava mogu pomoći. Ukoliko imate zaostalih zaključavanja, "
+"uklonite ~/.gconf*/*lock. Možda je problem u tome da ste pokušali da "
+"koristite GKonf sa dva računara istovremeno, a ORBit-ova uobičajena "
+"podešavanja onemogućavaju udaljeni CORBA pristup — stavite „ORBIIOPIPv4=1“ "
+"u /etc/orbitrc. Kao i uvek, proverite user.* sistemski dnevnik za detalje o "
+"problemima na koje je gconfd naišao. Može postojati samo jedan gconfd za "
+"svaki lični direktorijum, i mora imati datoteku za zaključavanje u ~/.gconfd "
+"i datoteke za zaključavanje u pojedinačnim mestima za smeštanje kao što je "
+"~/.gconf"
#: gconf/gconf-sources.c:1414
#, c-format
@@ -1135,16 +1136,16 @@ msgid ""
"gconfd compiled with debugging; trying to load gconf.path from the source "
"directory"
msgstr ""
-"gconfd je preveden sa simbolima za nalaženje grešaka; pokušava da učita gconf."
-"path iz direktorijuma sa izvornim kodom"
+"gconfd je preveden sa simbolima za nalaženje grešaka; pokušava da učita "
+"gconf.path iz direktorijuma sa izvornim kodom"
#: gconf/gconfd.c:296
#, c-format
msgid ""
"No configuration files found, trying to use the default config source `%s'"
msgstr ""
-"Nije pronašao datoteke sa podešavanjima, pokušava da koristi uobičajeni izvor "
-"podešavanja „%s“"
+"Nije pronašao datoteke sa podešavanjima, pokušava da koristi uobičajeni "
+"izvor podešavanja „%s“"
#. We want to stay alive but do nothing, because otherwise every
#. request would result in another failed gconfd being spawned.
@@ -1183,7 +1184,8 @@ msgstr ""
#, c-format
msgid "Received signal %d, dumping core. Please report a GConf bug."
msgstr ""
-"Primio je signal %d, ispisuje stanje memorije. Prijavite ovo kao GKonf grešku."
+"Primio je signal %d, ispisuje stanje memorije. Prijavite ovo kao GKonf "
+"grešku."
#: gconf/gconfd.c:390
#, c-format
@@ -1373,8 +1375,8 @@ msgstr ""
#, c-format
msgid "Failed to flush client add to saved state file: %s"
msgstr ""
-"Nije uspeo da primora upis dodavanja klijenta u datoteku sa sačuvanim stanjem: "
-"%s"
+"Nije uspeo da primora upis dodavanja klijenta u datoteku sa sačuvanim "
+"stanjem: %s"
#: gconf/gconfd.c:2236
msgid ""
@@ -1509,8 +1511,8 @@ msgid ""
"Specify the type of the cdr pair value being set, or the type of the value a "
"schema describes. Unique abbreviations OK."
msgstr ""
-"Navedite tip drugog člana para koji postavljate, ili tip vrednosti koju shema "
-"opisuje. Jednoznačne skraćenice su u redu."
+"Navedite tip drugog člana para koji postavljate, ili tip vrednosti koju "
+"shema opisuje. Jednoznačne skraćenice su u redu."
#: gconf/gconftool.c:283
msgid "Specify a short half-line description to go in a schema."
@@ -1582,8 +1584,8 @@ msgid ""
"Torture-test an application by setting and unsetting a bunch of values of "
"different types for keys on the command line."
msgstr ""
-"Izmuči-i-proveri program podešavanjem hrpe vrednosti raznih vrsta za ključeve "
-"navedene u naredbi."
+"Izmuči-i-proveri program podešavanjem hrpe vrednosti raznih vrsta za "
+"ključeve navedene u naredbi."
#: gconf/gconftool.c:364
msgid ""
@@ -1822,7 +1824,8 @@ msgstr "Kada postavljate listu, morate navesti osnovni tip liste\n"
#: gconf/gconftool.c:1750
msgid ""
"When setting a pair you must specify a primitive car-type and cdr-type\n"
-msgstr "Kada postavljate par, morate navesti osnovni tip prvog i drugog člana\n"
+msgstr ""
+"Kada postavljate par, morate navesti osnovni tip prvog i drugog člana\n"
#: gconf/gconftool.c:1765
#, c-format
@@ -1899,7 +1902,8 @@ msgstr "Vrednost na „%s“ nije shema\n"
#: gconf/gconftool.c:2097
msgid "Must specify a schema name followed by the key name to apply it to\n"
-msgstr "Obavezno je navesti ime sheme i zatim ime ključa na koji je primeniti\n"
+msgstr ""
+"Obavezno je navesti ime sheme i zatim ime ključa na koji je primeniti\n"
#: gconf/gconftool.c:2104
#, c-format
@@ -1950,8 +1954,8 @@ msgstr "Greška pri usklađivanju: %s"
#: gconf/gconftool.c:2283
msgid "Must specify one or more directories to get key/value pairs from.\n"
msgstr ""
-"Obavezno je navesti jednu ili više kategorija za učitavanje parova ključeva i "
-"vrednosti.\n"
+"Obavezno je navesti jednu ili više kategorija za učitavanje parova ključeva "
+"i vrednosti.\n"
#: gconf/gconftool.c:2297
msgid "Must specify one or more keys to unset.\n"
@@ -1966,8 +1970,8 @@ msgstr "Greška pri uklanjanju vrednosti „%s“: %s\n"
#: gconf/gconftool.c:2328
msgid "Must specify one or more keys to recursively unset.\n"
msgstr ""
-"Obavezno je navesti jedan ili više ključeva za rekurzivno uklanjanje njihovih "
-"vrednosti.\n"
+"Obavezno je navesti jedan ili više ključeva za rekurzivno uklanjanje "
+"njihovih vrednosti.\n"
#: gconf/gconftool.c:2342
#, c-format
@@ -2118,7 +2122,8 @@ msgstr ""
msgid ""
"WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
msgstr ""
-"UPOZORENjE: <locale> oznaka za lokalitet „%s“, prvo zanemaruje sve prethodno\n"
+"UPOZORENjE: <locale> oznaka za lokalitet „%s“, prvo zanemaruje sve "
+"prethodno\n"
#: gconf/gconftool.c:3299
#, c-format
@@ -2241,8 +2246,8 @@ msgid ""
"directory:\n"
" %s\n"
msgstr ""
-"Pokušava da pokvari vaš program postavljanjem neispravnih vrednosti ključeva u "
-"kategoriji:\n"
+"Pokušava da pokvari vaš program postavljanjem neispravnih vrednosti "
+"ključeva u kategoriji:\n"
" %s\n"
# bug: plural forms (both occurrences of %u)
@@ -2250,8 +2255,8 @@ msgstr ""
#~ "%u items remain in the cache after cleaning already-synced items older "
#~ "than %u seconds"
#~ msgstr ""
-#~ "Preostalo je %u stavki u kešu nakon čišćenja već snimljenih stavki koje su "
-#~ "starije od %u sekundi."
+#~ "Preostalo je %u stavki u kešu nakon čišćenja već snimljenih stavki koje "
+#~ "su starije od %u sekundi."
#~ msgid "%s"
#~ msgstr "%s"
diff --git a/po/sv.po b/po/sv.po
index 11db6d74..705d55c7 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf\n"
-"POT-Creation-Date: 2004-01-06 00:58+0100\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\n"
"PO-Revision-Date: 2004-01-06 00:59+0100\n"
"Last-Translator: Christian Rose <menthos@menthos.com>\n"
"Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/tr.po b/po/tr.po
index fc413a14..7d9cb5bd 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,14 +8,14 @@
msgid ""
msgstr ""
"Project-Id-Version: GConf\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-28 21:38+0000\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\n"
"PO-Revision-Date: 2003-02-07 08:25+0000\n"
"Last-Translator: erkaN <erkaN@linux-sevenler.de>\n"
"Language-Team: Turkish <gnome-turk@gnome.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
@@ -32,6 +32,33 @@ msgstr "`%s' dizini oluşturulamadı: %s"
msgid "Can't read from or write to the %s root directory in the address `%s'"
msgstr "%s dizini (%s adresindeki) okunamaz/yazılamaz"
+#: backends/gconf-merge-tree.c:78
+#, fuzzy, c-format
+msgid "Cannot find directory %s\n"
+msgstr "`%s' dizini oluşturulamadı: %s"
+
+#: backends/gconf-merge-tree.c:94
+#, fuzzy, c-format
+msgid "Error saving GConf tree to '%s': %s\n"
+msgstr "`%s' içindeki dizinler listelenirken hata: %s\n"
+
+#: backends/gconf-merge-tree.c:120
+#, c-format
+msgid "Usage: %s <dir>\n"
+msgstr ""
+
+#: backends/gconf-merge-tree.c:126
+#, c-format
+msgid ""
+"Usage: %s <dir>\n"
+" Merges a markup backend filesystem hierarchy like:\n"
+" dir/%%gconf.xml\n"
+" subdir1/%%gconf.xml\n"
+" subdir2/%%gconf.xml\n"
+" to:\n"
+" dir/%%gconf-tree.xml\n"
+msgstr ""
+
#: backends/xml-backend.c:236
msgid "Unloading XML backend module."
msgstr "XML modülü kaldırılıyor."
@@ -2254,8 +2281,5 @@ msgstr ""
#~ msgid "Unsynced directory deletions when shutting down XML backend"
#~ msgstr "XML modülü kapatılırken bazı dizinler silinmeden kaldı"
-#~ msgid "Error listing subdirs of '%s': %s\n"
-#~ msgstr "`%s' içindeki dizinler listelenirken hata: %s\n"
-
#~ msgid "Error unsetting '%s': %s\n"
#~ msgstr "`%s' kaldırılırken hata: %s\n"
diff --git a/po/uk.po b/po/uk.po
index b78660c5..758610c3 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -9,14 +9,14 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf.HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-14 21:55-0500\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\n"
"PO-Revision-Date: 2004-02-08 8:45+0200\n"
"Last-Translator: Maxim Dziumanenko <mvd@mylinux.com.ua>\n"
"Language-Team: Ukrainian <uk@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
@@ -35,6 +35,33 @@ msgstr ""
"Неможливо виконати зчитування чи запис в кореневому каталозі %s за адресою "
"\"%s\""
+#: backends/gconf-merge-tree.c:78
+#, fuzzy, c-format
+msgid "Cannot find directory %s\n"
+msgstr "Не вдалось створити каталог \"%s\": %s"
+
+#: backends/gconf-merge-tree.c:94
+#, fuzzy, c-format
+msgid "Error saving GConf tree to '%s': %s\n"
+msgstr "Помилка отримання схеми на \"%s\": %s\n"
+
+#: backends/gconf-merge-tree.c:120
+#, c-format
+msgid "Usage: %s <dir>\n"
+msgstr ""
+
+#: backends/gconf-merge-tree.c:126
+#, c-format
+msgid ""
+"Usage: %s <dir>\n"
+" Merges a markup backend filesystem hierarchy like:\n"
+" dir/%%gconf.xml\n"
+" subdir1/%%gconf.xml\n"
+" subdir2/%%gconf.xml\n"
+" to:\n"
+" dir/%%gconf-tree.xml\n"
+msgstr ""
+
#: backends/xml-backend.c:236
msgid "Unloading XML backend module."
msgstr "Вивантаження серверного модуля XML."
@@ -700,7 +727,8 @@ msgstr "Помилка перевірки доступності сервера:
#: gconf/gconf-internals.c:2899
#, c-format
msgid "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
-msgstr "Помилка при створенні каналу зв'язку з породженим процесом gconfd: %s\n"
+msgstr ""
+"Помилка при створенні каналу зв'язку з породженим процесом gconfd: %s\n"
#: gconf/gconf-internals.c:2923
#, c-format
@@ -1257,8 +1285,8 @@ msgstr ""
msgid ""
"Failed to close gconfd logfile; data may not have been properly saved (%s)"
msgstr ""
-"Помилка при закриванні файла журналу gconfd; дані може бути неправильно збережено "
-"(%s)"
+"Помилка при закриванні файла журналу gconfd; дані може бути неправильно "
+"збережено (%s)"
#: gconf/gconfd.c:1327
#, c-format
@@ -1480,8 +1508,8 @@ msgid ""
"Specify the type of the cdr pair value being set, or the type of the value a "
"schema describes. Unique abbreviations OK."
msgstr ""
-"Вказує тип значення пари, що встановлюється, або тип значення, що "
-"описується схемою. Унікальні абревіатури повністю підходять."
+"Вказує тип значення пари, що встановлюється, або тип значення, що описується "
+"схемою. Унікальні абревіатури повністю підходять."
#: gconf/gconftool.c:283
msgid "Specify a short half-line description to go in a schema."
@@ -1524,8 +1552,8 @@ msgid ""
"Access the config database directly, bypassing server. Requires that gconfd "
"is not running."
msgstr ""
-"Безпосередній доступ до бази даних конфігурації, обминаючи сервер, вимагає зупинки "
-"gconfd."
+"Безпосередній доступ до бази даних конфігурації, обминаючи сервер, вимагає "
+"зупинки gconfd."
#: gconf/gconftool.c:337
msgid ""
@@ -1543,9 +1571,10 @@ msgid ""
"GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
"config source or set to the empty string to use the default."
msgstr ""
-"Коректно вилучає з бази даних файли схеми, вказані в командному рядку. Змінна "
-"середовища GCONF_CONFIG_SOURCE має бути встановлена в значення нетипового "
-"шляху до джерела чи лишитися порожньою для використання типового значення."
+"Коректно вилучає з бази даних файли схеми, вказані в командному рядку. "
+"Змінна середовища GCONF_CONFIG_SOURCE має бути встановлена в значення "
+"нетипового шляху до джерела чи лишитися порожньою для використання типового "
+"значення."
#: gconf/gconftool.c:355
msgid ""
@@ -1606,8 +1635,8 @@ msgstr "Не можна отримувати та встановлювати/з
#: gconf/gconftool.c:552
msgid "Can't use --all-entries with --get or --set\n"
msgstr ""
-"Не можна використовувати параметр --all-entries разом з параметрами --get "
-"чи --set\n"
+"Не можна використовувати параметр --all-entries разом з параметрами --get чи "
+"--set\n"
#: gconf/gconftool.c:563
msgid "Can't use --all-dirs with --get or --set\n"
@@ -2202,6 +2231,6 @@ msgid ""
"directory:\n"
" %s\n"
msgstr ""
-"Спроба ушкодити вашу програму встановленням неправильних значень для ключів у "
-"каталозі:\n"
+"Спроба ушкодити вашу програму встановленням неправильних значень для ключів "
+"у каталозі:\n"
" %s\n"
diff --git a/po/vi.po b/po/vi.po
index cdad2ee9..9b4a6d2c 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,14 +6,14 @@
msgid ""
msgstr ""
"Project-Id-Version: 2.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-14 21:55-0500\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
"com>\n"
#: backends/dir-utils.c:108
@@ -31,6 +31,33 @@ msgstr "Không thể tạo thư mục `%s': %s"
msgid "Can't read from or write to the %s root directory in the address `%s'"
msgstr "Không thể đọc/ghi ở thư mục %s của root trong địa chỉ `%s'"
+#: backends/gconf-merge-tree.c:78
+#, 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:94
+#, 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:120
+#, c-format
+msgid "Usage: %s <dir>\n"
+msgstr ""
+
+#: backends/gconf-merge-tree.c:126
+#, c-format
+msgid ""
+"Usage: %s <dir>\n"
+" Merges a markup backend filesystem hierarchy like:\n"
+" dir/%%gconf.xml\n"
+" subdir1/%%gconf.xml\n"
+" subdir2/%%gconf.xml\n"
+" to:\n"
+" dir/%%gconf-tree.xml\n"
+msgstr ""
+
#: backends/xml-backend.c:236
msgid "Unloading XML backend module."
msgstr "Không nạp mô-đun XML chạy ở nền."
diff --git a/po/yi.po b/po/yi.po
index 6e76cc23..0c9bdeb3 100644
--- a/po/yi.po
+++ b/po/yi.po
@@ -5,14 +5,14 @@
msgid ""
msgstr ""
"Project-Id-Version: 1.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-14 21:55-0500\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
@@ -29,6 +29,33 @@ msgstr ""
msgid "Can't read from or write to the %s root directory in the address `%s'"
msgstr ""
+#: backends/gconf-merge-tree.c:78
+#, c-format
+msgid "Cannot find directory %s\n"
+msgstr ""
+
+#: backends/gconf-merge-tree.c:94
+#, c-format
+msgid "Error saving GConf tree to '%s': %s\n"
+msgstr ""
+
+#: backends/gconf-merge-tree.c:120
+#, c-format
+msgid "Usage: %s <dir>\n"
+msgstr ""
+
+#: backends/gconf-merge-tree.c:126
+#, c-format
+msgid ""
+"Usage: %s <dir>\n"
+" Merges a markup backend filesystem hierarchy like:\n"
+" dir/%%gconf.xml\n"
+" subdir1/%%gconf.xml\n"
+" subdir2/%%gconf.xml\n"
+" to:\n"
+" dir/%%gconf-tree.xml\n"
+msgstr ""
+
#: backends/xml-backend.c:236
msgid "Unloading XML backend module."
msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 459888b1..f9a8498a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,14 +7,14 @@
msgid ""
msgstr ""
"Project-Id-Version: gconf\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-14 21:55-0500\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\n"
"PO-Revision-Date: 2003-08-09 03:06+0800\n"
"Last-Translator: Sun G11n <gnome_int_l10n@ireland.sun.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
"X-Generator: KBabel 1.0\n"
#: backends/dir-utils.c:108
@@ -32,6 +32,33 @@ msgstr "无法创建目录“%s”:%s"
msgid "Can't read from or write to the %s root directory in the address `%s'"
msgstr "无法在地址“%s”处读或写 %s 根目录"
+#: backends/gconf-merge-tree.c:78
+#, fuzzy, c-format
+msgid "Cannot find directory %s\n"
+msgstr "无法创建目录“%s”:%s"
+
+#: backends/gconf-merge-tree.c:94
+#, fuzzy, c-format
+msgid "Error saving GConf tree to '%s': %s\n"
+msgstr "在“%s”获取 schema 时发生错误:%s\n"
+
+#: backends/gconf-merge-tree.c:120
+#, c-format
+msgid "Usage: %s <dir>\n"
+msgstr ""
+
+#: backends/gconf-merge-tree.c:126
+#, c-format
+msgid ""
+"Usage: %s <dir>\n"
+" Merges a markup backend filesystem hierarchy like:\n"
+" dir/%%gconf.xml\n"
+" subdir1/%%gconf.xml\n"
+" subdir2/%%gconf.xml\n"
+" to:\n"
+" dir/%%gconf-tree.xml\n"
+msgstr ""
+
#: backends/xml-backend.c:236
msgid "Unloading XML backend module."
msgstr "正在卸载 XML 后端模块。"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index d2180900..d2b9e5b5 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5,14 +5,14 @@
msgid ""
msgstr ""
"Project-Id-Version: GConf 1.2.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-14 21:55-0500\n"
+"POT-Creation-Date: 2004-02-24 16:00+0000\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
#: backends/dir-utils.c:108
#, c-format
@@ -29,6 +29,33 @@ msgstr "無法建立目錄 `%s': %s"
msgid "Can't read from or write to the %s root directory in the address `%s'"
msgstr "無法讀取或寫入到 %s 根目錄在 `%s' 的位址"
+#: backends/gconf-merge-tree.c:78
+#, fuzzy, c-format
+msgid "Cannot find directory %s\n"
+msgstr "無法建立目錄 `%s': %s"
+
+#: backends/gconf-merge-tree.c:94
+#, fuzzy, c-format
+msgid "Error saving GConf tree to '%s': %s\n"
+msgstr "在 '%s' 取得概要發生錯誤: %s\n"
+
+#: backends/gconf-merge-tree.c:120
+#, c-format
+msgid "Usage: %s <dir>\n"
+msgstr ""
+
+#: backends/gconf-merge-tree.c:126
+#, c-format
+msgid ""
+"Usage: %s <dir>\n"
+" Merges a markup backend filesystem hierarchy like:\n"
+" dir/%%gconf.xml\n"
+" subdir1/%%gconf.xml\n"
+" subdir2/%%gconf.xml\n"
+" to:\n"
+" dir/%%gconf-tree.xml\n"
+msgstr ""
+
#: backends/xml-backend.c:236
msgid "Unloading XML backend module."
msgstr "卸載 XML 後端模組。"