Broken pipe, merge from 2.6.0.GCONF_DBUS_2_6_0

17 files changed, 5132 insertions, 1425 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index a65441dd..0d2b6160 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,85 @@
+2004-03-23  Takeshi AIHANA <aihana@gnome.gr.jp>
+
+	* ja.po: Fixed wrong translations for gconftool-2.
+
+2004-03-22  Baris Cicek <baris@teamforce.name.tr>
+
+	* tr.po:  Updated Turkish Translation from Gurkan ASLAN.
+	
+2004-03-22  Guntupalli Karunakar  <karunakar@freedomink.org>
+
+        * pa.po: Punjabi translation by 
+        Amanpreet Singh Alam <amanlinux@netscape.net>.
+
+2004-03-21  Vincent van Adrighem  <adrighem@gnome.org>
+
+	* nl.po: Translation updated by Daniel van Eeden.
+
+2004-03-21  Robert Sedak  <robert.sedak@sk.htnet.hr>
+
+        * hr.po: Updated Croatian translation.
+
+2004-03-20  Telsa Gwynne <hobbit@aloss.ukuu.org.uk>
+
+	* cy.po: Updated Welsh translation. (typo hunt)
+
+2004-03-16  Gareth Owen  <gowen72@yahoo.com>
+
+	* en_GB.po: Added British translation
+
+2004-03-16  Maxim Dziumanenko <mvd@mylinux.com.ua>
+
+	* uk.po: Updated Ukrainian translation.
+
+2004-03-16  Nikos Charonitakis  <frolix68@yahoo.gr>
+
+	* el.po: Updated Greek translation.
+
+2004-03-15  Gustavo Noronha Silva  <kov@debian.org>
+
+	* pt_BR.po: updated translation, by
+	  Medina - debian <afmedina@uol.com.br>
+
+2004-03-13  Robert Sedak  <robert.sedak@sk.htnet.hr>
+
+	* hr.po: Updated Croatian translation.
+
+2004-03-11  Dafydd Harries  <daf@muse.19inch.net>
+
+	* cy.po: Updated Welsh translation from Rhys Jones.
+
+2004-03-09  Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>
+
+	* sk.po: Updated Slovak translation.
+
+2004-03-08 Alastair McKinstry <mckinstry@computer.org>
+	
+	* ga.po: Updated Irish translation.
+
+2004-03-08  Ales Nyakhaychyk  <nab@mail.by>
+
+	* be.po: Updated Belarusian translation.
+
+2004-03-07  Funda Wang  <fundawang@linux.net.cn>
+
+	* zh_CN.po: Updated Simplified Chinese translation.
+
+2004-03-02 Dinesh Nadarajah <dinesh_list@sbcglobal.net>
+
+	* ta.po: Started Tamil Translation.
+
+2004-03-01  Laurent Dhima  <laurenti@alblinux.net>
+
+	* sq.po: Updated Albanian translation.
+
+2004-02-26  Takeshi AIHANA <aihana@gnome.gr.jp>
+
+	* ja.po: Updated Japanese translation.
+
+2004-02-26  Christian Neumair  <chris@gnome-de.org>
+
+	* de.po: Fixed ugly string order bug.
+
 2004-02-24  Laurent Dhima  <laurenti@alblinux.net>
 
 	* sq.po: Fixed Albanian translation.
diff --git a/po/be.po b/po/be.po
index f28bcad7..96ba1bd5 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,26 +6,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf HEAD\n"
 "POT-Creation-Date: 2003-12-05 00:37+0100\n"
-"PO-Revision-Date: 2003-07-27 14:40+0300\n"
+"PO-Revision-Date: 2003-12-11 08:46EET\n"
 "Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
 "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"
+"X-Generator: KBabel 0.9.5\n"
 
 # backends/dir-utils.c:108
 #: backends/dir-utils.c:108
 #, c-format
 msgid "Couldn't find the %s root directory in the address `%s'"
-msgstr "Не атрымалася адшукаць каранёвую тэчку %s у адрэсе \"%s\""
+msgstr "Немагчыма адшукаць каранёвую тэчку %s у адрасе \"%s\""
 
 # backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1176
 #: backends/dir-utils.c:124 backends/xml-backend.c:332
 #, c-format
 msgid "Could not make directory `%s': %s"
-msgstr "Не атрымалася стварыць тэчку \"%s\": %s"
+msgstr "Немагчыма стварыць тэчку \"%s\": %s"
 
 # backends/dir-utils.c:212
 #: backends/dir-utils.c:212
@@ -65,13 +65,12 @@ msgstr "Памылка сынхранізацыі кэшу каталёга мо
 
 # backends/xml-backend.c:651
 #: backends/xml-backend.c:684
-#, fuzzy
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
 msgstr ""
-"Апэрацыя выдаленьня каталёга больш ня падтрымліваецца, проста выдаліце ўсе "
-"значэньні з каталёга"
+"Выдаленьня тэчкі больш не падтрымліваецца, проста выдаліце ўсе значэньні з "
+"тэчкі"
 
 # backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1176
 #: backends/xml-backend.c:770
@@ -92,9 +91,9 @@ msgstr "Ініцыялізацыя модулю паслужніка XML"
 
 # backends/xml-backend.c:786
 #: backends/xml-backend.c:877
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
-msgstr "Збой пад час блякаваньня XML-каталёга \"%s\": %s"
+msgstr "Немагчыма атрымаць замок для XML-тэчкі \"%s\": %s"
 
 # backends/xml-cache.c:248
 #: backends/xml-cache.c:286
@@ -429,9 +428,9 @@ msgstr "Памылка праверкі існаваньня \"%s\": %s"
 
 # gconf/gconf-database.c:1509
 #: gconf/gconf-database.c:520
-#, fuzzy, c-format
+#, c-format
 msgid "Error removing directory \"%s\": %s"
-msgstr "Памылка выдаленьня каталёга \"%s\": %s"
+msgstr "Памылка выдаленьня тэчкі \"%s\": %s"
 
 # gconf/gconf-database.c:1536
 #: gconf/gconf-database.c:547
@@ -749,13 +748,13 @@ msgid ""
 "that the \"nfslock\" service has been disabled.The error was \"%s\" (errno = "
 "%d)."
 msgstr ""
-"Зьвяжыцеся са сваім сыстэмным адміністратарам для вырашэньня наступнае "
-"праблемы:\n"
-"Неатрымалася заблякаваць файл \"%s\"; Гэта азначае, што магчыма існуе "
-"праблема з канфігурацыяй вашае апэрацыйнае сыстэмы. Калі ў вас ёсьць "
-"замантаваны праз NFS хатні каталёг, магчыма, альбо паслужнік, альбо кліент "
-"скафігураваны памылковы.Паглядзіце дакумэнтацыю на rpc.statd і rpc.lockd. "
-"Агульным выпадкам гэтае памылкі можа быць што, паслуга \"nfslock\" была "
+"Калі ласка, зьвяжыцеся са сваім сыстэмным адміністратарам для вырашэньня "
+"наступнае праблемы:\n"
+"Немагчыма замкнуць файл \"%s\"; гэта азначае, што магчыма існуе праблема з "
+"наладкамі вашае апэрацыйнае сыстэмы. Калі ў вас ёсьць замантаваная праз NFS "
+"свойская тэчка, магчыма, альбо паслужнік, альбо кліент наладжаны ня так, як "
+"патрэбна. Паглядзіце дакумэнтацыю на rpc.statd і rpc.lockd. Агульным "
+"выпадкам гэтае памылкі можа быць тое, што паслуга \"nfslock\" была "
 "адключана. Адбылася памылка - \"%s\" (errno = %d)."
 
 # gconf/gconf-internals.c:2569
@@ -1134,13 +1133,13 @@ msgstr ""
 #. request would result in another failed gconfd being spawned.
 #.
 #: gconf/gconfd.c:169
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit %s"
 msgstr ""
-"Няма крыніцаў канфігурацыі на шляху крыніцаў, канфігурацыя ня была захавана; "
-"рэдагаваць "
+"Адсутнічаюць крыніцы наладкі ў шляху крыніц, наладкі ня будуць захаваны; "
+"рэдагаваць %s"
 
 # gconf/gconfd.c:313
 #: gconf/gconfd.c:182
@@ -1207,9 +1206,9 @@ msgid "Owner of %s is not the current user"
 msgstr "Бягучы карыстальнік не з'яўляецца ўладальнікам %s"
 
 #: gconf/gconfd.c:365
-#, fuzzy, c-format
+#, c-format
 msgid "Bad permissions %lo on directory %s"
-msgstr "Дрэнныя правы %o на тэчку %s"
+msgstr "Дрэнныя правы %lo на тэчку %s"
 
 # gconf/gconfd.c:531
 #. openlog() does not copy logname - what total brokenness.
@@ -1217,7 +1216,7 @@ msgstr "Дрэнныя правы %o на тэчку %s"
 #: gconf/gconfd.c:445
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
-msgstr "запуск (версыя %s), pid %u карыстальнік \"%s\""
+msgstr "запуск (вэрсыя %s), pid %u карыстальнік \"%s\""
 
 # gconf/gconf-internals.c:2842 gconf/gconfd.c:583
 #: gconf/gconfd.c:484
@@ -1659,16 +1658,13 @@ msgstr "Памылка выключэньня: %s\n"
 
 # gconf/gconftool.c:894
 #: gconf/gconftool.c:1120
-#, fuzzy
 msgid "Must specify one or more directories to recursively list.\n"
-msgstr ""
-"Патрабуецца указаць адзін ці болей каталёгаў для рэкурсыўнага сьпіса.\n"
+msgstr "Неабходна задаць адну ці болей тэчак для рэкурсыўнага сьпіса.\n"
 
 # gconf/gconftool.c:1607
 #: gconf/gconftool.c:1172
-#, fuzzy
 msgid "Must specify one or more directories to dump.\n"
-msgstr "Павінена быць задана адна ці больш тэчак для звалкі.\n"
+msgstr "Неабходна задаць адну ці больш тэчак для звалкі.\n"
 
 # gconf/gconftool.c:928
 #: gconf/gconftool.c:1214 gconf/gconftool.c:1479
@@ -1945,11 +1941,9 @@ msgstr "Памылка сынхранізацыі: %s"
 
 # gconf/gconftool.c:1593
 #: gconf/gconftool.c:2283
-#, fuzzy
 msgid "Must specify one or more directories to get key/value pairs from.\n"
 msgstr ""
-"Патрабуецца указываць адзін ці болей каталёгаў для атрыманьня пар ключ/"
-"значэньне.\n"
+"Неабходна задаць адну ці болей тэчак для атрыманьня пар ключ/значэньне.\n"
 
 # gconf/gconftool.c:1607
 #: gconf/gconftool.c:2297
@@ -1976,11 +1970,8 @@ msgstr "Збой пад час рэкурсыўнага выдаленьня \"%
 
 # gconf/gconftool.c:1670
 #: gconf/gconftool.c:2362
-#, fuzzy
 msgid "Must specify one or more directories to get subdirs from.\n"
-msgstr ""
-"Патрабуецца указываць адзін ці болей каталёгаў для атрыманьня з іх "
-"падкаталёгаў.\n"
+msgstr "Неабходна задаць адну ці болей тэчак для атрыманьня з іх падтэчак.\n"
 
 # gconf/gconftool.c:1704
 #: gconf/gconftool.c:2396
@@ -2303,7 +2294,7 @@ msgstr ""
 # backends/dir-utils.c:124 backends/xml-backend.c:304 backends/xml-dir.c:1176
 #, fuzzy
 #~ msgid "Cannot find directory %s\n"
-#~ msgstr "Не атрымалася стварыць тэчку \"%s\": %s"
+#~ msgstr "Немагчыма стварыць тэчку \"%s\": %s"
 
 # gconf/gconftool.c:1341
 #, fuzzy
@@ -2554,74 +2545,3 @@ msgstr ""
 #~ msgstr ""
 #~ "Пэўны кліент выдаліў сябе з паслужніка GConf, але ня бу раней даданы да "
 #~ "яго!"
-
-# backends/xml-cache.c:305
-#~ msgid ""
-#~ "%u items remain in the cache after cleaning already-synced items older "
-#~ "than %u seconds"
-#~ msgstr ""
-#~ "%u элемэнтаў застаецца ў кэшы пасьля ачысткі ад ужо сынхранізаваных "
-#~ "элемэнтаў старэйшых за %u сэкундаў"
-
-# gconf/gconftool.c:2415
-#~ msgid "%s"
-#~ msgstr "%s"
-
-# gconf/gconfd.c:300
-#~ msgid "/path"
-#~ msgstr "/path"
-
-# gconf/gconftool.c:495
-#~ msgid "--dir-exists option must be used by itself.\n"
-#~ msgstr "парамэтар --dir-exists мусіць выкарыстоўвацца сам.\n"
-
-# gconf/gconftool.c:505
-#~ msgid "--install-schema-file must be used by itself.\n"
-#~ msgstr "парамэтар --install-schema-file мусіць выкарыстоўвацца сам.\n"
-
-# gconf/gconftool.c:516
-#~ msgid "--makefile-install-rule must be used by itself.\n"
-#~ msgstr "парамэтар --makefile-install-rule мусіць выкарыстоўвацца сам.\n"
-
-# gconf/gconftool.c:516
-#~ msgid "--makefile-uninstall-rule must be used by itself.\n"
-#~ msgstr "--makefile-install-rule мусіць быць выкарыстоўвацца сам.\n"
-
-# gconf/gconftool.c:527
-#~ msgid "--break-key must be used by itself.\n"
-#~ msgstr "--break-key мусіць быць выкарыстоўвацца сам.\n"
-
-# gconf/gconftool.c:538
-#~ msgid "--break-directory must be used by itself.\n"
-#~ msgstr "парамэтар --break-directory павінны быць выкарыстаны сам.\n"
-
-# backends/bdb-backend.c:215
-#~ msgid "Unloading BerkeleyDB (BDB) backend module."
-#~ msgstr "Выгрузка модулю паслужніка BerkeleyDB (BDB)."
-
-# backends/bdb-backend.c:238
-#~ msgid "Opened BerkeleyDB source at root %s"
-#~ msgstr "Адчынена крыніца BerkeleyDB з каранём %s"
-
-# backends/bdb-backend.c:578
-#~ msgid "Initializing BDB backend module"
-#~ msgstr "Ініцыялізацыя модулю паслужніка BDB"
-
-# backends/dir-utils.c:108
-#~ msgid "Couldn't find the root directory in the address \"%s\""
-#~ msgstr "Ня атрымалася адшукаць каранёвы каталёг на адрэсе '%s'"
-
-# gconf/gconftool.c:2282
-#~ msgid "WARNING: node <%s> not understood below <schemalist>\n"
-#~ msgstr "УВАГА: вузел <%s> ня зразуметы пад <schemalist>\n"
-
-#~ msgid "Multiple segmentation faults occurred; can't display error dialog\n"
-#~ msgstr ""
-#~ "Шматлікія сыстэмныя памылкі; немагчыма паказаць дыялёг з памылкамі\n"
-
-#~ msgid ""
-#~ "Segmentation fault!\n"
-#~ "Cannot display crash dialog: %s\n"
-#~ msgstr ""
-#~ "Памылка сэгментацыі!\n"
-#~ "Немагчыма адлюстраваць дыялёг памылкі: %s\n"
diff --git a/po/cy.po b/po/cy.po
index b2071121..0ec339d8 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -1,15 +1,15 @@
 # gconf yn Gymraeg.
-# Copyright (C) 2003 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gconf package.
 # Chris Jackson <chris@www.linux.org.uk>, 2003.
 # Dafydd Harries <daf@parnassus.ath.cx>, 2003.
+# Rhys Jones <rhys@sucs.org>, 2004.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gconf\n"
 "POT-Creation-Date: 2003-12-05 00:37+0100\n"
-"PO-Revision-Date: 2003-08-30 23:52+0100\n"
-"Last-Translator: Dafydd Harries <daf@parnassus.ath.cx>\n"
+"PO-Revision-Date: 2004-03-20 09:30+0000\n"
+"Last-Translator: Rhys Jones <rhys@sucs.org>\n"
 "Language-Team: Cymraeg <gnome-cy@pengwyn.linux.org.uk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -52,7 +52,8 @@ msgstr ""
 #: backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
-msgstr "Caniatâd cyfeiriadur/ffeil i'r ffynhonell XML wrth gwreiddyn %s: %o/%o"
+msgstr ""
+"Caniatâd cyfeiriadur/ffeil i'r ffynhonnell XML wrth gwreiddyn %s: %o/%o"
 
 #: backends/xml-backend.c:619
 #, c-format
@@ -60,19 +61,17 @@ msgid "Error syncing the XML backend directory cache: %s"
 msgstr "Methiant wrth gysoni storfa cyfeiriadur ochr gefn XML: %s"
 
 #: backends/xml-backend.c:684
-#, fuzzy
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
 msgstr ""
-"Ni chynhelir y weithred tynnu cyfeiriadur bellach, tynnwch pob gwerth yn y "
-"cyfeiriadur yn lle"
+"Ni chynhelir y weithred dileu cyfeiriadur bellach; dilëwch pob gwerth yn y "
+"cyfeiriadur yn lle hynny"
 
-# msgstr "Ni chynhelir y weithred dileu cyfeiriadur bellach, dileuwch
 #: backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
-msgstr "Methu wrth cloi'r cyfeiriadur er mwyn i %s dadgloi: %s\n"
+msgstr "Methu agor y cyfeiriadur clo er mwyn i %s dynnu'r cloeon: %s\n"
 
 #: backends/xml-backend.c:788
 #, c-format
@@ -84,9 +83,9 @@ msgid "Initializing XML backend module"
 msgstr "Cychwyn modiwl ochr gefn XML"
 
 #: backends/xml-backend.c:877
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
-msgstr "Methu dadgloi cyf XML \"%s\": %s"
+msgstr "Methu rhoi'r clo ar gyfeiriadur XML \"%s\" i fyny: %s"
 
 #: backends/xml-cache.c:286
 msgid "Failed to sync XML cache contents to disk"
@@ -253,7 +252,7 @@ msgstr "Anwybyddu CAR gwael o bâr XML: %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 "gramadegu ffeil XML: ni chair rhoi rhestri a parau o fewn pâr"
+msgstr "gramadegu ffeil XML: ni chaniateir rhoi rhestri a parau o fewn pâr"
 
 #: backends/xml-entry.c:1168
 #, c-format
@@ -271,15 +270,15 @@ msgstr "Ni chanfodwyd CAR a CDR ar gyfer nôd pâr XML"
 
 #: backends/xml-entry.c:1211
 msgid "Missing cdr from pair of values in XML file"
-msgstr "CDR ar goll o par o werthoedd mewn ffeil XML"
+msgstr "CDR ar goll o pâr o werthoedd mewn ffeil XML"
 
 #: backends/xml-entry.c:1218
 msgid "Missing car from pair of values in XML file"
-msgstr "CAR ar goll o par o werthoedd mewn ffeil XML"
+msgstr "CAR ar goll o pâr o werthoedd mewn ffeil XML"
 
 #: backends/xml-entry.c:1223
 msgid "Missing both car and cdr values from pair in XML file"
-msgstr "CAR a CDR ar goll o par mewn ffeil XML"
+msgstr "CAR a CDR ar goll o pâr mewn ffeil XML"
 
 #. -- end debug only
 #: gconf/gconf-backend.c:167
@@ -328,7 +327,7 @@ msgstr "Disgwyliwyd `%s', cafwyd `%s' am allwedd %s"
 #: gconf/gconf-database.c:173
 #, c-format
 msgid "Failed to sync one or more sources: %s"
-msgstr "Methwyd cysoni un neu fwy o ffynhonellau: %s"
+msgstr "Methwyd cysoni un ffynhonnell neu fwy: %s"
 
 #: gconf/gconf-database.c:241 gconf/gconf-sources.c:1541
 #, c-format
@@ -366,9 +365,9 @@ msgid "Error checking existence of `%s': %s"
 msgstr "Gwall wrth wirio bodolaeth `%s': %s"
 
 #: gconf/gconf-database.c:520
-#, fuzzy, c-format
+#, c-format
 msgid "Error removing directory \"%s\": %s"
-msgstr "Gwall wrth gael gwared ar gyfeiriadur `%s': %s"
+msgstr "Gwall wrth ddileu cyfeiriadur `%s': %s"
 
 #: gconf/gconf-database.c:547
 #, c-format
@@ -403,7 +402,7 @@ msgstr "Dim caniatâd"
 
 #: gconf/gconf-error.c:29
 msgid "Couldn't resolve address for configuration source"
-msgstr "Methwyd gatrys cyfeiriad ar gyfer ffynhonell cyfluniad"
+msgstr "Methwyd gatrys cyfeiriad ar gyfer ffynhonnell cyfluniad"
 
 #: gconf/gconf-error.c:30
 msgid "Bad key or directory name"
@@ -415,7 +414,7 @@ msgstr "Gwall gramadegu"
 
 #: gconf/gconf-error.c:32
 msgid "Corrupt data in configuration source database"
-msgstr "Data llygredig yn y cronfa ddata ffynhonellau cyfluniad"
+msgstr "Data llygredig yn y cronfa ddata ffynhonnellau cyfluniad"
 
 #: gconf/gconf-error.c:33
 msgid "Type mismatch"
@@ -462,7 +461,7 @@ msgstr "Methu agor ffeil llwybr `%s': %s\n"
 #: gconf/gconf-internals.c:386
 #, c-format
 msgid "Adding source `%s'\n"
-msgstr "Ychwannegu'r ffynhonell `%s'\n"
+msgstr "Ychwanegu'r ffynhonnell `%s'\n"
 
 #: gconf/gconf-internals.c:398
 #, c-format
@@ -493,12 +492,12 @@ msgstr "Disgwylwyd par, canfu %s"
 #: gconf/gconf-internals.c:1005
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
-msgstr "Disgwylwyd par (%s, %s), cafwyd par gyda un neu'r ddau werth ar goll"
+msgstr "Disgwylwyd pâr (%s, %s), cafwyd pâr gyda un neu'r ddau werth ar goll"
 
 #: gconf/gconf-internals.c:1021
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
-msgstr "Disgwylwyd par o'r math (%s,%s), cafwyd math (%s,%s)"
+msgstr "Disgwylwyd pâr o'r math (%s,%s), cafwyd math (%s,%s)"
 
 #: gconf/gconf-internals.c:1137
 msgid "Quoted string doesn't begin with a quotation mark"
@@ -541,7 +540,7 @@ msgstr "Methu cloi ffeil dros dro '%s': %s"
 #: gconf/gconf-internals.c:1976
 #, c-format
 msgid "Could not create file '%s', probably because it already exists"
-msgstr "Methu creu'r ffeil '%s', mwy na thebyg oherwydd mae'n bodoli eisioes"
+msgstr "Methu creu'r ffeil '%s', mwy na thebyg am ei fod yn bodoli eisioes"
 
 #: gconf/gconf-internals.c:2023
 #, c-format
@@ -600,7 +599,7 @@ msgstr "Methwyd datgysylltu ffeil clo %s: %s\n"
 
 #: gconf/gconf-sanity-check.c:43 gconf/gconftool.c:84
 msgid "Help options"
-msgstr "Opsiynnau cymorth"
+msgstr "Opsiynau cymorth"
 
 #: gconf/gconf-sanity-check.c:79 gconf/gconftool.c:506
 #, c-format
@@ -642,7 +641,7 @@ msgstr ""
 "Methwyd cloi y ffeil \"%s\"; mae hyn yn dangos bod problem gyda cyfluniad "
 "eich system weithredu. Os oes cyfeiriadur cartref wedi ei osod dros NFs "
 "gennych, efallai for y gweinydd neu'r cleient wedi ei osod yn anghywir. "
-"Gweler dogfenniaeth rpc.statd and rpc.lockd. Achos cyffredin o'r broblem hon "
+"Gweler dogfennaeth rpc.statd and rpc.lockd. Achos cyffredin o'r broblem hon "
 "yw fod y gwasanaeth \"nfslock\" wedi ei analluogi. \"%s\" oedd y gwall "
 "(errno = %d)."
 
@@ -660,8 +659,8 @@ msgid ""
 msgstr ""
 "Cysylltwch a gweinydd eich system er mwyn datrys y broblem dilynol os\n"
 "gwelwch yn dda:\n"
-"Dim ffynhonellau cyfluniad yn y ffeil cyfluniad \"%s\"; mae hyn yn golygu ni "
-"ellir arbed hoffterau a gosodiadau eraill. %s%s"
+"Dim ffynhonnellau cyfluniad yn y ffeil cyfluniad \"%s\"; mae hyn yn golygu "
+"ni ellir arbed hoffterau a gosodiadau eraill. %s%s"
 
 #: gconf/gconf-sanity-check.c:239
 msgid "Error reading the file: "
@@ -733,20 +732,20 @@ msgstr "Mae'r sgema yn penodi pâr ond nid yw'n penodi math yr elfennau CAR/CDR"
 #: gconf/gconf-sources.c:319
 #, c-format
 msgid "Failed to load source \"%s\": %s"
-msgstr "Methu llwytho'r ffynhonell \"%s\": %s"
+msgstr "Methu llwytho'r ffynhonnell \"%s\": %s"
 
 #: gconf/gconf-sources.c:346
 #, c-format
 msgid "Resolved address \"%s\" to a writable config source at position %d"
 msgstr ""
-"Datryswyd y cyfeiriad \"%s\" i ffynhonell cyfluniad ysgrifennadwy ger y "
+"Datryswyd y cyfeiriad \"%s\" i ffynhonnell cyfluniad ysgrifennadwy ger y "
 "safle %d"
 
 #: gconf/gconf-sources.c:352
 #, c-format
 msgid "Resolved address \"%s\" to a read-only config source at position %d"
 msgstr ""
-"Datryswyd y cyfeiriad \"%s\" i ffynhonell cyfluniad darllen-yn-unig ger y "
+"Datryswyd y cyfeiriad \"%s\" i ffynhonnell cyfluniad darllen-yn-unig ger y "
 "safle %d"
 
 #: gconf/gconf-sources.c:359
@@ -754,7 +753,7 @@ msgstr ""
 msgid ""
 "Resolved address \"%s\" to a partially writable config source at position %d"
 msgstr ""
-"Datryswyd y cyfeiriad \"%s\" i ffynhonell cyfluniad rhannol ysgrifennadwy "
+"Datryswyd y cyfeiriad \"%s\" i ffynhonnell cyfluniad rhannol ysgrifennadwy "
 "ger y safle %d"
 
 #: gconf/gconf-sources.c:368
@@ -780,7 +779,7 @@ msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path"
 msgstr ""
-"Gosodwyd gwerth ar gyfer `%s' mewn ffynhonell darllen-yn-unig ar flaen eich "
+"Gosodwyd gwerth ar gyfer `%s' mewn ffynhonnell darllen-yn-unig ar flaen eich "
 "llwybr cyfluniad"
 
 #: gconf/gconf-sources.c:692
@@ -873,12 +872,12 @@ msgstr "Ddim yn daeall `%s' (rhaid i rhestr orffen efo ']')"
 #: gconf/gconf-value.c:325
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
-msgstr "Methwyd daeall `%s' (']' ychwannegol heb ei ddianc o fewn rhestr)"
+msgstr "Methwyd daeall `%s' (']' ychwanegol heb ei ddianc o fewn rhestr)"
 
 #: gconf/gconf-value.c:356 gconf/gconf-value.c:517
 #, c-format
 msgid "Didn't understand `%s' (extra trailing characters)"
-msgstr "Ddim yn daeall `%s' (nodau ychwannegol ar y diwedd)"
+msgstr "Ddim yn daeall `%s' (nodau ychwanegol ar y diwedd)"
 
 #: gconf/gconf-value.c:403
 #, c-format
@@ -898,7 +897,7 @@ msgstr "Ddim yn daeall `%s' (nifer anghywir o elfennau)"
 #: gconf/gconf-value.c:486
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
-msgstr "Methwyd daeall `%s' (')' ychwannegol heb ei ddianc o fewn pâr)"
+msgstr "Methwyd daeall `%s' (')' ychwanegol heb ei ddianc o fewn pâr)"
 
 #: gconf/gconf.c:44
 #, c-format
@@ -967,14 +966,14 @@ msgid ""
 "directory"
 msgstr ""
 "crynhowyd gconfd gyda dadcwilenni; ceisir llwytho gconf.path o'r cyfeiriadur "
-"ffynhonell"
+"ffynhonnell"
 
 #: gconf/gconfd.c:161
 #, c-format
 msgid ""
 "No configuration files found, trying to use the default config source `%s'"
 msgstr ""
-"Ni chanfodwyd unrhyw ffeiliau cyfluniad, ceisir defnyddio y ffynhonell "
+"Ni chanfodwyd unrhyw ffeiliau cyfluniad, ceisir defnyddio y ffynhonnell "
 "cyfluniad rhagosodedig `%s'"
 
 # EFALLAI
@@ -982,13 +981,13 @@ msgstr ""
 #. request would result in another failed gconfd being spawned.
 #.
 #: gconf/gconfd.c:169
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit %s"
 msgstr ""
-"Dim ffynohnellau cyfluniad yn y llwybr cyfluniad, ni chaiff y cyfluniad ei "
-"gadw; golygu "
+"Dim ffynhonnellau cyfluniad yn y llwybr ffynhonnell; ni chaiff y cyfluniad "
+"ei gadw; golygwch %s"
 
 #: gconf/gconfd.c:182
 #, c-format
@@ -1000,7 +999,7 @@ msgid ""
 "No config source addresses successfully resolved, can't load or store config "
 "data"
 msgstr ""
-"Methwyd datrys unrhyw gyfeiriad ffynhonell cyfluniad, ni ellir llwytho na "
+"Methwyd datrys unrhyw gyfeiriad ffynhonnell cyfluniad, ni ellir llwytho na "
 "arbed data cyfluniad"
 
 #: gconf/gconfd.c:211
@@ -1015,21 +1014,21 @@ msgstr ""
 #, c-format
 msgid "Received signal %d, dumping core. Please report a GConf bug."
 msgstr ""
-"Derbynniwyd arwydd %d, dadlytho craidd. Adroddwch gwall yn GConf os gwelwch "
-"yn dda."
+"Derbyniwyd arwydd %d, dadlwytho craidd. A fyddech cystal â rhoi gwybodfod "
+"gwall yn GConf."
 
 #: gconf/gconfd.c:255
 #, c-format
 msgid ""
 "Received signal %d, shutting down abnormally. Please file a GConf bug report."
 msgstr ""
-"Derbynniwys arwydd %d, cau lawr yn anarferol. Adroddwch gwall yn GConf os "
-"gwelwch yn dda."
+"Derbyniwyd arwydd %d, cau lawr yn anarferol. A fyddech cystal â rhoi "
+"gwybodfod gwall yn GConf."
 
 #: gconf/gconfd.c:272
 #, c-format
 msgid "Received signal %d, shutting down cleanly"
-msgstr "Derbynniwyd arwydd %d, terfynnu'n daclus"
+msgstr "Derbyniwyd arwydd %d, terfynu'n daclus"
 
 #: gconf/gconfd.c:341
 #, c-format
@@ -1047,9 +1046,9 @@ msgid "Owner of %s is not the current user"
 msgstr "Nid y defnyddiwr cyfredol yw perchennog %s"
 
 #: gconf/gconfd.c:365
-#, fuzzy, c-format
+#, c-format
 msgid "Bad permissions %lo on directory %s"
-msgstr "Caniatadau gwael %o ar cyfeiriadur %s"
+msgstr "Caniatadau gwael %lo ar gyfeiriadur %s"
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
@@ -1078,7 +1077,7 @@ msgstr ""
 #: gconf/gconfd.c:542
 #, c-format
 msgid "Failed to get lock for daemon, exiting: %s"
-msgstr "Methu cael clo ar gyfer daemon, terfynnu: %s"
+msgstr "Methu cael clo ar gyfer daemon, terfynu: %s"
 
 #: gconf/gconfd.c:584
 #, c-format
@@ -1087,11 +1086,11 @@ msgstr "Gwall wrth ryddhau ffeil clo: %s"
 
 #: gconf/gconfd.c:592
 msgid "Exiting"
-msgstr "Terfynnu"
+msgstr "Terfynu"
 
 #: gconf/gconfd.c:635
 msgid "GConf server is not in use, shutting down."
-msgstr "Nid yw'r gweinydd GConf yn cael ei ddefnyddio, terfynnu."
+msgstr "Nid yw'r gweinydd GConf yn cael ei ddefnyddio, terfynu."
 
 #: gconf/gconftool.c:93
 msgid "Set a key to a value and sync. Use with --type."
@@ -1118,12 +1117,12 @@ msgid ""
 "Recursively unset all keys at or below the key/directory names on the "
 "command line"
 msgstr ""
-"Datosod yn ailgyrchol yr holl allweddi at neu islaw yr enwau allwedd/"
+"Datosod yn ailgyrchol yr holl allweddi sydd yn, neu islaw, yr enwau allwedd/"
 "cyfeiriadur ar y llinell orchymyn"
 
 #: gconf/gconftool.c:139
 msgid "Print all key/value pairs in a directory."
-msgstr "Argraffu pob par allwedd/gwerth mewn cyfeiriadur."
+msgstr "Argraffu pob pâr allwedd/gwerth mewn cyfeiriadur."
 
 #: gconf/gconftool.c:148
 msgid "Print all subdirectories in a directory."
@@ -1147,19 +1146,20 @@ msgstr ""
 
 #: gconf/gconftool.c:175
 msgid "Print all subdirectories and entries under a dir, recursively."
-msgstr "Argraffu pob is-gyfeiriadur a cofnod islaw cyfeiriadur, yn ailgyrchol."
+msgstr ""
+"Argraffu pob is-gyfeiriadur a chofnod islaw cyfeiriadur, yn ailgyrchol."
 
 #: gconf/gconftool.c:184
 msgid "Return 0 if the directory exists, 2 if it does not."
-msgstr "Dychwelyd 0 os mae'r cyfeiriadur yn bodoli, 2 os nad ydyw."
+msgstr "Dychwelyd 0 os yw'r cyfeiriadur yn bodoli, 2 os nad ydyw."
 
 #: gconf/gconftool.c:193
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
-msgstr "Terfynnu gconfd. PEIDIWCH A DEFNYDDIO'R OPSIWN HWN HEB RHESWM DA."
+msgstr "Terfynu gconfd. PEIDIWCH A DEFNYDDIO'R OPSIWN HWN HEB RHESWM DA."
 
 #: gconf/gconftool.c:202
 msgid "Return 0 if gconfd is running, 2 if not."
-msgstr "Dychwelyd 2 os mae gconfd yn rhedeg, 2 os nad ydyw."
+msgstr "Dychwelyd 0 os yw gconfd yn rhedeg, 2 os nad ydyw."
 
 #: gconf/gconftool.c:211
 msgid ""
@@ -1239,7 +1239,7 @@ msgstr "Penodi perchennog sgema"
 
 #: gconf/gconftool.c:302
 msgid "OWNER"
-msgstr "PERCHENOG"
+msgstr "PERCHENNOG"
 
 #: gconf/gconftool.c:310
 msgid "Specify a schema file to be installed"
@@ -1252,7 +1252,7 @@ msgstr "ENWFFEIL"
 #: gconf/gconftool.c:319
 msgid "Specify a configuration source to use rather than the default path"
 msgstr ""
-"Penodi ffynhonell cyfluniad i'w ddefnyddio yn hytrach na'r llwybr "
+"Penodi ffynhonnell cyfluniad i'w ddefnyddio yn hytrach na'r llwybr "
 "rhagosodedig"
 
 #: gconf/gconftool.c:320
@@ -1274,7 +1274,7 @@ msgid ""
 "config source or set to the empty string to use the default."
 msgstr ""
 "Gosodir yn gywir ffeiliau sgema ar y llinell orchymyn i'r cronfa ddata. "
-"Dylid gosod y newidyn amgylchol GCONF_CONFIG_SOURCE i ffynhonell cyfluniad "
+"Dylid gosod y newidyn amgylchol GCONF_CONFIG_SOURCE i ffynhonnell cyfluniad "
 "nid yw'n rhagosodedig neu ei osod i llinyn gwag er mwyn defnyddio'r "
 "rhagosodiad."
 
@@ -1285,7 +1285,7 @@ msgid ""
 "config source or set to the empty string to use the default."
 msgstr ""
 "Datosodir yn gywir ffeiliau sgema ar y llinell orchymyn o'r cronfa ddata. "
-"Dylid gosod y newidyn amgylchol GCONF_CONFIG_SOURCE i ffynhonell cyfluniad "
+"Dylid gosod y newidyn amgylchol GCONF_CONFIG_SOURCE i ffynhonnell cyfluniad "
 "nid yw'n rhagosodedig neu ei osod i llinyn gwag er mwyn defnyddio'r "
 "rhagosodiad."
 
@@ -1295,7 +1295,7 @@ msgid ""
 "different types for keys on the command line."
 msgstr ""
 "Poenydio rhaglen er mwyn ei brofi gan osod a datosod nifer o werthoedd o "
-"wahannol fathau ar gyfer allweddau ar y llinell orchymyn."
+"wahanol fathau ar gyfer allweddau ar y llinell orchymyn."
 
 #: gconf/gconftool.c:364
 msgid ""
@@ -1328,7 +1328,7 @@ msgstr "Tynnu unrhyw enw sgema a gymhwyswyd i'r allweddi penodwyd"
 
 #: gconf/gconftool.c:418
 msgid "Get the name of the default source"
-msgstr "Cyrchu enw y ffynhonell rhagosodedig"
+msgstr "Cyrchu enw y ffynhonnell rhagosodedig"
 
 #: gconf/gconftool.c:427
 msgid "Print version"
@@ -1389,13 +1389,13 @@ msgstr "Rhaid defnyddio'r opsiwn %s ar ei hun.\n"
 msgid ""
 "You must specify a config source with --config-source when using --direct\n"
 msgstr ""
-"Rhaid i chi benodi ffynhonell cyfluniad efo --config-source wrth ddefnyddio "
+"Rhaid i chi benodi ffynhonnell cyfluniad efo --config-source wrth ddefnyddio "
 "--direct\n"
 
 #: gconf/gconftool.c:708
 msgid "You should use --direct when using a non-default configuration source\n"
 msgstr ""
-"Dylwch ddefnyddio --direct wrth ddefnyddio ffynhonell cyfluniad nid ydyw'n "
+"Dylwch ddefnyddio --direct wrth ddefnyddio ffynhonnell cyfluniad nid ydyw'n "
 "rhagosodedig\n"
 
 #: gconf/gconftool.c:714
@@ -1423,27 +1423,25 @@ msgstr "Rhaid gosod y newidyn amgylchol GCONF_CONFIG_SOURCE\n"
 #: gconf/gconftool.c:792
 #, c-format
 msgid "Failed to access configuration source(s): %s\n"
-msgstr "Methwyd cyrchu y ffynhonell(au) cyfluniad: %s\n"
+msgstr "Methwyd cyrchu y ffynhonnell(au) cyfluniad: %s\n"
 
 #: gconf/gconftool.c:1077
 #, c-format
 msgid "Shutdown error: %s\n"
-msgstr "Gwall terfynnu: %s\n"
+msgstr "Gwall terfynu: %s\n"
 
 #: gconf/gconftool.c:1120
-#, fuzzy
 msgid "Must specify one or more directories to recursively list.\n"
-msgstr "Rhaid penodi un neu fwy cyfeiriadur i'w rhestru'n ailgyrchol.\n"
+msgstr "Rhaid penodi un cyfeiriadur neu fwy i'w rhestru'n ailgyrchol.\n"
 
 #: gconf/gconftool.c:1172
-#, fuzzy
 msgid "Must specify one or more directories to dump.\n"
-msgstr "Rhaid penodi un neu fwy cyfeiriadur i'w tomenu.\n"
+msgstr "Rhaid penodi un cyfeiriadur neu fwy i'w tomennu.\n"
 
 #: gconf/gconftool.c:1214 gconf/gconftool.c:1479
 #, c-format
 msgid "Failure listing entries in `%s': %s\n"
-msgstr "Methaint wrth rhestru cofnodion yn `%s': %s\n"
+msgstr "Methiant wrth restru cofnodion yn `%s': %s\n"
 
 #: gconf/gconftool.c:1232
 msgid "(no value set)"
@@ -1666,14 +1664,13 @@ msgid "Error syncing: %s"
 msgstr "Gwall wrth gysoni: %s"
 
 #: gconf/gconftool.c:2283
-#, fuzzy
 msgid "Must specify one or more directories to get key/value pairs from.\n"
 msgstr ""
-"Rhaid penodi un neu fwy cyfeiriadur i gyrchu parau allwedd/gwerth ohonynt.\n"
+"Rhaid penodi un cyfeiriadur neu fwy i gyrchu parau allwedd/gwerth ohonynt.\n"
 
 #: gconf/gconftool.c:2297
 msgid "Must specify one or more keys to unset.\n"
-msgstr "Rhaid penodi un neu fwy allwedd i'w datosod.\n"
+msgstr "Rhaid penodi un allwedd neu fwy i'w datosod.\n"
 
 #: gconf/gconftool.c:2308
 #, c-format
@@ -1682,7 +1679,7 @@ msgstr "Gwall wrth ddatosod '%s': %s\n"
 
 #: gconf/gconftool.c:2328
 msgid "Must specify one or more keys to recursively unset.\n"
-msgstr "Rhaid penodi un neu fwy allwedd i'w datosod yn ailgyrchol.\n"
+msgstr "Rhaid penodi un allwedd neu fwy i'w datosod yn ailgyrchol.\n"
 
 #: gconf/gconftool.c:2342
 #, c-format
@@ -1690,10 +1687,9 @@ msgid "Failure during recursive unset of \"%s\": %s\n"
 msgstr "Methiant yn ystod datosodiad ailgyrchol o \"%s\": %s\n"
 
 #: gconf/gconftool.c:2362
-#, fuzzy
 msgid "Must specify one or more directories to get subdirs from.\n"
 msgstr ""
-"Rhaid penodi un neu fwy cyfeiriadur i gyrchu isgyfeiriaduron ohonynt.\n"
+"Rhaid penodi un cyfeiriadur neu fwy i gyrchu isgyfeiriaduron ohonynt.\n"
 
 #: gconf/gconftool.c:2396
 #, c-format
@@ -1957,13 +1953,31 @@ msgstr ""
 "cyfeiriadur:\n"
 "  %s\n"
 
-#, fuzzy
 #~ msgid "Cannot find directory %s\n"
-#~ msgstr "Methu creu cyfeiriadur `%s': %s"
+#~ msgstr "Methu darganfod y cyfeiriadur %s\n"
 
-#, fuzzy
 #~ msgid "Error saving GConf tree to '%s': %s\n"
-#~ msgstr "Gwall wrth gyrchu sgema at '%s': %s\n"
+#~ msgstr "Gwall wrth arbed coeden GConf at '%s': %s\n"
+
+#~ msgid "Usage: %s <dir>\n"
+#~ msgstr "Defnydd: %s <cyfeiriadur>\n"
+
+#~ 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 ""
+#~ "Defnydd: %s <cyfeiriadur>\n"
+#~ "  Cyfuno system ffeiliau ochr gefn farciwyd i fyny, e.e:\n"
+#~ "    cyf/%%gconf.xml\n"
+#~ "        isgyf1/%%gconf.xml\n"
+#~ "        isgyf2/%%gconf.xml\n"
+#~ "  i mewn i:\n"
+#~ "    cyf/%%gconf-tree.xml\n"
 
 #~ msgid "Received invalid value in set request"
 #~ msgstr "Derbyniwyd gwerth annilys yn y cais gosod"
@@ -1980,14 +1994,14 @@ msgstr ""
 #~ msgstr "Derbyniwyd cais i gysoni yn gydamseredig"
 
 #~ msgid "Fatal error: failed to get object reference for ConfigDatabase"
-#~ msgstr "Gwall terfynnol: methwyd cael "
+#~ msgstr "Gwall terfynol: methwyd cael "
 
 #~ msgid ""
 #~ "Failed to log addition of listener %s (%s);will not be able to restore "
 #~ "this listener on gconfd restart, resulting in unreliable notification of "
 #~ "configuration changes."
 #~ msgstr ""
-#~ "Methwyd cofnodi ychwannegiad y grandawr %s (%s); ni ellir adfer y "
+#~ "Methwyd cofnodi ychwanegiad y gwrandawr %s (%s); ni ellir adfer y "
 #~ "grandawr hwn pan mae gconfd yn ailddechrau, yn arwain at hysbysiad "
 #~ "annibynadwy ynhylch newidiadau cyfluniad."
 
@@ -1998,8 +2012,8 @@ msgstr ""
 #~ "Failed to log removal of listener to logfile (most likely harmless, may "
 #~ "result in a notification weirdly reappearing): %s"
 #~ msgstr ""
-#~ "Methwyd cofnodi tynniad grandawr i'r ffeil cofnodi (diniwed, mwy na "
-#~ "thebyg, efallai be fydd hysbysiad yn ailymddangos mewn ffordd os): %s"
+#~ "Methwyd cofnodi tynniad gwrandawr i'r ffeil cofnodi (diniwed, mwy na "
+#~ "thebyg, efallai bydd hysbysiad yn ailymddangos mewn ffordd od): %s"
 
 #~ msgid "Invalid UTF-8 in string value in '%s'"
 #~ msgstr "UTF-8 annilys mewn gwerth llinyn yn '%s'"
@@ -2011,7 +2025,7 @@ msgstr ""
 #~ msgstr "Math anghywit ar gyfer elfen rhestr yn %s"
 
 #~ msgid "Received list from gconfd with a bad list type"
-#~ msgstr "Derbynniwyd rhestr o gconfd gyda math rhestr gwael"
+#~ msgstr "Derbyniwyd rhestr o gconfd gyda math rhestr gwael"
 
 #~ msgid "Failed to convert object to IOR"
 #~ msgstr "Methwyd trosi gwthrych i IOR"
@@ -2057,23 +2071,23 @@ msgstr ""
 #~ msgstr "Methodd y gweinydd ddatrys y cyfeiriad `%s'"
 
 #~ msgid "Can't add notifications to a local configuration source"
-#~ msgstr "Methu ychwanegu hysbysiadau at ffynhonell cyfluniad lleol"
+#~ msgstr "Methu ychwanegu hysbysiadau at ffynhonnell cyfluniad lleol"
 
 #~ msgid "Adding client to server's list failed, CORBA error: %s"
 #~ msgstr "Methwyd ychwanegu cleient i rhestry gweinydd, gwall CORBA: %s"
 
 #~ msgid "Failure shutting down config server: %s"
-#~ msgstr "Gwall wrth derfynnu gweinydd cyfluniad: %s"
+#~ msgstr "Gwall wrth derfynu gweinydd cyfluniad: %s"
 
 #~ msgid "CORBA error: %s"
 #~ msgstr "Gwall CORBA: %s"
 
 # EFALLAI
 #~ msgid "Shutdown request received"
-#~ msgstr "Derbynnwyd gofynniad terfynnu"
+#~ msgstr "Derbynwyd gofyniad terfynu"
 
 #~ msgid "Failed to get object reference for ConfigServer"
-#~ msgstr "Methwyd cyrchu cefeirnod gwrthrych ar gyfer ConfigServer"
+#~ msgstr "Methwyd cyrchu cyfeirnod gwrthrych ar gyfer ConfigServer"
 
 #~ msgid "Returning exception: %s"
 #~ msgstr "Dychwelyd eithriad: %s"
@@ -2083,7 +2097,7 @@ msgstr ""
 #~ "gconfd shutdown (%s)"
 #~ msgstr ""
 #~ "Methwyd agor ffeil gofnodi gconfd: ni ellir adfer gwrandawyr ar ôl "
-#~ "igconfd derfynnu (%s)"
+#~ "igconfd derfynu (%s)"
 
 #~ msgid ""
 #~ "Failed to close gconfd logfile; data may not have been properly saved (%s)"
@@ -2128,15 +2142,15 @@ msgstr ""
 #~ "Failed to log addition of listener to gconfd logfile; won't be able to re-"
 #~ "add the listener if gconfd exits or shuts down (%s)"
 #~ msgstr ""
-#~ "Methwyd cofnodi ychwannegiad gwrandawr at ffeil cofnod gconfd; ni ellir "
-#~ "ail-ychwannegu'r gwrandawr os mae gconfd yn terfynnu (%s)"
+#~ "Methwyd cofnodi ychwanegiad gwrandawr at ffeil cofnod gconfd; ni ellir "
+#~ "ail-ychwanegu'r gwrandawr os mae gconfd yn terfynu (%s)"
 
 #~ msgid ""
 #~ "Failed to log removal of listener to gconfd logfile; might erroneously re-"
 #~ "add the listener if gconfd exits or shuts down (%s)"
 #~ msgstr ""
-#~ "Methwyd cofnodi tynniad gwrandawr at ffeil cofnod gconfd; efallai caiff y "
-#~ "gwrandawr ei ail-ychwannegu yn wallus os mae gconfd yn terfynnu (%s)"
+#~ "Methwyd cofnodi tyniad gwrandawr at ffeil cofnod gconfd; efallai caiff y "
+#~ "gwrandawr ei ail-ychwanegu yn wallus os mae gconfd yn terfynu (%s)"
 
 #~ msgid "Failed to get IOR for client: %s"
 #~ msgstr "Methu cael IOR ar gyfer y cleient: %s"
@@ -2145,17 +2159,17 @@ msgstr ""
 #~ msgstr "Methwyd agor ffeil cadw cyflwr: %s"
 
 #~ msgid "Failed to write client add to saved state file: %s"
-#~ msgstr "Methwyd ysgrifennu ychwannegiad cleient at ffeil cadw cyflwr: %s"
+#~ msgstr "Methwyd ysgrifennu ychwanegiad cleient at ffeil cadw cyflwr: %s"
 
 #~ msgid "Failed to flush client add to saved state file: %s"
-#~ msgstr "Methwyd cysoni ychwannegiad cleient at ffeil cadw cyflwr: %s"
+#~ msgstr "Methwyd cysoni ychwanegiad cleient at ffeil cadw cyflwr: %s"
 
 #~ msgid ""
 #~ "Some client removed itself from the GConf server when it hadn't been "
 #~ "added."
 #~ msgstr ""
 #~ "Tynnodd rhyw gleient ei hun o'r gweinydd GConf pan nad oedd wedi ei "
-#~ "ychwannegu."
+#~ "ychwanegu."
 
 #~ msgid ""
 #~ "%u items remain in the cache after cleaning already-synced items older "
diff --git a/po/de.po b/po/de.po
index 7e519949..786dc09d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,16 +1,16 @@
 # German GConf translation
-# Copyright (C) 1999-2003 Free Software Foundation, Inc.
+# Copyright (C) 1999-2004 Free Software Foundation, Inc.
 # Matthias Warkus <mawa@iname.com>, 1999.
 # Kai Lahmann <kl@linuxfaqs.de>, 2000.
 # Christian Meyer <chrisime@gnome.org>, 2000-2002.
 # Manuel Borchers <webmaster@matronix.de>, 2002.
-# Christian Neumair <chris@gnome-de.org>, 2002, 2003.
+# Christian Neumair <chris@gnome-de.org>, 2002-2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GConf 2.5.1\n"
+"Project-Id-Version: GConf 2.5.90\n"
 "POT-Creation-Date: 2003-12-05 00:37+0100\n"
-"PO-Revision-Date: 2003-12-29 12:39+0100\n"
+"PO-Revision-Date: 2004-02-24 16:00+0100\n"
 "Last-Translator: Christian Neumair <chris@gnome-de.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -338,7 +338,7 @@ msgstr "GConf-Warnung: In »%s« konnten keine Paare aufgelistet werden: %s"
 #: gconf/gconf-client.c:1181
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
-msgstr "Für den Schlüssel »%s« wurde »%s« erwartet, jedoch »%s« erhalten"
+msgstr "Für den Schlüssel »%3$s« wurde »%1$s« erwartet, jedoch »%2$s« erhalten"
 
 #: gconf/gconf-database.c:173
 #, c-format
diff --git a/po/el.po b/po/el.po
index 6bcca685..9cfe5db2 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,21 +7,20 @@
 # kostas: updated and finished the translation,02122002
 # kostas: 03sep2003, updated translation for 2.4
 # list type=είδος λίστας
+# Nikos:16Mar2004, review translation
 # Sarantis Paskalis <paskalis@di.uoa.gr>, 2000.
-# Kostas Papadimas <pkst@gnome.org>, 2003,2004.
-#
+# Kostas Papadimas <pkst@gnome.org>, 2003, 2004.
+# Nikos Charonitakis  <charosn@her.forthnet.gr>, 2004.
 msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
 "POT-Creation-Date: 2003-12-05 00:37+0100\n"
-"PO-Revision-Date: 2004-02-03 19:03+0200\n"
-"Last-Translator: Kostas Papadimas <pkst@gnome.org>\n"
+"PO-Revision-Date: 2004-03-16 15:25-0200\n"
+"Last-Translator: Nikos Charonitakis <charosn@her.fothnet.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
 "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
 #: backends/dir-utils.c:108
@@ -33,7 +32,7 @@ msgstr "Αδύνατη η εύρεση ριζικού καταλόγου %s στ
 #: backends/dir-utils.c:124 backends/xml-backend.c:332
 #, c-format
 msgid "Could not make directory `%s': %s"
-msgstr "Δημιουργία καταλόγου αδύνατη `%s': %s"
+msgstr "Αδύνατη η δημιουργία καταλόγου `%s': %s"
 
 # backends/xml-backend.c:400
 #: backends/dir-utils.c:212
@@ -44,13 +43,13 @@ msgstr "Αδύνατη η ανάγνωση ή εγγραφή στο ριζικό
 # backends/xml-backend.c:247
 #: backends/xml-backend.c:236
 msgid "Unloading XML backend module."
-msgstr "Εκφορτώνεται η μονάδα υποστήριξης XML"
+msgstr "Εκφορτώνεται η μονάδα υποστήριξης XML."
 
 # backends/xml-backend.c:300
 #: backends/xml-backend.c:285
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
-msgstr "Εύρεση ριζικού καταλόγου XML αδύνατη στη διεύθυνση `%s'"
+msgstr "Αδύνατη η εύρεση ριζικού καταλόγου XML στη διεύθυνση `%s'"
 
 # backends/xml-backend.c:400
 #: backends/xml-backend.c:443
@@ -65,7 +64,7 @@ msgstr ""
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr ""
-"Τα δικαιώματα για καταλόγους/αρχεία για τον πηγαίο XML κώδικα στη ρίζα %s "
+"Τα δικαιώματα για καταλόγους/αρχεία για τον πηγαίο κώδικα XML στη ρίζα %s "
 "είναι: %o%o"
 
 # gconf/gconftool.c:1696 gconf/gconftool.c:1728
@@ -117,8 +116,8 @@ msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
 "not been successfully synced to disk"
 msgstr ""
-"Αδυναμία διαγραφήα καταλόγου `%s'  από την  XML backend cache, επειδή δεν "
-"είχει επιτυχώς συγχρονιστεί στον δίσκο"
+"Αδυναμία διαγραφής καταλόγου `%s'  από την  XML backend cache, επειδή δεν "
+"είχε επιτυχώς συγχρονιστεί στον δίσκο"
 
 # backends/xml-backend.c:315
 #: backends/xml-dir.c:171
@@ -244,7 +243,7 @@ msgstr "Αγνόηση XML node `%s': %s"
 #: backends/xml-entry.c:732
 #, c-format
 msgid "Failed reading default value for schema: %s"
-msgstr "Αποτυχία στην ανάγνωση της εξ' ορισμού τιμής για το σχήμα: %s"
+msgstr "Αποτυχία στην ανάγνωση της προεπιλεγμένης τιμής για το σχήμα: %s"
 
 #: backends/xml-entry.c:952
 #, c-format
@@ -268,7 +267,7 @@ msgstr "Δεν έγινε κατανοητός ο κόμβος XML <%s> μέσα
 
 #: 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
@@ -399,7 +398,7 @@ msgstr "Σφάλμα διαγραφής `%s': %s"
 #: gconf/gconf-database.c:371
 #, c-format
 msgid "Error getting default value for `%s': %s"
-msgstr "Σφάλμα κατά τη λήψη εξ ορισμού τιμής για `%s': %s"
+msgstr "Σφάλμα κατά τη λήψη προεπιλεγμένης τιμής για `%s': %s"
 
 # gconf/gconfd.c:1593
 #: gconf/gconf-database.c:418
@@ -539,7 +538,7 @@ msgstr "Σφάλμα ανάγνωσης στο αρχείο `%s': %s\n"
 #: gconf/gconf-value.c:154 gconf/gconf-value.c:253 gconf/gconf-value.c:395
 #: gconf/gconf-value.c:1681
 msgid "Text contains invalid UTF-8"
-msgstr "Το κείμενο περιέχει μή έγκυρο UTF-8 "
+msgstr "Το κείμενο περιέχει μη έγκυρο UTF-8 "
 
 # gconf/gconf-internals.c:1282
 #: gconf/gconf-internals.c:853
@@ -751,13 +750,13 @@ msgid ""
 msgstr ""
 "Επικοινωνήστε με το διαχειριστή του συστήματος σας για να επιλυθεί το "
 "επόμενο πρόβλημα:\n"
-"Δεν βρέθηκαν πηγές ρύθμισης στο αρχείο ρυθμίσεων \"%s\"; αυτό σημαίνει ότι "
-"οι προτιμήσεις και άλλες ρυθμίσεις δε μπορούν να αποθηκευτούν. %s%s"
+"Δε βρέθηκαν πηγές ρύθμισης στο αρχείο ρυθμίσεων \"%s\"; αυτό σημαίνει ότι οι "
+"προτιμήσεις και άλλες ρυθμίσεις δε μπορούν να αποθηκευτούν. %s%s"
 
 # gconf/gconfd.c:1676
 #: gconf/gconf-sanity-check.c:239
 msgid "Error reading the file: "
-msgstr "Σφάλμα ανάγνωσης του αρχείου:"
+msgstr "Σφάλμα ανάγνωσης του αρχείου: "
 
 #: gconf/gconf-sanity-check.c:262
 #, c-format
@@ -810,7 +809,7 @@ msgstr "%s Συνέχεια (y/n)?"
 #: gconf/gconf-schema.c:221 gconf/gconf-schema.c:229 gconf/gconf-schema.c:237
 #: gconf/gconf-schema.c:245
 msgid "Schema contains invalid UTF-8"
-msgstr "Το σχήμα περιέχει μή έγκυρο UTF-8"
+msgstr "Το σχήμα περιέχει μη έγκυρο UTF-8"
 
 #: gconf/gconf-schema.c:254
 msgid ""
@@ -1226,7 +1225,7 @@ msgstr "Ανάθεση μιας τιμής σε ένα κλειδί και συ�
 # gconf/gconftool.c:91
 #: gconf/gconftool.c:102
 msgid "Print the value of a key to standard output."
-msgstr "Εκτύπωση της τιμής ενός κλειδιού στην κανονική  έξοδο"
+msgstr "Εκτύπωση της τιμής ενός κλειδιού στην κανονική έξοδο."
 
 # gconf/gconftool.c:100
 #: gconf/gconftool.c:111
@@ -1298,7 +1297,7 @@ msgstr "Κλείσιμο gconfd. ΜΗ ΧΡΗΣΙΜΟΠΟΙΕΙΤΕ ΑΥΤΗΝ Τ
 # gconf/gconftool.c:164
 #: gconf/gconftool.c:202
 msgid "Return 0 if gconfd is running, 2 if not."
-msgstr "Επιστρέφει 0 αν το gconfd εκτελείται, 2 αν όχι"
+msgstr "Επιστρέφει 0 αν το gconfd εκτελείται, 2 αν όχι."
 
 # gconf/gconftool.c:173
 #: gconf/gconftool.c:211
@@ -1422,7 +1421,7 @@ msgid ""
 "is not running."
 msgstr ""
 "Απευθείας πρόσβαση στη βάση δεδομένων διαμόρφωσης, προσπερνώντας τον "
-"εξυπηρέτη. Απαιτείται ότι το gconfd δεν εκτελείται."
+"εξυπηρετητή. Απαιτείται ότι το gconfd δεν εκτελείται."
 
 # gconf/gconftool.c:245
 #: gconf/gconftool.c:337
@@ -1432,9 +1431,9 @@ msgid ""
 "config source or set to the empty string to use the default."
 msgstr ""
 "Εγκαθιστά σωστά τα αρχεία σχήματος στη γραμμή εντολών στη βάση δεδομένων. Η "
-"μεταβλητή περιβάλλοντος GCONF_CONFIG_SOURCE θα πρέπει να τεθεί σε μια μη εξ "
-"ορισμού πηγή διαμόρφωσης ή να τεθεί το κενό αλφαριθμητικό να χρησιμοποιεί το "
-"εξ ορισμού."
+"μεταβλητή περιβάλλοντος GCONF_CONFIG_SOURCE θα πρέπει να τεθεί σε μια μη "
+"προεπιλεγμένη πηγή διαμόρφωσης ή να τεθεί το κενό αλφαριθμητικό να "
+"χρησιμοποιεί την προεπιλογή."
 
 # gconf/gconftool.c:245
 #: gconf/gconftool.c:346
@@ -1443,10 +1442,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/gconftool.c:254
 #: gconf/gconftool.c:355
@@ -1570,7 +1569,7 @@ msgstr ""
 #: gconf/gconftool.c:708
 msgid "You should use --direct when using a non-default configuration source\n"
 msgstr ""
-"Θα πρέπει να χρησιμοποιήσετε --άμεσο κατά τη χρήση προσαρμοσμένης πηγής "
+"Θα πρέπει να χρησιμοποιήσετε --direct κατά τη χρήση προσαρμοσμένης πηγής "
 "ρυθμίσεων\n"
 
 # gconf-editor/gconf-editor.c:69 gconf/gconftool.c:447
@@ -1670,7 +1669,7 @@ msgstr "Είδος Cdr: %s\n"
 #: gconf/gconftool.c:1594
 #, c-format
 msgid "Default Value: %s\n"
-msgstr "Εξ' ορισμού Τιμή: %s\n"
+msgstr "Προεπιλεγμένη Τιμή: %s\n"
 
 # gconf/gconftool.c:866 gconf/gconftool.c:867 gconf/gconftool.c:868
 #: gconf/gconftool.c:1594 gconf/gconftool.c:1596 gconf/gconftool.c:1597
@@ -1789,7 +1788,7 @@ msgstr "Πρέπει να καθοριστεί κατάλογος λίστας\n
 
 #: gconf/gconftool.c:1938
 msgid "List index must be non-negative.\n"
-msgstr "Ο κατάλογος λίστας πρέπει να είναι μή-αρνητικός.\n"
+msgstr "Ο κατάλογος λίστας πρέπει να είναι μη-αρνητικός.\n"
 
 #: gconf/gconftool.c:1947
 msgid "List index is out of bounds.\n"
@@ -2067,17 +2066,20 @@ msgstr ""
 # gconf/gconftool.c:1340
 #: gconf/gconftool.c:3154
 msgid "WARNING: no <list_type> specified for schema of type list\n"
-msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δεν έχει καθοριστεί κλειδί για το σχήμα\n"
+msgstr ""
+"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δεν έχει καθοριστεί το <list_type> για το σχήμα type list\n"
 
 # gconf/gconftool.c:1340
 #: gconf/gconftool.c:3160
 msgid "WARNING: no <car_type> specified for schema of type pair\n"
-msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δεν έχει καθοριστεί κλειδί για το σχήμα\n"
+msgstr ""
+"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δεν έχει καθοριστεί το <car_type> για το σχήμα type pair\n"
 
 # gconf/gconftool.c:1340
 #: gconf/gconftool.c:3166
 msgid "WARNING: no <cdr_type> specified for schema of type pair\n"
-msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δεν έχει καθοριστεί κλειδί για το σχήμα\n"
+msgstr ""
+"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δεν έχει καθοριστεί το <cdr_type> για το σχήμα type pair\n"
 
 # gconf/gconftool.c:1373
 #: gconf/gconftool.c:3195
@@ -2343,16 +2345,16 @@ msgstr ""
 #~ msgstr "Αποτυχία μετατροπής αντικειμένου σε IOR"
 
 #~ msgid "Invalid UTF-8 in locale for schema"
-#~ msgstr "Μή έγκυρο UTF-8 στο locale για σχήμα "
+#~ msgstr "Μη έγκυρο UTF-8 στο locale για σχήμα "
 
 #~ msgid "Invalid UTF-8 in short description for schema"
-#~ msgstr "Μή έγκυρο UTF-8 στη σύντομη περιγραφή για σχήμα"
+#~ msgstr "Μη έγκυρο UTF-8 στη σύντομη περιγραφή για σχήμα"
 
 #~ msgid "Invalid UTF-8 in long description for schema"
-#~ msgstr "Μή έγκυρο UTF-8 στη μακρά περιγραφή για σχήμα"
+#~ msgstr "Μη έγκυρο UTF-8 στη μακρά περιγραφή για σχήμα"
 
 #~ msgid "Invalid UTF-8 in owner for schema"
-#~ msgstr "Μή έγκυρο UTF-8 στον ιδιοκτήτη για σχήμα"
+#~ msgstr "Μη έγκυρο UTF-8 στον ιδιοκτήτη για σχήμα"
 
 # gconf/gconf-internals.c:2137
 #~ msgid "Server ping error: %s"
@@ -2517,310 +2519,5 @@ msgstr ""
 #~ "Some client removed itself from the GConf server when it hadn't been "
 #~ "added."
 #~ msgstr ""
-#~ "Κάποιος πελάτης απομάκρυνε τον εαυτό του απί τον εξυπηρετητή GConf όταν "
-#~ "δεν είχε προστεθεί"
-
-#~ msgid ""
-#~ "%u items remain in the cache after cleaning already-synced items older "
-#~ "than %u seconds"
-#~ msgstr ""
-#~ "%u αντικείμενα παραμένουν στην cache μετά την εκκαθάριση την ήδη "
-#~ "συγχρονισμένων αντικειμένων που είναι παλιότερα από %u δευτερόλεπτα"
-
-# gconf/gconf-internals.c:2120
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid "/path"
-#~ msgstr "/διαδρομή"
-
-# gconf/gconftool.c:395
-#~ msgid "--dir-exists option must be used by itself.\n"
-#~ msgstr "Η επιλογή --dir-exists πρέπει να χρησιμοποιείται μόνη της.\n"
-
-# gconf/gconftool.c:404
-#~ msgid "--install-schema-file must be used by itself.\n"
-#~ msgstr ""
-#~ "Η επιλογή --install-schema-file πρέπει να χρησιμοποιείται μόνη της.\n"
-
-# gconf/gconftool.c:414
-#~ msgid "--makefile-install-rule must be used by itself.\n"
-#~ msgstr ""
-#~ "Η επιλογή --makefile-install-rule πρέπει να χρησιμοποιείται μόνη της.\n"
-
-# gconf/gconftool.c:424
-#~ msgid "--break-key must be used by itself.\n"
-#~ msgstr "Η επιλογή --break-key πρέπει να χρησιμοποιείται μόνη της.\n"
-
-# gconf/gconftool.c:434
-#~ msgid "--break-directory must be used by itself.\n"
-#~ msgstr "Η επιλογή --break-directory πρέπει να χρησιμοποιείται μόνη της.\n"
-
-# backends/xml-backend.c:247
-#~ msgid "Unloading BerkeleyDB (BDB) backend module."
-#~ msgstr "Εκφορτώνεται η μονάδα υποστήριξης BerkeleyDB (BDB)."
-
-#~ msgid "Opened BerkeleyDB source at root %s"
-#~ msgstr "Άνοιχτηκε η πηγή BerkeleyDB στο ριζικό κατάλογο %s"
-
-# backends/xml-backend.c:694
-#~ msgid "Initializing BDB backend module"
-#~ msgstr "Αρχικοποιείται η μονάδα υποστήριξης BDB"
-
-# backends/xml-backend.c:300
-#~ msgid "Couldn't find the root directory in the address \"%s\""
-#~ msgstr "Αδύνατη η εύρεση ριζικού καταλόγου στη διεύθυνση \"%s\""
-
-# gconf/gconftool.c:1617
-#~ msgid "WARNING: node <%s> not understood below <schemalist>\n"
-#~ msgstr ""
-#~ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Ο κόμβος <%s> δεν είναι κατανοητός χαμηλότερα από το "
-#~ "<schemalist>\n"
-
-# gconf/gconftool.c:1124
-#, fuzzy
-#~ msgid "Error unsetting '%s': %s\n"
-#~ msgstr "Σφάλμα στην αφαίρεση `%s': %s\n"
-
-# gconf/gconf-internals.c:2137
-#, fuzzy
-#~ msgid "bonobo-activation problem description: '%s'"
-#~ msgstr "Περιγραφή προβλήματος OAF: '%s'"
-
-# gconf/gconf-internals.c:2125
-#~ msgid "attempt to remove not-listed OAF object directory"
-#~ msgstr "προσπάθεια αφαίρεσης μη καταχωρημένου καταλόγου αντικειμένων OAF"
-
-# gconf/gconf-internals.c:2130
-#~ msgid "attempt to add already-listed OAF directory"
-#~ msgstr "προσπάθεια πρόσθεσης ήδη καταχωρημένου καταλόγου OAF"
-
-# gconf/gconf-internals.c:2142
-#~ msgid "Unknown OAF error"
-#~ msgstr "Άγνωστο σφάλμα OAF"
-
-# gconf/gconf-internals.c:2225
-#~ msgid "No ior file in `%s'"
-#~ msgstr "Δεν υπάρχει αρχείο ior στο `%s'"
-
-# gconf/gconf-internals.c:2256
-#~ msgid "gconfd taking lock `%s' from some other process"
-#~ msgstr "το gconfd παίρνει το κλείδωμα `%s' από κάποια άλλη διεργασία"
-
-# gconf/gconf-internals.c:2267
-#~ msgid "Another program has lock `%s'"
-#~ msgstr "Κάποιο άλλο πρόγραμμα έχει το κλείδωμα `%s'"
-
-# gconf/gconf-internals.c:2295
-#~ msgid ""
-#~ "Removing stale lock `%s' because IOR couldn't be converted to object "
-#~ "reference, IOR `%s'"
-#~ msgstr ""
-#~ "Αφαιρείται παλιό κλείδωμα `%s' επειδή το IOR δεν μπορούσε να μετατραπεί "
-#~ "σε αναφορά αντικειμένου, IOR `%s'"
-
-# gconf/gconf-internals.c:2307
-#~ msgid "Removing stale lock `%s' because of error pinging server: %s"
-#~ msgstr ""
-#~ "Αφαιρείται το παλιό κλείδωμα `%s' λόγω σφάλματος ανίχνευσης εξυπηρέτη: %s"
-
-# gconf/gconf-internals.c:2319
-#~ msgid "GConf configuration daemon (gconfd) has lock `%s'"
-#~ msgstr "Ο δαίμονας διαμόρφωσης GConf (gconfd) έχει το κλείδωμα `%s'"
-
-# gconf/gconf-internals.c:2368
-#~ msgid "Can't create lock `%s': %s"
-#~ msgstr "Αδύνατη η δημιουργία κλειδώματος `%s': %s"
-
-# gconf/gconf-internals.c:2447
-#~ msgid "Can't open lock file `%s'; assuming it isn't ours: %s"
-#~ msgstr ""
-#~ "Αδύνατο το άνοιγμα του αρχείου κλειδώματος `%s'· υποθέτουμε ότι δεν είναι "
-#~ "δικό μας: %s"
-
-# gconf/gconf-internals.c:2464
-#~ msgid "Corrupt lock file `%s', removing anyway"
-#~ msgstr "Φθαρμένο αρχείο κλειδώματος `%s', αφαιρείται ούτως ή άλλως"
-
-# gconf/gconf-internals.c:2474
-#~ msgid ""
-#~ "Didn't create lock file `%s' (creator pid %u, our pid %u; assuming "
-#~ "someone took our lock"
-#~ msgstr ""
-#~ "Δεν δημιουργήθηκε αρχείο κλειδώματος `%s' (δημιουργός pid %u, δικό μας "
-#~ "pid %u· υποθέτουμε ότι κάποιος πήρε το κλείδωμα μας"
-
-# gconf-editor/gconf-editor.c:69 gconf/gconftool.c:447
-#~ msgid "Failed to init GConf, exiting\n"
-#~ msgstr "Αποτυχία αρχικοποίησης GConf, τερματισμός\n"
-
-# gconf/gconfd.c:1036
-#, fuzzy
-#~ msgid ""
-#~ "Failed to init Object Activation Framework: please mail bug report to "
-#~ "bonobo-activation maintainers"
-#~ msgstr ""
-#~ "Αδύνατη η αρχικοποίηση του Πλαισίου Ενεργοποίησης Αντικειμένων: παρακαλώ "
-#~ "στείλετε αναφορά προβλήματος στους συντηρητές του ΠΕΑ (OAF)"
-
-# gconf/gconfd.c:1075
-#, fuzzy
-#~ msgid ""
-#~ "OAF doesn't know about our IID; indicates broken installation; can't "
-#~ "register existing server."
-#~ msgstr ""
-#~ "Το ΠΕΑ (OAF) δε γνωρίζει περί του IID μας· δε μπορεί να καταχωρηθεί· "
-#~ "κλείσιμο\n"
-
-# gconf/gconfd.c:1079
-#, fuzzy
-#~ msgid ""
-#~ "Another gconfd already registered with OAF, so we can't register the "
-#~ "existing server"
-#~ msgstr "Ένα άλλο gconfd είναι ήδη καταχωρημένο στο ΠΕΑ (OAF)· κλείσιμο\n"
-
-# gconf/gconfd.c:1084
-#, fuzzy
-#~ msgid "Unknown error registering existing gconfd with OAF; exiting"
-#~ msgstr "Άγνωστο λάθος καταχώρησης του gconfd στο ΠΕΑ (OAF)· κλείσιμο\n"
-
-# gconf/gconfd.c:1075
-#, fuzzy
-#~ msgid ""
-#~ "bonobo-activation doesn't know about our IID; indicates broken "
-#~ "installation; can't register; exiting\n"
-#~ msgstr ""
-#~ "Το ΠΕΑ (OAF) δε γνωρίζει περί του IID μας· δε μπορεί να καταχωρηθεί· "
-#~ "κλείσιμο\n"
-
-# gconf/gconfd.c:1079
-#, fuzzy
-#~ msgid "Another gconfd already registered with bonobo-activation; exiting\n"
-#~ msgstr "Ένα άλλο gconfd είναι ήδη καταχωρημένο στο ΠΕΑ (OAF)· κλείσιμο\n"
-
-# gconf/gconfd.c:1084
-#, fuzzy
-#~ msgid "Unknown error registering gconfd with bonobo-activation; exiting\n"
-#~ msgstr "Άγνωστο λάθος καταχώρησης του gconfd στο ΠΕΑ (OAF)· κλείσιμο\n"
-
-# gconf/gconftool.c:488
-#~ msgid ""
-#~ "Shouldn't run gconfd while installing new schema files.\n"
-#~ "Use gconftool --shutdown to shut down the daemon, most safely while no "
-#~ "applications are running\n"
-#~ "(though things theoretically work if apps are running).\n"
-#~ msgstr ""
-#~ "Δε θα έπρεπε να εκτελείται το gconfd όταν εγκαθίστανται νέα αρχεία "
-#~ "σχήματος.\n"
-#~ "Χρησιμοποιείστε το gconftool --shutdown για να κλείσετε το δαίμονα, "
-#~ "ασφαλέστερα όταν δεν εκτελούνται εφαρμογές\n"
-#~ "(αν και θεωρητικά θα έπρεπε να δουλέψει αν εκτελούνται εφαρμογές).\n"
-
-# gconf/gconf.c:1463
-#~ msgid ""
-#~ "Error contacting configuration server: OAF returned nil from "
-#~ "oaf_activate_from_id() and did not set an exception explaining the "
-#~ "problem. Please file an OAF bug report."
-#~ msgstr ""
-#~ "Σφάλμα στην επαφή με τον εξυπηρέτη διαμόρφωσης: Το OAF επέστρεψε μηδέν "
-#~ "από την oaf_activate_from_id() και δεν καθόρισε μια εξαίρεση που να "
-#~ "εξηγεί το πρόβλημα. Παρακαλώ στείλτε μια αναφορά σφάλματος OAF"
-
-# gconf/gconfd.c:955 gconf/gconfd.c:967
-#, fuzzy
-#~ msgid "Received signal %d, shutting down."
-#~ msgstr "Λήφθηκε σήμα %d, ομαλό κλείσιμο"
-
-# gconf/gconf-internals.c:2416
-#, fuzzy
-#~ msgid "Didn't understand line in saved state file: '%s'"
-#~ msgstr "Αποτυχία άνοιγματος αρχείου αποθηκευμένης κατάστασης: %s"
-
-# gconf/gconf-internals.c:2416
-#, fuzzy
-#~ msgid "Failed to parse connection ID in saved state file"
-#~ msgstr "Αποτυχία άνοιγματος αρχείου αποθηκευμένης κατάστασης: %s"
-
-# gconf/gconf-internals.c:2416
-#, fuzzy
-#~ msgid "Failed to unquote config source address from saved state file: %s"
-#~ msgstr ""
-#~ "Αποτυχία εγγραφής προσθήκης πελάτη στο αρχείο αποθηκευμένσης κατάστασης: %"
-#~ "s"
-
-# gconf/gconf-internals.c:2416
-#, fuzzy
-#~ msgid "Failed to unquote listener location from saved state file: %s"
-#~ msgstr ""
-#~ "Αποτυχία εγγραφής προσθήκης πελάτη στο αρχείο αποθηκευμένσης κατάστασης: %"
-#~ "s"
-
-# gconf/gconf-internals.c:2416
-#, fuzzy
-#~ msgid "Failed to unquote IOR from saved state file: %s"
-#~ msgstr "Αποτυχία άνοιγματος αρχείου αποθηκευμένης κατάστασης: %s"
-
-# gconf/gconftool.c:337
-#~ msgid "Can't use --all-pairs with --get or --set\n"
-#~ msgstr "Αδύνατη η χρήση της --all-pairs με τις --get ή --set\n"
-
-# gconf/gconf-internals.c:2416
-#~ msgid "Unable to store a value at key '%s'"
-#~ msgstr "Αδύνατη η αποθήκευση τιμής στο κλειδί `%s'"
-
-# gconf/gconfd.c:972
-#~ msgid "Received signal %d, ignoring"
-#~ msgstr "Λήφθηκε σήμα %d, αγνοείται"
-
-# gconf/gconfd.c:1911
-#~ msgid "Attempt to unregister invalid context ID"
-#~ msgstr "Προσπάθεια διαγραφής άκυρου context ID"
-
-# gconf/gconfd.c:1918
-#~ msgid "Bad context ID %lu, request ignored"
-#~ msgstr "Λάθος context ID %lu, αίτηση αγνοείται"
-
-# gconf/gconfd.c:1926
-#~ msgid "Already-unregistered context ID %lu, request ignored"
-#~ msgstr "Context ID %lu ήδη αποκαταχωρημένο, αίτηση αγνοείται"
-
-# gconf/gconfd.c:1951
-#~ msgid "Attempt to use invalid context ID %lu"
-#~ msgstr "Προσπάθεια χρήσης άκυρου context ID %lu"
-
-# gconf/gconfd.c:1961
-#~ msgid "Attempt to use already-unregistered context ID %lu"
-#~ msgstr "Προσπάθεια χρήσης ήδη αποκαταχωρημένου context ID %lu"
-
-# gconf/gconftool.c:1227
-#~ msgid ""
-#~ "WARNING: For now gconftool only knows how to install default values for "
-#~ "simple types (int, string, bool, float)\n"
-#~ msgstr ""
-#~ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Προς το παρόν, το gconftool γνωρίζει μόνο να εγκαθιστά εξ "
-#~ "ορισμού τιμές για απλούς τύπους (ακέραιους, αλφαριθμητικά, δυαδικούς, "
-#~ "κινητής υποδιαστολής)\n"
-
-# gconf-editor/app.c:53
-#~ msgid "Key"
-#~ msgstr "Κλειδί"
-
-# gconf-editor/app.c:54
-#~ msgid "Value"
-#~ msgstr "Τιμή"
-
-# gconf-editor/app.c:57
-#~ msgid "Configuration Editor"
-#~ msgstr "Συντάκτης Διαμόρφωσης"
-
-# gconf-editor/app.c:117
-#~ msgid "Could not parse geometry string"
-#~ msgstr "Αποτυχία γραμματικής ανάλυσης αλφαριθμητικού γεωμετρίας"
-
-# gconf-editor/gconf-editor.c:41
-#~ msgid "Specify the geometry of the main window"
-#~ msgstr "Καθορίστε τη γεωμετρία του κύριου παραθύρου"
-
-# gconf-editor/gconf-editor.c:42
-#~ msgid "GEOMETRY"
-#~ msgstr "ΓΕΩΜΕΤΡΙΑ"
+#~ "Κάποιος πελάτης απομάκρυνε τον εαυτό του από τον εξυπηρετητή GConf όταν "
+#~ "δεν είχε προστεθεί."
diff --git a/po/en_GB.po b/po/en_GB.po
new file mode 100644
index 00000000..825978ae
--- /dev/null
+++ b/po/en_GB.po
@@ -0,0 +1,2115 @@
+# English (British) translation.
+# Copyright (C) 2004 THE PACKAGES'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the GCONF package.
+# Gareth Owen <gowen72@yahoo.com> 2004
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: GCONF\n"
+"POT-Creation-Date: 2003-12-05 00:37+0100\n"
+"PO-Revision-Date: 2004-03-07 16:58-0500\n"
+"Last-Translator: Gareth Owen <gowen72@yahoo.com>\n"
+"Language-Team: \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
+msgid "Couldn't find the %s root directory in the address `%s'"
+msgstr "Couldn't find the %s root directory in the address `%s'"
+
+#: backends/dir-utils.c:124 backends/xml-backend.c:332
+#, c-format
+msgid "Could not make directory `%s': %s"
+msgstr "Could not make 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 "Can't read from or write to the %s root directory in the address `%s'"
+
+#: backends/xml-backend.c:236
+msgid "Unloading XML backend module."
+msgstr "Unloading XML backend module."
+
+#: backends/xml-backend.c:285
+#, c-format
+msgid "Couldn't find the XML root directory in the address `%s'"
+msgstr "Couldn't find the XML root directory in the address `%s'"
+
+#: backends/xml-backend.c:443
+#, c-format
+msgid ""
+"Can't read from or write to the XML root directory in the address \"%s\""
+msgstr ""
+"Can't read from or write to the XML root directory in the address \"%s\""
+
+#: backends/xml-backend.c:453
+#, c-format
+msgid "Directory/file permissions for XML source at root %s are: %o/%o"
+msgstr "Directory/file permissions for XML source at root %s are: %o/%o"
+
+#: backends/xml-backend.c:619
+#, c-format
+msgid "Error syncing the XML backend directory cache: %s"
+msgstr "Error syncing the XML backend directory cache: %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 operation is no longer supported, just remove all the "
+"values in the directory"
+
+#: backends/xml-backend.c:770
+#, c-format
+msgid "Could not open lock directory for %s to remove locks: %s\n"
+msgstr "Could not open lock directory for %s to remove locks: %s\n"
+
+#: backends/xml-backend.c:788
+#, c-format
+msgid "Could not remove file %s: %s\n"
+msgstr "Could not remove file %s: %s\n"
+
+#: backends/xml-backend.c:809
+msgid "Initializing XML backend module"
+msgstr "Initialising XML backend module"
+
+#: backends/xml-backend.c:877
+#, c-format
+msgid "Failed to give up lock on XML directory \"%s\": %s"
+msgstr "Failed to give up lock on XML directory \"%s\": %s"
+
+#: backends/xml-cache.c:286
+msgid "Failed to sync XML cache contents to disk"
+msgstr "Failed to sync XML cache contents to disk"
+
+#: backends/xml-cache.c:316
+#, c-format
+msgid ""
+"Unable to remove directory `%s' from the XML backend cache, because it has "
+"not been successfully synced to disk"
+msgstr ""
+"Unable to remove directory `%s' from the XML backend cache, because it has "
+"not been successfully synced to disk"
+
+#: backends/xml-dir.c:171
+#, c-format
+msgid "Could not stat `%s': %s"
+msgstr "Could not stat `%s': %s"
+
+#: backends/xml-dir.c:181
+#, c-format
+msgid "XML filename `%s' is a directory"
+msgstr "XML filename `%s' is a directory"
+
+#: backends/xml-dir.c:416 backends/xml-dir.c:425
+#, c-format
+msgid "Failed to delete \"%s\": %s"
+msgstr "Failed to delete \"%s\": %s"
+
+#: backends/xml-dir.c:471
+#, c-format
+msgid "Failed to write file `%s': %s"
+msgstr "Failed to write file `%s': %s"
+
+#: backends/xml-dir.c:484
+#, c-format
+msgid "Failed to set mode on `%s': %s"
+msgstr "Failed to set mode on `%s': %s"
+
+#: backends/xml-dir.c:494
+#, c-format
+msgid "Failed to write XML data to `%s': %s"
+msgstr "Failed to write XML data to `%s': %s"
+
+#: backends/xml-dir.c:504 backends/xml-dir.c:1279
+#, c-format
+msgid "Failed to close file `%s': %s"
+msgstr "Failed to close file `%s': %s"
+
+#: backends/xml-dir.c:520 backends/xml-dir.c:530
+#, c-format
+msgid "Failed to rename `%s' to `%s': %s"
+msgstr "Failed to rename `%s' to `%s': %s"
+
+#: backends/xml-dir.c:536
+#, c-format
+msgid "Failed to restore `%s' from `%s': %s"
+msgstr "Failed to restore `%s' from `%s': %s"
+
+#: backends/xml-dir.c:548
+#, c-format
+msgid "Failed to delete old file `%s': %s"
+msgstr "Failed to delete old file `%s': %s"
+
+#. These are all fatal errors
+#: backends/xml-dir.c:978
+#, c-format
+msgid "Failed to stat `%s': %s"
+msgstr "Failed to stat `%s': %s"
+
+#: backends/xml-dir.c:1152
+#, c-format
+msgid "Duplicate entry `%s' in `%s', ignoring"
+msgstr "Duplicate entry `%s' in `%s', ignoring"
+
+#: backends/xml-dir.c:1174
+#, c-format
+msgid "Entry with no name in XML file `%s', ignoring"
+msgstr "Entry with no name in XML file `%s', ignoring"
+
+#: backends/xml-dir.c:1182
+#, c-format
+msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
+msgstr "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
+
+#: backends/xml-dir.c:1255
+#, c-format
+msgid "Could not make directory \"%s\": %s"
+msgstr "Could not make directory \"%s\": %s"
+
+#: backends/xml-dir.c:1271
+#, c-format
+msgid "Failed to create file `%s': %s"
+msgstr "Failed to create file `%s': %s"
+
+#: backends/xml-dir.c:1370
+#, c-format
+msgid "Failed to parse XML file \"%s\""
+msgstr "Failed to parse XML file \"%s\""
+
+#. There was an error
+#: backends/xml-entry.c:154
+#, c-format
+msgid "Ignoring XML node with name `%s': %s"
+msgstr "Ignoring XML node with name `%s': %s"
+
+#: backends/xml-entry.c:332
+#, c-format
+msgid "Ignoring schema name `%s', invalid: %s"
+msgstr "Ignoring schema name `%s', invalid: %s"
+
+#: backends/xml-entry.c:380
+#, c-format
+msgid "Ignoring XML node `%s': %s"
+msgstr "Ignoring XML node `%s': %s"
+
+#: backends/xml-entry.c:732
+#, c-format
+msgid "Failed reading default value for schema: %s"
+msgstr "Failed reading default value for schema: %s"
+
+#: backends/xml-entry.c:952
+#, c-format
+msgid "No \"type\" attribute for <%s> node"
+msgstr "No \"type\" attribute for <%s> node"
+
+#: backends/xml-entry.c:966
+#, c-format
+msgid "A node has unknown \"type\" attribute `%s', ignoring"
+msgstr "A node has unknown \"type\" attribute `%s', ignoring"
+
+#: backends/xml-entry.c:981
+msgid "No \"value\" attribute for node"
+msgstr "No \"value\" attribute for node"
+
+#: backends/xml-entry.c:1029 backends/xml-entry.c:1105
+#, c-format
+msgid "Didn't understand XML node <%s> inside an XML list node"
+msgstr "Didn't understand XML node <%s> inside an XML list node"
+
+#: backends/xml-entry.c:1063
+msgid "Invalid type (list, pair, or unknown) in a list node"
+msgstr "Invalid type (list, pair, or unknown) in a list node"
+
+#: backends/xml-entry.c:1086
+#, c-format
+msgid "Bad XML node: %s"
+msgstr "Bad XML node: %s"
+
+#: backends/xml-entry.c:1094
+#, c-format
+msgid "List contains a badly-typed node (%s, should be %s)"
+msgstr "List contains a badly-typed node (%s, should be %s)"
+
+#: backends/xml-entry.c:1146
+#, c-format
+msgid "Ignoring bad car from XML pair: %s"
+msgstr "Ignoring bad car from XML pair: %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 "parsing XML file: lists and pairs may not be placed inside a pair"
+
+#: backends/xml-entry.c:1168
+#, c-format
+msgid "Ignoring bad cdr from XML pair: %s"
+msgstr "Ignoring bad cdr from XML pair: %s"
+
+#: backends/xml-entry.c:1187
+#, c-format
+msgid "Didn't understand XML node <%s> inside an XML pair node"
+msgstr "Didn't understand XML node <%s> inside an XML pair node"
+
+#: backends/xml-entry.c:1205
+msgid "Didn't find car and cdr for XML pair node"
+msgstr "Didn't find car and cdr for XML pair node"
+
+#: backends/xml-entry.c:1211
+msgid "Missing cdr from pair of values in XML file"
+msgstr "Missing cdr from pair of values in XML file"
+
+#: backends/xml-entry.c:1218
+msgid "Missing car from pair of values in XML file"
+msgstr "Missing car from pair of values in XML file"
+
+#: backends/xml-entry.c:1223
+msgid "Missing both car and cdr values from pair in XML file"
+msgstr "Missing both car and cdr values from pair in XML file"
+
+#. -- end debug only
+#: gconf/gconf-backend.c:167
+#, c-format
+msgid "No such file `%s'\n"
+msgstr "No such file `%s'\n"
+
+#: gconf/gconf-backend.c:195
+#, c-format
+msgid "Bad address `%s'"
+msgstr "Bad address `%s'"
+
+#: gconf/gconf-backend.c:220
+msgid "GConf won't work without dynamic module support (gmodule)"
+msgstr "GConf won't work without dynamic module support (gmodule)"
+
+#: gconf/gconf-backend.c:230
+#, c-format
+msgid "Error opening module `%s': %s\n"
+msgstr "Error opening module `%s': %s\n"
+
+#: gconf/gconf-backend.c:262
+#, c-format
+msgid "Couldn't locate backend module for `%s'"
+msgstr "Couldn't locate backend module for `%s'"
+
+#: gconf/gconf-backend.c:299
+msgid "Failed to shut down backend"
+msgstr "Failed to shut down backend"
+
+#: gconf/gconf-client.c:344 gconf/gconf-client.c:362
+#, c-format
+msgid "GConf Error: %s\n"
+msgstr "GConf Error: %s\n"
+
+#: gconf/gconf-client.c:896
+#, c-format
+msgid "GConf warning: failure listing pairs in `%s': %s"
+msgstr "GConf warning: failure listing pairs in `%s': %s"
+
+#: gconf/gconf-client.c:1181
+#, c-format
+msgid "Expected `%s' got `%s' for key %s"
+msgstr "Expected `%s' got `%s' for key %s"
+
+#: gconf/gconf-database.c:173
+#, c-format
+msgid "Failed to sync one or more sources: %s"
+msgstr "Failed to sync one or more sources: %s"
+
+#: gconf/gconf-database.c:241 gconf/gconf-sources.c:1541
+#, c-format
+msgid "Error getting value for `%s': %s"
+msgstr "Error getting value for `%s': %s"
+
+#: gconf/gconf-database.c:287
+#, c-format
+msgid "Error setting value for `%s': %s"
+msgstr "Error setting value for `%s': %s"
+
+#: gconf/gconf-database.c:342
+#, c-format
+msgid "Error unsetting `%s': %s"
+msgstr "Error unsetting `%s': %s"
+
+#: gconf/gconf-database.c:371
+#, c-format
+msgid "Error getting default value for `%s': %s"
+msgstr "Error getting default value for `%s': %s"
+
+#: gconf/gconf-database.c:418
+#, c-format
+msgid "Error unsetting \"%s\": %s"
+msgstr "Error unsetting \"%s\": %s"
+
+#: gconf/gconf-database.c:450
+#, c-format
+msgid "Error getting new value for \"%s\": %s"
+msgstr "Error getting new value for \"%s\": %s"
+
+#: gconf/gconf-database.c:496
+#, c-format
+msgid "Error checking existence of `%s': %s"
+msgstr "Error checking existence of `%s': %s"
+
+#: gconf/gconf-database.c:520
+#, c-format
+msgid "Error removing directory \"%s\": %s"
+msgstr "Error removing directory \"%s\": %s"
+
+#: gconf/gconf-database.c:547
+#, c-format
+msgid "Failed to get all entries in `%s': %s"
+msgstr "Failed to get all entries in `%s': %s"
+
+#: gconf/gconf-database.c:573
+#, c-format
+msgid "Error listing dirs in `%s': %s"
+msgstr "Error listing dirs in `%s': %s"
+
+#: gconf/gconf-database.c:594
+#, c-format
+msgid "Error setting schema for `%s': %s"
+msgstr "Error setting schema for `%s': %s"
+
+#: gconf/gconf-error.c:25
+msgid "Success"
+msgstr "Success"
+
+#: gconf/gconf-error.c:26
+msgid "Failed"
+msgstr "Failed"
+
+#: gconf/gconf-error.c:27
+msgid "Configuration server couldn't be contacted"
+msgstr "Configuration server couldn't be contacted"
+
+#: gconf/gconf-error.c:28
+msgid "Permission denied"
+msgstr "Permission denied"
+
+#: gconf/gconf-error.c:29
+msgid "Couldn't resolve address for configuration source"
+msgstr "Couldn't resolve address for configuration source"
+
+#: gconf/gconf-error.c:30
+msgid "Bad key or directory name"
+msgstr "Bad key or directory name"
+
+#: gconf/gconf-error.c:31
+msgid "Parse error"
+msgstr "Parse error"
+
+#: gconf/gconf-error.c:32
+msgid "Corrupt data in configuration source database"
+msgstr "Corrupt data in configuration source database"
+
+#: gconf/gconf-error.c:33
+msgid "Type mismatch"
+msgstr "Type mismatch"
+
+#: gconf/gconf-error.c:34
+msgid "Key operation on directory"
+msgstr "Key operation on directory"
+
+#: gconf/gconf-error.c:35
+msgid "Directory operation on key"
+msgstr "Directory operation on key"
+
+#: gconf/gconf-error.c:36
+msgid "Can't overwrite existing read-only value"
+msgstr "Can't overwrite existing read-only value"
+
+#: gconf/gconf-error.c:37
+msgid "Object Activation Framework error"
+msgstr "Object Activation Framework error"
+
+#: gconf/gconf-error.c:38
+msgid "Operation not allowed without configuration server"
+msgstr "Operation not allowed without configuration server"
+
+#: gconf/gconf-error.c:39
+msgid "Failed to get a lock"
+msgstr "Failed to get a lock"
+
+#: gconf/gconf-error.c:40
+msgid "No database available to save your configuration"
+msgstr "No database available to save your configuration"
+
+#: gconf/gconf-internals.c:67
+#, c-format
+msgid "No '/' in key \"%s\""
+msgstr "No '/' in key \"%s\""
+
+#: gconf/gconf-internals.c:337
+#, c-format
+msgid "Couldn't open path file `%s': %s\n"
+msgstr "Couldn't open path file `%s': %s\n"
+
+#: gconf/gconf-internals.c:386
+#, c-format
+msgid "Adding source `%s'\n"
+msgstr "Adding source `%s'\n"
+
+#: gconf/gconf-internals.c:398
+#, c-format
+msgid "Read error on file `%s': %s\n"
+msgstr "Read error on file `%s': %s\n"
+
+#: gconf/gconf-internals.c:702 gconf/gconf-internals.c:768
+#: gconf/gconf-value.c:154 gconf/gconf-value.c:253 gconf/gconf-value.c:395
+#: gconf/gconf-value.c:1681
+msgid "Text contains invalid UTF-8"
+msgstr "Text contains invalid UTF-8"
+
+#: gconf/gconf-internals.c:853
+#, c-format
+msgid "Expected list, got %s"
+msgstr "Expected list, got %s"
+
+#: gconf/gconf-internals.c:863
+#, c-format
+msgid "Expected list of %s, got list of %s"
+msgstr "Expected list of %s, got list of %s"
+
+#: gconf/gconf-internals.c:991
+#, c-format
+msgid "Expected pair, got %s"
+msgstr "Expected pair, got %s"
+
+#: gconf/gconf-internals.c:1005
+#, c-format
+msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
+msgstr "Expected (%s,%s) pair, got a pair with one or both values missing"
+
+#: gconf/gconf-internals.c:1021
+#, c-format
+msgid "Expected pair of type (%s,%s) got type (%s,%s)"
+msgstr "Expected pair of type (%s,%s) got type (%s,%s)"
+
+#: gconf/gconf-internals.c:1137
+msgid "Quoted string doesn't begin with a quotation mark"
+msgstr "Quoted string doesn't begin with a quotation mark"
+
+#: gconf/gconf-internals.c:1199
+msgid "Quoted string doesn't end with a quotation mark"
+msgstr "Quoted string doesn't end with a quotation mark"
+
+#: gconf/gconf-internals.c:1335
+msgid "Encoded value is not valid UTF-8"
+msgstr "Encoded value is not valid UTF-8"
+
+#: gconf/gconf-internals.c:1837
+#, c-format
+msgid "IOR file '%s' not opened successfully, no gconfd located: %s"
+msgstr "IOR file '%s' not opened successfully, no gconfd located: %s"
+
+#: gconf/gconf-internals.c:1867
+#, c-format
+msgid "gconftool or other non-gconfd process has the lock file '%s'"
+msgstr "gconftool or other non-gconfd process has the lock file '%s'"
+
+#: gconf/gconf-internals.c:1884
+msgid "couldn't contact ORB to resolve existing gconfd object reference"
+msgstr "couldn't contact ORB to resolve existing gconfd object reference"
+
+#: gconf/gconf-internals.c:1894
+#, c-format
+msgid "Failed to convert IOR '%s' to an object reference"
+msgstr "Failed to convert IOR '%s' to an object reference"
+
+#: gconf/gconf-internals.c:1949
+#, c-format
+msgid "Could not lock temporary file '%s': %s"
+msgstr "Could not lock temporary file '%s': %s"
+
+#: gconf/gconf-internals.c:1976
+#, c-format
+msgid "Could not create file '%s', probably because it already exists"
+msgstr "Could not create file '%s', probably because it already exists"
+
+#: gconf/gconf-internals.c:2023
+#, c-format
+msgid "Failed to create or open '%s'"
+msgstr "Failed to create or open '%s'"
+
+#: gconf/gconf-internals.c:2033
+#, c-format
+msgid ""
+"Failed to lock '%s': probably another process has the lock, or your "
+"operating system has NFS file locking misconfigured (%s)"
+msgstr ""
+"Failed to lock '%s': probably another process has the lock, or your "
+"operating system has NFS file locking misconfigured (%s)"
+
+#: gconf/gconf-internals.c:2117
+#, c-format
+msgid "We didn't have the lock on file `%s', but we should have"
+msgstr "We didn't have the lock on file `%s', but we should have"
+
+#: gconf/gconf-internals.c:2138
+#, c-format
+msgid "Failed to link '%s' to '%s': %s"
+msgstr "Failed to link '%s' to '%s': %s"
+
+#: gconf/gconf-internals.c:2150
+#, c-format
+msgid "Failed to remove lock file `%s': %s"
+msgstr "Failed to remove lock file `%s': %s"
+
+#: gconf/gconf-internals.c:2169
+#, c-format
+msgid "Failed to clean up file '%s': %s"
+msgstr "Failed to clean up file '%s': %s"
+
+#: gconf/gconf-internals.c:2183
+#, c-format
+msgid "Failed to remove lock directory `%s': %s"
+msgstr "Failed to remove lock directory `%s': %s"
+
+#: gconf/gconf-internals.c:2220
+#, c-format
+msgid "couldn't create directory `%s': %s"
+msgstr "couldn't create directory `%s': %s"
+
+#: gconf/gconf-internals.c:2279
+#, c-format
+msgid "Can't write to file `%s': %s"
+msgstr "Can't write to file `%s': %s"
+
+#: gconf/gconf-internals.c:2323
+#, c-format
+msgid "Failed to unlink lock file %s: %s\n"
+msgstr "Failed to unlink lock file %s: %s\n"
+
+#: gconf/gconf-sanity-check.c:43 gconf/gconftool.c:84
+msgid "Help options"
+msgstr "Help options"
+
+#: gconf/gconf-sanity-check.c:79 gconf/gconftool.c:506
+#, c-format
+msgid ""
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+
+#: gconf/gconf-sanity-check.c:144 gconf/gconf-sanity-check.c:169
+#, 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 "
+"problem with your configuration, as many programs will need to create files "
+"in your home directory. The error was \"%s\" (errno = %d)."
+msgstr ""
+"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 "
+"problem with your configuration, as many programs will need to create files "
+"in your home directory. The error was \"%s\" (errno = %d)."
+
+#: gconf/gconf-sanity-check.c:183
+#, 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 "
+"with your operating system configuration. If you have an NFS-mounted home "
+"directory, either the client or the server may be set up incorrectly. See "
+"the rpc.statd and rpc.lockd documentation. A common cause of this error is "
+"that the \"nfslock\" service has been disabled.The error was \"%s\" (errno = "
+"%d)."
+msgstr ""
+"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 "
+"with your operating system configuration. If you have an NFS-mounted home "
+"directory, either the client or the server may be set up incorrectly. See "
+"the rpc.statd and rpc.lockd documentation. A common cause of this error is "
+"that the \"nfslock\" service has been disabled.The error was \"%s\" (errno = "
+"%d)."
+
+#: gconf/gconf-sanity-check.c:200
+#, c-format
+msgid "Can't remove file %s: %s\n"
+msgstr "Can't remove file %s: %s\n"
+
+#: gconf/gconf-sanity-check.c:236
+#, 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 ""
+"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"
+
+#: gconf/gconf-sanity-check.c:239
+msgid "Error reading the file: "
+msgstr "Error reading the file: "
+
+#: gconf/gconf-sanity-check.c:262
+#, 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 ""
+"Please contact your system administrator to resolve the following problem:\n"
+"Could not resolve the address \"%s\" in the configuration file \"%s\": %s"
+
+#: gconf/gconf-sanity-check.c:323
+msgid ""
+"The files that contain your preference settings are currently in use.\n"
+"\n"
+"You might be logged in to a session from another computer, and the other "
+"login session is using your preference settings files.\n"
+"\n"
+"You can continue to use the current session, but this might cause temporary "
+"problems with the preference settings in the other session.\n"
+"\n"
+"Do you want to continue?"
+msgstr ""
+"The files that contain your preference settings are currently in use.\n"
+"\n"
+"You might be logged in to a session from another computer, and the other "
+"login session is using your preference settings files.\n"
+"\n"
+"You can continue to use the current session, but this might cause temporary "
+"problems with the preference settings in the other session.\n"
+"\n"
+"Do you want to continue?"
+
+#: gconf/gconf-sanity-check.c:344
+msgid "_Log Out"
+msgstr "_Log Out"
+
+#: gconf/gconf-sanity-check.c:346
+msgid "_Continue"
+msgstr "_Continue"
+
+#: gconf/gconf-sanity-check.c:359
+#, c-format
+msgid "%s Continue (y/n)?"
+msgstr "%s Continue (y/n)?"
+
+#: gconf/gconf-schema.c:221 gconf/gconf-schema.c:229 gconf/gconf-schema.c:237
+#: gconf/gconf-schema.c:245
+msgid "Schema contains invalid UTF-8"
+msgstr "Schema contains invalid UTF-8"
+
+#: gconf/gconf-schema.c:254
+msgid ""
+"Schema specifies type list but doesn't specify the type of the list elements"
+msgstr ""
+"Schema specifies type list but doesn't specify the type of the list elements"
+
+#: gconf/gconf-schema.c:264
+msgid ""
+"Schema specifies type pair but doesn't specify the type of the car/cdr "
+"elements"
+msgstr ""
+"Schema specifies type pair but doesn't specify the type of the car/cdr "
+"elements"
+
+#: gconf/gconf-sources.c:319
+#, c-format
+msgid "Failed to load source \"%s\": %s"
+msgstr "Failed to load source \"%s\": %s"
+
+#: gconf/gconf-sources.c:346
+#, c-format
+msgid "Resolved address \"%s\" to a writable config source at position %d"
+msgstr "Resolved address \"%s\" to a writable config source at position %d"
+
+#: gconf/gconf-sources.c:352
+#, c-format
+msgid "Resolved address \"%s\" to a read-only config source at position %d"
+msgstr "Resolved address \"%s\" to a read-only config source at position %d"
+
+#: gconf/gconf-sources.c:359
+#, c-format
+msgid ""
+"Resolved address \"%s\" to a partially writable config source at position %d"
+msgstr ""
+"Resolved address \"%s\" to a partially writable config source at position %d"
+
+#: gconf/gconf-sources.c:368
+msgid ""
+"None of the resolved addresses are writable; saving configuration settings "
+"will not be possible"
+msgstr ""
+"None of the resolved addresses are writable; saving configuration settings "
+"will not be possible"
+
+#: gconf/gconf-sources.c:584
+#, c-format
+msgid "Schema `%s' specified for `%s' stores a non-schema value"
+msgstr "Schema `%s' specified for `%s' stores a non-schema value"
+
+#: gconf/gconf-sources.c:642
+msgid "The '/' name can only be a directory, not a key"
+msgstr "The '/' name can only be a directory, not a key"
+
+#: gconf/gconf-sources.c:680
+#, c-format
+msgid ""
+"Value for `%s' set in a read-only source at the front of your configuration "
+"path"
+msgstr ""
+"Value for `%s' set in a read-only source at the front of your configuration "
+"path"
+
+#: 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 "
+"configuration path file %s/path doesn't contain any databases or wasn't "
+"found 2) somehow we mistakenly created two gconfd processes 3) your "
+"operating system is misconfigured so NFS file locking doesn't work in your "
+"home directory or 4) your NFS client machine crashed and didn't properly "
+"notify the server on reboot that file locks should be dropped. If you have "
+"two gconfd processes (or had two at the time the second was launched), "
+"logging out, killing all copies of gconfd, and logging back in may help. If "
+"you have stale locks, remove ~/.gconf*/*lock. Perhaps the problem is that "
+"you attempted to use GConf from two machines at once, and ORBit still has "
+"its default configuration that prevents remote CORBA connections - put "
+"\"ORBIIOPIPv4=1\" in /etc/orbitrc. As always, check the user.* syslog for "
+"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 ""
+"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 "
+"configuration path file %s/path doesn't contain any databases or wasn't "
+"found 2) somehow we mistakenly created two gconfd processes 3) your "
+"operating system is misconfigured so NFS file locking doesn't work in your "
+"home directory or 4) your NFS client machine crashed and didn't properly "
+"notify the server on reboot that file locks should be dropped. If you have "
+"two gconfd processes (or had two at the time the second was launched), "
+"logging out, killing all copies of gconfd, and logging back in may help. If "
+"you have stale locks, remove ~/.gconf*/*lock. Perhaps the problem is that "
+"you attempted to use GConf from two machines at once, and ORBit still has "
+"its default configuration that prevents remote CORBA connections - put "
+"\"ORBIIOPIPv4=1\" in /etc/orbitrc. As always, check the user.* syslog for "
+"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"
+
+#: gconf/gconf-sources.c:1414
+#, c-format
+msgid "Error finding metainfo: %s"
+msgstr "Error finding metainfo: %s"
+
+#: gconf/gconf-sources.c:1483
+#, c-format
+msgid "Error getting metainfo: %s"
+msgstr "Error getting metainfo: %s"
+
+#: gconf/gconf-sources.c:1507
+#, c-format
+msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
+msgstr "Key `%s' listed as schema for key `%s' actually stores type `%s'"
+
+#: gconf/gconf-value.c:110
+#, c-format
+msgid "Didn't understand `%s' (expected integer)"
+msgstr "Didn't understand `%s' (expected integer)"
+
+#: gconf/gconf-value.c:120
+#, c-format
+msgid "Integer `%s' is too large or small"
+msgstr "Integer `%s' is too large or small"
+
+#: gconf/gconf-value.c:141
+#, c-format
+msgid "Didn't understand `%s' (expected real number)"
+msgstr "Didn't understand `%s' (expected real number)"
+
+#: gconf/gconf-value.c:185
+#, c-format
+msgid "Didn't understand `%s' (expected true or false)"
+msgstr "Didn't understand `%s' (expected true or false)"
+
+#: gconf/gconf-value.c:261
+#, c-format
+msgid "Didn't understand `%s' (list must start with a '[')"
+msgstr "Didn't understand `%s' (list must start with a '[')"
+
+#: gconf/gconf-value.c:274
+#, c-format
+msgid "Didn't understand `%s' (list must end with a ']')"
+msgstr "Didn't understand `%s' (list must end with a ']')"
+
+#: gconf/gconf-value.c:325
+#, c-format
+msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
+msgstr "Didn't understand `%s' (extra unescaped ']' found inside list)"
+
+#: gconf/gconf-value.c:356 gconf/gconf-value.c:517
+#, c-format
+msgid "Didn't understand `%s' (extra trailing characters)"
+msgstr "Didn't understand `%s' (extra trailing characters)"
+
+#: gconf/gconf-value.c:403
+#, c-format
+msgid "Didn't understand `%s' (pair must start with a '(')"
+msgstr "Didn't understand `%s' (pair must start with a '(')"
+
+#: gconf/gconf-value.c:416
+#, c-format
+msgid "Didn't understand `%s' (pair must end with a ')')"
+msgstr "Didn't understand `%s' (pair must end with a ')')"
+
+#: gconf/gconf-value.c:446 gconf/gconf-value.c:532
+#, c-format
+msgid "Didn't understand `%s' (wrong number of elements)"
+msgstr "Didn't understand `%s' (wrong number of elements)"
+
+#: gconf/gconf-value.c:486
+#, c-format
+msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
+msgstr "Didn't understand `%s' (extra unescaped ')' found inside pair)"
+
+#: gconf/gconf.c:44
+#, c-format
+msgid "Key \"%s\" is NULL"
+msgstr "Key \"%s\" is NULL"
+
+#: gconf/gconf.c:51
+#, c-format
+msgid "\"%s\": %s"
+msgstr "\"%s\": %s"
+
+#: gconf/gconf.c:116
+msgid "Must begin with a slash (/)"
+msgstr "Must begin with a slash (/)"
+
+#: gconf/gconf.c:138
+msgid "Can't have two slashes (/) in a row"
+msgstr "Can't have two slashes (/) in a row"
+
+#: gconf/gconf.c:140
+msgid "Can't have a period (.) right after a slash (/)"
+msgstr "Can't have a period (.) right after a slash (/)"
+
+#: gconf/gconf.c:159
+#, c-format
+msgid "'%c' is not an ASCII character, so isn't allowed in key names"
+msgstr "'%c' is not an ASCII character, so isn't allowed in key names"
+
+#: gconf/gconf.c:169
+#, c-format
+msgid "`%c' is an invalid character in key/directory names"
+msgstr "`%c' is an invalid character in key/directory names"
+
+#: gconf/gconf.c:183
+msgid "Key/directory may not end with a slash (/)"
+msgstr "Key/directory may not end with a slash (/)"
+
+#: gconf/gconf.c:408
+#, c-format
+msgid "Expected float, got %s"
+msgstr "Expected float, got %s"
+
+#: gconf/gconf.c:443
+#, c-format
+msgid "Expected int, got %s"
+msgstr "Expected int, got %s"
+
+#: gconf/gconf.c:478
+#, c-format
+msgid "Expected string, got %s"
+msgstr "Expected string, got %s"
+
+#: gconf/gconf.c:512
+#, c-format
+msgid "Expected bool, got %s"
+msgstr "Expected bool, got %s"
+
+#: gconf/gconf.c:545
+#, c-format
+msgid "Expected schema, got %s"
+msgstr "Expected schema, got %s"
+
+#: gconf/gconfd.c:147
+msgid ""
+"gconfd compiled with debugging; trying to load gconf.path from the source "
+"directory"
+msgstr ""
+"gconfd compiled with debugging; trying to load gconf.path from the source "
+"directory"
+
+#: gconf/gconfd.c:161
+#, c-format
+msgid ""
+"No configuration files found, trying to use the default config source `%s'"
+msgstr ""
+"No configuration files found, trying to use the default config source `%s'"
+
+#. We want to stay alive but do nothing, because otherwise every
+#. request would result in another failed gconfd being spawned.
+#.
+#: gconf/gconfd.c:169
+#, c-format
+msgid ""
+"No configuration sources in the source path, configuration won't be saved; "
+"edit %s"
+msgstr ""
+"No configuration sources in the source path, configuration won't be saved; "
+"edit %s"
+
+#: gconf/gconfd.c:182
+#, c-format
+msgid "Error loading some config sources: %s"
+msgstr "Error loading some config sources: %s"
+
+#: gconf/gconfd.c:194
+msgid ""
+"No config source addresses successfully resolved, can't load or store config "
+"data"
+msgstr ""
+"No config source addresses successfully resolved, can't load or store config "
+"data"
+
+#: gconf/gconfd.c:211
+msgid ""
+"No writable config sources successfully resolved, may not be able to save "
+"some configuration changes"
+msgstr ""
+"No writable config sources successfully resolved, may not be able to save "
+"some configuration changes"
+
+#: gconf/gconfd.c:237
+#, c-format
+msgid "Received signal %d, dumping core. Please report a GConf bug."
+msgstr "Received signal %d, dumping core. Please report a GConf bug."
+
+#: gconf/gconfd.c:255
+#, c-format
+msgid ""
+"Received signal %d, shutting down abnormally. Please file a GConf bug report."
+msgstr ""
+"Received signal %d, shutting down abnormally. Please file a GConf bug report."
+
+#: gconf/gconfd.c:272
+#, c-format
+msgid "Received signal %d, shutting down cleanly"
+msgstr "Received signal %d, shutting down cleanly"
+
+#: gconf/gconfd.c:341
+#, c-format
+msgid "Failed to open %s: %s"
+msgstr "Failed to open %s: %s"
+
+#: gconf/gconfd.c:348
+#, c-format
+msgid "Failed to stat %s: %s"
+msgstr "Failed to stat %s: %s"
+
+#: gconf/gconfd.c:357
+#, c-format
+msgid "Owner of %s is not the current user"
+msgstr "Owner of %s is not the current user"
+
+#: gconf/gconfd.c:365
+#, c-format
+msgid "Bad permissions %lo on directory %s"
+msgstr "Bad permissions %lo on directory %s"
+
+#. openlog() does not copy logname - what total brokenness.
+#. So we free it at the end of main()
+#: gconf/gconfd.c:445
+#, c-format
+msgid "starting (version %s), pid %u user '%s'"
+msgstr "starting (version %s), pid %u user '%s'"
+
+#: gconf/gconfd.c:484
+#, c-format
+msgid "Failed to create %s: %s"
+msgstr "Failed to create %s: %s"
+
+#: gconf/gconfd.c:492
+#, c-format
+msgid "Directory %s has a problem, gconfd can't use it"
+msgstr "Directory %s has a problem, gconfd can't use it"
+
+#: gconf/gconfd.c:528
+#, c-format
+msgid "Failed to write byte to pipe fd %d so client program may hang: %s"
+msgstr "Failed to write byte to pipe fd %d so client program may hang: %s"
+
+#: gconf/gconfd.c:542
+#, c-format
+msgid "Failed to get lock for daemon, exiting: %s"
+msgstr "Failed to get lock for daemon, exiting: %s"
+
+#: gconf/gconfd.c:584
+#, c-format
+msgid "Error releasing lockfile: %s"
+msgstr "Error releasing lockfile: %s"
+
+#: gconf/gconfd.c:592
+msgid "Exiting"
+msgstr "Exiting"
+
+#: gconf/gconfd.c:635
+msgid "GConf server is not in use, shutting down."
+msgstr "GConf server is not in use, shutting down."
+
+#: gconf/gconftool.c:93
+msgid "Set a key to a value and sync. Use with --type."
+msgstr "Set a key to a value and sync. Use with --type."
+
+#: gconf/gconftool.c:102
+msgid "Print the value of a key to standard output."
+msgstr "Print the value of a key to standard output."
+
+#: gconf/gconftool.c:111
+msgid ""
+"Set a schema and sync. Use with --short-desc, --long-desc, --owner, and --"
+"type."
+msgstr ""
+"Set a schema and sync. Use with --short-desc, --long-desc, --owner, and --"
+"type."
+
+#: gconf/gconftool.c:121
+msgid "Unset the keys on the command line"
+msgstr "Unset the keys on the command line"
+
+#: gconf/gconftool.c:130
+msgid ""
+"Recursively unset all keys at or below the key/directory names on the "
+"command line"
+msgstr ""
+"Recursively unset all keys at or below the key/directory names on the "
+"command line"
+
+#: gconf/gconftool.c:139
+msgid "Print all key/value pairs in a directory."
+msgstr "Print all key/value pairs in a directory."
+
+#: gconf/gconftool.c:148
+msgid "Print all subdirectories in a directory."
+msgstr "Print all subdirectories in a directory."
+
+#: gconf/gconftool.c:157
+msgid ""
+"Dump to standard out an XML description of all entries under a dir, "
+"recursively."
+msgstr ""
+"Dump to standard out an XML description of all entries under a dir, "
+"recursively."
+
+#: gconf/gconftool.c:166
+msgid ""
+"Load from the specified file an XML description of values and set them "
+"relative to a dir."
+msgstr ""
+"Load from the specified file an XML description of values and set them "
+"relative to a dir."
+
+#: gconf/gconftool.c:175
+msgid "Print all subdirectories and entries under a dir, recursively."
+msgstr "Print all subdirectories and entries under a dir, recursively."
+
+#: gconf/gconftool.c:184
+msgid "Return 0 if the directory exists, 2 if it does not."
+msgstr "Return 0 if the directory exists, 2 if it does not."
+
+#: gconf/gconftool.c:193
+msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
+msgstr "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
+
+#: gconf/gconftool.c:202
+msgid "Return 0 if gconfd is running, 2 if not."
+msgstr "Return 0 if gconfd is running, 2 if not."
+
+#: gconf/gconftool.c:211
+msgid ""
+"Launch the config server (gconfd). (Normally happens automatically when "
+"needed.)"
+msgstr ""
+"Launch the config server (gconfd). (Normally happens automatically when "
+"needed.)"
+
+#: gconf/gconftool.c:220
+msgid ""
+"Specify the type of the value being set, or the type of the value a schema "
+"describes. Unique abbreviations OK."
+msgstr ""
+"Specify the type of the value being set, or the type of the value a schema "
+"describes. Unique abbreviations OK."
+
+#: gconf/gconftool.c:221
+msgid "int|bool|float|string|list|pair"
+msgstr "int|bool|float|string|list|pair"
+
+#: gconf/gconftool.c:229
+msgid "Print the data type of a key to standard output."
+msgstr "Print the data type of a key to standard output."
+
+#: gconf/gconftool.c:238
+msgid "Get the number of elements in a list key."
+msgstr "Get the number of elements in a list key."
+
+#: gconf/gconftool.c:247
+msgid "Get a specific element from a list key, numerically indexed."
+msgstr "Get a specific element from a list key, numerically indexed."
+
+#: gconf/gconftool.c:256
+msgid ""
+"Specify the type of the list value being set, or the type of the value a "
+"schema describes. Unique abbreviations OK."
+msgstr ""
+"Specify the type of the list value being set, or the type of the value a "
+"schema describes. Unique abbreviations OK."
+
+#: gconf/gconftool.c:257 gconf/gconftool.c:266 gconf/gconftool.c:275
+msgid "int|bool|float|string"
+msgstr "int|bool|float|string"
+
+#: gconf/gconftool.c:265
+msgid ""
+"Specify the type of the car pair value being set, or the type of the value a "
+"schema describes. Unique abbreviations OK."
+msgstr ""
+"Specify the type of the car pair value being set, or the type of the value a "
+"schema describes. Unique abbreviations OK."
+
+#: gconf/gconftool.c:274
+msgid ""
+"Specify the type of the cdr pair value being set, or the type of the value a "
+"schema describes. Unique abbreviations OK."
+msgstr ""
+"Specify the type of the cdr pair value being set, or the type of the value a "
+"schema describes. Unique abbreviations OK."
+
+#: gconf/gconftool.c:283
+msgid "Specify a short half-line description to go in a schema."
+msgstr "Specify a short half-line description to go in a schema."
+
+#: gconf/gconftool.c:284 gconf/gconftool.c:293
+msgid "DESCRIPTION"
+msgstr "DESCRIPTION"
+
+#: gconf/gconftool.c:292
+msgid "Specify a several-line description to go in a schema."
+msgstr "Specify a several-line description to go in a schema."
+
+#: gconf/gconftool.c:301
+msgid "Specify the owner of a schema"
+msgstr "Specify the owner of a schema"
+
+#: gconf/gconftool.c:302
+msgid "OWNER"
+msgstr "OWNER"
+
+#: gconf/gconftool.c:310
+msgid "Specify a schema file to be installed"
+msgstr "Specify a schema file to be installed"
+
+#: gconf/gconftool.c:311
+msgid "FILENAME"
+msgstr "FILENAME"
+
+#: gconf/gconftool.c:319
+msgid "Specify a configuration source to use rather than the default path"
+msgstr "Specify a configuration source to use rather than the default path"
+
+#: gconf/gconftool.c:320
+msgid "SOURCE"
+msgstr "SOURCE"
+
+#: gconf/gconftool.c:328
+msgid ""
+"Access the config database directly, bypassing server. Requires that gconfd "
+"is not running."
+msgstr ""
+"Access the config database directly, bypassing server. Requires that gconfd "
+"is not running."
+
+#: gconf/gconftool.c:337
+msgid ""
+"Properly installs schema files on the command line into the database. "
+"GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
+"config source or set to the empty string to use the default."
+msgstr ""
+"Properly installs schema files on the command line into the database. "
+"GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
+"config source or set to the empty string to use the default."
+
+#: gconf/gconftool.c:346
+msgid ""
+"Properly uninstalls schema files on the command line from the database. "
+"GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
+"config source or set to the empty string to use the default."
+msgstr ""
+"Properly uninstalls schema files on the command line from the database. "
+"GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
+"config source or set to the empty string to use the default."
+
+#: gconf/gconftool.c:355
+msgid ""
+"Torture-test an application by setting and unsetting a bunch of values of "
+"different types for keys on the command line."
+msgstr ""
+"Torture-test an application by setting and unsetting a bunch of values of "
+"different types for keys on the command line."
+
+#: gconf/gconftool.c:364
+msgid ""
+"Torture-test an application by setting and unsetting a bunch of keys inside "
+"the directories on the command line."
+msgstr ""
+"Torture-test an application by setting and unsetting a bunch of keys inside "
+"the directories on the command line."
+
+#: gconf/gconftool.c:373
+msgid "Get the short doc string for a key"
+msgstr "Get the short doc string for a key"
+
+#: gconf/gconftool.c:382
+msgid "Get the long doc string for a key"
+msgstr "Get the long doc string for a key"
+
+#: gconf/gconftool.c:391
+msgid "Get the name of the schema applied to this key"
+msgstr "Get the name of the schema applied to this key"
+
+#: gconf/gconftool.c:400
+msgid "Specify the schema name followed by the key to apply the schema name to"
+msgstr ""
+"Specify the schema name followed by the key to apply the schema name to"
+
+#: gconf/gconftool.c:409
+msgid "Remove any schema name applied to the given keys"
+msgstr "Remove any schema name applied to the given keys"
+
+#: gconf/gconftool.c:418
+msgid "Get the name of the default source"
+msgstr "Get the name of the default source"
+
+#: gconf/gconftool.c:427
+msgid "Print version"
+msgstr "Print version"
+
+#: gconf/gconftool.c:524
+msgid "Can't get and set/unset simultaneously\n"
+msgstr "Can't get and set/unset simultaneously\n"
+
+#: gconf/gconftool.c:534
+msgid "Can't set and get/unset simultaneously\n"
+msgstr "Can't set and get/unset simultaneously\n"
+
+#: gconf/gconftool.c:541
+msgid "Can't get type and set/unset simultaneously\n"
+msgstr "Can't get type and set/unset simultaneously\n"
+
+#: gconf/gconftool.c:552
+msgid "Can't use --all-entries with --get or --set\n"
+msgstr "Can't use --all-entries with --get or --set\n"
+
+#: gconf/gconftool.c:563
+msgid "Can't use --all-dirs with --get or --set\n"
+msgstr "Can't use --all-dirs with --get or --set\n"
+
+#: gconf/gconftool.c:576
+msgid ""
+"--recursive-list should not be used with --get, --set, --unset, --all-"
+"entries, or --all-dirs\n"
+msgstr ""
+"--recursive-list should not be used with --get, --set, --unset, --all-"
+"entries, or --all-dirs\n"
+
+#: gconf/gconftool.c:589
+msgid ""
+"--set_schema should not be used with --get, --set, --unset, --all-entries, --"
+"all-dirs\n"
+msgstr ""
+"--set_schema should not be used with --get, --set, --unset, --all-entries, --"
+"all-dirs\n"
+
+#: gconf/gconftool.c:595
+msgid "Value type is only relevant when setting a value\n"
+msgstr "Value type is only relevant when setting a value\n"
+
+#: gconf/gconftool.c:601
+msgid "Must specify a type when setting a value\n"
+msgstr "Must specify a type when setting a value\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 "%s option must be used by itself.\n"
+
+#: gconf/gconftool.c:702
+msgid ""
+"You must specify a config source with --config-source when using --direct\n"
+msgstr ""
+"You must specify a config source with --config-source when using --direct\n"
+
+#: gconf/gconftool.c:708
+msgid "You should use --direct when using a non-default configuration source\n"
+msgstr ""
+"You should use --direct when using a non-default configuration source\n"
+
+#: gconf/gconftool.c:714
+#, c-format
+msgid "Failed to init GConf: %s\n"
+msgstr "Failed to init 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 is set, not installing schemas\n"
+
+#: gconf/gconftool.c:750
+msgid ""
+"GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL is set, not uninstalling schemas\n"
+msgstr ""
+"GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL is set, not uninstalling schemas\n"
+
+#: gconf/gconftool.c:763
+msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
+msgstr "Must set the GCONF_CONFIG_SOURCE environment variable\n"
+
+#: gconf/gconftool.c:792
+#, c-format
+msgid "Failed to access configuration source(s): %s\n"
+msgstr "Failed to access configuration source(s): %s\n"
+
+#: gconf/gconftool.c:1077
+#, c-format
+msgid "Shutdown error: %s\n"
+msgstr "Shutdown error: %s\n"
+
+#: gconf/gconftool.c:1120
+msgid "Must specify one or more directories to recursively list.\n"
+msgstr "Must specify one or more directories to recursively list.\n"
+
+#: gconf/gconftool.c:1172
+msgid "Must specify one or more directories to dump.\n"
+msgstr "Must specify one or more directories to dump.\n"
+
+#: gconf/gconftool.c:1214 gconf/gconftool.c:1479
+#, c-format
+msgid "Failure listing entries in `%s': %s\n"
+msgstr "Failure listing entries in `%s': %s\n"
+
+#: gconf/gconftool.c:1232
+msgid "(no value set)"
+msgstr "(no value set)"
+
+#: gconf/gconftool.c:1537
+#, c-format
+msgid "Failed to spawn the config server (gconfd): %s\n"
+msgstr "Failed to spawn the config server (gconfd): %s\n"
+
+#: gconf/gconftool.c:1551
+msgid "Must specify a key or keys to get\n"
+msgstr "Must specify a key or keys to get\n"
+
+#: gconf/gconftool.c:1586
+#, c-format
+msgid "Type: %s\n"
+msgstr "Type: %s\n"
+
+#: gconf/gconftool.c:1587
+#, c-format
+msgid "List Type: %s\n"
+msgstr "List Type: %s\n"
+
+#: gconf/gconftool.c:1588
+#, c-format
+msgid "Car Type: %s\n"
+msgstr "Car Type: %s\n"
+
+#: gconf/gconftool.c:1589
+#, c-format
+msgid "Cdr Type: %s\n"
+msgstr "Cdr Type: %s\n"
+
+#: gconf/gconftool.c:1594
+#, c-format
+msgid "Default Value: %s\n"
+msgstr "Default Value: %s\n"
+
+#: gconf/gconftool.c:1594 gconf/gconftool.c:1596 gconf/gconftool.c:1597
+#: gconf/gconftool.c:1598
+msgid "Unset"
+msgstr "Unset"
+
+#: gconf/gconftool.c:1596
+#, c-format
+msgid "Owner: %s\n"
+msgstr "Owner: %s\n"
+
+#: gconf/gconftool.c:1597
+#, c-format
+msgid "Short Desc: %s\n"
+msgstr "Short Desc: %s\n"
+
+#: gconf/gconftool.c:1598
+#, c-format
+msgid "Long Desc: %s\n"
+msgstr "Long Desc: %s\n"
+
+#: 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 "No value set for `%s'\n"
+
+#: 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 "Failed to get value for `%s': %s\n"
+
+#: gconf/gconftool.c:1654 gconf/gconftool.c:1666
+#, c-format
+msgid "Don't understand type `%s'\n"
+msgstr "Don't understand type `%s'\n"
+
+#: gconf/gconftool.c:1678
+msgid "Must specify alternating keys/values as arguments\n"
+msgstr "Must specify alternating keys/values as arguments\n"
+
+#: gconf/gconftool.c:1698
+#, c-format
+msgid "No value to set for key: `%s'\n"
+msgstr "No value to set for key: `%s'\n"
+
+#: gconf/gconftool.c:1726
+msgid "Cannot set schema as value\n"
+msgstr "Cannot set schema as value\n"
+
+#: gconf/gconftool.c:1736
+msgid "When setting a list you must specify a primitive list-type\n"
+msgstr "When setting a list you must specify a primitive list-type\n"
+
+#: gconf/gconftool.c:1750
+msgid ""
+"When setting a pair you must specify a primitive car-type and cdr-type\n"
+msgstr ""
+"When setting a pair you must specify a primitive car-type and cdr-type\n"
+
+#: gconf/gconftool.c:1765
+#, c-format
+msgid "Error: %s\n"
+msgstr "Error: %s\n"
+
+#: gconf/gconftool.c:1778 gconf/gconftool.c:2806
+#, c-format
+msgid "Error setting value: %s\n"
+msgstr "Error setting value: %s\n"
+
+#: gconf/gconftool.c:1796
+#, c-format
+msgid "Error syncing: %s\n"
+msgstr "Error syncing: %s\n"
+
+#: gconf/gconftool.c:1811
+msgid "Must specify a key or keys to get type\n"
+msgstr "Must specify a key or keys to get type\n"
+
+#: gconf/gconftool.c:1855
+msgid "Must specify a key to lookup size of.\n"
+msgstr "Must specify a key to lookup size of.\n"
+
+#: gconf/gconftool.c:1880 gconf/gconftool.c:1925
+#, c-format
+msgid "Key %s is not a list.\n"
+msgstr "Key %s is not a list.\n"
+
+#: gconf/gconftool.c:1900
+msgid "Must specify a key from which to get list element.\n"
+msgstr "Must specify a key from which to get list element.\n"
+
+#: gconf/gconftool.c:1931
+msgid "Must specify list index.\n"
+msgstr "Must specify list index.\n"
+
+#: gconf/gconftool.c:1938
+msgid "List index must be non-negative.\n"
+msgstr "List index must be non-negative.\n"
+
+#: gconf/gconftool.c:1947
+msgid "List index is out of bounds.\n"
+msgstr "List index is out of bounds.\n"
+
+#: gconf/gconftool.c:1973
+msgid "Must specify a key or keys on the command line\n"
+msgstr "Must specify a key or keys on the command line\n"
+
+#: gconf/gconftool.c:1993
+#, c-format
+msgid "No schema known for `%s'\n"
+msgstr "No schema known for `%s'\n"
+
+#: gconf/gconftool.c:2026
+#, c-format
+msgid "No doc string stored in schema at '%s'\n"
+msgstr "No doc string stored in schema at '%s'\n"
+
+#: gconf/gconftool.c:2031
+#, c-format
+msgid "Error getting schema at '%s': %s\n"
+msgstr "Error getting schema at '%s': %s\n"
+
+#: gconf/gconftool.c:2038
+#, c-format
+msgid "No schema stored at '%s'\n"
+msgstr "No schema stored at '%s'\n"
+
+#: gconf/gconftool.c:2041
+#, c-format
+msgid "Value at '%s' is not a schema\n"
+msgstr "Value at '%s' is not a schema\n"
+
+#: gconf/gconftool.c:2097
+msgid "Must specify a schema name followed by the key name to apply it to\n"
+msgstr "Must specify a schema name followed by the key name to apply it to\n"
+
+#: gconf/gconftool.c:2104
+#, c-format
+msgid "Error associating schema name '%s' with key name '%s': %s\n"
+msgstr "Error associating schema name '%s' with key name '%s': %s\n"
+
+#: gconf/gconftool.c:2122
+msgid "Must specify keys to unapply schema from\n"
+msgstr "Must specify keys to unapply schema from\n"
+
+#: gconf/gconftool.c:2132
+#, c-format
+msgid "Error removing schema name from '%s': %s\n"
+msgstr "Error removing schema name from '%s': %s\n"
+
+#: gconf/gconftool.c:2157
+msgid "Must specify key (schema name) as the only argument\n"
+msgstr "Must specify key (schema name) as the only argument\n"
+
+#: gconf/gconftool.c:2199
+msgid "List type must be a primitive type: string, int, float or bool\n"
+msgstr "List type must be a primitive type: string, int, float or bool\n"
+
+#: gconf/gconftool.c:2219
+msgid "Pair car type must be a primitive type: string, int, float or bool\n"
+msgstr "Pair car type must be a primitive type: string, int, float or bool\n"
+
+#: gconf/gconftool.c:2239
+msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
+msgstr "Pair cdr type must be a primitive type: string, int, float or bool\n"
+
+#: gconf/gconftool.c:2254
+#, c-format
+msgid "Error setting value: %s"
+msgstr "Error setting value: %s"
+
+#: gconf/gconftool.c:2268
+#, c-format
+msgid "Error syncing: %s"
+msgstr "Error syncing: %s"
+
+#: gconf/gconftool.c:2283
+msgid "Must specify one or more directories to get key/value pairs from.\n"
+msgstr "Must specify one or more directories to get key/value pairs from.\n"
+
+#: gconf/gconftool.c:2297
+msgid "Must specify one or more keys to unset.\n"
+msgstr "Must specify one or more keys to unset.\n"
+
+#: gconf/gconftool.c:2308
+#, c-format
+msgid "Error unsetting `%s': %s\n"
+msgstr "Error unsetting `%s': %s\n"
+
+#: gconf/gconftool.c:2328
+msgid "Must specify one or more keys to recursively unset.\n"
+msgstr "Must specify one or more keys to recursively unset.\n"
+
+#: gconf/gconftool.c:2342
+#, c-format
+msgid "Failure during recursive unset of \"%s\": %s\n"
+msgstr "Failure during recursive unset of \"%s\": %s\n"
+
+#: gconf/gconftool.c:2362
+msgid "Must specify one or more directories to get subdirs from.\n"
+msgstr "Must specify one or more directories to get subdirs from.\n"
+
+#: gconf/gconftool.c:2396
+#, c-format
+msgid "Error listing dirs: %s\n"
+msgstr "Error listing dirs: %s\n"
+
+#: gconf/gconftool.c:2532
+msgid "WARNING: must specify both a <car> and a <cdr> in a <pair>\n"
+msgstr "WARNING: must specify both a <car> and a <cdr> in a <pair>\n"
+
+#: gconf/gconftool.c:2559
+#, c-format
+msgid "WARNING: key specified (%s) for schema under a <value> - ignoring\n"
+msgstr "WARNING: key specified (%s) for schema under a <value> - ignoring\n"
+
+#: gconf/gconftool.c:2592
+msgid "WARNING: must have a child node under <value>\n"
+msgstr "WARNING: must have a child node under <value>\n"
+
+#: gconf/gconftool.c:2598
+#, c-format
+msgid "WARNING: node <%s> not understood\n"
+msgstr "WARNING: node <%s> not understood\n"
+
+#: gconf/gconftool.c:2616
+#, c-format
+msgid "WARNING: Failed to parse int value `%s'\n"
+msgstr "WARNING: Failed to parse int value `%s'\n"
+
+#: gconf/gconftool.c:2637
+#, c-format
+msgid "WARNING: Failed to parse float value `%s'\n"
+msgstr "WARNING: Failed to parse float value `%s'\n"
+
+#: gconf/gconftool.c:2659
+#, c-format
+msgid "WARNING: Failed to parse string value `%s'\n"
+msgstr "WARNING: Failed to parse string value `%s'\n"
+
+#: gconf/gconftool.c:2680
+#, c-format
+msgid "WARNING: Failed to parse boolean value `%s'\n"
+msgstr "WARNING: Failed to parse boolean value `%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 "WARNING: failed to associate schema `%s' with key `%s': %s\n"
+
+#: gconf/gconftool.c:2901
+#, c-format
+msgid "WARNING: invalid or missing type for schema (%s)\n"
+msgstr "WARNING: invalid or missing type for schema (%s)\n"
+
+#: gconf/gconftool.c:2910
+#, c-format
+msgid "WARNING: invalid or missing list_type for schema (%s)\n"
+msgstr "WARNING: invalid or missing list_type for 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 "WARNING: Failed to parse default value `%s' for schema (%s)\n"
+
+#: gconf/gconftool.c:2939
+#, c-format
+msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
+msgstr "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
+
+#: gconf/gconftool.c:2964
+msgid "WARNING: You cannot set a default value for a schema\n"
+msgstr "WARNING: You cannot set a default value for a schema\n"
+
+#: gconf/gconftool.c:2993
+msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
+msgstr "WARNING: gconftool internal error, unknown GConfValueType\n"
+
+#: 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 "WARNING: failed to parse type name `%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 ""
+"WARNING: list_type can only be int, float, string or bool and not `%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 ""
+"WARNING: car_type can only be int, float, string or bool and not `%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 ""
+"WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
+
+#: gconf/gconftool.c:3140
+msgid "WARNING: empty <applyto> node"
+msgstr "WARNING: empty <applyto> node"
+
+#: gconf/gconftool.c:3143 gconf/gconftool.c:3405
+#, c-format
+msgid "WARNING: node <%s> not understood below <schema>\n"
+msgstr "WARNING: node <%s> not understood below <schema>\n"
+
+#: gconf/gconftool.c:3154
+msgid "WARNING: no <list_type> specified for schema of type list\n"
+msgstr "WARNING: no <list_type> specified for schema of type list\n"
+
+#: gconf/gconftool.c:3160
+msgid "WARNING: no <car_type> specified for schema of type pair\n"
+msgstr "WARNING: no <car_type> specified for schema of type pair\n"
+
+#: gconf/gconftool.c:3166
+msgid "WARNING: no <cdr_type> specified for schema of type pair\n"
+msgstr "WARNING: no <cdr_type> specified for schema of type pair\n"
+
+#: gconf/gconftool.c:3195
+msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
+msgstr "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
+
+#: gconf/gconftool.c:3201
+#, c-format
+msgid ""
+"WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
+msgstr ""
+"WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
+
+#: gconf/gconftool.c:3299
+#, c-format
+msgid "WARNING: Invalid node <%s> in a <locale> node\n"
+msgstr "WARNING: Invalid node <%s> in a <locale> node\n"
+
+#: gconf/gconftool.c:3340
+#, c-format
+msgid "Attached schema `%s' to key `%s'\n"
+msgstr "Attached schema `%s' to key `%s'\n"
+
+#: gconf/gconftool.c:3414
+msgid "You must have at least one <locale> entry in a <schema>\n"
+msgstr "You must have at least one <locale> entry in a <schema>\n"
+
+#: gconf/gconftool.c:3446
+#, c-format
+msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
+msgstr "WARNING: failed to install schema `%s' locale `%s': %s\n"
+
+#: gconf/gconftool.c:3454
+#, c-format
+msgid "Installed schema `%s' for locale `%s'\n"
+msgstr "Installed schema `%s' for locale `%s'\n"
+
+#: gconf/gconftool.c:3478
+#, c-format
+msgid "WARNING: failed to uninstall schema `%s' locale `%s': %s\n"
+msgstr "WARNING: failed to uninstall schema `%s' locale `%s': %s\n"
+
+#: gconf/gconftool.c:3486
+#, c-format
+msgid "Uninstalled schema `%s' from locale `%s'\n"
+msgstr "Uninstalled schema `%s' from locale `%s'\n"
+
+#: gconf/gconftool.c:3524
+msgid "WARNING: no key specified for schema\n"
+msgstr "WARNING: no key specified for schema\n"
+
+#: gconf/gconftool.c:3565
+#, c-format
+msgid "WARNING: node <%s> not understood below <%s>\n"
+msgstr "WARNING: node <%s> not understood below <%s>\n"
+
+#: gconf/gconftool.c:3596
+#, c-format
+msgid "Failed to open `%s': %s\n"
+msgstr "Failed to open `%s': %s\n"
+
+#: gconf/gconftool.c:3603
+#, c-format
+msgid "Document `%s' is empty?\n"
+msgstr "Document `%s' is empty?\n"
+
+#: gconf/gconftool.c:3615
+#, c-format
+msgid "Document `%s' has the wrong type of root node (<%s>, should be <%s>)\n"
+msgstr "Document `%s' has the wrong type of root node (<%s>, should be <%s>)\n"
+
+#: gconf/gconftool.c:3628
+#, c-format
+msgid "Document `%s' has no top level <%s> node\n"
+msgstr "Document `%s' has no top level <%s> node\n"
+
+#: gconf/gconftool.c:3642
+#, c-format
+msgid "WARNING: node <%s> below <%s> not understood\n"
+msgstr "WARNING: node <%s> below <%s> not understood\n"
+
+#: gconf/gconftool.c:3653 gconf/gconftool.c:3688 gconf/gconftool.c:3720
+#, c-format
+msgid "Error syncing config data: %s"
+msgstr "Error syncing config data: %s"
+
+#: gconf/gconftool.c:3672
+msgid "Must specify some schema files to install\n"
+msgstr "Must specify some schema files to install\n"
+
+#: gconf/gconftool.c:3704
+msgid "Must specify some schema files to uninstall\n"
+msgstr "Must specify some schema files to uninstall\n"
+
+#: gconf/gconftool.c:3741
+#, c-format
+msgid ""
+"\n"
+"%s\n"
+msgstr ""
+"\n"
+"%s\n"
+
+#: gconf/gconftool.c:3761
+#, c-format
+msgid "Failed to unset breakage key %s: %s\n"
+msgstr "Failed to unset breakage key %s: %s\n"
+
+#: gconf/gconftool.c:3887
+msgid "Must specify some keys to break\n"
+msgstr "Must specify some keys to break\n"
+
+#: gconf/gconftool.c:3893
+#, c-format
+msgid ""
+"Trying to break your application by setting bad values for key:\n"
+"  %s\n"
+msgstr ""
+"Trying to break your application by setting bad values for key:\n"
+"  %s\n"
+
+#: gconf/gconftool.c:3911
+msgid "Must specify some directories to break\n"
+msgstr "Must specify some directories to break\n"
+
+#: gconf/gconftool.c:3930
+#, c-format
+msgid ""
+"Trying to break your application by setting bad values for keys in "
+"directory:\n"
+"  %s\n"
+msgstr ""
+"Trying to break your application by setting bad values for keys in "
+"directory:\n"
+"  %s\n"
+
+#~ msgid "Cannot find directory %s\n"
+#~ msgstr "Cannot find directory %s\n"
+
+#~ msgid "Error saving GConf tree to '%s': %s\n"
+#~ msgstr "Error saving GConf tree to '%s': %s\n"
+
+#~ msgid "Usage: %s <dir>\n"
+#~ msgstr "Usage: %s <dir>\n"
+
+#~ 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 ""
+#~ "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"
+
+#~ msgid "Received invalid value in set request"
+#~ msgstr "Received invalid value in set request"
+
+#~ msgid ""
+#~ "Couldn't make sense of CORBA value received in set request for key `%s'"
+#~ msgstr ""
+#~ "Couldn't make sense of CORBA value received in set request for key `%s'"
+
+#~ msgid "Received request to drop all cached data"
+#~ msgstr "Received request to drop all cached data"
+
+#~ msgid "Received request to sync synchronously"
+#~ msgstr "Received request to sync synchronously"
+
+#~ msgid "Fatal error: failed to get object reference for ConfigDatabase"
+#~ msgstr "Fatal error: failed to get object reference for ConfigDatabase"
+
+#~ msgid ""
+#~ "Failed to log addition of listener %s (%s);will not be able to restore "
+#~ "this listener on gconfd restart, resulting in unreliable notification of "
+#~ "configuration changes."
+#~ msgstr ""
+#~ "Failed to log addition of listener %s (%s);will not be able to restore "
+#~ "this listener on gconfd restart, resulting in unreliable notification of "
+#~ "configuration changes."
+
+#~ msgid "Listener ID %lu doesn't exist"
+#~ msgstr "Listener ID %lu doesn't exist"
+
+#~ msgid ""
+#~ "Failed to log removal of listener to logfile (most likely harmless, may "
+#~ "result in a notification weirdly reappearing): %s"
+#~ msgstr ""
+#~ "Failed to log removal of listener to logfile (most likely harmless, may "
+#~ "result in a notification strangely reappearing): %s"
+
+#~ msgid "Invalid UTF-8 in string value in '%s'"
+#~ msgstr "Invalid UTF-8 in string value in '%s'"
+
+#~ msgid "Couldn't interpret CORBA value for list element"
+#~ msgstr "Couldn't interpret CORBA value for list element"
+
+#~ msgid "Incorrect type for list element in %s"
+#~ msgstr "Incorrect type for list element in %s"
+
+#~ msgid "Received list from gconfd with a bad list type"
+#~ msgstr "Received list from gconfd with a bad list type"
+
+#~ msgid "Failed to convert object to IOR"
+#~ msgstr "Failed to convert object to IOR"
+
+#~ msgid "Invalid UTF-8 in locale for schema"
+#~ msgstr "Invalid UTF-8 in locale for schema"
+
+#~ msgid "Invalid UTF-8 in short description for schema"
+#~ msgstr "Invalid UTF-8 in short description for schema"
+
+#~ msgid "Invalid UTF-8 in long description for schema"
+#~ msgstr "Invalid UTF-8 in long description for schema"
+
+#~ msgid "Invalid UTF-8 in owner for schema"
+#~ msgstr "Invalid UTF-8 in owner for schema"
+
+#~ msgid "Server ping error: %s"
+#~ msgstr "Server ping error: %s"
+
+#~ msgid ""
+#~ "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
+#~ msgstr ""
+#~ "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
+
+#~ msgid "Failed to launch configuration server: %s\n"
+#~ msgstr "Failed to launch configuration server: %s\n"
+
+#~ msgid ""
+#~ "Failed to contact configuration server; some possible causes are that you "
+#~ "need to enable TCP/IP networking for ORBit, or you have stale NFS locks "
+#~ "due to a system crash. See http://www.gnome.org/projects/gconf/ for "
+#~ "information. (Details - %s)"
+#~ msgstr ""
+#~ "Failed to contact configuration server; some possible causes are that you "
+#~ "need to enable TCP/IP networking for ORBit, or you have stale NFS locks "
+#~ "due to a system crash. See http://www.gnome.org/projects/gconf/ for "
+#~ "information. (Details - %s)"
+
+#~ msgid "none"
+#~ msgstr "none"
+
+#~ msgid "Server couldn't resolve the address `%s'"
+#~ msgstr "Server couldn't resolve the address `%s'"
+
+#~ msgid "Can't add notifications to a local configuration source"
+#~ msgstr "Can't add notifications to a local configuration source"
+
+#~ msgid "Adding client to server's list failed, CORBA error: %s"
+#~ msgstr "Adding client to server's list failed, CORBA error: %s"
+
+#~ msgid "Failure shutting down config server: %s"
+#~ msgstr "Failure shutting down config server: %s"
+
+#~ msgid "CORBA error: %s"
+#~ msgstr "CORBA error: %s"
+
+#~ msgid "Shutdown request received"
+#~ msgstr "Shutdown request received"
+
+#~ msgid "Failed to get object reference for ConfigServer"
+#~ msgstr "Failed to get object reference for ConfigServer"
+
+#~ msgid "Returning exception: %s"
+#~ msgstr "Returning exception: %s"
+
+#~ msgid ""
+#~ "Failed to open gconfd logfile; won't be able to restore listeners after "
+#~ "gconfd shutdown (%s)"
+#~ msgstr ""
+#~ "Failed to open gconfd logfile; won't be able to restore listeners after "
+#~ "gconfd shutdown (%s)"
+
+#~ msgid ""
+#~ "Failed to close gconfd logfile; data may not have been properly saved (%s)"
+#~ msgstr ""
+#~ "Failed to close gconfd logfile; data may not have been properly saved (%s)"
+
+#~ msgid "Could not open saved state file '%s' for writing: %s"
+#~ msgstr "Could not open saved state file '%s' for writing: %s"
+
+#~ msgid "Could not write saved state file '%s' fd: %d: %s"
+#~ msgstr "Could not write saved state file '%s' fd: %d: %s"
+
+#~ msgid "Failed to close new saved state file '%s': %s"
+#~ msgstr "Failed to close new saved state file '%s': %s"
+
+#~ msgid "Could not move aside old saved state file '%s': %s"
+#~ msgstr "Could not move aside old saved state file '%s': %s"
+
+#~ msgid "Failed to move new save state file into place: %s"
+#~ msgstr "Failed to move new save state file into place: %s"
+
+#~ msgid ""
+#~ "Failed to restore original saved state file that had been moved to '%s': %"
+#~ "s"
+#~ msgstr ""
+#~ "Failed to restore original saved state file that had been moved to '%s': %"
+#~ "s"
+
+#~ msgid ""
+#~ "Unable to restore a listener on address '%s', couldn't resolve the "
+#~ "database"
+#~ msgstr ""
+#~ "Unable to restore a listener on address '%s', couldn't resolve the "
+#~ "database"
+
+#~ msgid "Error reading saved state file: %s"
+#~ msgstr "Error reading saved state file: %s"
+
+#~ msgid "Unable to open saved state file '%s': %s"
+#~ msgstr "Unable to open saved state file '%s': %s"
+
+#~ msgid ""
+#~ "Failed to log addition of listener to gconfd logfile; won't be able to re-"
+#~ "add the listener if gconfd exits or shuts down (%s)"
+#~ msgstr ""
+#~ "Failed to log addition of listener to gconfd logfile; won't be able to re-"
+#~ "add the listener if gconfd exits or shuts down (%s)"
+
+#~ msgid ""
+#~ "Failed to log removal of listener to gconfd logfile; might erroneously re-"
+#~ "add the listener if gconfd exits or shuts down (%s)"
+#~ msgstr ""
+#~ "Failed to log removal of listener to gconfd logfile; might erroneously re-"
+#~ "add the listener if gconfd exits or shuts down (%s)"
+
+#~ msgid "Failed to get IOR for client: %s"
+#~ msgstr "Failed to get IOR for client: %s"
+
+#~ msgid "Failed to open saved state file: %s"
+#~ msgstr "Failed to open saved state file: %s"
+
+#~ msgid "Failed to write client add to saved state file: %s"
+#~ msgstr "Failed to write client add to saved state file: %s"
+
+#~ msgid "Failed to flush client add to saved state file: %s"
+#~ msgstr "Failed to flush client add to saved state file: %s"
+
+#~ msgid ""
+#~ "Some client removed itself from the GConf server when it hadn't been "
+#~ "added."
+#~ msgstr ""
+#~ "A client removed itself from the GConf server when it hadn't been added."
diff --git a/po/ga.po b/po/ga.po
index 3eeb00c3..0b6d37f4 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -6,9 +6,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GConf.pot HEAD\n"
 "POT-Creation-Date: 2003-12-05 00:37+0100\n"
-"PO-Revision-Date: 2004-01-13 18:23+0000\n"
+"PO-Revision-Date: 2004-03-08  18:23+0000\n"
 "Last-Translator:  Alastair McKinstry <mckinstry@computer.org>\n"
-"Language-Team: Irish <ga@li.org>\n"
+"Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -22,7 +22,7 @@ msgstr ""
 #: backends/dir-utils.c:124 backends/xml-backend.c:332
 #, c-format
 msgid "Could not make directory `%s': %s"
-msgstr ""
+msgstr "Teip ag cruthaigh eolaire '%s': %s"
 
 #: backends/dir-utils.c:212
 #, c-format
@@ -68,7 +68,7 @@ msgstr ""
 #: backends/xml-backend.c:788
 #, c-format
 msgid "Could not remove file %s: %s\n"
-msgstr ""
+msgstr "Teip ag scr;ios comhad %s: %s\n"
 
 #: backends/xml-backend.c:809
 msgid "Initializing XML backend module"
@@ -93,22 +93,22 @@ msgstr ""
 #: backends/xml-dir.c:171
 #, c-format
 msgid "Could not stat `%s': %s"
-msgstr ""
+msgstr "Teip ag 'stat' '%s': %s"
 
 #: backends/xml-dir.c:181
 #, c-format
 msgid "XML filename `%s' is a directory"
-msgstr ""
+msgstr "Is eolaire an t-ainm comhad '%s'"
 
 #: backends/xml-dir.c:416 backends/xml-dir.c:425
 #, c-format
 msgid "Failed to delete \"%s\": %s"
-msgstr ""
+msgstr "Teip ag dealaigh \"%s\": %s"
 
 #: backends/xml-dir.c:471
 #, c-format
 msgid "Failed to write file `%s': %s"
-msgstr ""
+msgstr "Teip ag scríobh comhad '%s': %s"
 
 #: backends/xml-dir.c:484
 #, c-format
@@ -118,17 +118,17 @@ msgstr ""
 #: backends/xml-dir.c:494
 #, c-format
 msgid "Failed to write XML data to `%s': %s"
-msgstr ""
+msgstr "Teip ag scríobh sonraí XML do '%s': %s"
 
 #: backends/xml-dir.c:504 backends/xml-dir.c:1279
 #, c-format
 msgid "Failed to close file `%s': %s"
-msgstr ""
+msgstr "Teip ag dúnadh comhad '%s': %s"
 
 #: backends/xml-dir.c:520 backends/xml-dir.c:530
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
-msgstr ""
+msgstr "Teip ag athainmigh '%s' do '%s': %s"
 
 #: backends/xml-dir.c:536
 #, c-format
@@ -138,13 +138,13 @@ msgstr ""
 #: backends/xml-dir.c:548
 #, c-format
 msgid "Failed to delete old file `%s': %s"
-msgstr ""
+msgstr "Teip ag dealaigh sean-comhad '%s': %s"
 
 #. These are all fatal errors
 #: backends/xml-dir.c:978
 #, c-format
 msgid "Failed to stat `%s': %s"
-msgstr ""
+msgstr "Teip ag stat() '%s': %s"
 
 #: backends/xml-dir.c:1152
 #, c-format
@@ -164,12 +164,12 @@ msgstr ""
 #: backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
-msgstr ""
+msgstr "Teip ag deánamh eolaire \"%s\": %s"
 
 #: backends/xml-dir.c:1271
 #, c-format
 msgid "Failed to create file `%s': %s"
-msgstr ""
+msgstr "Teip ag cruthaigh comhad '%s': %s"
 
 #: backends/xml-dir.c:1370
 #, c-format
@@ -223,7 +223,7 @@ msgstr ""
 #: backends/xml-entry.c:1086
 #, c-format
 msgid "Bad XML node: %s"
-msgstr ""
+msgstr "Droch nód XML: %s"
 
 #: backends/xml-entry.c:1094
 #, c-format
@@ -269,7 +269,7 @@ msgstr ""
 #: gconf/gconf-backend.c:167
 #, c-format
 msgid "No such file `%s'\n"
-msgstr ""
+msgstr "Níl aon comhad '%s'\n"
 
 #: gconf/gconf-backend.c:195
 #, c-format
@@ -283,7 +283,7 @@ msgstr ""
 #: gconf/gconf-backend.c:230
 #, c-format
 msgid "Error opening module `%s': %s\n"
-msgstr ""
+msgstr "Teip ag oscailt modúil '%s': %s\n"
 
 #: gconf/gconf-backend.c:262
 #, c-format
@@ -317,7 +317,7 @@ msgstr ""
 #: gconf/gconf-database.c:241 gconf/gconf-sources.c:1541
 #, c-format
 msgid "Error getting value for `%s': %s"
-msgstr ""
+msgstr "Teip ag tógtha luach do '%s': %s"
 
 #: gconf/gconf-database.c:287
 #, c-format
@@ -436,28 +436,28 @@ msgstr ""
 #: gconf/gconf-internals.c:67
 #, c-format
 msgid "No '/' in key \"%s\""
-msgstr ""
+msgstr "Ná '/' san eochar \"%s\""
 
 #: gconf/gconf-internals.c:337
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
-msgstr ""
+msgstr "Teip ag oscailt comhaad san slí '%s': %s\n"
 
 #: gconf/gconf-internals.c:386
 #, c-format
 msgid "Adding source `%s'\n"
-msgstr ""
+msgstr "Ag suimigh foinse '%s'\n"
 
 #: gconf/gconf-internals.c:398
 #, c-format
 msgid "Read error on file `%s': %s\n"
-msgstr ""
+msgstr "Teip ag leámh comhad '%s': %s\n"
 
 #: gconf/gconf-internals.c:702 gconf/gconf-internals.c:768
 #: gconf/gconf-value.c:154 gconf/gconf-value.c:253 gconf/gconf-value.c:395
 #: gconf/gconf-value.c:1681
 msgid "Text contains invalid UTF-8"
-msgstr ""
+msgstr "Tá UTF-8 neamhbháilí san teacs"
 
 #: gconf/gconf-internals.c:853
 #, c-format
@@ -528,7 +528,7 @@ msgstr ""
 #: gconf/gconf-internals.c:2023
 #, c-format
 msgid "Failed to create or open '%s'"
-msgstr ""
+msgstr "Teip ag cruthaigh nó oscailt '%s'"
 
 #: gconf/gconf-internals.c:2033
 #, c-format
@@ -545,7 +545,7 @@ msgstr ""
 #: gconf/gconf-internals.c:2138
 #, c-format
 msgid "Failed to link '%s' to '%s': %s"
-msgstr ""
+msgstr "Teip ag ceangal '%s' do '%s': %s"
 
 #: gconf/gconf-internals.c:2150
 #, c-format
@@ -555,22 +555,22 @@ msgstr ""
 #: gconf/gconf-internals.c:2169
 #, c-format
 msgid "Failed to clean up file '%s': %s"
-msgstr ""
+msgstr "Téip ag glan comhad '%s': %s"
 
 #: gconf/gconf-internals.c:2183
 #, c-format
 msgid "Failed to remove lock directory `%s': %s"
-msgstr ""
+msgstr "Teip ag scríos an t-eolaire glasal '%s': %s"
 
 #: gconf/gconf-internals.c:2220
 #, c-format
 msgid "couldn't create directory `%s': %s"
-msgstr ""
+msgstr "Teip ag cruthaigh eolaire '%s': %s"
 
 #: gconf/gconf-internals.c:2279
 #, c-format
 msgid "Can't write to file `%s': %s"
-msgstr ""
+msgstr "Teip ag scríobh do comhad '%s': %s"
 
 #: gconf/gconf-internals.c:2323
 #, c-format
@@ -612,7 +612,7 @@ msgstr ""
 #: gconf/gconf-sanity-check.c:200
 #, c-format
 msgid "Can't remove file %s: %s\n"
-msgstr ""
+msgstr "Teip ag scríosadh comhad %s: %s\n"
 
 #: gconf/gconf-sanity-check.c:236
 #, c-format
@@ -678,7 +678,7 @@ msgstr ""
 #: gconf/gconf-sources.c:319
 #, c-format
 msgid "Failed to load source \"%s\": %s"
-msgstr ""
+msgstr "Teip ag lódáil buncód \"%s\": %s"
 
 #: gconf/gconf-sources.c:346
 #, c-format
@@ -817,12 +817,12 @@ msgstr ""
 #: gconf/gconf.c:44
 #, c-format
 msgid "Key \"%s\" is NULL"
-msgstr ""
+msgstr "Is NULL an eochar \"%s\""
 
 #: gconf/gconf.c:51
 #, c-format
 msgid "\"%s\": %s"
-msgstr ""
+msgstr "\"%s: %s"
 
 #: gconf/gconf.c:116
 msgid "Must begin with a slash (/)"
@@ -933,12 +933,12 @@ msgstr ""
 #: gconf/gconfd.c:341
 #, c-format
 msgid "Failed to open %s: %s"
-msgstr ""
+msgstr "Teip ag oscailt %s: %s"
 
 #: gconf/gconfd.c:348
 #, c-format
 msgid "Failed to stat %s: %s"
-msgstr ""
+msgstr "Teip ag 'stat' %s: %s"
 
 #: gconf/gconfd.c:357
 #, c-format
@@ -955,12 +955,12 @@ msgstr ""
 #: gconf/gconfd.c:445
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
-msgstr ""
+msgstr "ag tosnú (leagan %s), pid %u úsáideoir '%s'"
 
 #: gconf/gconfd.c:484
 #, c-format
 msgid "Failed to create %s: %s"
-msgstr ""
+msgstr "Teip ag cruthaigh %s: %s"
 
 #: gconf/gconfd.c:492
 #, c-format
@@ -1194,7 +1194,7 @@ msgstr ""
 
 #: gconf/gconftool.c:427
 msgid "Print version"
-msgstr ""
+msgstr "Taispeán leagan"
 
 #: gconf/gconftool.c:524
 msgid "Can't get and set/unset simultaneously\n"
@@ -1255,7 +1255,7 @@ msgstr ""
 #: gconf/gconftool.c:714
 #, c-format
 msgid "Failed to init GConf: %s\n"
-msgstr ""
+msgstr "Teip ag tosaigh GConf: %s\n"
 
 #: gconf/gconftool.c:743
 msgid "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, not installing schemas\n"
@@ -1344,12 +1344,12 @@ msgstr "Úinéar: %s\n"
 #: gconf/gconftool.c:1597
 #, c-format
 msgid "Short Desc: %s\n"
-msgstr ""
+msgstr "Tuarascail: %s\n"
 
 #: gconf/gconftool.c:1598
 #, c-format
 msgid "Long Desc: %s\n"
-msgstr ""
+msgstr "Tuarascail fhada: %s\n"
 
 #: gconf/gconftool.c:1607 gconf/gconftool.c:1831 gconf/gconftool.c:1865
 #: gconf/gconftool.c:1910 gconf/gconftool.c:2055
@@ -1780,5 +1780,20 @@ msgid ""
 "  %s\n"
 msgstr ""
 
+#~ msgid "Cannot find directory %s\n"
+#~ msgstr "Teip ag cuardaigh eolaire %s\n"
+
+#~ msgid "Error saving GConf tree to '%s': %s\n"
+#~ msgstr "Teip ag sábhail crann Gconf do '%s': %s\n"
+
+#~ msgid "Usage: %s <dir>\n"
+#~ msgstr "Úsáid: %s <eolaire>\n"
+
 #~ msgid "none"
 #~ msgstr "tada"
+
+#~ msgid "CORBA error: %s"
+#~ msgstr "Earraidh CORBA: %s"
+
+#~ msgid "%s"
+#~ msgstr "%s"
diff --git a/po/hr.po b/po/hr.po
index 84826afd..29f816ae 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf 0\n"
 "POT-Creation-Date: 2003-12-05 00:37+0100\n"
-"PO-Revision-Date: 2004-02-01 16:55+CET\n"
+"PO-Revision-Date: 2004-03-22 22:49+CET\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr "Ne mogu stvoriti mapu `%s': %s"
 #: backends/dir-utils.c:212
 #, c-format
 msgid "Can't read from or write to the %s root directory in the address `%s'"
-msgstr "Ne mogu čitati iz ili pisati u %s korjensku mapu na adresi `%s'"
+msgstr "Ne mogu čitati iz ili pisati u %s korijensku mapu na adresi `%s'"
 
 #: backends/xml-backend.c:236
 msgid "Unloading XML backend module."
@@ -41,7 +41,7 @@ msgstr "Ne mogu naći XML početnu mapu na adresi `%s'"
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
-msgstr "Ne mogu čitati iz ili pisati u XML korjensku mapu na adresi \"%s\""
+msgstr "Ne mogu čitati iz ili pisati u XML korijensku mapu na adresi \"%s\""
 
 #: backends/xml-backend.c:453
 #, c-format
@@ -78,7 +78,7 @@ msgstr "Pokrećem pozadinski XML modul"
 #: backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
-msgstr "Nisam uspio otpusiti ključeve XML mape \"%s\": %s"
+msgstr "Nisam uspio otpustiti ključeve XML mape \"%s\": %s"
 
 #: backends/xml-cache.c:286
 msgid "Failed to sync XML cache contents to disk"
@@ -90,8 +90,8 @@ msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
 "not been successfully synced to disk"
 msgstr ""
-"Ne mogu maknuri mapu `%s' iz XML pozadinskog međuspreminka, zbog toga što "
-"bilo uspješno sinkronirano s diskom"
+"Ne mogu maknuti mapu `%s' iz XML pozadinskog međuspreminka, zbog toga što "
+"bilo uspješno sinkronizirano s diskom"
 
 #: backends/xml-dir.c:171
 #, c-format
@@ -462,7 +462,7 @@ msgstr "Greška kod čitanja datoteke `%s': %s\n"
 #: gconf/gconf-value.c:154 gconf/gconf-value.c:253 gconf/gconf-value.c:395
 #: gconf/gconf-value.c:1681
 msgid "Text contains invalid UTF-8"
-msgstr "Tekst sadrži neuspravni UTF-8"
+msgstr "Tekst sadrži neispravni UTF-8"
 
 #: gconf/gconf-internals.c:853
 #, c-format
@@ -609,9 +609,9 @@ msgid ""
 "in your home directory. The error was \"%s\" (errno = %d)."
 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 "
+"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 bi \"%s\" (errno "
 "= %d)."
 
 #: gconf/gconf-sanity-check.c:183
@@ -626,11 +626,11 @@ 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 "
+"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)."
+"je onemogućen program \"nfslock\". Greška je bila \"%s\" (errno = %d)."
 
 #: gconf/gconf-sanity-check.c:200
 #, c-format
@@ -638,7 +638,7 @@ msgid "Can't remove file %s: %s\n"
 msgstr "Ne mogu premjestiti datoteku %s: %s\n"
 
 #: gconf/gconf-sanity-check.c:236
-#, c-format
+#, fuzzy, 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 "
@@ -646,7 +646,7 @@ msgid ""
 msgstr ""
 "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 "
+"Nema izvora podešavanja u datoteci sa postavkama \"%\"; to znači da se "
 "postavke i ostala podešavanja ne mogu sačuvati. %s%s"
 
 #: gconf/gconf-sanity-check.c:239
@@ -661,7 +661,7 @@ msgid ""
 msgstr ""
 "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"
+"Nije moguće pronaći adresu \"%s\"  iz datoteke sa postavkama \"%s\": %s"
 
 #: gconf/gconf-sanity-check.c:323
 msgid ""
@@ -722,7 +722,7 @@ msgstr "Nisam uspio učitati izvor \"%s\": %s"
 #: gconf/gconf-sources.c:346
 #, c-format
 msgid "Resolved address \"%s\" to a writable config source at position %d"
-msgstr "Riješena adresa \"%s\" u zapisivajućem izvoru postavki na mjestu %d"
+msgstr "Riješena adresa \"%s\" u zapisujućem izvoru postavki na mjestu %d"
 
 #: gconf/gconf-sources.c:352
 #, c-format
@@ -736,7 +736,7 @@ msgstr ""
 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"
+"Riješena adresa \"%s\" u djelomično zapisujući izvor postavki na mjestu %d"
 
 #: gconf/gconf-sources.c:368
 msgid ""
@@ -749,7 +749,7 @@ msgstr ""
 #: gconf/gconf-sources.c:584
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
-msgstr "Shema `%s' određena za `%s' sprem vrijednost koja nije shema"
+msgstr "Shema `%s' određena za `%s' sprema vrijednost koja nije shema"
 
 #: gconf/gconf-sources.c:642
 msgid "The '/' name can only be a directory, not a key"
@@ -765,7 +765,7 @@ msgstr ""
 "putanje vaših postavki"
 
 #: gconf/gconf-sources.c:692
-#, c-format
+#, fuzzy, 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 "
@@ -784,7 +784,7 @@ 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 "
+"Ne može se spremiti vrijednost ključa \"%\", 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, "
@@ -797,7 +797,7 @@ msgstr ""
 "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 "
+"\"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 "
@@ -1285,12 +1285,12 @@ msgstr "Dohvatite dugački dokumentacijski niz znakova za ključ"
 
 #: gconf/gconftool.c:391
 msgid "Get the name of the schema applied to this key"
-msgstr "Dohvatite ime sheme primjenjenu na ovaj ključ"
+msgstr "Dohvatite ime sheme primijenjenu 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"
+"Odredite ime sheme za sljedeći ključ na koji se treba primijeniti ime sheme"
 
 #: gconf/gconftool.c:409
 msgid "Remove any schema name applied to the given keys"
@@ -1298,7 +1298,7 @@ msgstr "Ukloni bilo koje ime sheme primjenjenu na zadane ključeve"
 
 #: gconf/gconftool.c:418
 msgid "Get the name of the default source"
-msgstr "Dohvatite ime uobučajenog izvora"
+msgstr "Dohvatite ime uobičajenog izvora"
 
 #: gconf/gconftool.c:427
 msgid "Print version"
@@ -1399,11 +1399,11 @@ msgstr "Greška kod isključivanja: %s\n"
 
 #: gconf/gconftool.c:1120
 msgid "Must specify one or more directories to recursively list.\n"
-msgstr "Morate odrediti jedanu ili više mapa za rekurzivni ispis.\n"
+msgstr "Morate odrediti jednu ili više mapa za rekurzivni ispis.\n"
 
 #: gconf/gconftool.c:1172
 msgid "Must specify one or more directories to dump.\n"
-msgstr "Morate odrediti jedanu ili više mapa za ispisivanje.\n"
+msgstr "Morate odrediti jednu ili više mapa za ispisivanje.\n"
 
 #: gconf/gconftool.c:1214 gconf/gconftool.c:1479
 #, c-format
@@ -1635,8 +1635,8 @@ 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"
+"Morate odrediti jednu 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"
@@ -1659,7 +1659,7 @@ msgstr "Greška tijekom rekurzivnog micanja postavki \"%s\": %s\n"
 
 #: gconf/gconftool.c:2362
 msgid "Must specify one or more directories to get subdirs from.\n"
-msgstr "Morate odrediti jedanu ili više mapa za dohvaćanje podmapa.\n"
+msgstr "Morate odrediti jednu ili više mapa za dohvaćanje podmapa.\n"
 
 #: gconf/gconftool.c:2396
 #, c-format
@@ -1738,7 +1738,7 @@ msgstr "UPOZORENJE: Ne mogu postaviti uobičajenu vrijednost za shemu\n"
 
 #: gconf/gconftool.c:2993
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
-msgstr "UPOZORENJE: interna greška gconftool-a, napoznati GConfValueType\n"
+msgstr "UPOZORENJE: interna greška gconftool-a, nepoznati GConfValueType\n"
 
 #: gconf/gconftool.c:3041 gconf/gconftool.c:3062 gconf/gconftool.c:3083
 #: gconf/gconftool.c:3104
@@ -1779,7 +1779,7 @@ msgstr "UPOZORENJE: ne razumijem čvor <%s> ispod <schema>\n"
 
 #: gconf/gconftool.c:3154
 msgid "WARNING: no <list_type> specified for schema of type list\n"
-msgstr "UPOZORENJE: nije određen <list_type> za dhemu popisa vrste\n"
+msgstr "UPOZORENJE: nije određen <list_type> za shemu popisa vrste\n"
 
 #: gconf/gconftool.c:3160
 msgid "WARNING: no <car_type> specified for schema of type pair\n"
@@ -1838,7 +1838,7 @@ msgstr "Deinstalirana shema `%s' s mjesta `%s'\n"
 
 #: gconf/gconftool.c:3524
 msgid "WARNING: no key specified for schema\n"
-msgstr "UPOZORENJE: nije odrežena vrsta za shemu\n"
+msgstr "UPOZORENJE: nije određena vrsta za shemu\n"
 
 #: gconf/gconftool.c:3565
 #, c-format
@@ -1908,7 +1908,7 @@ 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 "
+"Pokušavam prekinuti vaš program postavljajući neispravne vrijednosti za "
 "ključ:\n"
 "  %s\n"
 
@@ -1923,17 +1923,15 @@ msgid ""
 "directory:\n"
 "  %s\n"
 msgstr ""
-"Pokušavam prekinuti vaš program postavljajući neispravne vrijendosti za "
+"Pokušavam prekinuti vaš program postavljajući neispravne vrijednosti za "
 "ključeve u mapi:\n"
 "  %s\n"
 
-#, fuzzy
 #~ msgid "Cannot find directory %s\n"
 #~ msgstr "Ne mogu naći mapu %s\n"
 
-#, fuzzy
 #~ msgid "Error saving GConf tree to '%s': %s\n"
-#~ msgstr "Greška kod spremanja stabla za Gconf u '%s': %s\n"
+#~ msgstr "Greška kod spremanja stabla GConf-a u \"%s\": %s\n"
 
 #~ msgid "Usage: %s <dir>\n"
 #~ msgstr "Uporaba: %s <mapa>\n"
@@ -1968,7 +1966,7 @@ msgstr ""
 #~ msgstr "Primljen je zahtijev za otpuštanje svih podataka"
 
 #~ msgid "Received request to sync synchronously"
-#~ msgstr "Primljen je zahtijev za sinkronizirano sinkroniziranje"
+#~ msgstr "Primljen je zahtjev za sinkronizirano sinkroniziranje"
 
 #~ msgid "Fatal error: failed to get object reference for ConfigDatabase"
 #~ msgstr ""
@@ -2063,7 +2061,7 @@ msgstr ""
 #~ msgstr "Greška CORBA-e: %s"
 
 #~ msgid "Shutdown request received"
-#~ msgstr "Primljen je zahtijev za isključivanje"
+#~ msgstr "Primljen je zahtjev za isključivanje"
 
 #~ msgid "Failed to get object reference for ConfigServer"
 #~ msgstr "Nisam uspio dohvatiti referentni objekt za ConfigServer"
@@ -2111,7 +2109,7 @@ msgstr ""
 #~ "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"
+#~ "Ne mogu obnoviti slušatelja na adresi '%s', ne mogu riješiti baru podataka"
 
 #~ msgid "Error reading saved state file: %s"
 #~ msgstr "Greška kod čitanja spremljene statusne datoteke: %s"
diff --git a/po/ja.po b/po/ja.po
index e871d426..04c0b6f5 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,14 +1,14 @@
 # GConf ja.po.
-# Copyright (C) 2000-2003 Free Software Foundation, Inc.
-# Takeshi Aihana <aihana@gnome.gr.jp>, 2000-2003.
+# Copyright (C) 2000-2004 Free Software Foundation, Inc.
+# Takeshi Aihana <aihana@gnome.gr.jp>, 2000-2004.
 # KAMAGASAKO Masatoshi <emerald@gnome.gr.jp>, 2003
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: GConf HEAD\n"
 "POT-Creation-Date: 2003-12-05 00:37+0100\n"
-"PO-Revision-Date: 2003-10-28 00:16+0900\n"
-"Last-Translator: KAMAGASAKO Masatoshi <emerald@gnome.gr.jp>\n"
+"PO-Revision-Date: 2004-03-23 19:53+0900\n"
+"Last-Translator: Takeshi AIHANA <aihana@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"
@@ -18,7 +18,7 @@ msgstr ""
 #: backends/dir-utils.c:108
 #, c-format
 msgid "Couldn't find the %s root directory in the address `%s'"
-msgstr "%s ルートディレクトリはアドレス '%s' 中に見つかりませんでした。"
+msgstr "%s ルートディレクトリがアドレス '%s' 中に見つかりませんでした。"
 
 #: backends/dir-utils.c:124 backends/xml-backend.c:332
 #, c-format
@@ -293,7 +293,8 @@ msgstr "アドレス '%s' は使えません。"
 
 #: 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:230
 #, c-format
@@ -303,11 +304,11 @@ msgstr "モジュール '%s' をロード中にエラー: %s\n"
 #: gconf/gconf-backend.c:262
 #, c-format
 msgid "Couldn't locate backend module for `%s'"
-msgstr "'%s' 用のバックエンドモジュールが特定できません。"
+msgstr "'%s' 用のバックエンド・モジュールを特定できませんでした。"
 
 #: gconf/gconf-backend.c:299
 msgid "Failed to shut down backend"
-msgstr "バックエンドモジュールのシャットダウンに失敗しました。"
+msgstr "バックエンド・モジュールのシャットダウンに失敗しました。"
 
 #: gconf/gconf-client.c:344 gconf/gconf-client.c:362
 #, c-format
@@ -322,12 +323,12 @@ msgstr "GConf から警告: '%s' の中のペアのリスト化に失敗: %s"
 #: gconf/gconf-client.c:1181
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
-msgstr "'%s' を期待されたが、得られたのは '%s'(キーは'%s')です。"
+msgstr "'%s' を期待しましたが得られたのは '%s'(キーは'%s')です。"
 
 #: gconf/gconf-database.c:173
 #, c-format
 msgid "Failed to sync one or more sources: %s"
-msgstr "1 つ以上のファイルの同期でエラー: %s"
+msgstr "一つ以上のファイルの同期でエラー: %s"
 
 #: gconf/gconf-database.c:241 gconf/gconf-sources.c:1541
 #, c-format
@@ -493,22 +494,22 @@ msgstr "(キーと値の)ペアを期待されたが、得られたのは %s で
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr ""
-"(%s と %s) のペアを期待されたが、得られたのは一つないし両方の値が無いペアで"
+"ペア (%s と %s) を期待しましたが得られたのは一つないし両方の値が無いペアで"
 "す。"
 
 #: gconf/gconf-internals.c:1021
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr ""
-"(%s と %s)のタイプのペアを期待されたが、得られたのは(%s と %s)のタイプです。"
+"種類 (%s と %s) のペアを期待しましたが、得られたのは種類 (%s と %s) です。"
 
 #: gconf/gconf-internals.c:1137
 msgid "Quoted string doesn't begin with a quotation mark"
-msgstr "引用された文字列はクォーテーション記号(')で始まっていません。"
+msgstr "引用された文字列はクォーテーション記号 (') で始まっていません。"
 
 #: gconf/gconf-internals.c:1199
 msgid "Quoted string doesn't end with a quotation mark"
-msgstr "引用された文字列はクォーテーション記号(')で終わっていません。"
+msgstr "引用された文字列はクォーテーション記号 (') で終わっていません。"
 
 #: gconf/gconf-internals.c:1335
 msgid "Encoded value is not valid UTF-8"
@@ -914,7 +915,7 @@ msgstr "スラッシュ '/' で始める必要があります。"
 
 #: gconf/gconf.c:138
 msgid "Can't have two slashes (/) in a row"
-msgstr "行中に２つのスラッシュ '/' がありません。"
+msgstr "行中にスラッシュ '/' が二つありません。"
 
 #: gconf/gconf.c:140
 msgid "Can't have a period (.) right after a slash (/)"
@@ -985,7 +986,7 @@ msgid ""
 "edit %s"
 msgstr ""
 "ソースパスの中に設定ソースがありません。設定は保存されません; \n"
-"%s を編集してください"
+"%s を編集して下さい。"
 
 #: gconf/gconfd.c:182
 #, c-format
@@ -1093,87 +1094,89 @@ msgstr "GConf サーバーが使用されていません。シャットダウン
 
 #: gconf/gconftool.c:93
 msgid "Set a key to a value and sync. Use with --type."
-msgstr "\"--type\" を使って、値に対するキーをセットし同期します。"
+msgstr "キーを値にセットして同期する ('--type' と一緒に使用すること)"
 
 #: gconf/gconftool.c:102
 msgid "Print the value of a key to standard output."
-msgstr "標準出力にキーの値を表示します。"
+msgstr "キーの値を標準出力に表示する"
 
 #: gconf/gconftool.c:111
 msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and --"
 "type."
 msgstr ""
-"\"--short-desc, --long-desc, --owner, --type\" を使ってスキーマをセットして同"
-"期します。"
+"スキーマをセットし同期する ('--short-desc', '--long-desc', '--owner', '--"
+"type' と一緒に使用すること)"
 
 #: gconf/gconftool.c:121
 msgid "Unset the keys on the command line"
-msgstr "コマンドラインでキーを無効にします。"
+msgstr "指定したキーを無効にする"
 
 #: gconf/gconftool.c:130
 msgid ""
 "Recursively unset all keys at or below the key/directory names on the "
 "command line"
 msgstr ""
-"全てのキー、または以下のコマンドライン上のキー/ディレクトリ名を再帰的に解放し"
-"て下さい。"
+"指定した場所または指定した \"キー/ディレクトリ\" 名の下にある全てのキーを再帰"
+"的に無効にする"
 
 #: gconf/gconftool.c:139
 msgid "Print all key/value pairs in a directory."
-msgstr "ディレクトリ中の全てのキーと値のペアを表示します。"
+msgstr "指定したディレクトリ中の全てのキー/値のペアを表示する"
 
 #: gconf/gconftool.c:148
 msgid "Print all subdirectories in a directory."
-msgstr "ディレクトリ中の全てのサブディレクトリを表示します。"
+msgstr "指定したディレクトリ中の全てのサブディレクトリを表示する"
 
 #: gconf/gconftool.c:157
 msgid ""
 "Dump to standard out an XML description of all entries under a dir, "
 "recursively."
 msgstr ""
-"ディレクトリ下の全エントリの XML ディスクリプションを標準出力に再帰的に表示し"
-"ます。"
+"指定してディレクトリの下にある全てのエントリの XML ディスクリプションを再帰的"
+"に標準出力へ表示する"
 
 #: gconf/gconftool.c:166
 msgid ""
 "Load from the specified file an XML description of values and set them "
 "relative to a dir."
 msgstr ""
-"指定したファイルから値の XML ディスクリプションを読み込んで、関連するディレク"
-"トリにセットします。"
+"指定したファイルから値の XML ディスクリプションを読み込み関連するディレクトリ"
+"にセットする"
 
 #: gconf/gconftool.c:175
 msgid "Print all subdirectories and entries under a dir, recursively."
-msgstr "ディレクトリ下のエントリとサブディレクトリの全てを再起的に表示する。"
+msgstr ""
+"指定したディレクトリの下にある全てのサブディレクトリとエントリを再帰的に表示"
+"する"
 
 #: gconf/gconftool.c:184
 msgid "Return 0 if the directory exists, 2 if it does not."
-msgstr "ディレクトリが存在したら 0 を返し、存在しなければ 2 を返します。"
+msgstr "指定したディレクトリが存在したら 0を返し、存在しなければ 2を返す"
 
 #: gconf/gconftool.c:193
 msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
 msgstr ""
-"gconfd をシャットダウンします。理由無しにこのオプションを使用しないこと!!"
+"gconfd をシャットダウンする (**正当な理由無しにこのオプションを使用しないこと"
+"**)"
 
 #: gconf/gconftool.c:202
 msgid "Return 0 if gconfd is running, 2 if not."
-msgstr "もし gconfd が起動中ならば 0 を返し、そうでなければ 2 を返します。"
+msgstr "gconfd が起動中ならば 0を返し、起動していなければ 2を返す"
 
 #: gconf/gconftool.c:211
 msgid ""
 "Launch the config server (gconfd). (Normally happens automatically when "
 "needed.)"
-msgstr ""
-"gcnofd 設定サーバーを立ち上げます。(普通は必要に応じて自動的に起動します。)"
+msgstr "gcnofd 設定サーバを起動する (通常は必要に応じて自動的に起動する)"
 
 #: gconf/gconftool.c:220
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
 msgstr ""
-"セットする値の型またはスキーマの型を指定して下さい。 重複しなければ省略形も "
-"OK です。"
+"セットする値の型または記述するスキーマの型を指定する (重複しなければ省略形も"
+"可)"
 
 #: gconf/gconftool.c:221
 msgid "int|bool|float|string|list|pair"
@@ -1181,23 +1184,23 @@ msgstr "int|bool|float|string|list|pair"
 
 #: gconf/gconftool.c:229
 msgid "Print the data type of a key to standard output."
-msgstr "標準出力にキーのデータ型を表示します。"
+msgstr "キーのデータ型を標準出力に表示する"
 
 #: gconf/gconftool.c:238
 msgid "Get the number of elements in a list key."
-msgstr "リスト・キーの中にある要素の数を取得します。"
+msgstr "リスト・キーの中にある要素の数を取得する"
 
 #: gconf/gconftool.c:247
 msgid "Get a specific element from a list key, numerically indexed."
-msgstr "数値が付与されたリスト・キーから指定した要素を取得します。"
+msgstr "リスト・キーから指定した (番号が付与された) 要素を取得する"
 
 #: gconf/gconftool.c:256
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
-"セットするリストの型または記述するスキーマの型を指定して下さい。 重複しなけれ"
-"ば省略形も OK です。"
+"セットするリストの型または記述するスキーマの型を指定する (重複しなければ省略"
+"形も可)"
 
 #: gconf/gconftool.c:257 gconf/gconftool.c:266 gconf/gconftool.c:275
 msgid "int|bool|float|string"
@@ -1208,20 +1211,20 @@ msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
-"セットする car ペアの型または記述するスキーマの型を指定して下さい。重複しなけ"
-"れば省略形も OK です。"
+"セットする car ペアの型または記述するスキーマの型を指定する (重複しなければ省"
+"略形も可)"
 
 #: gconf/gconftool.c:274
 msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
-"セットする cdr ペアの型またはスキーマの型を指定して下さい。重複しなければ省略"
-"形も OK です。"
+"セットする cdr ペアの型または記述するスキーマの型を指定する (重複しなければ省"
+"略形も可)"
 
 #: gconf/gconftool.c:283
 msgid "Specify a short half-line description to go in a schema."
-msgstr "スキーマの中で先に進むための半線の説明を指定して下さい。"
+msgstr "スキーマの短い説明を指定する"
 
 #: gconf/gconftool.c:284 gconf/gconftool.c:293
 msgid "DESCRIPTION"
@@ -1229,19 +1232,19 @@ msgstr "説明"
 
 #: gconf/gconftool.c:292
 msgid "Specify a several-line description to go in a schema."
-msgstr "スキーマの中で先委進むための点線の説明を指定して下さい。"
+msgstr "スキーマの詳細な説明を指定する"
 
 #: gconf/gconftool.c:301
 msgid "Specify the owner of a schema"
-msgstr "スキーマのオーナーを指定して下さい。"
+msgstr "スキーマの所有者を指定する"
 
 #: gconf/gconftool.c:302
 msgid "OWNER"
-msgstr "オーナー"
+msgstr "所有者"
 
 #: gconf/gconftool.c:310
 msgid "Specify a schema file to be installed"
-msgstr "インストールするスキーマファイルを指定してください。"
+msgstr "インストールするスキーマ・ファイルを指定する"
 
 #: gconf/gconftool.c:311
 msgid "FILENAME"
@@ -1249,7 +1252,7 @@ msgstr "ファイル名"
 
 #: gconf/gconftool.c:319
 msgid "Specify a configuration source to use rather than the default path"
-msgstr "デフォルトパスよりもむしろ使用するための設定ソースを指定して下さい。"
+msgstr "デフォルト・パス以外の設定ソースを指定する"
 
 #: gconf/gconftool.c:320
 msgid "SOURCE"
@@ -1260,8 +1263,8 @@ msgid ""
 "Access the config database directly, bypassing server. Requires that gconfd "
 "is not running."
 msgstr ""
-"バイパスしているサーバーの設定データベースに直接アクセスして下さい。gconfd が"
-"起動していないことが条件です。"
+"サーバを経由して設定データベースに直接アクセスする (gconfd が起動していないこ"
+"とが条件)"
 
 #: gconf/gconftool.c:337
 msgid ""
@@ -1269,9 +1272,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 ""
-"コマンドラインからデータベースにスキーマファイルを正しくインストールして下さ"
-"い。環境変数 GCONF_CONFIG_SOURCE はデフォルトでない設定ソースに設定されている"
-"か、もしくはデフォルトとして空の文字列が設定されている必要があります。"
+"指定したスキーマ・ファイルをデータベースにインストールする (環境変数 "
+"GCONF_CONFIG_SOURCE にはデフォルトではない設定ソースをセットしておくか、デ"
+"フォルト値を使用するために空をセットしておくこと)"
 
 #: gconf/gconftool.c:346
 msgid ""
@@ -1279,53 +1282,53 @@ 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 ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
 msgstr ""
-"コマンドライン上でキーの異なる型の値のまとまりを設定/未設定する事によりアプリ"
-"ケーションをテストできます。"
+"指定した複数のキーの型をセット/セットしないにすることでアプリケーションの負荷"
+"テストを行う"
 
 #: gconf/gconftool.c:364
 msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
 msgstr ""
-"コマンドライン上でディレクトリ内部のキーのまとまりを設定/未設定にする事により"
-"アプリケーションをテストできます。"
+"指定したディレクトリ内部にある複数のキーをセット/セットしないにすることでアプ"
+"リケーションのテストを行う"
 
 #: gconf/gconftool.c:373
 msgid "Get the short doc string for a key"
-msgstr "キーに対する短い doc 文字列の取得"
+msgstr "キーに対する短い doc 文字列を取得する"
 
 #: gconf/gconftool.c:382
 msgid "Get the long doc string for a key"
-msgstr "キーに対する長い doc 文字列の取得"
+msgstr "キーに対する長い doc 文字列を取得する"
 
 #: gconf/gconftool.c:391
 msgid "Get the name of the schema applied to this key"
-msgstr "このキーに適用されたスキーマ名の取得"
+msgstr "指定したキーに対応するスキーマ名を取得する"
 
 #: gconf/gconftool.c:400
 msgid "Specify the schema name followed by the key to apply the schema name to"
-msgstr "スキーマ名を適用するためにキーに従うスキーマ名を指定して下さい。"
+msgstr "キーに指定したスキーマ名を適用する"
 
 #: gconf/gconftool.c:409
 msgid "Remove any schema name applied to the given keys"
-msgstr "指定されたキーに適用されるスキーマ名の削除"
+msgstr "指定したキーのスキーマ名を削除する"
 
 #: gconf/gconftool.c:418
 msgid "Get the name of the default source"
-msgstr "デフォルトソースの名前の取得"
+msgstr "デフォルトの設定ソースの名前を取得する"
 
 #: gconf/gconftool.c:427
 msgid "Print version"
-msgstr "印刷バージョン"
+msgstr "バージョンを表示する"
 
 #: gconf/gconftool.c:524
 msgid "Can't get and set/unset simultaneously\n"
@@ -1426,7 +1429,7 @@ 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"
@@ -1678,8 +1681,7 @@ msgstr "\"%s\" の再帰的な解放中にエラー: %s\n"
 
 #: gconf/gconftool.c:2362
 msgid "Must specify one or more directories to get subdirs from.\n"
-msgstr ""
-"サブディレクトリを取得するためのディレクトリを一つ以上指定してください。\n"
+msgstr "サブディレクトリを取得するためのディレクトリを一つ以上指定して下さい\n"
 
 #: gconf/gconftool.c:2396
 #, c-format
@@ -1947,13 +1949,32 @@ msgstr ""
 "ようとしています:\n"
 "  %s\n"
 
-#, fuzzy
 #~ msgid "Cannot find directory %s\n"
-#~ msgstr "ディレクトリ '%s' を作成できませんでした: %s"
+#~ msgstr "ディレクトリ %s が見つかりません\n"
 
-#, fuzzy
 #~ msgid "Error saving GConf tree to '%s': %s\n"
-#~ msgstr "'%s' でスキーマの取得のエラー: %s\n"
+#~ msgstr "'%s' への GConf ツリーの保存エラー: %s\n"
+
+#~ msgid "Usage: %s <dir>\n"
+#~ msgstr "用法: %s <ディレクトリ>\n"
+
+#~ 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 ""
+#~ "用法: %s <ディレクトリ>\n"
+#~ "  下記のようなマークアップ・バックエンドのファイルシステム階層をマージしま"
+#~ "す:\n"
+#~ "    dir/%%gconf.xml\n"
+#~ "        subdir1/%%gconf.xml\n"
+#~ "        subdir2/%%gconf.xml\n"
+#~ "  マージ後:\n"
+#~ "    dir/%%gconf-tree.xml\n"
 
 #~ msgid "Received invalid value in set request"
 #~ msgstr "設定した要求の中に不正な値を受け取りました。"
@@ -2149,19 +2170,3 @@ msgstr ""
 #~ msgstr ""
 #~ "幾つかのクライアントは追加されなかったので、GConf サーバーから自分自身を削"
 #~ "除しました。"
-
-#~ msgid ""
-#~ "%u items remain in the cache after cleaning already-synced items older "
-#~ "than %u seconds"
-#~ msgstr ""
-#~ "%u 個のアイテムが %u 秒よりも古い同期したアイテムを削除した後のキャッシュ"
-#~ "に残っています。"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid "/path"
-#~ msgstr "/path を編集してください"
-
-#~ msgid "%s must be used by itself.\n"
-#~ msgstr "%s はそれ自身で使われる必要があります。\n"
diff --git a/po/nl.po b/po/nl.po
index dd834a7c..9e185ec3 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GConf cvs\n"
 "POT-Creation-Date: 2003-12-05 00:37+0100\n"
-"PO-Revision-Date: 2004-01-20 16:57+0100\n"
+"PO-Revision-Date: 2004-03-21 11:20+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"
@@ -1415,7 +1415,7 @@ msgid ""
 "GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL is set, not uninstalling schemas\n"
 msgstr ""
 "GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL is gezet, schema's worden niet "
-"gedeïnstalleerd\n"
+"gedeïnstalleerd\n"
 
 #: gconf/gconftool.c:763
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
@@ -1626,7 +1626,7 @@ msgstr "Moet een sleutel (schemanaam) specificeren als het enige argument\n"
 #: gconf/gconftool.c:2104
 #, c-format
 msgid "Error associating schema name '%s' with key name '%s': %s\n"
-msgstr "Fout bij associëren schema `%s' met sleutel `%s': %s\n"
+msgstr "Fout bij associëren schema `%s' met sleutel `%s': %s\n"
 
 #: gconf/gconftool.c:2122
 msgid "Must specify keys to unapply schema from\n"
@@ -1871,12 +1871,12 @@ msgstr "Schema `%s' voor locale `%s' geïnstalleerd\n"
 #: gconf/gconftool.c:3478
 #, c-format
 msgid "WARNING: failed to uninstall schema `%s' locale `%s': %s\n"
-msgstr "WAARSCHUWING: fout bij deïnstalleren schema `%s' locale `%s': %s\n"
+msgstr "WAARSCHUWING: fout bij deïnstalleren schema `%s' locale `%s': %s\n"
 
 #: gconf/gconftool.c:3486
 #, c-format
 msgid "Uninstalled schema `%s' from locale `%s'\n"
-msgstr "Schema `%s' voor locale `%s' gedeïnstalleerd\n"
+msgstr "Schema `%s' voor locale `%s' gedeïnstalleerd\n"
 
 #: gconf/gconftool.c:3524
 msgid "WARNING: no key specified for schema\n"
@@ -1925,7 +1925,7 @@ msgstr "U moet enkele te installeren schemabestanden specificeren\n"
 
 #: gconf/gconftool.c:3704
 msgid "Must specify some schema files to uninstall\n"
-msgstr "U moet enkele te deïnstalleren schemabestanden specificeren\n"
+msgstr "U moet enkele te deïnstalleren schemabestanden specificeren\n"
 
 #: gconf/gconftool.c:3741
 #, c-format
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 732f37fc..4dd30d50 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf 2.4.0.1\n"
 "POT-Creation-Date: 2003-12-05 00:37+0100\n"
-"PO-Revision-Date: 2003-09-29 12:13-0400\n"
+"PO-Revision-Date: 2004-03-14 23:51-0300\n"
 "Last-Translator: Evandro Fernandes Giovanini <evandrofg@ig.com.br>\n"
 "Language-Team: Brazilian Portuguese <gnome-l10n-br@listas.cipsga.org.br>\n"
 "MIME-Version: 1.0\n"
@@ -59,7 +59,6 @@ msgid "Error syncing the XML backend directory cache: %s"
 msgstr "Erro ao sincronizar o cache do diretório do backend XML: %s"
 
 #: backends/xml-backend.c:684
-#, fuzzy
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -84,7 +83,7 @@ msgid "Initializing XML backend module"
 msgstr "Iniciando módulo backend XML"
 
 #: backends/xml-backend.c:877
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Falha ao liberar bloqueio no diretório XML \"%s\": %s"
 
@@ -98,7 +97,7 @@ msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
 "not been successfully synced to disk"
 msgstr ""
-"Não é possível remover diretório `%s' do cache do módulo backend XML, pois "
+"Não é possível remover o diretório `%s' do cache do módulo backend XML, pois "
 "ele não foi sincronizado com o disco corretamente"
 
 #: backends/xml-dir.c:171
@@ -171,78 +170,76 @@ msgstr "Entrada sem nome no arquivo XML `%s', ignorando"
 #, c-format
 msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
 msgstr ""
-"Um nódulo de nível principal no arquivo XML `%s' é <%s> e não <entry>, "
-"ignorando"
+"Um nó de nível superior no arquivo XML `%s' é <%s> e não <entry>, ignorando"
 
 #: backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
-msgstr "Não foi possível criar diretório \"%s\": %s"
+msgstr "Não foi possível criar o diretório \"%s\": %s"
 
 #: backends/xml-dir.c:1271
 #, c-format
 msgid "Failed to create file `%s': %s"
-msgstr "Falha ao criar arquivo `%s': %s"
+msgstr "Falha ao criar o arquivo `%s': %s"
 
 #: backends/xml-dir.c:1370
 #, c-format
 msgid "Failed to parse XML file \"%s\""
-msgstr "Falha ao analisar arquivo XML \"%s\""
+msgstr "Falha ao analisar o arquivo XML \"%s\""
 
 #. There was an error
 #: backends/xml-entry.c:154
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
-msgstr "Ignorando nódulo XML com nome `%s': %s"
+msgstr "Ignorando nó XML com nome `%s': %s"
 
 #: backends/xml-entry.c:332
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
-msgstr "Ignorando nome de schema `%s', inválido: %s"
+msgstr "Ignorando nome de esquema `%s', inválido: %s"
 
 #: backends/xml-entry.c:380
 #, c-format
 msgid "Ignoring XML node `%s': %s"
-msgstr "Ignorando nódulo XML `%s': %s"
+msgstr "Ignorando nó XML `%s': %s"
 
 #: backends/xml-entry.c:732
 #, c-format
 msgid "Failed reading default value for schema: %s"
-msgstr "Falha ao ler valor padrão para schema: %s"
+msgstr "Falha ao ler valor padrão para esquema: %s"
 
 #: backends/xml-entry.c:952
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
-msgstr "Sem atributo \"type\" para nódulo <%s>"
+msgstr "Sem atributo \"tipo\" para o nó <%s>"
 
 #: backends/xml-entry.c:966
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
-msgstr "Um nódulo tem atributo \"type\" desconhecido `%s', ignorando"
+msgstr "Um nó tem atributo \"tipo\" desconhecido `%s', ignorando"
 
 #: backends/xml-entry.c:981
 msgid "No \"value\" attribute for node"
-msgstr "Sem atributo \"value\" para o nódulo"
+msgstr "Sem atributo \"valor\" para o nó"
 
 #: backends/xml-entry.c:1029 backends/xml-entry.c:1105
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
-msgstr ""
-"Não foi possível entender nódulo XML <%s> dentro de um nódulo de lista XML"
+msgstr "Não foi possível entender o nó XML <%s> dentro de uma lista XML de nós"
 
 #: backends/xml-entry.c:1063
 msgid "Invalid type (list, pair, or unknown) in a list node"
-msgstr "Tipo inválido (lista, par ou desconhecido) em um nódulo de lista"
+msgstr "Tipo inválido (lista, par ou desconhecido) em uma lista de nós"
 
 #: backends/xml-entry.c:1086
 #, c-format
 msgid "Bad XML node: %s"
-msgstr "Nódulo XML defeituoso: %s"
+msgstr "Nó XML defeituoso: %s"
 
 #: backends/xml-entry.c:1094
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
-msgstr "Lista contém um nódulo com tipo inválido (%s, deveria ser %s)"
+msgstr "Lista contém um nó com tipo inválido (%s, deveria ser %s)"
 
 #: backends/xml-entry.c:1146
 #, c-format
@@ -263,12 +260,11 @@ msgstr "Ignorando cdr defeituoso do par XML: %s"
 #: backends/xml-entry.c:1187
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
-msgstr ""
-"Não foi possível entender nódulo XML <%s> dentro de um nódulo de par XML"
+msgstr "Não foi possível entender o nó XML <%s> dentro de um nó de par XML"
 
 #: backends/xml-entry.c:1205
 msgid "Didn't find car and cdr for XML pair node"
-msgstr "Não foi possível encontrar car e cdr para o nódulo de par XML"
+msgstr "Não foi possível encontrar car e cdr para o nó de par XML"
 
 #: backends/xml-entry.c:1211
 msgid "Missing cdr from pair of values in XML file"
@@ -319,12 +315,12 @@ msgstr "Erro do GConf: %s\n"
 #: gconf/gconf-client.c:896
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
-msgstr "Alerta do GConf: falha ao listar pares em `%s': %s"
+msgstr "Alerta do GConf: falha ao construir a lista de pares em `%s': %s"
 
 #: gconf/gconf-client.c:1181
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
-msgstr "Esperado `%s' recebi `%s' para chave %s"
+msgstr "Esperado `%s' recebi `%s' para a chave %s"
 
 #: gconf/gconf-database.c:173
 #, c-format
@@ -367,7 +363,7 @@ msgid "Error checking existence of `%s': %s"
 msgstr "Erro ao verificar existência de `%s': %s"
 
 #: gconf/gconf-database.c:520
-#, fuzzy, c-format
+#, c-format
 msgid "Error removing directory \"%s\": %s"
 msgstr "Erro ao remover diretório `%s': %s"
 
@@ -384,7 +380,7 @@ msgstr "Erro ao listar diretórios em `%s': %s"
 #: gconf/gconf-database.c:594
 #, c-format
 msgid "Error setting schema for `%s': %s"
-msgstr "Erro ao atribuir schema para `%s': %s"
+msgstr "Erro ao atribuir esquema para `%s': %s"
 
 #: gconf/gconf-error.c:25
 msgid "Success"
@@ -504,15 +500,15 @@ msgstr "Par do tipo (%s,%s) esperado, recebi tipo (%s,%s)"
 
 #: gconf/gconf-internals.c:1137
 msgid "Quoted string doesn't begin with a quotation mark"
-msgstr "Cadeia entre aspas não começa com aspas"
+msgstr "A cadeia entre aspas não começa com aspas"
 
 #: gconf/gconf-internals.c:1199
 msgid "Quoted string doesn't end with a quotation mark"
-msgstr "Cadeia entre aspas não termina com aspas"
+msgstr "A cadeia entre aspas não termina com aspas"
 
 #: gconf/gconf-internals.c:1335
 msgid "Encoded value is not valid UTF-8"
-msgstr "Valor codificado não é UTF-8 válido"
+msgstr "O valor codificado não é um UTF-8 válido"
 
 #: gconf/gconf-internals.c:1837
 #, c-format
@@ -531,7 +527,7 @@ msgstr ""
 #: gconf/gconf-internals.c:1884
 msgid "couldn't contact ORB to resolve existing gconfd object reference"
 msgstr ""
-"não foi possível contactar ORB para resolver referência a objeto gconfd "
+"não foi possível contactar ORB para resolver a referência ao objeto gconfd "
 "existente"
 
 #: gconf/gconf-internals.c:1894
@@ -593,7 +589,7 @@ msgstr "Falha ao remover diretório de bloqueios `%s': %s"
 #: gconf/gconf-internals.c:2220
 #, c-format
 msgid "couldn't create directory `%s': %s"
-msgstr "não foi possível criar diretório `%s': %s"
+msgstr "não foi possível criar o diretório `%s': %s"
 
 #: gconf/gconf-internals.c:2279
 #, c-format
@@ -656,7 +652,7 @@ msgstr ""
 #: gconf/gconf-sanity-check.c:200
 #, c-format
 msgid "Can't remove file %s: %s\n"
-msgstr "Não é possível remover arquivo \"%s\": %s\n"
+msgstr "Não é possível remover o arquivo \"%s\": %s\n"
 
 #: gconf/gconf-sanity-check.c:236
 #, c-format
@@ -710,7 +706,7 @@ msgstr ""
 
 #: gconf/gconf-sanity-check.c:344
 msgid "_Log Out"
-msgstr "_Log Out"
+msgstr "_Sair da Sessão"
 
 #: gconf/gconf-sanity-check.c:346
 msgid "_Continue"
@@ -724,13 +720,13 @@ msgstr "%s Continuar (s/n)?"
 #: gconf/gconf-schema.c:221 gconf/gconf-schema.c:229 gconf/gconf-schema.c:237
 #: gconf/gconf-schema.c:245
 msgid "Schema contains invalid UTF-8"
-msgstr "O Schema contém UTF-8 inválido"
+msgstr "O esquema contém UTF-8 inválido"
 
 #: gconf/gconf-schema.c:254
 msgid ""
 "Schema specifies type list but doesn't specify the type of the list elements"
 msgstr ""
-"O schema especifica tipo lista mas não especifica o tipo dos elementos da "
+"O esquema especifica o tipo lista mas não especifica o tipo dos elementos da "
 "lista"
 
 #: gconf/gconf-schema.c:264
@@ -738,7 +734,8 @@ msgid ""
 "Schema specifies type pair but doesn't specify the type of the car/cdr "
 "elements"
 msgstr ""
-"O schema especifica tipo par, mas não especifica o tipo dos elementos car/cdr"
+"O esquema especifica o tipo par, mas não especifica o tipo dos elementos car/"
+"cdr"
 
 #: gconf/gconf-sources.c:319
 #, c-format
@@ -778,7 +775,7 @@ msgstr ""
 #: gconf/gconf-sources.c:584
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
-msgstr "Schema `%s' especificado para `%s' armazena um valor de não-schema"
+msgstr "Esquema `%s' especificado para `%s' armazena um valor de não-esquema"
 
 #: gconf/gconf-sources.c:642
 msgid "The '/' name can only be a directory, not a key"
@@ -790,8 +787,8 @@ msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path"
 msgstr ""
-"Valor para `%s' atribuído em fonte somente leitura no início do seu caminho "
-"de configuração."
+"O valor para `%s' atribuído em fonte somente leitura no início do seu "
+"caminho de configuração"
 
 #: gconf/gconf-sources.c:692
 #, c-format
@@ -818,20 +815,20 @@ msgstr ""
 "Existem duas causas comuns para este problema: 1) seu arquivo de caminho de "
 "configuração %s/caminho não contém bases de dados ou não foi encontrado 2) "
 "de alguma forma nós criamos por erro duas instâncias do gconfd 3) seu "
-"sistema operacinal está desconfigurado então o bloqueio de arquivos em NFS "
-"não funciona no seu diretório pessoal ou 4) sua máquina cliente de NFS "
-"encontrou um erro e não notificou o servidor na reinicialização que os "
-"bloqueios de arquivos deviam ser desfeitos. Se você tem dois processos do "
-"gconfd (ou tinha dois quando o segundo foi iniciando), sair, matar todas as "
-"cópias do gconfd e entrar novamente na seção pode ajudar. Se você tem "
-"arquivos de bloqueio deixados para trás, remova ~/.gconf*/*lock. Talvez o "
-"problema seja que você tentou usar o GConf de duas máquinas ao mesmo tempo e "
-"o ORBit ainda está configurado para evitar conexões CORBA remotas - coloque "
-"\"ORBIIOPIPv4=1\" no /etc/orbitrc. Como sempre, confira o syslog user.* para "
-"obter detalhes sobre os problemas encontrados pelo gconf. Só pode haver um "
-"gconfd por diretório pessoal e ele precisa ser dono de um arquivo de "
-"bloqueio no ~/.gconfd e também arquivos de bloqueio em locais onde guarda "
-"configurações individuais como o ~/.gconf"
+"sistema operacional está desconfigurado fazendo com que o bloqueio de "
+"arquivos NFS não funcione no seu diretório pessoal ou 4) sua máquina cliente "
+"de NFS encontrou um erro e não notificou o servidor na reinicialização que "
+"os bloqueios de arquivos deviam ser desfeitos. Se você tem dois processos do "
+"gconfd (ou tinha dois quando o segundo foi iniciando), sair da sessão, matar "
+"todas as cópias do gconfd e entrar novamente na seção pode ajudar. Se você "
+"tem arquivos de bloqueio deixados para trás, remova ~/.gconf*/*lock. Talvez "
+"o problema seja que você tentou usar o GConf de duas máquinas ao mesmo tempo "
+"e o ORBit ainda está configurado para evitar conexões CORBA remotas - "
+"coloque \"ORBIIOPIPv4=1\" no /etc/orbitrc. Como sempre, confira o syslog "
+"user.* para obter detalhes sobre os problemas encontrados pelo gconf. Só "
+"pode haver um gconfd por diretório pessoal e ele precisa ser dono de um "
+"arquivo de bloqueio no ~/.gconfd e também arquivos de bloqueio em locais "
+"onde guarda configurações individuais como o ~/.gconf"
 
 #: gconf/gconf-sources.c:1414
 #, c-format
@@ -847,17 +844,18 @@ msgstr "Erro ao obter metainfo: %s"
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
-"Chave `%s', listada como schema para chave `%s', realmente armazena tipo `%s'"
+"A chave `%s', listada como esquema para a chave `%s', realmente armazena o "
+"tipo `%s'"
 
 #: gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
-msgstr "Não foi possível entender `%s' (inteiro esperado)"
+msgstr "Não foi possível entender `%s' (era esperado um inteiro)"
 
 #: gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
-msgstr "Inteiro `%s' é muito grande ou pequeno"
+msgstr "O inteiro `%s' é muito grande ou pequeno"
 
 #: gconf/gconf-value.c:141
 #, c-format
@@ -912,7 +910,7 @@ msgstr "Não foi possível entender `%s' (')' extra encontrado em um par)"
 #: gconf/gconf.c:44
 #, c-format
 msgid "Key \"%s\" is NULL"
-msgstr "Chave \"%s\" não é NULL"
+msgstr "A chave \"%s\" não é NULA"
 
 #: gconf/gconf.c:51
 #, c-format
@@ -948,7 +946,7 @@ msgstr "Chave/diretório não pode terminar com uma barra (/)"
 #: gconf/gconf.c:408
 #, c-format
 msgid "Expected float, got %s"
-msgstr "Flutuante esperado, recebi %s"
+msgstr "Ponto futuante esperado, recebi %s"
 
 #: gconf/gconf.c:443
 #, c-format
@@ -958,7 +956,7 @@ msgstr "Inteiro esperado, recebi %s"
 #: gconf/gconf.c:478
 #, c-format
 msgid "Expected string, got %s"
-msgstr "Cadeia esperada, recebi %s"
+msgstr "Texto esperado, recebi %s"
 
 #: gconf/gconf.c:512
 #, c-format
@@ -968,15 +966,15 @@ msgstr "Booleano esperado, recebi %s"
 #: gconf/gconf.c:545
 #, c-format
 msgid "Expected schema, got %s"
-msgstr "Schema esperado, recebi %s"
+msgstr "Esquema esperado, recebi %s"
 
 #: gconf/gconfd.c:147
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr ""
-"gconfd foi compilado com opção de depuração; tentando carregar gconf.path do "
-"diretório fonte"
+"gconfd foi compilado com opção de depuração; tentando carregar gconf.caminho "
+"do diretório fonte"
 
 #: gconf/gconfd.c:161
 #, c-format
@@ -990,13 +988,13 @@ msgstr ""
 #. request would result in another failed gconfd being spawned.
 #.
 #: gconf/gconfd.c:169
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit %s"
 msgstr ""
-"Nenhuma fonte de configuração no caminho de fontes. Não será possível salvar "
-"a configuração; edite "
+"Nenhuma fonte de configuração no caminho de fontes; a configuração não será "
+"salva; edite %s"
 
 #: gconf/gconfd.c:182
 #, c-format
@@ -1016,23 +1014,22 @@ msgid ""
 "No writable config sources successfully resolved, may not be able to save "
 "some configuration changes"
 msgstr ""
-"Nenhuma fonte de configuração com permissão de escrita foi resolvido com "
+"Nenhuma fonte de configuração com permissão de escrita foi resolvida com "
 "sucesso, pode não ser possível salvar algumas modificações de configuração"
 
 #: gconf/gconfd.c:237
 #, c-format
 msgid "Received signal %d, dumping core. Please report a GConf bug."
 msgstr ""
-"Recebido sinal %d, gerando um core. Por favor, crie um relatório de erro do "
-"GConf."
+"Recebido sinal %d, gerando um core. Por favor, reporte um bug no GConf."
 
 #: gconf/gconfd.c:255
 #, c-format
 msgid ""
 "Received signal %d, shutting down abnormally. Please file a GConf bug report."
 msgstr ""
-"Recebido sinal %d, desligando anormalmente. Por favor, crie um relatório de "
-"erro do GConf."
+"Recebido sinal %d, desligando anormalmente. Por favor, reporte um bug no "
+"GConf."
 
 #: gconf/gconfd.c:272
 #, c-format
@@ -1055,9 +1052,9 @@ msgid "Owner of %s is not the current user"
 msgstr "O proprietário de %s não é o usuário atual"
 
 #: gconf/gconfd.c:365
-#, fuzzy, c-format
+#, c-format
 msgid "Bad permissions %lo on directory %s"
-msgstr "Permissões %o inválidas no diretório %s"
+msgstr "Permissões %lo inválidas no diretório %s"
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
@@ -1080,7 +1077,7 @@ msgstr "O diretório %s tem um problema; gconfd não pode usá-lo"
 #, c-format
 msgid "Failed to write byte to pipe fd %d so client program may hang: %s"
 msgstr ""
-"Falha ao escrever byte no pipe fd %d logo o programa cliente pode travar: %s"
+"Falha ao escrever byte no canal fd %d logo o programa cliente pode travar: %s"
 
 #: gconf/gconfd.c:542
 #, c-format
@@ -1098,7 +1095,7 @@ msgstr "Terminando"
 
 #: gconf/gconfd.c:635
 msgid "GConf server is not in use, shutting down."
-msgstr "Servidor GConf não está sendo usado, desligando."
+msgstr "O servidor GConf não está sendo usado, desligando."
 
 #: gconf/gconftool.c:93
 msgid "Set a key to a value and sync. Use with --type."
@@ -1113,8 +1110,8 @@ msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and --"
 "type."
 msgstr ""
-"Atribui um schema e sincroniza. Use com --short-desc, --long-desc, --owner e "
-"--type."
+"Atribui um esquema e sincroniza. Use com --short-desc, --long-desc, --owner "
+"e --type."
 
 #: gconf/gconftool.c:121
 msgid "Unset the keys on the command line"
@@ -1141,7 +1138,7 @@ msgid ""
 "Dump to standard out an XML description of all entries under a dir, "
 "recursively."
 msgstr ""
-"Imprime uma descrição XML de todos os itens sob um diretório, recursivamente."
+"Imprime uma descrição XML de todos os itens em um diretório, recursivamente."
 
 #: gconf/gconftool.c:166
 msgid ""
@@ -1154,7 +1151,7 @@ msgstr ""
 #: gconf/gconftool.c:175
 msgid "Print all subdirectories and entries under a dir, recursively."
 msgstr ""
-"Imprime todos os subdiretórios e itens sob um diretório, recursivamente."
+"Imprime todos os subdiretórios e itens em um diretório, recursivamente."
 
 #: gconf/gconftool.c:184
 msgid "Return 0 if the directory exists, 2 if it does not."
@@ -1181,8 +1178,8 @@ msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
 msgstr ""
-"Especifica o tipo do valor sendo atribuído ou o tipo do valor um schema "
-"descreve. Abreviações únicas são permitidas."
+"Especifica o tipo do valor sendo atribuído ou o tipo do valor que um esquema "
+"descreve. Abreviações são permitidas."
 
 #: gconf/gconftool.c:221
 msgid "int|bool|float|string|list|pair"
@@ -1194,20 +1191,20 @@ msgstr "Imprime o tipo de dado de uma chave para a saída padrão."
 
 #: gconf/gconftool.c:238
 msgid "Get the number of elements in a list key."
-msgstr "Obtém o número de elementos em uma lista de chave."
+msgstr "Obtém o número de elementos em uma lista de chaves."
 
 #: gconf/gconftool.c:247
 msgid "Get a specific element from a list key, numerically indexed."
 msgstr ""
-"Obtenha um elemento específico de uma lista de chave indexada numericamente."
+"Obtenha um elemento específico de uma lista de chaves indexada numericamente."
 
 #: gconf/gconftool.c:256
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
-"Especifica o tipo do valor de lista sendo atribuído ou o tipo do valor um "
-"schema descreve. Abreviações únicas são permitidas."
+"Especifica o tipo do valor de lista sendo atribuído ou o tipo do valor que "
+"um esquema descreve. Abreviações são permitidas."
 
 #: gconf/gconftool.c:257 gconf/gconftool.c:266 gconf/gconftool.c:275
 msgid "int|bool|float|string"
@@ -1219,7 +1216,7 @@ msgid ""
 "schema describes. Unique abbreviations OK."
 msgstr ""
 "Especifica o tipo do valor do car do par sendo atribuído ou o tipo do valor "
-"um schema descreve. Abreviações únicas são permitidas."
+"que um esquema descreve. Abreviações são permitidas."
 
 #: gconf/gconftool.c:274
 msgid ""
@@ -1227,11 +1224,11 @@ msgid ""
 "schema describes. Unique abbreviations OK."
 msgstr ""
 "Especifica o tipo do valor do cdr do par sendo atribuído ou o tipo do valor "
-"um schema descreve. Abreviações únicas são permitidas."
+"que um esquema descreve. Abreviações são permitidas."
 
 #: gconf/gconftool.c:283
 msgid "Specify a short half-line description to go in a schema."
-msgstr "Especifica uma breve descrição de meia linha para um schema."
+msgstr "Especifica uma breve descrição de meia linha para um esquema."
 
 #: gconf/gconftool.c:284 gconf/gconftool.c:293
 msgid "DESCRIPTION"
@@ -1239,19 +1236,19 @@ msgstr "DESCRIÇÃO"
 
 #: gconf/gconftool.c:292
 msgid "Specify a several-line description to go in a schema."
-msgstr "Especifica uma descrição com várias linhas para um schema."
+msgstr "Especifica uma descrição com várias linhas para um esquema."
 
 #: gconf/gconftool.c:301
 msgid "Specify the owner of a schema"
-msgstr "Especifica o dono de um schema"
+msgstr "Especifica o proprietário de um esquema"
 
 #: gconf/gconftool.c:302
 msgid "OWNER"
-msgstr "DONO"
+msgstr "PROPRIETÁRIO"
 
 #: gconf/gconftool.c:310
 msgid "Specify a schema file to be installed"
-msgstr "Especifica um arquivo de schema a ser instalado"
+msgstr "Especifica um arquivo de esquema a ser instalado"
 
 #: gconf/gconftool.c:311
 msgid "FILENAME"
@@ -1272,7 +1269,7 @@ msgid ""
 "is not running."
 msgstr ""
 "Acessa o banco de dados de configuração diretamente, ignorando o servidor. "
-"Exige que gconfd não esteja sendo executado."
+"Exige que o gconfd não esteja sendo executado."
 
 #: gconf/gconftool.c:337
 msgid ""
@@ -1280,9 +1277,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 ""
-"Instala corretamente arquivos de schema pela linha de comando no banco de "
+"Instala corretamente arquivos de esquema pela linha de comando no banco de "
 "dados. A variável de ambiente GCONF_CONFIG_SOURCE deve receber uma fonte de "
-"configuração não-padrão ou receber a cadeia vazia para usar o padrão."
+"configuração não-padrão ou receber texto vazio para usar o padrão."
 
 #: gconf/gconftool.c:346
 msgid ""
@@ -1290,9 +1287,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 ""
-"Desinstala corretamente arquivos de schema pela linha de comando no banco de "
-"dados. A variável de ambiente GCONF_CONFIG_SOURCE deve receber uma fonte de "
-"configuração não-padrão ou receber a cadeia vazia para usar o padrão."
+"Desinstala corretamente arquivos de esquema pela linha de comando no banco "
+"de dados. A variável de ambiente GCONF_CONFIG_SOURCE deve receber uma fonte "
+"de configuração não-padrão ou receber um texto vazio para usar o padrão."
 
 #: gconf/gconftool.c:355
 msgid ""
@@ -1320,17 +1317,17 @@ msgstr "Obtém a linha longa de documentação para uma chave"
 
 #: gconf/gconftool.c:391
 msgid "Get the name of the schema applied to this key"
-msgstr "Obtém o nome do schema aplicado a esta chave"
+msgstr "Obtém o nome do esquema aplicado a esta chave"
 
 #: gconf/gconftool.c:400
 msgid "Specify the schema name followed by the key to apply the schema name to"
 msgstr ""
-"Especifica o nome do schema seguido pela chave à qual se deseja aplicar este "
-"nome"
+"Especifica o nome do esquema seguido pela chave à qual se deseja aplicar "
+"este nome"
 
 #: gconf/gconftool.c:409
 msgid "Remove any schema name applied to the given keys"
-msgstr "Remove qualquer nome de schema aplicado às chaves dadas"
+msgstr "Remove qualquer nome de esquema aplicado às chaves dadas"
 
 #: gconf/gconftool.c:418
 msgid "Get the name of the default source"
@@ -1373,7 +1370,7 @@ msgid ""
 "--set_schema should not be used with --get, --set, --unset, --all-entries, --"
 "all-dirs\n"
 msgstr ""
-"--set_schema não deve ser usado com --get, --set, --unset, --all-entries ou "
+"--set_esquema não deve ser usado com --get, --set, --unset, --all-entries ou "
 "--all-dirs\n"
 
 #: gconf/gconftool.c:595
@@ -1389,7 +1386,7 @@ msgstr "Um tipo deve ser especificado ao atribuir um valor\n"
 #: gconf/gconftool.c:693
 #, c-format
 msgid "%s option must be used by itself.\n"
-msgstr "Opção %s deve ser usada sozinha.\n"
+msgstr "A opção %s deve ser utilizada sozinha.\n"
 
 #: gconf/gconftool.c:702
 msgid ""
@@ -1401,23 +1398,24 @@ msgstr ""
 #: gconf/gconftool.c:708
 msgid "You should use --direct when using a non-default configuration source\n"
 msgstr ""
-"É necessário usar --direct quando usar uma fonte de configuração não-padrão\n"
+"É necessário usar --direct quando utilizar uma fonte de configuração não-"
+"padrão\n"
 
 #: gconf/gconftool.c:714
 #, c-format
 msgid "Failed to init GConf: %s\n"
-msgstr "Falha ao iniciar GConf: %s\n"
+msgstr "Falha ao iniciar o 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 definida, não instalando schemas\n"
+"GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL definida, não instalando esquemas\n"
 
 #: gconf/gconftool.c:750
 msgid ""
 "GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL is set, not uninstalling schemas\n"
 msgstr ""
-"GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL definida; não desinstalando schemas\n"
+"GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL definida; não desinstalando esquemas\n"
 
 #: gconf/gconftool.c:763
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
@@ -1434,20 +1432,19 @@ msgid "Shutdown error: %s\n"
 msgstr "Erro ao desligar: %s\n"
 
 #: gconf/gconftool.c:1120
-#, fuzzy
 msgid "Must specify one or more directories to recursively list.\n"
 msgstr ""
-"É necessário especificar um ou mais diretórios para listar recursivamente.\n"
+"É necessário especificar um ou mais diretórios para utilizar uma lista "
+"recursiva.\n"
 
 #: gconf/gconftool.c:1172
-#, fuzzy
 msgid "Must specify one or more directories to dump.\n"
 msgstr "É necessário especificar um ou mais diretórios para descarregar.\n"
 
 #: gconf/gconftool.c:1214 gconf/gconftool.c:1479
 #, c-format
 msgid "Failure listing entries in `%s': %s\n"
-msgstr "Falha ao listar entradas em `%s': %s\n"
+msgstr "Falha ao construir a lista de entradas em `%s': %s\n"
 
 #: gconf/gconftool.c:1232
 msgid "(no value set)"
@@ -1535,7 +1532,7 @@ msgstr "Sem valor a atribuir para chave: `%s'\n"
 
 #: gconf/gconftool.c:1726
 msgid "Cannot set schema as value\n"
-msgstr "Não é possível atribuir um schema como valor\n"
+msgstr "Não é possível atribuir um esquema como valor\n"
 
 #: gconf/gconftool.c:1736
 msgid "When setting a list you must specify a primitive list-type\n"
@@ -1575,7 +1572,7 @@ msgstr "É necessário especificar uma chave para pesquisar o tamanho.\n"
 #: gconf/gconftool.c:1880 gconf/gconftool.c:1925
 #, c-format
 msgid "Key %s is not a list.\n"
-msgstr "A chave %s não é uma lista\n"
+msgstr "A chave %s não é uma lista.\n"
 
 #: gconf/gconftool.c:1900
 msgid "Must specify a key from which to get list element.\n"
@@ -1585,7 +1582,7 @@ msgstr ""
 
 #: gconf/gconftool.c:1931
 msgid "Must specify list index.\n"
-msgstr "É necessário especificar o índice da lista\n"
+msgstr "É necessário especificar o índice da lista.\n"
 
 #: gconf/gconftool.c:1938
 msgid "List index must be non-negative.\n"
@@ -1602,66 +1599,66 @@ msgstr "É necessário especificar uma chave ou chaves na linha de comando\n"
 #: gconf/gconftool.c:1993
 #, c-format
 msgid "No schema known for `%s'\n"
-msgstr "Não existe schema conhecido para `%s'\n"
+msgstr "Não existe esquema conhecido para `%s'\n"
 
 #: gconf/gconftool.c:2026
 #, c-format
 msgid "No doc string stored in schema at '%s'\n"
-msgstr "Não existe linha de documentação no schema em '%s'\n"
+msgstr "Não existe linha de documentação no esquema em '%s'\n"
 
 #: gconf/gconftool.c:2031
 #, c-format
 msgid "Error getting schema at '%s': %s\n"
-msgstr "Erro ao obter schema em '%s': %s\n"
+msgstr "Erro ao obter esquema em '%s': %s\n"
 
 #: gconf/gconftool.c:2038
 #, c-format
 msgid "No schema stored at '%s'\n"
-msgstr "Não existe schema armazenado em '%s'\n"
+msgstr "Não existe esquema armazenado em '%s'\n"
 
 #: gconf/gconftool.c:2041
 #, c-format
 msgid "Value at '%s' is not a schema\n"
-msgstr "Valor em '%s' não é um schema\n"
+msgstr "Valor em '%s' não é um esquema\n"
 
 #: gconf/gconftool.c:2097
 msgid "Must specify a schema name followed by the key name to apply it to\n"
 msgstr ""
-"É necessárior especificar um nome de schema seguido por um nome de chave "
+"É necessárior especificar um nome de esquema seguido por um nome de chave "
 "onde aplicá-lo\n"
 
 #: gconf/gconftool.c:2104
 #, c-format
 msgid "Error associating schema name '%s' with key name '%s': %s\n"
-msgstr "Erro ao associar nome de schema '%s' com nome de chave '%s': %s\n"
+msgstr "Erro ao associar nome de esquema '%s' com nome de chave '%s': %s\n"
 
 #: gconf/gconftool.c:2122
 msgid "Must specify keys to unapply schema from\n"
-msgstr "É necessário especificar uma chave para remover o schema\n"
+msgstr "É necessário especificar uma chave para remover o esquema\n"
 
 #: gconf/gconftool.c:2132
 #, c-format
 msgid "Error removing schema name from '%s': %s\n"
-msgstr "Erro removendo nome de schema de '%s': %s\n"
+msgstr "Erro removendo nome de esquema de '%s': %s\n"
 
 #: gconf/gconftool.c:2157
 msgid "Must specify key (schema name) as the only argument\n"
 msgstr ""
-"É necessário especificar a chave (nome do schema) como único argumento\n"
+"É necessário especificar a chave (nome do esquema) como único argumento\n"
 
 #: gconf/gconftool.c:2199
 msgid "List type must be a primitive type: string, int, float or bool\n"
-msgstr "Tipo de lista deve ser um tipo primitivo: string, int, float or bool\n"
+msgstr "Tipo de lista deve ser um tipo primitivo: string, int, float ou bool\n"
 
 #: gconf/gconftool.c:2219
 msgid "Pair car type must be a primitive type: string, int, float or bool\n"
 msgstr ""
-"Tipo de car de par deve ser um tipo primitivo: string, int, float or bool\n"
+"Tipo de car de par deve ser um tipo primitivo: string, int, float ou bool\n"
 
 #: gconf/gconftool.c:2239
 msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
 msgstr ""
-"Tipo de cdr de par deve ser um tipo primitivo: string, int, float or bool\n"
+"Tipo de cdr de par deve ser um tipo primitivo: string, int, float ou bool\n"
 
 #: gconf/gconftool.c:2254
 #, c-format
@@ -1674,7 +1671,6 @@ msgid "Error syncing: %s"
 msgstr "Erro ao sincronizar: %s"
 
 #: gconf/gconftool.c:2283
-#, fuzzy
 msgid "Must specify one or more directories to get key/value pairs from.\n"
 msgstr ""
 "É necessário especificar um ou mais diretórios de onde obter pares chave/"
@@ -1697,10 +1693,9 @@ msgstr ""
 #: gconf/gconftool.c:2342
 #, c-format
 msgid "Failure during recursive unset of \"%s\": %s\n"
-msgstr "Falha durante remoção de definições recursiva de \"%s\": %s\n"
+msgstr "Falha durante a remoção de definições recursivas de \"%s\": %s\n"
 
 #: gconf/gconftool.c:2362
-#, fuzzy
 msgid "Must specify one or more directories to get subdirs from.\n"
 msgstr ""
 "É necessário especificar um ou mais diretórios de onde obter subdiretórios.\n"
@@ -1713,23 +1708,23 @@ msgstr "Erro ao listar diretórios: %s\n"
 #: gconf/gconftool.c:2532
 msgid "WARNING: must specify both a <car> and a <cdr> in a <pair>\n"
 msgstr ""
-"ALERTA: ambos devem ser especificados um <car> e um <cdr> em um <pair>\n"
+"ALERTA: devem ser especificados tanto um <car> quanto um <cdr> em um <pair>\n"
 
 #: gconf/gconftool.c:2559
 #, c-format
 msgid "WARNING: key specified (%s) for schema under a <value> - ignoring\n"
 msgstr ""
-"ALERTA: a chave (%s) especificada para schema está abaixo de <value> - "
+"ALERTA: a chave (%s) especificada para esquema está abaixo de <value> - "
 "ignorando\n"
 
 #: gconf/gconftool.c:2592
 msgid "WARNING: must have a child node under <value>\n"
-msgstr "ALERTA: deve haver um nódulo filho abaixo de <value>\n"
+msgstr "ALERTA: deve haver um nó filho abaixo de <value>\n"
 
 #: gconf/gconftool.c:2598
 #, c-format
 msgid "WARNING: node <%s> not understood\n"
-msgstr "ALERTA: nódulo <%s> não entendido\n"
+msgstr "ALERTA: nó <%s> não entendido\n"
 
 #: gconf/gconftool.c:2616
 #, c-format
@@ -1739,12 +1734,12 @@ msgstr "ALERTA: Falha ao analisar o valor `%s' interno\n"
 #: gconf/gconftool.c:2637
 #, c-format
 msgid "WARNING: Failed to parse float value `%s'\n"
-msgstr "ALERTA: Falha ao analisar o valor flutuante `%s'\n"
+msgstr "ALERTA: Falha ao analisar o valor float `%s'\n"
 
 #: gconf/gconftool.c:2659
 #, c-format
 msgid "WARNING: Failed to parse string value `%s'\n"
-msgstr "ALERTA: Falha ao analisar o valor `%s' da cadeia\n"
+msgstr "ALERTA: Falha ao analisar o valor texto `%s'\n"
 
 #: gconf/gconftool.c:2680
 #, c-format
@@ -1754,31 +1749,32 @@ msgstr "ALERTA: Falha ao analisar o valor boleano `%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 "ALERTA: falha ao associar schema `%s' com chave `%s': %s\n"
+msgstr "ALERTA: falha ao associar esquema `%s' com a chave `%s': %s\n"
 
 #: gconf/gconftool.c:2901
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
-msgstr "ALERTA: tipo inválido ou faltante para schema (%s)\n"
+msgstr "ALERTA: tipo inválido ou faltante para o esquema (%s)\n"
 
 #: gconf/gconftool.c:2910
 #, c-format
 msgid "WARNING: invalid or missing list_type for schema (%s)\n"
-msgstr "ALERTA: tipo de lista inválido ou faltante para schema (%s)\n"
+msgstr "ALERTA: tipo de lista inválido ou faltante para o esquema (%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 "ALERTA: Falha ao analisar valor padrão `%s' para schema (%s)\n"
+msgstr "ALERTA: Falha ao analisar valor padrão `%s' para o esquema (%s)\n"
 
 #: gconf/gconftool.c:2939
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
-msgstr "ALERTA: tipo de car ou de cdr inválido ou faltante para schema (%s)\n"
+msgstr ""
+"ALERTA: tipo de car ou de cdr inválido ou faltante para o esquema (%s)\n"
 
 #: gconf/gconftool.c:2964
 msgid "WARNING: You cannot set a default value for a schema\n"
-msgstr "ALERTA: Você não pode atribuir uma valor padrão a um schema\n"
+msgstr "ALERTA: Você não pode atribuir uma valor padrão a um esquema\n"
 
 #: gconf/gconftool.c:2993
 msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
@@ -1811,16 +1807,16 @@ msgstr ""
 
 #: gconf/gconftool.c:3140
 msgid "WARNING: empty <applyto> node"
-msgstr "ALERTA: nódulo <applyto> vazio"
+msgstr "ALERTA: nó <applyto> vazio"
 
 #: gconf/gconftool.c:3143 gconf/gconftool.c:3405
 #, c-format
 msgid "WARNING: node <%s> not understood below <schema>\n"
-msgstr "ALERTA: nódulo <%s> não entendido sob <schema>\n"
+msgstr "ALERTA: nó <%s> não entendido sob <esquema>\n"
 
 #: gconf/gconftool.c:3154
 msgid "WARNING: no <list_type> specified for schema of type list\n"
-msgstr "ALERTA: não foi especificado <list_type> para schema de tipo lista\n"
+msgstr "ALERTA: não foi especificado <list_type> para esquema de tipo lista\n"
 
 #: gconf/gconftool.c:3160
 msgid "WARNING: no <car_type> specified for schema of type pair\n"
@@ -1828,63 +1824,62 @@ msgstr "ALERTA: não foi especificado <car_type> para esquema de tipo par\n"
 
 #: gconf/gconftool.c:3166
 msgid "WARNING: no <cdr_type> specified for schema of type pair\n"
-msgstr "ALERTA: não foi especificado <cdr_type> para schema de tipo par\n"
+msgstr "ALERTA: não foi especificado <cdr_type> para esquema de tipo par\n"
 
 #: gconf/gconftool.c:3195
 msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
-msgstr ""
-"ALERTA: nódulo <locale> não possui atributo `name=\"locale\"', ignorando\n"
+msgstr "ALERTA: nó <locale> não possui atributo `name=\"locale\"', ignorando\n"
 
 #: gconf/gconftool.c:3201
 #, c-format
 msgid ""
 "WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
 msgstr ""
-"ALERTA: múltiplos nódulos <locale> para o locale `%s', ignorando todos após "
-"o primeiro\n"
+"ALERTA: múltiplos nó <locale> para o locale `%s', ignorando todos após o "
+"primeiro\n"
 
 #: gconf/gconftool.c:3299
 #, c-format
 msgid "WARNING: Invalid node <%s> in a <locale> node\n"
-msgstr "ALERTA: Nódulo inválido <%s> em um nódulo <locale>\n"
+msgstr "ALERTA: Nó inválido <%s> em um nó <locale>\n"
 
 #: gconf/gconftool.c:3340
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
-msgstr "Anexado schema `%s' à chave `%s'\n"
+msgstr "Anexado esquema `%s' à chave `%s'\n"
 
 #: gconf/gconftool.c:3414
 msgid "You must have at least one <locale> entry in a <schema>\n"
-msgstr "Você deve ter pelo menos um item <locale> em um <schema>\n"
+msgstr "Você deve ter pelo menos um item <locale> em um <esquema>\n"
 
 #: gconf/gconftool.c:3446
 #, c-format
 msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
-msgstr "ALERTA: falha ao instalar schema `%s' da localidade `%s': %s\n"
+msgstr "ALERTA: falha ao instalar esquema `%s' da localidade `%s': %s\n"
 
 #: gconf/gconftool.c:3454
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
-msgstr "Instalado schema `%s' para locale `%s'\n"
+msgstr "Instalado esquema `%s' para locale `%s'\n"
 
 #: gconf/gconftool.c:3478
 #, c-format
 msgid "WARNING: failed to uninstall schema `%s' locale `%s': %s\n"
-msgstr "ALERTA: falha ao desinstalar schema `%s' locale `%s': %s\n"
+msgstr "ALERTA: falha ao desinstalar esquema `%s' locale `%s': %s\n"
 
 #: gconf/gconftool.c:3486
 #, c-format
 msgid "Uninstalled schema `%s' from locale `%s'\n"
-msgstr "Schema `%s' desinstalado da localidade `%s'\n"
+msgstr "Esquema `%s' desinstalado da localidade `%s'\n"
 
 #: gconf/gconftool.c:3524
 msgid "WARNING: no key specified for schema\n"
-msgstr "ALERTA: sem chave especificada para schema\n"
+msgstr "ALERTA: sem chave especificada para o esquema\n"
 
 #: gconf/gconftool.c:3565
 #, c-format
 msgid "WARNING: node <%s> not understood below <%s>\n"
-msgstr "ALERTA: nódulo <%s> não entendido sob <%s>\n"
+msgstr "ALERTA: nó <%s> não entendido sob <%s>\n"
 
 #: gconf/gconftool.c:3596
 #, c-format
@@ -1894,23 +1889,23 @@ msgstr "Falha ao abrir `%s': %s\n"
 #: gconf/gconftool.c:3603
 #, c-format
 msgid "Document `%s' is empty?\n"
-msgstr "Documento `%s' está vazio?\n"
+msgstr "O documento `%s' está vazio?\n"
 
 #: gconf/gconftool.c:3615
 #, c-format
 msgid "Document `%s' has the wrong type of root node (<%s>, should be <%s>)\n"
 msgstr ""
-"O documento `%s' tem o tipo errado do nódulo raiz (<%s>, deveria ser <%s>)\n"
+"O documento `%s' tem o tipo errado de nó raiz (<%s>, deveria ser <%s>)\n"
 
 #: gconf/gconftool.c:3628
 #, c-format
 msgid "Document `%s' has no top level <%s> node\n"
-msgstr "O documento `%s' não possui nódulo <%s> de nível principal\n"
+msgstr "O documento `%s' não possui nó <%s> de nível principal\n"
 
 #: gconf/gconftool.c:3642
 #, c-format
 msgid "WARNING: node <%s> below <%s> not understood\n"
-msgstr "ALERTA: nódulo <%s> abaixo de <%s> não entendido\n"
+msgstr "ALERTA: nó <%s> abaixo de <%s> não entendido\n"
 
 #: gconf/gconftool.c:3653 gconf/gconftool.c:3688 gconf/gconftool.c:3720
 #, c-format
@@ -1919,11 +1914,11 @@ msgstr "Erro ao sincronizar dados de configuração: %s"
 
 #: gconf/gconftool.c:3672
 msgid "Must specify some schema files to install\n"
-msgstr "É necessário especificar alguns arquivos de schema a instalar\n"
+msgstr "É necessário especificar alguns arquivos de esquema a instalar\n"
 
 #: gconf/gconftool.c:3704
 msgid "Must specify some schema files to uninstall\n"
-msgstr "É necessário especificar alguns arquivos de schema para desinstalar\n"
+msgstr "É necessário especificar alguns arquivos de esquema para desinstalar\n"
 
 #: gconf/gconftool.c:3741
 #, c-format
@@ -1963,17 +1958,36 @@ msgid ""
 "directory:\n"
 "  %s\n"
 msgstr ""
-"Tentando quebrar o seu aplicativo atribuíndo valores inválidos para chaves "
+"Tentando quebrar o seu aplicativo, atribuíndo valores inválidos para chaves "
 "no diretório:\n"
 "  %s\n"
 
-#, fuzzy
 #~ msgid "Cannot find directory %s\n"
-#~ msgstr "Não foi possível criar diretório `%s': %s"
+#~ msgstr "Não foi possível encontrar o diretório %s\n"
 
-#, fuzzy
 #~ msgid "Error saving GConf tree to '%s': %s\n"
-#~ msgstr "Erro ao obter schema em '%s': %s\n"
+#~ msgstr "Erro ao salvar a árvore GConf para '%s': %s\n"
+
+#~ msgid "Usage: %s <dir>\n"
+#~ msgstr "Utilização: %s <dir>\n"
+
+#~ 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 ""
+#~ "Utilização: %s <dir>\n"
+#~ "  Mescla uma hierarquia de sistema de arquivos de suporte em etiquetas do "
+#~ "tipo:\n"
+#~ "    dir/%%gconf.xml\n"
+#~ "        subdir1/%%gconf.xml\n"
+#~ "        subdir2/%%gconf.xml\n"
+#~ "  para:\n"
+#~ "    dir/%%gconf-tree.xml\n"
 
 #~ msgid "Received invalid value in set request"
 #~ msgstr "Valor inválido recebido na requisição de atribuição"
@@ -1982,13 +1996,13 @@ msgstr ""
 #~ "Couldn't make sense of CORBA value received in set request for key `%s'"
 #~ msgstr ""
 #~ "Não foi possível interpretar o valor CORBA recebido na requisição de "
-#~ "atribuição para chave `%s'"
+#~ "atribuição para a chave `%s'"
 
 #~ msgid "Received request to drop all cached data"
-#~ msgstr "Recebida requisição para descartar todos os dados do cache"
+#~ msgstr "Recebida a requisição para descartar todos os dados do cache"
 
 #~ msgid "Received request to sync synchronously"
-#~ msgstr "Recebida requisição para sincronizar sincronamente"
+#~ msgstr "Recebida a requisição para sincronizar sincronamente"
 
 #~ msgid "Fatal error: failed to get object reference for ConfigDatabase"
 #~ msgstr "Erro fatal: falha ao obter referência de objeto para ConfigDatabase"
@@ -2014,13 +2028,13 @@ msgstr ""
 #~ "de forma estranha): %s"
 
 #~ msgid "Invalid UTF-8 in string value in '%s'"
-#~ msgstr "UTF-8 inválido no valor string em '%s'"
+#~ msgstr "UTF-8 inválido no valor texto em '%s'"
 
 #~ msgid "Couldn't interpret CORBA value for list element"
-#~ msgstr "Nao foi possível interpretar valor CORBA para elemento de lista"
+#~ msgstr "Nao foi possível interpretar valor CORBA para elemento da lista"
 
 #~ msgid "Incorrect type for list element in %s"
-#~ msgstr "Tipo incorreto para elemento de lista em %s"
+#~ msgstr "Tipo incorreto para elemento da lista em %s"
 
 #~ msgid "Received list from gconfd with a bad list type"
 #~ msgstr "Lista recebida de gconfd com um tipo de lista inválido"
@@ -2029,16 +2043,16 @@ msgstr ""
 #~ msgstr "Falha ao converter objeto para IOR"
 
 #~ msgid "Invalid UTF-8 in locale for schema"
-#~ msgstr "UTF-8 inválido no locale para schema"
+#~ msgstr "UTF-8 inválido no locale para esquema"
 
 #~ msgid "Invalid UTF-8 in short description for schema"
-#~ msgstr "UTF-8 inválido na descrição curta para schema"
+#~ msgstr "UTF-8 inválido na descrição curta para esquema"
 
 #~ msgid "Invalid UTF-8 in long description for schema"
-#~ msgstr "UTF-8 inválido na descrição longa para schema"
+#~ msgstr "UTF-8 inválido na descrição longa para esquema"
 
 #~ msgid "Invalid UTF-8 in owner for schema"
-#~ msgstr "UTF-8 inválido no dono para schema"
+#~ msgstr "UTF-8 inválido no proprietário para esquema"
 
 #~ msgid "Server ping error: %s"
 #~ msgstr "Erro no ping do servidor: %s"
@@ -2046,7 +2060,7 @@ msgstr ""
 #~ msgid ""
 #~ "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
 #~ msgstr ""
-#~ "Falha ao criar pipe para se comunicar com o daemon gconf filho: %s\n"
+#~ "Falha ao criar canal para se comunicar com o daemon gconf filho: %s\n"
 
 #~ msgid "Failed to launch configuration server: %s\n"
 #~ msgstr "Falha ao lançar servidor de configuração: %s\n"
@@ -2057,21 +2071,21 @@ msgstr ""
 #~ "due to a system crash. See http://www.gnome.org/projects/gconf/ for "
 #~ "information. (Details - %s)"
 #~ msgstr ""
-#~ "Falha ao contatar servidor de configuração; algumas das causas possíveis "
+#~ "Falha ao contactar servidor de configuração; algumas das causas possíveis "
 #~ "são: necessidade de habilitar rede TCP/IP no ORBit ou existência de "
-#~ "arquivos de bloqueio deixados para trás no NFS por causa de um erro do "
-#~ "sistema. Para mais informações consulte http://www.gnome.org/projects/"
+#~ "arquivos de bloqueio deixados para trás no NFS devido a algum um erro do "
+#~ "sistema. Para mais informações consulte: http://www.gnome.org/projects/"
 #~ "gconf/ (Detalhes - %s)."
 
 #~ msgid "none"
 #~ msgstr "nenhum"
 
 #~ msgid "Server couldn't resolve the address `%s'"
-#~ msgstr "Servidor não conseguiu resolver o endereço `%s'"
+#~ msgstr "O servidor não conseguiu resolver o endereço `%s'"
 
 #~ msgid "Can't add notifications to a local configuration source"
 #~ msgstr ""
-#~ "Não é possível incluir notificações para uma fonde de configurações local"
+#~ "Não é possível incluir notificações para uma fonte de configurações local"
 
 #~ msgid "Adding client to server's list failed, CORBA error: %s"
 #~ msgstr "Falha ao incluir cliente na lista do servidor, erro CORBA: %s"
@@ -2089,20 +2103,20 @@ msgstr ""
 #~ msgstr "Falha ao obter referência de objeto para ConfigServer"
 
 #~ msgid "Returning exception: %s"
-#~ msgstr "Levantando exceção: %s"
+#~ msgstr "Retornando exceção: %s"
 
 #~ msgid ""
 #~ "Failed to open gconfd logfile; won't be able to restore listeners after "
 #~ "gconfd shutdown (%s)"
 #~ msgstr ""
 #~ "Falha ao abrir arquivo de registro do gconfd; não será possível restaurar "
-#~ "ouvidores após uma parada do gconfd (%s)"
+#~ "ouvidores após o gconfd desligar (%s)"
 
 #~ msgid ""
 #~ "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 #~ msgstr ""
-#~ "Falha ao fechar arquivo de registro do gconfd; dados podem não ter sido "
-#~ "salvos corretamente (%s)"
+#~ "Falha ao fechar arquivo de registro do gconfd; os dados podem não ter "
+#~ "sido salvos corretamente (%s)"
 
 #~ msgid "Could not open saved state file '%s' for writing: %s"
 #~ msgstr "Não foi possível abrir arquivo de estado '%s' para escrita: %s"
@@ -2133,7 +2147,7 @@ msgstr ""
 #~ "resolver o banco de dados"
 
 #~ msgid "Error reading saved state file: %s"
-#~ msgstr "Erro ao lerr arquivo de estado: %s"
+#~ msgstr "Erro ao ler arquivo de estado: %s"
 
 #~ msgid "Unable to open saved state file '%s': %s"
 #~ msgstr "Não é possível abrir arquivo de estado '%s': %s"
diff --git a/po/sk.po b/po/sk.po
index 4074561b..886ac66f 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,23 +1,25 @@
 # translation of gconf.HEAD.po to Slovak
 # translation of sk.po to Slovak
 # GConf Slovak translation.
-# Copyright (C) 2001,2002, 2003 Free Software Foundation, Inc.
-# Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>, 2001,2002.
+# Copyright (C) 2001,2002, 2003, 2004 Free Software Foundation, Inc.
+# Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>, 2001,2002, 2004.
 # Stanislav Višňovský <visnovsky@nenya.ms.mff.cuni.cz>, 2002.
 # Stanislav Visnovsky <visnov@suse.cz>, 2003.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNOME gconf.HEAD\n"
+"Project-Id-Version: gconf.HEAD\n"
 "POT-Creation-Date: 2003-12-05 00:37+0100\n"
-"PO-Revision-Date: 2003-09-09 17:51+0200\n"
-"Last-Translator: Stanislav Visnovsky <visnov@suse.cz>\n"
+"PO-Revision-Date: 2004-03-09 17:53+0100\n"
+"Last-Translator: Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>\n"
 "Language-Team: Slovak <sk-i18n@linux.sk>\n"
 "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"
+"X-Generator: KBabel 1.3\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: backends/dir-utils.c:108
 #, c-format
@@ -64,7 +66,6 @@ msgid "Error syncing the XML backend directory cache: %s"
 msgstr "Chyba pri synchronizácii vyrovnávacej pamäti pre modul XML: %s"
 
 #: backends/xml-backend.c:684
-#, fuzzy
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -88,7 +89,7 @@ msgid "Initializing XML backend module"
 msgstr "Inicializujem XML modul"
 
 #: backends/xml-backend.c:877
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "Zlyhalo uvoľnenie zámku na priečinku XML \"%s\": %s"
 
@@ -366,9 +367,9 @@ msgid "Error checking existence of `%s': %s"
 msgstr "Chyba pri kontrole existencie `%s': %s"
 
 #: gconf/gconf-database.c:520
-#, fuzzy, c-format
+#, c-format
 msgid "Error removing directory \"%s\": %s"
-msgstr "Chyba pri odstraňovaní priečinku `%s': %s"
+msgstr "Chyba pri odstraňovaní priečinku \"%s\": %s"
 
 #: gconf/gconf-database.c:547
 #, c-format
@@ -969,13 +970,13 @@ msgstr ""
 #. request would result in another failed gconfd being spawned.
 #.
 #: gconf/gconfd.c:169
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit %s"
 msgstr ""
 "Nenájdené žiadne konfiguračné súbory v zdrojovej ceste, konfigurácia nebude "
-"uložená ani upravená"
+"uložená. Upravte %s"
 
 #: gconf/gconfd.c:182
 #, c-format
@@ -1033,9 +1034,9 @@ msgid "Owner of %s is not the current user"
 msgstr "Vlastník %s nie je aktuálny používateľ"
 
 #: gconf/gconfd.c:365
-#, fuzzy, c-format
+#, c-format
 msgid "Bad permissions %lo on directory %s"
-msgstr "Neplatné práva %o na priečinku %s"
+msgstr "Neplatné práva %lo na priečinku %s"
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
@@ -1410,15 +1411,13 @@ msgid "Shutdown error: %s\n"
 msgstr "Chyba pri ukončovaní: %s\n"
 
 #: gconf/gconftool.c:1120
-#, fuzzy
 msgid "Must specify one or more directories to recursively list.\n"
 msgstr ""
 "Musíte zadať jeden alebo viac priečinkov, ktoré chcete rekurzívne vypísať.\n"
 
 #: gconf/gconftool.c:1172
-#, fuzzy
 msgid "Must specify one or more directories to dump.\n"
-msgstr "Musíte uviesť jeden alebo viac priečinkov, ktoré chcete vypísať.\n"
+msgstr "Musíte zadať jeden alebo viac priečinkov, ktoré chcete vypísať.\n"
 
 #: gconf/gconftool.c:1214 gconf/gconftool.c:1479
 #, c-format
@@ -1640,7 +1639,6 @@ msgid "Error syncing: %s"
 msgstr "Chyba pri synchronizácii: %s"
 
 #: gconf/gconftool.c:2283
-#, fuzzy
 msgid "Must specify one or more directories to get key/value pairs from.\n"
 msgstr ""
 "Musíte zadať jeden alebo viac priečinkov, z ktorých chcete páry kľúč/"
@@ -1666,7 +1664,6 @@ msgid "Failure during recursive unset of \"%s\": %s\n"
 msgstr "Nepodarilo sa zrušiť hodnoty v '%s': %s\n"
 
 #: gconf/gconftool.c:2362
-#, fuzzy
 msgid "Must specify one or more directories to get subdirs from.\n"
 msgstr ""
 "Musíte zadať jeden alebo viac priečinkov, z ktorých chcete podpriečinky.\n"
@@ -1934,13 +1931,31 @@ msgstr ""
 "priečinku:\n"
 "  %s\n"
 
-#, fuzzy
 #~ msgid "Cannot find directory %s\n"
-#~ msgstr "Nie je možné vytvoriť priečinok '%s': %s"
+#~ msgstr "Nie je možné nájsť priečinok %s\n"
 
-#, fuzzy
 #~ msgid "Error saving GConf tree to '%s': %s\n"
-#~ msgstr "Chyba pri získavaní schémy z '%s': %s\n"
+#~ msgstr "Chyba pri ukladaní stromu GConf do '%s': %s\n"
+
+#~ msgid "Usage: %s <dir>\n"
+#~ msgstr "Použitie: %s <dir>\n"
+
+#~ 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 ""
+#~ "Použitie: %s <dir>\n"
+#~ "  Spojí XML hierarchie systémov súborov, ako:\n"
+#~ "    dir/%%gconf.xml\n"
+#~ "        subdir1/%%gconf.xml\n"
+#~ "        subdir2/%%gconf.xml\n"
+#~ "  do:\n"
+#~ "    dir/%%gconf-tree.xml\n"
 
 #~ msgid "Received invalid value in set request"
 #~ msgstr "Zachytená neplatná hodnota v požiadavke"
@@ -2135,16 +2150,3 @@ msgstr ""
 #~ "Some client removed itself from the GConf server when it hadn't been "
 #~ "added."
 #~ msgstr "Niektorý klient sa odstránil z GConf serveru keď tam nebol pridaný."
-
-#~ msgid ""
-#~ "%u items remain in the cache after cleaning already-synced items older "
-#~ "than %u seconds"
-#~ msgstr ""
-#~ "%u položiek zostalo v keši po vyčistení už synchronizovaných položiek "
-#~ "starších ako %u sekúnd"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid "/path"
-#~ msgstr "/cesta"
diff --git a/po/sq.po b/po/sq.po
index 95641099..2d8bb315 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf.HEAD\n"
 "POT-Creation-Date: 2003-12-05 00:37+0100\n"
-"PO-Revision-Date: 2004-02-24 13:52+0100\n"
+"PO-Revision-Date: 2004-03-01 11:14+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"
@@ -68,7 +68,8 @@ msgstr ""
 #: backends/xml-backend.c:770
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
-msgstr "E pamundur hapja e directory të lock që %s të heqë files e locks: %s\n"
+msgstr ""
+"E pamundur hapja e directory të lock për %s që të heqë files e locks: %s\n"
 
 #: backends/xml-backend.c:788
 #, c-format
@@ -167,7 +168,7 @@ msgstr "Zëri pa emër tek file XML `%s' nuk u përfill"
 #, c-format
 msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
 msgstr ""
-"Një nyjë primare tek file XML `%s' është <%s> në vend të <entry>, injorohet"
+"Një nyjë parësore tek file XML `%s' është <%s> në vend të <entry>, injorohet"
 
 #: backends/xml-dir.c:1255
 #, c-format
@@ -241,7 +242,7 @@ msgstr "Lista përmban një nyjë të pavlefshme (%s, duhet të jetë %s)"
 #: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
-msgstr "Injorohet car i gabuar nga çifti XML: %s"
+msgstr "Injorohet shkronja e gabuar nga çifti XML: %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"
@@ -403,7 +404,7 @@ msgstr "E pamundur gjetja e adresës për burimin e konfigurimit"
 
 #: gconf/gconf-error.c:30
 msgid "Bad key or directory name"
-msgstr "Çelës apo emër directory i gabuar"
+msgstr "Kyç apo emër directory i gabuar"
 
 #: gconf/gconf-error.c:31
 msgid "Parse error"
@@ -411,7 +412,7 @@ msgstr "Gabim interpretimi"
 
 #: gconf/gconf-error.c:32
 msgid "Corrupt data in configuration source database"
-msgstr "Të dhënat të dëmtuara në databazën e konfigurimit"
+msgstr "Të dhëna të dëmtuara në databazën e konfigurimit"
 
 #: gconf/gconf-error.c:33
 msgid "Type mismatch"
@@ -803,8 +804,8 @@ msgid ""
 "home directory, and it must own a lockfile in ~/.gconfd and also lockfiles "
 "in individual storage locations such as ~/.gconf"
 msgstr ""
-"I pamundur shtimi i një vlere çelsit '%s' sepse serveri i konfigurimit nuk "
-"ka databaza të shkruajtshme. Shkaqet e mundëshme janë: 1) file juaj i "
+"I pamundur shtimi i një vlere kyçit '%s' sepse serveri i konfigurimit nuk ka "
+"databaza të shkruajtshme. Shkaqet e mundëshme janë: 1) file juaj i "
 "konfigurimit në pozicionin %s/path nuk përmban asnjë databazë ose nuk u "
 "gjet; 2) janë aktivë gabimisht dy proçese gconfd; 3) sistemi operativ ka një "
 "konfigurim të gabuar që nuk mundëson funksionimin e file locking NFS në home "
@@ -835,7 +836,7 @@ msgstr "Gabim gjatë marrjes së metainfo: %s"
 #: gconf/gconf-sources.c:1507
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
-msgstr "Çelsi `%s' llogaritur si skemë për kyçin `%s' përmban një lloj `%s'"
+msgstr "Kyçi `%s' llogaritur si skemë për kyçin `%s' përmban një lloj `%s'"
 
 #: gconf/gconf-value.c:110
 #, c-format
@@ -901,7 +902,7 @@ msgstr ""
 #: gconf/gconf.c:44
 #, c-format
 msgid "Key \"%s\" is NULL"
-msgstr "Çelsi \"%s\" është NULL"
+msgstr "Kyçi \"%s\" është NULL"
 
 #: gconf/gconf.c:51
 #, c-format
@@ -923,18 +924,17 @@ msgstr "Nuk lejohet të ketë një pikë (.) menjëherë mbas një slash (/)"
 #: gconf/gconf.c:159
 #, c-format
 msgid "'%c' is not an ASCII character, so isn't allowed in key names"
-msgstr ""
-"'%c' nuk është një simbol ASCII, prandaj nuk lejohet në emrat e çelsave"
+msgstr "'%c' nuk është një simbol ASCII, prandaj nuk lejohet në emrat e kyçeve"
 
 #: gconf/gconf.c:169
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr ""
-"`%c' nuk është një simbol i vlefshëm për emrat e çelsave dhe të directory"
+"`%c' nuk është një simbol i vlefshëm për emrat e kyçeve dhe të directory"
 
 #: gconf/gconf.c:183
 msgid "Key/directory may not end with a slash (/)"
-msgstr "Emrat e çelsave dhe directory nuk mund të përfundojnë me një slash (/)"
+msgstr "Emrat e kyçeve dhe directory nuk mund të përfundojnë me një slash (/)"
 
 #: gconf/gconf.c:408
 #, c-format
@@ -1071,7 +1071,7 @@ msgstr "Directory %s ka një problem, gconfd nuk mund t'a përdorë"
 #, c-format
 msgid "Failed to write byte to pipe fd %d so client program may hang: %s"
 msgstr ""
-"Gabim në shkrimin në byte tek pipe fd %d, programi mund të bllokohet: %s"
+"Gabim në shkrimin e byte tek pipe fd %d, programi mund të bllokohet: %s"
 
 #: gconf/gconfd.c:542
 #, c-format
@@ -1110,14 +1110,14 @@ msgstr ""
 
 #: gconf/gconftool.c:121
 msgid "Unset the keys on the command line"
-msgstr "Anullon çelsat tek komanda në rresht"
+msgstr "Anullon kyçet tek komanda në rresht"
 
 #: gconf/gconftool.c:130
 msgid ""
 "Recursively unset all keys at or below the key/directory names on the "
 "command line"
 msgstr ""
-"Anullon njëri pas tjetrit të gjithë çelsat pas çelsit apo directory në "
+"Anullon njëri pas tjetrit të gjithë kyçet pas kyçit apo directory në "
 "rreshtin e komandave"
 
 #: gconf/gconftool.c:139
@@ -1187,12 +1187,12 @@ msgstr "Shkruan llojin e të dhënës së një kyçi tek standart output."
 
 #: gconf/gconftool.c:238
 msgid "Get the number of elements in a list key."
-msgstr "Lexon numrin e elementëve në një kyç listë."
+msgstr "Lexon numrin e elementëve në kyçin e një liste."
 
 #: gconf/gconftool.c:247
 msgid "Get a specific element from a list key, numerically indexed."
 msgstr ""
-"Merr një element të veçantë nga një kyç listë, të indeksuar numerikisht."
+"Merr një element të veçantë nga një kyç liste, të indeksuar numerikisht."
 
 #: gconf/gconftool.c:256
 msgid ""
@@ -1284,8 +1284,8 @@ 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 ""
-"Disinstalon korrektësisht files e skemën në databazë duke përdorur rreshtin "
-"e komandave. E ndryshueshmja e ambientit GCONF_CONGIF_SOURCE duhet të jetë "
+"Ç'instalon korrektësisht files e skemës në databazë duke përdorur rreshtin e "
+"komandave. E ndryshueshmja e ambientit GCONF_CONGIF_SOURCE duhet të jetë "
 "vendosur tek buruesi jo i prezgjedhur i konfigurimit ose vendose në një "
 "stringë boshe për të përdorur burimin e konfigurimit të prezgjedhur."
 
@@ -1295,7 +1295,7 @@ msgid ""
 "different types for keys on the command line."
 msgstr ""
 "Kryen \"torture-test\" e një programi duke vendosur dhe anulluar një shumicë "
-"vlerash të llojeve të ndryshme për çelsat në rreshtin e komandave."
+"vlerash të llojeve të ndryshme për kyçet në rreshtin e komandave."
 
 #: gconf/gconftool.c:364
 msgid ""
@@ -1307,15 +1307,15 @@ msgstr ""
 
 #: gconf/gconftool.c:373
 msgid "Get the short doc string for a key"
-msgstr "Lexon përshkrimin e shkurtër të çelsit"
+msgstr "Lexon përshkrimin e shkurtër të kyçit"
 
 #: gconf/gconftool.c:382
 msgid "Get the long doc string for a key"
-msgstr "Lexon përshkrimin e hollësishëm të çelsit"
+msgstr "Lexon përshkrimin e hollësishëm të kyçit"
 
 #: gconf/gconftool.c:391
 msgid "Get the name of the schema applied to this key"
-msgstr "Lexon emrin e skemës që i është aplikuar çelsit"
+msgstr "Lexon emrin e skemës që i është aplikuar kyçit"
 
 #: gconf/gconftool.c:400
 msgid "Specify the schema name followed by the key to apply the schema name to"
@@ -1450,7 +1450,7 @@ msgstr "(vlerë e papërcaktuar)"
 #: gconf/gconftool.c:1537
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
-msgstr "Gabim gjatë rigjenerimit të server të konfigurimit (gconfd): %s\n"
+msgstr "Gabim gjatë rigjenerimit të server-it të konfigurimit (gconfd): %s\n"
 
 #: gconf/gconftool.c:1551
 msgid "Must specify a key or keys to get\n"
@@ -1568,7 +1568,7 @@ msgstr "Specifiko një kyç nga ku të merret madhësia.\n"
 #: gconf/gconftool.c:1880 gconf/gconftool.c:1925
 #, c-format
 msgid "Key %s is not a list.\n"
-msgstr "Çelsi %s nuk është një listë.\n"
+msgstr "Kyçi %s nuk është një listë.\n"
 
 #: gconf/gconftool.c:1900
 msgid "Must specify a key from which to get list element.\n"
@@ -1617,17 +1617,17 @@ msgstr "Vlera tek '%s' nuk është një skemë\n"
 
 #: gconf/gconftool.c:2097
 msgid "Must specify a schema name followed by the key name to apply it to\n"
-msgstr "Specifiko emrin e skemës ndjekur nga emri i çelsit ku duhet aplikuar\n"
+msgstr "Specifiko emrin e skemës ndjekur nga emri i kyçit ku duhet aplikuar\n"
 
 #: gconf/gconftool.c:2104
 #, c-format
 msgid "Error associating schema name '%s' with key name '%s': %s\n"
 msgstr ""
-"Gabim gjatë shoqërimit të emrit '%s' të skemës me emrin '%s' të çelsit: %s\n"
+"Gabim gjatë shoqërimit të emrit '%s' të skemës me emrin '%s' të kyçit: %s\n"
 
 #: gconf/gconftool.c:2122
 msgid "Must specify keys to unapply schema from\n"
-msgstr "Duhet të specifikosh çelsat nga të cilët do të anullohet skema\n"
+msgstr "Duhet të specifikosh kyçet nga të cilët do të anullohet skema\n"
 
 #: gconf/gconftool.c:2132
 #, c-format
@@ -1845,7 +1845,7 @@ msgstr "KUJDES: Nyje <%s> e pasaktë në një nyje <locale>\n"
 #: gconf/gconftool.c:3340
 #, c-format
 msgid "Attached schema `%s' to key `%s'\n"
-msgstr "Skema `%s' ju bashkangjit çelsit `%s'\n"
+msgstr "Skema `%s' ju bashkangjit kyçit `%s'\n"
 
 #: gconf/gconftool.c:3414
 msgid "You must have at least one <locale> entry in a <schema>\n"
@@ -1918,7 +1918,7 @@ msgstr "Specifiko files skema që duhen instaluar\n"
 
 #: gconf/gconftool.c:3704
 msgid "Must specify some schema files to uninstall\n"
-msgstr "Specifiko files skema që duhen disinstaluar\n"
+msgstr "Specifiko files skema që duhen ç'instaluar\n"
 
 #: gconf/gconftool.c:3741
 #, c-format
@@ -1932,7 +1932,7 @@ msgstr ""
 #: gconf/gconftool.c:3761
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
-msgstr "I pamundur anullimi i çelsit të ndërprerjes %s: %s\n"
+msgstr "I pamundur anullimi i kyçit të ndërprerjes %s: %s\n"
 
 #: gconf/gconftool.c:3887
 msgid "Must specify some keys to break\n"
@@ -1960,7 +1960,7 @@ msgid ""
 "  %s\n"
 msgstr ""
 "Duke u zhvilluar një përpjekje thyerje të programit duke vendosur vlera të "
-"gabuara për çelsat në directory: \n"
+"gabuara për kyçet në directory: \n"
 "  %s\n"
 
 #~ msgid "Cannot find directory %s\n"
@@ -2002,11 +2002,11 @@ msgstr ""
 #~ msgstr "Arriti një kërkesë për fshirjen e të gjitha të dhënave në cache"
 
 #~ msgid "Received request to sync synchronously"
-#~ msgstr "U mor një kërkesa për sinkronizimin në mënyrë sinkrone"
+#~ msgstr "U mor një kërkesë për sinkronizimin në mënyrë sinkrone"
 
 #~ msgid "Fatal error: failed to get object reference for ConfigDatabase"
 #~ msgstr ""
-#~ "Fatal error: e pamundur marrja e një riferimenti të vlefshëm për "
+#~ "Gabim fatal: e pamundur marrja e një riferimenti të vlefshëm për "
 #~ "ConfigDatabase"
 
 #~ msgid ""
@@ -2015,7 +2015,7 @@ msgstr ""
 #~ "configuration changes."
 #~ msgstr ""
 #~ "Gabim gjatë regjistrimit të shtimit të %s (%s); nuk do të jetë i mundur "
-#~ "rikthimi i këtij listener në rinisjen e ardhëshme të gconfd, prandaj "
+#~ "rikthimi i këtij listener në rinisjen e ardhshme të gconfd, prandaj "
 #~ "njoftimi indryshimeve në konfigurim nuk do të jetë i besueshëm."
 
 #~ msgid "Listener ID %lu doesn't exist"
@@ -2099,7 +2099,7 @@ msgstr ""
 #~ msgstr "Gabim CORBA: %s"
 
 #~ msgid "Shutdown request received"
-#~ msgstr "U mor një kërkesa për përfundim"
+#~ msgstr "U mor një kërkesë për përfundim"
 
 #~ msgid "Failed to get object reference for ConfigServer"
 #~ msgstr "Gabim gjatë marrjes së riferimentit për ConfigServer"
@@ -2111,7 +2111,7 @@ msgstr ""
 #~ "Failed to open gconfd logfile; won't be able to restore listeners after "
 #~ "gconfd shutdown (%s)"
 #~ msgstr ""
-#~ "Gabim gjatë hapjes së file të log të gconfd; nuk do të jetë e mundur "
+#~ "Gabim gjatë hapjes së file të log të gconfd; nuk do të jetë i mundur "
 #~ "rikthimi i listener mbas ndalimit të gconfd (%s)"
 
 #~ msgid ""
diff --git a/po/ta.po b/po/ta.po
new file mode 100644
index 00000000..fcc6ec65
--- /dev/null
+++ b/po/ta.po
@@ -0,0 +1,1796 @@
+# Tamil Translation of GConf.
+# Dinesh Nadarajah (C) 2004
+# This file is distributed under the same license as the PACKAGE package.
+# Dinesh Nadarajah <dinesh_list@sbcglobal.net>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Tamil Gconf \n"
+"POT-Creation-Date: 2003-12-05 00:37+0100\n"
+"PO-Revision-Date: 2004-03-02 18:16-0600\n"
+"Last-Translator: Dinesh Nadarajah <dinesh_list@sbcglobal.net>\n"
+"Language-Team: Tamil <tamillinux-user@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: backends/dir-utils.c:108
+#, c-format
+msgid "Couldn't find the %s root directory in the address `%s'"
+msgstr ""
+
+#: backends/dir-utils.c:124 backends/xml-backend.c:332
+#, c-format
+msgid "Could not make directory `%s': %s"
+msgstr "`%s' அடைவு உருவாக்க முடியவில்லை: %s"
+
+#: backends/dir-utils.c:212
+#, c-format
+msgid "Can't read from or write to the %s root directory in the address `%s'"
+msgstr ""
+
+#: backends/xml-backend.c:236
+msgid "Unloading XML backend module."
+msgstr ""
+
+#: backends/xml-backend.c:285
+#, c-format
+msgid "Couldn't find the XML root directory in the address `%s'"
+msgstr ""
+
+#: backends/xml-backend.c:443
+#, c-format
+msgid ""
+"Can't read from or write to the XML root directory in the address \"%s\""
+msgstr ""
+
+#: backends/xml-backend.c:453
+#, c-format
+msgid "Directory/file permissions for XML source at root %s are: %o/%o"
+msgstr ""
+
+#: backends/xml-backend.c:619
+#, c-format
+msgid "Error syncing the XML backend directory cache: %s"
+msgstr ""
+
+#: backends/xml-backend.c:684
+msgid ""
+"Remove directory operation is no longer supported, just remove all the "
+"values in the directory"
+msgstr ""
+
+#: backends/xml-backend.c:770
+#, c-format
+msgid "Could not open lock directory for %s to remove locks: %s\n"
+msgstr ""
+
+#: backends/xml-backend.c:788
+#, c-format
+msgid "Could not remove file %s: %s\n"
+msgstr "%s கோப்பு கழட்ட முடியவில்லை: %s\n"
+
+#: backends/xml-backend.c:809
+msgid "Initializing XML backend module"
+msgstr ""
+
+#: backends/xml-backend.c:877
+#, c-format
+msgid "Failed to give up lock on XML directory \"%s\": %s"
+msgstr ""
+
+#: backends/xml-cache.c:286
+msgid "Failed to sync XML cache contents to disk"
+msgstr ""
+
+#: backends/xml-cache.c:316
+#, c-format
+msgid ""
+"Unable to remove directory `%s' from the XML backend cache, because it has "
+"not been successfully synced to disk"
+msgstr ""
+
+#: backends/xml-dir.c:171
+#, c-format
+msgid "Could not stat `%s': %s"
+msgstr "`%s' stat செய்யமுடியவில்லை: %s"
+
+#: backends/xml-dir.c:181
+#, c-format
+msgid "XML filename `%s' is a directory"
+msgstr "XML கோப்பு பெயர் `%s' ஓர் அடைவு"
+
+#: backends/xml-dir.c:416 backends/xml-dir.c:425
+#, c-format
+msgid "Failed to delete \"%s\": %s"
+msgstr "\"%s\" அழிக்க முடியவில்லை: %s"
+
+#: backends/xml-dir.c:471
+#, c-format
+msgid "Failed to write file `%s': %s"
+msgstr "`%s' எழுதுவது நொடிப்படைந்தது: %s"
+
+#: backends/xml-dir.c:484
+#, c-format
+msgid "Failed to set mode on `%s': %s"
+msgstr "`%s' இன் முறைமை அமைப்பு நொடிப்படைந்தது: %s"
+
+#: backends/xml-dir.c:494
+#, c-format
+msgid "Failed to write XML data to `%s': %s"
+msgstr "XML தரவுகளை `%s' க்கு எழுத முடியவில்லை: %s"
+
+#: backends/xml-dir.c:504 backends/xml-dir.c:1279
+#, c-format
+msgid "Failed to close file `%s': %s"
+msgstr "`%s' கோப்பு மூட முடியவில்லை: %s"
+
+#: backends/xml-dir.c:520 backends/xml-dir.c:530
+#, c-format
+msgid "Failed to rename `%s' to `%s': %s"
+msgstr "`%s' இலிருந்து `%s' க்கு பெயர் மாற்ற முடியவில்லை: %s"
+
+#: backends/xml-dir.c:536
+#, c-format
+msgid "Failed to restore `%s' from `%s': %s"
+msgstr ""
+
+#: backends/xml-dir.c:548
+#, c-format
+msgid "Failed to delete old file `%s': %s"
+msgstr "பழைய கோப்பு `%s' அழிக்க முடியவில்லை: %s"
+
+#. These are all fatal errors
+#: backends/xml-dir.c:978
+#, c-format
+msgid "Failed to stat `%s': %s"
+msgstr ""
+
+#: backends/xml-dir.c:1152
+#, c-format
+msgid "Duplicate entry `%s' in `%s', ignoring"
+msgstr ""
+
+#: backends/xml-dir.c:1174
+#, c-format
+msgid "Entry with no name in XML file `%s', ignoring"
+msgstr ""
+
+#: backends/xml-dir.c:1182
+#, c-format
+msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
+msgstr ""
+
+#: backends/xml-dir.c:1255
+#, c-format
+msgid "Could not make directory \"%s\": %s"
+msgstr "\"%s\" அடைவு படைக்க முடியவில்லை: %s"
+
+#: backends/xml-dir.c:1271
+#, c-format
+msgid "Failed to create file `%s': %s"
+msgstr "'%s' கோப்பு படைக்க முடியவில்லை: %s"
+
+#: backends/xml-dir.c:1370
+#, c-format
+msgid "Failed to parse XML file \"%s\""
+msgstr ""
+
+#. There was an error
+#: backends/xml-entry.c:154
+#, c-format
+msgid "Ignoring XML node with name `%s': %s"
+msgstr ""
+
+#: backends/xml-entry.c:332
+#, c-format
+msgid "Ignoring schema name `%s', invalid: %s"
+msgstr ""
+
+#: backends/xml-entry.c:380
+#, c-format
+msgid "Ignoring XML node `%s': %s"
+msgstr ""
+
+#: backends/xml-entry.c:732
+#, c-format
+msgid "Failed reading default value for schema: %s"
+msgstr ""
+
+#: backends/xml-entry.c:952
+#, c-format
+msgid "No \"type\" attribute for <%s> node"
+msgstr ""
+
+#: backends/xml-entry.c:966
+#, c-format
+msgid "A node has unknown \"type\" attribute `%s', ignoring"
+msgstr ""
+
+#: backends/xml-entry.c:981
+msgid "No \"value\" attribute for node"
+msgstr ""
+
+#: backends/xml-entry.c:1029 backends/xml-entry.c:1105
+#, c-format
+msgid "Didn't understand XML node <%s> inside an XML list node"
+msgstr ""
+
+#: backends/xml-entry.c:1063
+msgid "Invalid type (list, pair, or unknown) in a list node"
+msgstr ""
+
+#: backends/xml-entry.c:1086
+#, c-format
+msgid "Bad XML node: %s"
+msgstr ""
+
+#: backends/xml-entry.c:1094
+#, c-format
+msgid "List contains a badly-typed node (%s, should be %s)"
+msgstr ""
+
+#: backends/xml-entry.c:1146
+#, c-format
+msgid "Ignoring bad car from XML pair: %s"
+msgstr ""
+
+#: 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 ""
+
+#: backends/xml-entry.c:1168
+#, c-format
+msgid "Ignoring bad cdr from XML pair: %s"
+msgstr ""
+
+#: backends/xml-entry.c:1187
+#, c-format
+msgid "Didn't understand XML node <%s> inside an XML pair node"
+msgstr ""
+
+#: backends/xml-entry.c:1205
+msgid "Didn't find car and cdr for XML pair node"
+msgstr ""
+
+#: backends/xml-entry.c:1211
+msgid "Missing cdr from pair of values in XML file"
+msgstr ""
+
+#: backends/xml-entry.c:1218
+msgid "Missing car from pair of values in XML file"
+msgstr ""
+
+#: backends/xml-entry.c:1223
+msgid "Missing both car and cdr values from pair in XML file"
+msgstr ""
+
+#. -- end debug only
+#: gconf/gconf-backend.c:167
+#, c-format
+msgid "No such file `%s'\n"
+msgstr "`%s' கோப்பு கிரையாது\n"
+
+#: gconf/gconf-backend.c:195
+#, c-format
+msgid "Bad address `%s'"
+msgstr "கெட்ட முகவரி `%s'"
+
+#: gconf/gconf-backend.c:220
+msgid "GConf won't work without dynamic module support (gmodule)"
+msgstr ""
+
+#: gconf/gconf-backend.c:230
+#, c-format
+msgid "Error opening module `%s': %s\n"
+msgstr "`%s' தொகுதி திறக்கும்போது பிழை: %s\n"
+
+#: gconf/gconf-backend.c:262
+#, c-format
+msgid "Couldn't locate backend module for `%s'"
+msgstr ""
+
+#: gconf/gconf-backend.c:299
+msgid "Failed to shut down backend"
+msgstr ""
+
+#: gconf/gconf-client.c:344 gconf/gconf-client.c:362
+#, c-format
+msgid "GConf Error: %s\n"
+msgstr "GConf பிழை: %s\n"
+
+#: gconf/gconf-client.c:896
+#, c-format
+msgid "GConf warning: failure listing pairs in `%s': %s"
+msgstr ""
+
+#: gconf/gconf-client.c:1181
+#, c-format
+msgid "Expected `%s' got `%s' for key %s"
+msgstr ""
+
+#: gconf/gconf-database.c:173
+#, c-format
+msgid "Failed to sync one or more sources: %s"
+msgstr ""
+
+#: gconf/gconf-database.c:241 gconf/gconf-sources.c:1541
+#, c-format
+msgid "Error getting value for `%s': %s"
+msgstr ""
+
+#: gconf/gconf-database.c:287
+#, c-format
+msgid "Error setting value for `%s': %s"
+msgstr "`%s' மதிப்பு அமைக்கும் போது பிழை: %s"
+
+#: gconf/gconf-database.c:342
+#, c-format
+msgid "Error unsetting `%s': %s"
+msgstr "`%s' மதிப்பு அழிக்கும்போது பிழை: %s"
+
+#: gconf/gconf-database.c:371
+#, c-format
+msgid "Error getting default value for `%s': %s"
+msgstr ""
+
+#: gconf/gconf-database.c:418
+#, c-format
+msgid "Error unsetting \"%s\": %s"
+msgstr "\"%s\" மதிப்பு அழிக்கும்போது பிழை: %s"
+
+#: gconf/gconf-database.c:450
+#, c-format
+msgid "Error getting new value for \"%s\": %s"
+msgstr "\"%s\" க்கு புதிய மதிப்பு பெறும்போது பிழை: %s"
+
+#: gconf/gconf-database.c:496
+#, c-format
+msgid "Error checking existence of `%s': %s"
+msgstr ""
+
+#: gconf/gconf-database.c:520
+#, c-format
+msgid "Error removing directory \"%s\": %s"
+msgstr "\"%s\" அடைவு கழட்டும்போது பிழை: %s"
+
+#: gconf/gconf-database.c:547
+#, c-format
+msgid "Failed to get all entries in `%s': %s"
+msgstr ""
+
+#: gconf/gconf-database.c:573
+#, c-format
+msgid "Error listing dirs in `%s': %s"
+msgstr ""
+
+#: gconf/gconf-database.c:594
+#, c-format
+msgid "Error setting schema for `%s': %s"
+msgstr ""
+
+#: gconf/gconf-error.c:25
+msgid "Success"
+msgstr "வெற்றிகரம்"
+
+#: gconf/gconf-error.c:26
+msgid "Failed"
+msgstr "நொடிப்படைந்தது"
+
+#: gconf/gconf-error.c:27
+msgid "Configuration server couldn't be contacted"
+msgstr ""
+
+#: gconf/gconf-error.c:28
+msgid "Permission denied"
+msgstr "அனுமதி மறுக்கப்பட்டது"
+
+#: gconf/gconf-error.c:29
+msgid "Couldn't resolve address for configuration source"
+msgstr ""
+
+#: gconf/gconf-error.c:30
+msgid "Bad key or directory name"
+msgstr ""
+
+#: gconf/gconf-error.c:31
+msgid "Parse error"
+msgstr "அலகிடும் பிழை"
+
+#: gconf/gconf-error.c:32
+msgid "Corrupt data in configuration source database"
+msgstr ""
+
+#: gconf/gconf-error.c:33
+msgid "Type mismatch"
+msgstr ""
+
+#: gconf/gconf-error.c:34
+msgid "Key operation on directory"
+msgstr ""
+
+#: gconf/gconf-error.c:35
+msgid "Directory operation on key"
+msgstr ""
+
+#: gconf/gconf-error.c:36
+msgid "Can't overwrite existing read-only value"
+msgstr ""
+
+#: gconf/gconf-error.c:37
+msgid "Object Activation Framework error"
+msgstr ""
+
+#: gconf/gconf-error.c:38
+msgid "Operation not allowed without configuration server"
+msgstr ""
+
+#: gconf/gconf-error.c:39
+msgid "Failed to get a lock"
+msgstr ""
+
+#: gconf/gconf-error.c:40
+msgid "No database available to save your configuration"
+msgstr ""
+
+#: gconf/gconf-internals.c:67
+#, c-format
+msgid "No '/' in key \"%s\""
+msgstr "\"%s\" விசையில் '/' இல்லை"
+
+#: gconf/gconf-internals.c:337
+#, c-format
+msgid "Couldn't open path file `%s': %s\n"
+msgstr ""
+
+#: gconf/gconf-internals.c:386
+#, c-format
+msgid "Adding source `%s'\n"
+msgstr "`%s' மூலம் சேர்க்கப்படுகின்றது\n"
+
+#: gconf/gconf-internals.c:398
+#, c-format
+msgid "Read error on file `%s': %s\n"
+msgstr "`%s' கோப்பில் வாசிப்பு பிழை: %s\n"
+
+#: gconf/gconf-internals.c:702 gconf/gconf-internals.c:768
+#: gconf/gconf-value.c:154 gconf/gconf-value.c:253 gconf/gconf-value.c:395
+#: gconf/gconf-value.c:1681
+msgid "Text contains invalid UTF-8"
+msgstr "உரையில் தவரதலான UTF-8 வரியுருகள் உல்லன"
+
+#: gconf/gconf-internals.c:853
+#, c-format
+msgid "Expected list, got %s"
+msgstr "எதிபார்த்தது பட்டியல், கிடைத்தது %s"
+
+#: gconf/gconf-internals.c:863
+#, c-format
+msgid "Expected list of %s, got list of %s"
+msgstr ""
+
+#: gconf/gconf-internals.c:991
+#, c-format
+msgid "Expected pair, got %s"
+msgstr "எதிபார்த்தது ஜோடி, கிடைத்தது %s"
+
+#: gconf/gconf-internals.c:1005
+#, c-format
+msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
+msgstr ""
+
+#: gconf/gconf-internals.c:1021
+#, c-format
+msgid "Expected pair of type (%s,%s) got type (%s,%s)"
+msgstr ""
+
+#: gconf/gconf-internals.c:1137
+msgid "Quoted string doesn't begin with a quotation mark"
+msgstr ""
+
+#: gconf/gconf-internals.c:1199
+msgid "Quoted string doesn't end with a quotation mark"
+msgstr ""
+
+#: gconf/gconf-internals.c:1335
+msgid "Encoded value is not valid UTF-8"
+msgstr ""
+
+#: gconf/gconf-internals.c:1837
+#, c-format
+msgid "IOR file '%s' not opened successfully, no gconfd located: %s"
+msgstr ""
+
+#: gconf/gconf-internals.c:1867
+#, c-format
+msgid "gconftool or other non-gconfd process has the lock file '%s'"
+msgstr ""
+
+#: gconf/gconf-internals.c:1884
+msgid "couldn't contact ORB to resolve existing gconfd object reference"
+msgstr ""
+
+#: gconf/gconf-internals.c:1894
+#, c-format
+msgid "Failed to convert IOR '%s' to an object reference"
+msgstr ""
+
+#: gconf/gconf-internals.c:1949
+#, c-format
+msgid "Could not lock temporary file '%s': %s"
+msgstr ""
+
+#: gconf/gconf-internals.c:1976
+#, c-format
+msgid "Could not create file '%s', probably because it already exists"
+msgstr ""
+
+#: gconf/gconf-internals.c:2023
+#, c-format
+msgid "Failed to create or open '%s'"
+msgstr "'%s' படைக்கவோ திறக்கவோ முடியவில்லை"
+
+#: gconf/gconf-internals.c:2033
+#, c-format
+msgid ""
+"Failed to lock '%s': probably another process has the lock, or your "
+"operating system has NFS file locking misconfigured (%s)"
+msgstr ""
+
+#: gconf/gconf-internals.c:2117
+#, c-format
+msgid "We didn't have the lock on file `%s', but we should have"
+msgstr ""
+
+#: gconf/gconf-internals.c:2138
+#, c-format
+msgid "Failed to link '%s' to '%s': %s"
+msgstr "இதனை '%s' இதட்கு '%s' இணைக்க முடியவில்லை: %s"
+
+#: gconf/gconf-internals.c:2150
+#, c-format
+msgid "Failed to remove lock file `%s': %s"
+msgstr "பூட்டுதல் கோப்பு `%s' கழட்ட முடியவில்லை: %s"
+
+#: gconf/gconf-internals.c:2169
+#, c-format
+msgid "Failed to clean up file '%s': %s"
+msgstr "'%s' கோப்பு சுத்தம் செய்ய முடியவில்லை: %s"
+
+#: gconf/gconf-internals.c:2183
+#, c-format
+msgid "Failed to remove lock directory `%s': %s"
+msgstr "பூட்டுதல் அடைவு `%s' கழட்ட முடியவில்லை: %s"
+
+#: gconf/gconf-internals.c:2220
+#, c-format
+msgid "couldn't create directory `%s': %s"
+msgstr "`%s' அடைவு படைக்க முடியவில்லை: %s"
+
+#: gconf/gconf-internals.c:2279
+#, c-format
+msgid "Can't write to file `%s': %s"
+msgstr "`%s' கோப்புக்கு எழுத முடியவில்லை: %s"
+
+#: gconf/gconf-internals.c:2323
+#, c-format
+msgid "Failed to unlink lock file %s: %s\n"
+msgstr ""
+
+#: gconf/gconf-sanity-check.c:43 gconf/gconftool.c:84
+msgid "Help options"
+msgstr "உதவி தேர்வுகள்"
+
+#: gconf/gconf-sanity-check.c:79 gconf/gconftool.c:506
+#, c-format
+msgid ""
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+
+#: gconf/gconf-sanity-check.c:144 gconf/gconf-sanity-check.c:169
+#, 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 "
+"problem with your configuration, as many programs will need to create files "
+"in your home directory. The error was \"%s\" (errno = %d)."
+msgstr ""
+
+#: gconf/gconf-sanity-check.c:183
+#, 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 "
+"with your operating system configuration. If you have an NFS-mounted home "
+"directory, either the client or the server may be set up incorrectly. See "
+"the rpc.statd and rpc.lockd documentation. A common cause of this error is "
+"that the \"nfslock\" service has been disabled.The error was \"%s\" (errno = "
+"%d)."
+msgstr ""
+
+#: gconf/gconf-sanity-check.c:200
+#, c-format
+msgid "Can't remove file %s: %s\n"
+msgstr "%s கோப்பு கழட்டமுடியவில்லை: %s\n"
+
+#: gconf/gconf-sanity-check.c:236
+#, 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 ""
+
+#: gconf/gconf-sanity-check.c:239
+msgid "Error reading the file: "
+msgstr "கோப்பு வாசிக்கும் போது பிழை:"
+
+#: gconf/gconf-sanity-check.c:262
+#, 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 ""
+
+#: gconf/gconf-sanity-check.c:323
+msgid ""
+"The files that contain your preference settings are currently in use.\n"
+"\n"
+"You might be logged in to a session from another computer, and the other "
+"login session is using your preference settings files.\n"
+"\n"
+"You can continue to use the current session, but this might cause temporary "
+"problems with the preference settings in the other session.\n"
+"\n"
+"Do you want to continue?"
+msgstr ""
+
+#: gconf/gconf-sanity-check.c:344
+msgid "_Log Out"
+msgstr "_விலகு"
+
+#: gconf/gconf-sanity-check.c:346
+msgid "_Continue"
+msgstr "_தொடர்ந்து"
+
+#: gconf/gconf-sanity-check.c:359
+#, c-format
+msgid "%s Continue (y/n)?"
+msgstr "%s தொடருக (ஆ/இ)?"
+
+#: gconf/gconf-schema.c:221 gconf/gconf-schema.c:229 gconf/gconf-schema.c:237
+#: gconf/gconf-schema.c:245
+msgid "Schema contains invalid UTF-8"
+msgstr ""
+
+#: gconf/gconf-schema.c:254
+msgid ""
+"Schema specifies type list but doesn't specify the type of the list elements"
+msgstr ""
+
+#: gconf/gconf-schema.c:264
+msgid ""
+"Schema specifies type pair but doesn't specify the type of the car/cdr "
+"elements"
+msgstr ""
+
+#: gconf/gconf-sources.c:319
+#, c-format
+msgid "Failed to load source \"%s\": %s"
+msgstr "\"%s\" மூலம் ஏற்ற முடியவில்லை: %s"
+
+#: gconf/gconf-sources.c:346
+#, c-format
+msgid "Resolved address \"%s\" to a writable config source at position %d"
+msgstr ""
+
+#: gconf/gconf-sources.c:352
+#, c-format
+msgid "Resolved address \"%s\" to a read-only config source at position %d"
+msgstr ""
+
+#: gconf/gconf-sources.c:359
+#, c-format
+msgid ""
+"Resolved address \"%s\" to a partially writable config source at position %d"
+msgstr ""
+
+#: gconf/gconf-sources.c:368
+msgid ""
+"None of the resolved addresses are writable; saving configuration settings "
+"will not be possible"
+msgstr ""
+
+#: gconf/gconf-sources.c:584
+#, c-format
+msgid "Schema `%s' specified for `%s' stores a non-schema value"
+msgstr ""
+
+#: gconf/gconf-sources.c:642
+msgid "The '/' name can only be a directory, not a key"
+msgstr ""
+
+#: gconf/gconf-sources.c:680
+#, c-format
+msgid ""
+"Value for `%s' set in a read-only source at the front of your configuration "
+"path"
+msgstr ""
+
+#: 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 "
+"configuration path file %s/path doesn't contain any databases or wasn't "
+"found 2) somehow we mistakenly created two gconfd processes 3) your "
+"operating system is misconfigured so NFS file locking doesn't work in your "
+"home directory or 4) your NFS client machine crashed and didn't properly "
+"notify the server on reboot that file locks should be dropped. If you have "
+"two gconfd processes (or had two at the time the second was launched), "
+"logging out, killing all copies of gconfd, and logging back in may help. If "
+"you have stale locks, remove ~/.gconf*/*lock. Perhaps the problem is that "
+"you attempted to use GConf from two machines at once, and ORBit still has "
+"its default configuration that prevents remote CORBA connections - put "
+"\"ORBIIOPIPv4=1\" in /etc/orbitrc. As always, check the user.* syslog for "
+"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 ""
+
+#: gconf/gconf-sources.c:1414
+#, c-format
+msgid "Error finding metainfo: %s"
+msgstr ""
+
+#: gconf/gconf-sources.c:1483
+#, c-format
+msgid "Error getting metainfo: %s"
+msgstr ""
+
+#: gconf/gconf-sources.c:1507
+#, c-format
+msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
+msgstr ""
+
+#: gconf/gconf-value.c:110
+#, c-format
+msgid "Didn't understand `%s' (expected integer)"
+msgstr ""
+
+#: gconf/gconf-value.c:120
+#, c-format
+msgid "Integer `%s' is too large or small"
+msgstr ""
+
+#: gconf/gconf-value.c:141
+#, c-format
+msgid "Didn't understand `%s' (expected real number)"
+msgstr ""
+
+#: gconf/gconf-value.c:185
+#, c-format
+msgid "Didn't understand `%s' (expected true or false)"
+msgstr ""
+
+#: gconf/gconf-value.c:261
+#, c-format
+msgid "Didn't understand `%s' (list must start with a '[')"
+msgstr ""
+
+#: gconf/gconf-value.c:274
+#, c-format
+msgid "Didn't understand `%s' (list must end with a ']')"
+msgstr ""
+
+#: gconf/gconf-value.c:325
+#, c-format
+msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
+msgstr ""
+
+#: gconf/gconf-value.c:356 gconf/gconf-value.c:517
+#, c-format
+msgid "Didn't understand `%s' (extra trailing characters)"
+msgstr ""
+
+#: gconf/gconf-value.c:403
+#, c-format
+msgid "Didn't understand `%s' (pair must start with a '(')"
+msgstr ""
+
+#: gconf/gconf-value.c:416
+#, c-format
+msgid "Didn't understand `%s' (pair must end with a ')')"
+msgstr ""
+
+#: gconf/gconf-value.c:446 gconf/gconf-value.c:532
+#, c-format
+msgid "Didn't understand `%s' (wrong number of elements)"
+msgstr ""
+
+#: gconf/gconf-value.c:486
+#, c-format
+msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
+msgstr ""
+
+#: gconf/gconf.c:44
+#, c-format
+msgid "Key \"%s\" is NULL"
+msgstr "விசை \"%s\" NULL ஆனது"
+
+#: gconf/gconf.c:51
+#, c-format
+msgid "\"%s\": %s"
+msgstr "\"%s\": %s"
+
+#: gconf/gconf.c:116
+msgid "Must begin with a slash (/)"
+msgstr "ஒரு சாய்வுகோடுடன் (/) தொடங்க வேண்டும்"
+
+#: gconf/gconf.c:138
+msgid "Can't have two slashes (/) in a row"
+msgstr "ஒரே வரிசையில் இரண்டு சாய்வுகோடுகள் (/) இருக்க முடியாது"
+
+#: gconf/gconf.c:140
+msgid "Can't have a period (.) right after a slash (/)"
+msgstr ""
+
+#: gconf/gconf.c:159
+#, c-format
+msgid "'%c' is not an ASCII character, so isn't allowed in key names"
+msgstr ""
+
+#: gconf/gconf.c:169
+#, c-format
+msgid "`%c' is an invalid character in key/directory names"
+msgstr ""
+
+#: gconf/gconf.c:183
+msgid "Key/directory may not end with a slash (/)"
+msgstr ""
+
+#: gconf/gconf.c:408
+#, c-format
+msgid "Expected float, got %s"
+msgstr "எதிபார்த்தது மிதவை, கிடைத்தது %s"
+
+#: gconf/gconf.c:443
+#, c-format
+msgid "Expected int, got %s"
+msgstr "எதிபார்த்தது முழுஎண், கிடைத்தது %s"
+
+#: gconf/gconf.c:478
+#, c-format
+msgid "Expected string, got %s"
+msgstr "எதிபார்த்தது சரம், கிடைத்தது %s"
+
+#: gconf/gconf.c:512
+#, c-format
+msgid "Expected bool, got %s"
+msgstr "எதிபார்த்தது பூலியன், கிடைத்தது %s"
+
+#: gconf/gconf.c:545
+#, c-format
+msgid "Expected schema, got %s"
+msgstr "எதிபார்த்தது schema, கிடைத்தது %s"
+
+#: gconf/gconfd.c:147
+msgid ""
+"gconfd compiled with debugging; trying to load gconf.path from the source "
+"directory"
+msgstr ""
+
+#: gconf/gconfd.c:161
+#, c-format
+msgid ""
+"No configuration files found, trying to use the default config source `%s'"
+msgstr ""
+
+#. We want to stay alive but do nothing, because otherwise every
+#. request would result in another failed gconfd being spawned.
+#.
+#: gconf/gconfd.c:169
+#, c-format
+msgid ""
+"No configuration sources in the source path, configuration won't be saved; "
+"edit %s"
+msgstr ""
+
+#: gconf/gconfd.c:182
+#, c-format
+msgid "Error loading some config sources: %s"
+msgstr ""
+
+#: gconf/gconfd.c:194
+msgid ""
+"No config source addresses successfully resolved, can't load or store config "
+"data"
+msgstr ""
+
+#: gconf/gconfd.c:211
+msgid ""
+"No writable config sources successfully resolved, may not be able to save "
+"some configuration changes"
+msgstr ""
+
+#: gconf/gconfd.c:237
+#, c-format
+msgid "Received signal %d, dumping core. Please report a GConf bug."
+msgstr ""
+
+#: gconf/gconfd.c:255
+#, c-format
+msgid ""
+"Received signal %d, shutting down abnormally. Please file a GConf bug report."
+msgstr ""
+
+#: gconf/gconfd.c:272
+#, c-format
+msgid "Received signal %d, shutting down cleanly"
+msgstr ""
+
+#: gconf/gconfd.c:341
+#, c-format
+msgid "Failed to open %s: %s"
+msgstr ""
+
+#: gconf/gconfd.c:348
+#, c-format
+msgid "Failed to stat %s: %s"
+msgstr ""
+
+#: gconf/gconfd.c:357
+#, c-format
+msgid "Owner of %s is not the current user"
+msgstr ""
+
+#: gconf/gconfd.c:365
+#, c-format
+msgid "Bad permissions %lo on directory %s"
+msgstr ""
+
+#. openlog() does not copy logname - what total brokenness.
+#. So we free it at the end of main()
+#: gconf/gconfd.c:445
+#, c-format
+msgid "starting (version %s), pid %u user '%s'"
+msgstr ""
+
+#: gconf/gconfd.c:484
+#, c-format
+msgid "Failed to create %s: %s"
+msgstr "%s படைக்க முடியவில்லை: %s"
+
+#: gconf/gconfd.c:492
+#, c-format
+msgid "Directory %s has a problem, gconfd can't use it"
+msgstr ""
+
+#: gconf/gconfd.c:528
+#, c-format
+msgid "Failed to write byte to pipe fd %d so client program may hang: %s"
+msgstr ""
+
+#: gconf/gconfd.c:542
+#, c-format
+msgid "Failed to get lock for daemon, exiting: %s"
+msgstr ""
+
+#: gconf/gconfd.c:584
+#, c-format
+msgid "Error releasing lockfile: %s"
+msgstr ""
+
+#: gconf/gconfd.c:592
+msgid "Exiting"
+msgstr "வெளியேறுகின்றது"
+
+#: gconf/gconfd.c:635
+msgid "GConf server is not in use, shutting down."
+msgstr ""
+
+#: gconf/gconftool.c:93
+msgid "Set a key to a value and sync. Use with --type."
+msgstr ""
+
+#: gconf/gconftool.c:102
+msgid "Print the value of a key to standard output."
+msgstr ""
+
+#: gconf/gconftool.c:111
+msgid ""
+"Set a schema and sync. Use with --short-desc, --long-desc, --owner, and --"
+"type."
+msgstr ""
+
+#: gconf/gconftool.c:121
+msgid "Unset the keys on the command line"
+msgstr ""
+
+#: gconf/gconftool.c:130
+msgid ""
+"Recursively unset all keys at or below the key/directory names on the "
+"command line"
+msgstr ""
+
+#: gconf/gconftool.c:139
+msgid "Print all key/value pairs in a directory."
+msgstr ""
+
+#: gconf/gconftool.c:148
+msgid "Print all subdirectories in a directory."
+msgstr ""
+
+#: gconf/gconftool.c:157
+msgid ""
+"Dump to standard out an XML description of all entries under a dir, "
+"recursively."
+msgstr ""
+
+#: gconf/gconftool.c:166
+msgid ""
+"Load from the specified file an XML description of values and set them "
+"relative to a dir."
+msgstr ""
+
+#: gconf/gconftool.c:175
+msgid "Print all subdirectories and entries under a dir, recursively."
+msgstr ""
+
+#: gconf/gconftool.c:184
+msgid "Return 0 if the directory exists, 2 if it does not."
+msgstr ""
+
+#: gconf/gconftool.c:193
+msgid "Shut down gconfd. DON'T USE THIS OPTION WITHOUT GOOD REASON."
+msgstr ""
+
+#: gconf/gconftool.c:202
+msgid "Return 0 if gconfd is running, 2 if not."
+msgstr ""
+
+#: gconf/gconftool.c:211
+msgid ""
+"Launch the config server (gconfd). (Normally happens automatically when "
+"needed.)"
+msgstr ""
+
+#: gconf/gconftool.c:220
+msgid ""
+"Specify the type of the value being set, or the type of the value a schema "
+"describes. Unique abbreviations OK."
+msgstr ""
+
+#: gconf/gconftool.c:221
+msgid "int|bool|float|string|list|pair"
+msgstr ""
+
+#: gconf/gconftool.c:229
+msgid "Print the data type of a key to standard output."
+msgstr ""
+
+#: gconf/gconftool.c:238
+msgid "Get the number of elements in a list key."
+msgstr ""
+
+#: gconf/gconftool.c:247
+msgid "Get a specific element from a list key, numerically indexed."
+msgstr ""
+
+#: gconf/gconftool.c:256
+msgid ""
+"Specify the type of the list value being set, or the type of the value a "
+"schema describes. Unique abbreviations OK."
+msgstr ""
+
+#: gconf/gconftool.c:257 gconf/gconftool.c:266 gconf/gconftool.c:275
+msgid "int|bool|float|string"
+msgstr ""
+
+#: gconf/gconftool.c:265
+msgid ""
+"Specify the type of the car pair value being set, or the type of the value a "
+"schema describes. Unique abbreviations OK."
+msgstr ""
+
+#: gconf/gconftool.c:274
+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."
+msgstr ""
+
+#: gconf/gconftool.c:284 gconf/gconftool.c:293
+msgid "DESCRIPTION"
+msgstr "விவரம்"
+
+#: gconf/gconftool.c:292
+msgid "Specify a several-line description to go in a schema."
+msgstr ""
+
+#: gconf/gconftool.c:301
+msgid "Specify the owner of a schema"
+msgstr ""
+
+#: gconf/gconftool.c:302
+msgid "OWNER"
+msgstr "சொந்தக்காரர்"
+
+#: gconf/gconftool.c:310
+msgid "Specify a schema file to be installed"
+msgstr ""
+
+#: gconf/gconftool.c:311
+msgid "FILENAME"
+msgstr "கோப்புப்பெய்ர்"
+
+#: gconf/gconftool.c:319
+msgid "Specify a configuration source to use rather than the default path"
+msgstr ""
+
+#: gconf/gconftool.c:320
+msgid "SOURCE"
+msgstr "மூலம்"
+
+#: gconf/gconftool.c:328
+msgid ""
+"Access the config database directly, bypassing server. Requires that gconfd "
+"is not running."
+msgstr ""
+
+#: gconf/gconftool.c:337
+msgid ""
+"Properly installs schema files on the command line into the database. "
+"GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
+"config source or set to the empty string to use the default."
+msgstr ""
+
+#: gconf/gconftool.c:346
+msgid ""
+"Properly uninstalls schema files on the command line from the database. "
+"GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
+"config source or set to the empty string to use the default."
+msgstr ""
+
+#: gconf/gconftool.c:355
+msgid ""
+"Torture-test an application by setting and unsetting a bunch of values of "
+"different types for keys on the command line."
+msgstr ""
+
+#: gconf/gconftool.c:364
+msgid ""
+"Torture-test an application by setting and unsetting a bunch of keys inside "
+"the directories on the command line."
+msgstr ""
+
+#: gconf/gconftool.c:373
+msgid "Get the short doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:382
+msgid "Get the long doc string for a key"
+msgstr ""
+
+#: gconf/gconftool.c:391
+msgid "Get the name of the schema applied to this key"
+msgstr ""
+
+#: gconf/gconftool.c:400
+msgid "Specify the schema name followed by the key to apply the schema name to"
+msgstr ""
+
+#: gconf/gconftool.c:409
+msgid "Remove any schema name applied to the given keys"
+msgstr ""
+
+#: gconf/gconftool.c:418
+msgid "Get the name of the default source"
+msgstr "மூலத்தின் கொடாநிலை பெயரைப் பெறுக"
+
+#: gconf/gconftool.c:427
+msgid "Print version"
+msgstr "பதிப்பு அச்சிடுக"
+
+#: gconf/gconftool.c:524
+msgid "Can't get and set/unset simultaneously\n"
+msgstr ""
+
+#: gconf/gconftool.c:534
+msgid "Can't set and get/unset simultaneously\n"
+msgstr ""
+
+#: gconf/gconftool.c:541
+msgid "Can't get type and set/unset simultaneously\n"
+msgstr ""
+
+#: gconf/gconftool.c:552
+msgid "Can't use --all-entries with --get or --set\n"
+msgstr ""
+
+#: gconf/gconftool.c:563
+msgid "Can't use --all-dirs with --get or --set\n"
+msgstr ""
+
+#: gconf/gconftool.c:576
+msgid ""
+"--recursive-list should not be used with --get, --set, --unset, --all-"
+"entries, or --all-dirs\n"
+msgstr ""
+
+#: gconf/gconftool.c:589
+msgid ""
+"--set_schema should not be used with --get, --set, --unset, --all-entries, --"
+"all-dirs\n"
+msgstr ""
+
+#: gconf/gconftool.c:595
+msgid "Value type is only relevant when setting a value\n"
+msgstr ""
+
+#: gconf/gconftool.c:601
+msgid "Must specify a type when setting a value\n"
+msgstr ""
+
+#: 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 ""
+
+#: gconf/gconftool.c:702
+msgid ""
+"You must specify a config source with --config-source when using --direct\n"
+msgstr ""
+
+#: gconf/gconftool.c:708
+msgid "You should use --direct when using a non-default configuration source\n"
+msgstr ""
+
+#: gconf/gconftool.c:714
+#, c-format
+msgid "Failed to init GConf: %s\n"
+msgstr ""
+
+#: gconf/gconftool.c:743
+msgid "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, not installing schemas\n"
+msgstr ""
+
+#: gconf/gconftool.c:750
+msgid ""
+"GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL is set, not uninstalling schemas\n"
+msgstr ""
+
+#: gconf/gconftool.c:763
+msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
+msgstr ""
+
+#: gconf/gconftool.c:792
+#, c-format
+msgid "Failed to access configuration source(s): %s\n"
+msgstr ""
+
+#: gconf/gconftool.c:1077
+#, c-format
+msgid "Shutdown error: %s\n"
+msgstr "பணிநிறுத்தம் பிழை: %s\n"
+
+#: gconf/gconftool.c:1120
+msgid "Must specify one or more directories to recursively list.\n"
+msgstr ""
+
+#: gconf/gconftool.c:1172
+msgid "Must specify one or more directories to dump.\n"
+msgstr ""
+
+#: gconf/gconftool.c:1214 gconf/gconftool.c:1479
+#, c-format
+msgid "Failure listing entries in `%s': %s\n"
+msgstr ""
+
+#: gconf/gconftool.c:1232
+msgid "(no value set)"
+msgstr ""
+
+#: gconf/gconftool.c:1537
+#, c-format
+msgid "Failed to spawn the config server (gconfd): %s\n"
+msgstr ""
+
+#: gconf/gconftool.c:1551
+msgid "Must specify a key or keys to get\n"
+msgstr ""
+
+#: gconf/gconftool.c:1586
+#, c-format
+msgid "Type: %s\n"
+msgstr "வகை: %s\n"
+
+#: gconf/gconftool.c:1587
+#, c-format
+msgid "List Type: %s\n"
+msgstr "பட்டியல் வகை: %s\n"
+
+#: gconf/gconftool.c:1588
+#, c-format
+msgid "Car Type: %s\n"
+msgstr ""
+
+#: gconf/gconftool.c:1589
+#, c-format
+msgid "Cdr Type: %s\n"
+msgstr ""
+
+#: gconf/gconftool.c:1594
+#, c-format
+msgid "Default Value: %s\n"
+msgstr "கொடாநிலை மதிப்பு: %s\n"
+
+#: gconf/gconftool.c:1594 gconf/gconftool.c:1596 gconf/gconftool.c:1597
+#: gconf/gconftool.c:1598
+msgid "Unset"
+msgstr ""
+
+#: gconf/gconftool.c:1596
+#, c-format
+msgid "Owner: %s\n"
+msgstr "சொந்தக்காரர்: %s\n"
+
+#: gconf/gconftool.c:1597
+#, c-format
+msgid "Short Desc: %s\n"
+msgstr ""
+
+#: gconf/gconftool.c:1598
+#, c-format
+msgid "Long Desc: %s\n"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: gconf/gconftool.c:1654 gconf/gconftool.c:1666
+#, c-format
+msgid "Don't understand type `%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:1678
+msgid "Must specify alternating keys/values as arguments\n"
+msgstr ""
+
+#: gconf/gconftool.c:1698
+#, c-format
+msgid "No value to set for key: `%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:1726
+msgid "Cannot set schema as value\n"
+msgstr ""
+
+#: gconf/gconftool.c:1736
+msgid "When setting a list you must specify a primitive list-type\n"
+msgstr ""
+
+#: gconf/gconftool.c:1750
+msgid ""
+"When setting a pair you must specify a primitive car-type and cdr-type\n"
+msgstr ""
+
+#: gconf/gconftool.c:1765
+#, c-format
+msgid "Error: %s\n"
+msgstr "பிழை: %s\n"
+
+#: gconf/gconftool.c:1778 gconf/gconftool.c:2806
+#, c-format
+msgid "Error setting value: %s\n"
+msgstr "மதிப்பு அமைக்குபோது பிழை: %s\n"
+
+#: gconf/gconftool.c:1796
+#, c-format
+msgid "Error syncing: %s\n"
+msgstr ""
+
+#: gconf/gconftool.c:1811
+msgid "Must specify a key or keys to get type\n"
+msgstr ""
+
+#: gconf/gconftool.c:1855
+msgid "Must specify a key to lookup size of.\n"
+msgstr ""
+
+#: gconf/gconftool.c:1880 gconf/gconftool.c:1925
+#, c-format
+msgid "Key %s is not a list.\n"
+msgstr ""
+
+#: gconf/gconftool.c:1900
+msgid "Must specify a key from which to get list element.\n"
+msgstr ""
+
+#: gconf/gconftool.c:1931
+msgid "Must specify list index.\n"
+msgstr ""
+
+#: gconf/gconftool.c:1938
+msgid "List index must be non-negative.\n"
+msgstr ""
+
+#: gconf/gconftool.c:1947
+msgid "List index is out of bounds.\n"
+msgstr ""
+
+#: gconf/gconftool.c:1973
+msgid "Must specify a key or keys on the command line\n"
+msgstr ""
+
+#: gconf/gconftool.c:1993
+#, c-format
+msgid "No schema known for `%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:2026
+#, c-format
+msgid "No doc string stored in schema at '%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:2031
+#, c-format
+msgid "Error getting schema at '%s': %s\n"
+msgstr ""
+
+#: gconf/gconftool.c:2038
+#, c-format
+msgid "No schema stored at '%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:2041
+#, c-format
+msgid "Value at '%s' is not a schema\n"
+msgstr ""
+
+#: gconf/gconftool.c:2097
+msgid "Must specify a schema name followed by the key name to apply it to\n"
+msgstr ""
+
+#: gconf/gconftool.c:2104
+#, c-format
+msgid "Error associating schema name '%s' with key name '%s': %s\n"
+msgstr ""
+
+#: gconf/gconftool.c:2122
+msgid "Must specify keys to unapply schema from\n"
+msgstr ""
+
+#: gconf/gconftool.c:2132
+#, c-format
+msgid "Error removing schema name from '%s': %s\n"
+msgstr ""
+
+#: gconf/gconftool.c:2157
+msgid "Must specify key (schema name) as the only argument\n"
+msgstr ""
+
+#: gconf/gconftool.c:2199
+msgid "List type must be a primitive type: string, int, float or bool\n"
+msgstr ""
+
+#: gconf/gconftool.c:2219
+msgid "Pair car type must be a primitive type: string, int, float or bool\n"
+msgstr ""
+
+#: gconf/gconftool.c:2239
+msgid "Pair cdr type must be a primitive type: string, int, float or bool\n"
+msgstr ""
+
+#: gconf/gconftool.c:2254
+#, c-format
+msgid "Error setting value: %s"
+msgstr "மதிப்பு அமைக்குபோது பிழை: %s"
+
+#: gconf/gconftool.c:2268
+#, c-format
+msgid "Error syncing: %s"
+msgstr ""
+
+#: gconf/gconftool.c:2283
+msgid "Must specify one or more directories to get key/value pairs from.\n"
+msgstr ""
+
+#: gconf/gconftool.c:2297
+msgid "Must specify one or more keys to unset.\n"
+msgstr ""
+
+#: gconf/gconftool.c:2308
+#, c-format
+msgid "Error unsetting `%s': %s\n"
+msgstr ""
+
+#: gconf/gconftool.c:2328
+msgid "Must specify one or more keys to recursively unset.\n"
+msgstr ""
+
+#: gconf/gconftool.c:2342
+#, c-format
+msgid "Failure during recursive unset of \"%s\": %s\n"
+msgstr ""
+
+#: gconf/gconftool.c:2362
+msgid "Must specify one or more directories to get subdirs from.\n"
+msgstr ""
+
+#: gconf/gconftool.c:2396
+#, c-format
+msgid "Error listing dirs: %s\n"
+msgstr ""
+
+#: gconf/gconftool.c:2532
+msgid "WARNING: must specify both a <car> and a <cdr> in a <pair>\n"
+msgstr ""
+
+#: gconf/gconftool.c:2559
+#, c-format
+msgid "WARNING: key specified (%s) for schema under a <value> - ignoring\n"
+msgstr ""
+
+#: gconf/gconftool.c:2592
+msgid "WARNING: must have a child node under <value>\n"
+msgstr ""
+
+#: gconf/gconftool.c:2598
+#, c-format
+msgid "WARNING: node <%s> not understood\n"
+msgstr ""
+
+#: gconf/gconftool.c:2616
+#, c-format
+msgid "WARNING: Failed to parse int value `%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:2637
+#, c-format
+msgid "WARNING: Failed to parse float value `%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:2659
+#, c-format
+msgid "WARNING: Failed to parse string value `%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:2680
+#, c-format
+msgid "WARNING: Failed to parse boolean value `%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:2796 gconf/gconftool.c:3332
+#, c-format
+msgid "WARNING: failed to associate schema `%s' with key `%s': %s\n"
+msgstr ""
+
+#: gconf/gconftool.c:2901
+#, c-format
+msgid "WARNING: invalid or missing type for schema (%s)\n"
+msgstr ""
+
+#: gconf/gconftool.c:2910
+#, c-format
+msgid "WARNING: invalid or missing list_type for schema (%s)\n"
+msgstr ""
+
+#: 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 ""
+
+#: gconf/gconftool.c:2939
+#, c-format
+msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
+msgstr ""
+
+#: gconf/gconftool.c:2964
+msgid "WARNING: You cannot set a default value for a schema\n"
+msgstr ""
+
+#: gconf/gconftool.c:2993
+msgid "WARNING: gconftool internal error, unknown GConfValueType\n"
+msgstr ""
+
+#: 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 ""
+
+#: gconf/gconftool.c:3058
+#, c-format
+msgid ""
+"WARNING: list_type can only be int, float, string or bool and not `%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:3079
+#, c-format
+msgid "WARNING: car_type can only be int, float, string or bool and not `%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:3100
+#, c-format
+msgid "WARNING: cdr_type can only be int, float, string or bool and not `%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:3140
+msgid "WARNING: empty <applyto> node"
+msgstr ""
+
+#: gconf/gconftool.c:3143 gconf/gconftool.c:3405
+#, c-format
+msgid "WARNING: node <%s> not understood below <schema>\n"
+msgstr ""
+
+#: gconf/gconftool.c:3154
+msgid "WARNING: no <list_type> specified for schema of type list\n"
+msgstr ""
+
+#: gconf/gconftool.c:3160
+msgid "WARNING: no <car_type> specified for schema of type pair\n"
+msgstr ""
+
+#: gconf/gconftool.c:3166
+msgid "WARNING: no <cdr_type> specified for schema of type pair\n"
+msgstr ""
+
+#: gconf/gconftool.c:3195
+msgid "WARNING: <locale> node has no `name=\"locale\"' attribute, ignoring\n"
+msgstr ""
+
+#: gconf/gconftool.c:3201
+#, c-format
+msgid ""
+"WARNING: multiple <locale> nodes for locale `%s', ignoring all past first\n"
+msgstr ""
+
+#: gconf/gconftool.c:3299
+#, c-format
+msgid "WARNING: Invalid node <%s> in a <locale> node\n"
+msgstr ""
+
+#: gconf/gconftool.c:3340
+#, c-format
+msgid "Attached schema `%s' to key `%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:3414
+msgid "You must have at least one <locale> entry in a <schema>\n"
+msgstr ""
+
+#: gconf/gconftool.c:3446
+#, c-format
+msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
+msgstr ""
+
+#: gconf/gconftool.c:3454
+#, c-format
+msgid "Installed schema `%s' for locale `%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:3478
+#, c-format
+msgid "WARNING: failed to uninstall schema `%s' locale `%s': %s\n"
+msgstr ""
+
+#: gconf/gconftool.c:3486
+#, c-format
+msgid "Uninstalled schema `%s' from locale `%s'\n"
+msgstr ""
+
+#: gconf/gconftool.c:3524
+msgid "WARNING: no key specified for schema\n"
+msgstr ""
+
+#: gconf/gconftool.c:3565
+#, c-format
+msgid "WARNING: node <%s> not understood below <%s>\n"
+msgstr ""
+
+#: gconf/gconftool.c:3596
+#, c-format
+msgid "Failed to open `%s': %s\n"
+msgstr "'%s' திறக்க முடியவில்லை: %s\n"
+
+#: gconf/gconftool.c:3603
+#, c-format
+msgid "Document `%s' is empty?\n"
+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 ""
+
+#: gconf/gconftool.c:3628
+#, c-format
+msgid "Document `%s' has no top level <%s> node\n"
+msgstr ""
+
+#: gconf/gconftool.c:3642
+#, c-format
+msgid "WARNING: node <%s> below <%s> not understood\n"
+msgstr ""
+
+#: gconf/gconftool.c:3653 gconf/gconftool.c:3688 gconf/gconftool.c:3720
+#, c-format
+msgid "Error syncing config data: %s"
+msgstr ""
+
+#: gconf/gconftool.c:3672
+msgid "Must specify some schema files to install\n"
+msgstr ""
+
+#: gconf/gconftool.c:3704
+msgid "Must specify some schema files to uninstall\n"
+msgstr ""
+
+#: gconf/gconftool.c:3741
+#, c-format
+msgid ""
+"\n"
+"%s\n"
+msgstr ""
+"\n"
+"%s\n"
+
+#: gconf/gconftool.c:3761
+#, c-format
+msgid "Failed to unset breakage key %s: %s\n"
+msgstr ""
+
+#: gconf/gconftool.c:3887
+msgid "Must specify some keys to break\n"
+msgstr ""
+
+#: gconf/gconftool.c:3893
+#, c-format
+msgid ""
+"Trying to break your application by setting bad values for key:\n"
+"  %s\n"
+msgstr ""
+
+#: gconf/gconftool.c:3911
+msgid "Must specify some directories to break\n"
+msgstr ""
+
+#: gconf/gconftool.c:3930
+#, c-format
+msgid ""
+"Trying to break your application by setting bad values for keys in "
+"directory:\n"
+"  %s\n"
+msgstr ""
+
+#~ msgid "Cannot find directory %s\n"
+#~ msgstr "அடைவு %s காணவில்லை\n"
+
+#~ msgid "Usage: %s <dir>\n"
+#~ msgstr "பயன்படுத்துதல்: %s <அடைவு>\n"
+
+#~ msgid "none"
+#~ msgstr "வெற்று"
+
+#~ msgid "CORBA error: %s"
+#~ msgstr "CORBA பிழை: %s"
+
+#~ msgid "Shutdown request received"
+#~ msgstr "நிறுத்தல் வேண்டுதல் கிடைத்தது"
diff --git a/po/tr.po b/po/tr.po
index 5a6c037e..99163ac4 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,17 +1,20 @@
+# translation of gconf.HEAD.po to Türkçe
 # Turkish translation of GConf.
-# Copyright (C) 2001-2003 Free Software Foundation, Inc.
-# Nilgün Belma Bugüner <nilgun@fide.org>, 2001
-# Fatih Demir <kabalak@gtranslator.org>, 2000
-# Ömer Fadıl USTA <omer_fad@hotmail.com>, 2001
-# Barbaros Ulutas <barbaros@ekolojikpolitika.org>, 2003
-#
+# Copyright (C) 2001-2003, 2004 Free Software Foundation, Inc.
+# Nilgün Belma Bugüner <nilgun@fide.org>, 2001.
+# Fatih Demir <kabalak@gtranslator.org>, 2000.
+# Ömer Fadıl USTA <omer_fad@hotmail.com>, 2001.
+# Barbaros Ulutas <barbaros@ekolojikpolitika.org>, 2003.
+# Gurkan Aslan <gurkan@iaslan.com>, 2004.
+# 
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: GConf\n"
+"Project-Id-Version: gconf.HEAD\n"
 "POT-Creation-Date: 2003-12-05 00:37+0100\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"
+"PO-Revision-Date: 2004-03-22 15:16+0200\n"
+"Last-Translator: Gurkan Aslan <gurkan@iaslan.com>\n"
+"Language-Team: Türkçe <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,32 +23,32 @@ msgstr ""
 #: backends/dir-utils.c:108
 #, c-format
 msgid "Couldn't find the %s root directory in the address `%s'"
-msgstr "`%s' kök dizini `%s' adresinde bulunamadı"
+msgstr "`%s' adresinde %s kök dizininde bulunamadı"
 
 #: backends/dir-utils.c:124 backends/xml-backend.c:332
 #, c-format
 msgid "Could not make directory `%s': %s"
-msgstr "`%s' dizini oluşturulamadı: %s"
+msgstr "Dizin oluşturulamadı `%s': %s"
 
 #: backends/dir-utils.c:212
 #, c-format
 msgid "Can't read from or write to the %s root directory in the address `%s'"
-msgstr "%s dizini (%s adresindeki) okunamaz/yazılamaz"
+msgstr "%s kök dizini `%s' adresinden okunamıyor veya yazılamıyor"
 
 #: backends/xml-backend.c:236
 msgid "Unloading XML backend module."
-msgstr "XML modülü kaldırılıyor."
+msgstr "XML arkayüz modülü kaldırılıyor."
 
 #: backends/xml-backend.c:285
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
-msgstr "`%s' adresinde XML kök dizini bulunamadı."
+msgstr "XML kök dizini bulunamadı `%s' adresinde bulunamadı."
 
 #: backends/xml-backend.c:443
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
-msgstr "\"%s\" adresinde XML kök dizini okunamaz/yazılamaz."
+msgstr "\"%s\" adresindeki XML kök dizinine okuma veya yazma yapılamıyor"
 
 #: backends/xml-backend.c:453
 #, c-format
@@ -55,10 +58,9 @@ msgstr "%s kökündeki XML kaynak dizin/dosya erişim izinleri: %o/%o"
 #: backends/xml-backend.c:619
 #, c-format
 msgid "Error syncing the XML backend directory cache: %s"
-msgstr "XML arkayüz dizini geçici belleği eşzamanlanırken hata: %s"
+msgstr "XML arkayüz dizini arabelleği eşzamanlanırken hata: %s"
 
 #: backends/xml-backend.c:684
-#, fuzzy
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
@@ -67,27 +69,27 @@ msgstr ""
 "değerleri kaldırın."
 
 #: backends/xml-backend.c:770
-#, fuzzy, c-format
+#, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
-msgstr "`%s' dizini oluşturulamadı: %s"
+msgstr "%s 'in kilitlerini kaldırmak için kilitli dizin açılamıyor: %s\n"
 
 #: backends/xml-backend.c:788
-#, fuzzy, c-format
+#, c-format
 msgid "Could not remove file %s: %s\n"
-msgstr "`%s' dosyası kaldırılamadı: %s\n"
+msgstr "Dosya kaldırılamadı %s: %s\n"
 
 #: backends/xml-backend.c:809
 msgid "Initializing XML backend module"
-msgstr "XML modülü başlatılıyor"
+msgstr "XML arkayüz modülü başlatılıyor"
 
 #: backends/xml-backend.c:877
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
-msgstr "\"%s\" XML dizininde kilitleme yapılamadı: %s"
+msgstr "XML dizininden kilit kaldırılması başarısız: \"%s\": %s"
 
 #: backends/xml-cache.c:286
 msgid "Failed to sync XML cache contents to disk"
-msgstr "XML cache içeriği diskle senkronize edilemedi."
+msgstr "XML arabellek içeriğinin diskle senkronizasyonu başarısız."
 
 #: backends/xml-cache.c:316
 #, c-format
@@ -95,8 +97,8 @@ msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
 "not been successfully synced to disk"
 msgstr ""
-"Diskle eşzamanlı olmadığından, XML modülünün arabelleğindeki `%s' dizini "
-"silinemiyor"
+"XML arkayüz modülünün arabelleğindeki `%s' dizini kaldırılamıyor, çünkü "
+"başarılı bir şekilde disk ile eşzamanlanamadı"
 
 #: backends/xml-dir.c:171
 #, c-format
@@ -126,7 +128,7 @@ msgstr "`%s'de kip belirlenemedi: %s"
 #: backends/xml-dir.c:494
 #, c-format
 msgid "Failed to write XML data to `%s': %s"
-msgstr "XML verisi `%s' dosyasına yazılamadı: %s"
+msgstr "XML verisi yazılamadı `%s': %s"
 
 #: backends/xml-dir.c:504 backends/xml-dir.c:1279
 #, c-format
@@ -136,12 +138,12 @@ msgstr "`%s' dosyası kapatılamadı: %s"
 #: backends/xml-dir.c:520 backends/xml-dir.c:530
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
-msgstr "`%s' `%s' olarak değiştirilemedi: %s"
+msgstr "`%s', `%s' olarak değiştirilemedi: %s"
 
 #: backends/xml-dir.c:536
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
-msgstr "`%s' `%s'den eski haline getirilemedi: %s"
+msgstr "`%s', `%s' den eski haline getirilemedi: %s"
 
 #: backends/xml-dir.c:548
 #, c-format
@@ -157,17 +159,17 @@ msgstr "`%s' durumlanamadı: %s"
 #: backends/xml-dir.c:1152
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
-msgstr "`%s' girdisi `%s' içinde tekrarlandı, yoksayılıyor"
+msgstr "`%s' girdisi `%s' içinde tekrarlı, yoksayılıyor"
 
 #: backends/xml-dir.c:1174
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
-msgstr "`%s' XML dosyasında isimsiz girdi var, yoksayılıyor"
+msgstr "XML dosyası `%s' içinde isimsiz girdi var, yoksayılıyor"
 
 #: backends/xml-dir.c:1182
 #, c-format
 msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
-msgstr "`%s' XML dosyasındaki ilk düğüm <%s> bir <entry> değil, yoksayılıyor"
+msgstr "`%s' XML dosyasındaki ilk düğüm <%s> aksine <entry>, yoksayılıyor"
 
 #: backends/xml-dir.c:1255
 #, c-format
@@ -182,7 +184,7 @@ msgstr "`%s' dosyası oluşturulamadı: %s"
 #: backends/xml-dir.c:1370
 #, c-format
 msgid "Failed to parse XML file \"%s\""
-msgstr "\"%s\" dosyası yazılamadı"
+msgstr "\"%s\" XML dosyası ayrıştırılamadı"
 
 #. There was an error
 #: backends/xml-entry.c:154
@@ -193,7 +195,7 @@ msgstr "`%s' adlı XML düğümü yoksayılıyor: %s"
 #: backends/xml-entry.c:332
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
-msgstr "`%s' şema ismi yoksayılıyor, geçersiz: %s"
+msgstr "Şema ismi `%s' yoksayılıyor, geçersiz: %s"
 
 #: backends/xml-entry.c:380
 #, c-format
@@ -208,16 +210,16 @@ msgstr "Şema için verilen öntanımlı değer okunamadı: %s"
 #: backends/xml-entry.c:952
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
-msgstr "<%s> düğümü için \"type\" değeri belirtilmemiş"
+msgstr "<%s> düğümü için \"type\" özniteliği belirtilmemiş"
 
 #: backends/xml-entry.c:966
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
-msgstr "Bilinmeyen `%s' \"type\" değerine sahip düğüm yoksayıldı"
+msgstr "Bilinmeyen `%s' \"type\" özniteliğine sahip düğüm, yoksayıldı"
 
 #: backends/xml-entry.c:981
 msgid "No \"value\" attribute for node"
-msgstr "Düğümde \"value\" için bir şey verilmemiş"
+msgstr "\"value\" özniteliği için düğüm yok"
 
 #: backends/xml-entry.c:1029 backends/xml-entry.c:1105
 #, c-format
@@ -227,38 +229,38 @@ msgstr "Bir XML liste düğümü içindeki <%s> XML düğümü anlaşılamadı"
 #: backends/xml-entry.c:1063
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr ""
-"Bir liste düğümü içindeki tür (liste, değer çifti ya da  her neyse) geçersiz"
+"Bir liste düğümü içindeki (liste, değer çifti ya da bilinmeyen) tip geçersiz"
 
 #: backends/xml-entry.c:1086
 #, c-format
 msgid "Bad XML node: %s"
-msgstr "Kötü biçimlendirilmiş XML düğümü: %s"
+msgstr "Kötü XML düğümü: %s"
 
 #: backends/xml-entry.c:1094
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
-msgstr "Liste yanlış türde düğüm içeriyor ( %s, %s olmalıydı)"
+msgstr "Liste hatalı tipte düğüm içeriyor ( %s, %s olmalıydı)"
 
 #: backends/xml-entry.c:1146
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
-msgstr "XML çiftindeki hatalı `car' yoksayılıyor: %s"
+msgstr "XML çiftindeki kötü `car' yoksayılıyor: %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 dosyası okunurken hata: listeler ve çiftler bir başka çiftin içine "
-"yerleştirilemez"
+"XML dosyası ayrıştırılıyor: listeler ve çiftler bir çiftin içine "
+"yerleştirilemedi"
 
 #: backends/xml-entry.c:1168
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
-msgstr "XML çiftinde hatalı `cdr' yoksayıldı: %s"
+msgstr "XML çiftindeki hatalı `cdr' yoksayılıyor: %s"
 
 #: backends/xml-entry.c:1187
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
-msgstr "Bir XML çiftindeki <%s> XML düğümü anlaşılamadı"
+msgstr "Bir XML çifti düğümü içindeki <%s> XML düğümü anlaşılamadı"
 
 #: backends/xml-entry.c:1205
 msgid "Didn't find car and cdr for XML pair node"
@@ -274,36 +276,36 @@ msgstr "XML dosyasındaki değer çiftlerinden `car' eksik"
 
 #: backends/xml-entry.c:1223
 msgid "Missing both car and cdr values from pair in XML file"
-msgstr "XML dosyasındaki değer çiftlerinde `car' ve `cdr'  ikisi de eksik"
+msgstr "XML dosyasındaki çiftden `car' ve `cdr' değerlerinin ikisi de eksik"
 
 #. -- end debug only
 #: gconf/gconf-backend.c:167
 #, c-format
 msgid "No such file `%s'\n"
-msgstr "`%s' diye bir dosya yok\n"
+msgstr "Böyle bir dosya yok `%s'\n"
 
 #: gconf/gconf-backend.c:195
 #, c-format
 msgid "Bad address `%s'"
-msgstr "Hatalı adres `%s'"
+msgstr "Kötü adres `%s'"
 
 #: gconf/gconf-backend.c:220
 msgid "GConf won't work without dynamic module support (gmodule)"
-msgstr "GConf dinamik modül desteği (gmodule) olmadan çalışmaz"
+msgstr "GConf dinamik modül desteği (gmodule) olmadan çalışmayacak"
 
 #: gconf/gconf-backend.c:230
 #, c-format
 msgid "Error opening module `%s': %s\n"
-msgstr "`%s' modülü açılırken hata: %s\n"
+msgstr "Modül açılırken hata `%s': %s\n"
 
 #: gconf/gconf-backend.c:262
 #, c-format
 msgid "Couldn't locate backend module for `%s'"
-msgstr "`%s' için modül bulunamadı"
+msgstr "`%s' için arkayüz modülüne konumlanılamadı"
 
 #: gconf/gconf-backend.c:299
 msgid "Failed to shut down backend"
-msgstr "Modül kapatılamadı"
+msgstr "Arkayüz modülü kapatılamadı"
 
 #: gconf/gconf-client.c:344 gconf/gconf-client.c:362
 #, c-format
@@ -318,12 +320,12 @@ msgstr "GConf uyarısı: `%s' içindeki çiftlerin listelenmesi başarısız old
 #: gconf/gconf-client.c:1181
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
-msgstr "`%s' olmalıydı, `%s' alındı (%s anahtarı için)"
+msgstr "`%3$s' anahtarı için `%1$s' bekleniyordu `%2$s' alındı"
 
 #: gconf/gconf-database.c:173
 #, c-format
 msgid "Failed to sync one or more sources: %s"
-msgstr "Bir ya da daha fazla kaynağın eşzamanlamasında hata: %s"
+msgstr "Bir ya da daha fazla kaynağı eşzamanlanamadı: %s"
 
 #: gconf/gconf-database.c:241 gconf/gconf-sources.c:1541
 #, c-format
@@ -338,7 +340,7 @@ msgstr "`%s' için değer belirtilirken hata: %s"
 #: gconf/gconf-database.c:342
 #, c-format
 msgid "Error unsetting `%s': %s"
-msgstr "`%s' kaldırılamadı: %s"
+msgstr "`%s': Kaldırılırken hata %s"
 
 #: gconf/gconf-database.c:371
 #, c-format
@@ -348,7 +350,7 @@ msgstr "`%s' için öntanımlı değer alınırken hata: %s"
 #: gconf/gconf-database.c:418
 #, c-format
 msgid "Error unsetting \"%s\": %s"
-msgstr "\"%s\" kaldırılamadı: %s"
+msgstr "\"%s\" Kaldırılırken hata: %s"
 
 #: gconf/gconf-database.c:450
 #, c-format
@@ -358,10 +360,10 @@ msgstr "\"%s\" için yeni değer alınırken hata: %s"
 #: gconf/gconf-database.c:496
 #, c-format
 msgid "Error checking existence of `%s': %s"
-msgstr "`%s' var mı/yok mu bakılırken hata: %s"
+msgstr "`%s' var olup olmadığına bakılırken hata: %s"
 
 #: gconf/gconf-database.c:520
-#, fuzzy, c-format
+#, c-format
 msgid "Error removing directory \"%s\": %s"
 msgstr "`%s' dizini silinirken hata: %s"
 
@@ -402,7 +404,7 @@ msgstr "Yapılandırma kaynaklarının adresleri çözümlenemedi"
 
 #: gconf/gconf-error.c:30
 msgid "Bad key or directory name"
-msgstr "Hatalı anahtar ya da dizin adı"
+msgstr "Kötü anahtar ya da dizin adı"
 
 #: gconf/gconf-error.c:31
 msgid "Parse error"
@@ -452,12 +454,12 @@ msgstr "\"%s\" anahtarında '/' yok"
 #: gconf/gconf-internals.c:337
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
-msgstr "Dizin dosyası `%s' açılamadı: %s\n"
+msgstr "Yol dosyası açılamadı `%s': %s\n"
 
 #: gconf/gconf-internals.c:386
 #, c-format
 msgid "Adding source `%s'\n"
-msgstr "`%s' kaynağının eklenmesi\n"
+msgstr "`%s' kaynağı ekleniyor\n"
 
 #: gconf/gconf-internals.c:398
 #, c-format
@@ -493,24 +495,24 @@ msgstr "(%s,%s) çifti beklenirken , bir ya da iki değeri eksik bir çift alın
 #: gconf/gconf-internals.c:1021
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
-msgstr "(%s,%s) çifti beklenirken, (%s,%s) çifti alındı"
+msgstr "(%s,%s) tipinde çift beklenirken, (%s,%s) tipi alındı"
 
 #: gconf/gconf-internals.c:1137
 msgid "Quoted string doesn't begin with a quotation mark"
-msgstr "Tırnaklarla belirlenen bir dizge ? işareti ile başlamaz"
+msgstr "Tırnaklarla belirlenen bir dizge soru işaretiyle başlamaz"
 
 #: gconf/gconf-internals.c:1199
 msgid "Quoted string doesn't end with a quotation mark"
-msgstr "Tırnaklarla belirlenen bir dizge ? işareti ile bitmez"
+msgstr "Tırnaklarla belirlenen bir dizge soru işareti ile bitmez"
 
 #: gconf/gconf-internals.c:1335
 msgid "Encoded value is not valid UTF-8"
-msgstr "Kodlanan değer UTF-8 olarak geçersiz"
+msgstr "Kodlanan değer geçersiz UTF-8"
 
 #: gconf/gconf-internals.c:1837
 #, c-format
 msgid "IOR file '%s' not opened successfully, no gconfd located: %s"
-msgstr "'%s' IOR dosyası başarıyla açılmamış, gconfd yok: %s"
+msgstr "'%s' IOR dosyası başarıyla açılmamış, konumlanmış gconfd yok: %s"
 
 #: gconf/gconf-internals.c:1867
 #, c-format
@@ -534,7 +536,7 @@ msgstr "Geçici dosya `%s' kilitlenemedi: %s"
 #: gconf/gconf-internals.c:1976
 #, c-format
 msgid "Could not create file '%s', probably because it already exists"
-msgstr "'%s' dosyası oluşturulamadı, herhalde zaten var"
+msgstr "'%s' dosyası oluşturulamadı, zaten var olabilir"
 
 #: gconf/gconf-internals.c:2023
 #, c-format
@@ -558,7 +560,7 @@ msgstr "`%s' dosyasında kilit yok, ama olmalı"
 #: gconf/gconf-internals.c:2138
 #, c-format
 msgid "Failed to link '%s' to '%s': %s"
-msgstr "`%s' -> `%s' bağı oluşturulamadı: %s"
+msgstr "`%s' 'den `%s' e bağ oluşturulamadı: %s"
 
 #: gconf/gconf-internals.c:2150
 #, c-format
@@ -586,9 +588,9 @@ msgid "Can't write to file `%s': %s"
 msgstr "`%s' dosyasına yazılamadı: %s"
 
 #: gconf/gconf-internals.c:2323
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to unlink lock file %s: %s\n"
-msgstr "`%s' kilit dosyası silinemedi: %s"
+msgstr "%s kilit dosyasının bağlantısı koparılamadı: %s\n"
 
 #: gconf/gconf-sanity-check.c:43 gconf/gconftool.c:84
 msgid "Help options"
@@ -613,7 +615,7 @@ msgid ""
 "in your home directory. The error was \"%s\" (errno = %d)."
 msgstr ""
 "Lütfen aşağıdaki sorunu çözemek için sistem yöneticinize başvurun:\n"
-"\"%s\" dosyası açılamadı ya da oluşturulamadı, bu durum yapılandırma "
+"\"%s\" dosyası açılamadı ya da oluşturulamadı; bu durum yapılandırma "
 "ayarlarınızla ilgili bir sorun olduğunu gösterebilir, çünkü bir çok program "
 "ev dizininizde dosyalar oluşturmaya gereksinim duyar. Hata: \"%s\" (errno = %"
 "d)"
@@ -677,19 +679,28 @@ msgid ""
 "\n"
 "Do you want to continue?"
 msgstr ""
+"Tercihlerinizi içeren dosyalardaki ayarlar zaten kullanımda \n"
+"\n"
+"Başka bir bilgisayardan açtığınız başka bir oturum tercih ettiğiniz ayarları "
+"kullanıyor olabilir.\n"
+"\n"
+"Var olan oturuma devam edebilirsiniz, ancak diğer oturumdakitercih edilen "
+"ayarlarla birlikte geçisi sorunlar olabilir.\n"
+"\n"
+"Devam etmek istiyor musunuz?"
 
 #: gconf/gconf-sanity-check.c:344
 msgid "_Log Out"
-msgstr ""
+msgstr "_Çıkış"
 
 #: gconf/gconf-sanity-check.c:346
 msgid "_Continue"
-msgstr ""
+msgstr "_Devam"
 
 #: gconf/gconf-sanity-check.c:359
 #, c-format
 msgid "%s Continue (y/n)?"
-msgstr ""
+msgstr "%s Devam (e/h)?"
 
 #: gconf/gconf-schema.c:221 gconf/gconf-schema.c:229 gconf/gconf-schema.c:237
 #: gconf/gconf-schema.c:245
@@ -739,8 +750,8 @@ msgid ""
 "None of the resolved addresses are writable; saving configuration settings "
 "will not be possible"
 msgstr ""
-"Çözülen hiç bir adres yazılabilir değil. Yapılandırma ayarları "
-"kaydedilemeyecek."
+"Çözülen hiçbir adres yazılabilir değil. Yapılandırma ayarlarını kaydetmek "
+"mümkün olmayacak."
 
 #: gconf/gconf-sources.c:584
 #, c-format
@@ -757,7 +768,8 @@ msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path"
 msgstr ""
-"`%s değeri, ayar dizinlerinden birinde salt-okunur kaynak içinde belirtiliyor"
+"`%s' için değer yapılandırma yolunda bir salt-okunur kaynak içinde "
+"belirtiliyor"
 
 #: gconf/gconf-sources.c:692
 #, c-format
@@ -779,16 +791,23 @@ msgid ""
 "home directory, and it must own a lockfile in ~/.gconfd and also lockfiles "
 "in individual storage locations such as ~/.gconf"
 msgstr ""
-"Yapılandırma sunucusu yazılabilir veritabanlarına sahip olmadığından '%s'de "
-"bir değer saklanamıyor. Bu sorun iki sebepten ortaya çıkabilir: 1) %s "
-"Yapılandırma dosya yolu dosyanız herhangi bir veritabanı içermiyordur ya da "
-"yoktur veya 2) Yanlışlıkla iki gconfd süreci oluşturulmuştur. Eğer iki "
-"gconfd süreciniz varsa (veya ikincisi çalıştırıldığında zaten iki süreç "
-"varsa) Gconfd'yi öldürmek üzere bir çıkış ve tekrar giriş yardımcı olabilir. "
-"Bu durum GConfd'nin iki makinada aynı anda kullanılmasından kaynaklanabilir "
-"ve ORBit hala, uzak CORBA bağlantılarını önleyen öntanımlı yapılandırmasına "
-"sahip olabilir mi? Daima, GConfd tarafından saptanan sorunlar hakkındaki "
-"ayrıntıları görmek için user.* sistem günlük dosyasına bakınız."
+"Yapılandırma sunucusu yazılabilir veritabanlarına sahip olmadığından '%s' "
+"anahtarında bir değer saklanamıyor. Bu sorun iki sebepten ortaya çıkabilir: "
+"1) %s Yapılandırma dosya yolu dosyanız herhangi bir veritabanı içermiyordur "
+"ya da yoktur veya 2) Yanlışlıkla iki gconfd süreci oluşturulmuştur.3) "
+"İşletim sisteminiz ayarlanmamıştır, NFS dosya kilidi ev dizini içinde "
+"çalışmıyor veya 4) NSF istemci makine çökmüştür ve yeniden başladığında "
+"dosya kilitleri kaldırılmış olabilir. Eğer iki gconfd süreciniz varsa (veya "
+"ikincisi çalıştırıldığında zaten iki süreç varsa) çıkıp, tüm gconfd "
+"kopyalarını öldürüp tekrar giriş yapmanızyardımcı olabilir. Eğer yıpranmış "
+"kilit varsa, ~/.gconf*/*lock 'u silin. Bu durum GConfd'nin iki makinada aynı "
+"anda kullanılmasından kaynaklanabilir ve ORBit hala uzak CORBA "
+"bağlantılarını önleyen öntanımlı yapılandırmasına sahip olabilir - /etc/"
+"orbitrc dosyasına \"ORBIIOPIPv4=1\" değerini yerleştirin. Daima, GConfd "
+"tarafından saptanan sorunlar hakkındaki ayrıntıları görmek için kullanıcı.* "
+"sistem günlük dosyasına bakınız. Her ev dizininde bir gconfd olabilir ve "
+"kendi kilit dosyası ~/.gconfd içinde ve ayrıca kişisel depolama kilit "
+"dosyaları ~/.gconf dosyasında."
 
 #: gconf/gconf-sources.c:1414
 #, c-format
@@ -804,43 +823,43 @@ msgstr "Meta bilgileri alırken hata: %s"
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
-"`%s' anahtarı, `%s' anahtarı için şema olarak belirtilmiş, ama aslında `%s' "
+"`%s' anahtarı, `%s' anahtarı için şema olarak listelenmiş, aslında `%s' "
 "türünü içeriyor"
 
 #: gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
-msgstr "`%s' anlaşılamadı (tamsayı gerekli)"
+msgstr "`%s' anlaşılamadı (tamsayı bekleniyor)"
 
 #: gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
-msgstr "`%s' tamsayı olarak ya çok büyük ya da çok küçük"
+msgstr "Tamsayı `%s' çok büyük ya da çok küçük"
 
 #: gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
-msgstr "`%s' anlaşılamadı (değer gerçek sayı olmalı)"
+msgstr "`%s' anlaşılamadı (gerçek sayı bekleniyor)"
 
 #: gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
-msgstr "`%s' anlaşılamadı (mantıksal bir değer olmalıydı)"
+msgstr "`%s' anlaşılamadı (Doğru ya da Yalnış bekleniyor)"
 
 #: gconf/gconf-value.c:261
 #, c-format
 msgid "Didn't understand `%s' (list must start with a '[')"
-msgstr "`%s' anlaşılamadı (satır bir '[' ile başlamalı)"
+msgstr "`%s' anlaşılamadı (liste bir '[' ile başlamalı)"
 
 #: gconf/gconf-value.c:274
 #, c-format
 msgid "Didn't understand `%s' (list must end with a ']')"
-msgstr "`%s' anlaşılamadı (satır bir ']' ile bitmeli)"
+msgstr "`%s' anlaşılamadı (liste bir ']' ile bitmeli)"
 
 #: gconf/gconf-value.c:325
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
-msgstr "`%s' anlaşılamadı (listenin içinde fazladan bir ']' var)"
+msgstr "`%s' anlaşılamadı (listenin içinde fazladan bir ']' bulundu)"
 
 #: gconf/gconf-value.c:356 gconf/gconf-value.c:517
 #, c-format
@@ -865,7 +884,7 @@ msgstr "`%s' anlaşılamadı (eleman sayısı yanlış)"
 #: gconf/gconf-value.c:486
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
-msgstr "`%s' anlaşılamadı (çift içinde fazladan bir ')' var)"
+msgstr "`%s' anlaşılamadı (çift içinde fazladan bir ')' bulundu)"
 
 #: gconf/gconf.c:44
 #, c-format
@@ -892,12 +911,12 @@ msgstr "Bir nokta '/'den sonra gelemez"
 #: gconf/gconf.c:159
 #, c-format
 msgid "'%c' is not an ASCII character, so isn't allowed in key names"
-msgstr "`%c' bir ASCII karakter olmadığından tuş isimlerinde kullanılmaz"
+msgstr "'%c' bir ASCII karakter olmadığından tuş isimlerinde kullanılmaz"
 
 #: gconf/gconf.c:169
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
-msgstr "`%c' anahtar/dizin isimlerinde geçersizdir"
+msgstr "`%c' anahtar/dizin isimleri için geçersiz bir karakterdir"
 
 #: gconf/gconf.c:183
 msgid "Key/directory may not end with a slash (/)"
@@ -906,12 +925,12 @@ msgstr "Anahtar/Dizin bir '/' ile bitemez"
 #: gconf/gconf.c:408
 #, c-format
 msgid "Expected float, got %s"
-msgstr "\"float\" beklenirken %s alındı"
+msgstr "Kayan noktalı sayı beklenirken %s alındı"
 
 #: gconf/gconf.c:443
 #, c-format
 msgid "Expected int, got %s"
-msgstr "\"tamsayı\" beklenirken %s alındı"
+msgstr "Tamsayı bekleniyordu, %s alındı"
 
 #: gconf/gconf.c:478
 #, c-format
@@ -921,7 +940,7 @@ msgstr "Dizge beklenirken %s alındı"
 #: gconf/gconf.c:512
 #, c-format
 msgid "Expected bool, got %s"
-msgstr "\"mantıksal\" beklenirken %s alındı"
+msgstr "Mantıksal beklenirken %s alındı"
 
 #: gconf/gconf.c:545
 #, c-format
@@ -933,7 +952,7 @@ msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr ""
-"gconfd hata ayıklama seçeneği ile derlenmiş; gconf.path kaynak dizininden "
+"gconfd hata ayıklama seçeneği ile derlenmiş; gconf.yolu kaynak dizininden "
 "yüklenmeye çalışılıyor"
 
 #: gconf/gconfd.c:161
@@ -948,13 +967,13 @@ msgstr ""
 #. request would result in another failed gconfd being spawned.
 #.
 #: gconf/gconfd.c:169
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit %s"
 msgstr ""
-"Kaynak dizininde yapılandırma kaynakları yok, yapılandırma kaydedilmeyecek "
-"düzeltin "
+"Kaynak yolda yapılandırma kaynakları yok, yapılandırma kaydedilmeyecek; %s "
+"'i düzeltin"
 
 #: gconf/gconfd.c:182
 #, c-format
@@ -981,16 +1000,14 @@ msgstr ""
 #, c-format
 msgid "Received signal %d, dumping core. Please report a GConf bug."
 msgstr ""
-"%d sinyali alındı, core kaydedildi (GConf çöktü). Lütfen bir hata raporu "
-"gönderin."
+"%d sinyali alındı, core dökümlendi. Lütfen bir GConf hata raporu gönderin."
 
 #: gconf/gconfd.c:255
 #, c-format
 msgid ""
 "Received signal %d, shutting down abnormally. Please file a GConf bug report."
 msgstr ""
-"%d sinyali alındı, olağandışı kapanma (GConf çöktü). Lütfen bir hata raporu "
-"gönderin"
+"%d sinyali alındı, olağandışı kapanma. Lütfen bir GConf hata raporu gönderin"
 
 #: gconf/gconfd.c:272
 #, c-format
@@ -998,31 +1015,31 @@ msgid "Received signal %d, shutting down cleanly"
 msgstr "%d sinyali alındı, GConf kapatılıyor."
 
 #: gconf/gconfd.c:341
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to open %s: %s"
-msgstr "`%s' açılamadı: %s\n"
+msgstr "%s açılamadı: %s"
 
 #: gconf/gconfd.c:348
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to stat %s: %s"
-msgstr "`%s' durumlanamadı: %s"
+msgstr "%s durumlanamadı: %s"
 
 #: gconf/gconfd.c:357
 #, c-format
 msgid "Owner of %s is not the current user"
-msgstr ""
+msgstr "%s 'in sahibi şu anki kullanıcı değil."
 
 #: gconf/gconfd.c:365
-#, fuzzy, c-format
+#, c-format
 msgid "Bad permissions %lo on directory %s"
-msgstr "Dizin üzerinde bir anahtar işlemi"
+msgstr ""
 
 #. openlog() does not copy logname - what total brokenness.
 #. So we free it at the end of main()
 #: gconf/gconfd.c:445
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
-msgstr "başlıyor (sürüm: %s), pid %u kullanıcı `%s'"
+msgstr "başlıyor (sürüm: %s), pid %u kullanıcı '%s'"
 
 #: gconf/gconfd.c:484
 #, c-format
@@ -1032,7 +1049,7 @@ msgstr "%s oluşturulamadı: %s"
 #: gconf/gconfd.c:492
 #, c-format
 msgid "Directory %s has a problem, gconfd can't use it"
-msgstr ""
+msgstr "%s dizininde bir problem var; gconfd onu kullanamaz"
 
 #: gconf/gconfd.c:528
 #, c-format
@@ -1051,7 +1068,7 @@ msgstr "kilit dosyası bırakılırken hata: %s"
 
 #: gconf/gconfd.c:592
 msgid "Exiting"
-msgstr "Kapanıyor"
+msgstr "Çıkılıyor"
 
 #: gconf/gconfd.c:635
 msgid "GConf server is not in use, shutting down."
@@ -1059,8 +1076,7 @@ msgstr "GConf sunucusu kullanımda değil, kapanıyor."
 
 #: gconf/gconftool.c:93
 msgid "Set a key to a value and sync. Use with --type."
-msgstr ""
-"Bir anahtara bir değer ve eşzamanlama belirtilir. --type ile kullanılır."
+msgstr "Bir anahtara bir değer ve eşzamanlama belirtilir. --type ile kullanın."
 
 #: gconf/gconftool.c:102
 msgid "Print the value of a key to standard output."
@@ -1076,7 +1092,7 @@ msgstr ""
 
 #: gconf/gconftool.c:121
 msgid "Unset the keys on the command line"
-msgstr "komut satırında anahtarları kaldırır"
+msgstr "Komut satırında anahtarları kaldırır"
 
 #: gconf/gconftool.c:130
 msgid ""
@@ -1095,21 +1111,24 @@ msgid "Print all subdirectories in a directory."
 msgstr "Dizindeki tüm alt dizinleri gösterir."
 
 #: gconf/gconftool.c:157
-#, fuzzy
 msgid ""
 "Dump to standard out an XML description of all entries under a dir, "
 "recursively."
-msgstr "Bir dizinin altındaki tüm alt dizinleri ardışık olarak gösterir."
+msgstr ""
+"Bir dizinin altındaki tüm girdilerin XML açıklamaları standart çıkışa "
+"dökümlendi, tekrarlı"
 
 #: gconf/gconftool.c:166
 msgid ""
 "Load from the specified file an XML description of values and set them "
 "relative to a dir."
 msgstr ""
+"Belirtilmiş bir dosyadan XML açıklamala değerlerini yükle ve ilişkili dizine "
+"ata."
 
 #: gconf/gconftool.c:175
 msgid "Print all subdirectories and entries under a dir, recursively."
-msgstr "Bir dizinin altındaki tüm alt dizinleri ardışık olarak gösterir."
+msgstr "Bir dizinin altındaki tüm alt dizinleri ardışık olarak yazar."
 
 #: gconf/gconftool.c:184
 msgid "Return 0 if the directory exists, 2 if it does not."
@@ -1144,18 +1163,16 @@ msgid "int|bool|float|string|list|pair"
 msgstr "tam|mantık|gerçek|dizge|liste|çift"
 
 #: gconf/gconftool.c:229
-#, fuzzy
 msgid "Print the data type of a key to standard output."
-msgstr "Bir anahtarın değerini standart çıktıya yazar."
+msgstr "Bir anahtarın veri tipini standart çıktıya yazar."
 
 #: gconf/gconftool.c:238
-#, fuzzy
 msgid "Get the number of elements in a list key."
-msgstr "Bu anahtara uygulanan şemanın ismi alınır"
+msgstr "Bir liste anahtarı içinden öğelerin numarasını al"
 
 #: gconf/gconftool.c:247
 msgid "Get a specific element from a list key, numerically indexed."
-msgstr ""
+msgstr "Liste anahtarından bir özgül öğe alındı, numaralı olarak indekslendi."
 
 #: gconf/gconftool.c:256
 msgid ""
@@ -1203,7 +1220,7 @@ msgstr "Şema sahibi belirtilir"
 
 #: gconf/gconftool.c:302
 msgid "OWNER"
-msgstr "SAHİBİ"
+msgstr "SAHİP"
 
 #: gconf/gconftool.c:310
 msgid "Specify a schema file to be installed"
@@ -1241,14 +1258,13 @@ msgstr ""
 "ayarlanmış olmalıdır."
 
 #: gconf/gconftool.c:346
-#, fuzzy
 msgid ""
 "Properly uninstalls schema files on the command line from the database. "
 "GCONF_CONFIG_SOURCE environment variable should be set to a non-default "
 "config source or set to the empty string to use the default."
 msgstr ""
-"Komut satırından kullanılarak şema dosyalarının düzgün olarak yüklenmesini "
-"sağlar. GCONF_CONFIG_SOURCE çevre değişkeni ya öntanımlı olmayan bir "
+"Komut satırı üzerinde veritabanından düzgün bir şekilde kaldırılmış şema "
+"dosyasıGCONF_CONFIG_SOURCE çevre değişkeni ya öntanımlı olmayan bir "
 "yapılandırma kaynağına ya da öntanımlı kullanılmak üzere bir boş dizgeye "
 "ayarlanmış olmalıdır."
 
@@ -1289,7 +1305,7 @@ msgstr ""
 
 #: gconf/gconftool.c:409
 msgid "Remove any schema name applied to the given keys"
-msgstr "Verili anahtarlara uygulanan şema adları silinir"
+msgstr "Verilen anahtarlara uygulanan şema adları silinir"
 
 #: gconf/gconftool.c:418
 msgid "Get the name of the default source"
@@ -1301,16 +1317,15 @@ msgstr "Sürümü yazdır"
 
 #: gconf/gconftool.c:524
 msgid "Can't get and set/unset simultaneously\n"
-msgstr "Aynı anda hem alınsın hem de belirtilsin/kaldırılsın olmaz.\n"
+msgstr "Eşzamanlı alınamıyor ve belirt/kaldır yapılamıyor\n"
 
 #: gconf/gconftool.c:534
 msgid "Can't set and get/unset simultaneously\n"
-msgstr "Aynı anda hem belirtilsin hem de alınsın/kaldırılsın olmaz.\n"
+msgstr "Eşzamanlı belirtilemiyor ve al/kaldır yapılamıyor\n"
 
 #: gconf/gconftool.c:541
-#, fuzzy
 msgid "Can't get type and set/unset simultaneously\n"
-msgstr "Aynı anda hem alınsın hem de belirtilsin/kaldırılsın olmaz.\n"
+msgstr "Tür alınamıyor ve eşzamanlı atanamıyor/kaldırılamıyor.\n"
 
 #: gconf/gconftool.c:552
 msgid "Can't use --all-entries with --get or --set\n"
@@ -1347,9 +1362,9 @@ msgstr "Bir değer ile bir de tür belirtilmelidir.\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
-#, fuzzy, c-format
+#, c-format
 msgid "%s option must be used by itself.\n"
-msgstr "Ping seçeneği tek başına kullanılabilir.\n"
+msgstr "%s seçeneği kendi kendine kullanılmalıdır. \n"
 
 #: gconf/gconftool.c:702
 msgid ""
@@ -1373,10 +1388,10 @@ msgid "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, not installing schemas\n"
 msgstr "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL ayarlandı, şemalar yüklenmiyor\n"
 
 #: gconf/gconftool.c:750
-#, fuzzy
 msgid ""
 "GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL is set, not uninstalling schemas\n"
-msgstr "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL ayarlandı, şemalar yüklenmiyor\n"
+msgstr ""
+"GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL ayarlandı, şemalar kaldırılmıyor\n"
 
 #: gconf/gconftool.c:763
 msgid "Must set the GCONF_CONFIG_SOURCE environment variable\n"
@@ -1393,14 +1408,12 @@ msgid "Shutdown error: %s\n"
 msgstr "Kapanma hatası: %s\n"
 
 #: gconf/gconftool.c:1120
-#, fuzzy
 msgid "Must specify one or more directories to recursively list.\n"
-msgstr "Ardışık listeye bir ya da daha fazla dizin belirtilmelidir.\n"
+msgstr "Tekrarlı listeye bir ya da daha fazla dizin açıkça belirtilmelidir.\n"
 
 #: gconf/gconftool.c:1172
-#, fuzzy
 msgid "Must specify one or more directories to dump.\n"
-msgstr "Kaldırılacak anahtarlar belirtilmelidir.\n"
+msgstr "Döküme bir ya da daha fazla dizin belirtilmelidir.\n"
 
 #: gconf/gconftool.c:1214 gconf/gconftool.c:1479
 #, c-format
@@ -1448,7 +1461,7 @@ msgstr "Öntanımlı Değer: %s\n"
 #: gconf/gconftool.c:1594 gconf/gconftool.c:1596 gconf/gconftool.c:1597
 #: gconf/gconftool.c:1598
 msgid "Unset"
-msgstr "Tanımsız"
+msgstr "Kaldır"
 
 #: gconf/gconftool.c:1596
 #, c-format
@@ -1520,37 +1533,33 @@ msgid "Error syncing: %s\n"
 msgstr "Eşzamanlamada hata: %s\n"
 
 #: gconf/gconftool.c:1811
-#, fuzzy
 msgid "Must specify a key or keys to get type\n"
 msgstr "Alınacak anahtar ya da anahtarlar belirtilmelidir.\n"
 
 #: gconf/gconftool.c:1855
-#, fuzzy
 msgid "Must specify a key to lookup size of.\n"
-msgstr "Alınacak anahtar ya da anahtarlar belirtilmelidir.\n"
+msgstr "Arama büyüklüğüne bir anahtar belirtilmelidir.\n"
 
 #: gconf/gconftool.c:1880 gconf/gconftool.c:1925
-#, fuzzy, c-format
+#, c-format
 msgid "Key %s is not a list.\n"
-msgstr "'%s' deki değer bir şema değil\n"
+msgstr "%s anahtarı bir liste değildir.\n"
 
 #: gconf/gconftool.c:1900
-#, fuzzy
 msgid "Must specify a key from which to get list element.\n"
-msgstr "Alınacak anahtar ya da anahtarlar belirtilmelidir.\n"
+msgstr "Listeden hangi öğenin alınacağına dair bir anahtar belirtilmelidir.\n"
 
 #: gconf/gconftool.c:1931
-#, fuzzy
 msgid "Must specify list index.\n"
-msgstr "Kırılacak anahtarlar belirtilmeli\n"
+msgstr "Liste indeksi belirtilmelidir.\n"
 
 #: gconf/gconftool.c:1938
 msgid "List index must be non-negative.\n"
-msgstr ""
+msgstr "Liste indeksi negatif olmamalı \n"
 
 #: gconf/gconftool.c:1947
 msgid "List index is out of bounds.\n"
-msgstr ""
+msgstr "Liste indeksi sınır dışında \n"
 
 #: gconf/gconftool.c:1973
 msgid "Must specify a key or keys on the command line\n"
@@ -1588,17 +1597,16 @@ msgstr "Uygulanacak anahtar ismiyle izlenen bir şema ismi belirtilmelidir\n"
 #: gconf/gconftool.c:2104
 #, c-format
 msgid "Error associating schema name '%s' with key name '%s': %s\n"
-msgstr "UYARI: `%s' şeması `%s' anahtarı ile ilişkilendirilirken hata: %s\n"
+msgstr "'%s' şeması '%s' anahtarı ile ilişkilendirilirken hata: %s\n"
 
 #: gconf/gconftool.c:2122
-#, fuzzy
 msgid "Must specify keys to unapply schema from\n"
-msgstr "Alınacak anahtar ya da anahtarlar belirtilmelidir.\n"
+msgstr "Uygulanmamış şemaya anahtarlar belirtilmelidir\n"
 
 #: gconf/gconftool.c:2132
 #, c-format
 msgid "Error removing schema name from '%s': %s\n"
-msgstr "`%s' den şema kaldırılırken hata: %s\n"
+msgstr "'%s' den şema kaldırılırken hata: %s\n"
 
 #: gconf/gconftool.c:2157
 msgid "Must specify key (schema name) as the only argument\n"
@@ -1633,10 +1641,9 @@ msgid "Error syncing: %s"
 msgstr "Eşzamanlamada hata: %s"
 
 #: gconf/gconftool.c:2283
-#, fuzzy
 msgid "Must specify one or more directories to get key/value pairs from.\n"
 msgstr ""
-"anahtar/değer çiftinin alınacağı bir ya da daha fazla dizin "
+"Anahtar/değer çiftlerinin alınacağı bir ya da daha fazla dizin "
 "belirtilmelidir.\n"
 
 #: gconf/gconftool.c:2297
@@ -1655,12 +1662,11 @@ msgstr "Ardışık kaldırılacak bir ya da daha fazla dizin belirtilmelidir.\n"
 #: gconf/gconftool.c:2342
 #, c-format
 msgid "Failure during recursive unset of \"%s\": %s\n"
-msgstr "\"%s içinde girdiler listelenemedi: %s\n"
+msgstr "\"%s\" tekrarlı kaldırma sırasında başarısızlık: %s\n"
 
 #: gconf/gconftool.c:2362
-#, fuzzy
 msgid "Must specify one or more directories to get subdirs from.\n"
-msgstr "Alt dizinlerin alınacağı dizin ya da dizinler belirtilmelidir.\n"
+msgstr "Alt dizinlerin alınacağı bir ya da daha fazla dizin belirtilmelidir.\n"
 
 #: gconf/gconftool.c:2396
 #, c-format
@@ -1669,41 +1675,42 @@ msgstr "Dizinler listelenirken hata: %s\n"
 
 #: gconf/gconftool.c:2532
 msgid "WARNING: must specify both a <car> and a <cdr> in a <pair>\n"
-msgstr ""
+msgstr "UYARI: <car> ile <cdr> bir <pair> içinde belirtilmek zorunda\n"
 
 #: gconf/gconftool.c:2559
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: key specified (%s) for schema under a <value> - ignoring\n"
-msgstr "UYARI: şema için belirtilmiş bir anahtar yok\n"
+msgstr ""
+"UYARI: <value> altındaki şema için anahtar belirtilmiş (%s) - yoksayılıyor\n"
 
 #: gconf/gconftool.c:2592
 msgid "WARNING: must have a child node under <value>\n"
-msgstr ""
+msgstr "UYARI: <value> altında bir çocuk düğüm olmalı \n"
 
 #: gconf/gconftool.c:2598
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: node <%s> not understood\n"
-msgstr "UYARI: <%s> düğümü <schema> altında anlaşılamadı\n"
+msgstr "UYARI: <%s> düğümü anlaşılmadı\n"
 
 #: gconf/gconftool.c:2616
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: Failed to parse int value `%s'\n"
-msgstr "UYARI: Tür ismi `%s' ayrıştırılamadı\n"
+msgstr "UYARI: Tamsayı değeri `%s' ayrıştırılamadı.\n"
 
 #: gconf/gconftool.c:2637
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: Failed to parse float value `%s'\n"
-msgstr "UYARI: Tür ismi `%s' ayrıştırılamadı\n"
+msgstr "UYARI: Kayan noktalı değer `%s' ayrıştırılamadı.\n"
 
 #: gconf/gconftool.c:2659
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: Failed to parse string value `%s'\n"
-msgstr "UYARI: Tür ismi `%s' ayrıştırılamadı\n"
+msgstr "UYARI: Dizge değeri `%s' ayrıştırılamadı\n"
 
 #: gconf/gconftool.c:2680
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: Failed to parse boolean value `%s'\n"
-msgstr "UYARI: Tür ismi `%s' ayrıştırılamadı\n"
+msgstr "UYARI: İkili değer `%s' ayrıştırılamadı.\n"
 
 #: gconf/gconftool.c:2796 gconf/gconftool.c:3332
 #, c-format
@@ -1713,7 +1720,7 @@ msgstr "UYARI: `%s' şeması `%s' anahtarı ile ilişkilendirilemedi: %s\n"
 #: gconf/gconftool.c:2901
 #, c-format
 msgid "WARNING: invalid or missing type for schema (%s)\n"
-msgstr "UYARI: şema (%s) için type geçersiz ya da verilmemiş\n"
+msgstr "UYARI: Şema (%s) için geçersiz ya da verilmemiş tür\n"
 
 #: gconf/gconftool.c:2910
 #, c-format
@@ -1723,7 +1730,7 @@ msgstr "UYARI: şema (%s) için list_type geçersiz ya da verilmemiş\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 "UYARI: öntanımlı `%s' değeri şema (%s) için ayrıştırılamadı\n"
+msgstr "UYARI: Öntanımlı `%s' değeri şema (%s) için ayrıştırılamadı\n"
 
 #: gconf/gconftool.c:2939
 #, c-format
@@ -1824,26 +1831,26 @@ msgstr "UYARI: `%s' şeması `%s' konumu yüklenemedi: %s\n"
 #: gconf/gconftool.c:3454
 #, c-format
 msgid "Installed schema `%s' for locale `%s'\n"
-msgstr "`%s' konumu için `%s' şeması yüklendi\n"
+msgstr "`%2$s' konumu için `%1$s' şeması yüklendi\n"
 
 #: gconf/gconftool.c:3478
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: failed to uninstall schema `%s' locale `%s': %s\n"
-msgstr "UYARI: `%s' şeması `%s' konumu yüklenemedi: %s\n"
+msgstr "UYARI: `%s' şeması %s konumundan kaldırılamadı:%s\n"
 
 #: gconf/gconftool.c:3486
-#, fuzzy, c-format
+#, c-format
 msgid "Uninstalled schema `%s' from locale `%s'\n"
-msgstr "`%s' konumu için `%s' şeması yüklendi\n"
+msgstr "`%s' şeması `%s' konumundan kaldırıldı\n"
 
 #: gconf/gconftool.c:3524
 msgid "WARNING: no key specified for schema\n"
 msgstr "UYARI: şema için belirtilmiş bir anahtar yok\n"
 
 #: gconf/gconftool.c:3565
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: node <%s> not understood below <%s>\n"
-msgstr "UYARI: <%s> düğümü <schema> altında anlaşılamadı\n"
+msgstr "UYARI: <%s> düğümü <%s> altında anlaşılamadı\n"
 
 #: gconf/gconftool.c:3596
 #, c-format
@@ -1856,20 +1863,19 @@ msgid "Document `%s' is empty?\n"
 msgstr "Belge %s boş mu?\n"
 
 #: gconf/gconftool.c:3615
-#, fuzzy, c-format
+#, c-format
 msgid "Document `%s' has the wrong type of root node (<%s>, should be <%s>)\n"
-msgstr ""
-"Belge %s kök düğümde yanlış tür içeriyor (<%s>, <gconfschemafile> olmalı)\n"
+msgstr "`%s' belgesi yanlış kök düğümüne sahip (<%s>, <%s> olmalı)\n"
 
 #: gconf/gconftool.c:3628
-#, fuzzy, c-format
+#, c-format
 msgid "Document `%s' has no top level <%s> node\n"
-msgstr "Belge `%s' bir üst düzey <gconfschemafile> düğümü içermiyor\n"
+msgstr "`%s' belgesi üst düzey <%s> düğümüne sahip değil\n"
 
 #: gconf/gconftool.c:3642
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: node <%s> below <%s> not understood\n"
-msgstr "UYARI: <%s> düğümü <gconfschemafile> altında anlaşılamadı\n"
+msgstr "UYARI: <%s> düğümü <%s> altında anlaşılmadı\n"
 
 #: gconf/gconftool.c:3653 gconf/gconftool.c:3688 gconf/gconftool.c:3720
 #, c-format
@@ -1881,9 +1887,8 @@ msgid "Must specify some schema files to install\n"
 msgstr "Yüklenecek şema dosyaları belirtilmeli\n"
 
 #: gconf/gconftool.c:3704
-#, fuzzy
 msgid "Must specify some schema files to uninstall\n"
-msgstr "Yüklenecek şema dosyaları belirtilmeli\n"
+msgstr "Kaldırılacak bazı şema dosyaları belirtilmeli\n"
 
 #: gconf/gconftool.c:3741
 #, c-format
@@ -1927,20 +1932,39 @@ msgstr ""
 "çalışıyor:\n"
 "  %s\n"
 
-#, fuzzy
 #~ msgid "Cannot find directory %s\n"
-#~ msgstr "`%s' dizini oluşturulamadı: %s"
+#~ msgstr "%s dizini bulunamıyor\n"
 
-#, fuzzy
 #~ msgid "Error saving GConf tree to '%s': %s\n"
-#~ msgstr "`%s' içindeki dizinler listelenirken hata: %s\n"
+#~ msgstr "GConf ağacını kaydederken hata '%s': %s\n"
+
+#~ msgid "Usage: %s <dir>\n"
+#~ msgstr "Kullanım: %s <dir>\n"
+
+#~ 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 ""
+#~ "Kullanım: %s <dir>\n"
+#~ "  Dosyasistemi hiyerarşisinin arkayüzündeki birleştirme farkları: \n"
+#~ "    dizin/%%gconf.xml\n"
+#~ "        altdizin1/%%gconf.xml\n"
+#~ "        altdizin1/%%gconf.xml\n"
+#~ "  şuraya:\n"
+#~ "    dizin/%%gconf-tree.xml\n"
 
 #~ msgid "Received invalid value in set request"
 #~ msgstr "Ayar isteğinden geçersiz değer alındı"
 
 #~ msgid ""
 #~ "Couldn't make sense of CORBA value received in set request for key `%s'"
-#~ msgstr "`%s' anahtarının ayarı için alınan CORBA değerine anlam verilemedi"
+#~ msgstr ""
+#~ "`%s' anahtarı için istek ayarı alınırken CORBA değerine anlam verilemedi"
 
 #~ msgid "Received request to drop all cached data"
 #~ msgstr "Tüm arabelleklenmiş verinin silinmesi istendi"
@@ -1956,9 +1980,10 @@ msgstr ""
 #~ "this listener on gconfd restart, resulting in unreliable notification of "
 #~ "configuration changes."
 #~ msgstr ""
-#~ "%s dinleyicinin (%s) ek günlük kaydı yapılamadı; yapılandırma "
-#~ "değişikliklerinin güvenilir olmayan bildirimlerinin sonucu olarak bu "
-#~ "dinleyici gconfd tekrar başlatılırken etkinleştirilemeyecek."
+#~ "Dinleyici %s (%s) günlük kaydına eklenemedi; bu dinleyici gconfd tekrar "
+#~ "başlatılırken yerleştirilemedi, değişikliklerin güvenilir olmayan "
+#~ "bildirimlerin sonucu olarak bu dinleyici gconfd tekrar başlatılırken "
+#~ "etkinleştirilemeyecek."
 
 #~ msgid "Listener ID %lu doesn't exist"
 #~ msgstr "Dinleyici kimliği %lu yok"
@@ -1971,7 +1996,7 @@ msgstr ""
 #~ "zararsız, ara sıra ortaya çıkan bir sistem bildiriminin sonucu): %s"
 
 #~ msgid "Invalid UTF-8 in string value in '%s'"
-#~ msgstr "'%s' içindeki dizgede geçersiz UTF-8"
+#~ msgstr "'%s' içindeki dizge değerinde geçersiz UTF-8"
 
 #~ msgid "Couldn't interpret CORBA value for list element"
 #~ msgstr "Liste elemanının CORBA değeri yorumlanamadı"
@@ -1995,7 +2020,7 @@ msgstr ""
 #~ msgstr "Şema uzun açıklamasında geçersiz UTF-8"
 
 #~ msgid "Invalid UTF-8 in owner for schema"
-#~ msgstr "Şemanın kendinde geçersiz UTF-8"
+#~ msgstr "Şemanın sahibinde geçersiz UTF-8"
 
 #~ msgid "Server ping error: %s"
 #~ msgstr "Sunucu ping hatası: %s"
@@ -2005,7 +2030,7 @@ msgstr ""
 #~ msgstr "Alt gconfd süreciyle haberleşmek için veriyolu oluşturulamadı: %s\n"
 
 #~ msgid "Failed to launch configuration server: %s\n"
-#~ msgstr "Yapılandırma sunucusuna erişilemedi: %s\n"
+#~ msgstr "Yapılandırma sunucusu çalıştırılamadı: %s\n"
 
 #~ msgid ""
 #~ "Failed to contact configuration server; some possible causes are that you "
@@ -2013,7 +2038,7 @@ msgstr ""
 #~ "due to a system crash. See http://www.gnome.org/projects/gconf/ for "
 #~ "information. (Details - %s)"
 #~ msgstr ""
-#~ "Yapılandırma sunucusuna bağlanılamıyor, olası nedenler şunlar olabilir: "
+#~ "Yapılandırma sunucusuna bağlanılamıyor; olası nedenler şunlar olabilir: "
 #~ "ORBit için TCP/IP desteğini etkinleştirmeniz gerekebilir, ya da bir "
 #~ "sistem çökmesinden kaynaklı, bozuk NFS kilitlerine sahip olabilrsiniz. "
 #~ "Lütfen daha fazla ayrıntı içinhttp://www.gnome.org/projects/gconf "
@@ -2044,19 +2069,20 @@ msgstr ""
 #~ msgstr "ConfigServer için nesne başvurusu alınamadı"
 
 #~ msgid "Returning exception: %s"
-#~ msgstr "Dönen olağandışılık: %s"
+#~ msgstr "Dönen istisna: %s"
 
 #~ msgid ""
 #~ "Failed to open gconfd logfile; won't be able to restore listeners after "
 #~ "gconfd shutdown (%s)"
 #~ msgstr ""
 #~ "gconfd günlük dosyası açılamadı; gconfd kapandıktan sonra dinleyiciler "
-#~ "etkinleştirilemeyecek (%s)"
+#~ "etkinleştirilmeyecek (%s)"
 
 #~ msgid ""
 #~ "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 #~ msgstr ""
-#~ "gconfd günlük dosyası kapatılamadı; veri gereği gibi kaydedilemeyecek (%s)"
+#~ "gconfd günlük dosyası kapatılamadı; veri gereği gibi kaydedilememiş "
+#~ "olabilir (%s)"
 
 #~ msgid "Could not open saved state file '%s' for writing: %s"
 #~ msgstr "Durum kayıt dosyası '%s' yazmak için açılamadı: %s"
@@ -2097,8 +2123,8 @@ msgstr ""
 #~ "add the listener if gconfd exits or shuts down (%s)"
 #~ msgstr ""
 #~ "gconfd günlük dosyasına dinleyicilerin eklenmesine ilişkin kayıtlar "
-#~ "eklenemedi; gconf'dan çıkıldığında ya da bir kapanmadan sonra "
-#~ "dinleyicilerin yeniden eklenmesi mümkün olmayabilecek. (%s)"
+#~ "eklenemedi; gconf'dan çıkıldığında ya da bir kapanmadan sonra dinleyici "
+#~ "yeniden eklenemeyecek. (%s)"
 
 #~ msgid ""
 #~ "Failed to log removal of listener to gconfd logfile; might erroneously re-"
@@ -2106,7 +2132,7 @@ msgstr ""
 #~ msgstr ""
 #~ "gconfd günlük dosyasına dinleyicilerin kaldırılmasına ilişkin kayıtlar "
 #~ "eklenemedi; gconf'dan çıkıldığında ya da bir kapanmadan sonra bu "
-#~ "dinleyiciler yeniden eklenebilir. (%s)"
+#~ "dinleyiciler hatalı şekilde yeniden eklenebilir. (%s)"
 
 #~ msgid "Failed to get IOR for client: %s"
 #~ msgstr "İstemci için IOR alınamadı: %s"
@@ -2124,7 +2150,8 @@ msgstr ""
 #~ msgid ""
 #~ "Some client removed itself from the GConf server when it hadn't been "
 #~ "added."
-#~ msgstr "GConf sunucusu eklemediği sırada tek bir istemci sunucudan silindi."
+#~ msgstr ""
+#~ "Bazı istemciler kendilerini GConf sunucusundan eklenemediğinde sildi."
 
 #~ msgid ""
 #~ "%u items remain in the cache after cleaning already-synced items older "
diff --git a/po/uk.po b/po/uk.po
index 83191070..23bd4d66 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf.HEAD\n"
 "POT-Creation-Date: 2003-12-05 00:37+0100\n"
-"PO-Revision-Date: 2004-02-08 8:45+0200\n"
+"PO-Revision-Date: 2004-03-16 15:47+0200\n"
 "Last-Translator: Maxim Dziumanenko <mvd@mylinux.com.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -21,12 +21,12 @@ msgstr ""
 #: backends/dir-utils.c:108
 #, c-format
 msgid "Couldn't find the %s root directory in the address `%s'"
-msgstr "Не вдалось знайти кореневий каталог %s за адресою \"%s\""
+msgstr "Не вдається знайти кореневий каталог %s за адресою \"%s\""
 
 #: backends/dir-utils.c:124 backends/xml-backend.c:332
 #, c-format
 msgid "Could not make directory `%s': %s"
-msgstr "Не вдалось створити каталог \"%s\": %s"
+msgstr "Не вдається створити каталог \"%s\": %s"
 
 #: backends/dir-utils.c:212
 #, c-format
@@ -42,7 +42,7 @@ msgstr "Вивантаження серверного модуля XML."
 #: backends/xml-backend.c:285
 #, c-format
 msgid "Couldn't find the XML root directory in the address `%s'"
-msgstr "Не вдалось знайти кореневий каталог XML за адресою \"%s\""
+msgstr "Не вдається знайти кореневий каталог XML за адресою \"%s\""
 
 #: backends/xml-backend.c:443
 #, c-format
@@ -88,7 +88,7 @@ msgstr "Ініціалізація серверного модуля XML"
 #: backends/xml-backend.c:877
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
-msgstr "Не вдалось зняти блокування з каталогу XML \"%s\": %s"
+msgstr "Не вдається зняти блокування з каталогу XML \"%s\": %s"
 
 #: backends/xml-cache.c:286
 msgid "Failed to sync XML cache contents to disk"
@@ -106,7 +106,7 @@ msgstr ""
 #: backends/xml-dir.c:171
 #, c-format
 msgid "Could not stat `%s': %s"
-msgstr "Не вдалось отримати властивості \"%s\": %s"
+msgstr "Не вдається отримати властивості \"%s\": %s"
 
 #: backends/xml-dir.c:181
 #, c-format
@@ -116,12 +116,12 @@ msgstr "XML файл \"%s\" є каталогом"
 #: backends/xml-dir.c:416 backends/xml-dir.c:425
 #, c-format
 msgid "Failed to delete \"%s\": %s"
-msgstr "Не вдалось видалити \"%s\": %s"
+msgstr "Не вдається видалити \"%s\": %s"
 
 #: backends/xml-dir.c:471
 #, c-format
 msgid "Failed to write file `%s': %s"
-msgstr "Не вдалось записати файл \"%s\": %s"
+msgstr "Не вдається записати файл \"%s\": %s"
 
 #: backends/xml-dir.c:484
 #, c-format
@@ -136,28 +136,28 @@ msgstr "Помилка при записуванні даних XML в \"%s\": %
 #: backends/xml-dir.c:504 backends/xml-dir.c:1279
 #, c-format
 msgid "Failed to close file `%s': %s"
-msgstr "Не вдалось закрити файл \"%s\": %s"
+msgstr "Не вдається закрити файл \"%s\": %s"
 
 #: backends/xml-dir.c:520 backends/xml-dir.c:530
 #, c-format
 msgid "Failed to rename `%s' to `%s': %s"
-msgstr "Не вдалось перейменувати \"%s\" в \"%s\": %s"
+msgstr "Не вдається перейменувати \"%s\" в \"%s\": %s"
 
 #: backends/xml-dir.c:536
 #, c-format
 msgid "Failed to restore `%s' from `%s': %s"
-msgstr "Не вдалось відновити \"%s\" з \"%s\": %s"
+msgstr "Не вдається відновити \"%s\" з \"%s\": %s"
 
 #: backends/xml-dir.c:548
 #, c-format
 msgid "Failed to delete old file `%s': %s"
-msgstr "Не вдалось видалити старий файл \"%s\": %s"
+msgstr "Не вдається видалити старий файл \"%s\": %s"
 
 #. These are all fatal errors
 #: backends/xml-dir.c:978
 #, c-format
 msgid "Failed to stat `%s': %s"
-msgstr "Не вдалось отримати властивості \"%s\": %s"
+msgstr "Не вдається отримати властивості \"%s\": %s"
 
 #: backends/xml-dir.c:1152
 #, c-format
@@ -179,12 +179,12 @@ msgstr ""
 #: backends/xml-dir.c:1255
 #, c-format
 msgid "Could not make directory \"%s\": %s"
-msgstr "Не вдалось створити каталог \"%s\": %s"
+msgstr "Не вдається створити каталог \"%s\": %s"
 
 #: backends/xml-dir.c:1271
 #, c-format
 msgid "Failed to create file `%s': %s"
-msgstr "Не вдалось створити файл \"%s\": %s"
+msgstr "Не вдається створити файл \"%s\": %s"
 
 #: backends/xml-dir.c:1370
 #, c-format
@@ -306,11 +306,11 @@ msgstr "Помилка відкриття модуля \"%s\": %s\n"
 #: gconf/gconf-backend.c:262
 #, c-format
 msgid "Couldn't locate backend module for `%s'"
-msgstr "Не вдалось знайти серверний модуль для \"%s\""
+msgstr "Не вдається знайти серверний модуль для \"%s\""
 
 #: gconf/gconf-backend.c:299
 msgid "Failed to shut down backend"
-msgstr "Не вдалось вимкнути сервер"
+msgstr "Не вдається вимкнути сервер"
 
 #: gconf/gconf-client.c:344 gconf/gconf-client.c:362
 #, c-format
@@ -320,7 +320,7 @@ msgstr "Помилка GConf: %s\n"
 #: gconf/gconf-client.c:896
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
-msgstr "Попередження GConf: не вдалось отримати список пар в \"%s\": %s"
+msgstr "Попередження GConf: Не вдається отримати список пар в \"%s\": %s"
 
 #: gconf/gconf-client.c:1181
 #, c-format
@@ -330,7 +330,7 @@ msgstr "Очікувалось \"%s\", отримано \"%s\" для ключа
 #: gconf/gconf-database.c:173
 #, c-format
 msgid "Failed to sync one or more sources: %s"
-msgstr "Не вдалось синхронізувати одне чи більше джерел: %s"
+msgstr "Не вдається синхронізувати одне чи більше джерел: %s"
 
 #: gconf/gconf-database.c:241 gconf/gconf-sources.c:1541
 #, c-format
@@ -375,7 +375,7 @@ msgstr "Помилка видалення каталогу \"%s\": %s"
 #: gconf/gconf-database.c:547
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
-msgstr "Не вдалось отримати всі елементи в \"%s\": %s"
+msgstr "Не вдається отримати всі елементи в \"%s\": %s"
 
 #: gconf/gconf-database.c:573
 #, c-format
@@ -405,7 +405,7 @@ msgstr "Доступ заборонений"
 
 #: gconf/gconf-error.c:29
 msgid "Couldn't resolve address for configuration source"
-msgstr "Не вдалось розпізнати адресу для джерела конфігурації"
+msgstr "Не вдається розпізнати адресу для джерела конфігурації"
 
 #: gconf/gconf-error.c:30
 msgid "Bad key or directory name"
@@ -445,7 +445,7 @@ msgstr "Операція не доступна без конфігураційн
 
 #: gconf/gconf-error.c:39
 msgid "Failed to get a lock"
-msgstr "Не вдалось встановити блокування"
+msgstr "Не вдається встановити блокування"
 
 #: gconf/gconf-error.c:40
 msgid "No database available to save your configuration"
@@ -459,7 +459,7 @@ msgstr "Немає \"/\" в ключі \"%s\""
 #: gconf/gconf-internals.c:337
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
-msgstr "Не вдалось відкрити файл шляху \"%s\": %s\n"
+msgstr "Не вдається відкрити файл шляху \"%s\": %s\n"
 
 #: gconf/gconf-internals.c:386
 #, c-format
@@ -529,7 +529,7 @@ msgstr "gconftool чи інший процес (не gconfd) заблокува�
 #: gconf/gconf-internals.c:1884
 msgid "couldn't contact ORB to resolve existing gconfd object reference"
 msgstr ""
-"не вдалось зв'язатись з ORB для розв'язання дійсного посилання на об'єкт"
+"Не вдається зв'язатись з ORB для розв'язання дійсного посилання на об'єкт"
 
 #: gconf/gconf-internals.c:1894
 #, c-format
@@ -539,17 +539,17 @@ msgstr "Помилка на перетворенні IOR \"%s\" в посила�
 #: gconf/gconf-internals.c:1949
 #, c-format
 msgid "Could not lock temporary file '%s': %s"
-msgstr "Не вдалось заблокувати тимчасовий файл \"%s\": %s"
+msgstr "Не вдається заблокувати тимчасовий файл \"%s\": %s"
 
 #: gconf/gconf-internals.c:1976
 #, c-format
 msgid "Could not create file '%s', probably because it already exists"
-msgstr "Не вдалось створити \"%s\", можливо тому, що він вже існує"
+msgstr "Не вдається створити \"%s\", можливо тому, що він вже існує"
 
 #: gconf/gconf-internals.c:2023
 #, c-format
 msgid "Failed to create or open '%s'"
-msgstr "Не вдалось створити чи відкрити \"%s\""
+msgstr "Не вдається створити чи відкрити \"%s\""
 
 #: gconf/gconf-internals.c:2033
 #, c-format
@@ -568,7 +568,7 @@ msgstr "Блокування на файл \"%s\" відсутнє, а має б
 #: gconf/gconf-internals.c:2138
 #, c-format
 msgid "Failed to link '%s' to '%s': %s"
-msgstr "Не вдалось пов'язати \"%s\" з \"%s\": %s"
+msgstr "Не вдається пов'язати \"%s\" з \"%s\": %s"
 
 #: gconf/gconf-internals.c:2150
 #, c-format
@@ -588,7 +588,7 @@ msgstr "Помилка при зніманні блокування катало
 #: gconf/gconf-internals.c:2220
 #, c-format
 msgid "couldn't create directory `%s': %s"
-msgstr "не вдалось створити каталог \"%s\": %s"
+msgstr "Не вдається створити каталог \"%s\": %s"
 
 #: gconf/gconf-internals.c:2279
 #, c-format
@@ -623,7 +623,7 @@ msgid ""
 msgstr ""
 "Зв'яжіться з вашим системним адміністратором для вирішення наступної "
 "проблеми:\n"
-"Не вдалось відкрити чи створити файл \"%s\". Це означає, що, можливо, існує "
+"Не вдається відкрити чи створити файл \"%s\". Це означає, що, можливо, існує "
 "проблема з конфігурацією, бо багатьом програмам буде необхідно створювати "
 "файли у вашому домашньому каталозі. Виникла помилка \"%s\" (errno = %d)."
 
@@ -640,7 +640,7 @@ msgid ""
 msgstr ""
 "Зв'яжіться з вашим системним адміністратором для вирішення наступної "
 "проблеми:\n"
-"Не вдалось заблокувати файл \"%s\". Це означає, що, можливо, існує проблема "
+"Не вдається заблокувати файл \"%s\". Це означає, що, можливо, існує проблема "
 "з конфігурацією вашої операційної системи. Якщо у вас є змонтований через "
 "NFS домашній каталог, можливо, або сервер, або клієнт налаштовано "
 "неправильно. Подивіться документацію на rpc.statd і rpc.lockd. Загальним "
@@ -676,7 +676,7 @@ msgid ""
 msgstr ""
 "Зв'яжіться з вашим системним адміністратором для вирішення наступної "
 "проблеми:\n"
-"Не вдалось розв'язати адреси \"%s\" у файлі конфігурації \"%s\": %s"
+"Не вдається розв'язати адреси \"%s\" у файлі конфігурації \"%s\": %s"
 
 #: gconf/gconf-sanity-check.c:323
 msgid ""
@@ -1442,7 +1442,7 @@ msgstr "(значення не встановлено)"
 #: gconf/gconftool.c:1537
 #, c-format
 msgid "Failed to spawn the config server (gconfd): %s\n"
-msgstr "Не вдалось породити сервер конфігурації (gconfd): %s\n"
+msgstr "Не вдається породити сервер конфігурації (gconfd): %s\n"
 
 #: gconf/gconftool.c:1551
 msgid "Must specify a key or keys to get\n"
@@ -1503,7 +1503,7 @@ msgstr "Не встановлено значення для \"%s\"\n"
 #: gconf/gconftool.c:1914 gconf/gconftool.c:2059
 #, c-format
 msgid "Failed to get value for `%s': %s\n"
-msgstr "Не вдалось отримати значення для \"%s\": %s\n"
+msgstr "Не вдається отримати значення для \"%s\": %s\n"
 
 #: gconf/gconftool.c:1654 gconf/gconftool.c:1666
 #, c-format
@@ -1705,27 +1705,27 @@ msgstr "УВАГА: вузол <%s> незрозумілий\n"
 #: gconf/gconftool.c:2616
 #, c-format
 msgid "WARNING: Failed to parse int value `%s'\n"
-msgstr "УВАГА: не вдалось проаналізувати значення типу int \"%s\"\n"
+msgstr "УВАГА: Не вдається проаналізувати значення типу int \"%s\"\n"
 
 #: gconf/gconftool.c:2637
 #, c-format
 msgid "WARNING: Failed to parse float value `%s'\n"
-msgstr "УВАГА: не вдалось проаналізувати значення типу float \"%s\"\n"
+msgstr "УВАГА: Не вдається проаналізувати значення типу float \"%s\"\n"
 
 #: gconf/gconftool.c:2659
 #, c-format
 msgid "WARNING: Failed to parse string value `%s'\n"
-msgstr "УВАГА: не вдалось проаналізувати значення типу string \"%s\"\n"
+msgstr "УВАГА: Не вдається проаналізувати значення типу string \"%s\"\n"
 
 #: gconf/gconftool.c:2680
 #, c-format
 msgid "WARNING: Failed to parse boolean value `%s'\n"
-msgstr "УВАГА: не вдалось проаналізувати значення типу boolean \"%s\"\n"
+msgstr "УВАГА: Не вдається проаналізувати значення типу 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 "УВАГА: не вдалось зв'язати схему \"%s\" з ключем \"%s\": %s\n"
+msgstr "УВАГА: Не вдається зв'язати схему \"%s\" з ключем \"%s\": %s\n"
 
 #: gconf/gconftool.c:2901
 #, c-format
@@ -1741,7 +1741,7 @@ msgstr "УВАГА: неправильний чи відсутній тип list
 #, c-format
 msgid "WARNING: Failed to parse default value `%s' for schema (%s)\n"
 msgstr ""
-"УВАГА: не вдалось проаналізувати типове значення \"%s\" для схеми (%s)\n"
+"УВАГА: Не вдається проаналізувати типове значення \"%s\" для схеми (%s)\n"
 
 #: gconf/gconftool.c:2939
 #, c-format
@@ -1761,7 +1761,7 @@ msgstr "УВАГА: внутрішня помилка gconftool, невідом�
 #: gconf/gconftool.c:3104
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
-msgstr "УВАГА: не вдалось проаналізувати назву типу \"%s\"\n"
+msgstr "УВАГА: Не вдається проаналізувати назву типу \"%s\"\n"
 
 #: gconf/gconftool.c:3058
 #, c-format
@@ -1940,13 +1940,31 @@ msgstr ""
 "у каталозі:\n"
 "  %s\n"
 
-#, fuzzy
 #~ msgid "Cannot find directory %s\n"
-#~ msgstr "Не вдалось створити каталог \"%s\": %s"
+#~ msgstr "Не вдається знайти каталог %s\n"
 
-#, fuzzy
 #~ msgid "Error saving GConf tree to '%s': %s\n"
-#~ msgstr "Помилка отримання схеми на \"%s\": %s\n"
+#~ msgstr "Помилка збереження схеми на \"%s\": %s\n"
+
+#~ msgid "Usage: %s <dir>\n"
+#~ msgstr "Використання: %s <каталог>\n"
+
+#~ 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 ""
+#~ "Використання: %s <каталог>\n"
+#~ "  З'єднує ієрархію файлів у вигляді:\n"
+#~ "    каталог/%%gconf.xml\n"
+#~ "        підкаталог1/%%gconf.xml\n"
+#~ "        підкаталог2/%%gconf.xml\n"
+#~ "  у:\n"
+#~ "    каталог/%%gconf-tree.xml\n"
 
 #~ msgid "Received invalid value in set request"
 #~ msgstr "Отримано неправильне значення у запиті"
@@ -1954,8 +1972,8 @@ msgstr ""
 #~ msgid ""
 #~ "Couldn't make sense of CORBA value received in set request for key `%s'"
 #~ msgstr ""
-#~ "Не вдалось зрозуміти зміст значення CORBA, отриманого в результаті запиту "
-#~ "встановлення ключа \"%s\""
+#~ "Не вдається зрозуміти зміст значення CORBA, отриманого в результаті "
+#~ "запиту встановлення ключа \"%s\""
 
 #~ msgid "Received request to drop all cached data"
 #~ msgstr "Отримано запит на скидання усіх кешованих даних"
@@ -1990,7 +2008,7 @@ msgstr ""
 #~ msgstr "Неправильна послідовність UTF-8 у рядковому значенні \"%s\""
 
 #~ msgid "Couldn't interpret CORBA value for list element"
-#~ msgstr "Не вдалось інтерпретувати CORBA-значення елементу списку"
+#~ msgstr "Не вдається інтерпретувати CORBA-значення елементу списку"
 
 #~ msgid "Incorrect type for list element in %s"
 #~ msgstr "Некоректний тип елемента списку в %s"
@@ -1999,7 +2017,7 @@ msgstr ""
 #~ msgstr "Від gconfd отримано список з неправильним типом списку"
 
 #~ msgid "Failed to convert object to IOR"
-#~ msgstr "Не вдалось перетворити об'єкт у IOR"
+#~ msgstr "Не вдається перетворити об'єкт у IOR"
 
 #~ msgid "Invalid UTF-8 in locale for schema"
 #~ msgstr "Неправильна послідовність UTF-8 в локалі для схеми"
@@ -2049,7 +2067,7 @@ msgstr ""
 #~ msgstr "Помилка при додаванні клієнта у серверний список, помилка CORBA: %s"
 
 #~ msgid "Failure shutting down config server: %s"
-#~ msgstr "Не вдалось вимкнути сервера конфігурації: %s"
+#~ msgstr "Не вдається вимкнути сервера конфігурації: %s"
 
 #~ msgid "CORBA error: %s"
 #~ msgstr "Помилка CORBA: %s"
@@ -2077,26 +2095,26 @@ msgstr ""
 #~ "збережено (%s)"
 
 #~ msgid "Could not open saved state file '%s' for writing: %s"
-#~ msgstr "Не вдалось відкрити файл збереженого стану \"%s\" для запису: %s"
+#~ msgstr "Не вдається відкрити файл збереженого стану \"%s\" для запису: %s"
 
 #~ msgid "Could not write saved state file '%s' fd: %d: %s"
 #~ msgstr ""
-#~ "Не вдалось записати файл збереженого стану \"%s\", дескриптор: %d: %s"
+#~ "Не вдається записати файл збереженого стану \"%s\", дескриптор: %d: %s"
 
 #~ msgid "Failed to close new saved state file '%s': %s"
-#~ msgstr "Не вдалось закрити новий файл збереженого стану \"%s\": %s"
+#~ msgstr "Не вдається закрити новий файл збереженого стану \"%s\": %s"
 
 #~ msgid "Could not move aside old saved state file '%s': %s"
-#~ msgstr "Не вдалось відкласти старий файл збереженого стану \"%s\": %s"
+#~ msgstr "Не вдається відкласти старий файл збереженого стану \"%s\": %s"
 
 #~ msgid "Failed to move new save state file into place: %s"
-#~ msgstr "Не вдалось перенести новий файл збереженого стану на місце: %s"
+#~ msgstr "Не вдається перенести новий файл збереженого стану на місце: %s"
 
 #~ msgid ""
 #~ "Failed to restore original saved state file that had been moved to '%s': %"
 #~ "s"
 #~ msgstr ""
-#~ "Не вдалось відновити оригінальний файл збереженого стану, який було "
+#~ "Не вдається відновити оригінальний файл збереженого стану, який було "
 #~ "перенесено у \"%s\": %s"
 
 #~ msgid ""
@@ -2110,7 +2128,7 @@ msgstr ""
 #~ msgstr "Помилка зчитування файла збереженого стану: %s"
 
 #~ msgid "Unable to open saved state file '%s': %s"
-#~ msgstr "Не вдалось відкрити файл збереженого стану \"%s\": %s"
+#~ msgstr "Не вдається відкрити файл збереженого стану \"%s\": %s"
 
 #~ msgid ""
 #~ "Failed to log addition of listener to gconfd logfile; won't be able to re-"
@@ -2127,7 +2145,7 @@ msgstr ""
 #~ "може бути помилково додано ще раз, якщо gcofd завершить роботу (%s)"
 
 #~ msgid "Failed to get IOR for client: %s"
-#~ msgstr "Не вдалось отримати IOR для клієнта: %s"
+#~ msgstr "Не вдається отримати IOR для клієнта: %s"
 
 #~ msgid "Failed to open saved state file: %s"
 #~ msgstr "Помилка при відкриванні файла збереженого стану: %s"
@@ -2136,7 +2154,7 @@ msgstr ""
 #~ msgstr "Помилка запису додавання клієнта у файл збереженого стану: %s"
 
 #~ msgid "Failed to flush client add to saved state file: %s"
-#~ msgstr "Не вдалось скинути клієнта у файл збереженого стану: %s"
+#~ msgstr "Не вдається скинути клієнта у файл збереженого стану: %s"
 
 #~ msgid ""
 #~ "Some client removed itself from the GConf server when it hadn't been "
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7cdf0ba7..d1d30bde 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,21 +1,21 @@
-# translation of gconf.po to zh_CN
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# Wang Jian <lark@linux.net.cn>, 2001
-# Xiong Jiang <jxiong@offtopic.org>, 2003
-# Funda Wang <fundawang@linux.net.cn>, 2003
+# Translation of gconf.po to zh_CN
+# Copyright (C) 2001-2004 Free Software Foundation, Inc.
+# Wang Jian <lark@linux.net.cn>, 2001.
+# Xiong Jiang <jxiong@offtopic.org>, 2003.
+# Funda Wang <fundawang@linux.net.cn>, 2003, 2004.
+# LoneStar <lone@auvtech.com>, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gconf\n"
+"Project-Id-Version: gconf 2.6.0\n"
 "POT-Creation-Date: 2003-12-05 00:37+0100\n"
-"PO-Revision-Date: 2003-08-09 03:06+0800\n"
-"Last-Translator: Sun G11n <gnome_int_l10n@ireland.sun.com>\n"
+"PO-Revision-Date: 2004-03-20 21:56+0800\n"
+"Last-Translator: LoneStar <lone@auvtech.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
 #, c-format
@@ -50,19 +50,18 @@ msgstr "无法读取或写入地址“%s”中的 XML 根目录"
 #: backends/xml-backend.c:453
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
-msgstr "位于根 %s 的XML源文件的目录/文件权限是：%o/%o"
+msgstr "位于根 %s 的 XML 源文件的目录/文件权限是：%o/%o"
 
 #: backends/xml-backend.c:619
 #, c-format
 msgid "Error syncing the XML backend directory cache: %s"
-msgstr "在同步XML后端目录缓存时发生错误：%s"
+msgstr "在同步 XML 后端目录缓存时发生错误：%s"
 
 #: backends/xml-backend.c:684
-#, fuzzy
 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
@@ -80,7 +79,7 @@ msgid "Initializing XML backend module"
 msgstr "正在初始化 XML 后端模块"
 
 #: backends/xml-backend.c:877
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "无法放弃 XML 目录“%s”上的锁定：%s"
 
@@ -93,7 +92,7 @@ msgstr "无法同步 XML 缓存内容到磁盘"
 msgid ""
 "Unable to remove directory `%s' from the XML backend cache, because it has "
 "not been successfully synced to disk"
-msgstr "无法从 XML 后代缓存中删除目录“%s”，因为它还没有成功地同步到磁盘"
+msgstr "无法从 XML 后端缓存中删除目录“%s”，因为它还没有成功地同步到磁盘"
 
 #: backends/xml-dir.c:171
 #, c-format
@@ -154,7 +153,7 @@ msgstr "无法查看“%s”：%s"
 #: backends/xml-dir.c:1152
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
-msgstr "重复的项“%s”在“%s”中，忽略"
+msgstr "“%2$s”中存在重复项“%1$s”，忽略"
 
 #: backends/xml-dir.c:1174
 #, c-format
@@ -181,7 +180,7 @@ msgstr "无法创建文件“%s”：%s"
 #: backends/xml-dir.c:1370
 #, c-format
 msgid "Failed to parse XML file \"%s\""
-msgstr "无法分析 XML 文件“%s”"
+msgstr "无法解析 XML 文件“%s”"
 
 #. There was an error
 #: backends/xml-entry.c:154
@@ -202,7 +201,7 @@ msgstr "忽略 XML 结点“%s”：%s"
 #: backends/xml-entry.c:732
 #, c-format
 msgid "Failed reading default value for schema: %s"
-msgstr "无法读取 schema 的默认值 %s"
+msgstr "无法读取 schema 的默认值: %s"
 
 #: backends/xml-entry.c:952
 #, c-format
@@ -221,7 +220,7 @@ msgstr "节点没有“value”属性"
 #: backends/xml-entry.c:1029 backends/xml-entry.c:1105
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
-msgstr "无法解释在 XML 列表节点中的 XML 节点 <%s>"
+msgstr "无法理解在 XML 列表节点中的 XML 节点 <%s>"
 
 #: backends/xml-entry.c:1063
 msgid "Invalid type (list, pair, or unknown) in a list node"
@@ -316,13 +315,13 @@ msgstr "GConf 错误：%s\n"
 #: gconf/gconf-client.c:896
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
-msgstr "GConf 警告：无法列出“%s”中的对：%s"
+msgstr "GConf 警告：无法列出“%s”中的 pair：%s"
 
 # SUN NEW TRANSLATION
 #: gconf/gconf-client.c:1181
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
-msgstr "要求为“%s”，实际为“%s”(关键字 %s)"
+msgstr "需要“%s”，实际为“%s”(针对键 %s)"
 
 #: gconf/gconf-database.c:173
 #, c-format
@@ -365,7 +364,7 @@ msgid "Error checking existence of `%s': %s"
 msgstr "检查“%s”的存在时发生错误：%s"
 
 #: gconf/gconf-database.c:520
-#, fuzzy, c-format
+#, c-format
 msgid "Error removing directory \"%s\": %s"
 msgstr "删除目录“%s”发生错误：%s"
 
@@ -382,7 +381,7 @@ msgstr "列出“%s”中的目录时发生错误：%s"
 #: gconf/gconf-database.c:594
 #, c-format
 msgid "Error setting schema for `%s': %s"
-msgstr "为“%s”设置 schema 时发生错误：%s"
+msgstr "为“%s”设置模式时发生错误：%s"
 
 #: gconf/gconf-error.c:25
 msgid "Success"
@@ -439,7 +438,7 @@ msgstr "对象激活框架错误"
 
 #: gconf/gconf-error.c:38
 msgid "Operation not allowed without configuration server"
-msgstr "没有配置服务器不允许"
+msgstr "没有配置服务器操作不允许"
 
 #: gconf/gconf-error.c:39
 msgid "Failed to get a lock"
@@ -481,31 +480,31 @@ msgstr "文本包含无效的 UTF-8"
 #: gconf/gconf-internals.c:853
 #, c-format
 msgid "Expected list, got %s"
-msgstr "要求列表，得到的是 %s"
+msgstr "需要列表，得到的是 %s"
 
 # SUN CHANGED MESSAGE
 #: gconf/gconf-internals.c:863
 #, c-format
 msgid "Expected list of %s, got list of %s"
-msgstr "要求 %s 列表，得到的是 %s 列表"
+msgstr "需要 %s 列表，得到的是 %s 列表"
 
 # SUN CHANGED MESSAGE
 #: gconf/gconf-internals.c:991
 #, c-format
 msgid "Expected pair, got %s"
-msgstr "要求对，得到的是 %s"
+msgstr "需要对，得到的是 %s"
 
 # SUN CHANGED MESSAGE
 #: gconf/gconf-internals.c:1005
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
-msgstr "要求 (%s,%s) 对，得到的对仅有一个值或两个值都没有"
+msgstr "需要 (%s,%s) 对，得到的对仅有一个值或两个值都没有"
 
 # SUN CHANGED MESSAGE
 #: gconf/gconf-internals.c:1021
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
-msgstr "要求类型 (%s,%s) 对，得到的是类型 (%s,%s)"
+msgstr "需要类型 (%s,%s) 对，得到的是类型 (%s,%s)"
 
 #: gconf/gconf-internals.c:1137
 msgid "Quoted string doesn't begin with a quotation mark"
@@ -729,18 +728,18 @@ msgstr "%s 继续吗(y/n)？"
 #: gconf/gconf-schema.c:221 gconf/gconf-schema.c:229 gconf/gconf-schema.c:237
 #: gconf/gconf-schema.c:245
 msgid "Schema contains invalid UTF-8"
-msgstr "模式包含无效的 UTF-8"
+msgstr "schema 包含无效的 UTF-8"
 
 #: gconf/gconf-schema.c:254
 msgid ""
 "Schema specifies type list but doesn't specify the type of the list elements"
-msgstr "模式指定的为列表类型，但并未指定列表元素的类型"
+msgstr "schema 指定了列表类型，但并未指定列表元素的类型"
 
 #: gconf/gconf-schema.c:264
 msgid ""
 "Schema specifies type pair but doesn't specify the type of the car/cdr "
 "elements"
-msgstr "模式指定的为成对类型，但并未指定 car/cdr 元素的类型"
+msgstr "schema 指定了成对类型，但并未指定 car/cdr 元素的类型"
 
 # SUN CHANGED MESSAGE
 #: gconf/gconf-sources.c:319
@@ -778,12 +777,12 @@ msgstr "没有一个解析的地址可以写入；将无法保存配置设置"
 #: gconf/gconf-sources.c:584
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
-msgstr "模式“%s”(为“%s”指定)存储了非模式值"
+msgstr "为“%s”指定的 schema “%s”存储了非 schema 值"
 
 # SUN NEW TRANSLATION
 #: gconf/gconf-sources.c:642
 msgid "The '/' name can only be a directory, not a key"
-msgstr "“/”名称只能是目录，不能是关键字"
+msgstr "“/”名称只能是目录，不能是键"
 
 # SUN NEW TRANSLATION
 #: gconf/gconf-sources.c:680
@@ -814,13 +813,13 @@ msgid ""
 "home directory, and it must own a lockfile in ~/.gconfd and also lockfiles "
 "in individual storage locations such as ~/.gconf"
 msgstr ""
-"无法以关键字“%s”存储值，因为配置服务器没有可写入数据库。该问题的常见原因如"
-"下：1) 您的配置路径文件 %s/path 不包含任何数据库或者没有 找到该文件 2) 可能由"
-"于某些原因错误地创建了两个 gconfd 进程 3) 您的操作系统配置错误，所以 NFS 文件"
-"锁定在您的主目录中不起作用或者 4) 您的 NFS 客户机崩溃并在重新启动时没有正确通"
-"知服务器应删除文件锁定。如果您有两个gconfd 进程(或在第二个进程启动时曾有两个"
-"进程)，注销、杀死 gconfd 的所有副本，然后再重新登录可能会有帮助。如果您的锁定"
-"已失效，删除 ~/.gconf*/*lock。可能问题是您尝试从两台计算机同时使用 GConf，而 "
+"无法以键“%s”存储值，因为配置服务器没有可写入数据库。该问题的常见原因如下：1) "
+"您的配置路径文件 %s/path 不包含任何数据库或者没有 找到该文件 2) 可能由于某些"
+"原因错误地创建了两个 gconfd 进程 3) 您的操作系统配置错误，所以 NFS 文件锁定在"
+"您的主目录中不起作用或者 4) 您的 NFS 客户机崩溃并在重新启动时没有正确通知服务"
+"器应删除文件锁定。如果您有两个gconfd 进程(或在第二个进程启动时曾有两个进程)，"
+"注销、杀死 gconfd 的所有副本，然后再重新登录可能会有帮助。如果您的锁定已失"
+"效，删除 ~/.gconf*/*lock。可能问题是您尝试从两台计算机同时使用 GConf，而 "
 "ORBit 仍然使用阻止远程 CORBA 连接的默认配置 - 将 \"ORBIIOPIPv4=1\" 放入 /etc/"
 "orbitrc 目录中。并且一定要检查 user.* syslog 了解有关 gconfd 遇到的问题的详细"
 "信息。每个主目录只能有一个 gconfd 进程，并且该进程必须在 ~/.gconfd 中拥有一个"
@@ -842,13 +841,13 @@ msgstr "获取元信息时出错：%s"
 #: gconf/gconf-sources.c:1507
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
-msgstr "关键字“%s”(作为关键字“%s”的模式列出)实际存储的类型是“%s”"
+msgstr "键“%s”(作为键“%s”的 schema 列出)实际存储的类型是“%s”"
 
 # SUN NEW TRANSLATION
 #: gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
-msgstr "不理解“%s”(要求为整数)"
+msgstr "不理解“%s”(需要整数)"
 
 # SUN NEW TRANSLATION
 #: gconf/gconf-value.c:120
@@ -860,13 +859,13 @@ msgstr "整数“%s”过大或过小"
 #: gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
-msgstr "不理解“%s”(要求为实数)"
+msgstr "不理解“%s”(需要实数)"
 
 # SUN NEW TRANSLATION
 #: gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
-msgstr "不理解“%s”(要求为 true 或 false)"
+msgstr "不理解“%s”(需要 true 或 false)"
 
 # SUN NEW TRANSLATION
 #: gconf/gconf-value.c:261
@@ -920,7 +919,7 @@ msgstr "不理解“%s”(在 pair 中找到多余的非换码字符“)”)"
 #: gconf/gconf.c:44
 #, c-format
 msgid "Key \"%s\" is NULL"
-msgstr "关键字“%s”为 NULL"
+msgstr "键“%s”为 NULL"
 
 # SUN NEW TRANSLATION
 #: gconf/gconf.c:51
@@ -947,48 +946,48 @@ msgstr "斜杠 (/) 后不能紧跟句号 (.)"
 #: gconf/gconf.c:159
 #, c-format
 msgid "'%c' is not an ASCII character, so isn't allowed in key names"
-msgstr "“%c”不是 ASCII 字符，所以不允许出现在关键字名称中"
+msgstr "“%c”不是 ASCII 字符，所以不允许出现在键名称中"
 
 # SUN NEW TRANSLATION
 #: gconf/gconf.c:169
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
-msgstr "“%c”在关键字/目录名称中是无效字符"
+msgstr "“%c”在键/目录名称中是无效字符"
 
 # SUN NEW TRANSLATION
 #: gconf/gconf.c:183
 msgid "Key/directory may not end with a slash (/)"
-msgstr "关键字/目录不能以斜杠 (/) 结束"
+msgstr "键/目录不能以斜杠 (/) 结束"
 
 # SUN NEW TRANSLATION
 #: gconf/gconf.c:408
 #, c-format
 msgid "Expected float, got %s"
-msgstr "要求值为浮点数，得到的值为 %s"
+msgstr "需要浮点数，得到的值为 %s"
 
 # SUN NEW TRANSLATION
 #: gconf/gconf.c:443
 #, c-format
 msgid "Expected int, got %s"
-msgstr "要求值为整数，得到的值为 %s"
+msgstr "需要整数，得到的值为 %s"
 
 # SUN NEW TRANSLATION
 #: gconf/gconf.c:478
 #, c-format
 msgid "Expected string, got %s"
-msgstr "要求值为字符串，得到的值为 %s"
+msgstr "需要字符串，得到的值为 %s"
 
 # SUN NEW TRANSLATION
 #: gconf/gconf.c:512
 #, c-format
 msgid "Expected bool, got %s"
-msgstr "要求值为布尔值，得到的值为 %s"
+msgstr "需要布尔值，得到的值为 %s"
 
 # SUN NEW TRANSLATION
 #: gconf/gconf.c:545
 #, c-format
 msgid "Expected schema, got %s"
-msgstr "要求值为模式，得到的值为 %s"
+msgstr "需要 schema ，得到的值为 %s"
 
 # SUN NEW TRANSLATION
 #: gconf/gconfd.c:147
@@ -1009,11 +1008,11 @@ msgstr "找不到配置文件，尝试使用默认配置源“%s”"
 #. request would result in another failed gconfd being spawned.
 #.
 #: gconf/gconfd.c:169
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "No configuration sources in the source path, configuration won't be saved; "
 "edit %s"
-msgstr "该源路径中没有配置源，不会保存配置；编辑"
+msgstr "该源路径中没有配置源，配置不会保存；请编辑 %s"
 
 # SUN NEW TRANSLATION
 #: gconf/gconfd.c:182
@@ -1062,7 +1061,7 @@ msgstr "打开 %s 失败：%s"
 #: gconf/gconfd.c:348
 #, c-format
 msgid "Failed to stat %s: %s"
-msgstr "统计 %s 失败：%s"
+msgstr "查看 %s 失败：%s"
 
 #: gconf/gconfd.c:357
 #, c-format
@@ -1070,9 +1069,9 @@ msgid "Owner of %s is not the current user"
 msgstr "%s 的所有者并非当前用户"
 
 #: gconf/gconfd.c:365
-#, fuzzy, c-format
+#, c-format
 msgid "Bad permissions %lo on directory %s"
-msgstr "目录 %2$s 的权限 %1$o 有错"
+msgstr "目录 %2$s 的权限 %1$lo 有错"
 
 # SUN NEW TRANSLATION
 #. openlog() does not copy logname - what total brokenness.
@@ -1124,36 +1123,37 @@ msgstr "GConf 服务器不在使用，正在关闭。"
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:93
 msgid "Set a key to a value and sync. Use with --type."
-msgstr "将关键字设置为值和同步。使用 --type。"
+msgstr "将键设置为值和同步。使用 --type。"
 
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:102
 msgid "Print the value of a key to standard output."
-msgstr "将关键字的值显示到标准输出。"
+msgstr "将键的值显示到标准输出。"
 
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:111
 msgid ""
 "Set a schema and sync. Use with --short-desc, --long-desc, --owner, and --"
 "type."
-msgstr "设置模式和同步。使用 --short-desc、--long-desc、--owner 和 --type。"
+msgstr ""
+"设置 schema 和同步。使用 --short-desc、--long-desc、--owner 和 --type。"
 
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:121
 msgid "Unset the keys on the command line"
-msgstr "取消命令行上的关键字设置"
+msgstr "取消命令行上的键设置"
 
 # SUN CHANGED MESSAGE
 #: gconf/gconftool.c:130
 msgid ""
 "Recursively unset all keys at or below the key/directory names on the "
 "command line"
-msgstr "递归取消设置命令行上该关键字/目录名称上或以下的所有关键字"
+msgstr "递归取消设置命令行上该键/目录名称位置或以下的所有键"
 
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:139
 msgid "Print all key/value pairs in a directory."
-msgstr "显示某个目录中的所有关键字/值对。"
+msgstr "显示某个目录中的所有键/值对。"
 
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:148
@@ -1205,7 +1205,7 @@ msgstr "启动该配置服务器 (gconfd)。(当需要时通常会自动启动�
 msgid ""
 "Specify the type of the value being set, or the type of the value a schema "
 "describes. Unique abbreviations OK."
-msgstr "指定正在设置的值的类型，或模式描述的值的类型。可使用唯一的缩写词。"
+msgstr "指定正在设置的值的类型，或 schema 描述的值的类型。可使用唯一的缩写词。"
 
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:221
@@ -1215,7 +1215,7 @@ msgstr "int|bool|float|string|list|pair"
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:229
 msgid "Print the data type of a key to standard output."
-msgstr "将关键字的数据类型显示到标准输出。"
+msgstr "将键的数据类型打印到标准输出。"
 
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:238
@@ -1231,7 +1231,8 @@ msgstr "从列表键中获取指定元素，以数字作为索引。"
 msgid ""
 "Specify the type of the list value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
-msgstr "指定正在设置的列表值的类型，或模式描述的值的类型。可使用唯一的缩写词。"
+msgstr ""
+"指定正在设置的列表值的类型，或 schema 描述的值的类型。可使用唯一的缩写词。"
 
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:257 gconf/gconftool.c:266 gconf/gconftool.c:275
@@ -1244,7 +1245,8 @@ msgid ""
 "Specify the type of the car pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
-"指定正在设置的 car pair 值的类型，或模式描述的值的类型。可使用唯一的缩写词。"
+"指定正在设置的 car pair 值的类型，或 schema 描述的值的类型。可使用唯一的缩写"
+"词。"
 
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:274
@@ -1252,12 +1254,13 @@ msgid ""
 "Specify the type of the cdr pair value being set, or the type of the value a "
 "schema describes. Unique abbreviations OK."
 msgstr ""
-"指定正在设置的 cdr pair 值的类型，或模式描述的值的类型。可使用唯一的缩写词。"
+"指定正在设置的 cdr pair 值的类型，或 schema 描述的值的类型。可使用唯一的缩写"
+"词。"
 
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:283
 msgid "Specify a short half-line description to go in a schema."
-msgstr "指定模式中使用的一条简短的半行说明。"
+msgstr "指定 schema 中使用的一条简短的半行说明。"
 
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:284 gconf/gconftool.c:293
@@ -1267,12 +1270,12 @@ msgstr "说明"
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:292
 msgid "Specify a several-line description to go in a schema."
-msgstr "指定模式中使用的一条多行说明。"
+msgstr "指定 schema 中使用的一条多行说明。"
 
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:301
 msgid "Specify the owner of a schema"
-msgstr "指定模式的所有者"
+msgstr "指定 schema 的所有者"
 
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:302
@@ -1282,7 +1285,7 @@ msgstr "所有者"
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:310
 msgid "Specify a schema file to be installed"
-msgstr "指定要安装的模式文件"
+msgstr "指定要安装的 schema 文件"
 
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:311
@@ -1313,8 +1316,8 @@ 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 环"
-"境变量应设置为非默认配置源或设置为空字符串。"
+"在命令行上将 schema 文件正确安装到数据库中。要使用默认值，"
+"GCONF_CONFIG_SOURCE 环境变量应设置为非默认配置源或设置为空字符串。"
 
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:346
@@ -1323,8 +1326,8 @@ 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 环"
-"境变量应设置为非默认配置源或设置为空字符串。"
+"在命令行上将 schema 文件正确从数据库中卸载。要使用默认值，"
+"GCONF_CONFIG_SOURCE 环境变量应设置为非默认配置源或设置为空字符串。"
 
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:355
@@ -1332,8 +1335,7 @@ msgid ""
 "Torture-test an application by setting and unsetting a bunch of values of "
 "different types for keys on the command line."
 msgstr ""
-"通过在命令行上为关键字设置和取消设置各种不同类型的值，对应用程序进行严格的测"
-"试。"
+"通过在命令行上为键设置和取消设置各种不同类型的值，对应用程序进行严格的测试。"
 
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:364
@@ -1341,32 +1343,32 @@ msgid ""
 "Torture-test an application by setting and unsetting a bunch of keys inside "
 "the directories on the command line."
 msgstr ""
-"通过在命令行上设置和取消设置目录中的各种关键字，对应用程序进行严格的测试。"
+"通过在命令行上设置和取消设置目录中的一系列键，对应用程序进行严格的测试。"
 
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:373
 msgid "Get the short doc string for a key"
-msgstr "获取关键字的短文档字符串"
+msgstr "获取键的短文档字符串"
 
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:382
 msgid "Get the long doc string for a key"
-msgstr "获取关键字的长文档字符串"
+msgstr "获取键的长文档字符串"
 
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:391
 msgid "Get the name of the schema applied to this key"
-msgstr "获取要应用于此关键字的模式名称"
+msgstr "获取要应用于此键的 schema 名称"
 
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:400
 msgid "Specify the schema name followed by the key to apply the schema name to"
-msgstr "指定模式名，后面跟着要应用该模式名的关键字"
+msgstr "指定 schema 名，后面跟着要应用该 schema 名的键"
 
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:409
 msgid "Remove any schema name applied to the given keys"
-msgstr "删除所有已应用于指定关键字的模式名"
+msgstr "删除所有已应用于指定键的 schema 名"
 
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:418
@@ -1458,13 +1460,13 @@ msgstr "无法初始化 GConf：%s\n"
 # SUN NEW TRANSLATION
 #: 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 已设置，不再安装 schema\n"
 
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:750
 msgid ""
 "GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL is set, not uninstalling schemas\n"
-msgstr "GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL 已设置，不在卸载模式\n"
+msgstr "GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL 已设置，不再卸载 schema\n"
 
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:763
@@ -1484,13 +1486,11 @@ msgstr "关闭错误：%s\n"
 
 # SUN CHANGED MESSAGE
 #: gconf/gconftool.c:1120
-#, fuzzy
 msgid "Must specify one or more directories to recursively list.\n"
 msgstr "必须要指定递归列出的一个或多个目录。\n"
 
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:1172
-#, fuzzy
 msgid "Must specify one or more directories to dump.\n"
 msgstr "必须指定要转存的一个或多个目录。\n"
 
@@ -1582,13 +1582,13 @@ msgstr "不理解类型“%s”\n"
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:1678
 msgid "Must specify alternating keys/values as arguments\n"
-msgstr "必须将替代关键字/值指定为参数\n"
+msgstr "必须将替代键/值指定为参数\n"
 
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:1698
 #, c-format
 msgid "No value to set for key: `%s'\n"
-msgstr "没有可为关键字“%s”设置的值\n"
+msgstr "没有可为键“%s”设置的值\n"
 
 #: gconf/gconftool.c:1726
 msgid "Cannot set schema as value\n"
@@ -1685,13 +1685,13 @@ msgstr "“%s”处的值不是模式\n"
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:2097
 msgid "Must specify a schema name followed by the key name to apply it to\n"
-msgstr "必须指定模式名，后面跟着要应用该模式名的关键字名称\n"
+msgstr "必须指定模式名，后面跟着要应用该模式名的键名称\n"
 
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:2104
 #, c-format
 msgid "Error associating schema name '%s' with key name '%s': %s\n"
-msgstr "将模式名“%s”与关键字名“%s”关联时出错：%s\n"
+msgstr "将模式名“%s”与键名“%s”关联时出错：%s\n"
 
 #: gconf/gconftool.c:2122
 msgid "Must specify keys to unapply schema from\n"
@@ -1706,7 +1706,7 @@ msgstr "从“%s”删除模式名时出错：%s\n"
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:2157
 msgid "Must specify key (schema name) as the only argument\n"
-msgstr "必须将关键字(模式名)指定为唯一的参数\n"
+msgstr "必须将键(模式名)指定为唯一的参数\n"
 
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:2199
@@ -1735,14 +1735,13 @@ msgstr "同步时发生错误：%s"
 
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:2283
-#, fuzzy
 msgid "Must specify one or more directories to get key/value pairs from.\n"
-msgstr "必须指定一个或多个要从其中获得关键字/值对的目录。\n"
+msgstr "必须指定一个或多个要从其中获得键/值对的目录。\n"
 
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:2297
 msgid "Must specify one or more keys to unset.\n"
-msgstr "必须指定一个或多个要取消设置的关键字。\n"
+msgstr "必须指定一个或多个要取消设置的键。\n"
 
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:2308
@@ -1753,7 +1752,7 @@ msgstr "取消设置“%s”时出错：%s\n"
 # SUN CHANGED MESSAGE
 #: gconf/gconftool.c:2328
 msgid "Must specify one or more keys to recursively unset.\n"
-msgstr "必须指定一个或多个要递归取消设置的关键字。\n"
+msgstr "必须指定一个或多个要递归取消设置的键。\n"
 
 # SUN CHANGED MESSAGE
 #: gconf/gconftool.c:2342
@@ -1762,9 +1761,8 @@ msgid "Failure during recursive unset of \"%s\": %s\n"
 msgstr "在递归取消设置“%s”时失败：%s\n"
 
 #: gconf/gconftool.c:2362
-#, fuzzy
 msgid "Must specify one or more directories to get subdirs from.\n"
-msgstr "必须指定获取子目录的一个或多个目录。\n"
+msgstr "必须指定要获取子目录的一个或多个目录。\n"
 
 #: gconf/gconftool.c:2396
 #, c-format
@@ -1792,12 +1790,12 @@ msgstr "警告：无法理解节点 <%s>\n"
 #: gconf/gconftool.c:2616
 #, c-format
 msgid "WARNING: Failed to parse int value `%s'\n"
-msgstr "警告：无法分析整数值“%s”\n"
+msgstr "警告：无法解析整数值“%s”\n"
 
 #: gconf/gconftool.c:2637
 #, c-format
 msgid "WARNING: Failed to parse float value `%s'\n"
-msgstr "警告：无法分析浮点值“%s”\n"
+msgstr "警告：无法解析浮点值“%s”\n"
 
 #: gconf/gconftool.c:2659
 #, c-format
@@ -1807,7 +1805,7 @@ msgstr "警告：无法处理字符串值“%s”\n"
 #: gconf/gconftool.c:2680
 #, c-format
 msgid "WARNING: Failed to parse boolean value `%s'\n"
-msgstr "警告：无法分析布尔值“%s”\n"
+msgstr "警告：无法解析布尔值“%s”\n"
 
 #: gconf/gconftool.c:2796 gconf/gconftool.c:3332
 #, c-format
@@ -1827,7 +1825,7 @@ msgstr "警告：schema (%s) 的 list_type 无效或缺少\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 "警告：无法分析 schema (%s) 的默认值“%s”\n"
+msgstr "警告：无法解析 schema (%s) 的默认值“%s”\n"
 
 #: gconf/gconftool.c:2939
 #, c-format
@@ -1846,7 +1844,7 @@ msgstr "警告：gconftool 内部错误，未知的 GConfValueType\n"
 #: gconf/gconftool.c:3104
 #, c-format
 msgid "WARNING: failed to parse type name `%s'\n"
-msgstr "警告：无法分析类型名“%s”\n"
+msgstr "警告：无法解析类型名“%s”\n"
 
 #: gconf/gconftool.c:3058
 #, c-format
@@ -1990,12 +1988,12 @@ msgstr ""
 #: gconf/gconftool.c:3761
 #, c-format
 msgid "Failed to unset breakage key %s: %s\n"
-msgstr "无法取消设置破坏关键字 %s：%s\n"
+msgstr "无法取消设置破坏键 %s：%s\n"
 
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:3887
 msgid "Must specify some keys to break\n"
-msgstr "必须指定一些要破坏的关键字\n"
+msgstr "必须指定一些要破坏的键\n"
 
 # SUN NEW TRANSLATION
 #: gconf/gconftool.c:3893
@@ -2004,7 +2002,7 @@ msgid ""
 "Trying to break your application by setting bad values for key:\n"
 "  %s\n"
 msgstr ""
-"正在试图通过为关键字设置不正确的值来破坏您的应用程序:\n"
+"正在试图通过为键设置不正确的值来破坏您的应用程序:\n"
 "  %s\n"
 
 # SUN NEW TRANSLATION
@@ -2020,33 +2018,51 @@ msgid ""
 "directory:\n"
 "  %s\n"
 msgstr ""
-"正在试图通过为目录中的关键字设置不正确的值来破坏您的应用程序：\n"
+"正在试图通过为目录中的键设置不正确的值来破坏您的应用程序：\n"
 "  %s\n"
 
-#, fuzzy
 #~ msgid "Cannot find directory %s\n"
-#~ msgstr "无法创建目录“%s”：%s"
+#~ msgstr "无法找到目录 %s\n"
 
-#, fuzzy
 #~ msgid "Error saving GConf tree to '%s': %s\n"
-#~ msgstr "在“%s”获取 schema 时发生错误：%s\n"
+#~ msgstr "将 GConf 树保存到“%s”时发生错误：%s\n"
+
+#~ msgid "Usage: %s <dir>\n"
+#~ msgstr "用法：%s <dir>\n"
+
+#~ 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 ""
+#~ "用法：%s <dir>\n"
+#~ "  合并一个标记后端文件系统层次形如：\n"
+#~ "    dir/%%gconf.xml\n"
+#~ "        subdir1/%%gconf.xml\n"
+#~ "        subdir2/%%gconf.xml\n"
+#~ "  成为：\n"
+#~ "    dir/%%gconf-tree.xml\n"
 
 #~ msgid "Received invalid value in set request"
-#~ msgstr "接收到“设置请求中有无效值”"
+#~ msgstr "在“设置”请求中收到无效值"
 
 # SUN NEW TRANSLATION
 #~ msgid ""
 #~ "Couldn't make sense of CORBA value received in set request for key `%s'"
-#~ msgstr "无法理解关键字“%s”的设置请求中接收到的 CORBA 值"
+#~ msgstr "无法理解键“%s”的设置请求中接收到的 CORBA 值"
 
 #~ msgid "Received request to drop all cached data"
 #~ msgstr "接收到“丢弃所有缓冲的数据”的请求"
 
 #~ msgid "Received request to sync synchronously"
-#~ msgstr "接收到“同步地进行同步”的请求"
+#~ msgstr "接收到“同时进行同步”的请求"
 
 #~ msgid "Fatal error: failed to get object reference for ConfigDatabase"
-#~ msgstr "严重错误：无法为 ConfigDatabase 得到对象引用"
+#~ msgstr "严重错误：无法为 ConfigDatabase 获取对象引用"
 
 # SUN NEW TRANSLATION
 #~ msgid ""
@@ -2054,8 +2070,8 @@ msgstr ""
 #~ "this listener on gconfd restart, resulting in unreliable notification of "
 #~ "configuration changes."
 #~ msgstr ""
-#~ "无法记录添加了监听程序 %s (%s)；将无法在 gconfd重启动时恢复该监听程序，这"
-#~ "会导致配置更改的通知不可靠。"
+#~ "无法记录添加了监听程序 %s (%s)；将无法在 gconfd 重启时恢复该监听程序，这会"
+#~ "导致配置更改的通知不可靠。"
 
 #~ msgid "Listener ID %lu doesn't exist"
 #~ msgstr "监听程序 ID %lu 不存在"
@@ -2086,19 +2102,19 @@ msgstr ""
 
 # SUN NEW TRANSLATION
 #~ msgid "Invalid UTF-8 in locale for schema"
-#~ msgstr "模式的区域设置中的 UTF-8 无效"
+#~ msgstr "schema 的区域设置中有无效的 UTF-8 字符"
 
 # SUN NEW TRANSLATION
 #~ msgid "Invalid UTF-8 in short description for schema"
-#~ msgstr "模式的简短说明中的 UTF-8 无效"
+#~ msgstr "schema 的简短说明中有无效的 UTF-8 字符"
 
 # SUN NEW TRANSLATION
 #~ msgid "Invalid UTF-8 in long description for schema"
-#~ msgstr "模式的详细说明中的 UTF-8 无效"
+#~ msgstr "schema 的详细说明中有无效的 UTF-8 字符"
 
 # SUN NEW TRANSLATION
 #~ msgid "Invalid UTF-8 in owner for schema"
-#~ msgstr "模式的所有者中的 UTF-8 无效"
+#~ msgstr "schema 的所有者中有无效的 UTF-8 字符"
 
 # SUN NEW TRANSLATION
 #~ msgid "Server ping error: %s"
@@ -2248,15 +2264,3 @@ msgstr ""
 #~ "Some client removed itself from the GConf server when it hadn't been "
 #~ "added."
 #~ msgstr "当某个客户端未被添加时，它将自己从 GConf 服务器中删除。"
-
-#~ msgid ""
-#~ "%u items remain in the cache after cleaning already-synced items older "
-#~ "than %u seconds"
-#~ msgstr "在清除旧于“%u”秒的已同步的项后，有 %u 项保留在缓存中"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-# SUN NEW TRANSLATION
-#~ msgid "/path"
-#~ msgstr "/path"