On Sun, Mar 20, 2011 at 20:49, Junio C Hamano <gitster@xxxxxxxxx> 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.
--
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