Author: hwright
Date: Mon Aug 8 11:31:10 2011
New Revision: 1154923
URL: http://svn.apache.org/viewvc?rev=1154923&view=rev
Log:
Merge r1151906 from trunk:
* r1151906
Allow proper translation of some messages.
Votes:
+1: arfrever, rhuijben, julianfoad
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/svn/notify.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 8 11:31:10 2011
@@ -55,4 +55,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154023,1154121,1154461
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154023,1154121,1154461
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1154923&r1=1154922&r2=1154923&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Mon Aug 8 11:31:10 2011
@@ -194,8 +194,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1151906
- Allow proper translation of some messages.
- Votes:
- +1: arfrever, rhuijben, julianfoad
Modified: subversion/branches/1.7.x/subversion/svn/notify.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/svn/notify.c?rev=1154923&r1=1154922&r2=1154923&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/svn/notify.c (original)
+++ subversion/branches/1.7.x/subversion/svn/notify.c Mon Aug 8 11:31:10 2011
@@ -697,9 +697,9 @@ notify(void *baton, const svn_wc_notify_
case svn_wc_notify_commit_modified:
/* xgettext: Align the %s's on this and the following 4 messages */
if ((err = svn_cmdline_printf(pool,
- _("Sending %s %s\n"),
nb->is_wc_to_repos_copy
- ? _("copy of") : "",
+ ? _("Sending copy of %s\n")
+ : _("Sending %s\n"),
path_local)))
goto print_error;
break;
@@ -709,27 +709,28 @@ notify(void *baton, const svn_wc_notify_
if (n->mime_type && svn_mime_type_is_binary(n->mime_type))
{
if ((err = svn_cmdline_printf(pool,
- _("Adding %s (bin) %s\n"),
nb->is_wc_to_repos_copy
- ? _("copy of") : "",
+ ? _("Adding copy of (bin) %s\n")
+ : _("Adding (bin) %s\n"),
path_local)))
goto print_error;
}
else
{
if ((err = svn_cmdline_printf(pool,
- _("Adding %s %s\n"),
nb->is_wc_to_repos_copy
- ? _("copy of") : "",
+ ? _("Adding copy of %s\n")
+ : _("Adding %s\n"),
path_local)))
goto print_error;
}
break;
case svn_wc_notify_commit_deleted:
- if ((err = svn_cmdline_printf(pool, _("Deleting %s %s\n"),
+ if ((err = svn_cmdline_printf(pool,
nb->is_wc_to_repos_copy
- ? _("copy of") : "",
+ ? _("Deleting copy of %s\n")
+ : _("Deleting %s\n"),
path_local)))
goto print_error;
break;
@@ -737,9 +738,9 @@ notify(void *baton, const svn_wc_notify_
case svn_wc_notify_commit_replaced:
case svn_wc_notify_commit_copied_replaced:
if ((err = svn_cmdline_printf(pool,
- _("Replacing %s %s\n"),
nb->is_wc_to_repos_copy
- ? _("copy of") : "",
+ ? _("Replacing copy of %s\n")
+ : _("Replacing %s\n"),
path_local)))
goto print_error;
break;
