Commit graph

771 commits

Author SHA1 Message Date
Ralf Thielow 0688c551a3 l10n: de.po: fix two messages
Reported-by: Phillip Szelat <phillip.szelat@gmail.com>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2018-12-07 19:43:07 +01:00
Jiang Xin 4c27fcb576 l10n: zh_CN: for git v2.20.0 l10n round 1 to 3
Translate 257 new messages (4187t0f0u) for git 2.20.0.

Reviewed-by: Zhou Fangyi <fangyi.zhou@yuriko.moe>
Reviewed-by: 依云 <lilydjwg@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2018-12-06 16:00:29 +08:00
Ralf Thielow cf4c0c2505 l10n: update German translation
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2018-12-06 07:44:41 +01:00
Jiang Xin 609713eb66 Merge branch 'master' of git://github.com/alshopov/git-po 2018-12-03 12:49:45 +08:00
Alexander Shopov 9290395fe9 l10n: bg.po: Updated Bulgarian translation (4187t)
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2018-12-02 16:09:21 +01:00
Peter Krefting 7345044379 l10n: sv.po: Update Swedish translation (4187t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2018-12-02 15:43:34 +01:00
Jiang Xin a8f5329e04 Merge branch 'fr_2.20_round3' of git://github.com/jnavila/git 2018-12-02 22:36:36 +08:00
Jean-Noël Avila 5386321271 l10n: fr.po v2.20.0 round 3
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
2018-12-02 11:03:23 +01:00
Jiang Xin cd1eab5882 Merge branch 'master' of https://github.com/vnwildman/git 2018-12-02 17:57:24 +08:00
Tran Ngoc Quan 8173e9c772 l10n: vi(4187t): Updated Vietnamese translation for v2.20.0 rd3
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2018-12-02 14:15:00 +07:00
Christopher Diaz Riveros 7c6767be71 l10n: es.po v2.20.0 round 3
Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org>
2018-12-01 23:17:55 -05:00
Jiang Xin 578d8ea381 l10n: git.pot: v2.20.0 round 3 (5 new, 3 removed)
Generate po/git.pot from v2.20.0-rc2 for git v2.20.0 l10n round 3.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2018-12-02 10:56:26 +08:00
Jiang Xin 26a567e4c3 Merge branch 'master' of https://github.com/vnwildman/git 2018-12-02 10:25:09 +08:00
Tran Ngoc Quan 84368b62b0 l10n: vi(4185t): Updated Vietnamese translation for v2.20.0
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2018-12-02 09:00:09 +07:00
Christopher Diaz Riveros 0960a4beff l10n: es.po v2.20.0 round 1
Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org>
2018-12-01 14:09:28 -05:00
Alexander Shopov d0a6644845 l10n: bg.po: Updated Bulgarian translation (4185t)
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2018-12-01 11:48:08 +01:00
Jiang Xin 36dd6933bd l10n: git.pot: v2.20.0 round 2 (2 new, 2 removed)
Generate po/git.pot from v2.20.0-rc1-10-g7068cbc4ab for git v2.20.0 l10n
round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2018-12-01 16:15:51 +08:00
Jiang Xin 5362f4d97f Merge branch 'master' of git://github.com/alshopov/git-po 2018-12-01 16:13:31 +08:00
Jiang Xin 1a8e317e53 Merge branch 'master' of git://github.com/nafmo/git-l10n-sv 2018-12-01 16:11:45 +08:00
Jiang Xin 9cf1f0d08d Merge branch 'fr_2.20_rnd1' of git://github.com/jnavila/git 2018-12-01 15:36:53 +08:00
Alexander Shopov 3154af4a0d l10n: bg.po: Updated Bulgarian translation (4185t)
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2018-11-30 23:17:50 +01:00
Peter Krefting 4a81e9cd6d l10n: sv.po: Update Swedish translation (4185t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2018-11-29 12:55:22 +01:00
Jean-Noël Avila 6b822f7359 l10n: fr.po v2.20 rnd 1
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
2018-11-28 22:16:56 +01:00
Jordi Mas d9324e4ed0 l10n: Update Catalan translation
Signed-off-by: Jordi Mas <jmas@softcatala.org>
2018-11-25 14:53:41 +01:00
Jiang Xin 1f5a6ca2c7 Merge branch 'master' of git://github.com/git-l10n/git-po 2018-11-20 10:07:25 +08:00
Jiang Xin 1270554665 l10n: git.pot: v2.20.0 round 1 (254 new, 27 removed)
Generate po/git.pot from v2.20.0-rc0-23-gbb75be6cb9 for git v2.20.0 l10n
round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2018-11-20 10:06:16 +08:00
Jiang Xin 87af1bb0d8 Merge branch 'master' of https://github.com/Softcatala/git-po 2018-11-18 21:36:13 +08:00
Jordi Mas f3131eecdb l10n: Update Catalan translation
Signed-off-by: Jordi Mas <jmas@softcatala.org>
2018-11-11 16:35:19 +01:00
Ævar Arnfjörð Bjarmason 6cdccfce1e i18n: make GETTEXT_POISON a runtime option
Change the GETTEXT_POISON compile-time + runtime GIT_GETTEXT_POISON
test parameter to only be a GIT_TEST_GETTEXT_POISON=<non-empty?>
runtime parameter, to be consistent with other parameters documented
in "Running tests with special setups" in t/README.

When I added GETTEXT_POISON in bb946bba76 ("i18n: add GETTEXT_POISON
to simulate unfriendly translator", 2011-02-22) I was concerned with
ensuring that the _() function would get constant folded if NO_GETTEXT
was defined, and likewise that GETTEXT_POISON would be compiled out
unless it was defined.

But as the benchmark in my [1] shows doing a one-off runtime
getenv("GIT_TEST_[...]") is trivial, and since GETTEXT_POISON was
originally added the GIT_TEST_* env variables have become the common
idiom for turning on special test setups.

So change GETTEXT_POISON to work the same way. Now the
GETTEXT_POISON=YesPlease compile-time option is gone, and running the
tests with GIT_TEST_GETTEXT_POISON=[YesPlease|] can be toggled on/off
without recompiling.

This allows for conditionally amending tests to test with/without
poison, similar to what 859fdc0c3c ("commit-graph: define
GIT_TEST_COMMIT_GRAPH", 2018-08-29) did for GIT_TEST_COMMIT_GRAPH. Do
some of that, now we e.g. always run the t0205-gettext-poison.sh test.

I did enough there to remove the GETTEXT_POISON prerequisite, but its
inverse C_LOCALE_OUTPUT is still around, and surely some tests using
it can be converted to e.g. always set GIT_TEST_GETTEXT_POISON=.

Notes on the implementation:

 * We still compile a dedicated GETTEXT_POISON build in Travis
   CI. Perhaps this should be revisited and integrated into the
   "linux-gcc" build, see ae59a4e44f ("travis: run tests with
   GIT_TEST_SPLIT_INDEX", 2018-01-07) for prior art in that area. Then
   again maybe not, see [2].

 * We now skip a test in t0000-basic.sh under
   GIT_TEST_GETTEXT_POISON=YesPlease that wasn't skipped before. This
   test relies on C locale output, but due to an edge case in how the
   previous implementation of GETTEXT_POISON worked (reading it from
   GIT-BUILD-OPTIONS) wasn't enabling poison correctly. Now it does,
   and needs to be skipped.

 * The getenv() function is not reentrant, so out of paranoia about
   code of the form:

       printf(_("%s"), getenv("some-env"));

   call use_gettext_poison() in our early setup in git_setup_gettext()
   so we populate the "poison_requested" variable in a codepath that's
   won't suffer from that race condition.

 * We error out in the Makefile if you're still saying
   GETTEXT_POISON=YesPlease to prompt users to change their
   invocation.

 * We should not print out poisoned messages during the test
   initialization itself to keep it more readable, so the test library
   hides the variable if set in $GIT_TEST_GETTEXT_POISON_ORIG during
   setup. See [3].

See also [4] for more on the motivation behind this patch, and the
history of the GETTEXT_POISON facility.

1. https://public-inbox.org/git/871s8gd32p.fsf@evledraar.gmail.com/
2. https://public-inbox.org/git/20181102163725.GY30222@szeder.dev/
3. https://public-inbox.org/git/20181022202241.18629-2-szeder.dev@gmail.com/
4. https://public-inbox.org/git/878t2pd6yu.fsf@evledraar.gmail.com/

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-11-09 11:25:19 +09:00
Minh Nguyen 232b63c440 l10n: vi.po: fix typo in pack-objects
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2018-11-01 13:26:08 +07:00
Ralf Thielow 38bfde23f1 l10n: update German translation
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2018-10-19 19:34:36 +02:00
Jiang Xin e640d114ab l10n: zh_CN: review for git v2.19.0 l10n
Reviewed-by: 依云 <lilydjwg@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2018-09-12 10:14:07 +08:00
Jiang Xin c1ac5258dc l10n: zh_CN: for git v2.19.0 l10n round 1 to 2
Translate 382 new messages (3958t0f0u) for git 2.19.0.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2018-09-09 22:38:39 +08:00
Jiang Xin 282c393e18 Merge branch 'master' of git://github.com/alshopov/git-po
* 'master' of git://github.com/alshopov/git-po:
  l10n: bg.po: Updated Bulgarian translation (3958t)
2018-09-09 19:05:41 +08:00
Alexander Shopov 1eaabd4a0d l10n: bg.po: Updated Bulgarian translation (3958t)
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2018-09-09 11:29:19 +02:00
Tran Ngoc Quan 7c73a6bf27 l10n: vi.po(3958t): updated Vietnamese translation v2.19.0 round 2
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2018-09-07 13:41:08 +07:00
Christopher Diaz Riveros 33b727947d l10n: es.po v2.19.0 round 2
Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org>
2018-09-06 04:27:56 -05:00
Jiang Xin f1627fad4f Merge branch 'fr_2.19.0_rnd1' of git://github.com/jnavila/git
* 'fr_2.19.0_rnd1' of git://github.com/jnavila/git:
  l10n: fr.po v2.19.0 rnd 2
  l10n: fr.po v2.19.0 rnd 1
  l10n: fr: fix a message seen in git bisect
2018-09-06 09:17:55 +08:00
Jean-Noël Avila 2104663c7b l10n: fr.po v2.19.0 rnd 2
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
2018-09-05 22:19:48 +02:00
Jean-Noël Avila 0859ed62b4 l10n: fr.po v2.19.0 rnd 1
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
2018-09-05 22:15:09 +02:00
Raphaël Hertzog 8944a83342 l10n: fr: fix a message seen in git bisect
"cette" can be only be used before a word (like in "cette bouteille" for
"this bottle"), but here "this" refers to the current step and we have
to use "ceci" in French.

Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
2018-09-05 22:15:09 +02:00
Peter Krefting bc25f7ae19 l10n: sv.po: Update Swedish translation (3958t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2018-09-04 22:34:09 +01:00
Jiang Xin 98ac781508 l10n: git.pot: v2.19.0 round 2 (3 new, 5 removed)
Generate po/git.pot from v2.19.0-rc1 for git v2.19.0 l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2018-09-04 08:51:58 +08:00
Dimitriy Ryazantcev a123a47f40 l10n: ru.po: update Russian translation
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
2018-08-28 18:58:36 +03:00
Jiang Xin dba9f13c6a l10n: git.pot: v2.19.0 round 1 (382 new, 30 removed)
Generate po/git.pot from v2.19.0-rc0 for git v2.19.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2018-08-21 08:28:47 +08:00
Ralf Thielow 1be2214f4b l10n: de.po: translate 108 new messages
Translate 108 new messages came from git.pot update in 9b7388a85 (l10n:
git.pot: v2.18.0 round 1 (108 new, 14 removed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Matthias Rüster <matthias.ruester@gmail.com>
2018-07-26 18:52:14 +02:00
Jiang Xin 0fcd668fc4 l10n: zh_CN: review for git 2.18.0
Reviewed-by: 依云 <lilydjwg@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2018-07-02 10:32:10 +08:00
Peter Krefting a7a31d49b6 l10n: sv.po: Update Swedish translation(3608t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2018-06-26 13:29:56 +01:00
Changwoo Ryu 4898dd2513 l10n: ko.po: Update Korean translation
Update the Korean translation and change the team leader to Gwan-gyeong
Mun.

Signed-off-by: Gwan-gyeong Mun <elongbug@gmail.com>
Signed-off-by: Changwoo Ryu <cwryu@debian.org>
Reviewed-by: Gwan-gyeong Mun <elongbug@gmail.com>
2018-06-19 02:19:42 +09:00
Jiang Xin fd8cb37902 l10n: zh_CN: for git v2.18.0 l10n round 1 to 3
Translate 251 new messages (3608t0f0u) for git 2.18.0.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2018-06-18 00:31:45 +08:00