From: Jiang Xin <worldhello.net@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Git List" <git@vger.kernel.org>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Jonathan Nieder" <jrnieder@gmail.com>,
"Stefano Lattarini" <stefano.lattarini@gmail.com>,
"Martin von Zweigbergk" <martin.von.zweigbergk@gmail.com>,
"Jiang Xin" <worldhello.net@gmail.com>
Subject: [PATCH v6 0/7] i18n for git-am, git-rebase and git-merge
Date: Wed, 25 Jul 2012 22:53:06 +0800 [thread overview]
Message-ID: <cover.1343227806.git.worldhello.net@gmail.com> (raw)
[Sorry, bad patch series number, resend again. I'm sleepy.]
Marked messages for translation in git-am, git-rebase, and git-merge.
Also fixed suffered tests when turning GETTEXT_POISON switch on.
Jiang Xin (7):
i18n: New keywords for xgettext extraction from sh
i18n: rebase: mark messages for translation
i18n: Rewrite gettext messages start with dash
Remove obsolete LONG_USAGE which breaks xgettext
i18n: am: mark more strings for translation
Remove dead code which contains bad gettext block
i18n: merge-recursive: mark strings for translation
Makefile | 3 +-
git-am.sh | 20 ++---
git-rebase.sh | 89 ++++++++-------------
git-submodule.sh | 2 +-
merge-recursive.c | 148 +++++++++++++++++++----------------
t/t0201-gettext-fallbacks.sh | 8 +-
t/t3400-rebase.sh | 8 +-
t/t3404-rebase-interactive.sh | 2 +-
t/t3406-rebase-message.sh | 9 ++-
t/t6022-merge-rename.sh | 16 ++--
t/t6042-merge-rename-corner-cases.sh | 2 +-
11 files changed, 150 insertions(+), 157 deletions(-)
--
1.7.12.rc0.16.gf4916ac
next reply other threads:[~2012-07-25 14:53 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-25 14:53 Jiang Xin [this message]
2012-07-25 14:53 ` [PATCH v6 1/7] i18n: New keywords for xgettext extraction from sh Jiang Xin
2012-07-25 14:53 ` [PATCH v6 2/7] i18n: rebase: mark messages for translation Jiang Xin
2012-07-25 14:53 ` [PATCH v6 3/7] i18n: Rewrite gettext messages start with dash Jiang Xin
2012-07-25 14:53 ` [PATCH v6 4/7] Remove obsolete LONG_USAGE which breaks xgettext Jiang Xin
2012-07-25 14:53 ` [PATCH v6 5/7] i18n: am: mark more strings for translation Jiang Xin
2012-07-25 14:53 ` [PATCH v6 6/7] Remove dead code which contains bad gettext block Jiang Xin
2012-07-25 14:53 ` [PATCH v6 7/7] i18n: merge-recursive: mark strings for translation Jiang Xin
2012-07-25 17:18 ` [PATCH v6 5/7] i18n: am: mark more " Junio C Hamano
2012-07-25 17:13 ` [PATCH v6 4/7] Remove obsolete LONG_USAGE which breaks xgettext Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1343227806.git.worldhello.net@gmail.com \
--to=worldhello.net@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=martin.von.zweigbergk@gmail.com \
--cc=pclouds@gmail.com \
--cc=stefano.lattarini@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).