Merge branch 'ab/enable-i18n'

* ab/enable-i18n:
  i18n: add infrastructure for translating Git with gettext

Conflicts:
	Makefile

diff --cc Makefile
index 898278d58bf972a42bc8b8deb5a7dcf93b23df9f,08b92970843cd453f344954964b7d78c202a0db7..9470a1034396a5f3ee36c5d0e6ffc54e21bb3820
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -639,7 -639,7 +657,8 @@@ LIB_OBJS += entry.
  LIB_OBJS += environment.o
  LIB_OBJS += exec_cmd.o
  LIB_OBJS += fsck.o
 +LIB_OBJS += gpg-interface.o
+ LIB_OBJS += gettext.o
  LIB_OBJS += graph.o
  LIB_OBJS += grep.o
  LIB_OBJS += hash.o
@@@ -2222,8 -2250,8 +2288,9 @@@ endi
  ifdef GIT_TEST_CMP_USE_COPIED_CONTEXT
        @echo GIT_TEST_CMP_USE_COPIED_CONTEXT=YesPlease >>$@
  endif
+       @echo NO_GETTEXT=\''$(subst ','\'',$(subst ','\'',$(NO_GETTEXT)))'\' >>$@
        @echo GETTEXT_POISON=\''$(subst ','\'',$(subst ','\'',$(GETTEXT_POISON)))'\' >>$@
 +      @echo NO_UNIX_SOCKETS=\''$(subst ','\'',$(subst ','\'',$(NO_UNIX_SOCKETS)))'\' >>$@
  
  ### Detect Tck/Tk interpreter path changes
  ifndef NO_TCLTK

diff --cc fast-import.c
Simple merge

diff --cc git.c
Simple merge

diff --cc http-fetch.c
Simple merge

diff --cc http-push.c
Simple merge

diff --cc imap-send.c
Simple merge

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