Updated Occitan translationGCONF_2_21_2

svn path=/trunk/; revision=2523

2 files changed, 140 insertions, 131 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index d8a2f4ce..af3bdd58 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-20  Yannig Marchegay <yannig@marchegay.org>
+
+	* oc.po: Updated Occitan translation.
+
 2008-01-17  Maxim Dziumanenko <dziumanenko@gmail.com>
 
 	* uk.po: Updated Ukrainian translation.
diff --git a/po/oc.po b/po/oc.po
index 6ba4b2a9..82170a38 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: oc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-27 13:30+0100\n"
-"PO-Revision-Date: 2007-11-20 14:30+0100\n"
+"POT-Creation-Date: 2008-01-20 16:53+0100\n"
+"PO-Revision-Date: 2008-01-20 16:55+0100\n"
 "Last-Translator: Yannig Marchegay (Kokoyaya) <yannig@marchegay.org>\n"
 "Language-Team: Occitan <ubuntu-l10n-oci@lists.ubuntu.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);"
 
 #: ../backends/evoldap-backend.c:159
 #, c-format
@@ -27,57 +27,57 @@ msgstr ""
 msgid "Created Evolution/LDAP source using configuration file '%s'"
 msgstr ""
 
-#: ../backends/evoldap-backend.c:446
+#: ../backends/evoldap-backend.c:444
 #, c-format
 msgid "Unable to parse XML file '%s'"
 msgstr ""
 
-#: ../backends/evoldap-backend.c:455
+#: ../backends/evoldap-backend.c:453
 #, c-format
 msgid "Config file '%s' is empty"
 msgstr "Lo fichièr de configuracion '%s' es void"
 
-#: ../backends/evoldap-backend.c:466
+#: ../backends/evoldap-backend.c:464
 #, c-format
 msgid "Root node of '%s' must be <evoldap>, not <%s>"
 msgstr ""
 
-#: ../backends/evoldap-backend.c:504
+#: ../backends/evoldap-backend.c:502
 #, c-format
 msgid "No <template> specified in '%s'"
 msgstr ""
 
-#: ../backends/evoldap-backend.c:511
+#: ../backends/evoldap-backend.c:509
 #, c-format
 msgid "No \"filter\" attribute specified on <template> in '%s'"
 msgstr ""
 
-#: ../backends/evoldap-backend.c:572
+#: ../backends/evoldap-backend.c:570
 #, c-format
 msgid "No LDAP server or base DN specified in '%s'"
 msgstr ""
 
-#: ../backends/evoldap-backend.c:578
+#: ../backends/evoldap-backend.c:576
 #, c-format
 msgid "Contacting LDAP server: host '%s', port '%d', base DN '%s'"
 msgstr ""
 
-#: ../backends/evoldap-backend.c:584
+#: ../backends/evoldap-backend.c:582
 #, c-format
 msgid "Failed to contact LDAP server: %s"
 msgstr ""
 
-#: ../backends/evoldap-backend.c:671
+#: ../backends/evoldap-backend.c:669
 #, c-format
 msgid "Searching for entries using filter: %s"
 msgstr ""
 
-#: ../backends/evoldap-backend.c:684
+#: ../backends/evoldap-backend.c:682
 #, c-format
 msgid "Error querying LDAP server: %s"
 msgstr ""
 
-#: ../backends/evoldap-backend.c:694
+#: ../backends/evoldap-backend.c:692
 #, c-format
 msgid "Got %d entries using filter: %s"
 msgstr ""
@@ -165,7 +165,7 @@ msgstr ""
 msgid "Failed to write some configuration data to disk\n"
 msgstr ""
 
-#: ../backends/markup-tree.c:922 ../backends/xml-dir.c:1273
+#: ../backends/markup-tree.c:922 ../backends/xml-dir.c:1266
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "Impossible de crear lo repertòri \"%s\" : %s"
@@ -185,152 +185,152 @@ msgstr "Impossible d'escriure \"%s\" : %s\n"
 msgid "Failed to load file \"%s\": %s"
 msgstr "Impossible de cargar lo fichièr \"%s\" : %s"
 
-#: ../backends/markup-tree.c:1970
+#: ../backends/markup-tree.c:1968
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "Linha %d caractèr %d : %s"
 
-#: ../backends/markup-tree.c:2189
+#: ../backends/markup-tree.c:2187
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: ../backends/markup-tree.c:2206 ../backends/markup-tree.c:2230
+#: ../backends/markup-tree.c:2204 ../backends/markup-tree.c:2228
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: ../backends/markup-tree.c:2255 ../gconf/gconf-value.c:112
+#: ../backends/markup-tree.c:2253 ../gconf/gconf-value.c:110
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr ""
 
-#: ../backends/markup-tree.c:2262 ../gconf/gconf-value.c:122
+#: ../backends/markup-tree.c:2260 ../gconf/gconf-value.c:120
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr ""
 
-#: ../backends/markup-tree.c:2294 ../gconf/gconf-value.c:187
+#: ../backends/markup-tree.c:2292 ../gconf/gconf-value.c:185
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr ""
 
-#: ../backends/markup-tree.c:2318 ../gconf/gconf-value.c:143
+#: ../backends/markup-tree.c:2316 ../gconf/gconf-value.c:141
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr ""
 
-#: ../backends/markup-tree.c:2388 ../backends/markup-tree.c:2417
-#: ../backends/markup-tree.c:2457 ../backends/markup-tree.c:2481
-#: ../backends/markup-tree.c:2489 ../backends/markup-tree.c:2544
-#: ../backends/markup-tree.c:2609 ../backends/markup-tree.c:2721
-#: ../backends/markup-tree.c:2789 ../backends/markup-tree.c:2847
-#: ../backends/markup-tree.c:2997
+#: ../backends/markup-tree.c:2386 ../backends/markup-tree.c:2415
+#: ../backends/markup-tree.c:2455 ../backends/markup-tree.c:2479
+#: ../backends/markup-tree.c:2487 ../backends/markup-tree.c:2542
+#: ../backends/markup-tree.c:2607 ../backends/markup-tree.c:2719
+#: ../backends/markup-tree.c:2787 ../backends/markup-tree.c:2845
+#: ../backends/markup-tree.c:2995
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: ../backends/markup-tree.c:2397
+#: ../backends/markup-tree.c:2395
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: ../backends/markup-tree.c:2431
+#: ../backends/markup-tree.c:2429
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr ""
 
-#: ../backends/markup-tree.c:2511
+#: ../backends/markup-tree.c:2509
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr ""
 
-#: ../backends/markup-tree.c:2525
+#: ../backends/markup-tree.c:2523
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr ""
 
-#: ../backends/markup-tree.c:2561
+#: ../backends/markup-tree.c:2559
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr ""
 
-#: ../backends/markup-tree.c:2928
+#: ../backends/markup-tree.c:2926
 msgid "Two <default> elements below a <local_schema>"
 msgstr ""
 
-#: ../backends/markup-tree.c:2943
+#: ../backends/markup-tree.c:2941
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr ""
 
-#: ../backends/markup-tree.c:2950
+#: ../backends/markup-tree.c:2948
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: ../backends/markup-tree.c:2975 ../backends/markup-tree.c:3080
-#: ../backends/markup-tree.c:3134 ../backends/markup-tree.c:3185
+#: ../backends/markup-tree.c:2973 ../backends/markup-tree.c:3078
+#: ../backends/markup-tree.c:3132 ../backends/markup-tree.c:3183
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr ""
 
-#: ../backends/markup-tree.c:3058
+#: ../backends/markup-tree.c:3056
 msgid "Two <car> elements given for same pair"
 msgstr ""
 
-#: ../backends/markup-tree.c:3072
+#: ../backends/markup-tree.c:3070
 msgid "Two <cdr> elements given for same pair"
 msgstr ""
 
-#: ../backends/markup-tree.c:3126
+#: ../backends/markup-tree.c:3124
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr ""
 
-#: ../backends/markup-tree.c:3157
+#: ../backends/markup-tree.c:3155
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr ""
 
-#: ../backends/markup-tree.c:3198 ../backends/markup-tree.c:3221
-#: ../backends/markup-tree.c:3243 ../backends/markup-tree.c:3260
+#: ../backends/markup-tree.c:3196 ../backends/markup-tree.c:3219
+#: ../backends/markup-tree.c:3241 ../backends/markup-tree.c:3258
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr ""
 
-#: ../backends/markup-tree.c:3292
+#: ../backends/markup-tree.c:3290
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr ""
 
-#: ../backends/markup-tree.c:3312 ../backends/markup-tree.c:3334
-#: ../backends/markup-tree.c:3339
+#: ../backends/markup-tree.c:3310 ../backends/markup-tree.c:3332
+#: ../backends/markup-tree.c:3337
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: ../backends/markup-tree.c:3483
+#: ../backends/markup-tree.c:3481
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
-#: ../backends/markup-tree.c:3600 ../backends/markup-tree.c:4380
-#: ../backends/markup-tree.c:4398
+#: ../backends/markup-tree.c:3598 ../backends/markup-tree.c:4378
+#: ../backends/markup-tree.c:4396
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "Impossible de dobrir \"%s\" : %s\n"
 
-#: ../backends/markup-tree.c:3630
+#: ../backends/markup-tree.c:3628
 #, c-format
 msgid "Error reading \"%s\": %s\n"
 msgstr "Error al moment de legir \"%s\" : %s\n"
 
-#: ../backends/markup-tree.c:4485
+#: ../backends/markup-tree.c:4483
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "Error al moment d'escriure lo fichièr \"%s\" : %s"
 
-#: ../backends/markup-tree.c:4514
+#: ../backends/markup-tree.c:4512
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr ""
@@ -389,7 +389,7 @@ msgstr ""
 msgid "Failed to write XML data to `%s': %s"
 msgstr ""
 
-#: ../backends/xml-dir.c:506 ../backends/xml-dir.c:1297
+#: ../backends/xml-dir.c:506 ../backends/xml-dir.c:1290
 #, c-format
 msgid "Failed to close file `%s': %s"
 msgstr ""
@@ -410,122 +410,122 @@ msgid "Failed to delete old file `%s': %s"
 msgstr ""
 
 #. These are all fatal errors
-#: ../backends/xml-dir.c:996
+#: ../backends/xml-dir.c:990
 #, c-format
 msgid "Failed to stat `%s': %s"
 msgstr "Impossible d'analisar '%s' : %s"
 
-#: ../backends/xml-dir.c:1170
+#: ../backends/xml-dir.c:1164
 #, c-format
 msgid "Duplicate entry `%s' in `%s', ignoring"
 msgstr ""
 
-#: ../backends/xml-dir.c:1192
+#: ../backends/xml-dir.c:1186
 #, c-format
 msgid "Entry with no name in XML file `%s', ignoring"
 msgstr ""
 
-#: ../backends/xml-dir.c:1200
+#: ../backends/xml-dir.c:1194
 #, c-format
 msgid "A toplevel node in XML file `%s' is <%s> rather than <entry>, ignoring"
 msgstr ""
 
-#: ../backends/xml-dir.c:1289
+#: ../backends/xml-dir.c:1282
 #, c-format
 msgid "Failed to create file `%s': %s"
 msgstr "Impossible de crear lo fichièr \"%s\" : %s"
 
-#: ../backends/xml-dir.c:1388
+#: ../backends/xml-dir.c:1381
 #, c-format
 msgid "Failed to parse XML file \"%s\""
 msgstr "Impossible d'analisar lo fichièr XML \"%s\""
 
 #. There was an error
-#: ../backends/xml-entry.c:154
+#: ../backends/xml-entry.c:152
 #, c-format
 msgid "Ignoring XML node with name `%s': %s"
 msgstr ""
 
-#: ../backends/xml-entry.c:332
+#: ../backends/xml-entry.c:328
 #, c-format
 msgid "Ignoring schema name `%s', invalid: %s"
 msgstr ""
 
-#: ../backends/xml-entry.c:380
+#: ../backends/xml-entry.c:376
 #, c-format
 msgid "Ignoring XML node `%s': %s"
 msgstr ""
 
-#: ../backends/xml-entry.c:733
+#: ../backends/xml-entry.c:729
 #, c-format
 msgid "Failed reading default value for schema: %s"
 msgstr ""
 
-#: ../backends/xml-entry.c:953
+#: ../backends/xml-entry.c:949
 #, c-format
 msgid "No \"type\" attribute for <%s> node"
 msgstr ""
 
-#: ../backends/xml-entry.c:967
+#: ../backends/xml-entry.c:963
 #, c-format
 msgid "A node has unknown \"type\" attribute `%s', ignoring"
 msgstr ""
 
-#: ../backends/xml-entry.c:982
+#: ../backends/xml-entry.c:978
 msgid "No \"value\" attribute for node"
 msgstr ""
 
-#: ../backends/xml-entry.c:1030 ../backends/xml-entry.c:1106
+#: ../backends/xml-entry.c:1026 ../backends/xml-entry.c:1102
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML list node"
 msgstr ""
 
-#: ../backends/xml-entry.c:1064
+#: ../backends/xml-entry.c:1060
 msgid "Invalid type (list, pair, or unknown) in a list node"
 msgstr ""
 
-#: ../backends/xml-entry.c:1087
+#: ../backends/xml-entry.c:1083
 #, c-format
 msgid "Bad XML node: %s"
 msgstr ""
 
-#: ../backends/xml-entry.c:1095
+#: ../backends/xml-entry.c:1091
 #, c-format
 msgid "List contains a badly-typed node (%s, should be %s)"
 msgstr ""
 
-#: ../backends/xml-entry.c:1147
+#: ../backends/xml-entry.c:1143
 #, c-format
 msgid "Ignoring bad car from XML pair: %s"
 msgstr ""
 
-#: ../backends/xml-entry.c:1156 ../backends/xml-entry.c:1179
+#: ../backends/xml-entry.c:1152 ../backends/xml-entry.c:1175
 msgid "parsing XML file: lists and pairs may not be placed inside a pair"
 msgstr ""
 
-#: ../backends/xml-entry.c:1169
+#: ../backends/xml-entry.c:1165
 #, c-format
 msgid "Ignoring bad cdr from XML pair: %s"
 msgstr ""
 
-#: ../backends/xml-entry.c:1188
+#: ../backends/xml-entry.c:1184
 #, c-format
 msgid "Didn't understand XML node <%s> inside an XML pair node"
 msgstr ""
 
-#: ../backends/xml-entry.c:1206
+#: ../backends/xml-entry.c:1202
 msgid "Didn't find car and cdr for XML pair node"
 msgstr ""
 
-#: ../backends/xml-entry.c:1212
+#: ../backends/xml-entry.c:1208
 msgid "Missing cdr from pair of values in XML file"
 msgstr ""
 
-#: ../backends/xml-entry.c:1219
+#: ../backends/xml-entry.c:1215
 msgid "Missing car from pair of values in XML file"
 msgstr ""
 
-#: ../backends/xml-entry.c:1224
+#: ../backends/xml-entry.c:1220
 msgid "Missing both car and cdr values from pair in XML file"
 msgstr ""
 
@@ -542,7 +542,7 @@ msgstr "Pas cap de fichièr '%s'\n"
 
 #: ../gconf/gconf-backend.c:261
 #, c-format
-msgid "Backend `%s' failed return a vtable\n"
+msgid "Backend `%s' failed to return a vtable\n"
 msgstr ""
 
 #: ../gconf/gconf-backend.c:276
@@ -634,7 +634,7 @@ msgstr ""
 #: ../gconf/gconf-database.c:1119
 #, c-format
 msgid ""
-"Failed to log addition of listener %s (%s);will not be able to restore this "
+"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 ""
@@ -651,7 +651,7 @@ msgid ""
 "result in a notification weirdly reappearing): %s"
 msgstr ""
 
-#: ../gconf/gconf-database.c:1301 ../gconf/gconf-sources.c:1697
+#: ../gconf/gconf-database.c:1301 ../gconf/gconf-sources.c:1696
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "Error al moment d'obténer la valor de '%s' : %s"
@@ -829,8 +829,8 @@ msgid "Read error on file `%s': %s\n"
 msgstr ""
 
 #: ../gconf/gconf-internals.c:1244 ../gconf/gconf-internals.c:1310
-#: ../gconf/gconf-value.c:156 ../gconf/gconf-value.c:255
-#: ../gconf/gconf-value.c:397 ../gconf/gconf-value.c:1672
+#: ../gconf/gconf-value.c:154 ../gconf/gconf-value.c:253
+#: ../gconf/gconf-value.c:395 ../gconf/gconf-value.c:1667
 #, c-format
 msgid "Text contains invalid UTF-8"
 msgstr ""
@@ -1074,19 +1074,19 @@ msgstr "_Contunhar"
 msgid "%s Continue (y/n)?"
 msgstr ""
 
-#: ../gconf/gconf-schema.c:217 ../gconf/gconf-schema.c:225
-#: ../gconf/gconf-schema.c:233 ../gconf/gconf-schema.c:241
+#: ../gconf/gconf-schema.c:210 ../gconf/gconf-schema.c:218
+#: ../gconf/gconf-schema.c:226 ../gconf/gconf-schema.c:234
 #, c-format
 msgid "Schema contains invalid UTF-8"
 msgstr ""
 
-#: ../gconf/gconf-schema.c:250
+#: ../gconf/gconf-schema.c:243
 #, c-format
 msgid ""
 "Schema specifies type list but doesn't specify the type of the list elements"
 msgstr ""
 
-#: ../gconf/gconf-schema.c:260
+#: ../gconf/gconf-schema.c:253
 #, c-format
 msgid ""
 "Schema specifies type pair but doesn't specify the type of the car/cdr "
@@ -1113,7 +1113,8 @@ msgstr ""
 #: ../gconf/gconf-sources.c:424
 #, c-format
 msgid ""
-"Resolved address \"%s\" to a partially writable config source at position %d"
+"Resolved address \"%s\" to a partially writable configuration source at "
+"position %d"
 msgstr ""
 
 #: ../gconf/gconf-sources.c:433
@@ -1122,23 +1123,23 @@ msgid ""
 "will not be possible"
 msgstr ""
 
-#: ../gconf/gconf-sources.c:650
+#: ../gconf/gconf-sources.c:649
 #, c-format
 msgid "Schema `%s' specified for `%s' stores a non-schema value"
 msgstr ""
 
-#: ../gconf/gconf-sources.c:712
+#: ../gconf/gconf-sources.c:711
 msgid "The '/' name can only be a directory, not a key"
 msgstr ""
 
-#: ../gconf/gconf-sources.c:754
+#: ../gconf/gconf-sources.c:753
 #, c-format
 msgid ""
 "Value for `%s' set in a read-only source at the front of your configuration "
 "path"
 msgstr ""
 
-#: ../gconf/gconf-sources.c:766
+#: ../gconf/gconf-sources.c:765
 #, c-format
 msgid ""
 "Unable to store a value at key '%s', as the configuration server has no "
@@ -1159,57 +1160,57 @@ msgid ""
 "in individual storage locations such as ~/.gconf"
 msgstr ""
 
-#: ../gconf/gconf-sources.c:1570
+#: ../gconf/gconf-sources.c:1569
 #, c-format
 msgid "Error finding metainfo: %s"
 msgstr ""
 
