From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Subject: [PATCH 000/160] [PULL] ab/i18n rebased on ab/i18n-prereqs Date: Sun, 14 Nov 2010 15:07:23 +0000 Message-ID: <1289747245-23263-1-git-send-email-avarab@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Junio C Hamano , Johannes Sixt , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Nov 14 16:08:25 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PHeBq-0008Ge-Bh for gcvg-git-2@lo.gmane.org; Sun, 14 Nov 2010 16:08:23 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755891Ab0KNPIJ convert rfc822-to-quoted-printable (ORCPT ); Sun, 14 Nov 2010 10:08:09 -0500 Received: from mail-wy0-f174.google.com ([74.125.82.174]:46264 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755701Ab0KNPIH (ORCPT ); Sun, 14 Nov 2010 10:08:07 -0500 Received: by wyb28 with SMTP id 28so3574775wyb.19 for ; Sun, 14 Nov 2010 07:08:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:mime-version:content-type :content-transfer-encoding; bh=pEndHcBRbVO3VBh4bItoe+qLNCSI1dm8GcsETBUfL6E=; b=cu7eHgwE5f37svX7FTedrgApOusx739QfzOw/4jyuT5R3enrt5FLkVrKPGaJ3uJcIW pbWwVKDlNmMykWdJ/iTqetqfviT6HyMpt9yL8MUAu1UxQY33LGisG3FUJYzSwYkBwqA4 fTwGH/ZdL8ZKkbevFrFPr1mUmyGJuVE11SUs8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:mime-version :content-type:content-transfer-encoding; b=mW4XETRBffNzSRSfT4mqMSYDGoDk9rLOV1hu9n60w5dRZNqW7EO7PHOv+7cXScDQzQ Q6zxx3UXYJCKxH876u3DhP9BN2vNaCb3t/tevV+4mj0gPd6CdrMvL70dygX/cTrCNYUN /U7CBKLNm5xqkjUt6SsvOzK/UGRu0+CcR36YM= Received: by 10.227.152.9 with SMTP id e9mr5008965wbw.169.1289747285191; Sun, 14 Nov 2010 07:08:05 -0800 (PST) Received: from v.nix.is (v.nix.is [109.74.193.250]) by mx.google.com with ESMTPS id e12sm3208820wer.12.2010.11.14.07.08.04 (version=SSLv3 cipher=RC4-MD5); Sun, 14 Nov 2010 07:08:04 -0800 (PST) X-Mailer: git-send-email 1.7.3.2.326.g36065a Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Here's an updated ab/i18n rebased on the new ab/i18n-prereqs series. The major change here is this patch: gettext: fix bug in git-sh-i18n's eval_gettext() by using envsubst(= 1) Which fixes eval_gettext to work using our own copy of envsubst(1). And= : Makefile: Set NO_GETTEXT=3DYesPlease on Windows & MinGW Which implements Johannes Six's suggestion in "[PATCH] Do not build i18n on Windows." to not build with gettext on Windows by default. This series can be fetched from: git://github.com/avar/git.git ab/i18n Erik Faye-Lund (1): gettext.c: use libcharset.h instead of langinfo.h when available Jan Engelhardt (1): po/de.po: complete German translation Jan Kr=C3=BCger (1): po/de.po: add German translation Marcin Cie=C5=9Blak (1): po/pl.po: add Polish translation Peter Krefting (1): po/sv.po: add Swedish translation Ramkumar Ramachandra (1): po/hi.po: add Hindi Translation Sam Reed (1): po/en_GB.po: add British English translation Thomas Rast (1): gettext tests: locate i18n lib&data correctly under --valgrind =C3=86var Arnfj=C3=B6r=C3=B0 Bjarmason (152): gettext: add infrastructure for translating Git with gettext Makefile: Set NO_GETTEXT=3DYesPlease on Windows & MinGW gettext: fix bug in git-sh-i18n's eval_gettext() by using envsubst(1) gettext tests: rename test to work around GNU gettext bug gettext: setlocale(LC_CTYPE, "") breaks Git's C function assumptions Makefile: A variable for options used by xgettext(1) calls Makefile: provide a --msgid-bugs-address to xgettext(1) Makefile: tell xgettext(1) that our source is in UTF-8 Makefile: use variables and shorter lines for xgettext builtin.h: Include gettext.h gettext.c: work around us not using setlocale(LC_CTYPE, "") gettext tests: add GETTEXT_POISON=3DYesPlease Makefile parameter gettext tests: skip lib-gettext.sh tests under GETTEXT_POISON gettextize: git-init basic messages gettextize: git-init "Initialized [...] repository" message gettext tests: test if $VERSION exists before using it gettext tests: add detection for is_IS.ISO-8859-1 locale gettext tests: test message re-encoding under Shell gettext tests: test re-encoding with a UTF-8 msgid under Shell gettext tests: mark a test message as not needing translation po/is.po: add Icelandic translation gettext tests: test message re-encoding under C gettextize: git-clone basic messages gettextize: git-clone "Cloning into" message gettextize: git-add basic messages gettextize: git-add "no files added" message gettextize: git-add "Use -f if you really want" message gettextize: git-add "pathspec [...] did not match" message gettextize: git-add "remove '%s'" message gettextize: git-add refresh_index message gettextize: git-branch basic messages gettextize: git-branch "remote branch '%s' not found" message gettextize: git-branch "Deleted branch [...]" message gettextize: git-branch "git branch -v" messages gettextize: git-branch "(no branch)" message gettextize: git-checkout basic messages gettextize: git-checkout: our/their version message gettextize: git-checkout describe_detached_head messages gettextize: git-checkout "HEAD is now at" message gettextize: git-checkout "Switched to a .. branch" message gettextize: git-commit basic messages gettextize: git-commit "middle of a merge" message gettextize: git-commit formatting messages gettextize: git-commit print_summary messages gettextize: git-commit "enter the commit message" message gettextize: git-commit advice messages gettextize: git-diff basic messages gettextize: git-fetch basic messages gettextize: git-fetch formatting messages gettextize: git-fetch update_local_ref messages gettextize: git-fetch split up "(non-fast-forward)" message gettextize: git-grep basic messages gettextize: git-grep "--open-files-in-pager" message gettextize: git-log basic messages gettextize: git-log "--OPT does not make sense" messages gettextize: git-merge basic messages gettextize: git-merge "Updating %s..%s" message gettextize: git-merge "You have not concluded your merge" messages gettextize: git-merge "Wonderful" message gettextize: git-mv basic messages gettextize: git-mv "bad" messages gettextize: git-rm basic messages gettextize: git-reset basic messages gettextize: git-reset reset_type_names messages gettextize: git-reset "Unstaged changes after reset" message gettextize: git-tag basic messages gettextize: git-tag tag_template message gettextize: git-push basic messages gettextize: git-push "prevent you from losing" message gettextize: git-status basic messages gettextize: git-status "nothing to commit" messages gettextize: git-status shortstatus messages gettextize: git-status "Changes to be committed" message gettextize: git-status "Initial commit" message gettextize: git-status "renamed: " message gettextize: git-archive basic messages gettextize: git-bundle basic messages gettextize: git-clean basic messages gettextize: git-clean clean.requireForce messages gettextize: git-describe basic messages gettextize: git-gc basic messages gettextize: git-gc "Auto packing the repository" message gettextize: git-notes basic commands gettextize: git-notes GIT_NOTES_REWRITE_MODE error message gettextize: git-notes "Refusing to %s notes in %s" message gettextize: git-revert basic messages gettextize: git-revert "Your local changes" message gettextize: git-revert literal "me" messages gettextize: git-revert split up "could not revert/apply" message gettextize: git-shortlog basic messages Makefile: add GNU_GETTEXT, set when we expect GNU gettext Makefile: MSGFMT=3D"msgfmt --check" under GNU_GETTEXT gettext tests: add GETTEXT_POISON support for shell scripts gettext tests: add GETTEXT_POISON tests for shell scripts gettextize: git-am add git-sh-i18n gettextize: git-am one-line gettext $msg; echo gettextize: git-am multi-line getttext $msg; echo gettextize: git-am eval_gettext messages gettextize: git-am die messages gettextize: git-am cannot_fallback messages gettextize: git-am clean_abort messages gettextize: git-am "Apply?" message gettextize: git-am core say messages gettextize: git-am printf(1) message to eval_gettext gettext docs: add po/README file documenting Git's gettext Makefile: only add gettext tests on XGETTEXT_INCLUDE_TESTS=3DYesPleas= e gettext docs: add a "Testing your changes" section to po/README gettext docs: add "Marking strings for translation" section in po/README gettext docs: the gettext.h C interface gettext docs: the git-sh-i18n.sh Shell interface gettext docs: the Git::I18N Perl interface gettext docs: add "Testing marked strings" section to po/README gettextize: git-pull add git-sh-i18n gettextize: git-pull die messages gettextize: git-pull eval_gettext + die message gettextize: git-pull eval_gettext + warning message gettextize: git-pull split up "no candidate" message gettextize: git-pull "You asked to pull" message gettextize: git-pull "[...] not currently on a branch" message gettextize: git-pull "rebase against" / "merge with" messages gettextize: git-submodule add git-sh-i18n gettextize: git-submodule echo + eval_gettext messages gettextize: git-submodule say + eval_gettext messages gettextize: git-submodule die + eval_gettext messages gettextize: git-submodule $update_module say + die messages gettextize: git-submodule "cached cannot be used" message gettextize: git-submodule "Submodule change[...]" messages gettextize: git-submodule $errmsg messages gettextize: git-submodule "Entering [...]" message gettextize: git-submodule "[...] path is ignored" message gettextize: git-submodule "path not initialized" message gettextize: git-submodule "blob" and "submodule" messages gettextize: git-stash add git-sh-i18n gettextize: git-stash echo + gettext message gettextize: git-stash say + gettext messages gettextize: git-stash die + gettext messages gettextize: git-stash die + eval_gettext messages gettextize: git-stash die + eval_gettext $* messages gettextize: git-stash die + eval_gettext $1 messages gettextize: git-stash "unknown option" message gettextize: git-stash drop_stash say/die messages gettextize: git-bisect add git-sh-i18n gettextize: git-bisect gettext + echo message gettextize: git-bisect echo + gettext messages gettextize: git-bisect echo + eval_gettext message gettextize: git-bisect die + gettext messages gettextize: git-bisect die + eval_gettext messages gettextize: git-bisect bisect_run + $@ messages gettextize: git-bisect bisect_reset + $1 messages gettextize: git-bisect bisect_replay + $1 messages gettextize: git-bisect [Y/n] messages gettextize: git-bisect bisect_next_check "You need to" message .gitignore | 3 + Documentation/CodingGuidelines | 7 + INSTALL | 12 + Makefile | 135 ++- builtin.h | 1 + builtin/add.c | 46 +- builtin/archive.c | 14 +- builtin/branch.c | 69 +- builtin/bundle.c | 6 +- builtin/checkout.c | 93 +- builtin/clean.c | 33 +- builtin/clone.c | 63 +- builtin/commit.c | 156 +- builtin/describe.c | 36 +- builtin/diff.c | 20 +- builtin/fetch.c | 82 +- builtin/gc.c | 24 +- builtin/grep.c | 34 +- builtin/init-db.c | 58 +- builtin/log.c | 68 +- builtin/merge.c | 124 +- builtin/mv.c | 32 +- builtin/notes.c | 134 +- builtin/push.c | 42 +- builtin/reset.c | 42 +- builtin/revert.c | 75 +- builtin/rm.c | 22 +- builtin/shortlog.c | 8 +- builtin/tag.c | 66 +- config.mak.in | 3 + configure.ac | 18 + daemon.c | 3 + fast-import.c | 3 + gettext.c | 35 + gettext.h | 22 + git-am.sh | 68 +- git-bisect.sh | 84 +- git-pull.sh | 147 +- git-sh-i18n.sh | 80 + git-stash.sh | 75 +- git-submodule.sh | 94 +- git.c | 3 + http-backend.c | 3 + http-fetch.c | 3 + http-push.c | 3 + imap-send.c | 3 + perl/Git/I18N.pm | 91 + perl/Makefile | 3 +- perl/Makefile.PL | 14 +- po/.gitignore | 1 + po/README | 209 ++ po/de.po | 3609 +++++++++++++++++++++++++++= ++++++++ po/en_GB.po | 2784 +++++++++++++++++++++++++++ po/hi.po | 2787 +++++++++++++++++++++++++++ po/is.po | 194 ++ po/pl.po | 2793 +++++++++++++++++++++++++++ po/sv.po | 3492 +++++++++++++++++++++++++++= ++++++ sh-i18n--envsubst.c | 444 +++++ shell.c | 3 + show-index.c | 3 + t/lib-gettext.sh | 92 + t/lib-httpd.sh | 2 +- t/t0001-init.sh | 2 +- t/t0200-gettext-basic.sh | 111 ++ t/t0200/test.c | 23 + t/t0200/test.perl | 14 + t/t0200/test.sh | 14 + t/t0201-gettext-fallbacks.sh | 52 + t/t0202-gettext-perl.sh | 27 + t/t0202/test.pl | 109 ++ t/t0203-gettext-setlocale-sanity.sh | 26 + t/t0204-gettext-reencode-sanity.sh | 78 + t/t0205-gettext-poison.sh | 36 + t/t1200-tutorial.sh | 5 +- t/t2200-add-update.sh | 2 +- t/t2204-add-ignored.sh | 37 +- t/t3030-merge-recursive.sh | 2 +- t/t3200-branch.sh | 2 +- t/t3203-branch-output.sh | 2 +- t/t3501-revert-cherry-pick.sh | 2 +- t/t3507-cherry-pick-conflict.sh | 2 +- t/t3700-add.sh | 11 +- t/t4001-diff-rename.sh | 4 +- t/t4014-format-patch.sh | 2 +- t/t4150-am.sh | 5 +- t/t4151-am-abort.sh | 2 +- t/t5541-http-push.sh | 7 +- t/t5601-clone.sh | 2 +- t/t6040-tracking-info.sh | 2 +- t/t6120-describe.sh | 2 +- t/t7004-tag.sh | 1 + t/t7012-skip-worktree-writing.sh | 4 +- t/t7060-wtstatus.sh | 2 +- t/t7102-reset.sh | 2 +- t/t7110-reset-merge.sh | 6 +- t/t7201-co.sh | 10 +- t/t7300-clean.sh | 6 +- t/t7400-submodule-basic.sh | 4 +- t/t7401-submodule-summary.sh | 12 +- t/t7407-submodule-foreach.sh | 4 +- t/t7500-commit.sh | 6 +- t/t7501-commit.sh | 7 +- t/t7502-commit.sh | 60 +- t/t7506-status-submodule.sh | 28 +- t/t7508-status.sh | 115 +- t/t7600-merge.sh | 2 +- t/t7811-grep-open.sh | 2 +- t/test-lib.sh | 10 + upload-pack.c | 3 + wt-status.c | 116 +- 110 files changed, 18581 insertions(+), 1075 deletions(-) create mode 100644 gettext.c create mode 100644 gettext.h create mode 100644 git-sh-i18n.sh create mode 100644 perl/Git/I18N.pm create mode 100644 po/.gitignore create mode 100644 po/README create mode 100644 po/de.po create mode 100644 po/en_GB.po create mode 100644 po/hi.po create mode 100644 po/is.po create mode 100644 po/pl.po create mode 100644 po/sv.po create mode 100644 sh-i18n--envsubst.c create mode 100644 t/lib-gettext.sh create mode 100755 t/t0200-gettext-basic.sh create mode 100644 t/t0200/test.c create mode 100644 t/t0200/test.perl create mode 100644 t/t0200/test.sh create mode 100755 t/t0201-gettext-fallbacks.sh create mode 100755 t/t0202-gettext-perl.sh create mode 100644 t/t0202/test.pl create mode 100755 t/t0203-gettext-setlocale-sanity.sh create mode 100755 t/t0204-gettext-reencode-sanity.sh create mode 100755 t/t0205-gettext-poison.sh --=20 1.7.2.3