Volume XXII, number 280Wednesday, October 7, 2026Latest message 1 hour ago

The Git List

News and archive of git@vger.kernel.org, since April 2005

Trivial fix in the italian translation

5 messages between Apr 22, 2026 and Apr 27, 2026, from Matteo Beniamino, Jiang Xin.

Plain Markdown or JSON for tools and agents.

Matteo BeniaminoApr 22, 2026, 18:25 UTC on lore
This is the current output of `git branch -h`:
$ git branch -h
uso: git branch [<opzioni>] [-r | -a] [--merged] [--no-merged]
  oppure: git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-point>]
  oppure: git branch [<options>] [-l] [<pattern>...]
  oppure: git branch [<opzioni>] [-r] (-d | -D) <nome branch>...
  oppure: git branch [<opzioni>] (-m | -M) [<vecchio branch>] <nuovo branch>
  oppure: git branch [<opzioni>] (-c | -C) [<vecchio branch>] <nuovo branch>
  oppure: git branch [<opzioni>] [-r | -a] [--points-at]
  oppure: git branch [<opzioni>] [-r | -a] [--format]
[...]

As you can see `uso:` (`usage:`) and `oppure:` (`or:`) are misaligned. As commented in the .po the colon of `oppure:` should be aligned with the one of `usage:`. In the following patch I've substituted `oppure` with `o` (they're interchangable, and IMHO in the terminal every column counts) and I've aligned the colons in the two strings.

Matteo BeniaminoApr 22, 2026, 18:25 UTC in reply to Matteo Beniamino on lore

[PATCH] l10n: it.po: fix italian usage messages alignment

Fixed a misalignment in the "usage:" and " or:" lines in the italian help messages.

Signed-off-by: Matteo Beniamino <beniamino@beniamino.eu>
---
 po/it.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/po/it.po b/po/it.po
index 20fd8bb28d..b5ccd8c731 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5400,7 +5400,7 @@ msgstr "uso: %s"
 #: parse-options.c:915
 #, c-format
 msgid "   or: %s"
-msgstr "  oppure: %s"
+msgstr "  o: %s"
 
 #: parse-options.c:918
 #, c-format

-- 
2.53.0
Jiang XinApr 26, 2026, 03:01 UTC in reply to Matteo Beniamino on lore

Re: [PATCH] l10n: it.po: fix italian usage messages alignment

On Thu, Apr 23, 2026 at 2:25 AM Matteo Beniamino <beniamino@beniamino.eu> wrote:
Show 19 quoted lines
>
> Fixed a misalignment in the "usage:" and "   or:" lines in the italian
> help messages.
>
> Signed-off-by: Matteo Beniamino <beniamino@beniamino.eu>
> ---
>  po/it.po | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/po/it.po b/po/it.po
> index 20fd8bb28d..b5ccd8c731 100644
> --- a/po/it.po
> +++ b/po/it.po
> @@ -5400,7 +5400,7 @@ msgstr "uso: %s"
>  #: parse-options.c:915
>  #, c-format
>  msgid "   or: %s"
> -msgstr "  oppure: %s"
> +msgstr "  o: %s"

An example of the original English output for a command with multiple usage lines:

    $ LC_ALL=C git checkout -h | head -2
    usage: git checkout [<options>] <branch>
       or: git checkout [<options>] [<branch>] -- <file>...
The current Italian translation does not achieve colon alignment:
    $ LC_ALL=it  git checkout -h | head -2
    uso: git checkout [<opzioni>] <branch>
      oppure: git checkout [<opzioni>] [<branch>] -- <file>...
Your change fixes the alignment issue, producing the following output:
    $ LC_ALL=it  git checkout -h | head -2
    uso: git checkout [<opzioni>] <branch>
      o: git checkout [<opzioni>] [<branch>] -- <file>...
Another possible alignment solution for the Italian output would be:
    $ LC_ALL=it  git checkout -h | head -2
       uso: git checkout [<opzioni>] <branch>
    oppure: git checkout [<opzioni>] [<branch>] -- <file>...

Obviously, your solution is better, because for commands with only a single usage line, such as "git clone -h", no leading spaces will be shown — i.e., it displays "uso: ..." instead of " uso: ...".

Git localization follows a GitHub-based workflow; please refer to the "po/README.md" file for details. This change can be submitted as a Pull Request to the "git-l10n/git-po" repository, and will be merged once the next Git localization window opens. If you have additional changes to the Italian translation, please refer to the "po/TEAMS file", contact the Italian localization leader Alessandro Menti, and submit a pull request to his repository.

-- Jiang Xin

