Merge branch 'va/i18n-more'
authorJunio C Hamano <gitster@pobox.com>
Mon, 26 Sep 2016 23:09:17 +0000 (16:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 26 Sep 2016 23:09:18 +0000 (16:09 -0700)
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

1  2 
connect.c
diff.c
notes-merge.c
t/t5512-ls-remote.sh
diff --cc connect.c
index 7224b5ecc79beebe3182b301bdf0e661f6a246fd,06bff0b48acbc962c7d1ca52c6b4a5e6096a21f2..d99d6435fd01754e3b0f23537d7e1b385a26f262
+++ 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)
diff --cc diff.c
Simple merge
diff --cc notes-merge.c
Simple merge
Simple merge