Author: svn-role
Date: Wed May 1 04:01:26 2013
New Revision: 1477905
URL: http://svn.apache.org/r1477905
Log:
Merge r1476607 from trunk:
* r1476607
Some svnadmin command help copy-editing.
Justification:
For users, consistency; for translators, fewer mismatches.
Votes:
+1 (non-binding): mattiase
+1: danielsh, cmpilato, julianfoad
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/svnadmin/svnadmin.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1476607
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1477905&r1=1477904&r2=1477905&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed May 1 04:01:26 2013
@@ -80,14 +80,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1476607
- Some svnadmin command help copy-editing.
- Justification:
- For users, consistency; for translators, fewer mismatches.
- Votes:
- +1 (non-binding): mattiase
- +1: danielsh, cmpilato, julianfoad
-
* r1477359
Fix broken localisation of a string.
Justification:
Modified: subversion/branches/1.8.x/subversion/svnadmin/svnadmin.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/svnadmin/svnadmin.c?rev=1477905&r1=1477904&r2=1477905&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/svnadmin/svnadmin.c (original)
+++ subversion/branches/1.8.x/subversion/svnadmin/svnadmin.c Wed May 1
04:01:26 2013
@@ -358,7 +358,7 @@ static const svn_opt_subcommand_desc2_t
{"hotcopy", subcommand_hotcopy, {0}, N_
("usage: svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH\n\n"
- "Makes a hot copy of a repository.\n"
+ "Make a hot copy of a repository.\n"
"If --incremental is passed, data which already exists at the
destination\n"
"is not copied again. Incremental mode is implemented for FSFS
repositories.\n"),
{svnadmin__clean_logs, svnadmin__incremental} },
@@ -461,7 +461,7 @@ static const svn_opt_subcommand_desc2_t
{"unlock", subcommand_unlock, {0}, N_
("usage: svnadmin unlock REPOS_PATH LOCKED_PATH USERNAME TOKEN\n\n"
- "Unlocked LOCKED_PATH (as USERNAME) after verifying that the token\n"
+ "Unlock LOCKED_PATH (as USERNAME) after verifying that the token\n"
"associated with the lock matches TOKEN. Use --bypass-hooks to avoid\n"
"triggering the pre-unlock and post-unlock hook scripts.\n"),
{svnadmin__bypass_hooks} },
@@ -481,7 +481,7 @@ static const svn_opt_subcommand_desc2_t
{"verify", subcommand_verify, {0}, N_
("usage: svnadmin verify REPOS_PATH\n\n"
- "Verifies the data stored in the repository.\n"),
+ "Verify the data stored in the repository.\n"),
{'t', 'r', 'q', 'M'} },
{ NULL, NULL, {0}, NULL, {0} }
