Commit Graph

853 Commits

Author SHA1 Message Date
Jiang Xin
6c1a7dd97c Merge branch 'next' of https://github.com/ChrisADR/git-po
* 'next' of https://github.com/ChrisADR/git-po:
  l10n: es: 2.23.0 round 2
2019-08-12 16:00:14 +08:00
Christopher Diaz Riveros
3f3e3f9209 l10n: es: 2.23.0 round 2
Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org>
2019-08-10 13:17:33 -05:00
Jean-Noël Avila
ec688f776c l10n: fr v2.23.0 round 2
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
2019-08-10 18:17:31 +02:00
Jiang Xin
466c88fa0e l10n: git.pot: v2.23.0 round 2 (4 new, 6 removed)
Generate po/git.pot from v2.23.0-rc2 for git v2.23.0 l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2019-08-10 20:13:14 +08:00
Alexander Shopov
5532a55b34 l10n: bg.po: Updated Bulgarian translation (4674t)
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2019-08-10 12:34:54 +03:00
Tran Ngoc Quan
50106db740 l10n: vi.po (4676t): Updated Vietnamese translation
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2019-08-06 14:30:57 +07:00
Jiang Xin
78a9b45970 Merge branch 'master' of https://github.com/Softcatala/git-po
* 'master' of https://github.com/Softcatala/git-po:
  l10n: Update Catalan translation
2019-08-03 21:09:13 +08:00
Jiang Xin
22cc9a33ab Merge branch 'update-italian-translation' of github.com:AlessandroMenti/git-po
* 'update-italian-translation' of github.com:AlessandroMenti/git-po:
  l10n: it.po: update the Italian translation for v2.23.0
