From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 20 Dec 2011 00:06:41 +0000 (-0800)
Subject: Merge branch 'ab/enable-i18n'
X-Git-Tag: v1.7.9-rc0~42
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2dccad3c6f9df2b1eea7eb5617e2748a7f2daa40;p=git.git

Merge branch 'ab/enable-i18n'

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

Conflicts:
	Makefile
---

2dccad3c6f9df2b1eea7eb5617e2748a7f2daa40
diff --cc Makefile
index 898278d58,08b929708..9470a1034
--- a/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