author | Junio C Hamano <gitster@pobox.com> | |
Mon, 31 Jan 2011 03:03:20 +0000 (19:03 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 31 Jan 2011 03:03:20 +0000 (19:03 -0800) | ||
commit | 787bb21c4fbc09f831907fc455445cb18b2f2983 | |
tree | ae10249c0126131af07e9c20bbb09a77f34f7b1f | tree | snapshot |
parent | ce30a02f5b414741d19c9b7680671feba1c94a73 | commit | diff |
parent | 8a661824414164a4cda5462e6bef8e60d7bf3079 | commit | diff |
Merge branch 'ab/i18n' into pu
* ab/i18n: (161 commits)
po/de.po: complete German translation
po/sv.po: add Swedish translation
gettextize: git-bisect bisect_next_check "You need to" message
gettextize: git-bisect [Y/n] messages
gettextize: git-bisect bisect_replay + $1 messages
gettextize: git-bisect bisect_reset + $1 messages
gettextize: git-bisect bisect_run + $@ messages
gettextize: git-bisect die + eval_gettext messages
gettextize: git-bisect die + gettext messages
gettextize: git-bisect echo + eval_gettext message
gettextize: git-bisect echo + gettext messages
gettextize: git-bisect gettext + echo message
gettextize: git-bisect add git-sh-i18n
gettextize: git-stash drop_stash say/die messages
gettextize: git-stash "unknown option" message
gettextize: git-stash die + eval_gettext $1 messages
gettextize: git-stash die + eval_gettext $* messages
gettextize: git-stash die + eval_gettext messages
gettextize: git-stash die + gettext messages
gettextize: git-stash say + gettext messages
...
Conflicts:
Documentation/CodingGuidelines
Makefile
builtin/clean.c
builtin/commit.c
builtin/describe.c
builtin/grep.c
builtin/init-db.c
builtin/merge.c
builtin/notes.c
builtin/revert.c
fast-import.c
git-bisect.sh
git-pull.sh
git-submodule.sh
t/t3501-revert-cherry-pick.sh
t/t7004-tag.sh
wt-status.c
* ab/i18n: (161 commits)
po/de.po: complete German translation
po/sv.po: add Swedish translation
gettextize: git-bisect bisect_next_check "You need to" message
gettextize: git-bisect [Y/n] messages
gettextize: git-bisect bisect_replay + $1 messages
gettextize: git-bisect bisect_reset + $1 messages
gettextize: git-bisect bisect_run + $@ messages
gettextize: git-bisect die + eval_gettext messages
gettextize: git-bisect die + gettext messages
gettextize: git-bisect echo + eval_gettext message
gettextize: git-bisect echo + gettext messages
gettextize: git-bisect gettext + echo message
gettextize: git-bisect add git-sh-i18n
gettextize: git-stash drop_stash say/die messages
gettextize: git-stash "unknown option" message
gettextize: git-stash die + eval_gettext $1 messages
gettextize: git-stash die + eval_gettext $* messages
gettextize: git-stash die + eval_gettext messages
gettextize: git-stash die + gettext messages
gettextize: git-stash say + gettext messages
...
Conflicts:
Documentation/CodingGuidelines
Makefile
builtin/clean.c
builtin/commit.c
builtin/describe.c
builtin/grep.c
builtin/init-db.c
builtin/merge.c
builtin/notes.c
builtin/revert.c
fast-import.c
git-bisect.sh
git-pull.sh
git-submodule.sh
t/t3501-revert-cherry-pick.sh
t/t7004-tag.sh
wt-status.c
65 files changed: