Merge branch 'ab/dynamic-gettext-poison'

Our testing framework uses a special i18n "poisoned localization"
feature to find messages that ought to stay constant but are
incorrectly marked to be translated.  This feature has been made
into a runtime option (it used to be a compile-time option).

* ab/dynamic-gettext-poison:
Makefile: ease dynamic-gettext-poison transition
i18n: make GETTEXT_POISON a runtime option

diff --cc .travis.yml
index a5a82d6832563d48d8e7895e9a9656cea43b97b2,4523a2e5ec4acf4f8885710364bb3763ac2af3f7..03c8e4c613015476fffe3f1e071c0c9d6609df0e
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -12,9 -14,19 +12,9 @@@ compiler
    - clang
    - gcc
  
 -addons:
 -  apt:
 -    sources:
 -    - ubuntu-toolchain-r-test
 -    packages:
 -    - language-pack-is
 -    - git-svn
 -    - apache2
 -    - gcc-8
 -
  matrix:
    include:
-     - env: jobname=GETTEXT_POISON
+     - env: jobname=GIT_TEST_GETTEXT_POISON
        os: linux
        compiler:
        addons:

diff --cc Makefile
Simple merge

diff --cc t/README
Simple merge

diff --cc t/t3406-rebase-message.sh
Simple merge

diff --cc t/test-lib-functions.sh
Simple merge

diff --cc t/test-lib.sh
Simple merge