From: Vasco Almeida <vascomalmeida@sapo•pt>
To: Junio C Hamano <gitster@pobox•com>
Cc: git@vger•kernel.org, Jiang Xin <worldhello.net@gmail•com>
Subject: Re: [PATCH 2/7] l10n: unpack-trees: mark strings for translation
Date: Sat, 9 Apr 2016 12:19:24 +0000 [thread overview]
Message-ID: <5708F34C.3090004@sapo.pt> (raw)
In-Reply-To: <xmqqpotzvoia.fsf@gitster.mtv.corp.google.com>
Às 20:23 de 08-04-2016, Junio C Hamano escreveu:
> Vasco Almeida <vascomalmeida@sapo•pt> writes:
>
>> Mark strings seen by the user inside setup_unpack_trees_porcelain() and
>> display_error_msgs() functions for translation.
>>
>> One case Git outputs the named strings is when the user does some editing to
>> a file on some branch and then checks out other branch, but that file
>> changes by the checkout. This is the case of the first string marked.
>
> The second paragraph puzzling. Other strings are not shown at all?
> Or is it just you didn't bother explaining the others cases?
>
> Either case, it is not immediately clear why you felt that one
> string among others deserve more attention. Care to elaborate?
I meant that as an example, which was the situation I was when I found
the untranslated string.
I should have written that outside the commit message, as a note.
I'm going to remove that paragraph since it isn’t irrelevant and
confusing. Hope I answered you.
>
> In the patch itself I did not find anything questionable, though.
>
> Thanks.
>
>>
>> Signed-off-by: Vasco Almeida <vascomalmeida@sapo•pt>
>> ---
>> unpack-trees.c | 24 ++++++++++++------------
>> 1 file changed, 12 insertions(+), 12 deletions(-)
>>
>> diff --git a/unpack-trees.c b/unpack-trees.c
>> index 9f55cc2..4bc6b4f 100644
>> --- a/unpack-trees.c
>> +++ b/unpack-trees.c
>> @@ -61,21 +61,21 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
>> const char *cmd2 = strcmp(cmd, "checkout") ? cmd : "switch branches";
>>
>> if (advice_commit_before_merge)
>> - msg = "Your local changes to the following files would be overwritten by %s:\n%%s"
>> - "Please, commit your changes or stash them before you can %s.";
>> + msg = _("Your local changes to the following files would be overwritten by %s:\n%%s"
>> + "Please, commit your changes or stash them before you can %s.");
>> else
>> - msg = "Your local changes to the following files would be overwritten by %s:\n%%s";
>> + msg = _("Your local changes to the following files would be overwritten by %s:\n%%s");
>> msgs[ERROR_WOULD_OVERWRITE] = msgs[ERROR_NOT_UPTODATE_FILE] =
>> xstrfmt(msg, cmd, cmd2);
>>
>> msgs[ERROR_NOT_UPTODATE_DIR] =
>> - "Updating the following directories would lose untracked files in it:\n%s";
>> + _("Updating the following directories would lose untracked files in it:\n%s");
>>
>> if (advice_commit_before_merge)
>> - msg = "The following untracked working tree files would be %s by %s:\n%%s"
>> - "Please move or remove them before you can %s.";
>> + msg = _("The following untracked working tree files would be %s by %s:\n%%s"
>> + "Please move or remove them before you can %s.");
>> else
>> - msg = "The following untracked working tree files would be %s by %s:\n%%s";
>> + msg = _("The following untracked working tree files would be %s by %s:\n%%s");
>>
>> msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = xstrfmt(msg, "removed", cmd, cmd2);
>> msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = xstrfmt(msg, "overwritten", cmd, cmd2);
>> @@ -84,14 +84,14 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
>> * Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we
>> * cannot easily display it as a list.
>> */
>> - msgs[ERROR_BIND_OVERLAP] = "Entry '%s' overlaps with '%s'. Cannot bind.";
>> + msgs[ERROR_BIND_OVERLAP] = _("Entry '%s' overlaps with '%s'. Cannot bind.");
>>
>> msgs[ERROR_SPARSE_NOT_UPTODATE_FILE] =
>> - "Cannot update sparse checkout: the following entries are not up-to-date:\n%s";
>> + _("Cannot update sparse checkout: the following entries are not up-to-date:\n%s");
>> msgs[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN] =
>> - "The following Working tree files would be overwritten by sparse checkout update:\n%s";
>> + _("The following Working tree files would be overwritten by sparse checkout update:\n%s");
>> msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] =
>> - "The following Working tree files would be removed by sparse checkout update:\n%s";
>> + _("The following Working tree files would be removed by sparse checkout update:\n%s");
>>
>> opts->show_all_errors = 1;
>> /* rejected paths may not have a static buffer */
>> @@ -168,7 +168,7 @@ static void display_error_msgs(struct unpack_trees_options *o)
>> string_list_clear(rejects, 0);
>> }
>> if (something_displayed)
>> - fprintf(stderr, "Aborting\n");
>> + fprintf(stderr, _("Aborting\n"));
>> }
>>
>> /*
next prev parent reply other threads:[~2016-04-09 12:19 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-08 20:02 [PATCH 1/7] l10n: index-pack: use plural string instead of normal one Vasco Almeida
2016-04-08 20:02 ` [PATCH 2/7] l10n: unpack-trees: mark strings for translation Vasco Almeida
2016-04-08 20:23 ` Junio C Hamano
2016-04-09 12:19 ` Vasco Almeida [this message]
2016-04-08 20:02 ` [PATCH 3/7] l10n: git-parse-remote.sh: " Vasco Almeida
2016-04-08 20:30 ` Junio C Hamano
2016-04-08 20:02 ` [PATCH 4/7] l10n: builtin/pull.c: " Vasco Almeida
2016-04-08 20:33 ` Junio C Hamano
2016-04-09 12:34 ` Vasco Almeida
2016-04-08 20:02 ` [PATCH 5/7] l10n: builtin/pull.c: split strings marked " Vasco Almeida
2016-04-08 20:02 ` [PATCH 6/7] l10n: mv.c: add a comma ',' to string Vasco Almeida
2016-04-08 20:35 ` Junio C Hamano
2016-04-08 20:02 ` [PATCH 7/7] l10n: builtin/branch.c: mark option for translation Vasco Almeida
2016-04-08 20:26 ` [PATCH 1/7] l10n: index-pack: use plural string instead of normal one Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5708F34C.3090004@sapo.pt \
--to=vascomalmeida@sapo$(echo .)pt \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=worldhello.net@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox