From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 27 Dec 2016 08:11:40 +0000 (-0800)
Subject: Merge branch 'va/i18n-perl-scripts'
X-Git-Tag: v2.12.0-rc0~106
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1d73f8e86d7b4d95e0b7ce53eec2a5f8114722ac;p=thirdparty%2Fgit.git

Merge branch 'va/i18n-perl-scripts'

Porcelain scripts written in Perl are getting internationalized.

* va/i18n-perl-scripts:
  i18n: difftool: mark warnings for translation
  i18n: send-email: mark composing message for translation
  i18n: send-email: mark string with interpolation for translation
  i18n: send-email: mark warnings and errors for translation
  i18n: send-email: mark strings for translation
  i18n: add--interactive: mark status words for translation
  i18n: add--interactive: remove %patch_modes entries
  i18n: add--interactive: mark edit_hunk_manually message for translation
  i18n: add--interactive: i18n of help_patch_cmd
  i18n: add--interactive: mark patch prompt for translation
  i18n: add--interactive: mark plural strings
  i18n: clean.c: match string with git-add--interactive.perl
  i18n: add--interactive: mark strings with interpolation for translation
  i18n: add--interactive: mark simple here-documents for translation
  i18n: add--interactive: mark strings for translation
  Git.pm: add subroutines for commenting lines
---

1d73f8e86d7b4d95e0b7ce53eec2a5f8114722ac