From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Tue, 22 Mar 2011 10:57:58 GMT
Subject: Re: What's cooking in git.git (Mar 2011, #02; Sun, 20)
Message-ID: <AANLkTimsiM6k9t8H6q4cwB9i42Q4ysNJb2MYyeYYnF5D@mail.gmail.com>
In-Reply-To: <7vy649vah1.fsf@alter.siamese.dyndns.org>

On Sun, Mar 20, 2011 at 20:49, Junio C Hamano <gitster@pobox.com> wrote:

> [Graduated to "master"]
>
> * ab/i18n-basic (2011-02-25) 9 commits
>  (merged to 'next' on 2011-03-10 at ab70d57)
>  + i18n: "make distclean" should clean up after "make pot"
>  + i18n: Makefile: "pot" target to extract messages marked for translation
>  + i18n: add stub Q_() wrapper for ngettext
>  + i18n: do not poison translations unless GIT_GETTEXT_POISON envvar is set
>  + i18n: add GETTEXT_POISON to simulate unfriendly translator
>  + i18n: add no-op _() and N_() wrappers
>  + commit, status: use status_printf{,_ln,_more} helpers
>  + commit: refer to commit template as s->fp
>  + wt-status: add helpers for printing wt-status lines
>  (this branch is used by ab/i18n-st.)

Thanks a lot for merging this down.

> * ab/i18n-st (2011-02-22) 69 commits
>  - i18n: git-shortlog basic messages
>  - i18n: git-revert split up "could not revert/apply" message
>  - i18n: git-revert literal "me" messages
>  - i18n: git-revert "Your local changes" message
>  - i18n: git-revert basic messages
>  - i18n: git-notes GIT_NOTES_REWRITE_MODE error message
>  - i18n: git-notes basic commands
>  - i18n: git-gc "Auto packing the repository" message
>  - i18n: git-gc basic messages
>  - i18n: git-describe basic messages
>  - i18n: git-clean clean.requireForce messages
>  - i18n: git-clean basic messages
>  - i18n: git-bundle basic messages
>  - i18n: git-archive basic messages
>  - i18n: git-status "renamed: " message
>  - i18n: git-status "Initial commit" message
>  - i18n: git-status "Changes to be committed" message
>  - i18n: git-status shortstatus messages
>  - i18n: git-status "nothing to commit" messages
>  - i18n: git-status basic messages
>  - i18n: git-push "prevent you from losing" message
>  - i18n: git-push basic messages
>  - i18n: git-tag tag_template message
>  - i18n: git-tag basic messages
>  - i18n: git-reset "Unstaged changes after reset" message
>  - i18n: git-reset reset_type_names messages
>  - i18n: git-reset basic messages
>  - i18n: git-rm basic messages
>  - i18n: git-mv "bad" messages
>  - i18n: git-mv basic messages
>  - i18n: git-merge "Wonderful" message
>  - i18n: git-merge "You have not concluded your merge" messages
>  - i18n: git-merge "Updating %s..%s" message
>  - i18n: git-merge basic messages
>  - i18n: git-log "--OPT does not make sense" messages
>  - i18n: git-log basic messages
>  - i18n: git-grep "--open-files-in-pager" message
>  - i18n: git-grep basic messages
>  - i18n: git-fetch split up "(non-fast-forward)" message
>  - i18n: git-fetch update_local_ref messages
>  - i18n: git-fetch formatting messages
>  - i18n: git-fetch basic messages
>  - i18n: git-diff basic messages
>  - i18n: git-commit advice messages
>  - i18n: git-commit "enter the commit message" message
>  - i18n: git-commit print_summary messages
>  - i18n: git-commit formatting messages
>  - i18n: git-commit "middle of a merge" message
>  - i18n: git-commit basic messages
>  - i18n: git-checkout "Switched to a .. branch" message
>  - i18n: git-checkout "HEAD is now at" message
>  - i18n: git-checkout describe_detached_head messages
>  - i18n: git-checkout: our/their version message
>  - i18n: git-checkout basic messages
>  - i18n: git-branch "(no branch)" message
>  - i18n: git-branch "git branch -v" messages
>  - i18n: git-branch "Deleted branch [...]" message
>  - i18n: git-branch "remote branch '%s' not found" message
>  - i18n: git-branch basic messages
>  - i18n: git-add "Unstaged changes" message
>  - i18n: git-add "remove '%s'" message
>  - i18n: git-add "did not match any files" message
>  - i18n: git-add "The following paths are ignored" message
>  - i18n: git-add basic messages
>  - i18n: git-clone "Cloning into" message
>  - i18n: git-clone "Cloning into" message
>  - i18n: git-clone basic messages
>  - i18n: git-init "Initialized [...] repository" message
>  - i18n: git-init basic messages

What's your plan for merging this to master?

Once this is in I'll rebase my ab/i18n on master, sort out that
eval_gettext() issue you raised (maybe we don't need
git-sh-i18n--envsubst after all), and submit the shell script i18n
translations.