From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 31 Jul 2012 16:41:51 +0000 (-0700)
Subject: Merge branch 'jx/i18n-1.7.11'
X-Git-Tag: v1.7.12-rc2~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5fe1484a9b89e22f14d94d5b050c39db7ad65c81;p=git.git

Merge branch 'jx/i18n-1.7.11'

Add i18n support for scripted Porcelains, and mark strings in
merge(-recursive), am, and rebase for i18n.

* jx/i18n-1.7.11:
  i18n: merge-recursive: mark strings for translation
  Remove dead code which contains bad gettext block
  i18n: am: mark more strings for translation
  rebase: remove obsolete and unused LONG_USAGE which breaks xgettext
  i18n: Rewrite gettext messages start with dash
  i18n: rebase: mark messages for translation
  i18n: New keywords for xgettext extraction from sh
---

5fe1484a9b89e22f14d94d5b050c39db7ad65c81