diff options
| author | Danilo Šegan <dsegan@gmx.net> | 2004-08-07 09:16:42 +0000 |
|---|---|---|
| committer | Danilo Šegan <danilo@src.gnome.org> | 2004-08-07 09:16:42 +0000 |
| commit | 227d926a72191cd1e611988b3fbb85559f109bc3 (patch) | |
| tree | 6d094611de70f65f0ee4f88be23e218a3ffc5219 | |
| parent | a0f9c1db4efb8d4ddadc78c06df0bd5324e1e9d3 (diff) | |
| download | gconf-227d926a72191cd1e611988b3fbb85559f109bc3.tar.gz | |
Fixes bug #149518.
2004-08-07 Danilo Šegan <dsegan@gmx.net>
Fixes bug #149518.
* gconf/gconftool.c (options): s/dir/directory/ s/standard out/standard output/.
* gconf/gconfd.c (main): s/fd/file descriptor/.
* gconf/gconf-sources.c (gconf_sources_new_from_addresses): s/config/configuration/.
* backends/markup-tree.c (parse_value_element): s/car_type/first-element/.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | backends/markup-tree.c | 2 | ||||
| -rw-r--r-- | gconf/gconf-sources.c | 4 | ||||
| -rw-r--r-- | gconf/gconfd.c | 2 | ||||
| -rw-r--r-- | gconf/gconftool.c | 6 |
5 files changed, 16 insertions, 7 deletions
@@ -1,3 +1,12 @@ +2004-08-07 Danilo Šegan <dsegan@gmx.net> + + Fixes bug #149518. + + * gconf/gconftool.c (options): s/dir/directory/ s/standard out/standard output/. + * gconf/gconfd.c (main): s/fd/file descriptor/. + * gconf/gconf-sources.c (gconf_sources_new_from_addresses): s/config/configuration/. + * backends/markup-tree.c (parse_value_element): s/car_type/first-element/. + 2004-08-03 Mark McLoughlin <mark@skynet.ie> * configure.in: post-release bump to 2.7.91. diff --git a/backends/markup-tree.c b/backends/markup-tree.c index a34e068b..8aa25de0 100644 --- a/backends/markup-tree.c +++ b/backends/markup-tree.c @@ -2339,7 +2339,7 @@ parse_value_element (GMarkupParseContext *context, case GCONF_VALUE_PAIR: case GCONF_VALUE_SCHEMA: set_error (error, context, GCONF_ERROR_PARSE_ERROR, - _("Invalid car_type \"%s\" on <%s>"), + _("Invalid first-element type \"%s\" on <%s>"), car_type, element_name); return; break; diff --git a/gconf/gconf-sources.c b/gconf/gconf-sources.c index bd14170d..89be24b7 100644 --- a/gconf/gconf-sources.c +++ b/gconf/gconf-sources.c @@ -405,13 +405,13 @@ gconf_sources_new_from_addresses(GSList * addresses, GError** err) { some_writable = TRUE; gconf_log (GCL_INFO, - _("Resolved address \"%s\" to a writable config source at position %d"), + _("Resolved address \"%s\" to a writable configuration source at position %d"), source->address, i); } else if (source->flags & GCONF_SOURCE_NEVER_WRITEABLE) { gconf_log (GCL_INFO, - _("Resolved address \"%s\" to a read-only config source at position %d"), + _("Resolved address \"%s\" to a read-only configuration source at position %d"), source->address, i); } else diff --git a/gconf/gconfd.c b/gconf/gconfd.c index 7289aa9a..b115eeb1 100644 --- a/gconf/gconfd.c +++ b/gconf/gconfd.c @@ -726,7 +726,7 @@ main(int argc, char** argv) char buf[1] = { 'g' }; if (write (write_byte_fd, buf, 1) != 1) { - gconf_log (GCL_ERR, _("Failed to write byte to pipe fd %d so client program may hang: %s"), write_byte_fd, g_strerror (errno)); + gconf_log (GCL_ERR, _("Failed to write byte to pipe file descriptor %d so client program may hang: %s"), write_byte_fd, g_strerror (errno)); } close (write_byte_fd); diff --git a/gconf/gconftool.c b/gconf/gconftool.c index ba543958..1a0aae5e 100644 --- a/gconf/gconftool.c +++ b/gconf/gconftool.c @@ -156,7 +156,7 @@ struct poptOption options[] = { POPT_ARG_NONE, &dump_values, 0, - N_("Dump to standard out an XML description of all entries under a dir, recursively."), + N_("Dump to standard output an XML description of all entries under a directory, recursively."), NULL }, { @@ -165,7 +165,7 @@ struct poptOption options[] = { POPT_ARG_STRING, &entry_file, 0, - N_("Load from the specified file an XML description of values and set them relative to a dir."), + N_("Load from the specified file an XML description of values and set them relative to a directory."), NULL }, { @@ -183,7 +183,7 @@ struct poptOption options[] = { POPT_ARG_NONE, &recursive_list, 0, - N_("Print all subdirectories and entries under a dir, recursively."), + N_("Print all subdirectories and entries under a directory, recursively."), NULL }, { |