Merge branch 'ab/enable-i18n'

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

Conflicts:
	Makefile

1 files changed, 2 insertions, 0 deletions

diff --git a/git.c b/git.c
index 250f448..fb9029c 100644
--- a/git.c
+++ b/git.c
@@ -538,6 +538,8 @@ int main(int argc, const char **argv)
 	if (!cmd)
 		cmd = "git-help";
 
+	git_setup_gettext();
+
 	/*
 	 * "git-xxxx" is the same as "git xxxx", but we obviously:
 	 *