Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
handle_duplicate(): mark error message for translation
author
Michael Haggerty
<mhagger@alum.mit.edu>
Wed, 30 Oct 2013 05:33:11 +0000
(06:33 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 30 Oct 2013 21:16:42 +0000
(14:16 -0700)
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
remote.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
df02ebd
)
diff --git
a/remote.c
b/remote.c
index 4bed101da618e491ebeb31c0a31cd86654afa504..0848faffa48b350465ff4aacda74641d1a0c921b 100644
(file)
--- a/
remote.c
+++ b/
remote.c
@@
-748,7
+748,7
@@
int for_each_remote(each_remote_fn fn, void *priv)
static void handle_duplicate(struct ref *ref1, struct ref *ref2)
{
if (strcmp(ref1->name, ref2->name))
- die(
"%s tracks both %s and %s"
,
+ die(
_("%s tracks both %s and %s")
,
ref2->peer_ref->name, ref1->name, ref2->name);
free(ref2->peer_ref);
free(ref2);