-#: ../gconf/gconf-sources.c:1639
+#: ../gconf/gconf-sources.c:1638
 #, c-format
 msgid "Error getting metainfo: %s"
 msgstr ""
 
-#: ../gconf/gconf-sources.c:1663
+#: ../gconf/gconf-sources.c:1662
 #, c-format
 msgid "Key `%s' listed as schema for key `%s' actually stores type `%s'"
 msgstr ""
 
-#: ../gconf/gconf-value.c:263
+#: ../gconf/gconf-value.c:261
 #, c-format
 msgid "Didn't understand `%s' (list must start with a '[')"
 msgstr ""
 
-#: ../gconf/gconf-value.c:276
+#: ../gconf/gconf-value.c:274
 #, c-format
 msgid "Didn't understand `%s' (list must end with a ']')"
 msgstr ""
 
-#: ../gconf/gconf-value.c:327
+#: ../gconf/gconf-value.c:325
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ']' found inside list)"
 msgstr ""
 
-#: ../gconf/gconf-value.c:358 ../gconf/gconf-value.c:519
+#: ../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:405
+#: ../gconf/gconf-value.c:403
 #, c-format
 msgid "Didn't understand `%s' (pair must start with a '(')"
 msgstr ""
 
-#: ../gconf/gconf-value.c:418
+#: ../gconf/gconf-value.c:416
 #, c-format
 msgid "Didn't understand `%s' (pair must end with a ')')"
 msgstr ""
 
-#: ../gconf/gconf-value.c:448 ../gconf/gconf-value.c:534
+#: ../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:488
+#: ../gconf/gconf-value.c:486
 #, c-format
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr ""
@@ -1238,20 +1239,20 @@ msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr ""
 
 #: ../gconf/gconf.c:2623
-msgid "Must begin with a slash (/)"
+msgid "Must begin with a slash '/'"
 msgstr ""
 
 #: ../gconf/gconf.c:2645
-msgid "Can't have two slashes (/) in a row"
+msgid "Can't have two slashes '/' in a row"
 msgstr ""
 
 #: ../gconf/gconf.c:2647
-msgid "Can't have a period (.) right after a slash (/)"
+msgid "Can't have a period '.' right after a slash '/'"
 msgstr ""
 
 #: ../gconf/gconf.c:2667
 #, c-format
-msgid "'\\%o' is not an ASCII character, so isn't allowed in key names"
+msgid "'\\%o' is not an ASCII character and thus isn't allowed in key names"
 msgstr ""
 
 #: ../gconf/gconf.c:2677
@@ -1260,12 +1261,12 @@ msgid "`%c' is an invalid character in key/directory names"
 msgstr ""
 
 #: ../gconf/gconf.c:2691
-msgid "Key/directory may not end with a slash (/)"
+msgid "Key/directory may not end with a slash '/'"
 msgstr ""
 
 #: ../gconf/gconf.c:3062
 #, c-format
-msgid "Failure shutting down config server: %s"
+msgid "Failure shutting down configuration server: %s"
 msgstr ""
 
 #: ../gconf/gconf.c:3123
@@ -1311,7 +1312,8 @@ msgstr ""
 #: ../gconf/gconfd.c:354
 #, c-format
 msgid ""
-"No configuration files found, trying to use the default config source `%s'"
+"No configuration files found. Trying to use the default configuration source "
+"`%s'"
 msgstr ""
 
 #. We want to stay alive but do nothing, because otherwise every
@@ -1320,25 +1322,25 @@ msgstr ""
 #: ../gconf/gconfd.c:362
 #, c-format
 msgid ""
-"No configuration sources in the source path, configuration won't be saved; "
+"No configuration sources in the source path. Configuration won't be saved; "
 "edit %s%s"
 msgstr ""
 
 #: ../gconf/gconfd.c:375
 #, c-format
-msgid "Error loading some config sources: %s"
+msgid "Error loading some configuration sources: %s"
 msgstr ""
 
 #: ../gconf/gconfd.c:387
 msgid ""
-"No config source addresses successfully resolved, can't load or store config "
-"data"
+"No configuration source addresses successfully resolved. Can't load or store "
+"configuration data"
 msgstr ""
 
 #: ../gconf/gconfd.c:404
 msgid ""
-"No writable config sources successfully resolved, may not be able to save "
-"some configuration changes"
+"No writable configuration sources successfully resolved. May be unable to "
+"save some configuration changes"
 msgstr ""
 
 #: ../gconf/gconfd.c:553
@@ -1451,7 +1453,7 @@ msgstr ""
 
 #: ../gconf/gconfd.c:1580
 #, c-format
-msgid "Failed to move new save state file into place: %s"
+msgid "Failed to move new saved state file into place: %s"
 msgstr ""
 
 #: ../gconf/gconfd.c:1589
@@ -1595,8 +1597,8 @@ msgstr ""
 
 #: ../gconf/gconftool.c:265
 msgid ""
-"Launch the config server (gconfd). (Normally happens automatically when "
-"needed.)"
+"Launch the configuration server (gconfd). (Normally happens automatically "
+"when needed.)"
 msgstr ""
 
 #: ../gconf/gconftool.c:280
@@ -1661,22 +1663,23 @@ msgstr ""
 
 #: ../gconf/gconftool.c:367
 msgid ""
-"Access the config database directly, bypassing server. Requires that gconfd "
-"is not running."
+"Bypass server, and access the configuration database directly. Requires that "
+"gconfd is not running."
 msgstr ""
 
 #: ../gconf/gconftool.c:376
 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."
+"Specify a custom configuration source in the GCONF_CONFIG_SOURCE environment "
+"variable, or set set the variable to an empty string to use the default "
+"configuration source."
 msgstr ""
 
 #: ../gconf/gconftool.c:385
 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."
+"configuration source or set to the empty string to use the default."
 msgstr ""
 
 #: ../gconf/gconftool.c:400
@@ -1868,7 +1871,8 @@ msgstr ""
 #: ../gconf/gconftool.c:822
 #, c-format
 msgid ""
-"You must specify a config source with --config-source when using --direct\n"
+"You must specify a configuration source with --config-source when using --"
+"direct\n"
 msgstr ""
 
 #: ../gconf/gconftool.c:828
@@ -1929,7 +1933,7 @@ msgstr ""
 
 #: ../gconf/gconftool.c:1758
 #, c-format
-msgid "Failed to spawn the config server (gconfd): %s\n"
+msgid "Failed to spawn the configuration server (gconfd): %s\n"
 msgstr ""
 
 #: ../gconf/gconftool.c:1787
@@ -2343,7 +2347,7 @@ msgstr ""
 
 #: ../gconf/gconftool.c:3684
 #, c-format
-msgid "WARNING: failed to install schema `%s' locale `%s': %s\n"
+msgid "WARNING: failed to install schema `%s', locale `%s': %s\n"
 msgstr ""
 
 #: ../gconf/gconftool.c:3692
@@ -2353,7 +2357,7 @@ msgstr ""
 
 #: ../gconf/gconftool.c:3702
 #, c-format
-msgid "WARNING: failed to uninstall schema `%s' locale `%s': %s\n"
+msgid "WARNING: failed to uninstall schema `%s', locale `%s': %s\n"
 msgstr ""
 
 #: ../gconf/gconftool.c:3710
@@ -2398,8 +2402,8 @@ msgstr ""
 
 #: ../gconf/gconftool.c:3888
 #, c-format
-msgid "Error syncing config data: %s"
-msgstr "Error de sincronisacion de las donadas de configuracion : %s"
+msgid "Error syncing configuration data: %s"
+msgstr ""
 
 #: ../gconf/gconftool.c:3904
 #, c-format
@@ -2444,3 +2448,4 @@ msgid ""
 "directory:\n"
 "  %s\n"
 msgstr ""
+