From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 26 Sep 2016 23:09:17 +0000 (-0700)
Subject: Merge branch 'va/i18n-more'
X-Git-Tag: v2.11.0-rc0~112
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=8969feac7ee119dc3cdae0e2d8c65516aa8f4045;p=git.git

Merge branch 'va/i18n-more'

Even more i18n.

* va/i18n-more:
  i18n: stash: mark messages for translation
  i18n: notes-merge: mark die messages for translation
  i18n: ident: mark hint for translation
  i18n: i18n: diff: mark die messages for translation
  i18n: connect: mark die messages for translation
  i18n: commit: mark message for translation
---

8969feac7ee119dc3cdae0e2d8c65516aa8f4045
diff --cc connect.c
index 7224b5ecc7,06bff0b48a..d99d6435fd
--- a/connect.c
+++ b/connect.c
@@@ -43,14 -43,14 +43,14 @@@ int check_ref_type(const struct ref *re
  	return check_ref(ref->name, flags);
  }
  
 -static void die_initial_contact(int got_at_least_one_head)
 +static void die_initial_contact(int unexpected)
  {
 -	if (got_at_least_one_head)
 +	if (unexpected)
- 		die("The remote end hung up upon initial contact");
+ 		die(_("The remote end hung up upon initial contact"));
  	else
- 		die("Could not read from remote repository.\n\n"
- 		    "Please make sure you have the correct access rights\n"
- 		    "and the repository exists.");
+ 		die(_("Could not read from remote repository.\n\n"
+ 		      "Please make sure you have the correct access rights\n"
+ 		      "and the repository exists."));
  }
  
  static void parse_one_symref_info(struct string_list *symref, const char *val, int len)