![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 20 Mar 2011 06:24:42 +0000 (23:24 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 20 Mar 2011 06:24:42 +0000 (23:24 -0700) | ||
| commit | 1e239079f704b840778c263f35f1e299565d4a49 | |
| tree | e97798c2f77f567f308317f61444cdc69ef6a393 | tree | snapshot |
| parent | 32b31ab7f3ff52eafc40033b890b313efaed8c56 | commit | diff |
| parent | 92a684b916edf9e0f4f7962865e62ff71a988445 | commit | diff |
Merge branch 'ab/i18n-basic'
* ab/i18n-basic:
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
Conflicts:
builtin/commit.c
* ab/i18n-basic:
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
Conflicts:
builtin/commit.c
| Makefile | diff1 | | diff2 | | blob | history |
| cache.h | diff1 | | diff2 | | blob | history |