Merge branch 'nd/am-i18n-fix'
"git am" wasn't marked up for i18n properly. * nd/am-i18n-fix: am: quote string for translation before passing to eval_gettextln
This commit is contained in:
commit
e245397434
@ -855,8 +855,8 @@ did you forget to use 'git add'?"
|
||||
eval_gettextln 'Patch failed at $msgnum $FIRSTLINE'
|
||||
if test "$(git config --bool advice.amworkdir)" != false
|
||||
then
|
||||
eval_gettextln "The copy of the patch that failed is found in:
|
||||
$dotest/patch"
|
||||
eval_gettextln 'The copy of the patch that failed is found in:
|
||||
$dotest/patch'
|
||||
fi
|
||||
stop_here_user_resolve $this
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user