This is a pull request for an updated ab/i18n and the builtin.h
changes. I can also send this to list on request, but it's 25 patches
for what are trivial merge changes and a doc patch.
I've rebased the ab/i18n series on top of master. Now it looks like
this:
master
\
use-builtin-h-for-builtin-commands-v2
\
ab/i18n
The changes are:
use-builtin-h-for-builtin-commands-v2: (needed by the new ab/i18n
series, and a good idea in general)
833c9cf builtin: use builtin.h for all builtin commands
http://github.com/avar/git/commit/833c9cf
git://github.com/avar/git.git use-builtin-h-for-builtin-commands-v2
* I changed the "builtin: use builtin.h for all builtin commands"
patch so that it adds builtin.h but only removes cache.h, not
commit.h and notes.h.
ab/i18n: (new ab/i18n to replace the one in git.git)
git://github.com/avar/git.git ab/i18n
1c7584b gettext: Add po/README file documenting Git's gettext
This is new, a README file describing how to deal with the po/
directory. See http://github.com/avar/git/raw/ab/i18n/po/README
aba2acf gettext tests: remove old sanity test under NO_GETTEXT
340b167 gettext tests: test message re-encoding under C
f072e35 po/pl.po: add Polish translation
ea9736b po/is.po: add Icelandic translation
a0dfa7e po/is.po: msgmerge and add Language: header
6693d50 gettext tests: mark a test message as not needing translation
9428b0a gettext tests: test re-encoding with a UTF-8 msgid under Shell
b1d6c80 gettext tests: test message re-encoding under Shell
e630ddd gettext tests: add detection for is_IS.ISO-8859-1 locale
da615f4 gettext tests: update test/is.po to match t/t0200/test.c
09c03ba gettext tests: test if $VERSION exists before using it
56bed97 gettext.c: work around us not using setlocale(LC_CTYPE, "")
c1c0d12 gettext: localize the main git-init message
a0b47a5 gettext: make the simple parts of git-init localizable
4a606ac builtin.h: Include gettext.h
deb01cf Makefile: use variables and shorter lines for xgettext
4ecebf5 Makefile: tell xgettext(1) that our source is in UTF-8
3d9f454 Makefile: provide a --msgid-bugs-address to xgettext(1)
29446ce Makefile: A variable for options used by xgettext(1) calls
e25db7d tests: locate i18n lib&data correctly under --valgrind
d3415a9 gettext: setlocale(LC_CTYPE, "") breaks Git's C function assumptions
3e25bb6 tests: rename test to work around GNU gettext bug
This is all the same.
760724f Add infrastructure for translating Git with gettext
Changed perl/Makefile so it doesn't conflict with the version now in
master (conflict because of "perl/Makefile: Unset INSTALL_BASE when
making perl.mak").
END PULL REQUEST.
What I'm working on, which should not be pulled at this time:
ab/i18n-gettextize:
http://github.com/avar/git/compare/ab/i18n...ab/i18n-gettextize
Updated version of the gettextize series rebased on master. No
longer needs its own builtin.h patches (since ab/i18n itself now
depends on it). I'm also fixing some minor issues raised on-list.
I'm also going to add the aforementioned GETTEXT_POISON
functionality to ab/i18n to make sure this series is OK.
ab/i18n-add-translations:
http://github.com/avar/git/compare/ab/i18n-gettextize...ab/i18n-add-translations
Adds German and British English translations. More additions welcome.
--
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