2019-08-03 21:07:05 +08:00
Jordi Mas
6a7e7c4096 l10n: Update Catalan translation
Signed-off-by: Jordi Mas <jmas@softcatala.org>
2019-08-03 09:27:05 +02:00
Alessandro Menti
f46393cbfb
l10n: it.po: update the Italian translation for v2.23.0
Update the Italian translation for Git v2.23.0 (l10n round 1), as
well as adding some minor localization fixes.

Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it>
2019-08-01 09:39:42 +02:00
Peter Krefting
2613f067dc l10n: sv.po: Update Swedish translation (4676t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2019-07-31 12:46:31 +02:00
Jiang Xin
6b0f1a9b43 l10n: git.pot: v2.23.0 round 1 (130 new, 35 removed)
Generate po/git.pot from v2.23.0-rc0 for git v2.23.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2019-07-30 09:59:56 +08:00
Jiang Xin
eccd872c76 Git 2.23-rc0
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE4fA2sf7nIh/HeOzvsLXohpav5ssFAl0/TmEACgkQsLXohpav
 5stWchAA7sWt6Qd5zqtMAT96bEtPIvSVSIzYqg8m2UQL8alDIkXrWUiZGqD7hA9Q
 hkIoDXB1fH8Q7OlJxfAplnnrkea/ARStkBBHo4KB92QUObf2LvHD4thv4iYiTof9
 CchgVnIKH+Jr6ZAgtZw9knV+w86CO7NOrwAWBVf9s81GNWkARuPlsYWs7GDCds2j
 51DPgVNUNr1PNlzKxnScaCKnuwon5kFhMxJo4pQSjJO0ezqV/5MjcOzJBCsTItgc
 EDQUzvVKj8NF8P0eF4AfLjdWr57PMqSImHAvYpt7lDSG0g72xAQ55PGR7fT8fmZr
 yHZFs0H7Bh2TC55DYg92SCm8FKZEN6YNqiXEGwxIPanaNtMwz+huUjaSISGQG5rP
 qh4NFXBU6QoyhxJE5M2SLdOWdpBeTXOfUwDB0SS4NPaEHDBjj5alzdJVm2fJYyXh
 Rg+B2IpzcL3R9Le6EORPhUb8J27XkoxVihZBN8tS5nD0Y6A/e6qacVBOT7aW2lij
 /HSTMOkY/DM6BnEdnPYRoAQTEQJXCEkYYl9Lkqe8XFGCRDw5lbJSDWu0oXmOoAux
 BmaMZW4M+35RswaOGOngC1kbtmDoU00gDo91b6V5y/PJOZvXZJsKGyx7aUbWIlzR
 HNUoLtb9/ZeyzgBslp96lILY8chbUTPQ/t1BjiS2EFFE/izdCAE=
 =kdAI
 -----END PGP SIGNATURE-----

Merge tag 'v2.23.0-rc0' of git://git.kernel.org/pub/scm/git/git

Git 2.23-rc0

* tag 'v2.23.0-rc0' of git://git.kernel.org/pub/scm/git/git: (420 commits)
  Git 2.23-rc0
  Merge fixes made on the 'master' front
  Flush fixes up to the third batch post 2.22.0
  The seventh batch
  git: mark cmd_rebase as requiring a worktree
  rebase: fix white-space
  xdiff: clamp function context indices in post-image
  grep: print the pcre2_jit_on value
  t6200: use test_commit_bulk
  travis-ci: build with GCC 4.8 as well
  The sixth batch
  clean: show an error message when the path is too long
  CodingGuidelines: spell out post-C89 rules
  README: fix rendering of text in angle brackets
  rm: resolving by removal is not a warning-worthy event
  transport-helper: avoid var decl in for () loop control
  stash: fix handling removed files with --keep-index
  mingw: support spawning programs containing spaces in their names
  gpg-interface: do not scan past the end of buffer
  tests: defang pager tests by explicitly disabling the log.mailmap warning
  ...
2019-07-30 09:56:16 +08:00
Philipp Weißmann
291ada22cb l10n: de.po: Fix typo in German translation
Fix translation error of "complete => "vollständig" instead of
"unvollständig"

Currently: Documentation states that --unshallow can NOT be used on
INcomplete projects. This is wrong;
Correct would be: --unshallow can NOT be used on complete projects.

This change fixes that error in the German translation.

Signed-off-by: Philipp Weißmann <mail@philipp-weissmann.de>
Reviewed-by: Matthias Rüster <matthias.ruester@gmail.com>
2019-07-14 16:55:21 +02:00
Carmine Zaccagnino
820419f7c9
l10n: it.po: remove an extra space
Remove an extra space between the dashes and the start of the
"abort" option.

Signed-off-by: Carmine Zaccagnino <carmine@carminezacc.com>
Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it>
2019-06-29 07:51:37 +02:00
Alessandro Menti
505f7b235a
l10n: it.po: update the Italian translation
Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it>
2019-06-25 21:01:31 +02:00
Dimitriy Ryazantcev
6ff99fc757 l10n: ru.po: update Russian translation
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
2019-06-21 20:46:54 +03:00
Ævar Arnfjörð Bjarmason
1ff750b128 tests: make GIT_TEST_GETTEXT_POISON a boolean
Change the GIT_TEST_GETTEXT_POISON variable from being "non-empty?" to
being a more standard boolean variable.

Since it needed to be checked in both C code and shellscript (via test
-n) it was one of the remaining shellscript-like variables. Now that
we have "env--helper" we can change that.

There's a couple of tricky edge cases that arise because we're using
git_env_bool() early, and the config-reading "env--helper".

If GIT_TEST_GETTEXT_POISON is set to an invalid value die_bad_number()
will die, but to do so it would usually call gettext(). Let's detect
the special case of GIT_TEST_GETTEXT_POISON and always emit that
message in the C locale, lest we infinitely loop.

As seen in the updated tests in t0017-env-helper.sh there's also a
caveat related to "env--helper" needing to read the config for trace2
purposes.

Since the C_LOCALE_OUTPUT prerequisite is lazy and relies on
"env--helper" we could get invalid results if we failed to read the
config (e.g. because we'd loop on includes) when combined with
e.g. "test_i18ngrep" wanting to check with "env--helper" if
GIT_TEST_GETTEXT_POISON was true or not.

I'm crossing my fingers and hoping that a test similar to the one I
removed in the earlier "config tests: simplify include cycle test"
change in this series won't happen again, and testing for this
explicitly in "env--helper"'s own tests.

This change breaks existing uses of
e.g. GIT_TEST_GETTEXT_POISON=YesPlease, which we've documented in
po/README and other places. As noted in [1] we might want to consider
also accepting "YesPlease" in "env--helper" as a special-case.

But as the lack of uproar over 6cdccfce1e ("i18n: make GETTEXT_POISON
a runtime option", 2018-11-08) demonstrates the audience for this
option is a really narrow set of git developers, who shouldn't have
much trouble modifying their test scripts, so I think it's better to
deal with that minor headache now and make all the relevant GIT_TEST_*
variables boolean in the same way than carry the "YesPlease"
special-case forward.

1. https://public-inbox.org/git/xmqqtvckm3h8.fsf@gitster-ct.c.googlers.com/

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-06-21 09:42:49 -07:00
Jordi Mas
197866e4b3 l10n: Update Catalan translation
Signed-off-by: Jordi Mas <jmas@softcatala.org>
2019-06-08 08:32:49 +02:00
Jiang Xin
0cdb8d2db2 Merge branch 'fr_review' of git://github.com/jnavila/git
* 'fr_review' of git://github.com/jnavila/git:
  l10n: fr.po: Review French translation
2019-06-07 16:51:09 +08:00
Jiang Xin
d014920079 Merge branch 'master' of git://github.com/alshopov/git-po
* 'master' of git://github.com/alshopov/git-po:
  l10n: bg.po: Updated Bulgarian translation (4581t)
2019-06-07 16:50:23 +08:00
Cédric Malard
82eb147dbb l10n: fr.po: Review French translation
Signed-off-by: Cédric Malard <c.malard-git@valdun.net>
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
2019-06-07 08:54:28 +02:00
Matthias Rüster
219829ae83 l10n: de.po: Update German translation
Reviewed-by: Ralf Thielow <ralf.thielow@gmail.com>
Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com>
2019-06-06 07:03:26 +02:00
Ralf Thielow
8c18948b78 l10n: de.po: improve description of 'git reset --quiet'
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2019-06-06 07:03:25 +02:00
Matthias Rüster
d314d77577 l10n: TEAMS: Change German translation team leader
Acked-by: Ralf Thielow <ralf.thielow@gmail.com>
Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com>
2019-06-05 20:48:37 +02:00
Alexander Shopov
de2b0545ee l10n: bg.po: Updated Bulgarian translation (4581t)
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2019-06-05 08:51:15 +02:00
Fangyi Zhou
5b5336320b l10n: zh_CN: Revision for git v2.22.0 l10n
Revise 51 translations, improving consistency for some phrased.
Update email address for Fangyi Zhou

Signed-off-by: Fangyi Zhou <me@fangyi.io>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2019-06-05 08:37:30 +08:00
Jiang Xin
d46c551928 l10n: zh_CN: for git v2.22.0 l10n round 1~3
Translate 274 new messages (4581t0f0u) for git 2.22.0.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2019-06-05 08:37:30 +08:00
Jiang Xin
914bd0923e Merge branch '2.22' of https://github.com/ChrisADR/git-po
* '2.22' of https://github.com/ChrisADR/git-po:
  l10n: es: 2.22.0 round 3
2019-06-05 08:35:35 +08:00
Jiang Xin
488ed582d3 Merge branch 'it-l10n-wip' of github.com:AlessandroMenti/git-po
* 'it-l10n-wip' of github.com:AlessandroMenti/git-po:
  l10n: it.po: Updated Italian translation
2019-06-05 08:17:28 +08:00
Christopher Diaz Riveros
922a0a7d98 l10n: es: 2.22.0 round 3
Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org>
2019-06-04 18:52:28 -05:00
Alessandro Menti
bbc55709e7
l10n: it.po: Updated Italian translation
Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it>
2019-06-04 22:27:19 +02:00
Jean-Noël Avila
85b66ac50d l10n: fr v2.22.0 rnd 3
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
2019-06-04 19:53:32 +02:00
Tran Ngoc Quan
77e1962193 l10n: vi.po(4581t): Updated Vietnamese translation for v2.22.0 round 3
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2019-06-04 08:13:53 +07:00
Jiang Xin
386544cd84 l10n: git.pot: v2.22.0 round 3 (3 new, 2 removed)
Generate po/git.pot from v2.22.0-rc3 for git v2.22.0 l10n round 3.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2019-06-04 08:27:36 +08:00
Christopher Diaz Riveros
1c8ba5f1b3 l10n: es: 2.22.0 round 2
Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org>
2019-06-03 09:34:50 -05:00
Jiang Xin
cb56cf3b2d Merge branch 'master' of https://github.com/vnwildman/git
* 'master' of https://github.com/vnwildman/git:
  l10n: vi.po(4580t): Updated Vietnamese translation for v2.22.0 round 2
2019-06-02 22:35:11 +08:00
Jiang Xin
c181f4d2d7 Merge branch 'master' of git://github.com/alshopov/git-po
* 'master' of git://github.com/alshopov/git-po:
  l10n: bg.po: Updated Bulgarian translation (4580t)
2019-06-02 22:09:35 +08:00
Alexander Shopov
9c21d45420 l10n: bg.po: Updated Bulgarian translation (4580t)
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2019-06-02 09:26:52 +02:00
Tran Ngoc Quan
35655fe726 l10n: vi.po(4580t): Updated Vietnamese translation for v2.22.0 round 2
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2019-06-01 08:37:57 +07:00
Jean-Noël Avila
fc8703c9f6 l10n: fr.po v2.22.0 round 2
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
2019-05-31 10:46:21 +02:00
Jiang Xin
c08fd7307c l10n: git.pot: v2.22.0 round 2 (6 new, 3 removed)
Generate po/git.pot from v2.22.0-rc2 for git v2.22.0 l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2019-05-31 14:36:22 +08:00
Jiang Xin
ea8a8d04c3 Merge branch 'master' of https://github.com/Softcatala/git-po
* 'master' of https://github.com/Softcatala/git-po:
  l10n: Update Catalan translation
2019-05-31 14:32:35 +08:00
Jiang Xin
75a9e02b08 Merge branch 'master' of git://github.com/alshopov/git-po
* 'master' of git://github.com/alshopov/git-po:
  l10n: bg.po: Updated Bulgarian translation (4577t)
2019-05-29 22:01:19 +08:00
Alexander Shopov
47e80a2c53 l10n: bg.po: Updated Bulgarian translation (4577t)
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2019-05-29 10:27:27 +02:00
Christopher Diaz Riveros
d0b1b61578 l10n: es: 2.22.0 round 1
Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org>
2019-05-28 11:33:00 -05:00
Jiang Xin
1e24ee8471 Merge branch 'master' of https://github.com/vnwildman/git
* 'master' of https://github.com/vnwildman/git:
  l10n: vi.po(4577t): Updated Vietnamese translation for v2.22.0 round 1
2019-05-21 08:55:54 +08:00
Tran Ngoc Quan
28e0eb8086 l10n: vi.po(4577t): Updated Vietnamese translation for v2.22.0 round 1
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2019-05-19 08:40:33 +07:00
Jean-Noël Avila
1d9f0b79a0 l10n: fr.po v2.22.0.rnd1
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
2019-05-17 19:55:39 +02:00
Peter Krefting
4ae76f5e1d l10n: sv.po: Update Swedish translation (4577t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2019-05-14 15:46:15 +01:00