development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 18:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
57369 commits 6 branches 951 tags 697 MiB
Commit graph

880 commits

Author SHA1 Message Date
Fabien Villepinte 02705d38d4 l10n: fr.po Fix some typos from round3 
Signed-off-by: Fabien Villepinte <fabien.villepinte@gmail.com>
 2019-02-15 22:14:23 +01:00
Fabien Villepinte 5a05494049 l10n: fr.po Fix some typos 
Signed-off-by: Fabien Villepinte <fabien.villepinte@gmail.com>
 2019-02-15 22:14:23 +01:00
Jordi Mas bdc017d268 l10n: Fixes to Catalan translation 
Signed-off-by: Jordi Mas <jmas@softcatala.org>
 2019-02-15 16:43:59 +01:00
Jiang Xin 7f95bc7a20 l10n: git.pot: v2.21.0 round 2 (3 new, 3 removed) 
Introduce 3 update messages for v2.21.0 l10n round 2 from commit
32ceace39f (Fix typos in translatable strings for v2.21.0, 2019-02-11).

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2019-02-15 10:21:59 +08:00
Jiang Xin 94328ceff0 l10n: git.pot: v2.21.0 round 1 (214 new, 38 removed) 
Generate po/git.pot from v2.21.0-rc0-30-g11ad41d4cb (Seventh batch for 2.21)
for git v2.21.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2019-02-09 20:54:56 +08:00
Jiang Xin e9376a570c Merge branch 'master' of github.com:linusboyle/git 2018-12-13 22:25:55 +08:00
Jiang Xin 3e35df95ae Merge branch 'master' of https://github.com/Softcatala/git-po 2018-12-13 22:24:25 +08:00
Zhilei Han 25c759021f l10n: zh_CN: fix typo of submodule init message 
This patch somehow corrects a typo for 'git submodule init', which is
supposed to be mistakenly copyed from the deinit command

Signed-off-by: Zhilei Han <linusboyle@gmail.com>
 2018-12-13 21:36:46 +08:00
Jordi Mas b0340175b6 l10n: Update Catalan translation 
Signed-off-by: Jordi Mas <jmas@softcatala.org>
 2018-12-11 07:20:21 +01:00
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
Jiang Xin 6484659f26 Merge branch 'master' of git://github.com/nafmo/git-l10n-sv 
* 'master' of git://github.com/nafmo/git-l10n-sv:
  l10n: sv.po: Update Swedish translation (3608t0f0u)
  l10n: sv.po: Update Swedish translation (3470t0f0u)
 2018-06-17 22:44:08 +08:00
Jiang Xin cc9ab5bdfc Merge branch 'master' of https://github.com/vnwildman/git 
* 'master' of https://github.com/vnwildman/git:
  l10n: vi.po(3608t): Update Vietnamese translation for v2.18.0 round 3
 2018-06-17 22:41:43 +08:00
Jiang Xin 1f764f054c Merge branch 'master' of git://github.com/alshopov/git-po 
* 'master' of git://github.com/alshopov/git-po:
  l10n: bg.po: Updated Bulgarian translation (3608t)
 2018-06-17 22:37:53 +08:00
Jiang Xin ee4286e8a3 Merge branch 'fr_2.18_rnd3' of git://github.com/jnavila/git 
* 'fr_2.18_rnd3' of git://github.com/jnavila/git:
  l10n: fr.po v2.18.0 round 3
 2018-06-17 22:36:41 +08:00
Alexander Shopov e530425bc1 l10n: bg.po: Updated Bulgarian translation (3608t) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2018-06-17 13:16:40 +02:00
Tran Ngoc Quan 09dba1409d l10n: vi.po(3608t): Update Vietnamese translation for v2.18.0 round 3 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2018-06-17 07:06:44 +07:00
Jean-Noël Avila 3509754cae l10n: fr.po v2.18.0 round 3 
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
 2018-06-16 20:43:07 +02:00
Christopher Diaz Riveros 3b1110a658 l10n: es.po: Spanish update for v2.18.0 round 3 
Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org>
 2018-06-16 09:58:53 -05:00
Jiang Xin 90d4bec978 l10n: git.pot: v2.18.0 round 3 (1 new, 1 removed) 
Generate po/git.pot from v2.18.0-rc2 for git v2.18.0 l10n round 3.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2018-06-16 22:06:45 +08:00
Jiang Xin f448ec19c7 Merge branch 'master' of https://github.com/vnwildman/git 
* 'master' of https://github.com/vnwildman/git:
  l10n: vi.po(3608t): Update Vietnamese translation for v2.18.0 round2
 2018-06-15 10:04:25 +08:00
Tran Ngoc Quan 56c0bfbb69 l10n: vi.po(3608t): Update Vietnamese translation for v2.18.0 round2 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2018-06-14 14:19:56 +07:00
Alexander Shopov 2904c25f8b l10n: bg.po: Updated Bulgarian translation (3608t) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2018-06-12 09:38:49 +02:00
Christopher Diaz Riveros 425e504c7c l10n: es.po: Spanish update for v2.18.0 round 2 
Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org>
 2018-06-10 14:08:26 -05:00
Peter Krefting e93f5ec21d l10n: sv.po: Update Swedish translation (3608t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2018-06-08 22:53:44 +01:00
Peter Krefting cdd9311290 l10n: sv.po: Update Swedish translation (3470t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2018-06-08 21:37:32 +01:00
Jiang Xin 5589271206 l10n: git.pot: v2.18.0 round 2 (144 new, 6 removed) 
Generate po/git.pot from v2.18.0-rc1 for git v2.18.0 l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2018-06-08 09:17:29 +08:00
Jiang Xin a093a5da48 Merge branch 'fr_2.18_round1' of git://github.com/jnavila/git 
* 'fr_2.18_round1' of git://github.com/jnavila/git:
  l10n: fr.po v2.18 round 1
 2018-06-04 07:58:22 +08:00
Jean-Noël Avila f29a2d82f4 l10n: fr.po v2.18 round 1 
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
 2018-06-03 16:36:32 +02:00
Tran Ngoc Quan 70d748213e l10n: vi(3470t): Updated Vietnamese translation for v2.18.0 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2018-06-03 13:43:13 +07:00
Christopher Diaz Riveros 296415c039 l10n: es.po: Spanish update for v2.18.0 round 1 
Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org>
 2018-06-02 12:16:01 -05:00
Jiang Xin 9b7388a855 l10n: git.pot: v2.18.0 round 1 (108 new, 14 removed) 
Generate po/git.pot from v2.18.0-rc0 for git v2.18.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2018-05-31 23:35:22 +08:00
Jiang Xin 0b484b4816 Merge branch 'master' of https://github.com/ralfth/git-po-de into maint 
* 'master' of https://github.com/ralfth/git-po-de:
  l10n: de.po: fix typos
 2018-04-15 22:25:48 +08:00
Ralf Thielow 9e8e262749 l10n: TEAMS: remove inactive de team members 
Thanks for your contributions!

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2018-04-15 22:25:31 +08:00
Andre Hinrichs 4a5d2ec33a l10n: de.po: fix typos 
Signed-off-by: Andre Hinrichs <andre.hinrichs@gmx.de>
 2018-04-11 16:27:37 +02:00
Jordi Mas 8524bf7cc1 l10n: Update Catalan translation 
Signed-off-by: Jordi Mas <jmas@softcatala.org>
 2018-04-10 22:22:42 +02:00
Ralf Thielow 8bb6d60dd6 l10n: de.po: translate 132 new messages 
Translate 132 new messages came from git.pot update in abc8de64d (l10n:
git.pot: v2.17.0 round 1 (132 new, 44 removed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2018-03-31 13:21:09 +02:00
Ray Chen 610f8099cd l10n: zh_CN: review for git v2.17.0 l10n round 1 
Signed-off-by: Ray Chen <oldsharp@gmail.com>
 2018-03-29 22:09:39 +08:00
Jiang Xin 31e5e17b22 l10n: zh_CN: for git v2.17.0 l10n round 1 
Translate 132 new messages (3376t0f0u) for git 2.17.0-rc0.

Reviewed-by: 依云 <lilydjwg@gmail.com>
Reviewed-by: Fangyi Zhou <fangyi.zhou@yuriko.moe>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2018-03-29 22:09:39 +08:00
Changwoo Ryu 1be5ae8a4b l10n: ko.po: Update Korean translation 
Signed-off-by: Changwoo Ryu <cwryu@debian.org>
Signed-off-by: Sihyeon Jang <uneedsihyeon@gmail.com>
Signed-off-by: Gwan-gyeong Mun <elongbug@gmail.com>
Reviewed-by: Changwoo Ryu <cwryu@debian.org>
 2018-03-28 23:41:20 +09:00
Jiang Xin edc320edc3 Merge branch 'fr_v2.17.0' of git://github.com/jnavila/git 
* 'fr_v2.17.0' of git://github.com/jnavila/git:
  l10n: fr.po: v2.17.0 no fuzzy
 2018-03-25 21:24:02 +08:00
Jean-Noël Avila 7be97e414b l10n: fr.po: v2.17.0 no fuzzy 
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
 2018-03-23 23:03:37 +01:00
Jiang Xin df8526cef2 Merge branch 'master' of git://github.com/nafmo/git-l10n-sv 
* 'master' of git://github.com/nafmo/git-l10n-sv:
  l10n: sv.po: Update Swedish translation (3376t0f0u)
 2018-03-21 22:13:51 +08:00
Jiang Xin dabe29bbbd Merge branch 'master' of https://github.com/Softcatala/git-po 
* 'master' of https://github.com/Softcatala/git-po:
  l10n: Update Catalan translation
 2018-03-21 22:07:53 +08:00
Peter Krefting 1439a72e17 l10n: sv.po: Update Swedish translation (3376t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2018-03-18 20:57:07 +01:00
Jordi Mas b5827d230c l10n: Update Catalan translation 
Signed-off-by: Jordi Mas <jmas@softcatala.org>
 2018-03-18 16:03:18 +01:00
Jiang Xin d2cad6e67e Merge branch 'fr_v2.17.0' of git://github.com/jnavila/git 
* 'fr_v2.17.0' of git://github.com/jnavila/git:
  l10n: fr.po v2.17.0 round 1
 2018-03-18 19:46:38 +08:00
Jean-Noël Avila 6a07148356 l10n: fr.po v2.17.0 round 1 
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
 2018-03-17 16:21:34 +01:00
Jiang Xin d65800c648 Merge branch 'master' of https://github.com/vnwildman/git 
* 'master' of https://github.com/vnwildman/git:
  l10n: vi.po(3376t): Updated Vietnamese translation for v2.17
 2018-03-17 11:27:05 +08:00
Jiang Xin 77781256b9 Merge branch 'master' of git://github.com/alshopov/git-po 
* 'master' of git://github.com/alshopov/git-po:
  l10n: bg.po: Updated Bulgarian translation (3376t)
 2018-03-17 11:24:53 +08:00
Tran Ngoc Quan 1a849b56ac l10n: vi.po(3376t): Updated Vietnamese translation for v2.17 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2018-03-17 07:53:33 +07:00
Alexander Shopov 31243e7fff l10n: bg.po: Updated Bulgarian translation (3376t) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2018-03-16 09:55:13 +01:00
Christopher Diaz Riveros 33ac3e8968 l10n: es.po: Update Spanish translation 2.17.0 
Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org>
 2018-03-15 21:55:20 -05:00
Jiang Xin b82ef32528 Merge remote-tracking branch 'git-po/maint' 
* git-po/maint:
  l10n: es.po: fixes to Spanish translation
 2018-03-16 07:36:32 +08:00
Jiang Xin abc8de64d2 l10n: git.pot: v2.17.0 round 1 (132 new, 44 removed) 
Generate po/git.pot from v2.17.0-rc0 for git v2.17.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2018-03-16 07:34:52 +08:00
Christopher Diaz Riveros 9df63a4a8c l10n: es.po: fixes to Spanish translation 
Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org>
 2018-02-16 09:00:42 -05:00
Ralf Thielow c9741bb98e l10n: de.po: translate 72 new messages 
Translate 72 new messages came from git.pot update in 18a907225 (l10n:
git.pot: v2.16.0 round 1 (64 new, 25 removed)) and 005c62fe4 (l10n:
git.pot: v2.16.0 round 2 (8 new, 4 removed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Matthias Rüster <matthias.ruester@gmail.com>
 2018-01-15 07:47:30 +01:00
Ralf Thielow 31eaa14e81 l10n: de.po: improve messages when a branch starts to track another ref 
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2018-01-15 07:47:30 +01:00
Alexander Shopov 1b6d5e83b6 l10n: bg.po: Updated Bulgarian translation (3288t) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2018-01-11 22:02:02 +01:00
Jiang Xin 0d08328dd8 l10n: TEAMS: add zh_CN team members 
Add Fangyi Zhou to zh_CN l10n team members.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2018-01-10 11:31:55 +08:00
Jiang Xin 5809aa05f7 l10n: zh_CN: for git v2.16.0 l10n round 2 
Translate 72 messages (3288t0f0u) for git v2.16.0-rc1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Reviewed-by: 依云 <lilydjwg@gmail.com>
Reviewed-by: Fangyi Zhou <fangyi.zhou@yuriko.moe>
 2018-01-10 11:31:32 +08:00
Jiang Xin dfb5c4c15b Merge branch 'master' of git://github.com/nafmo/git-l10n-sv 
* 'master' of git://github.com/nafmo/git-l10n-sv:
  l10n: sv.po: Update Swedish translation (3288t0f0u)
 2018-01-10 11:30:04 +08:00
Jiang Xin 45498f08b6 Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ru 
* 'russian-l10n' of https://github.com/DJm00n/git-po-ru:
  l10n: ru.po: update Russian translation
 2018-01-10 11:28:56 +08:00
Peter Krefting 9d4b85be54 l10n: sv.po: Update Swedish translation (3288t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2018-01-09 20:10:14 +01:00
Dimitriy Ryazantcev 846bb11707 l10n: ru.po: update Russian translation 
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
 2018-01-09 13:22:24 +02:00
Changwoo Ryu 4b0d6bdafa l10n: TEAMS: Add ko team members 
Add Gwan-gyeong Mun and Sihyeon Jang.

Signed-off-by: Changwoo Ryu <cwryu@debian.org>
 2018-01-09 11:42:03 +09:00
Jiang Xin 77482d05d4 Merge branch 'ko/merge-l10n' of https://github.com/git-l10n-ko/git-l10n-ko 
* 'ko/merge-l10n' of https://github.com/git-l10n-ko/git-l10n-ko:
  l10n: ko.po: Update Korean translation
 2018-01-09 09:47:11 +08:00
Changwoo Ryu 4a7e1b2475 l10n: ko.po: Update Korean translation 
Signed-off-by: Changwoo Ryu <cwryu@debian.org>
Signed-off-by: Sihyeon Jang <uneedsihyeon@gmail.com>
Signed-off-by: Gwan-gyeong Mun <elongbug@gmail.com>
Reviewed-by: Changwoo Ryu <cwryu@debian.org>
 2018-01-08 17:59:35 +09:00
Jiang Xin daa8563143 Merge branch '2.16' of https://github.com/ChrisADR/git-po 
* '2.16' of https://github.com/ChrisADR/git-po:
  l10n: es.po: Spanish translation 2.16.0 round 2
 2018-01-08 10:59:24 +08:00
Jiang Xin 9c315b944d Merge branch 'fr_2.16-rc1' of git://github.com/jnavila/git 
* 'fr_2.16-rc1' of git://github.com/jnavila/git:
  l10n: fr.po 2.16 round 2
 2018-01-08 09:17:24 +08:00
Jean-Noel Avila 2acb3d4992 l10n: fr.po 2.16 round 2 
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
 2018-01-07 18:57:48 +01:00
Christopher Díaz Riveros 521437fe7c l10n: es.po: Spanish translation 2.16.0 round 2 
Signed-off-by: Christopher Díaz Riveros <chrisadr@gentoo.org>
 2018-01-07 12:15:35 -05:00
Tran Ngoc Quan fe73f3eecc l10n: vi.po(3288t): Updated Vietnamese translation for v2.16.0 round 2 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2018-01-07 08:20:27 +07:00
Jiang Xin 005c62fe46 l10n: git.pot: v2.16.0 round 2 (8 new, 4 removed) 
Generate po/git.pot from v2.16.0-rc1 for git v2.16.0 l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2018-01-07 07:50:31 +08:00
Jiang Xin 48f2a74589 Merge branch '2.16' of https://github.com/ChrisADR/git-po 
* '2.16' of https://github.com/ChrisADR/git-po:
  l10n: es.po: Update Spanish Translation v2.16.0
 2018-01-06 10:26:30 +08:00
Jiang Xin 4a6b2cb588 Merge branch 'fr_2.16' of git://github.com/jnavila/git 
* 'fr_2.16' of git://github.com/jnavila/git:
  l10n: fr.po v2.16.0 round 1
  l10n: fr.po: "worktree list" mistranslated as prune
 2018-01-06 10:24:52 +08:00
Christopher Díaz Riveros f8038f5b2a l10n: es.po: Update Spanish Translation v2.16.0 
Signed-off-by: Christopher Díaz Riveros <chrisadr@gentoo.org>
 2018-01-04 16:06:40 -05:00
Jean-Noel Avila 5da312d11c l10n: fr.po v2.16.0 round 1 
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
 2018-01-02 22:06:39 +01:00
Jiang Xin 9a08e9a72b Merge branch 'master' of git://github.com/alshopov/git-po 
* 'master' of git://github.com/alshopov/git-po:
  l10n: bg.po: Updated Bulgarian translation (3284t)
 2018-01-02 22:45:47 +08:00
Alexander Shopov 29f90338df l10n: bg.po: Updated Bulgarian translation (3284t) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2018-01-01 22:13:22 +01:00
Peter Krefting 9e3ea3b555 l10n: sv.po: Update Swedish translation (3284t0f0u) 
Also corrected spelling.

Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2018-01-01 09:38:15 +01:00
Louis Bettens 04e47a7f55 l10n: fr.po: "worktree list" mistranslated as prune 
Signed-off-by: Louis Bettens <louis@bettens.info>
 2017-12-31 16:30:28 +01:00
Jiang Xin dd5fc1d977 Merge branch 'maint' of git://github.com/git-l10n/git-po 
* 'maint' of git://github.com/git-l10n/git-po:
  l10n: fixes to German translation
  l10n: Update Spanish translation
  l10n: zh_CN translate parameter name
  l10n: zh_CN Fix typo
  l10n: Fixes to Catalan translation
 2017-12-31 10:48:20 +08:00
Jiang Xin 18a9072257 l10n: git.pot: v2.16.0 round 1 (64 new, 25 removed) 
Generate po/git.pot from v2.16.0-rc0 for git v2.16.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2017-12-31 10:46:19 +08:00
Robert Abel 765b644027 l10n: fixes to German translation 
Der-, die- and dasselbe and their declensions are spelt as one word in German.

Signed-off-by: Robert Abel <rabel@robertabel.eu>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2017-12-06 07:36:03 +01:00
Jiang Xin 09a659ccba Merge branch '2.15.1' of https://github.com/ChrisADR/git-po into maint 
* '2.15.1' of https://github.com/ChrisADR/git-po:
  l10n: Update Spanish translation
 2017-12-05 21:32:54 +08:00
Christopher Díaz Riveros 715fc7613e l10n: Update Spanish translation 
Signed-off-by: Christopher Díaz Riveros <chrisadr@gentoo.org>
 2017-12-04 16:21:51 -05:00
Fangyi Zhou 58b6f0784c l10n: zh_CN translate parameter name 
Translate parameters such as:

* <new-branch-name> in advice.c:126,
* <command>, <path>, <revision> in setup.c:171, setup.c:184,
  setup.c:252,
* <base-commit-id> in builtin/log.c:1288,
* <conflicted_files> in git-rebase.sh:58, and more...

Signed-off-by: Fangyi Zhou <fangyi.zhou@yuriko.moe>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2017-12-03 10:12:35 +08:00
Zhou Fangyi 2090d5b4a0 l10n: zh_CN Fix typo 
apply.c:125
say -> way

Signed-off-by: Fangyi Zhou <fangyi.zhou@yuriko.moe>
 2017-12-03 10:11:34 +08:00
Jordi Mas 16697bdd1b l10n: Fixes to Catalan translation 
Signed-off-by: Jordi Mas <jmas@softcatala.org>
 2017-11-04 20:50:50 +01:00
Jordi Mas 3f86f684b4 l10n: Update Catalan translation 
Signed-off-by: Jordi Mas <jmas@softcatala.org>
 2017-10-29 10:04:12 +08:00
Ray Chen 493a93228f l10n: zh_CN: review for git v2.15.0 l10n round 2 
Signed-off-by: Ray Chen <oldsharp@gmail.com>
 2017-10-24 10:06:39 +08:00
Jiang Xin 6937cb4e3a l10n: zh_CN: for git v2.15.0 l10n round 2 
Translate 69 messages (3245t0f0u) for git v2.15.0-rc2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Reviewed-by: 依云 <lilydjwg@gmail.com>
 2017-10-24 09:56:58 +08:00
Andre Hinrichs 27e3e09520 l10n: de.po: fix typos 
Signed-off-by: Andre Hinrichs <andre.hinrichs@gmx.de>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2017-10-23 18:42:01 +02:00
Ralf Thielow 38178d7be4 l10n: de.po: translate 70 new messages 
Translate 70 new messages came from git.pot update in 25eab542b
(l10n: git.pot: v2.15.0 round 1 (68 new, 36 removed)) and 9c07fab78
(l10n: git.pot: v2.15.0 round 2 (2 new, 2 removed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2017-10-23 18:41:51 +02:00
Dimitriy Ryazantcev c8e2301d56 l10n: ru.po: update Russian translation 
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
 2017-10-22 20:35:13 +03:00
Jiang Xin 1129cf60a5 Merge branch 'master' of https://github.com/vnwildman/git 
* 'master' of https://github.com/vnwildman/git:
  l10n: vi.po(3245t): Updated Vietnamese translation for v2.15.0 round 2
 2017-10-22 19:01:07 +08:00
Jiang Xin f0d56fb69b Merge branch 'l10n_fr_v2.15.0r2' of git://github.com/jnavila/git 
* 'l10n_fr_v2.15.0r2' of git://github.com/jnavila/git:
  l10n: fr.po: v2.15.0 round 2
  l10n: fr.po change translation of "First, rewinding"
  l10n: fr.po fix some mistakes
 2017-10-19 08:17:23 +08:00
Jiang Xin c84ba210d1 Merge branch 'master' of git://github.com/nafmo/git-l10n-sv 
* 'master' of git://github.com/nafmo/git-l10n-sv:
  l10n: sv.po: Update Swedish translation (3245t0f0u)
 2017-10-19 08:16:30 +08:00
Jiang Xin 56714a998f Merge branch 'master' of https://github.com/Softcatala/git-po 
* 'master' of https://github.com/Softcatala/git-po:
  l10n: Update Catalan translation
 2017-10-19 08:14:55 +08:00
Jiang Xin c271fa460c Merge branch 'translation' of https://github.com/ChrisADR/git-po 
* 'translation' of https://github.com/ChrisADR/git-po:
  l10n: es.po: v2.15.0 round 2
 2017-10-19 08:13:29 +08:00
Tran Ngoc Quan c744f54e19 l10n: vi.po(3245t): Updated Vietnamese translation for v2.15.0 round 2 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2017-10-19 07:08:04 +07:00