From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 13 Jul 2016 18:24:10 +0000 (-0700)
Subject: Merge branch 'va/i18n-even-more'
X-Git-Tag: v2.10.0-rc0~130
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2703572b3a005848ed058d2775fb933a17ac3656;p=git

Merge branch 'va/i18n-even-more'

More markings of messages for i18n, with updates to various tests
to pass GETTEXT_POISON tests.

One patch from the original submission dropped due to conflicts
with jk/upload-pack-hook, which is still in flux.

* va/i18n-even-more: (38 commits)
  t5541: become resilient to GETTEXT_POISON
  i18n: branch: mark comment when editing branch description for translation
  i18n: unmark die messages for translation
  i18n: submodule: escape shell variables inside eval_gettext
  i18n: submodule: join strings marked for translation
  i18n: init-db: join message pieces
  i18n: remote: allow translations to reorder message
  i18n: remote: mark URL fallback text for translation
  i18n: standardise messages
  i18n: sequencer: add period to error message
  i18n: merge: change command option help to lowercase
  i18n: merge: mark messages for translation
  i18n: notes: mark options for translation
  i18n: notes: mark strings for translation
  i18n: transport-helper.c: change N_() call to _()
  i18n: bisect: mark strings for translation
  t5523: use test_i18ngrep for negation
  t4153: fix negated test_i18ngrep call
  t9003: become resilient to GETTEXT_POISON
  tests: unpack-trees: update to use test_i18n* functions
  ...
---

2703572b3a005848ed058d2775fb933a17ac3656
diff --cc builtin/apply.c
index 7fc5c3e307,205c9f8f33..1a488f9e88
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@@ -3357,9 -3224,9 +3357,9 @@@ static int load_patch_target(struct app
  			     const char *name,
  			     unsigned expected_mode)
  {
 -	if (cached || check_index) {
 +	if (state->cached || state->check_index) {
  		if (read_file_or_gitlink(ce, buf))
- 			return error(_("read of %s failed"), name);
+ 			return error(_("failed to read %s"), name);
  	} else if (name) {
  		if (S_ISGITLINK(expected_mode)) {
  			if (ce)
diff --cc git-sh-setup.sh
index 85db5f1c63,2eda134800..0c34aa62f6
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@@ -341,10 -372,10 +372,10 @@@ git_dir_init () 
  		}
  	fi
  	test -n "$GIT_DIR" && GIT_DIR=$(cd "$GIT_DIR" && pwd) || {
- 		echo >&2 "Unable to determine absolute path of git directory"
+ 		gettextln "Unable to determine absolute path of git directory" >&2
  		exit 1
  	}
 -	: ${GIT_OBJECT_DIRECTORY="$(git rev-parse --git-path objects)"}
 +	: "${GIT_OBJECT_DIRECTORY="$(git rev-parse --git-path objects)"}"
  }
  
  if test -z "$NONGIT_OK"