Merge branch 'mr/mark-i18n-log-rerere'

* mr/mark-i18n-log-rerere:
builtin/log.c: mark strings for translation
rerere.h: mark string for translation

diff --combined builtin/log.c
index e4d812208d8844b9155739acfd59ef840f24a4ae,dd9f2436caa0a85575b3289aec5275263850ac3e..4ea71fee6819e4d94812e64cc20cbf1027655013
--- 1/builtin/log.c
--- 2/builtin/log.c
+++ b/builtin/log.c
@@@ -78,7 -78,7 +78,7 @@@ static int decorate_callback(const stru
                decoration_style = DECORATE_SHORT_REFS;
  
        if (decoration_style < 0)
-               die("invalid --decorate option: %s", arg);
+               die(_("invalid --decorate option: %s"), arg);
  
        decoration_given = 1;
  
@@@ -130,7 -130,7 +130,7 @@@ static void cmd_log_init_finish(int arg
                { OPTION_CALLBACK, 0, "decorate", NULL, NULL, N_("decorate options"),
                  PARSE_OPT_OPTARG, decorate_callback},
                OPT_CALLBACK('L', NULL, &line_cb, "n,m:file",
-                            "Process line range n,m in file, counting from 1",
+                            N_("Process line range n,m in file, counting from 1"),
                             log_line_range_callback),
                OPT_END()
        };
@@@ -150,7 -150,7 +150,7 @@@
  
        /* Any arguments at this point are not recognized */
        if (argc > 1)
-               die("unrecognized argument: %s", argv[1]);
+               die(_("unrecognized argument: %s"), argv[1]);
  
        memset(&w, 0, sizeof(w));
        userformat_find_requirements(NULL, &w);
@@@ -447,13 -447,13 +447,13 @@@ static int show_blob_object(const unsig
                return stream_blob_to_fd(1, sha1, NULL, 0);
  
        if (get_sha1_with_context(obj_name, 0, sha1c, &obj_context))
-               die("Not a valid object name %s", obj_name);
+               die(_("Not a valid object name %s"), obj_name);
        if (!obj_context.path[0] ||
            !textconv_object(obj_context.path, obj_context.mode, sha1c, 1, &buf, &size))
                return stream_blob_to_fd(1, sha1, NULL, 0);
  
        if (!buf)
-               die("git show %s: bad file", obj_name);
+               die(_("git show %s: bad file"), obj_name);
  
        write_or_die(1, buf, size);
        return 0;
@@@ -864,7 -864,6 +864,7 @@@ static void add_branch_description(stru
                strbuf_addbuf(buf, &desc);
                strbuf_addch(buf, '\n');
        }
 +      strbuf_release(&desc);
  }
  
  static char *find_branch_name(struct rev_info *rev)