[GIT PULL] l10n updates for 2.27.0 round 2

Jiang Xin· May 31, 2020, 05:17 UTC · lore

Hi Junio,

Please pull the following l10n updates for Git 2.27.0.

The following changes since commit 2d5e9f31ac46017895ce6a183467037d29ceb9d3:

  Git 2.27-rc2 (2020-05-26 09:38:13 -0700)

are available in the Git repository at:

  git@github.com:git-l10n/git-po.git tags/l10n-2.27.0-rnd2

for you to fetch changes up to cb26198ec6b3fa0bc58d210ea0338f4e972f9f50:

  Merge branch 'master' of github.com:ruester/git-po-de (2020-05-30 11:26:53 +0800)

---------------------------------------------------------------- l10n-2.27.0-rnd2

----------------------------------------------------------------
Alessandro Menti (2):
      l10n: it.po: update the Italian translation for Git 2.27.0 round 1
      l10n: it.po: update for Git 2.27.0 round #2

Alexander Shopov (2):
      l10n: bg.po: Updated Bulgarian translation (4868t)
      l10n: bg.po: Updated Bulgarian translation (4875t)

Christopher Diaz Riveros (1):
      l10n: es: 2.27.0 round 1

Emir Sarı (2):
      l10n: tr: v2.27.0 round 1
      l10n: tr: v2.27.0 round 2

Jan Engelhardt (1):
      l10n: de.po: Fix typo in the German translation of octopus

Jean-Noël Avila (2):
      l10n: fr v2.27.0 rnd 1
      l10n: fr.po v2.27.0 rnd 2

Jiang Xin (16):
      l10n: git.pot: v2.27.0 round 1 (72 new, 37 removed)
      Merge branch 'master' of github.com:nafmo/git-l10n-sv
      Merge branch 'git-2.27-round-1' of github.com:bitigchi/git-po
      Merge branch 'fr_2.27.0_rnd1' of github.com:jnavila/git
      Merge branch 'master' of github.com:alshopov/git-po into git-po-master
      Merge branch 'master' of github.com:Softcatala/git-po
      Merge branch 'next' of github.com:ChrisADR/git-po
      Merge branch 'master' of github.com:git-l10n/git-po
      l10n: git.pot: v2.27.0 round 2 (+1)
      l10n: zh_CN: for git v2.27.0 l10n round 1~2
      Merge branch 'master' of github.com:Softcatala/git-po
      Merge branch 'master' of github.com:alshopov/git-po
      Merge branch 'master' of github.com:bitigchi/git-po
      Merge branch 'fr_2.27.0rnd2' of github.com:jnavila/git
      Merge branch of github.com:AlessandroMenti/git-po
      Merge branch 'master' of github.com:ruester/git-po-de

Jordi Mas (3):
      l10n: Update Catalan translation
      l10n: Update Catalan translation
      l10n: Update Catalan translation

Matthias Rüster (1):
      l10n: de.po: Update German translation for Git 2.27.0

Peter Krefting (2):
      l10n: sv.po: Update Swedish translation (4839t0f0u)
      l10n: sv.po: Update Swedish translation (4875t0f0u)

Trần Ngọc Quân (2):
      l10n: vi(4874t): Updated Vietnamses translation for 2.27.0
      l10n: vi(4875t): Updated Vietnamses translation for 2.27.0rd2

Yi-Jyun Pan (2):
      l10n: zh_TW.po: v2.27.0 round 1 (0 untranslated)
      l10n: zh_TW.po: v2.27.0 round 2 (0 untranslated)

 po/bg.po    |  7288 ++++++++++++++++++------------------
 po/ca.po    | 11698 +++++++++++++++++++++++++++++++---------------------------
 po/de.po    |  7294 ++++++++++++++++++------------------
 po/es.po    |  7156 ++++++++++++++++++-----------------
 po/fr.po    |  7168 ++++++++++++++++++-----------------
 po/git.pot  |  7037 ++++++++++++++++++-----------------
 po/it.po    |  7320 +++++++++++++++++++-----------------
 po/sv.po    |  7313 +++++++++++++++++++-----------------
 po/tr.po    |  7296 ++++++++++++++++++------------------
 po/vi.po    |  7344 +++++++++++++++++++-----------------
 po/zh_CN.po |  7142 ++++++++++++++++++-----------------
 po/zh_TW.po |  7961 ++++++++++++++++++++-------------------
 12 files changed, 48168 insertions(+), 43849 deletions(-)

