Re: What's cooking in git.git (Jun 2016, #02; Mon, 6)

Junio C Hamano pobox.com> writes: > * va/i18n-even-more (2016-05-26) 22 commits > - t5523: use test_i18ngrep for negation [snip because of gmane] > - i18n: advice: mark string about detached head for translation > - i18n: builtin/remote.c: fix mark for translation > > More markings of

[PATCH v4 05/38] i18n: sequencer: mark entire sentences for translation

ource code verbosity. Moreover, translators can now 1) translate the terms "revert" and "cherry-pick" if they please 2) have more leeway to adapt their translations. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- sequencer.c | 11 --- 1 file changed, 8

[PATCH v4 13/38] i18n: git-sh-setup.sh: mark strings for translation

to, for instance, gettextln not being found. [1] http://www.gnu.org/software/gettext/manual/html_node/Preparing-Shell-Scripts.html Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- I don't know if we want to copy the text from git-sh-i18n.sh into git-sh-setup.sh file or sourcing the

[PATCH v4 23/38] i18n: bisect: mark strings for translation

In the last message, involving Q_(), try to mark the message in such way that is suited for RTL (Right to Left) languages. Update test t6030-bisect-porcelain.sh to reflect the changes. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- bisect.c

[PATCH v4 15/38] i18n: rebase-interactive: mark here-doc strings for translation

GETTEXT_POISON. Otherwise, tests would fail under GETTEXT_POISON, or other build that doesn't support the GNU gettext, because that function could not be found. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- git-rebase--interactive.sh| 30 +++--- git-sh-i

[PATCH v4 18/38] tests: use test_i18n* functions to suppress false positives

marked for translation, suppressing false positives. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- t/t0008-ignores.sh| 4 ++-- t/t1300-repo-config.sh| 8 t/t1307-config-blob.sh| 5 + t/t1308-config-set.sh | 4 ++-- t

[PATCH v4 20/38] t9003: become resilient to GETTEXT_POISON

The test t9003-help-autocorrect.sh fails when run under GETTEXT_POISON, because it's expecting to filter out the original output. Accommodate gettext poison case by also filtering out the default simulated output. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- t/t900

[PATCH v4 32/38] i18n: remote: mark URL fallback text for translation

Marks fallback text for translation that may be displayed in git remote show output. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- builtin/remote.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/remote.c b/builtin/remote.c index ae74da6..9

[PATCH v4 09/38] i18n: rebase: fix marked string to use eval_gettext variant

The string message marked for translation should use eval_gettext variant instead of the gettext one, since we want to dollar-substitute $head_name in the result. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- git-rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[PATCH v4 14/38] i18n: rebase-interactive: mark strings for translation

Mark strings in git-rebase--interactive.sh for translation. There is no need to source git-sh-i18n since git-rebase.sh already does so. Add git-rebase--interactive.sh to LOCALIZED_SH in Makefile in order to enable extracting strings marked for translation by xgettext. Signed-off-by: Vasco

[PATCH v4 21/38] t4153: fix negated test_i18ngrep call

tests: fix negated test_i18ngrep calls", 2014-08-13). Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- t/t4153-am-resume-override-opts.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t4153-am-resume-override-opts.sh b/t/t4153-am-resume-override-opts.

[PATCH v4 01/38] i18n: builtin/remote.c: fix mark for translation

The second string inside _() was not being extracted for translation by xgettext, meaning that, although the string was passed to gettext, there was no translation available. Mark each individual string instead of marking the result of ternary if. Signed-off-by: Vasco Almeida <vascoma

[PATCH v4 25/38] i18n: notes: mark strings for translation

. Fix conflicts in %s and [...]". Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- builtin/notes.c | 20 ++-- t/t3310-notes-merge-manual-resolve.sh | 8 t/t3320-notes-merge-worktrees.sh | 2 +- 3 files changed, 15 insertions(

[PATCH v4 17/38] i18n: setup: mark strings for translation

Update tests that compare the strings newly marked for translation to succeed when running under GETTEXT_POISON. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- setup.c| 16 t/t1506-rev-parse-diagnosis.sh | 2 +- t/t4208-log-magic-paths

[PATCH v4 07/38] i18n: merge-octopus: mark messages for translation

Mark messages in git-merge-octopus.sh for translation. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- git-merge-octopus.sh | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh index dc2fd1b..89e967a

[PATCH v4 24/38] i18n: transport-helper.c: change N_() call to _()

The N_() no-op call currently marks the string to be extracted by xgettext but doesn't trigger the retrieval of the translation at run time, whereas _() does both. Meaning that, in spite of having translations available, they were never retrieved to make use of them. Signed-off-by: Vasco Almeida

[PATCH v4 02/38] i18n: advice: mark string about detached head for translation

Mark string with advice seen by the user when in detached head. Update test t7201-co.sh to pass under GETTEXT_POISON build. Pretend success if the number of lines of "git checkout renamer^" output is not greater than 1 and test are running under GETTEXT_POISON. Signed-off-by: Vas

[PATCH v4 08/38] merge-octupus: use die shell function from git-sh-setup.sh

Source git-sh-setup in order to use die shell function from git-sh-setup.sh library instead of using the one defined in git-merge-octopus.sh. Remove the former die function. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- git-merge-octopus.sh | 6 +- 1 file changed, 1 ins

[PATCH v4 00/38] i18n and test updates

g/gmane.comp.version-control.git/296106 Interdiff v3 v4 included bellow. Vasco Almeida (38): 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 fo

[PATCH v4 33/38] i18n: remote: allow translations to reorder message

Before this patch, translations couldn't place the branch name where it was better fit in the message "and with remote ". Allow translations that, instead of forcing the branch name to display right of the message. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- buil

[PATCH v4 19/38] tests: unpack-trees: update to use test_i18n* functions

ot;i18n: unpack-trees: avoid substituting only a verb in sentences", 2016-05-12). Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- t/t1011-read-tree-sparse-checkout.sh | 2 +- t/t3400-rebase.sh| 4 ++-- t/t3404-rebase-interactive.sh| 4 ++--

[PATCH v4 28/38] i18n: merge: mark messages for translation

Mark messages shown to the user for translation. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- builtin/merge.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/merge.c b/builtin/merge.c index b555a1b..961def5 100644 --- a/builtin/merge.c

[PATCH v4 31/38] i18n: standardise messages

s'" "index file corrupt" "corrupt index file" "failed to read %s" "read of %s failed" "detach the HEAD at named commit" "detach HEAD at named commit" Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- builtin/apply.c

[PATCH v4 16/38] i18n: rebase-interactive: mark comments of squash for translation

d of eval_gettext, since other languages have more complex plural forms. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- git-rebase--interactive.sh | 69 +- t/lib-rebase.sh| 1 + 2 files changed, 57 insertions(+), 13 d

[PATCH v4 06/38] i18n: sequencer: mark string for translation

Mark informative string ": fast-forward" for translation. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- sequencer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sequencer.c b/sequencer.c index 88a7c78..57b3671 100644 --- a/sequencer.c +++ b/seque

[PATCH v4 04/38] i18n: transport: mark strings for translation

Mark one printf string and one error string for translation. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- transport.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/transport.c b/transport.c index 095e61f..59b911e 100644 --- a/trans

[PATCH v4 27/38] i18n: config: unfold error messages marked for translation

t instance. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- cache.h| 9 - config.c | 101 - submodule-config.c | 2 +- 3 files changed, 94 insertions(+), 18 deletions(-) diff --git a/cache.h b/cache

[PATCH v4 10/38] i18n: rebase: mark placeholder for translation

Mark placeholder "" in git-rebase.sh for translation. The string containing the named placeholder is passed to shell function error_on_missing_default_upstream in git-parse-remote.sh which uses it to display a command hint for the user. Signed-off-by: Vasco Almeida <vascomal

[PATCH v4 12/38] t6030: update to use test_i18ncmp

Since the git bisect output tested here is subject to translation, the helper function test_i18ncmp should be used over test_cmp. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- t/t6030-bisect-porcelain.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t

[PATCH v4 26/38] i18n: notes: mark options for translation

Mark options description of git prune for translation. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- builtin/notes.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/notes.c b/builtin/notes.c index d11e6eb..0572051 100644 --- a/builtin/notes.c

[PATCH v4 03/38] i18n: advice: internationalize message for conflicts

languages. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- advice.c| 17 +++-- builtin/pull.c | 2 +- t/t5520-pull.sh | 2 +- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/advice.c b/advice.c index cb445a7..b84ae49 100644 --- a/advice.

[PATCH v4 29/38] i18n: merge: change command option help to lowercase

Change command option description to lowercase, matching pull counterpart option. Translators would have to translate such message only once. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- builtin/merge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b

[PATCH v4 30/38] i18n: sequencer: add period to error message

Add a period to error message so it matches others instances in sequencer.c. Now translator would have to translate such message only once. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- sequencer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sequenc

[PATCH v4 11/38] i18n: bisect: simplify error message for i18n

for Internationalization from gettext manual [1]: "Simplify translatable strings so that they don't contain command substitution ("`...`" or "$(...)") [...]" [1] http://www.gnu.org/software/gettext/manual/html_node/Preparing-Shell-Scripts.html Signed-off-by: Vasco Almeida &l

[PATCH v4 22/38] t5523: use test_i18ngrep for negation

of consistency and also to make obvious that those strings are subject to i18n. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- t/t5523-push-upstream.sh | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/t/t5523-push-upstream.sh b/t/t5523-push-upstream.sh

[PATCH v4 37/38] i18n: unmark die messages for translation

These messages are relevant for the programmer only, not for the end user. Thus, they can be unmarked for translation, saving translator some work. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- git-bisect.sh | 2 +- wt-status.c | 4 ++-- 2 files changed, 3 insertions

[PATCH v4 35/38] i18n: submodule: join strings marked for translation

Join strings marked for translation since that would facilitate and improve translations result. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- git-submodule.sh | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/git-submodule.sh b/git-submod

[PATCH v4 38/38] i18n: branch: mark comment when editing branch description for translation

When one issues git branch --edit-description branch_name, a edit with that message commented out is opened. Mark that message for translation in to order to be localized. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- builtin/branch.c | 6 +++--- 1 file changed, 3 insertions

[PATCH v4 36/38] i18n: submodule: escape shell variables inside eval_gettext

-Scripts.html Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- git-submodule.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-submodule.sh b/git-submodule.sh index f72b237..1ff2f3a 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -618,7 +618,7 @@ cmd_

[PATCH v4 34/38] i18n: init-db: join message pieces

Join message displayed during repository initialization in one entire sentence. That would improve translations since it's easier translate an entire sentence than translating each piece. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- builtin/init-db.c | 17 ++---

Re: [PATCH v3 24/39] i18n: bisect: enable l10n of bisect terms in messages

Às 17:33 de 02-06-2016, Junio C Hamano escreveu: > Vasco Almeida <vascomalme...@sapo.pt> writes: > >> Às 17:38 de 01-06-2016, Junio C Hamano escreveu: >>> Vasco Almeida <vascomalme...@sapo.pt> writes: >>> >>>> @@ -

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

Às 17:11 de 27-05-2016, Junio C Hamano escreveu: > Vasco Almeida <vascomalme...@sapo.pt> writes: > >> Marks several messages for translation and updates tests to pass under >> GETTEXT_POISON. Some tests were updated to fit previous i18n marks, others >>

Re: [PATCH v2 02/22] i18n: advice: mark string about detached head for translation

Às 19:27 de 23-05-2016, Vasco Almeida escreveu: > Mark string with advice seen by the user when in detached head. > > Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> > --- > advice.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git

Re: [PATCH v2 16/22] i18n: rebase-interactive: mark comments of squash for translation

Às 22:35 de 26-05-2016, Junio C Hamano escreveu: > Vasco Almeida <vascomalme...@sapo.pt> writes: > >> Helper functions this_nth_commit_message and skip_nth_commit_message >> replace the previous method of making the comment messages (such as >> "This

Re: [PATCH v2 14/22] i18n: rebase-interactive: mark strings for translation

Às 22:36 de 26-05-2016, Junio C Hamano escreveu: > Vasco Almeida <vascomalme...@sapo.pt> writes: > >> @@ -222,9 +223,10 @@ has_action () { >> } >> >> is_empty_commit() { >> -tree=$(git rev-parse -q --verify "$1"^{tree} 2>/dev

Re: [PATCH v2 13/22] i18n: git-sh-setup.sh: mark strings for translation

Às 22:46 de 26-05-2016, Junio C Hamano escreveu: > Vasco Almeida <vascomalme...@sapo.pt> writes: > >> > require_work_tree_exists () { >> > + program_name=$0 >> >if test "z$(git rev-parse --is-bare-repository)" != zfalse >> >

Re: [PATCH v2 18/22] tests: use test_i18n* functions to suppress false positives

Às 17:08 de 27-05-2016, Junio C Hamano escreveu: > Vasco Almeida <vascomalme...@sapo.pt> writes: > >> diff --git a/t/t1307-config-blob.sh b/t/t1307-config-blob.sh >> index 3c6791e..4079fef 100755 >> --- a/t/t1307-config-blob.sh >> +++ b/t/t1

Re: [PATCH v3 28/39] i18n: config: unfold error messages marked for translation

Às 17:43 de 01-06-2016, Junio C Hamano escreveu: > Vasco Almeida <vascomalme...@sapo.pt> writes: > >> Introduced in 473166b ("config: add 'origin_type' to config_source >> struct", 2016-02-19), Git can inform the user about the origin of a >> config erro

Re: [PATCH v3 13/39] i18n: git-sh-setup.sh: mark strings for translation

Às 20:30 de 01-06-2016, Junio C Hamano escreveu: > Junio C Hamano writes: > Would it allow you to lose the $(git --exec-path) prefix in the new > dot-source to have this patch before applying your patch? > > -- >8 -- > Subject: t2300: run git-sh-setup in an environment that

Re: [PATCH v3 24/39] i18n: bisect: enable l10n of bisect terms in messages

Às 17:38 de 01-06-2016, Junio C Hamano escreveu: > Vasco Almeida <vascomalme...@sapo.pt> writes: > >> +enum term { BAD, GOOD, OLD, NEW }; >> +static const char *term_names[] = { >> +/* TRANSLATORS: in bisect.c source code file, the following terms are >> + us

[PATCH v3 21/39] t4153: fix negated test_i18ngrep call

tests: fix negated test_i18ngrep calls", 2014-08-13). Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- t/t4153-am-resume-override-opts.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t4153-am-resume-override-opts.sh b/t/t4153-am-resume-override-opts.

[PATCH v3 03/39] i18n: advice: internationalize message for conflicts

languages. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- advice.c| 17 +++-- builtin/pull.c | 2 +- t/t5520-pull.sh | 2 +- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/advice.c b/advice.c index cb445a7..b84ae49 100644 --- a/advice.

[PATCH v3 23/39] i18n: bisect: mark strings for translation

In the last message, involving Q_(), try to mark the message in such way that is suited for RTL (Right to Left) languages. Update test t6030-bisect-porcelain.sh to reflect the changes. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- bisect.c

[PATCH v3 26/39] i18n: notes: mark strings for translation

. Fix conflicts in %s and [...]". Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- builtin/notes.c | 20 ++-- t/t3310-notes-merge-manual-resolve.sh | 8 t/t3320-notes-merge-worktrees.sh | 2 +- 3 files changed, 15 insertions(

[PATCH v3 22/39] t5523: use test_i18ngrep for negation

of consistency and also to make obvious that those strings are subject to i18n. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- t/t5523-push-upstream.sh | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/t/t5523-push-upstream.sh b/t/t5523-push-upstream.sh

[PATCH v3 00/39] i18n and test updates

fixes issues comment on the previous discussion and adds patches to mark more strings for translation. Previous discussion: http://thread.gmane.org/gmane.comp.version-control.git/295354 Interdiff v2 v3 included bellow. Vasco Almeida (39): i18n: builtin/remote.c: fix mark for translation i18n

[PATCH v3 17/39] i18n: setup: mark strings for translation

Update tests that compare the strings newly marked for translation to succeed when running under GETTEXT_POISON. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- setup.c| 16 t/t1506-rev-parse-diagnosis.sh | 2 +- t/t4208-log-magic-paths

[PATCH v3 25/39] i18n: transport-helper.c: change N_() call to _()

The N_() no-op call currently marks the string to be extracted by xgettext but doesn't trigger the retrieval of the translation at run time, whereas _() does both. Meaning that, in spite of having translations available, they were never retrieved to make use of them. Signed-off-by: Vasco Almeida

[PATCH v3 04/39] i18n: transport: mark strings for translation

Mark one printf string and one error string for translation. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- transport.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/transport.c b/transport.c index 095e61f..59b911e 100644 --- a/trans

[PATCH v3 32/39] i18n: standardise messages

s'" "index file corrupt" "corrupt index file" "failed to read %s" "read of %s failed" "detach the HEAD at named commit" "detach HEAD at named commit" Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- builtin/apply.c

[PATCH v3 31/39] i18n: sequencer: add period to error message

Add a period to error message so it matches others instances in sequencer.c. Now translator would have to translate such message only once. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- sequencer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sequenc

[PATCH v3 10/39] i18n: rebase: mark placeholder for translation

Mark placeholder "" in git-rebase.sh for translation. The string containing the named placeholder is passed to shell function error_on_missing_default_upstream in git-parse-remote.sh which uses it to display a command hint for the user. Signed-off-by: Vasco Almeida <vascomal

[PATCH v3 07/39] i18n: merge-octopus: mark messages for translation

Mark messages in git-merge-octopus.sh for translation. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- git-merge-octopus.sh | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh index dc2fd1b..89e967a

[PATCH v3 24/39] i18n: bisect: enable l10n of bisect terms in messages

sect.sh. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- bisect.c | 29 +++-- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/bisect.c b/bisect.c index a8713a8..293d7ec 100644 --- a/bisect.c +++ b/bisect.c @@ -23,6 +23,15 @@ static const char *a

[PATCH v3 18/39] tests: use test_i18n* functions to suppress false positives

marked for translation, suppressing false positives. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- t/t0008-ignores.sh| 4 ++-- t/t1300-repo-config.sh| 8 t/t1307-config-blob.sh| 5 + t/t1308-config-set.sh | 4 ++-- t

[PATCH v3 01/39] i18n: builtin/remote.c: fix mark for translation

The second string inside _() was not being extracted for translation by xgettext, meaning that, although the string was passed to gettext, there was no translation available. Mark each individual string instead of marking the result of ternary if. Signed-off-by: Vasco Almeida <vascoma

[PATCH v3 08/39] merge-octupus: use die shell function from git-sh-setup.sh

Source git-sh-setup in order to use die shell function from git-sh-setup.sh library instead of using the one defined in git-merge-octopus.sh. Remove the former die function. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- git-merge-octopus.sh | 6 +- 1 file changed, 1 ins

[PATCH v3 33/39] i18n: remote: mark URL fallback text for translation

Marks fallback text for translation that may be displayed in git remote show output. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- builtin/remote.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/remote.c b/builtin/remote.c index ae74da6..9

[PATCH v3 28/39] i18n: config: unfold error messages marked for translation

t instance. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- cache.h| 9 - config.c | 102 - submodule-config.c | 2 +- 3 files changed, 95 insertions(+), 18 deletions(-) diff --git a/cache.h b/cache

[PATCH v3 29/39] i18n: merge: mark messages for translation

Mark messages shown to the user for translation. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- builtin/merge.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/merge.c b/builtin/merge.c index b555a1b..961def5 100644 --- a/builtin/merge.c

[PATCH v3 11/39] i18n: bisect: simplify error message for i18n

for Internationalization from gettext manual [1]: "Simplify translatable strings so that they don't contain command substitution ("`...`" or "$(...)") [...]" [1] http://www.gnu.org/software/gettext/manual/html_node/Preparing-Shell-Scripts.html Signed-off-by: Vasco Almeida &l

[PATCH v3 02/39] i18n: advice: mark string about detached head for translation

Mark string with advice seen by the user when in detached head. Update test t7201-co.sh to pass under GETTEXT_POISON build. Pretend success if the number of lines of "git checkout renamer^" output is not greater than 1 and test are running under GETTEXT_POISON. Signed-off-by: Vas

[PATCH v3 30/39] i18n: merge: change command option help to lowercase

Change command option description to lowercase, matching pull counterpart option. Translators would have to translate such message only once. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- builtin/merge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b

[PATCH v3 09/39] i18n: rebase: fix marked string to use eval_gettext variant

The string message marked for translation should use eval_gettext variant instead of the gettext one, since we want to dollar-substitute $head_name in the result. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- git-rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[PATCH v3 27/39] i18n: notes: mark options for translation

Mark options description of git prune for translation. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- builtin/notes.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/notes.c b/builtin/notes.c index d11e6eb..0572051 100644 --- a/builtin/notes.c

[PATCH v3 13/39] i18n: git-sh-setup.sh: mark strings for translation

8n instead of simply git-sh-i18n, because latter case would fail test t2300-cd-to-toplevel.sh. [1] http://www.gnu.org/software/gettext/manual/html_node/Preparing-Shell-Scripts.html Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- Makefile| 4 +++- git-

[PATCH v3 19/39] tests: unpack-trees: update to use test_i18n* functions

ot;i18n: unpack-trees: avoid substituting only a verb in sentences", 2016-05-12). Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- t/t1011-read-tree-sparse-checkout.sh | 2 +- t/t3400-rebase.sh| 4 ++-- t/t3404-rebase-interactive.sh| 4 ++--

[PATCH v3 16/39] i18n: rebase-interactive: mark comments of squash for translation

d of eval_gettext, since other languages have more complex plural forms. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- git-rebase--interactive.sh | 69 +- t/lib-rebase.sh| 1 + 2 files changed, 57 insertions(+), 13 d

[PATCH v3 20/39] t9003: become resilient to GETTEXT_POISON

The test t9003-help-autocorrect.sh fails when run under GETTEXT_POISON, because it's expecting to filter out the original output. Accommodate gettext poison case by also filtering out the default simulated output. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- t/t900

[PATCH v3 35/39] i18n: init-db: join message pieces

Join message displayed during repository initialization in one entire sentence. That would improve translations since it's easier translate an entire sentence than translating each piece. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- builtin/init-db.c | 17 ++---

[PATCH v3 37/39] i18n: submodule: escape shell variables inside eval_gettext

-Scripts.html Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- git-submodule.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-submodule.sh b/git-submodule.sh index 91fca56..75a7ebe 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -648,7 +648,7 @@ cmd_

[PATCH v3 34/39] i18n: remote: allow translations to reorder message

Before this patch, translations couldn't place the branch name where it was better fit in the message "and with remote ". Allow translations that, instead of forcing the branch name to display right of the message. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- buil

[PATCH v3 39/39] i18n: branch: mark comment when editing branch description for translation

When one issues git branch --edit-description branch_name, a edit with that message commented out is opened. Mark that message for translation in to order to be localized. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- builtin/branch.c | 6 +++--- 1 file changed, 3 insertions

[PATCH v3 36/39] i18n: submodule: join strings marked for translation

Join strings marked for translation since that would facilitate and improve translations result. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- git-submodule.sh | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/git-submodule.sh b/git-submod

[PATCH v3 38/39] i18n: unmark die messages for translation

These messages are relevant for the programmer only, not for the end user. Thus, they can be unmarked for translation, saving translator some work. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- git-bisect.sh | 2 +- wt-status.c | 4 ++-- 2 files changed, 3 insertions

[PATCH v3 15/39] i18n: rebase-interactive: mark here-doc strings for translation

GETTEXT_POISON. Otherwise, tests would fail under GETTEXT_POISON, or other build that doesn't support the GNU gettext, because that function could not be found. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- git-rebase--interactive.sh| 30 +++--- git-sh-i

[PATCH v3 14/39] i18n: rebase-interactive: mark strings for translation

Mark strings in git-rebase--interactive.sh for translation. There is no need to source git-sh-i18n since git-rebase.sh already does so. Add git-rebase--interactive.sh to LOCALIZED_SH in Makefile in order to enable extracting strings marked for translation by xgettext. Signed-off-by: Vasco

[PATCH v3 06/39] i18n: sequencer: mark string for translation

Mark informative string ": fast-forward" for translation. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- sequencer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sequencer.c b/sequencer.c index 88a7c78..57b3671 100644 --- a/sequencer.c +++ b/seque

[PATCH v3 12/39] t6030: update to use test_i18ncmp

Since the git bisect output tested here is subject to translation, the helper function test_i18ncmp should be used over test_cmp. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- t/t6030-bisect-porcelain.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t

[PATCH v3 05/39] i18n: sequencer: mark entire sentences for translation

ource code verbosity. Moreover, translators can now 1) translate the terms "revert" and "cherry-pick" if they please 2) have more leeway to adapt their translations. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- sequencer.c | 11 --- 1 file changed, 8

[PATCH 02/11] i18n: add--interactive: mark simple here documents for translation

se, reusing here document would add a trailer newline to the message, making them not match 100%, hence creating two entries in pot template for translation rather than a single entry. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- git-add--interactive.perl | 24 --

[PATCH 06/11] i18n: add--interactive: i18n of help_patch_cmd

Mark help message of help_patch_cmd for translation. The message must be unfolded to be free of variables so we can have hight quality translations. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- git-add--interactive.perl | 65 +++

[PATCH 05/11] i18n: add--interactive: mark message for translation

to the correct entry of %patch_modes, focusing only on value of %patch_modes. Now, we are also interested in the key ('staged', 'stash', 'checkout_head', ...). Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- git-add--interactive.perl | 112 ++

[PATCH 04/11] i18n: add--interactive: mark plural strings

Mark plural strings for translation. Unfold each action case in one entire sentence. Pass new keyword for xgettext to extract. Update test to include new subrotine Q__() for plural strings handling. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- Makefile

[PATCH 03/11] i18n: add--interactive: mark strings with interpolation for translation

Use of sprintf following die or error_msg is necessary for placeholder substitution take place. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- git-add--interactive.perl | 26 ++ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/g

[PATCH 11/11] i18n: difftool: mark warnings for translation

Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- git-difftool.perl | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/git-difftool.perl b/git-difftool.perl index ebd13ba..fe7f003 100755 --- a/git-difftool.perl +++ b/git-difftool.perl @@ -22,6

[PATCH 10/11] i18n: send-email: mark string with interpolation for translation

Mark warnings, errors and other messages that are interpolated for translation. We must call sprintf() before calling die() and in few other circumstances in order to interpolation take place. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- git-send-email.per

[PATCH 08/11] i18n: send-email: mark strings for translation

Mark strings often displayed to user for translation. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- git-send-email.perl | 53 +++-- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/git-send-email.perl b/git-send-emai

[PATCH 01/11] i18n: add--interactive: mark strings for translation

Mark simple strings (without interpolation) for translation. Brackets around first parameter of ternary operator is necessary because otherwise xgettext fails to extract strings marked for translation from the rest of the file. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- g

[PATCH 07/11] i18n: add--interactive: mark edit_hunk message for translation

to change wording of one particular use case. Signed-off-by: Vasco Almeida <vascomalme...@sapo.pt> --- git-add--interactive.perl | 60 ++- 1 file changed, 49 insertions(+), 11 deletions(-) diff --git a/git-add--interactive.perl b/g

  1   2   3   4   5   >