Merge branch 'va/i18n-even-more'

* va/i18n-even-more:
  i18n: fix misconversion in shell scripts
This commit is contained in:
Junio C Hamano
2016-12-27 00:11:45 -08:00
2 changed files with 4 additions and 3 deletions

View File

@ -437,7 +437,8 @@ update_squash_messages () {
}' <"$squash_msg".bak
} >"$squash_msg"
else
commit_message HEAD > "$fixup_msg" || die "$(gettext "Cannot write \$fixup_msg")"
commit_message HEAD >"$fixup_msg" ||
die "$(eval_gettext "Cannot write \$fixup_msg")"
count=2
{
printf '%s\n' "$comment_char $(gettext "This is a combination of 2 commits.")"