-- Jiang Xin

Junio C Hamano· May 31, 2020, 18:15 UTC · re: Jiang Xin · lore

Re: [GIT PULL] l10n updates for 2.27.0 round 2

Jiang Xin <worldhello.net@gmail.com> writes:

Show 15 quoted lines

> Hi Junio,
>
> Please pull the following l10n updates for Git 2.27.0.
>
> The following changes since commit 2d5e9f31ac46017895ce6a183467037d29ceb9d3:
>
>   Git 2.27-rc2 (2020-05-26 09:38:13 -0700)
>
> are available in the Git repository at:
>
>   git@github.com:git-l10n/git-po.git tags/l10n-2.27.0-rnd2
>
> for you to fetch changes up to cb26198ec6b3fa0bc58d210ea0338f4e972f9f50:
>
>   Merge branch 'master' of github.com:ruester/git-po-de (2020-05-30 11:26:53 +0800)

Thanks.  Swapped GPG key recently?

Jiang Xin· Jun 1, 2020, 07:35 UTC · re: Junio C Hamano · lore

Re: [GIT PULL] l10n updates for 2.27.0 round 2

Junio C Hamano <gitster@pobox.com> 于2020年6月1日周一 上午2:15写道：

Show 20 quoted lines

>
> Jiang Xin <worldhello.net@gmail.com> writes:
>
> > Hi Junio,
> >
> > Please pull the following l10n updates for Git 2.27.0.
> >
> > The following changes since commit 2d5e9f31ac46017895ce6a183467037d29ceb9d3:
> >
> >   Git 2.27-rc2 (2020-05-26 09:38:13 -0700)
> >
> > are available in the Git repository at:
> >
> >   git@github.com:git-l10n/git-po.git tags/l10n-2.27.0-rnd2
> >
> > for you to fetch changes up to cb26198ec6b3fa0bc58d210ea0338f4e972f9f50:
> >
> >   Merge branch 'master' of github.com:ruester/git-po-de (2020-05-30 11:26:53 +0800)
>
> Thanks.  Swapped GPG key recently?

My pgp key has expired on April 6th, so I generated a new one. Which is the best practice? Edit the old pgp key to extend the expiry time or generate a new pgp key?

-- Jiang Xin

Junio C Hamano· Jun 1, 2020, 15:45 UTC · re: Jiang Xin · lore

Re: [GIT PULL] l10n updates for 2.27.0 round 2

Jiang Xin <worldhello.net@gmail.com> writes:

Show 25 quoted lines

> Junio C Hamano <gitster@pobox.com> 于2020年6月1日周一 上午2:15写道：
>>
>> Jiang Xin <worldhello.net@gmail.com> writes:
>>
>> > Hi Junio,
>> >
>> > Please pull the following l10n updates for Git 2.27.0.
>> >
>> > The following changes since commit 2d5e9f31ac46017895ce6a183467037d29ceb9d3:
>> >
>> >   Git 2.27-rc2 (2020-05-26 09:38:13 -0700)
>> >
>> > are available in the Git repository at:
>> >
>> >   git@github.com:git-l10n/git-po.git tags/l10n-2.27.0-rnd2
>> >
>> > for you to fetch changes up to cb26198ec6b3fa0bc58d210ea0338f4e972f9f50:
>> >
>> >   Merge branch 'master' of github.com:ruester/git-po-de (2020-05-30 11:26:53 +0800)
>>
>> Thanks.  Swapped GPG key recently?
>
> My pgp key has expired on April 6th, so I generated a new one.  Which
> is the best practice? Edit the old pgp key to extend the expiry time
> or generate a new pgp key?

Either is OK; it's not as if we've met in person and exchanged our keys (I tend to extend the expiration date, as that key would be still recognisable by those who have been trusting that key; you can do the similar chaining of trust by signing the new key with the old key before starting to use the new one, I suppose).

Thanks.