Author: julianfoad
Date: Thu Jul 28 16:11:17 2011
New Revision: 1151906
URL: http://svn.apache.org/viewvc?rev=1151906&view=rev
Log:
* subversion/svn/notify.c
(notify): Use separate complete strings so they can be translated.
A follow-up to r1099992.
Modified:
subversion/trunk/subversion/svn/notify.c
Modified: subversion/trunk/subversion/svn/notify.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/notify.c?rev=1151906&r1=1151905&r2=1151906&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/notify.c (original)
+++ subversion/trunk/subversion/svn/notify.c Thu Jul 28 16:11:17 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;
