Thanks for the report and letting me know.
Yes, these were mistakes and lack of attention mine. It was supposed to
call 'eval_gettext' rather than 'gettext' when \$variable interpolation
is needed. Junio Hamano has the right answer for these errors.
A Seg, 19-12-2016 às 12:50 -0800, Junio C Hamano
When composing an e-mail, there is a message for the user whose lines
begin in "GIT:" that can be marked for translation.
Signed-off-by: Vasco Almeida
---
git-send-email.perl | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/git-send-email.perl
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 | 76
Add subroutines prefix_lines and comment_lines.
Signed-off-by: Vasco Almeida
---
perl/Git.pm | 38 ++
1 file changed, 38 insertions(+)
diff --git a/perl/Git.pm b/perl/Git.pm
index b2732822a..bfce1f795 100644
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@ -1438,6
Mark warnings, errors and other messages for translation.
Signed-off-by: Vasco Almeida
---
git-send-email.perl | 34 +-
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index 06e64699b..00d234e11 100755
., wanting to change wording
of one particular use case.
The comment character is now used according to the git configuration
core.commentchar.
Signed-off-by: Vasco Almeida
---
git-add--interactive.perl | 52 +++
1 file changed, 39 insertions(+), 13
Remove unnecessary entries from %patch_modes. After the i18n conversion,
these entries are not used anymore.
Signed-off-by: Vasco Almeida
---
git-add--interactive.perl | 21 -
1 file changed, 21 deletions(-)
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
Mark strings often displayed to the user for translation.
Signed-off-by: Vasco Almeida
---
git-send-email.perl | 54 +++--
1 file changed, 32 insertions(+), 22 deletions(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index da81be40c
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 | 54 ---
1 file changed, 46 insertions
delimited with \EOF but it is with delimiter enclosed in single quotes.
So change \EOF to 'EOF', although in this case does not make
difference what variation of here-document to use since there is nothing
to interpolate.
Signed-off-by: Vasco Almeida
---
git-add--interactive.perl | 8
mmentchar is not set to one single character, take '#' as the
comment line character. This follows the system behaviour programmed in
config.c::git_default_core_config.
Interdiff from v6 included below.
Vasco Almeida (16):
Git.pm: add subroutines for commenting lines
i18n: add-
table 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
---
Makefile | 2 +-
Mark warnings, errors and other messages that are interpolated for
translation.
We call sprintf() before calling die() and in few other circumstances in
order to replace the values on the placeholders.
Signed-off-by: Vasco Almeida
---
git-send-email.perl | 87
Since at this point Git::I18N.perl lacks support for Perl i18n
placeholder substitution, use of sprintf following die or error_msg is
necessary for placeholder substitution take place.
Signed-off-by: Vasco Almeida
---
git-add--interactive.perl | 25 +
1 file changed, 13
hose words but in this case we must also
retrieve the translation for the eq tests, since the value assigned was
of the translation, not the English source.
Signed-off-by: Vasco Almeida
---
git-add--interactive.perl | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/git-ad
Change strings for help to match the ones in git-add--interactive.perl.
The strings now represent one entry to translate each rather then two
entries each different only by an ending newline character.
Signed-off-by: Vasco Almeida
---
builtin/clean.c | 10 +-
1 file changed, 5
Signed-off-by: Vasco Almeida
---
git-difftool.perl | 22 --
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/git-difftool.perl b/git-difftool.perl
index a5790d03a..8d3632e55 100755
--- a/git-difftool.perl
+++ b/git-difftool.perl
@@ -22,6 +22,7 @@ use File::Path
: Vasco Almeida
---
Makefile | 3 ++-
git-add--interactive.perl | 27 ++-
perl/Git/I18N.pm | 10 +-
t/t0202/test.pl | 11 ++-
4 files changed, 39 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
index f53fcc90d
A Sáb, 10-12-2016 às 14:09 -0800, Junio C Hamano escreveu:
> We only update comment_line_char from the default "#" when the
> configured value is a single-byte character and we ignore incorrect
> values in the configuration file. So I think the patch you sent is
> correct after all.
I am still no
A Sex, 09-12-2016 às 14:23 -0800, Junio C Hamano escreveu:
> > This is exactly the same issue I fixed for rebase -i recently.
>
> Yes, but the patch we see here punts "core.commentChar is not a
> single-byte single-letter--panic!" case differently. I think you
> did "just take the first one" in "
A Ter, 22-11-2016 às 09:42 -0800, Junio C Hamano escreveu:
> The incremental update below looks sensible. We'd also want to
> protect this codepath from a misconfigured two-or-more byte sequence
> in core.commentchar, I would suspect, to be consistent.
Are the below changes alright for what you p
A Sex, 11-11-2016 às 11:45 -0100, Vasco Almeida escreveu:
> +=item comment_lines ( STRING [, STRING... ])
> +
> +Comments lines following core.commentchar configuration.
> +
> +=cut
> +
> +sub comment_lines {
> + my $comment_line_char = config("core.commentch
When composing an e-mail, there is a message for the user whose lines
are beginning in "GIT:" that can be marked for translation.
Signed-off-by: Vasco Almeida
---
git-send-email.perl | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/git-send-email.
hose words but in this case we must also
retrieve the translation for the eq tests, since the value assigned was
of the translation, not the English source.
Signed-off-by: Vasco Almeida
---
git-add--interactive.perl | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/git-ad
Add subroutines prefix_lines and comment_lines.
Signed-off-by: Vasco Almeida
---
perl/Git.pm | 24
1 file changed, 24 insertions(+)
diff --git a/perl/Git.pm b/perl/Git.pm
index b2732822a..69cd1ddec 100644
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@ -1438,6 +1438,30 @@ sub
Remove unnecessary entries from %patch_modes. After the i18n conversion,
these entries are not used anymore.
Signed-off-by: Vasco Almeida
---
git-add--interactive.perl | 21 -
1 file changed, 21 deletions(-)
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
Since at this point Git::I18N.perl lacks support for Perl i18n
placeholder substitution, use of sprintf following die or error_msg is
necessary for placeholder substitution take place.
Signed-off-by: Vasco Almeida
---
git-add--interactive.perl | 25 +
1 file changed, 13
., wanting to change wording
of one particular use case.
The comment character is now used according to the git configuration
core.commentchar.
Signed-off-by: Vasco Almeida
---
git-add--interactive.perl | 52 +++
1 file changed, 39 insertions(+), 13
table 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
---
Makefile | 2 +-
Mark warnings, errors and other messages for translation.
Signed-off-by: Vasco Almeida
---
git-send-email.perl | 34 +-
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index 06e64699b..00d234e11 100755
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 | 54 ---
1 file changed, 46 insertions
Mark warnings, errors and other messages that are interpolated for
translation.
We call sprintf() before calling die() and in few other circumstances in
order to replace the values on the placeholders.
Signed-off-by: Vasco Almeida
---
git-send-email.perl | 87
Change strings for help to match the ones in git-add--interactive.perl.
The strings now represent one entry to translate each rather then two
entries each different only by an ending newline character.
Signed-off-by: Vasco Almeida
---
builtin/clean.c | 10 +-
1 file changed, 5
delimited with \EOF but it is with delimiter enclosed in single quotes.
So change \EOF to 'EOF', although in this case does not make
difference what variation of here-document to use since there is nothing
to interpolate.
Signed-off-by: Vasco Almeida
---
git-add--interactive.perl | 8
Mark strings often displayed to the user for translation.
Signed-off-by: Vasco Almeida
---
git-send-email.perl | 54 +++--
1 file changed, 32 insertions(+), 22 deletions(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index da81be40c
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 | 76
Mark messages in some perl scripts for translation.
Changes in this re-roll v6:
- Change implementation of prefix_lines subroutine to allow arbitrary
number of strings as arguments.
- Change a few marks for translation hopefully to be easier on the eyes.
Interdiff included below.
Vasco
Signed-off-by: Vasco Almeida
---
git-difftool.perl | 22 --
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/git-difftool.perl b/git-difftool.perl
index a5790d03a..8d3632e55 100755
--- a/git-difftool.perl
+++ b/git-difftool.perl
@@ -22,6 +22,7 @@ use File::Path
: Vasco Almeida
---
Makefile | 3 ++-
git-add--interactive.perl | 27 ++-
perl/Git/I18N.pm | 10 +-
t/t0202/test.pl | 11 ++-
4 files changed, 39 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
index 9d6c24503
A Ter, 08-11-2016 às 17:06 -0800, Junio C Hamano escreveu:
> Vasco Almeida writes:
>
> >
> > Add subroutines prefix_lines and comment_lines.
> >
> > Signed-off-by: Vasco Almeida
> > ---
> > perl/Git.pm | 23 +++
> > 1 file
Change strings for help to match the ones in git-add--interactive.perl.
The strings now represent one entry to translate each rather then two
entries each different only by an ending newline character.
Signed-off-by: Vasco Almeida
---
builtin/clean.c | 10 +-
1 file changed, 5
hose words but in this case we must also
retrieve the translation for the eq tests, since the value assigned was
of the translation, not the English source.
Signed-off-by: Vasco Almeida
---
git-add--interactive.perl | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/git-ad
Mark warnings, errors and other messages that are interpolated for
translation.
We call sprintf() before calling die() and in few other circumstances in
order to replace the values on the placeholders.
Signed-off-by: Vasco Almeida
---
git-send-email.perl | 90
Since at this point Git::I18N.perl lacks support for Perl i18n
placeholder substitution, use of sprintf following die or error_msg is
necessary for placeholder substitution take place.
Signed-off-by: Vasco Almeida
---
git-add--interactive.perl | 25 +
1 file changed, 13
When composing an e-mail, there is a message for the user whose lines
are beginning in "GIT:" that can be marked for translation.
Signed-off-by: Vasco Almeida
---
git-send-email.perl | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/git-send-email.
Mark strings often displayed to the user for translation.
Signed-off-by: Vasco Almeida
---
git-send-email.perl | 52 ++--
1 file changed, 30 insertions(+), 22 deletions(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index da81be40c
: Vasco Almeida
---
Makefile | 3 ++-
git-add--interactive.perl | 27 ++-
perl/Git/I18N.pm | 10 +-
t/t0202/test.pl | 11 ++-
4 files changed, 39 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
index 9d6c24503
Mark warnings, errors and other messages for translation.
Signed-off-by: Vasco Almeida
---
git-send-email.perl | 34 +-
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index 78eb59b21..982c6c076 100755
table 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
---
Makefile | 2 +-
delimited with \EOF but it is with delimiter enclosed in single quotes.
So change \EOF to 'EOF', although in this case does not make
difference what variation of here-document to use since there is nothing
to interpolate.
Signed-off-by: Vasco Almeida
---
git-add--interactive.perl | 8
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 | 54 ---
1 file changed, 46 insertions
Remove unnecessary entries from %patch_modes. After the i18n conversion,
these entries are not used anymore.
Signed-off-by: Vasco Almeida
---
git-add--interactive.perl | 21 -
1 file changed, 21 deletions(-)
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
Signed-off-by: Vasco Almeida
---
git-difftool.perl | 22 --
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/git-difftool.perl b/git-difftool.perl
index a5790d03a..8d3632e55 100755
--- a/git-difftool.perl
+++ b/git-difftool.perl
@@ -22,6 +22,7 @@ use File::Path
., wanting to change wording
of one particular use case.
Signed-off-by: Vasco Almeida
---
git-add--interactive.perl | 52 ++-
1 file changed, 38 insertions(+), 14 deletions(-)
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index
Add subroutines prefix_lines and comment_lines.
Signed-off-by: Vasco Almeida
---
perl/Git.pm | 23 +++
1 file changed, 23 insertions(+)
diff --git a/perl/Git.pm b/perl/Git.pm
index b2732822a..17be59fb7 100644
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@ -1438,6 +1438,29 @@ sub
git-send-email.perl.
Interdiff included below.
Vasco Almeida (16):
Git.pm: add subroutines for commenting lines
i18n: add--interactive: mark strings for translation
i18n: add--interactive: mark simple here-documents for translation
i18n: add--interactive: mark strings with interpolation for
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 | 76
A Seg, 10-10-2016 às 12:54 +, Vasco Almeida escreveu:
> diff --git a/git-add--interactive.perl b/git-add--interactive.perl
> index 045b847..861f7b0 100755
> --- a/git-add--interactive.perl
> +++ b/git-add--interactive.perl
> @@ -1058,6 +1058,30 @@
A Seg, 10-10-2016 às 12:54 +, Vasco Almeida escreveu:
> @@ -70,6 +72,8 @@ Git::I18N - Perl interface to Git's Gettext localizations
>
> printf __("The following error occurred: %s\n"), $error;
>
> + printf __n("commited %d file", &quo
A Qua, 19-10-2016 às 11:40 -0700, Junio C Hamano escreveu:
> Vasco Almeida writes:
>
> >
> > @@ -669,12 +669,18 @@ sub status_cmd {
> > sub say_n_paths {
> > my $did = shift @_;
> > my $cnt = scalar @_;
> > - print "$did ";
> &g
A Qua, 19-10-2016 às 11:14 -0700, Junio C Hamano escreveu:
> Vasco Almeida writes:
>
> >
> > } else {
> > - print "No untracked files.\n";
> > + print __("No untracked files.\n");
> > }
>
> Not a big
Update test to reflect changes.
Signed-off-by: Vasco Almeida
---
apply.c | 4 ++--
t/t4254-am-corrupt.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/apply.c b/apply.c
index 8215874..705cf56 100644
--- a/apply.c
+++ b/apply.c
@@ -1586,8 +1586,8 @@ static
Mark error messages about CRLF for translation.
Update test to reflect changes.
Signed-off-by: Vasco Almeida
---
convert.c | 12
t/t0020-crlf.sh | 6 +-
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/convert.c b/convert.c
index 077f5e6..0ad39b1 100644
Mark rename_limit_warning and degrade_cc_to_c_warning and
rename_limit_warning for translation.
Signed-off-by: Vasco Almeida
---
diff.c | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/diff.c b/diff.c
index 1d304e0..1687317 100644
--- a/diff.c
+++ b/diff.c
Mark permissions_advice for translation.
Signed-off-by: Vasco Almeida
---
credential-cache--daemon.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/credential-cache--daemon.c b/credential-cache--daemon.c
index 1e5f16a..46c5937 100644
--- a/credential-cache--daemon.c
Mark messages for translation printed to stderr.
Signed-off-by: Vasco Almeida
---
apply.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/apply.c b/apply.c
index 201d3a7..13b2064 100644
--- a/apply.c
+++ b/apply.c
@@ -3554,7 +3554,7 @@ static int try_threeway(struct
Mark plural string for translation using Q_().
Signed-off-by: Vasco Almeida
---
apply.c | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/apply.c b/apply.c
index b03d274..201d3a7 100644
--- a/apply.c
+++ b/apply.c
@@ -4869,10 +4869,12 @@ int apply_all_patches(struct
Mark error messages for translation passed to error() and die()
functions.
Signed-off-by: Vasco Almeida
---
apply.c | 48
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/apply.c b/apply.c
index 13b2064..8215874 100644
--- a
The concerned message was marked for translation by 0c99171
("get_short_sha1: mark ambiguity error for translation", 2016-09-26).
Signed-off-by: Vasco Almeida
---
t/t1512-rev-parse-disambiguation.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t1512
Mark warnings, errors and other messages for translation.
Signed-off-by: Vasco Almeida
---
git-send-email.perl | 34 +-
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index 78eb59b..982c6c0 100755
--- a
hose words but in this case we must also
retrieve the translation for the eq tests, since the value assigned was
of the translation, not the English source.
Signed-off-by: Vasco Almeida
---
git-add--interactive.perl | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/git-ad
Mark strings often displayed to the user for translation.
Signed-off-by: Vasco Almeida
---
git-send-email.perl | 52 ++--
1 file changed, 30 insertions(+), 22 deletions(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index da81be4
Mark warnings, errors and other messages that are interpolated for
translation.
We call sprintf() before calling die() and in few other circumstances in
order to replace the values on the placeholders.
Signed-off-by: Vasco Almeida
---
git-send-email.perl | 90
Signed-off-by: Vasco Almeida
---
git-difftool.perl | 22 --
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/git-difftool.perl b/git-difftool.perl
index a5790d0..8d3632e 100755
--- a/git-difftool.perl
+++ b/git-difftool.perl
@@ -22,6 +22,7 @@ use File::Path qw
Remove unnecessary entries from %patch_modes. After the i18n conversion,
these entries are not used anymore.
Signed-off-by: Vasco Almeida
---
git-add--interactive.perl | 21 -
1 file changed, 21 deletions(-)
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
., wanting to change wording
of one particular use case.
Signed-off-by: Vasco Almeida
---
git-add--interactive.perl | 45 ++---
1 file changed, 34 insertions(+), 11 deletions(-)
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 045b84
Change strings for help to match the ones in git-add--interactive.perl.
The strings now represent one entry to translate each rather then two
entries each different only by an ending newline character.
Signed-off-by: Vasco Almeida
---
builtin/clean.c | 10 +-
1 file changed, 5
: Vasco Almeida
---
Makefile | 3 ++-
git-add--interactive.perl | 27 ++-
perl/Git/I18N.pm | 9 -
t/t0202/test.pl | 11 ++-
4 files changed, 38 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
index 1aad150
table 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
---
Makefile | 2 +-
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 | 54 ---
1 file changed, 46 insertions
delimiter \EOF but it is with delimiter enclosed in single quotes.
Then change \EOF to 'EOF', although in this case does not make
difference what variation of here-document to use since there is nothing
to interpolate.
Signed-off-by: Vasco Almeida
---
git-add--interactive.perl | 8
Since at this point Git::I18N.perl lacks support for Perl i18n
placeholder substitution, use of sprintf following die or error_msg is
necessary for placeholder substitution take place.
Signed-off-by: Vasco Almeida
---
git-add--interactive.perl | 25 +
1 file changed, 13
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 | 76
Mark messages in some perl scripts for translation.
Fix minor stuff and follow Jakub Narębski's suggestion to use N__() instead of
__() in the hash tables.
Interdiff included below.
Vasco Almeida (14):
i18n: add--interactive: mark strings for translation
i18n: add--interactive: mark s
Mark warnings, errors and other messages that are interpolated for
translation.
We call sprintf() before calling die() and in few other circumstances in
order to replace the values on the placeholders.
Signed-off-by: Vasco Almeida
---
I changed (y|N) to [y|N] around line 1750 to match with the
Remove unnecessary entries from %patch_modes. After the i18n conversion,
these entries are not used anymore.
Signed-off-by: Vasco Almeida
---
git-add--interactive.perl | 21 -
1 file changed, 21 deletions(-)
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
Mark warnings, errors and other messages for translation.
Signed-off-by: Vasco Almeida
---
git-send-email.perl | 34 +-
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index 78eb59b..982c6c0 100755
--- a
Mark words 'nothing', 'unchanged' and 'binary' used to display what has
been staged or not, in "git add -i" status command.
Signed-off-by: Vasco Almeida
---
git-add--interactive.perl | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff
Mark strings often displayed to the user for translation.
Signed-off-by: Vasco Almeida
---
git-send-email.perl | 52 ++--
1 file changed, 30 insertions(+), 22 deletions(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index da81be4
Signed-off-by: Vasco Almeida
---
git-difftool.perl | 22 --
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/git-difftool.perl b/git-difftool.perl
index a5790d0..8d3632e 100755
--- a/git-difftool.perl
+++ b/git-difftool.perl
@@ -22,6 +22,7 @@ use File::Path qw
Since at this point Git::I18N.perl lacks support for Perl i18n
placeholder substitution, use of sprintf following die or error_msg is
necessary for placeholder substitution take place.
Signed-off-by: Vasco Almeida
---
git-add--interactive.perl | 23 ---
1 file changed, 12
table 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
---
git-add--interactive.perl | 54 +
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 | 74
Change strings for help to match the ones in git-add--interactive.perl.
The strings now represent one entry to translate each rather then two
entries each different only by an ending newline character.
Signed-off-by: Vasco Almeida
---
builtin/clean.c | 10 +-
1 file changed, 5
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 | 54 ---
1 file changed, 46 insertions
: Vasco Almeida
---
On the present re-roll, change name __Q to __n following the
Locale::Message convention.
Add documentation about __n().
Makefile | 3 ++-
git-add--interactive.perl | 27 ++-
perl/Git/I18N.pm | 9 -
t/t0202/test.pl
., wanting to change wording
of one particular use case.
Signed-off-by: Vasco Almeida
---
git-add--interactive.perl | 45 ++---
1 file changed, 34 insertions(+), 11 deletions(-)
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 35967f
delimiter \EOF but it is with delimiter enclosed in single quotes.
Then change \EOF to 'EOF', although in this case does not make
difference what variation of here-document to use since there is nothing
to interpolate.
Signed-off-by: Vasco Almeida
---
git-add--interactive.perl | 8
lack Perl skills.
Interdiff bellow.
Vasco Almeida (14):
i18n: add--interactive: mark strings for translation
i18n: add--interactive: mark simple here-documents for translation
i18n: add--interactive: mark strings with interpolation for
translation
i18n: clean.c: match string with gi
A Sex, 30-09-2016 às 19:26 +0200, Jakub Narębski escreveu:
> W dniu 31.08.2016 o 14:31, Vasco Almeida pisze:
> > Mark messages in here document without interpolation for
> translation.
> >
> > Marking for translation by removing here documents this way, rather
> than
&
1 - 100 of 453 matches
Mail list logo