Matteo BeniaminoApr 26, 2026, 06:47 UTC in reply to Jiang Xin on lore

Re: [PATCH] l10n: it.po: fix italian usage messages alignment

Thanks for your answer. The italian repository found in the TEAMS files hasn't received an update for more than 5 years. I've opened a PR on the git-l10n repo, but it doesn't pass all the checks due to many obsolete entries.

Maybe Alessandro can shed some light on the current status of the italian translation.

Also, notice that when creating a PR the default PR message tells the user that the correct way to post a patch is via the mailing list: I assume this behaviour is inherited by the main git repo, but still can be a bit misleading.

Thanks again for your work.
Il 26/04/26 05:01, Jiang Xin ha scritto:
Show 49 quoted lines
> On Thu, Apr 23, 2026 at 2:25 AM Matteo Beniamino
> <beniamino@beniamino.eu> wrote:
>> 
>> Fixed a misalignment in the "usage:" and "   or:" lines in the
>> italian help messages.
>> 
>> Signed-off-by: Matteo Beniamino <beniamino@beniamino.eu> --- po/
>> it.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>> diff --git a/po/it.po b/po/it.po index 20fd8bb28d..b5ccd8c731
>> 100644 --- a/po/it.po +++ b/po/it.po @@ -5400,7 +5400,7 @@ msgstr
>> "uso: %s" #: parse-options.c:915 #, c-format msgid "   or: %s" -
>> msgstr "  oppure: %s" +msgstr "  o: %s"
> 
> An example of the original English output for a command with
> multiple usage lines:
> 
> $ LC_ALL=C git checkout -h | head -2 usage: git checkout [<options>]
> <branch> or: git checkout [<options>] [<branch>] -- <file>...
> 
> The current Italian translation does not achieve colon alignment:
> 
> $ LC_ALL=it  git checkout -h | head -2 uso: git checkout [<opzioni>]
> <branch> oppure: git checkout [<opzioni>] [<branch>] -- <file>...
> 
> Your change fixes the alignment issue, producing the following
> output:
> 
> $ LC_ALL=it  git checkout -h | head -2 uso: git checkout [<opzioni>]
> <branch> o: git checkout [<opzioni>] [<branch>] -- <file>...
> 
> Another possible alignment solution for the Italian output would be:
> 
> $ LC_ALL=it  git checkout -h | head -2 uso: git checkout [<opzioni>]
> <branch> oppure: git checkout [<opzioni>] [<branch>] -- <file>...
> 
> Obviously, your solution is better, because for commands with only a 
> single usage line, such as "git clone -h", no leading spaces will be 
> shown — i.e., it displays "uso: ..." instead of "   uso: ...".
> 
> Git localization follows a GitHub-based workflow; please refer to
> the "po/README.md" file for details. This change can be submitted as
> a Pull Request to the "git-l10n/git-po" repository, and will be
> merged once the next Git localization window opens. If you have
> additional changes to the Italian translation, please refer to the
> "po/TEAMS file", contact the Italian localization leader Alessandro
> Menti, and submit a pull request to his repository.
> 
> -- Jiang Xin
Jiang XinApr 27, 2026, 02:22 UTC in reply to Matteo Beniamino on lore

Re: [PATCH] l10n: it.po: fix italian usage messages alignment

On Sun, Apr 26, 2026 at 2:47 PM Matteo Beniamino <m.beniamino@beniamino.eu> wrote:

Show 5 quoted lines
>
> Thanks for your answer. The italian repository found in the TEAMS files
> hasn't received an update for more than 5 years. I've opened a PR on the
> git-l10n repo, but it doesn't pass all the checks due to many obsolete
> entries.

Your fix is unrelated to the CI issues reported in PR #918 [1]; feel free to ignore the errors reported. I will merge your PR in the next localization window.

[1]: https://github.com/git-l10n/git-po/pull/918
Show 7 quoted lines
> Maybe Alessandro can shed some light on the current status of
> the italian translation.
>
> Also, notice that when creating a PR the default PR
> message tells the user that the correct way to post a patch is via the
> mailing list: I assume this behaviour is inherited by the main git repo,
> but still can be a bit misleading.

The Git l10n coordinator repository ("git-po/git-l10n") inherits the pull request template file [2], and there is no way to disable it without changing the default branch name. I have updated the repository description as below to clarify:

    Git l10n coordinator repository (We use the GitHub pull request
    workflow. Please ignore the pull request template inherited from
    the upstream git/git repository.)
[2]: https://github.com/git-l10n/git-po/blob/master/.github/PULL_REQUEST_TEMPLATE.md

-- Jiang Xin

Back to recent threads