You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by "Peter N. Lundblad" <lu...@linux.nu> on 2004/04/23 23:11:47 UTC
[PATCH] Message tweaks
Hi,
I found some inconsistencies and errors in messages while working on the
Swedish translation. Here's a patch. It also adds _() around a few small
strings.
Enjoy!
//Peter
* subversion/clients/cmdline/main.c
* subversion/libsvn_client/diff.c
* subversion/libsvn_client/log.c
* subversion/libsvn_ra_dav/session.c
* subversion/libsvn_ra_dav/fetch.c
* subversion/libsvn_ra_dav/util.c
* subversion/libsvn_wc/props.c
* subversion/libsvn_wc/entries.c
* subversion/libsvn_wc/copy.c
* subversion/libsvn_wc/adm_crawler.c
* subversion/libsvn_wc/adm_ops.c
* subversion/libsvn_wc/update_editor.c
* subversion/svnadmin/main.c
* subversion/svnversion/main.c
Tweak messages for consistency. Some small corrections and additions of
_() around a few more ones.
Index: subversion/clients/cmdline/main.c
===================================================================
--- subversion/clients/cmdline/main.c (revision 9470)
+++ subversion/clients/cmdline/main.c (working copy)
@@ -206,7 +206,8 @@
svn_cl__editor_cmd_opt, svn_cl__encoding_opt, svn_cl__config_dir_opt} },
{ "copy", svn_cl__copy, {"cp"},
- N_("Duplicate something in working copy or repos, remembering history.\n"
+ N_("Duplicate something in working copy or repository, remembering"
+ "history.\n"
"usage: copy SRC DST\n"
"\n"
" SRC and DST can each be either a working copy (WC) path or URL:\n"
@@ -263,7 +264,7 @@
" 3. Shorthand for 'svn diff [-r N[:M]] --old=URL1 --new=URL2'\n"
"\n"
" Use just 'svn diff' to display local modifications in "
- "a working copy\n"),
+ "a working copy.\n"),
{'r', svn_cl__old_cmd_opt, svn_cl__new_cmd_opt, 'x', 'N',
svn_cl__diff_cmd_opt, svn_cl__no_diff_deleted,
svn_cl__notice_ancestry_opt, SVN_CL__AUTH_OPTIONS,
@@ -281,7 +282,7 @@
"\n"
" 2. Exports a clean directory tree from the working copy specified "
"by\n"
- " PATH1, at revision REV if it is given, otherwise at WORKING, "
+ " PATH1, at revision REV if it is given, otherwise at BASE, "
"into\n"
" PATH2. If PATH2 is omitted, the last component of the "
"PATH1 is used\n"
@@ -446,7 +447,7 @@
svn_cl__config_dir_opt} },
{ "propedit", svn_cl__propedit, {"pedit", "pe"},
- N_("Edit property PROPNAME with $EDITOR on targets.\n"
+ N_("Edit property PROPNAME with an external editor on targets.\n"
"usage: 1. propedit PROPNAME PATH...\n"
" 2. propedit PROPNAME --revprop -r REV [URL]\n"
"\n"
@@ -1018,7 +1019,7 @@
{
if (os->ind >= os->argc)
{
- fprintf (stderr, _("subcommand argument required\n"));
+ fprintf (stderr, _("Subcommand argument required\n"));
svn_cl__help (NULL, NULL, pool);
svn_pool_destroy (pool);
return EXIT_FAILURE;
@@ -1030,7 +1031,7 @@
first_arg);
if (subcommand == NULL)
{
- fprintf (stderr, _("unknown command: '%s'\n"), first_arg);
+ fprintf (stderr, _("Unknown command: '%s'\n"), first_arg);
svn_cl__help (NULL, NULL, pool);
svn_pool_destroy (pool);
return EXIT_FAILURE;
@@ -1057,7 +1058,7 @@
svn_opt_get_option_from_code (opt_id, svn_cl__options);
svn_opt_format_option (&optstr, badopt, FALSE, pool);
fprintf (stderr,
- _("subcommand '%s' doesn't accept option '%s'\n"
+ _("Subcommand '%s' doesn't accept option '%s'\n"
"Type 'svn help %s' for usage.\n"),
subcommand->name, optstr, subcommand->name);
svn_pool_destroy (pool);
Index: subversion/libsvn_client/diff.c
===================================================================
--- subversion/libsvn_client/diff.c (revision 9470)
+++ subversion/libsvn_client/diff.c (working copy)
@@ -1247,7 +1247,7 @@
{
return svn_error_create
(SVN_ERR_CLIENT_BAD_REVISION, NULL,
- "Not all required revisions specified");
+ "Not all required revisions are specified");
}
/* Establish first RA session to URL1. */
Index: subversion/libsvn_client/log.c
===================================================================
--- subversion/libsvn_client/log.c (revision 9470)
+++ subversion/libsvn_client/log.c (working copy)
@@ -301,7 +301,7 @@
/* Log receivers are free to handle revision 0 specially... But
just in case some don't, we make up a message here. */
SVN_ERR (receiver (receiver_baton,
- NULL, 0, "", "", "No commits in repository.",
+ NULL, 0, "", "", "No commits in repository",
pool));
}
}
Index: subversion/libsvn_ra_dav/session.c
===================================================================
--- subversion/libsvn_ra_dav/session.c (revision 9470)
+++ subversion/libsvn_ra_dav/session.c (working copy)
@@ -780,7 +780,7 @@
len = strlen(ras->url);
if (len <= relative_len)
return svn_error_create(APR_EGENERAL, NULL,
- _("Impossibly long relative url."));
+ _("Impossibly long relative URL"));
/* Don't strip off the extra '/' unless there is a relative path */
if (relative_len)
Index: subversion/libsvn_ra_dav/fetch.c
===================================================================
--- subversion/libsvn_ra_dav/fetch.c (revision 9470)
+++ subversion/libsvn_ra_dav/fetch.c (working copy)
@@ -461,7 +461,7 @@
{
const char *msg;
- msg = apr_psprintf(pool, _("GET request failed for %s"), url);
+ msg = apr_psprintf(pool, _("GET request failed for '%s'"), url);
if (err)
svn_error_clear (err);
err = svn_ra_dav__convert_error(sess, msg, decompress_rv);
Index: subversion/libsvn_ra_dav/util.c
===================================================================
--- subversion/libsvn_ra_dav/util.c (revision 9470)
+++ subversion/libsvn_ra_dav/util.c (working copy)
@@ -780,6 +780,6 @@
/* We either have a neon error, or some other error
that we didn't expect. */
- msg = apr_psprintf(pool, _("%s of %s"), method, url);
+ msg = apr_psprintf(pool, _("%s of '%s'"), method, url);
return svn_ra_dav__convert_error(session, msg, rv);
}
Index: subversion/libsvn_wc/props.c
===================================================================
--- subversion/libsvn_wc/props.c (revision 9470)
+++ subversion/libsvn_wc/props.c (working copy)
@@ -918,11 +918,11 @@
{
case svn_node_dir:
node_kind_prohibit = dir_prohibit;
- node_kind_text = "directory";
+ node_kind_text = _("directory");
break;
case svn_node_file:
node_kind_prohibit = file_prohibit;
- node_kind_text = "file";
+ node_kind_text = _("file");
break;
default:
return svn_error_createf (SVN_ERR_NODE_UNEXPECTED_KIND, NULL,
Index: subversion/libsvn_wc/entries.c
===================================================================
--- subversion/libsvn_wc/entries.c (revision 9470)
+++ subversion/libsvn_wc/entries.c (working copy)
@@ -828,7 +828,7 @@
return svn_error_createf
(SVN_ERR_WC_CORRUPT, NULL,
_("Corrupt working copy: '%s' in directory '%s' (which is "
- "scheduled for replacement) has in invalid schedule"),
+ "scheduled for replacement) has an invalid schedule"),
name, path);
}
Index: subversion/libsvn_wc/copy.c
===================================================================
--- subversion/libsvn_wc/copy.c (revision 9470)
+++ subversion/libsvn_wc/copy.c (working copy)
@@ -294,7 +294,7 @@
|| (src_entry->copied))
return svn_error_createf
(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- _("Not allowed to copy or move '%s': it is not in the repository yet; "
+ _("Cannot copy or move '%s': it is not in the repository yet; "
"try committing first"),
src_path);
Index: subversion/libsvn_wc/adm_crawler.c
===================================================================
--- subversion/libsvn_wc/adm_crawler.c (revision 9470)
+++ subversion/libsvn_wc/adm_crawler.c (working copy)
@@ -671,7 +671,7 @@
return svn_error_createf
(SVN_ERR_WC_CORRUPT_TEXT_BASE, NULL,
- _("Checksum mismatch for '%s': "
+ _("Checksum mismatch for '%s'; "
"expected '%s', actual: '%s'"),
tb, ent->checksum, base_digest_hex);
}
Index: subversion/libsvn_wc/adm_ops.c
===================================================================
--- subversion/libsvn_wc/adm_ops.c (revision 9470)
+++ subversion/libsvn_wc/adm_ops.c (working copy)
@@ -941,7 +941,7 @@
if (! parent_entry)
return svn_error_createf
(SVN_ERR_ENTRY_NOT_FOUND, NULL,
- _("Can't not find parent directory's entry while trying to add '%s'"),
+ _("Can't find parent directory's entry while trying to add '%s'"),
path);
if (parent_entry->schedule == svn_wc_schedule_delete)
return svn_error_createf
@@ -1193,10 +1193,10 @@
{
if ((working_props_kind == svn_node_file)
&& (err = svn_wc__prep_file_for_replacement (thing, FALSE, pool)))
- return revert_error (err, fullpath, "restoring props", pool);
+ return revert_error (err, fullpath, _("restoring props"), pool);
if ((err = svn_io_copy_file (base_thing, thing, FALSE, pool)))
- return revert_error (err, fullpath, "restoring props", pool);
+ return revert_error (err, fullpath, _("restoring props"), pool);
SVN_ERR (svn_io_file_affected_time (&tstamp, thing, pool));
entry->prop_time = tstamp;
@@ -1204,7 +1204,7 @@
else if (working_props_kind == svn_node_file)
{
if ((err = svn_io_remove_file (thing, pool)))
- return revert_error (err, fullpath, "removing props", pool);
+ return revert_error (err, fullpath, _("removing props"), pool);
}
/* Modify our entry structure. */
@@ -1228,7 +1228,7 @@
if (kind == svn_node_file)
{
if ((err = svn_io_copy_file (base_thing, thing, FALSE, pool)))
- return revert_error (err, fullpath, "restoring props", pool);
+ return revert_error (err, fullpath, _("restoring props"), pool);
SVN_ERR (svn_io_file_affected_time (&tstamp, thing, pool));
entry->prop_time = tstamp;
@@ -1268,7 +1268,7 @@
keywords,
TRUE, /* expand keywords */
pool)))
- return revert_error (err, fullpath, "restoring text", pool);
+ return revert_error (err, fullpath, _("restoring text"), pool);
/* If necessary, tweak the new working file's executable bit. */
SVN_ERR (svn_wc__maybe_set_executable (NULL, fullpath, adm_access,
Index: subversion/libsvn_wc/update_editor.c
===================================================================
--- subversion/libsvn_wc/update_editor.c (revision 9470)
+++ subversion/libsvn_wc/update_editor.c (working copy)
@@ -1002,7 +1002,7 @@
if (dir_entry && dir_entry->schedule == svn_wc_schedule_add)
return svn_error_createf
(SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
- "Failed to add dir '%s': object of the same name is already "
+ "Failed to add directory '%s': object of the same name is already "
"scheduled for addition", path);
/* Immediately create an entry for the new directory in the parent.
Index: subversion/svnadmin/main.c
===================================================================
--- subversion/svnadmin/main.c (revision 9470)
+++ subversion/svnadmin/main.c (working copy)
@@ -101,7 +101,7 @@
else if (svn_path_is_url (*repos_path))
{
return svn_error_createf (SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
- _("'%s' is an url when it should be a path"),
+ _("'%s' is an URL when it should be a path"),
*repos_path);
}
@@ -218,7 +218,7 @@
N_("read user configuration files from directory ARG")},
{"clean-logs", svnadmin__clean_logs, 0,
- N_("remove redundant log files from source repository.")},
+ N_("remove redundant log files from source repository")},
{NULL}
};
Index: subversion/svnversion/main.c
===================================================================
--- subversion/svnversion/main.c (revision 9470)
+++ subversion/svnversion/main.c (working copy)
@@ -122,7 +122,7 @@
{
fprintf
(stderr,
- _("usage: svnversion [options] wc_path [trail_url]\n\n"
+ _("usage: svnversion [OPTIONS] WC_PATH [TRAIL_URL]\n\n"
" Produce a compact \"version number\" for the working copy path\n"
" WC_PATH. TRAIL_URL is the trailing portion of the URL used to\n"
" determine if WC_PATH itself is switched (detection of switches\n"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Message tweaks
Posted by Erik Huelsmann <e....@gmx.net>.
> I thought WORKING was an incorrect name for BASE, but as I understand it
> now, WORKING is the file possibly with local modifications. So I think
> this should be reverted.
Yes; I was too fast at accepting it. Committed as r9497.
bye,
Erik.
--
NEU : GMX Internet.FreeDSL
Ab sofort DSL-Tarif ohne Grundgeb�hr: http://www.gmx.net/dsl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Message tweaks
Posted by "Peter N. Lundblad" <lu...@linux.nu>.
Hi,
Here are three more small message modifications. One is a correction of my
earlier patch where a space was removed due to splitting a string into two
lines.
BTW, wasn't this the following part of my previous patch actually wrong?
Index: subversion/clients/cmdline/main.c
===================================================================
--- subversion/clients/cmdline/main.c (revision 9470)
+++ subversion/clients/cmdline/main.c (working copy)
@@ -281,7 +282,7 @@
"\n"
" 2. Exports a clean directory tree from the working copy specified "
"by\n"
- " PATH1, at revision REV if it is given, otherwise at WORKING, "
+ " PATH1, at revision REV if it is given, otherwise at BASE, "
"into\n"
" PATH2. If PATH2 is omitted, the last component of the "
"PATH1 is used\n"
I thought WORKING was an incorrect name for BASE, but as I understand it
now, WORKING is the file possibly with local modifications. So I think
this should be reverted.
Regards,
//Peter
Re: [PATCH] Message tweaks
Posted by "Peter N. Lundblad" <lu...@linux.nu>.
On Sat, 24 Apr 2004, Erik Huelsmann wrote:
>
> After looking at the patch closer, I found that it actually combines two
> separate changes. One being the addition of _(), the other the tweaks for
> the error messages. This is normally split up into separate commits. Because
> of that it's very easy to have separate patches. I split it myself.
>
Yes. I should have thought of that myself.
> Committed in r9482; additions of _() comming later (with a few of my own).
>
Thanks.
//Peter
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Message tweaks
Posted by Erik Huelsmann <e....@gmx.net>.
After looking at the patch closer, I found that it actually combines two
separate changes. One being the addition of _(), the other the tweaks for
the error messages. This is normally split up into separate commits. Because
of that it's very easy to have separate patches. I split it myself.
Committed in r9482; additions of _() comming later (with a few of my own).
bye,
Erik.
>
> On Sat, 24 Apr 2004, Erik Huelsmann wrote:
>
> > Hi Peter,
> >
> > Thanks for the contribution. When I tried applying the patch, I had
> > conflicts though. Which is strange since your patch is generated against
> the
> > same revision I was applying against. Any idea why they occur?
> >
> No idea at all, sorry. The patch is against trunk
> (http://svn.collab.net/repos/svn/trunk/). I don't know why this would
> happen.
--
"Sie haben neue Mails!" - Die GMX Toolbar informiert Sie beim Surfen!
Jetzt aktivieren unter http://www.gmx.net/info
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Message tweaks
Posted by "Peter N. Lundblad" <lu...@linux.nu>.
On Sat, 24 Apr 2004, Erik Huelsmann wrote:
> Hi Peter,
>
> Thanks for the contribution. When I tried applying the patch, I had
> conflicts though. Which is strange since your patch is generated against the
> same revision I was applying against. Any idea why they occur?
>
No idea at all, sorry. The patch is against trunk
(http://svn.collab.net/repos/svn/trunk/). I don't know why this would
happen.
Thansk for taking the time.
Regards,
//Peter
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Message tweaks
Posted by Erik Huelsmann <e....@gmx.net>.
Hi Peter,
Thanks for the contribution. When I tried applying the patch, I had
conflicts though. Which is strange since your patch is generated against the
same revision I was applying against. Any idea why they occur?
(still reading the rest of the patch)
bye,
Erik.
These are the rej files (sorry for the wrapping):
subversion/libsvn_wc/adm_ops.c.rej
***************
*** 1228,1234 ****
if (kind == svn_node_file)
{
if ((err = svn_io_copy_file (base_thing, thing, FALSE, pool)))
- return revert_error (err, fullpath, "restoring props", pool);
SVN_ERR (svn_io_file_affected_time (&tstamp, thing, pool));
entry->prop_time = tstamp;
--- 1228,1234 ----
if (kind == svn_node_file)
{
if ((err = svn_io_copy_file (base_thing, thing, FALSE, pool)))
+ return revert_error (err, fullpath, _("restoring props"),
pool);
SVN_ERR (svn_io_file_affected_time (&tstamp, thing, pool));
entry->prop_time = tstamp;
subversion/libsvn_client/diff.c.rej:
***************
*** 1247,1253 ****
{
return svn_error_create
(SVN_ERR_CLIENT_BAD_REVISION, NULL,
- "Not all required revisions specified");
}
/* Establish first RA session to URL1. */
--- 1247,1253 ----
{
return svn_error_create
(SVN_ERR_CLIENT_BAD_REVISION, NULL,
+ "Not all required revisions are specified");
}
/* Establish first RA session to URL1. */
subversion/svnversion/main.c.rej
***************
*** 122,128 ****
{
fprintf
(stderr,
- _("usage: svnversion [options] wc_path [trail_url]\n\n"
" Produce a compact \"version number\" for the working copy
path\n"
" WC_PATH. TRAIL_URL is the trailing portion of the URL used
to\n"
" determine if WC_PATH itself is switched (detection of
switches\n"
--- 122,128 ----
{
fprintf
(stderr,
+ _("usage: svnversion [OPTIONS] WC_PATH [TRAIL_URL]\n\n"
" Produce a compact \"version number\" for the working copy
path\n"
" WC_PATH. TRAIL_URL is the trailing portion of the URL used
to\n"
" determine if WC_PATH itself is switched (detection of
switches\n"
> Hi,
>
> I found some inconsistencies and errors in messages while working on the
> Swedish translation. Here's a patch. It also adds _() around a few small
> strings.
>
> Enjoy!
> //Peter
>
> * subversion/clients/cmdline/main.c
> * subversion/libsvn_client/diff.c
> * subversion/libsvn_client/log.c
> * subversion/libsvn_ra_dav/session.c
> * subversion/libsvn_ra_dav/fetch.c
> * subversion/libsvn_ra_dav/util.c
> * subversion/libsvn_wc/props.c
> * subversion/libsvn_wc/entries.c
> * subversion/libsvn_wc/copy.c
> * subversion/libsvn_wc/adm_crawler.c
> * subversion/libsvn_wc/adm_ops.c
> * subversion/libsvn_wc/update_editor.c
> * subversion/svnadmin/main.c
> * subversion/svnversion/main.c
> Tweak messages for consistency. Some small corrections and additions of
> _() around a few more ones.
--
NEU : GMX Internet.FreeDSL
Ab sofort DSL-Tarif ohne Grundgeb�hr: http://www.gmx.net/dsl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org