This series builds on the "i18n: Add shell script translation infrastructure" series and adds the translations for the common *.sh programs. Changes since last time: * Fixed up for new broken tests under gettext poison * Now using the test_i18ncmp and test_i18ngrep functions * Ejected some git-pull patches: pick 969ef13 i18n: git-pull split up "no candidate" message pick 8eb125e i18n: git-pull "You asked to pull" message pick c7d7d56 i18n: git-pull "[...] not currently on a branch" message pick 43e6a9f i18n: git-pull "rebase against" / "merge with" messages These were all used by error_on_no_merge_candidates and recently split into git-parse-remote. It's too hard to keep rebasing these when the code is being changed from under me, I'll submit a series to do these separately once this series is in master. Ãvar ArnfjÃrà Bjarmason (48): i18n: git-am add git-sh-i18n i18n: git-am one-line gettext $msg; echo i18n: git-am multi-line getttext $msg; echo i18n: git-am eval_gettext messages i18n: git-am echo + gettext message i18n: git-am die messages i18n: git-am cannot_fallback messages i18n: git-am clean_abort messages i18n: git-am "Apply?" message i18n: git-am "Falling back" say message i18n: git-am core say messages i18n: git-am printf(1) message to eval_gettext i18n: git-pull add git-sh-i18n i18n: git-pull die messages i18n: git-pull eval_gettext + die message i18n: git-pull eval_gettext + warning message i18n: git-submodule add git-sh-i18n i18n: git-submodule echo + eval_gettext messages i18n: git-submodule say + eval_gettext messages i18n: git-submodule die + eval_gettext messages i18n: git-submodule $update_module say + die messages i18n: git-submodule "cached cannot be used" message i18n: git-submodule "Submodule change[...]" messages i18n: git-submodule $errmsg messages i18n: git-submodule "Entering [...]" message i18n: git-submodule "[...] path is ignored" message i18n: git-submodule "path not initialized" message i18n: git-submodule "blob" and "submodule" messages i18n: git-stash add git-sh-i18n i18n: git-stash echo + gettext message i18n: git-stash say + gettext messages i18n: git-stash die + gettext messages i18n: git-stash die + eval_gettext messages i18n: git-stash die + eval_gettext $* messages i18n: git-stash die + eval_gettext $1 messages i18n: git-stash "unknown option" message i18n: git-stash drop_stash say/die messages i18n: git-bisect add git-sh-i18n i18n: git-bisect gettext + echo message i18n: git-bisect echo + gettext messages i18n: git-bisect echo + eval_gettext message i18n: git-bisect die + gettext messages i18n: git-bisect die + eval_gettext messages i18n: git-bisect bisect_run + $@ messages i18n: git-bisect bisect_reset + $1 messages i18n: git-bisect bisect_replay + $1 messages i18n: git-bisect [Y/n] messages i18n: git-bisect bisect_next_check "You need to" message git-am.sh | 74 ++++++++++++++++++---------------- git-bisect.sh | 92 +++++++++++++++++++++++------------------ git-pull.sh | 31 +++++++------- git-stash.sh | 73 ++++++++++++++++++++------------- git-submodule.sh | 92 +++++++++++++++++++++-------------------- t/t4150-am.sh | 2 +- t/t4151-am-abort.sh | 5 +- t/t7400-submodule-basic.sh | 4 +- t/t7401-submodule-summary.sh | 12 +++--- t/t7406-submodule-update.sh | 2 +- t/t7407-submodule-foreach.sh | 4 +- 11 files changed, 214 insertions(+), 177 deletions(-) -- 1.7.4.4 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html