Re: [PATCH 1/5] git-gui i18n: mark strings for translation

2016-10-03 Thread Vasco Almeida
A Seg, 03-10-2016 às 11:30 +0100, Pat Thoyts escreveu: > Vasco Almeida writes: > > > > > Mark strings for translation in lib/index.tcl that were seemingly > > left behind by 700e560 ("git-gui: Mark forgotten strings for > > translation.&

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

2016-10-03 Thread Vasco Almeida
A Sáb, 01-10-2016 às 19:09 +0200, Jakub Narębski escreveu: > W dniu 26.09.2016 o 01:09, Junio C Hamano pisze: > > Vasco Almeida writes: > >  > >> -print colored $prompt_color, > $patch_mode_flavour{VERB}, > >> -  ($hunk[

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

2016-10-03 Thread Vasco Almeida
A Sáb, 01-10-2016 às 18:49 +0200, Jakub Narębski escreveu: > W dniu 26.09.2016 o 20:15, Vasco Almeida pisze: > > > > A Qua, 31-08-2016 às 12:31 +, Vasco Almeida escreveu: > > > > > > > > > Mark plural strings for translation.  Unfold each acti

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

2016-10-03 Thread Vasco Almeida
A Qui, 29-09-2016 às 23:27 +0200, Jakub Narębski escreveu: > W dniu 29.09.2016 o 19:05, Junio C Hamano pisze: > > > > Vasco Almeida writes: > > > > > > > > On the other hand, would it make sense to translate these > > > commands? If > > &g

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

2016-10-03 Thread Vasco Almeida
> W dniu 31.08.2016 o 14:31, Vasco Almeida pisze: > > Use of sprintf following die or error_msg is necessary for > > placeholder > > substitution take place. > > No, it is not.  Though I don't think that we have in out Git::I18N > the support for Perl i18n place

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

2016-09-29 Thread Vasco Almeida
A Dom, 25-09-2016 às 15:54 -0700, Junio C Hamano escreveu: > >  sub status_cmd { > > @@ -1573,14 +1573,14 @@ sub quit_cmd { > >  } > >   > >  sub help_cmd { > > - print colored $help_color, <<\EOF ; > > -status    - show paths with changes > > + print colored $help_color, __( > > +"stat

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

2016-09-28 Thread Vasco Almeida
A Dom, 25-09-2016 às 15:52 -0700, Junio C Hamano escreveu: > > @@ -252,7 +253,7 @@ sub list_untracked { > >  } > >   > >  my $status_fmt = '%12s %12s %s'; > > -my $status_head = sprintf($status_fmt, 'staged', 'unstaged', 'path'); > > +my $status_head = sprintf($status_fmt, __('staged'), __('unstage

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

2016-09-26 Thread Vasco Almeida
A Qua, 31-08-2016 às 12:31 +, Vasco Almeida escreveu: > 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. &g

Re: git-gui, was Re: [PATCH v2 6/6] git-gui: Update Japanese information

2016-09-20 Thread Vasco Almeida
Hi Junio Hamano, I have sent some git-gui patches on May this year and I think it will add value to accepted them at some point: git-gui: i18n stuff and small fixes <1462704778-4722-1-git-send-email-vascomalme...@sapo.pt> http://www.mail-archive.com/git@vger.kernel.org/msg92780.html git-gui: l10

[PATCH 6/6] i18n: stash: mark messages for translation

2016-09-19 Thread Vasco Almeida
Signed-off-by: Vasco Almeida --- git-stash.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/git-stash.sh b/git-stash.sh index 826af18..90d63f2 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -100,7 +100,7 @@ create_stash () { u_tree

[PATCH 5/6] i18n: notes-merge: mark die messages for translation

2016-09-19 Thread Vasco Almeida
Update test to reflect changes. Signed-off-by: Vasco Almeida --- notes-merge.c | 8 t/t3310-notes-merge-manual-resolve.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/notes-merge.c b/notes-merge.c index 97fc42f..3bbeb86 100644 --- a

[PATCH 3/6] i18n: diff: mark die errors for translation

2016-09-19 Thread Vasco Almeida
Signed-off-by: Vasco Almeida --- diff.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/diff.c b/diff.c index b4310f8..d82ad79 100644 --- a/diff.c +++ b/diff.c @@ -3325,7 +3325,7 @@ void diff_setup_done(struct diff_options *options) if (options

[PATCH 2/6] i18n: connect: mark die messages for translation

2016-09-19 Thread Vasco Almeida
Mark messages passed to die() in die_initial_contact(). Update test to reflect changes. Signed-off-by: Vasco Almeida --- connect.c| 8 t/t5512-ls-remote.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/connect.c b/connect.c index 722dc3f..06bff0b

[PATCH 4/6] i18n: ident: mark hint for translation

2016-09-19 Thread Vasco Almeida
Mark env_hint for translation. Signed-off-by: Vasco Almeida --- ident.c | 32 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/ident.c b/ident.c index e20a772..92c3cca 100644 --- a/ident.c +++ b/ident.c @@ -331,17 +331,17 @@ int split_ident_line

[PATCH 1/6] i18n: commit: mark message for translation

2016-09-19 Thread Vasco Almeida
Mark message commit_utf8_warn for translation. Update tests to reflect changes. Signed-off-by: Vasco Almeida --- commit.c | 8 t/t3900-i18n-commit.sh | 8 t/t3901-i18n-patch.sh | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/commit.c b

[PATCH v3 12/14] i18n: show-branch: mark error messages for translation

2016-09-15 Thread Vasco Almeida
Lowercase some messages first word to match style of the others. Signed-off-by: Vasco Almeida --- builtin/show-branch.c | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/builtin/show-branch.c b/builtin/show-branch.c index 2566935..5809371 100644 --- a/builtin

[PATCH v3 13/14] i18n: show-branch: mark plural strings for translation

2016-09-15 Thread Vasco Almeida
Mark plural string for translation using Q_(). Although we already know that the plural sentence is always used in the English source, other languages have complex plural rules they must comply according to the value of MAX_REVS. Signed-off-by: Vasco Almeida --- builtin/show-branch.c | 14

[PATCH v3 09/14] i18n: notes: mark error messages for translation

2016-09-15 Thread Vasco Almeida
Signed-off-by: Vasco Almeida --- builtin/notes.c | 20 +++- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/builtin/notes.c b/builtin/notes.c index f848b89..229ad6d 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -340,7 +340,9 @@ static struct notes_tree

[PATCH v3 14/14] i18n: update-index: mark warnings for translation

2016-09-15 Thread Vasco Almeida
Signed-off-by: Vasco Almeida --- builtin/update-index.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/builtin/update-index.c b/builtin/update-index.c index ba04b19..7a17ce1 100644 --- a/builtin/update-index.c +++ b/builtin/update-index.c @@ -1127,9 +1127,9

[PATCH v3 10/14] notes: lowercase first word of error messages

2016-09-15 Thread Vasco Almeida
Follow the usual case style. Update one test to reflect these changes. Signed-off-by: Vasco Almeida --- builtin/notes.c | 64 t/t3320-notes-merge-worktrees.sh | 2 +- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a

[PATCH v3 05/14] i18n: branch: mark option description for translation

2016-09-15 Thread Vasco Almeida
Signed-off-by: Vasco Almeida --- builtin/branch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/branch.c b/builtin/branch.c index 7df0543..d5d93a8 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -657,7 +657,7 @@ int cmd_branch(int argc, const char **argv

[PATCH v3 06/14] i18n: config: mark error message for translation

2016-09-15 Thread Vasco Almeida
Signed-off-by: Vasco Almeida --- builtin/config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/config.c b/builtin/config.c index 6cbf733..05843a0 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -622,8 +622,8 @@ int cmd_config(int argc, const char **argv

[PATCH v3 01/14] i18n: apply: mark plural string for translation

2016-09-15 Thread Vasco Almeida
Mark plural string for translation using Q_(). Signed-off-by: Vasco Almeida --- builtin/apply.c | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 1a488f9..ef03c74 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -4768,10

[PATCH v3 08/14] i18n: merge-recursive: mark verbose message for translation

2016-09-15 Thread Vasco Almeida
Signed-off-by: Vasco Almeida --- builtin/merge-recursive.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c index 3b09610..0dd9021 100644 --- a/builtin/merge-recursive.c +++ b/builtin/merge-recursive.c @@ -74,7 +74,7 @@ int

[PATCH v3 07/14] i18n: merge-recursive: mark error messages for translation

2016-09-15 Thread Vasco Almeida
Lowercase first word of such error messages following the usual style. Signed-off-by: Vasco Almeida --- builtin/merge-recursive.c | 17 ++--- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c index fd2c455..3b09610

[PATCH v3 04/14] i18n: blame: mark error messages for translation

2016-09-15 Thread Vasco Almeida
Mark error messages for translation passed to die() function. Change "Cannot" to lowercase following the usual style. Reflect changes to test by using test_i18ngrep. Signed-off-by: Vasco Almeida --- builtin/blame.c | 18 ++ t/t8003-blame-corner-cas

[PATCH v3 11/14] i18n: receive-pack: mark messages for translation

2016-09-15 Thread Vasco Almeida
Mark messages refuse_unconfigured_deny_msg and refuse_unconfigured_deny_delete_current_msg for translation. Signed-off-by: Vasco Almeida --- builtin/receive-pack.c | 58 ++ 1 file changed, 25 insertions(+), 33 deletions(-) diff --git a/builtin

[PATCH v3 03/14] i18n: apply: mark info messages for translation

2016-09-15 Thread Vasco Almeida
Mark messages for translation printed to stderr. Signed-off-by: Vasco Almeida --- builtin/apply.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index ef2c084..43ab7c5 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -3525,7

[PATCH v3 02/14] i18n: apply: mark error messages for translation

2016-09-15 Thread Vasco Almeida
Mark error messages for translation passed to error() and die() functions. Signed-off-by: Vasco Almeida --- builtin/apply.c | 46 +++--- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index ef03c74

Re: [PATCH v2 07/14] i18n: merge-recursive: mark error messages for translation

2016-09-13 Thread Vasco Almeida
A Seg, 12-09-2016 às 09:04 -0700, Junio C Hamano escreveu: > Vasco Almeida writes: > > > > > Lowercase first word of such error messages following the usual > > style. > > "Change X to lowercase" is fine, but "Lowercase" is not a verb. >

Re: [PATCH v2 09/14] i18n: notes: mark error messages for translation

2016-09-13 Thread Vasco Almeida
A Seg, 12-09-2016 às 14:23 +0200, Jean-Noël Avila escreveu: > Le 12/09/2016 à 13:29, Vasco Almeida a écrit : > > > > Signed-off-by: Vasco Almeida > > --- > >  builtin/notes.c | 18 +- > >  1 file changed, 9 insertions(+), 9 deletions(-) > &

[PATCH v2 14/14] i18n: show-branch: mark plural strings for translation

2016-09-12 Thread Vasco Almeida
Mark plural string for translation using Q_(). Although we already know that the plural sentence is always used in the English source, other languages have complex plural rules they must comply according to the value of MAX_REVS. Signed-off-by: Vasco Almeida --- builtin/show-branch.c | 15

[PATCH v2 11/14] i18n: receive-pack: mark messages for translation

2016-09-12 Thread Vasco Almeida
Mark messages refuse_unconfigured_deny_msg and refuse_unconfigured_deny_delete_current_msg for translation. Signed-off-by: Vasco Almeida --- builtin/receive-pack.c | 58 ++ 1 file changed, 25 insertions(+), 33 deletions(-) diff --git a/builtin

[PATCH v2 13/14] i18n: update-index: mark warnings for translation

2016-09-12 Thread Vasco Almeida
Signed-off-by: Vasco Almeida --- builtin/update-index.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/builtin/update-index.c b/builtin/update-index.c index ba04b19..7a17ce1 100644 --- a/builtin/update-index.c +++ b/builtin/update-index.c @@ -1127,9 +1127,9

[PATCH v2 12/14] i18n: show-branch: mark error messages for translation

2016-09-12 Thread Vasco Almeida
Lowercase some messages first word to match style of the others. Signed-off-by: Vasco Almeida --- builtin/show-branch.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/builtin/show-branch.c b/builtin/show-branch.c index 2566935..6bf82cd 100644 --- a

[PATCH v2 01/14] i18n: apply: mark plural string for translation

2016-09-12 Thread Vasco Almeida
Mark plural string for translation using Q_(). Signed-off-by: Vasco Almeida --- builtin/apply.c | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 1a488f9..ef03c74 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -4768,10

[PATCH v2 09/14] i18n: notes: mark error messages for translation

2016-09-12 Thread Vasco Almeida
Signed-off-by: Vasco Almeida --- builtin/notes.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/builtin/notes.c b/builtin/notes.c index f848b89..abacae2 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -340,7 +340,7 @@ static struct notes_tree

[PATCH v2 04/14] i18n: blame: mark error messages for translation

2016-09-12 Thread Vasco Almeida
Mark error messages for translation passed to die() function. Change "Cannot" to lowercase following the usual style. Reflect changes to test by using test_i18ngrep. Signed-off-by: Vasco Almeida --- builtin/blame.c | 18 ++ t/t8003-blame-corner-cas

[PATCH v2 05/14] i18n: branch: mark option description for translation

2016-09-12 Thread Vasco Almeida
Signed-off-by: Vasco Almeida --- builtin/branch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/branch.c b/builtin/branch.c index 7df0543..d5d93a8 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -657,7 +657,7 @@ int cmd_branch(int argc, const char **argv

[PATCH v2 02/14] i18n: apply: mark error messages for translation

2016-09-12 Thread Vasco Almeida
Mark error messages for translation passed to error() and die() functions. Signed-off-by: Vasco Almeida --- builtin/apply.c | 46 +++--- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index ef03c74

[PATCH v2 08/14] i18n: merge-recursive: mark verbose message for translation

2016-09-12 Thread Vasco Almeida
Signed-off-by: Vasco Almeida --- builtin/merge-recursive.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c index 0bc88a7..1c21802 100644 --- a/builtin/merge-recursive.c +++ b/builtin/merge-recursive.c @@ -71,7 +71,7 @@ int

[PATCH v2 03/14] i18n: apply: mark info messages for translation

2016-09-12 Thread Vasco Almeida
Mark messages for translation printed to stderr. Signed-off-by: Vasco Almeida --- builtin/apply.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index ef2c084..43ab7c5 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -3525,7

[PATCH v2 07/14] i18n: merge-recursive: mark error messages for translation

2016-09-12 Thread Vasco Almeida
Lowercase first word of such error messages following the usual style. Signed-off-by: Vasco Almeida --- builtin/merge-recursive.c | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c index fd2c455..0bc88a7

[PATCH v2 06/14] i18n: config: mark error message for translation

2016-09-12 Thread Vasco Almeida
Signed-off-by: Vasco Almeida --- builtin/config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/config.c b/builtin/config.c index 6cbf733..05843a0 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -622,8 +622,8 @@ int cmd_config(int argc, const char **argv

[PATCH v2 10/14] notes: lowercase first word of error messages

2016-09-12 Thread Vasco Almeida
Follow the usual case style. Update one test to reflect these changes. Signed-off-by: Vasco Almeida --- builtin/notes.c | 64 t/t3320-notes-merge-worktrees.sh | 2 +- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a

[PATCH 12/13] i18n: show-branch: mark error messages for translation

2016-09-07 Thread Vasco Almeida
Lowercase some messages first word to match style of the others. Signed-off-by: Vasco Almeida --- builtin/show-branch.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/builtin/show-branch.c b/builtin/show-branch.c index 2566935..8a5097d 100644 --- a

[PATCH 11/13] i18n: receive-pack: mark messages for translation

2016-09-07 Thread Vasco Almeida
Mark messages refuse_unconfigured_deny_msg and refuse_unconfigured_deny_delete_current_msg for translation. Signed-off-by: Vasco Almeida --- builtin/receive-pack.c | 58 ++ 1 file changed, 25 insertions(+), 33 deletions(-) diff --git a/builtin

[PATCH 10/13] notes: lowercase first word of error messages

2016-09-07 Thread Vasco Almeida
Follow the usual case style. Update one test to reflect these changes. Signed-off-by: Vasco Almeida --- builtin/notes.c | 64 t/t3320-notes-merge-worktrees.sh | 2 +- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a

[PATCH 08/13] i18n: merge-recursive: mark verbose message for translation

2016-09-07 Thread Vasco Almeida
Signed-off-by: Vasco Almeida --- builtin/merge-recursive.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c index 0bc88a7..1c21802 100644 --- a/builtin/merge-recursive.c +++ b/builtin/merge-recursive.c @@ -71,7 +71,7 @@ int

[PATCH 07/13] i18n: merge-recursive: mark error messages for translation

2016-09-07 Thread Vasco Almeida
Lowercase first word of such error messages following the usual style. Signed-off-by: Vasco Almeida --- builtin/merge-recursive.c | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c index fd2c455..0bc88a7

[PATCH 06/13] i18n: config: mark error message for translation

2016-09-07 Thread Vasco Almeida
Signed-off-by: Vasco Almeida --- builtin/config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/config.c b/builtin/config.c index 6cbf733..05843a0 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -622,8 +622,8 @@ int cmd_config(int argc, const char **argv

[PATCH 09/13] i18n: notes: mark error messages for translation

2016-09-07 Thread Vasco Almeida
Signed-off-by: Vasco Almeida --- builtin/notes.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/builtin/notes.c b/builtin/notes.c index f848b89..abacae2 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -340,7 +340,7 @@ static struct notes_tree

[PATCH 13/13] i18n: update-index: mark warnings for translation

2016-09-07 Thread Vasco Almeida
Signed-off-by: Vasco Almeida --- builtin/update-index.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/builtin/update-index.c b/builtin/update-index.c index ba04b19..7a17ce1 100644 --- a/builtin/update-index.c +++ b/builtin/update-index.c @@ -1127,9 +1127,9

[PATCH 05/13] i18n: branch: mark option description for translation

2016-09-07 Thread Vasco Almeida
Signed-off-by: Vasco Almeida --- builtin/branch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/branch.c b/builtin/branch.c index 7df0543..d5d93a8 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -657,7 +657,7 @@ int cmd_branch(int argc, const char **argv

[PATCH 04/13] i18n: blame: mark error messages for translation

2016-09-07 Thread Vasco Almeida
Mark error messages for translation passed to die() function. Change "Cannot" to lowercase following the usual style. Reflect changes to test by using test_i18ngrep. Signed-off-by: Vasco Almeida --- builtin/blame.c | 12 ++-- t/t8003-blame-corner-cases.sh |

[PATCH 13/13] i18n: update-index: mark warning for translation

2016-09-07 Thread Vasco Almeida
Signed-off-by: Vasco Almeida --- builtin/update-index.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/builtin/update-index.c b/builtin/update-index.c index ba04b19..7a17ce1 100644 --- a/builtin/update-index.c +++ b/builtin/update-index.c @@ -1127,9 +1127,9

[PATCH 02/13] i18n: apply: mark error messages for translation

2016-09-07 Thread Vasco Almeida
Mark error messages for translation passed to error() and die() functions. Signed-off-by: Vasco Almeida --- builtin/apply.c | 46 +++--- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index ef03c74

[PATCH 03/13] i18n: apply: mark info messages for translation

2016-09-07 Thread Vasco Almeida
Mark messages for translation printed to stderr. Signed-off-by: Vasco Almeida --- builtin/apply.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index ef2c084..43ab7c5 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -3525,7

[PATCH 01/13] i18n: apply: mark plural string for translation

2016-09-07 Thread Vasco Almeida
Mark plural string for translation using Q_(). Signed-off-by: Vasco Almeida --- builtin/apply.c | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 1a488f9..ef03c74 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -4768,10

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

2016-08-31 Thread Vasco Almeida
Signed-off-by: Vasco Almeida --- git-difftool.perl | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/git-difftool.perl b/git-difftool.perl index ebd13ba..de8d783 100755 --- a/git-difftool.perl +++ b/git-difftool.perl @@ -22,6 +22,7 @@ use File::Path qw

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

2016-08-31 Thread Vasco Almeida
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 --- git-send-email.perl | 71

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

2016-08-31 Thread Vasco Almeida
Mark help message of help_patch_cmd for translation. The message must be unfolded to be free of variables so we can have high quality translations. Signed-off-by: Vasco Almeida --- git-add--interactive.perl | 65 +++ 1 file changed, 54 insertions

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

2016-08-31 Thread Vasco Almeida
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 --- git-add--interactive.perl | 91 ++-

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

2016-08-31 Thread Vasco Almeida
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 --- git-add--interactive.perl | 68

[PATCH v2 09/11] i18n: send-email: mark warnings and errors for translation

2016-08-31 Thread Vasco Almeida
Mark warnings, errors and other messages for translation. Signed-off-by: Vasco Almeida --- git-send-email.perl | 36 ++-- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index 2521832..e7f712e 100755 --- a

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

2016-08-31 Thread Vasco Almeida
Use of sprintf following die or error_msg is necessary for placeholder substitution take place. Signed-off-by: Vasco Almeida --- git-add--interactive.perl | 26 ++ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/git-add--interactive.perl b/git-add

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

2016-08-31 Thread Vasco Almeida
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 --- Makefile | 3 ++- git-add

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

2016-08-31 Thread Vasco Almeida
., wanting to change wording of one particular use case. Signed-off-by: Vasco Almeida --- git-add--interactive.perl | 60 ++- 1 file changed, 49 insertions(+), 11 deletions(-) diff --git a/git-add--interactive.perl b/git-add--interactive.perl ind

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

2016-08-31 Thread Vasco Almeida
Mark strings often displayed to user for translation. Signed-off-by: Vasco Almeida --- git-send-email.perl | 53 +++-- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index 6958785..2521832

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

2016-08-31 Thread Vasco Almeida
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 --- git-add--interactive.perl | 24 1 file changed, 12 i

[PATCH v2 00/11] Mark strings in perl script for translation

2016-08-31 Thread Vasco Almeida
Mark messages in some perl scripts for translation. Since v1, adds brackets so parameter grouping of sprintf parameters is easier to see. Interdiff included below. Vasco Almeida (11): i18n: add--interactive: mark strings for translation i18n: add--interactive: mark simple here documents for

[PATCH 2/3] t5520: become resilient to GETTEXT_POISON

2016-08-12 Thread Vasco Almeida
Use test_i18ngrep function instead of grep for grepping strings. Signed-off-by: Vasco Almeida --- t/t5520-pull.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 6ad37b5..5518445 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh

[PATCH 3/3] t7411: become resilient to GETTEXT_POISON

2016-08-12 Thread Vasco Almeida
The concerned test greps the error message in git_parse_source() which contains "bad config line %d in submodule-blob %s". Signed-off-by: Vasco Almeida --- t/t7411-submodule-config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t7411-submodule-config.sh

[PATCH 1/3] t3404: become resilient to GETTEXT_POISON

2016-08-12 Thread Vasco Almeida
The concerned test greps the output of exit_with_patch() in git-rebase--interactive.sh script. Signed-off-by: Vasco Almeida --- t/t3404-rebase-interactive.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index

[PATCH v2 2/3] i18n: archive: mark errors for translation

2016-08-10 Thread Vasco Almeida
Signed-off-by: Vasco Almeida --- archive.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/archive.c b/archive.c index 42df974..dde1ab4 100644 --- a/archive.c +++ b/archive.c @@ -458,11 +458,11 @@ static int parse_archive_args(int argc, const char **argv

[PATCH v2 3/3] i18n: git-stash: mark messages for translation

2016-08-10 Thread Vasco Almeida
Signed-off-by: Vasco Almeida --- I added the second mark that I had missed the first time. Thank you Junio C Hamano for spotting that. git-stash.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-stash.sh b/git-stash.sh index 22fb8bc..826af18 100755 --- a/git

[PATCH v2 1/3] i18n: setup: mark error messages for translation

2016-08-10 Thread Vasco Almeida
Signed-off-by: Vasco Almeida --- setup.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/setup.c b/setup.c index 6d0e0c9..fe572b8 100644 --- a/setup.c +++ b/setup.c @@ -759,9 +759,9 @@ static const char *setup_bare_git_dir(struct strbuf *cwd, int offset

Re: [PATCH 2/3] i18n: archive: mark errors for translation

2016-08-10 Thread Vasco Almeida
A Ter, 09-08-2016 às 12:35 -0700, Junio C Hamano escreveu: > Hmm, this function is called by write_archive(), which can be called > by the upload-archive process running on the remote end, whose > locale certainly is different from that of your local environment. > > If I do not read English and g

[PATCH 2/3] i18n: archive: mark errors for translation

2016-08-08 Thread Vasco Almeida
Signed-off-by: Vasco Almeida --- archive.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/archive.c b/archive.c index 42df974..dde1ab4 100644 --- a/archive.c +++ b/archive.c @@ -458,11 +458,11 @@ static int parse_archive_args(int argc, const char **argv

[PATCH 3/3] i18n: git-stash: mark message for translation

2016-08-08 Thread Vasco Almeida
Signed-off-by: Vasco Almeida --- git-stash.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-stash.sh b/git-stash.sh index 22fb8bc..9cbd682 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -265,7 +265,7 @@ save_stash () { create_stash "$stash_msg"

[PATCH 1/3] i18n: setup: mark error messages for translation

2016-08-08 Thread Vasco Almeida
Signed-off-by: Vasco Almeida --- setup.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/setup.c b/setup.c index 6d0e0c9..fe572b8 100644 --- a/setup.c +++ b/setup.c @@ -759,9 +759,9 @@ static const char *setup_bare_git_dir(struct strbuf *cwd, int offset

[PATCH v2] i18n: config: unfold error messages marked for translation

2016-07-28 Thread Vasco Almeida
t_config_from_parameters() and configset_add_value(). For error message in git_parse_source(), use xstrfmt() function to prepare the message string, instead of doing something like it's done for die_bad_number(), because intelligibility and code conciseness are improved for that instanc

[PATCH v4] i18n: notes: mark comment for translation

2016-07-28 Thread Vasco Almeida
Mark comment displayed when editing a note for translation. Signed-off-by: Vasco Almeida --- This patch follows the original output and Ævar Arnfjörð Bjarmason sugestion to remove \n from the source string in order to assure that the ouput layout is not change by one translator forgetting to

Re: [PATCH] i18n: config: unfold error messages marked for translation

2016-07-28 Thread Vasco Almeida
A Qua, 27-07-2016 às 13:00 -0700, Junio C Hamano escreveu: > Vasco Almeida writes: > > > > > + > > + switch (cf->origin_type) { > > + case CONFIG_ORIGIN_BLOB: > > + error_msg = xstrfmt(_("bad config line %d in blob > > %s"

[PATCH] i18n: config: unfold error messages marked for translation

2016-07-27 Thread Vasco Almeida
t_config_from_parameters() and configset_add_value(). For error message in git_parse_source(), use xstrfmt() function to prepare the message string, instead of doing something like it's done for die_bad_number(), because intelligibility and code conciseness are improved for that instanc

Re: [PATCH v3] i18n: notes: mark comment for translation

2016-07-27 Thread Vasco Almeida
A Ter, 26-07-2016 às 09:57 -0700, Junio C Hamano escreveu: > Vasco Almeida writes: > > > > > + strbuf_add_commented_lines(&buf, "\n", > > strlen("\n")); > > + strbuf_add_commented_li

Re: [PATCH v2] i18n: notes: mark comment for translation

2016-07-27 Thread Vasco Almeida
A Ter, 26-07-2016 às 10:05 -0700, Junio C Hamano escreveu: > In any case, I do not understand why you want to exclude the LFs > from the message. As Ævar Arnfjörð Bjarmason pointed out [1], it is to assure that a translator does not break the output by mistake, by removing a LF. I agree because I

[PATCH] t5510: skip tests under GETTEXT_POISON build

2016-07-26 Thread Vasco Almeida
Skip tests when running under GETTEXT_POISON build and run them with C_LOCALE_OUTPUT prerequisite. These tests are irrelevant under GETTEXT_POISON because they test text output alignment which GETTEXT_POISON turns useless. Signed-off-by: Vasco Almeida --- t/t5510-fetch.sh | 4 ++-- 1 file

[PATCH v3] i18n: notes: mark comment for translation

2016-07-26 Thread Vasco Almeida
Mark comment displayed when editing a note for translation. Signed-off-by: Vasco Almeida --- builtin/notes.c | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/builtin/notes.c b/builtin/notes.c index 0572051..aec427b 100644 --- a/builtin/notes.c +++ b/builtin/notes.c

Re: [PATCH v2] i18n: notes: mark comment for translation

2016-07-26 Thread Vasco Almeida
A Seg, 25-07-2016 às 10:49 -0700, Junio C Hamano escreveu: > Vasco Almeida writes: > > > > >  static const char note_template[] = > > - "\nWrite/edit the notes for the following object:\n"; > > + N_("Write/edit the notes for the following object:

[PATCH] t5510: become resilient to GETTEXT_POISON

2016-07-25 Thread Vasco Almeida
Replace gettext poison text with appropriate values to be able to cut the right output of git fetch command for comparison. The first gettext poison falls from the previous line into the next because the poison does not add a newline, so we must replace it with nothing. Signed-off-by: Vasco

[PATCH v2] i18n: notes: mark comment for translation

2016-07-23 Thread Vasco Almeida
Mark comment displayed when editing a note for translation. Signed-off-by: Vasco Almeida --- It seems that strbuf_add_commented_lines adds a trailing newline. So adding another strbuf_addch(&buf, '\n') would make 2 lines rather only one. builtin/notes.c | 5 +++-- 1 file changed

[PATCH] i18n: notes: mark comment for translation

2016-07-21 Thread Vasco Almeida
Mark comment displayed when editing a note for translation. Signed-off-by: Vasco Almeida --- builtin/notes.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/notes.c b/builtin/notes.c index 0572051..37933bd 100644 --- a/builtin/notes.c +++ b/builtin/notes.c

[PATCH v2] t5541: become resilient to GETTEXT_POISON

2016-06-30 Thread Vasco Almeida
Use test_i18n* functions for testing text already marked for translation. Signed-off-by: Vasco Almeida --- Fix typo on v1. Forgot to mention that tests with TTY prerequisite were skipped, I don't know how to run them. Notes: Incremental update for va/i18n-even-more (merged to 'nex

[PATCH] t5541: become resilient to GETTEXT_POISON

2016-06-30 Thread Vasco Almeida
Use test_i18n* functions for testing text already marked for translation. Signed-off-by: Vasco Almeida --- Incremental update for va/i18n-even-more (merged to 'next' on 2016-06-28 at 5919dfa). I don't know how I didn't catch this one. t/t5541-http-push-smart.sh | 12

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

2016-06-29 Thread Vasco Almeida
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 --- git-send-email.perl | 71

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

2016-06-29 Thread Vasco Almeida
Signed-off-by: Vasco Almeida --- git-difftool.perl | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/git-difftool.perl b/git-difftool.perl index ebd13ba..de8d783 100755 --- a/git-difftool.perl +++ b/git-difftool.perl @@ -22,6 +22,7 @@ use File::Path qw

[PATCH v2 09/11] i18n: send-email: mark warnings and errors for translation

2016-06-29 Thread Vasco Almeida
Mark warnings, errors and other messages for translation. Signed-off-by: Vasco Almeida --- git-send-email.perl | 36 ++-- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index 2521832..e7f712e 100755 --- a

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

2016-06-29 Thread Vasco Almeida
., wanting to change wording of one particular use case. Signed-off-by: Vasco Almeida --- git-add--interactive.perl | 60 ++- 1 file changed, 49 insertions(+), 11 deletions(-) diff --git a/git-add--interactive.perl b/git-add--interactive.perl ind

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

2016-06-29 Thread Vasco Almeida
Mark strings often displayed to user for translation. Signed-off-by: Vasco Almeida --- git-send-email.perl | 53 +++-- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index 6958785..2521832

<    1   2   3   4   5   >