You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2016/01/06 14:59:39 UTC
svn commit: r1723328 -
/subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/logic.c
Author: stefan2
Date: Wed Jan 6 13:59:39 2016
New Revision: 1723328
URL: http://svn.apache.org/viewvc?rev=1723328&view=rev
Log:
* tools/client-side/svn-mergeinfo-normalizer/logic.c
(show_elision_result,
show_obsoletes_summary): I can ze english good.
Modified:
subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/logic.c
Modified: subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/logic.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/logic.c?rev=1723328&r1=1723327&r2=1723328&view=diff
==============================================================================
--- subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/logic.c (original)
+++ subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/logic.c Wed Jan 6 13:59:39 2016
@@ -1341,10 +1341,10 @@ show_elision_result(svn_mergeinfo_t pare
if (parent_mergeinfo)
SVN_ERR(svn_cmdline_printf(scratch_pool,
_("\n Sub-tree merge info cannot be elided due to "
- "the following branche(s):\n")));
+ "the following branch(es):\n")));
else
SVN_ERR(svn_cmdline_printf(scratch_pool,
- _("\n Merge info kept for the following branche(s):\n")));
+ _("\n Merge info kept for the following branch(es):\n")));
sorted_mi = svn_sort__hash(subtree_mergeinfo,
svn_sort_compare_items_lexically,
@@ -1608,7 +1608,7 @@ show_obsoletes_summary(svn_min__branch_l
iterpool = svn_pool_create(scratch_pool);
SVN_ERR(svn_cmdline_printf(iterpool,
- _("\nEncountered %d missing branche(s):\n"),
+ _("\nEncountered %d missing branch(es):\n"),
paths->nelts));
for (i = 0; i < paths->nelts; ++i)
{