summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-12-27 00:11:40 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-12-27 00:11:40 -0800
commit1d73f8e86d7b4d95e0b7ce53eec2a5f8114722ac (patch)
tree943d4c5dd8f366e610f08ce92fcb5d76291d72f0 /git-mergetool--lib.sh
parentMerge branch 'sb/submodule-config-cleanup' (diff)
parenti18n: difftool: mark warnings for translation (diff)
downloadtgif-1d73f8e86d7b4d95e0b7ce53eec2a5f8114722ac.tar.xz
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
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions