Merge branch 'jx/i18n-branch-error-messages' into next
commit630c2117d6a92f48910bfc4663f752cfaa0b30fa
authorJunio C Hamano <gitster@pobox.com>
Thu, 18 Apr 2013 21:05:01 +0000 (18 14:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 18 Apr 2013 21:05:01 +0000 (18 14:05 -0700)
tree7ea2e4883d0c53cd300ac59ff2b4a10ce7ff02bb
parent3208f440fff6c9d79f51afaba3bbf1eaf048518e
parentbc554df8c90e3592e8cd70460032b524fb6f03bc
Merge branch 'jx/i18n-branch-error-messages' into next

* jx/i18n-branch-error-messages:
  i18n: branch: mark strings for translation