Re: [PATCH v2 00/22] i18n and test updates

[Junio C Hamano]

Vasco Almeida  writes:

> Às 17:11 de 27-05-2016, Junio C Hamano escreveu:
>> Vasco Almeida  writes:
>> 
>>> Marks several messages for translation and updates tests to pass under
>>> GETTEXT_POISON. Some tests were updated to fit previous i18n marks, others
>>> were updated to fit marks made by these patches. Patches that only touch
>>> test file refer to marks done in commits previous to these ones.
>> 
>> Whew, this series is quite a lot of work.
>> 
> Do you mean review work?

If I answered No to "Was it a lot of work to review it?", then I'd
be lying ;-)

But my comment was "Whew, it must have been a lot of work to prepare
this series; thanks for tackling the topic".

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2 00/22] i18n and test updates

[Vasco Almeida]

Às 17:11 de 27-05-2016, Junio C Hamano escreveu:
> Vasco Almeida  writes:
> 
>> Marks several messages for translation and updates tests to pass under
>> GETTEXT_POISON. Some tests were updated to fit previous i18n marks, others
>> were updated to fit marks made by these patches. Patches that only touch
>> test file refer to marks done in commits previous to these ones.
> 
> Whew, this series is quite a lot of work.
> 
Do you mean review work?
Submitting patches is still a new thing for me.
I don't know how to organize or split well the patch series, if they're
too long, in order to make other's work easier and the patches
themselves more appealing.

I have got other patches that I've made on top of these ones, but
don't know whether I should 1) rebase them on top of master, if they
apply cleanly, and send them in a new patch series, or just 2) send them
together in the next re-roll. New patches are also about i18n.

I've tried scavenging mailing list and documentation (not too hard, I
confess) for a explicit hint on this and eventually other best/desired
practices but found nothing so far, beside the content of
Documentation/SubmittingPatches of course.
If somebody could point me to something like that, that would be great.

I also naturally expect that, if I'm doing something wrong or lesser,
someone will bring it to my attention so I can correct.

(The first time I've sent patches here, I then sent 2 more patches alone
in their own series [1], but Junio Hamano put them together in one
va/i18n-misc-updates branch, reasonable decision since that and the
previous series were all i18n patches, hence all related. That made me
suspect that option 2) is better.
After that, I've sent a re-roll of first series, and Junio Hamano
thought for a moment that I had dropped the 2 patches from the second
one [2]. So it seems that, at least in this case, option 1) can
confuse people.)

[1] http://thread.gmane.org/gmane.comp.version-control.git/291386
[2]
http://thread.gmane.org/gmane.comp.version-control.git/291860/focus=291914


--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2 00/22] i18n and test updates

[Junio C Hamano]

Vasco Almeida  writes:

> Marks several messages for translation and updates tests to pass under
> GETTEXT_POISON. Some tests were updated to fit previous i18n marks, others
> were updated to fit marks made by these patches. Patches that only touch
> test file refer to marks done in commits previous to these ones.

Whew, this series is quite a lot of work.

Most of the changes I only skimmed so if you had typos I wouldn't
have noticed them, but they looked good from my cursory reading.

I looked at the changes to scripted Porcelains more carefully than
other changes, and they all looked good (except for the parts I sent
reviews separately for).

Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v2 00/22] i18n and test updates

[Vasco Almeida]

Marks several messages for translation and updates tests to pass under
GETTEXT_POISON. Some tests were updated to fit previous i18n marks, others
were updated to fit marks made by these patches. Patches that only touch
test file refer to marks done in commits previous to these ones.

This re-roll takes into consideration the comments for v1 at
http://thread.gmane.org/gmane.comp.version-control.git/294946

Interdiff of v1 to v2 is included below.

Vasco Almeida (22):
  i18n: builtin/remote.c: fix mark for translation
  i18n: advice: mark string about detached head for translation
  i18n: advice: internationalize message for conflicts
  i18n: transport: mark strings for translation
  i18n: sequencer: mark entire sentences for translation
  i18n: sequencer: mark string for translation
  i18n: merge-octopus: mark messages for translation
  merge-octupus: use die shell function from git-sh-setup.sh
  i18n: rebase: fix marked string to use eval_gettext variant
  i18n: rebase: mark placeholder for translation
  i18n: bisect: simplify error message for i18n
  t6030: update to use test_i18ncmp
  i18n: git-sh-setup.sh: mark strings for translation
  i18n: rebase-interactive: mark strings for translation
  i18n: rebase-interactive: mark here-doc strings for translation
  i18n: rebase-interactive: mark comments of squash for translation
  i18n: setup: mark strings for translation
  tests: use test_i18n* functions to suppress false positives
  tests: unpack-trees: update to use test_i18n* functions
  t9003: become resilient to GETTEXT_POISON
  t4153: fix negated test_i18ngrep call
  t5523: use test_i18ngrep for negation

 Makefile |   5 +-
 advice.c |  21 ++-
 builtin/pull.c   |   2 +-
 builtin/remote.c |   6 +-
 git-bisect.sh|   5 +-
 git-merge-octopus.sh |  24 ++-
 git-rebase--interactive.sh   | 287 +--
 git-rebase.sh|   4 +-
 git-sh-i18n.sh   |   4 +
 git-sh-setup.sh  |  56 +--
 sequencer.c  |  13 +-
 setup.c  |  16 +-
 t/lib-rebase.sh  |   1 +
 t/t0008-ignores.sh   |   4 +-
 t/t1011-read-tree-sparse-checkout.sh |   2 +-
 t/t1300-repo-config.sh   |   8 +-
 t/t1307-config-blob.sh   |   2 +-
 t/t1308-config-set.sh|   4 +-
 t/t1400-update-ref.sh|   2 +-
 t/t1506-rev-parse-diagnosis.sh   |   2 +-
 t/t2010-checkout-ambiguous.sh|   2 +-
 t/t2018-checkout-branch.sh   |   2 +-
 t/t3200-branch.sh|   6 +-
 t/t3201-branch-contains.sh   |   2 +-
 t/t3320-notes-merge-worktrees.sh |   2 +-
 t/t3400-rebase.sh|   4 +-
 t/t3404-rebase-interactive.sh|  18 +--
 t/t4153-am-resume-override-opts.sh   |   2 +-
 t/t4208-log-magic-pathspec.sh|   4 +-
 t/t5505-remote.sh|   2 +-
 t/t5510-fetch.sh |   2 +-
 t/t5520-pull.sh  |   2 +-
 t/t5523-push-upstream.sh |  12 +-
 t/t5536-fetch-conflicts.sh   |   4 +-
 t/t6030-bisect-porcelain.sh  |   4 +-
 t/t6301-for-each-ref-errors.sh   |  10 +-
 t/t7063-status-untracked-cache.sh|   2 +-
 t/t7102-reset.sh |   4 +-
 t/t7400-submodule-basic.sh   |   2 +-
 t/t7403-submodule-sync.sh|   4 +-
 t/t7406-submodule-update.sh  |  10 +-
 t/t7508-status.sh|   4 +-
 t/t7607-merge-overwrite.sh   |   2 +-
 t/t9003-help-autocorrect.sh  |   4 +-
 transport.c  |  20 +--
 45 files changed, 352 insertions(+), 246 deletions(-)

 >8 
diff --git a/advice.c b/advice.c
index bc531fc..4612165 100644
--- a/advice.c
+++ b/advice.c
@@ -80,17 +80,17 @@ int git_default_advice_config(const char *var, const char 
*value)
 int error_resolve_conflict(const char *me)
 {
if (!strcmp(me, "cherry-pick"))
-   error(_("cherry-pick is not possible because you have unmerged 
files."));
+   error(_("Cherry-picking is not possible because you have 
unmerged files."));
else if (!strcmp(me, "commit"))
-   error(_("commit is not possible because you have unmerged 
files."));
+   error(_("Committing is not possible because you have unmerged 
files."));
else if (!strcmp(me, "merge"))
-   error(_("merge is not possible because you have unmerged 
files."));
+   error(_("Merging is not possible because you have unmerged 
files."));
else if (!strcmp(me, "pull"))
-   error(_("pull is not possible because you have unmerged 
files."));
+   error(_("Pulling is not possible because you have unmerged 
files."));
else if (!strcmp(me, "revert"))
-