threads / patch / 54339

patchpo: adjust for the recent change in send-pack/transport-helper

Subject: [PATCH] po: adjust for the recent change in send-pack/transport-helper

## tl;dr

4 messages between Oct 3, 2020 and Oct 5, 2020. Diffs are folded; open one to read it.

replies: 3people: 3as markdown or json

Johannes Schindelin via GitGitGadget· Oct 3, 2020, 22:19 UTC · lore

From: Johannes Schindelin <johannes.schindelin@gmx.de>

As of 4d04658d8b5 (send-pack/transport-helper: avoid mentioning a particular branch, 2020-06-24), the message does not mention any branch name anymore.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
    po: adjust for the recent change in send-pack/transport-helper
    
    I hope that I am being helpful here... Please let me know if I should
    just leave the translations alone instead.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-742%2Fdscho%2Fadjust-send-pack-translation-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-742/dscho/adjust-send-pack-translation-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/742

 po/bg.po | 4 ++--
 po/ca.po | 4 ++--
 po/el.po | 2 +-
 po/ru.po | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

Show changes to 4 files +6 −6

po/bg.po, po/ca.po, po/el.po, po/ru.po

diff --git a/po/bg.po b/po/bg.po
index a189b16dc4..aa463b5c24 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8790,10 +8790,10 @@ msgstr "грешка при изпълнението на командата з
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch such as 'master'.\n"
+"Perhaps you should specify a branch.\n"
 msgstr ""
 "Няма общи указатели, не са указани никакви указатели — нищо няма да бъде\n"
-"направено.  Пробвайте да укажете клон, напр. “master“.\n"
+"направено.  Пробвайте да укажете клон.\n"
 
 #: transport-helper.c:1121
 #, c-format
diff --git a/po/ca.po b/po/ca.po
index c43c21bc22..750e558343 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8593,10 +8593,10 @@ msgstr "error en executar l'exportació ràpida"
 #, fuzzy, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch such as 'master'.\n"
+"Perhaps you should specify a branch.\n"
 msgstr ""
 "No hi ha referències en comú i no n'hi ha cap especificat. Potser hauríeu "
-"d'especificar una branca com ara «master»."
+"d'especificar una branca."
 
 #: transport-helper.c:1121
 #, fuzzy, c-format
diff --git a/po/el.po b/po/el.po
index 703f46d0c7..1e20ebc5a6 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6599,7 +6599,7 @@ msgstr ""
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch such as 'master'.\n"
+"Perhaps you should specify a branch.\n"
 msgstr ""
 
 #: transport-helper.c:1083
diff --git a/po/ru.po b/po/ru.po
index a77b462e62..6363c270b5 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6948,7 +6948,7 @@ msgstr ""
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch such as 'master'.\n"
+"Perhaps you should specify a branch.\n"
 msgstr ""
 
 #: transport-helper.c:1085

base-commit: 306ee63a703ad67c54ba1209dc11dd9ea500dc1f

-- 
gitgitgadget

Junio C Hamano· Oct 3, 2020, 22:21 UTC · re: Johannes Schindelin via GitGitGadget · lore

Re: [PATCH] po: adjust for the recent change in send-pack/transport-helper

"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> writes:

>     po: adjust for the recent change in send-pack/transport-helper
>     
>     I hope that I am being helpful here... Please let me know if I should
>     just leave the translations alone instead.

I think you should. The i18n coordinator needs to update all the entries anyway and that process is quite mechanical. Accepting a handful manually edited entries now would mean that the later automated process to scan all the sources and pick up updated messages will need to be audited to ensure these manual entries are not overwritten/dropped.

Jiang Xin· Oct 5, 2020, 00:15 UTC · re: Johannes Schindelin via GitGitGadget · lore

Re: [PATCH] po: adjust for the recent change in send-pack/transport-helper

Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com> 于2020年10月4日周日上午6:19写道：

Show 14 quoted lines

>
> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> As of 4d04658d8b5 (send-pack/transport-helper: avoid mentioning a
> particular branch, 2020-06-24), the message does not mention any branch
> name anymore.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
>     po: adjust for the recent change in send-pack/transport-helper
>
>     I hope that I am being helpful here... Please let me know if I should
>     just leave the translations alone instead.
>

Will update "po/git.pot" after the release of git 2.29.0-rc0. And other l10n team leaders will fix the issue you found accordingly.

Thank you for the update.

-- Jiang Xin

Johannes Schindelin· Oct 4, 2020, 19:18 UTC · re: Jiang Xin · lore

Re: [PATCH] po: adjust for the recent change in send-pack/transport-helper

Hi,

On Mon, 5 Oct 2020, Jiang Xin wrote:

Show 19 quoted lines

> Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
> 于2020年10月4日周日 上午6:19写道：
> >
> > From: Johannes Schindelin <johannes.schindelin@gmx.de>
> >
> > As of 4d04658d8b5 (send-pack/transport-helper: avoid mentioning a
> > particular branch, 2020-06-24), the message does not mention any branch
> > name anymore.
> >
> > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> > ---
> >     po: adjust for the recent change in send-pack/transport-helper
> >
> >     I hope that I am being helpful here... Please let me know if I should
> >     just leave the translations alone instead.
> >
>
> Will update "po/git.pot" after the release of git 2.29.0-rc0. And
> other l10n team leaders will fix the issue you found accordingly.

Okay, so I'll just close the GitGitGadget PR.

> Thank you for the update.

No problem.

Thank you for coordinating the translations, Dscho