subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1477906 - in /subversion/branches/1.8.x: ./ STATUS subversion/libsvn_wc/props.c
Date Wed, 01 May 2013 04:01:32 GMT
Author: svn-role
Date: Wed May  1 04:01:32 2013
New Revision: 1477906

URL: http://svn.apache.org/r1477906
Log:
Merge r1477359 from trunk:

 * r1477359
   Fix broken localisation of a string.
   Justification:
     Allows string to be localised. Fewer translation file mismatches.
   Votes:
     +1 (non-binding): mattiase
     +1: danielsh, philip, julianfoad

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/STATUS
    subversion/branches/1.8.x/subversion/libsvn_wc/props.c

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1477359

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1477906&r1=1477905&r2=1477906&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed May  1 04:01:32 2013
@@ -79,11 +79,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * r1477359
-   Fix broken localisation of a string.
-   Justification:
-     Allows string to be localised. Fewer translation file mismatches.
-   Votes:
-     +1 (non-binding): mattiase
-     +1: danielsh, philip, julianfoad

Modified: subversion/branches/1.8.x/subversion/libsvn_wc/props.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_wc/props.c?rev=1477906&r1=1477905&r2=1477906&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_wc/props.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_wc/props.c Wed May  1 04:01:32 2013
@@ -1626,9 +1626,9 @@ validate_eol_prop_against_file(const cha
   if (mime_type && svn_mime_type_is_binary(mime_type->data))
     return svn_error_createf
       (SVN_ERR_ILLEGAL_TARGET, NULL,
-       _("Can't set '" SVN_PROP_EOL_STYLE "': "
+       _("Can't set '%s': "
          "file '%s' has binary mime type property"),
-       path_display);
+       SVN_PROP_EOL_STYLE, path_display);
 
   /* Now ask the getter for the contents of the file; this will do a
      newline translation.  All we really care about here is whether or



Mime
View raw message