Skip to content

i18n for git-am, git-rebase and git-merge

Jiang Xin git 6 versions In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v6 Latest7 patches 2 repliesIn review
  2. v5 posting 2/27 patches 0 repliesSuperseded
  3. v5 posting 1/27 patches 3 repliesSuperseded
Earlier versions · 3
VersionPostedPatchesRepliesStatus
v47 patches7 repliesSuperseded
v37 patches20 repliesSuperseded
v27 patches8 repliesSuperseded

Patches in v6 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/7i18n: New keywords for xgettext extraction from shMakefile+2 -10 replies
2/7i18n: rebase: mark messages for translationgit-am.sh git-rebase.sh t/t0201-gettext-fallbacks.sh +2 more+53 -420 replies
3/7i18n: Rewrite gettext messages start with dashgit-rebase.sh git-submodule.sh t/t3404-rebase-interactive.sh+3 -30 replies
4/7Remove obsolete LONG_USAGE which breaks xgettextgit-rebase.sh+0 -251 reply
5/7i18n: am: mark more strings for translationgit-am.sh+5 -61 reply
6/7Remove dead code which contains bad gettext blockgit-am.sh+0 -30 replies
7/7i18n: merge-recursive: mark strings for translationmerge-recursive.c t/t6022-merge-rename.sh t/t6042-merge-rename-corner-cases.sh+88 -780 replies

Reviews trailers per patch

All 7 patches have a Reviewed-by or Acked-by.

PatchStefano LattariniJonathan Nieder
1/7R-b R-b
2/7R-b
3/7R-b
4/7R-b
5/7R-b R-b
6/7R-b R-b
7/7R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v6 thread

Cover letter [PATCH v6 0/7] i18n for git-am, git-rebase and git-merge

[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(-)
Signature · 1 line
1.7.12.rc0.16.gf4916ac