Merge branch 'ap/git-svn-propset-doc' into maint

diff --git a/builtin/rm.c b/builtin/rm.c
index be83c4347a9cd6fdd6a76a9575f8e39a5b2bd6c2..8abb0207fa8e4da05ea447ae4e58c8e54c97c35b 100644 (file)
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -152,7 +152,7 @@ static int check_local_mod(unsigned char *head, int index_only)
 
                if (lstat(ce->name, &st) < 0) {
                        if (errno != ENOENT && errno != ENOTDIR)
-                               warning("'%s': %s", ce->name, strerror(errno));
+                               warning_errno(_("failed to stat '%s'"), ce->name);
                        /* It already vanished from the working tree */
                        continue;
                }