Merge branch 'tr/do-not-call-submodules-subprojects'

diff --git a/builtin/apply.c b/builtin/apply.c
index ff01ebff3d29516cdffa315ae564b2b75e7d5164..240a05c2d209478dc0d825ec07e636b50738bbf2 100644 (file)
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -3847,7 +3847,7 @@ static void add_index_file(const char *path, unsigned mode, void *buf, unsigned
                const char *s = buf;
 
                if (get_sha1_hex(s + strlen("Subproject commit "), ce->sha1))
-                       die(_("corrupt patch for subproject %s"), path);
+                       die(_("corrupt patch for submodule %s"), path);
        } else {
                if (!cached) {
                        if (lstat(path, &st) < 0)