Code

Merge branch 'ab/i18n' into pu
authorJunio C Hamano <gitster@pobox.com>
Mon, 31 Jan 2011 03:03:20 +0000 (19:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 31 Jan 2011 03:03:20 +0000 (19:03 -0800)
commit787bb21c4fbc09f831907fc455445cb18b2f2983
treeae10249c0126131af07e9c20bbb09a77f34f7b1f
parentce30a02f5b414741d19c9b7680671feba1c94a73
parent8a661824414164a4cda5462e6bef8e60d7bf3079
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
65 files changed:
.gitignore
Documentation/CodingGuidelines
INSTALL
Makefile
builtin.h
builtin/add.c
builtin/branch.c
builtin/checkout.c
builtin/clean.c
builtin/clone.c
builtin/commit.c
builtin/describe.c
builtin/diff.c
builtin/fetch-pack.c
builtin/fetch.c
builtin/gc.c
builtin/grep.c
builtin/init-db.c
builtin/log.c
builtin/merge.c
builtin/mv.c
builtin/notes.c
builtin/remote.c
builtin/reset.c
builtin/revert.c
builtin/rm.c
builtin/send-pack.c
builtin/shortlog.c
builtin/tag.c
config.mak.in
configure.ac
daemon.c
fast-import.c
git-am.sh
git-bisect.sh
git-pull.sh
git-submodule.sh
git.c
http-backend.c
http-fetch.c
http-push.c
t/lib-httpd.sh
t/t0001-init.sh
t/t1200-tutorial.sh
t/t2200-add-update.sh
t/t3030-merge-recursive.sh
t/t3200-branch.sh
t/t3203-branch-output.sh
t/t3501-revert-cherry-pick.sh
t/t4014-format-patch.sh
t/t4150-am.sh
t/t4151-am-abort.sh
t/t6040-tracking-info.sh
t/t7004-tag.sh
t/t7300-clean.sh
t/t7400-submodule-basic.sh
t/t7407-submodule-foreach.sh
t/t7500-commit.sh
t/t7501-commit.sh
t/t7502-commit.sh
t/t7508-status.sh
t/t7600-merge.sh
t/test-lib.sh
upload-pack.c
wt-status.c