Sync with 2.19.1

diff --git a/builtin/rerere.c b/builtin/rerere.c
index 0bc40298c2417a6d1f25aafb4b3577243e985c57..5ed941b91f2c1498a3f28f0c6415437f79133432 100644 (file)
--- a/builtin/rerere.c
+++ b/builtin/rerere.c
@@ -75,7 +75,7 @@ int cmd_rerere(int argc, const char **argv, const char *prefix)
        if (!strcmp(argv[0], "forget")) {
                struct pathspec pathspec;
                if (argc < 2)
-                       warning("'git rerere forget' without paths is deprecated");
+                       warning(_("'git rerere forget' without paths is deprecated"));
                parse_pathspec(&pathspec, 0, PATHSPEC_PREFER_CWD,
                               prefix, argv + 1);
                return rerere_forget(&pathspec);
@@ -107,7 +107,7 @@ int cmd_rerere(int argc, const char **argv, const char *prefix)
                        const char *path = merge_rr.items[i].string;
                        const struct rerere_id *id = merge_rr.items[i].util;
                        if (diff_two(rerere_path(id, "preimage"), path, path, path))
-                               die("unable to generate diff for %s", rerere_path(id, NULL));
+                               die(_("unable to generate diff for '%s'"), rerere_path(id, NULL));
                }
        } else
                usage_with_options(rerere_usage, options);