From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Sep 2014 18:38:40 +0000 (-0700)
Subject: Merge branch 'mr/mark-i18n-log-rerere'
X-Git-Tag: v2.2.0-rc0~99
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/49fb13bef188fdba6fc4eb2266f79808168e4ebe?ds=inline;hp=-c

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
---

49fb13bef188fdba6fc4eb2266f79808168e4ebe
diff --combined builtin/log.c
index e4d812208d,dd9f2436ca..4ea71fee68
--- a/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)