Commit Graph

1009 Commits

Author SHA1 Message Date
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
Peter Krefting
51d32e4535 l10n: sv.po: Update Swedish translation (3245t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2017-10-18 19:35:32 +01:00
Jean-Noel Avila
26ce3a3cc8 l10n: fr.po: v2.15.0 round 2
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
2017-10-18 20:28:33 +02:00
Nicolas Cornu
9de197e77b l10n: fr.po change translation of "First, rewinding"
Signed-off-by: Nicolas Cornu <nicolac76@yahoo.fr>
2017-10-18 20:25:57 +02:00
Jean-Noel Avila
285d1b4ee7 l10n: fr.po fix some mistakes
Reported-by: Christophe Jaillet <christophe.jaillet@wanadoo.fr>
Signed-off-by: Jean-Noel Avila <jean-noel.avila@scantech.fr>
2017-10-18 20:25:57 +02:00
Jordi Mas
104d6cb0a8 l10n: Update Catalan translation
Signed-off-by: Jordi Mas <jmas@softcatala.org>
2017-10-17 13:28:23 +01:00
Changwoo Ryu
d9e43e139b l10n: ko.po: Update Korean translation
Signed-off-by: Changwoo Ryu <cwryu@debian.org>
2017-10-17 16:24:11 +09:00
Christopher Díaz Riveros
6628a6e688 l10n: es.po: v2.15.0 round 2
Spanish translation for v2.15.0

Signed-off-by: Christopher Díaz Riveros <chrisadr@gentoo.org>
2017-10-16 21:17:30 -05:00
Jiang Xin
9c07fab78c l10n: git.pot: v2.15.0 round 2 (2 new, 2 removed)
Generate po/git.pot from v2.15.0-rc1 for git v2.15.0 l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2017-10-17 09:49:23 +08:00
Dimitriy Ryazantcev
38cc0b7783 l10n: ru.po: update Russian translation
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
2017-10-15 13:14:45 +03:00
Jiang Xin
a0c76f2077 Merge branch 'master' of git://github.com/alshopov/git-po
* 'master' of git://github.com/alshopov/git-po:
  l10n: bg.po: Updated Bulgarian translation (3245t)
2017-10-14 21:24:21 +08:00
Alexander Shopov
b8ed0ce775 l10n: bg.po: Updated Bulgarian translation (3245t)
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2017-10-14 11:52:59 +02:00
Peter Krefting
34e65a069f l10n: sv.po: Update Swedish translation (3245t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2017-10-11 11:35:34 +01:00
Jiang Xin
0f259664a0 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
2017-10-11 08:08:10 +08:00
Tran Ngoc Quan
bd3c946853 l10n: vi.po(3245t): Updated Vietnamese translation for v2.15.0
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2017-10-09 15:13:05 +07:00
Christopher Díaz
4b15eb221b l10n: es.po: Update translation v2.15.0 round 1
Signed-off-by: Christopher Díaz <christopher.diaz.riv@gmail.com>
2017-10-08 11:30:11 -05:00
Jiang Xin
69f8d44d38 Merge branch 'maint' of git://github.com/git-l10n/git-po
* 'maint' of git://github.com/git-l10n/git-po:
  l10n: es.po: spanish added to TEAMS
  l10n: es.po: initial Spanish version git 2.14.0
2017-10-08 15:21:22 +08:00
Jiang Xin
25eab542b1 l10n: git.pot: v2.15.0 round 1 (68 new, 36 removed)
Generate po/git.pot from commit d35688db19 ("Prepare for -rc1",
2017-10-07) for git v2.15.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2017-10-08 15:12:45 +08:00
Christopher Díaz
875468b7cf l10n: es.po: spanish added to TEAMS
Signed-off-by: Christopher Díaz <christopher.diaz.riv@gmail.com>
2017-08-27 13:05:58 -05:00
Christopher Díaz
fb0e25bce4 l10n: es.po: initial Spanish version git 2.14.0
Signed-off-by: Christopher Díaz <christopher.diaz.riv@gmail.com>
2017-08-27 13:04:07 -05:00
Jiang Xin
554e850170 l10n: zh_CN: review for git v2.14.0 l10n
Reviewed-by: 依云 <lilydjwg@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2017-08-02 08:02:37 +08:00
Changwoo Ryu
3347e76939 l10n: ko.po: Update Korean translation
Signed-off-by: Changwoo Ryu <cwryu@debian.org>
2017-08-01 12:32:00 +09:00
Jiang Xin
a4f16749d2 l10n: zh_CN: for git v2.14.0 l10n round 2
Translate new l10n messages for git 2.14.0, and update translations on
"stash".

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2017-08-01 09:26:19 +08:00
Hartmut Henkel
8d44797cc9 l10n: de.po: various fixes in German translation
Signed-off-by: Hartmut Henkel <henkel@vh-s.de>
Helped-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Matthias Rüster <matthias.ruester@gmail.com>
2017-07-30 17:21:06 +02:00
Jiang Xin
7873fb63f8 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
2017-07-30 22:47:47 +08:00
Dimitriy Ryazantcev
a65a75dfd6 l10n: ru.po: update Russian translation
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
2017-07-30 12:35:40 +03:00
Jiang Xin
79e8ee89ae Merge branch 'master' of https://github.com/ralfth/git-po-de
* 'master' of https://github.com/ralfth/git-po-de:
  l10n: de.po: update German translation
2017-07-27 23:12:11 +08:00
Jiang Xin
437d212413 Merge branch 'fr_l10n_v2.14.0rnd2' of git://github.com/jnavila/git
* 'fr_l10n_v2.14.0rnd2' of git://github.com/jnavila/git:
  l10n: fr.po v2.14.0 rnd 2
  l10n: fr.po Fix some french typos
  l10n: fr.po Fix typo
  l10n: fr.po Fix some translations
2017-07-27 23:10:13 +08:00
Jean-Noel Avila
12142e1bcb l10n: fr.po v2.14.0 rnd 2
Signed-off-by: Jean-Noel Avila <jean-noel.avila@scantech.fr>
2017-07-27 04:29:15 +02:00
Sylvestre Ledru
eb7bb1cc09 l10n: fr.po Fix some french typos
Signed-off-by: Sylvestre Ledru <sylvestre@debian.org>
2017-07-27 04:28:56 +02:00
Louis
694f610d65 l10n: fr.po Fix typo
Signed-off-by: Louis <spalax@gresille.org>
2017-07-27 04:22:23 +02:00
Hugues Peccatte
8430988d35 l10n: fr.po Fix some translations
Signed-off-by: Hugues Peccatte <hugues.peccatte@aareon.fr>
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
2017-07-27 04:22:19 +02:00
Ralf Thielow
2166cd5af0 l10n: de.po: update German translation
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2017-07-26 18:22:27 +02:00
Jiang Xin
7b043d09b0 Merge branch 'master' of https://github.com/Softcatala/git-po
* 'master' of https://github.com/Softcatala/git-po:
  l10n: Update Catalan translation
2017-07-26 00:13:54 +08:00
Jiang Xin
b1bb0df04b Merge branch 'master' of git://github.com/alshopov/git-po
* 'master' of git://github.com/alshopov/git-po:
  l10n: bg.po: Updated Bulgarian translation (3213t)
2017-07-26 00:13:05 +08:00
Tran Ngoc Quan
365fb9d947 l10n: vi.po (3213t): Updated 9 new strings
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2017-07-25 07:09:13 +07:00
Jordi Mas
1d99545f77 l10n: Update Catalan translation
Signed-off-by: Jordi Mas <jmas@softcatala.org>
2017-07-24 18:29:29 +02:00
Alexander Shopov
3db60c9132 l10n: bg.po: Updated Bulgarian translation (3213t)
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2017-07-24 17:28:43 +02:00
Jiang Xin
91d443d0d8 l10n: git.pot: v2.14.0 round 2 (9 new, 2 removed)
Generate po/git.pot from v2.14.0-rc0-40-g5eada8987e for git v2.14.0 l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2017-07-24 22:00:44 +08:00
Jiang Xin
842e0d63aa 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 (3206t0f0u)
2017-07-22 06:19:21 +08:00
Peter Krefting
7b7c15b881 l10n: sv.po: Update Swedish translation (3206t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2017-07-20 23:00:16 +02:00
Changwoo Ryu
e3fe4f7612 l10n: ko.po: Update Korean translation
Signed-off-by: Changwoo Ryu <cwryu@debian.org>
2017-07-19 17:15:54 +09:00
Jordi Mas
298082bc80 l10n: Update Catalan translation
Signed-off-by: Jordi Mas <jmas@softcatala.org>
2017-07-18 21:06:06 +02:00
Alexander Shopov
b61937fb62 l10n: bg.po: Updated Bulgarian translation (3206t)
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2017-07-16 22:52:07 +02:00
Tran Ngoc Quan
0e2a0915b3 l10n: vi.po(3206t): Update Vietnamese translation
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2017-07-15 13:53:33 +07:00
Jiang Xin
5b34e000f9 l10n: git.pot: v2.14.0 round 1 (34 new, 23 removed)
Generate po/git.pot from v2.14.0-rc0 for git v2.14.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2017-07-15 11:58:14 +08:00
Jiang Xin
8696ac8e9d Merge branch 'maint' of git://github.com/git-l10n/git-po
* 'maint' of git://github.com/git-l10n/git-po:
  l10n: ru.po: update Russian translation
  l10n: Fixes to Catalan translation
2017-07-15 09:26:40 +08:00
Ralf Thielow
f271c95cc0 l10n: de.po: fix typo
Reported-by: Andre Hinrichs <andre.hinrichs@gmx.de>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-07-10 11:44:18 -07:00
Dimitriy Ryazantcev
eabb0f240c l10n: ru.po: update Russian translation
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
2017-06-11 11:05:39 +08:00
Jiang Xin
7bc2869bee Merge branch 'master' of https://github.com/Softcatala/git-po into maint
* 'master' of https://github.com/Softcatala/git-po:
  l10n: Fixes to Catalan translation
2017-05-31 00:05:46 +08:00
Jordi Mas
0b8ccde958 l10n: Fixes to Catalan translation
Signed-off-by: Jordi Mas <jmas@softcatala.org>
2017-05-10 07:05:55 +02:00
Jiang Xin
961f9c8b1b 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 (3195t0f0u)
2017-05-09 22:12:34 +08:00
Jiang Xin
60638e9816 l10n: zh_CN: for git v2.13.0 l10n round 2
Translate 4 messages (3195t0f0u) for git v2.13.0-rc2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2017-05-09 21:55:38 +08:00
Peter Krefting
6402d7fcd5 l10n: sv.po: Update Swedish translation (3195t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2017-05-09 08:05:09 +01:00
Ray Chen
65e2041e40 l10n: zh_CN: review for git v2.13.0 l10n round 1
Signed-off-by: Ray Chen <oldsharp@gmail.com>
2017-05-09 07:03:34 +08:00
Jiang Xin
0502887d3d Merge branch 'master' of https://github.com/vnwildman/git
* 'master' of https://github.com/vnwildman/git:
  l10n: vi.po(3195t): Update translation for v2.13.0 round 2
2017-05-09 06:39:31 +08:00
Jordi Mas
7cbacabc13 l10n: Update Catalan translation
Signed-off-by: Jordi Mas <jmas@softcatala.org>
2017-05-09 06:27:56 +08:00
Alexander Shopov
3e69979fe8 l10n: bg.po: Updated Bulgarian translation (3195t)
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2017-05-09 06:24:36 +08:00
Jiang Xin
f172ad6275 Merge branch 'fr_l10n_v2.13_rnd2' of git://github.com/jnavila/git
* 'fr_l10n_v2.13_rnd2' of git://github.com/jnavila/git:
  l10n: fr.po v2.13 rnd 2
2017-05-09 06:18:53 +08:00
Jean-Noel Avila
f5be008399 l10n: fr.po v2.13 rnd 2
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
2017-05-06 12:12:54 +02:00
Ralf Thielow
0efcb8b0be l10n: de.po: translate 4 new messages
Translate 4 new messages came from git.pot update in 28e1aaa48 (l10n:
git.pot: v2.13.0 round 2 (4 new, 7 removed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Matthias Rüster <matthias.ruester@gmail.com>
2017-05-05 19:01:24 +02:00
Ralf Thielow
5c16226833 l10n: de.po: update German translation
Translate 96 new messages came from git.pot update in dfc182b (l10n:
git.pot: v2.13.0 round 1 (96 new, 37 removed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Matthias Rüster <matthias.ruester@gmail.com>
2017-05-05 19:01:16 +02:00
Michael J Gruber
c5614772d6 l10n: de.po: lower case after semi-colon
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2017-05-05 11:16:39 +02:00
Tran Ngoc Quan
72dd4a8e40 l10n: vi.po(3195t): Update translation for v2.13.0 round 2
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2017-05-05 13:41:32 +07:00
Jiang Xin
28e1aaa485 l10n: git.pot: v2.13.0 round 2 (4 new, 7 removed)
Generate po/git.pot from v2.13.0-rc2 for git v2.13.0 l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2017-05-05 09:37:02 +08:00
Jiang Xin
87cb7997f7 l10n: zh_CN: for git v2.13.0 l10n round 1
Translate 96 messages (3198t0f0u) for git v2.13.0-rc0.

Reviewed-by: 依云 <lilydjwg@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2017-05-05 09:32:08 +08:00
Jiang Xin
90117bda02 Merge branch 'fr_l10n_v2.13_rnd1' of git://github.com/jnavila/git
* 'fr_l10n_v2.13_rnd1' of git://github.com/jnavila/git:
  l10n: fr.po v2.13 round 1
2017-05-05 09:30:33 +08:00
Jean-Noel Avila
6a523d6681 l10n: fr.po v2.13 round 1
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
2017-05-02 22:21:09 +02:00
Vasco Almeida
9a2669129c l10n: pt_PT: update Portuguese translation
Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
2017-05-01 21:20:50 +00:00
Alexander Shopov
61d4c30930 l10n: bg.po: Updated Bulgarian translation (3201t)
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2017-04-30 18:58:32 +02:00
Jiang Xin
7895b2b448 Merge branch 'master' of https://github.com/vnwildman/git
* 'master' of https://github.com/vnwildman/git:
  l10n: vi.po(3198t): Updated Vietnamese translation for v2.13.0-rc0
2017-04-29 10:01:41 +08:00
Tran Ngoc Quan
64bd31b407 l10n: vi.po(3198t): Updated Vietnamese translation for v2.13.0-rc0
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2017-04-25 15:09:06 +07:00
Peter Krefting
94ad57c893 l10n: sv.po: Update Swedish translation (3199t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2017-04-23 19:47:34 +01:00
Jiang Xin
dfc182b139 l10n: git.pot: v2.13.0 round 1 (96 new, 37 removed)
Generate po/git.pot from v2.13.0-rc0 for git v2.13.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2017-04-23 09:55:51 +08:00
Michael J Gruber
7d5a38b61f l10n: de: translate describe debug terms
Signed-off-by: Michael J Gruber <git@grubix.eu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-27 13:45:30 -07:00
Jiang Xin
1a79b2f179 l10n: zh_CN: for git v2.12.0 l10n round 2
Translate 241 messages (3139t0f0u) for git v2.12.0-rc1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2017-02-25 00:19:14 +08:00
Jordi Mas
a14eee8f4d l10n: Update Catalan translation
Signed-off-by: Jordi Mas <jmas@softcatala.org>
2017-02-25 00:14:55 +08:00
Vasco Almeida
e06cdf12d3 l10n: pt_PT: update Portuguese tranlation
Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
2017-02-23 16:14:55 -01:00
Jiang Xin
28159ae592 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 (3139t0f0u)
2017-02-22 00:06:44 +08:00
Peter Krefting
806f2769e4 l10n: sv.po: Update Swedish translation (3139t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2017-02-20 19:40:11 +01:00
Ralf Thielow
af4cf7ed8b l10n: de.po: translate 241 messages
Translate 241 messages came from git.pot update in 673bfad09
(l10n: git.pot: v2.12.0 round 1 (239 new, 15 removed)) and a4d94835a
(l10n: git.pot: v2.12.0 round 2 (2 new)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Phillip Sz <phillip.szelat@gmail.com>
2017-02-20 18:40:36 +01:00
Jiang Xin
c24512527c Merge branch 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-ko
* 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-ko:
  l10n: ko.po: Update Korean translation
2017-02-19 22:08:05 +08:00
Jiang Xin
7cbeff01b8 Merge branch 'master' of https://github.com/vnwildman/git
* 'master' of https://github.com/vnwildman/git:
  l10n: vi.po (3139t): Updated 2 new messages for rc1
2017-02-19 22:04:41 +08:00
Changwoo Ryu
7d6d957c53 l10n: ko.po: Update Korean translation
Signed-off-by: Changwoo Ryu <cwryu@debian.org>
2017-02-19 19:35:37 +09:00
Tran Ngoc Quan
5271df1d56 l10n: vi.po (3139t): Updated 2 new messages for rc1
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2017-02-18 07:18:54 +07:00
Jean-Noel Avila
3d5f390525 l10n: fr.po: v2.12.0 round 2 3139t
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
2017-02-18 00:12:26 +01:00
Jiang Xin
a4d94835af l10n: git.pot: v2.12.0 round 2 (2 new)
Generate po/git.pot from v2.12.0-rc1 for git v2.12.0 l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2017-02-18 01:00:54 +08:00
Jiang Xin
84b3ceb1fb Merge branch 'master' of https://github.com/vnwildman/git
* 'master' of https://github.com/vnwildman/git:
  l10n: vi.po: Updated Vietnamese translation (3137t)
2017-02-18 00:54:49 +08:00
Jiang Xin
8b22a8e876 Merge branch 'master' of https://github.com/Softcatala/git-po
* 'master' of https://github.com/Softcatala/git-po:
  l10n: update Catalan translation
2017-02-18 00:49:06 +08:00
Tran Ngoc Quan
a1da87b72c l10n: vi.po: Updated Vietnamese translation (3137t)
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2017-02-17 13:52:11 +07:00
Jordi Mas
2f61b3a335 l10n: update Catalan translation
Signed-off-by: Jordi Mas <jmas@softcatala.org>
2017-02-16 05:10:04 +01:00
Jiang Xin
b02312b21e 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 (3137t0f0u)
2017-02-14 00:19:11 +08:00
Jiang Xin
0b0891c590 Merge branch 'fr_v2.11.0_rnd1' of git://github.com/jnavila/git
* 'fr_v2.11.0_rnd1' of git://github.com/jnavila/git:
  l10n: fr.po: v2.11-rc0 first round
  l10n: fr.po: Fix a typo in the French translation
  l10n: fr.po: Remove gender specific adjectives
  l10n: fr.po: Fix typos
2017-02-14 00:17:21 +08:00
Peter Krefting
5676f96b75 l10n: sv.po: Update Swedish translation (3137t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2017-02-11 20:21:33 +01:00
Jean-Noel Avila
71ca3ba309 l10n: fr.po: v2.11-rc0 first round
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
2017-02-11 15:09:59 +01:00
Changwoo Ryu
dcf07e275a l10n: ko.po: Update Korean translation
Signed-off-by: Changwoo Ryu <cwryu@debian.org>
2017-02-11 11:32:27 +09:00
Anthony Ramine
c0ea09b2da l10n: fr.po: Fix a typo in the French translation
Signed-off-by: Anthony Ramine <n.oxyde@gmail.com>
2017-02-04 15:10:39 +01:00
Joachim Jablon
98992e9334 l10n: fr.po: Remove gender specific adjectives
Signed-off-by: Joachim Jablon <ewjoachim@gmail.com>
Reviewed-by: Jean-Noel Avila <jn.avila@free.fr>
2017-02-04 15:10:39 +01:00
Joachim Jablon
e1df01c55c l10n: fr.po: Fix typos
Reviewed-by: Jean-Noel Avila <jn.avila@free.fr>
Signed-off-by: Joachim Jablon <ewjoachim@gmail.com>
2017-02-04 15:10:39 +01:00
Jiang Xin
673bfad09c l10n: git.pot: v2.12.0 round 1 (239 new, 15 removed)
Generate po/git.pot from v2.12.0-rc0 for git v2.12.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2017-02-04 13:02:24 +08:00
Alexander Shopov
40390522be l10n: bg: Updated Bulgarian translation (2913t+0f+0u)
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2017-01-31 09:28:20 +02:00
Jiang Xin
63d919d9df Merge branch 'master' of https://github.com/Softcatala/git-po
* 'master' of https://github.com/Softcatala/git-po:
  l10n: fixes to Catalan translation
2017-01-25 20:57:52 +08:00
Jordi Mas
16996772af l10n: fixes to Catalan translation
Signed-off-by: Jordi Mas <jmas@softcatala.org>
2017-01-03 23:28:46 +01:00
Ray Chen
29004bbb34 l10n: zh_CN: review for git v2.11.0 l10n
Signed-off-by: Ray Chen <oldsharp@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2017-01-02 20:11:49 +08:00
Jordi Mas
984ad34691 l10n: New Catalan translation maintainer
Signed-off-by: Jordi Mas <jmas@softcatala.org>
2016-12-26 21:14:02 +01:00
Jiang Xin
082ed8f870 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
2016-11-29 21:19:43 +08:00
Dimitriy Ryazantcev
f8f8b45d88 l10n: ru.po: update Russian translation
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
2016-11-29 11:33:07 +02:00
Alex Henrie
43a970d78b l10n: ca.po: update translation
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
2016-11-28 20:06:25 -07:00
Ralf Thielow
6366c34b89 l10n: de.po: translate 210 new messages
Translate 210 new messages came from git.pot update in fda7b09
(l10n: git.pot: v2.11.0 round 1 (209 new, 53 removed)) and c091ffb
(l10n: git.pot: v2.11.0 round 2 (1 new, 1 removed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2016-11-28 18:49:25 +01:00
Jiang Xin
72351d7d4f l10n: fix unmatched single quote in error message
Translate one message introduced by commit:

 * 358718064b i18n: fix unmatched single quote in error message

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2016-11-25 23:26:34 +08:00
Jiang Xin
275588f93e l10n: Fixed typo of git fetch-pack command
Git 2.11.0-rc2 introduced one small l10n update, and this commit fixed
the affected translations all in one batch.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2016-11-22 22:24:59 +08:00
Jiang Xin
c091ffbe8e l10n: git.pot: v2.11.0 round 2 (1 new, 1 removed)
Generate po/git.pot from v2.11.0-rc2 for git v2.11.0 l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2016-11-22 22:22:59 +08:00
Jiang Xin
a0b6b24660 l10n: zh_CN: for git v2.11.0 l10n round 1
Update 209 translations (2913t0f0u) for git v2.11.0-rc0.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2016-11-21 23:24:15 +08:00
Vasco Almeida
d1edc0d647 l10n: pt_PT: update Portuguese translation
Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
2016-11-13 16:44:18 -01:00
Jiang Xin
b8068f14e6 Merge branch 'fr_v2.11.0_rnd1' of git://github.com/jnavila/git
* 'fr_v2.11.0_rnd1' of git://github.com/jnavila/git:
  l10n: fr.po fix grammar mistakes
  l10n: fr.po v2.11.0_rnd1
2016-11-09 22:54:19 +08:00
jfbu
73c3c10335 l10n: fr.po fix grammar mistakes
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
Signed-off-by: jfbu <jfbu@free.fr>
2016-11-06 20:24:55 +01:00
Jean-Noel Avila
85ea5cbf5a l10n: fr.po v2.11.0_rnd1
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
2016-11-05 21:43:53 +01:00
Peter Krefting
416a48e3c9 l10n: sv.po: Update Swedish translation (2913t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2016-11-05 16:03:11 +01:00
Jiang Xin
ad15a59e24 Merge branch 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-ko
* 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-ko:
  l10n: ko.po: Update Korean translation
2016-11-05 20:09:16 +08:00
Tran Ngoc Quan
2297360793 l10n: vi.po: Updated translation to v2.11.0 (2913t)
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2016-11-04 08:12:04 +07:00
Changwoo Ryu
de7011c117 l10n: ko.po: Update Korean translation
Signed-off-by: Changwoo Ryu <cwryu@debian.org>
2016-11-04 00:38:23 +09:00
Jiang Xin
954f127dbb 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
2016-11-02 22:03:05 +08:00
Jiang Xin
fda7b0924e l10n: git.pot: v2.11.0 round 1 (209 new, 53 removed)
Generate po/git.pot from v2.11.0-rc0 for git v2.11.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2016-11-01 21:36:26 +08:00
Dimitriy Ryazantcev
686daabd7c l10n: ru.po: update Russian translation
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
2016-10-16 20:34:27 +03:00
Jiang Xin
4dc2ce92fa 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
2016-10-16 20:11:41 +08:00
Ralf Thielow
6fcf786e11 l10n: de.po: translate 260 new messages
Translate 260 new message came from git.pot updates in 9fa976f (l10n:
git.pot: v2.10.0 round 1 (248 new, 56 removed)) and 5bd166d (l10n:
git.pot: v2.10.0 round 2 (12 new, 44 removed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Matthias Rüster <matthias.ruester@gmail.com>
2016-10-12 18:31:13 +02:00
Ralf Thielow
0ff597830f l10n: de.po: fix translation of autostash
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Matthias Rüster <matthias.ruester@gmail.com>
2016-09-12 09:49:36 +02:00
Ray Chen
9a4b694c53 l10n: zh_CN: review for git v2.10.0 l10n
Signed-off-by: Ray Chen <oldsharp@gmail.com>
2016-09-11 21:34:23 +08:00
Jiang Xin
7665d45926 l10n: zh_CN: fixed some typos for git 2.10.0
Reviewed-by: Ray <tvvocold@163.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2016-09-11 21:31:51 +08:00
Vasco Almeida
a1277f2071 l10n: pt_PT: update Portuguese repository info
Change Portuguese l10n leadership to Vasco Almeida.

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
2016-09-03 12:16:19 +00:00
Vasco Almeida
bb7106334c l10n: pt_PT: update Portuguese translation
Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
2016-09-03 12:02:22 +00:00
Jiang Xin
e8e349249c Merge branch 'master' of https://github.com/vnwildman/git
* 'master' of https://github.com/vnwildman/git:
  l10n: Updated Vietnamese translation for v2.10.0-rc2 (2757t)
2016-09-02 21:29:48 +08:00
Jiang Xin
5c57d7622e l10n: zh_CN: for git v2.10.0 l10n round 2
Update 215 translations (2757t0f0u) for git v2.10.0-rc2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2016-08-31 00:11:13 +08:00
Alex Henrie
63b8265402 l10n: ca.po: update translation
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
2016-08-28 10:32:56 -06:00
Jean-Noel Avila
b67e63067d l10n: fr.po v2.10.0-rc2
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
2016-08-28 11:36:14 +02:00
Tran Ngoc Quan
800d88e2b3 l10n: Updated Vietnamese translation for v2.10.0-rc2 (2757t)
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2016-08-28 07:23:30 +07:00
Peter Krefting
8ed2d3fb15 l10n: sv.po: Update Swedish translation (2757t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2016-08-27 20:42:50 +01:00
Jiang Xin
b30eec1a69 Merge branch 'master' of https://github.com/vnwildman/git
* 'master' of https://github.com/vnwildman/git:
  l10n: Updated Vietnamese translation for v2.10.0 (2789t)
2016-08-27 23:36:16 +08:00
Jiang Xin
5bd166d8af l10n: git.pot: v2.10.0 round 2 (12 new, 44 removed)
Generate po/git.pot from v2.10.0-rc2 for git v2.10.0 l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2016-08-27 23:23:26 +08:00
Tran Ngoc Quan
b9252573c4 l10n: Updated Vietnamese translation for v2.10.0 (2789t)
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2016-08-27 09:15:28 +07:00
Vasco Almeida
9d83143621 l10n: pt_PT: update Portuguese translation
Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
2016-08-25 13:33:17 +00:00
Vasco Almeida
587dae416d l10n: pt_PT: merge git.pot
Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
2016-08-25 13:33:17 +00:00
Changwoo Ryu
ec584cd69a l10n: ko.po: Update Korean translation
Signed-off-by: Changwoo Ryu <cwryu@debian.org>
2016-08-22 00:41:23 +09:00
Jiang Xin
9fa976fffe l10n: git.pot: v2.10.0 round 1 (248 new, 56 removed)
Generate po/git.pot from v2.10.0-rc0 for git v2.10.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2016-08-15 22:45:20 +08:00
Junio C Hamano
2703572b3a Merge branch 'va/i18n-even-more'
More markings of messages for i18n, with updates to various tests
to pass GETTEXT_POISON tests.

One patch from the original submission dropped due to conflicts
with jk/upload-pack-hook, which is still in flux.

* va/i18n-even-more: (38 commits)
  t5541: become resilient to GETTEXT_POISON
  i18n: branch: mark comment when editing branch description for translation
  i18n: unmark die messages for translation
  i18n: submodule: escape shell variables inside eval_gettext
  i18n: submodule: join strings marked for translation
  i18n: init-db: join message pieces
  i18n: remote: allow translations to reorder message
  i18n: remote: mark URL fallback text for translation
  i18n: standardise messages
  i18n: sequencer: add period to error message
  i18n: merge: change command option help to lowercase
  i18n: merge: mark messages for translation
  i18n: notes: mark options for translation
  i18n: notes: mark strings for translation
  i18n: transport-helper.c: change N_() call to _()
  i18n: bisect: mark strings for translation
  t5523: use test_i18ngrep for negation
  t4153: fix negated test_i18ngrep call
  t9003: become resilient to GETTEXT_POISON
  tests: unpack-trees: update to use test_i18n* functions
  ...
2016-07-13 11:24:10 -07:00
Dimitriy Ryazantcev
231a4b7785 l10n: ru.po: update Russian translation
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
2016-07-12 11:50:32 +03:00
Vasco Almeida
c30364d080 i18n: init-db: join message pieces
Join message displayed during repository initialization in one entire
sentence.  That would improve translations since it's easier translate
an entire sentence than translating each piece.

Update Icelandic translation to reflect the changes.  The Icelandic
translation of these messages is used with test
t0204-gettext-reencode-sanity.sh and not updating the translation would
fail the test.

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-06-17 15:46:10 -07:00
Changwoo Ryu
ad583ebe08 l10n: ko.po: Update Korean translation 2016-06-12 01:25:58 +09:00
Jiang Xin
091a8f769d 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
2016-06-11 20:21:52 +08:00
Dimitriy Ryazantcev
92c28525f6 l10n: ru.po: update Russian translation
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
2016-06-11 12:53:43 +03:00
Ralf Thielow
b0e098ce46 l10n: de.po: translate 104 new messages
Translate 104 new messages came from git.pot update in f517e50
(l10n: git.pot: v2.9.0 round 1 (104 new, 37 removed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2016-06-10 18:00:46 +02:00
Ray Chen
aef18cc606 l10n: zh_CN: review for git v2.9.0 l10n round 1
Signed-off-by: Ray Chen <oldsharp@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2016-06-09 22:08:39 +08:00
Jiang Xin
5b04ee3b95 l10n: zh_CN: for git v2.9.0 l10n round 1
Update 104 new translations (2596t1f0u) for git v2.9.0-rc0.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2016-06-06 22:33:59 +08:00
Vasco Almeida
f086c2576c l10n: pt_PT: update Portuguese translation
Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
2016-05-31 18:17:40 +00:00
Vasco Almeida
ef04f0dcbb l10n: pt_PT: update according to git-gui glossary
Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
2016-05-31 18:16:03 +00:00
Vasco Almeida
ca1a7872ee l10n: pt_PT: merge git.pot file
Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
2016-05-31 18:15:56 +00:00
Alexander Shopov
0d670e7818 l10n: Updated Bulgarian translation of git (2597t,0f,0u)
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2016-05-29 16:13:24 +03:00
Jiang Xin
6dfee07643 Merge branch 'v2.9.0_rnd1_fr' of git://github.com/jnavila/git
* 'v2.9.0_rnd1_fr' of git://github.com/jnavila/git:
  l10n: fr.po v2.9.0rnd1
2016-05-29 19:55:26 +08:00
Peter Krefting
5ed5b8d87a l10n: sv.po: Update Swedish translation (2597t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2016-05-27 14:04:42 +01:00
Jean-Noel Avila
955efd65f1 l10n: fr.po v2.9.0rnd1
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
2016-05-26 22:46:41 +02:00
Jiang Xin
e890b29b3e Merge branch 'fix_fr' of git://github.com/jnavila/git
* 'fix_fr' of git://github.com/jnavila/git:
  l10n: fr.po Fixed grammar mistake
2016-05-26 23:40:48 +08:00
Tran Ngoc Quan
72e3c7a85f l10n: Updated Vietnamese translation (2597t)
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2016-05-25 07:42:13 +07:00
Jiang Xin
f517e50dba l10n: git.pot: v2.9.0 round 1 (104 new, 37 removed)
Generate po/git.pot from v2.9.0-rc0 for git v2.9.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2016-05-24 23:43:14 +08:00
Antonin
52492b4ae2 l10n: fr.po Fixed grammar mistake
"tous le dépôts distants" -> "tous les dépôts distants"

Signed-off-by:	Antonin <antonin@delpeuch.eu>
2016-04-28 21:09:14 +02:00
Junio C Hamano
625efa9dec l10n-2.8.0-rnd3-fr
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXHL5eAAoJEMek6Rt1RHoou9QP/0GgI8fbrRmSgXv7tVB3mG/Q
 hyboK/lLll2uVioIQjXnkHkp3Q7k9dl/MPVJDaPZ0chogxs078YwumWGFFbB4+DU
 lkuAQAQr4mGVflgzwBhKZ2GwaZvWuBZFlFWPLj1Z2T1s2q8VBy87oajh/Q4G7yv1
 lEdbde0sZk7tvmgm5iHLQkzg/ihtiEikbm/ivnUR5KSngc6OrlkWokYVojSIt2nT
 lAbBx/16XGC4hI9uqnEB/t5hhaf+tzDbW9ZwJkYLj5cXV4gQgWaAnAr1jp9n5IDb
 51AjZKB+bYyjCmpAJb2M1RxElVB+O5R7IBqlN5U3OY8pN4Web4XxMMl21aFwIbeX
 hsRkL3CFxZ/GFAgQ6HH/jS12QRLh9L7EGsxIr+IXtS+6OX7nSTh/d/ofAfBIyw3b
 CfVjBEZ4uCLSwisRvjLrS1WE5izgTQQkmz+n2iiLX2bxsGTnQ8OsdLbqz14Q6uuF
 ut4iJLHxWYHQffWT2dB1i535LpfUkQGW9M5NJL8XhSUY9gCZgRz5hrD6D0ZwC4S9
 A32TfqDIHflrdD1HCNq64Du6aBGEguKVSy7UNO928FNqydR6tI2E1ymqPIpit8rw
 bRVa1Gw4kWdat9SNweyeIXE5DUqtwfwCjptICkGl2UfPFs9l8lpUpw8Um4JlfjSd
 fTDwGhYKqLOFFazZMLcP
 =Ho/5
 -----END PGP SIGNATURE-----

Merge tag 'l10n-2.8.0-rnd3-fr' of git://github.com/git-l10n/git-po into maint

l10n-2.8.0-rnd3-fr

* tag 'l10n-2.8.0-rnd3-fr' of git://github.com/git-l10n/git-po:
  l10n: fr: don't translate "merge" as a parameter
  l10n: fr: change "id de clé" to match "id-clé"
  l10n: fr: fix wrongly translated option name
  l10n: fr: fix transcation of "dir"
2016-04-25 13:36:26 -07:00
Jiang Xin
2ee0fca122 Merge branch 'fr_v2.8.0_r3' of git://github.com/jnavila/git into maint
* 'fr_v2.8.0_r3' of git://github.com/jnavila/git:
  l10n: fr: don't translate "merge" as a parameter
  l10n: fr: change "id de clé" to match "id-clé"
  l10n: fr: fix wrongly translated option name
  l10n: fr: fix transcation of "dir"
2016-04-24 20:36:34 +08:00
Vasco Almeida
bb31072246 l10n: fr: don't translate "merge" as a parameter
At builtin/checkout.c:1154, merge is a parameter to --conflict=<style>
(git checkout --conflict=merge).

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
2016-03-25 14:04:58 -01:00
Vasco Almeida
abf5795592 l10n: fr: change "id de clé" to match "id-clé"
At builtin/tag.c:23 French message translation, "<key-id>" was
translated to "<id-clé>", but at builtin/tag.c:355 "key-id" was
translated to "id de clé", hence an inconsistency in git tag -h output.

Translate "key-id" to "id-clé".
Alternatively, both places could use "id de clé" instead of "id-clé".

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
2016-03-25 14:04:58 -01:00
Vasco Almeida
a0f3d92b52 l10n: fr: fix wrongly translated option name
In the original source, tags and heads refer to that options (--head and
--tags) for git show-ref.

Don't translate that terms, since they refer to actual option names.

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
2016-03-25 14:04:58 -01:00
Vasco Almeida
794b1d2ee1 l10n: fr: fix transcation of "dir"
"dir" was translated to the same string at builtin/log.c:1236,
but, also at that code line, "<dir>" was translate to "<répertoire>".

Before this commit, git format-patch -h would output "-o,
--output-directory <dir>" and <répertoire> in its description.

Use <répertoire> in both the parameter and description.

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
2016-03-25 14:04:58 -01:00
Jiang Xin
103ee5c21e Merge branch 'master' of https://github.com/vnwildman/git
* 'master' of https://github.com/vnwildman/git:
  l10n: vi.po (2530t): Update translation
2016-03-23 23:01:51 +08:00
Jiang Xin
70749562fb Merge branch 'master' of git://github.com/alexhenrie/git-po
* 'master' of git://github.com/alexhenrie/git-po:
  l10n: ca.po: update translation
2016-03-23 22:48:14 +08:00