mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-27 20:14:30 +08:00
Code Issues Packages Projects Releases Wiki Activity
67,383 Commits 6 Branches 957 Tags 661 MiB
24ba8b70c9
Commit Graph

1283 Commits

Author SHA1 Message Date
Daniel Santos
ed1e674f4d l10n: pt_PT: add Portuguese translations part 3 
* Correct malformed strings
* Transforming 'não' (no) into affirmative

Signed-off-by: Daniel Santos <hello@brighterdan.com>
 2021-06-01 11:45:52 +01:00
Jiang Xin
3d33e36c47 Merge branch 'l10n/zh_TW/21-05-20' of github.com:l10n-tw/git-po 
* 'l10n/zh_TW/21-05-20' of github.com:l10n-tw/git-po:
  l10n: zh_TW.po: localized
  l10n: zh_TW.po: v2.32.0 round 1 (11 untranslated)
 2021-05-30 21:40:59 +08:00
Jiang Xin
e94005634c Merge branch 'master' of github.com:Softcatala/git-po 
* 'master' of github.com:Softcatala/git-po:
  l10n: Update Catalan translation
 2021-05-30 20:45:10 +08:00
Alexander Shopov
fe1c18ba4d l10n: bg.po: Updated Bulgarian translation (5204t) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2021-05-28 17:45:58 +02:00
Jiang Xin
c2529290f0 Merge branch 'fr_next' of github.com:jnavila/git 
* 'fr_next' of github.com:jnavila/git:
  l10n: fr: v2.32.0 round 1
  l10n: fr: fixed inconsistencies
  l10n: fr.po fixed inconsistencies
 2021-05-27 10:28:50 +08:00
Bagas Sanjaya
1df318be63 l10n: id: po-id for 2.32.0 (round 1) 
Translate following components:

  * builtin/add.c
  * worktree.c
  * builtin/branch.c
  * builtin/commit.c
  * builtin/merge.c
  * builtin/rebase.c
  * builtin/pull.c
  * diff.c
  * add-interactive.c
  * builtin/log.c
  * builtin/stash.c
  * builtin/tag.c
  * config.c
  * builtin/config.c
  * reset.c
  * builtin/remote.c
  * builtin/rm.c
  * builtin/mv.c
  * builtin/clean.c
  * builtin/help.c
  * archive.c
  * submodule.c
  * builtin/submodule--helper.c
  * submodule-config.c

Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
 2021-05-25 18:08:16 +07:00
Tran Ngoc Quan
11998a0364 l10n: vi.po(5204t): Updated Vietnamese translation for v2.32.0 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2021-05-24 13:54:03 +07:00
Yi-Jyun Pan
beded618b2 l10n: zh_TW.po: localized 
Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com>
 2021-05-23 15:31:29 +08:00
Yi-Jyun Pan
a6eff43bea l10n: zh_TW.po: v2.32.0 round 1 (11 untranslated) 
Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com>
 2021-05-21 14:50:11 +08:00
Peter Krefting
733b9f59ba l10n: sv.po: Update Swedish translation (5204t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2021-05-20 13:32:48 +01:00
Jiang Xin
619418b993 l10n: fix typos in po/TEAMS 
Find typos in "po/TEAMS" file using the "git-po-helper" program.  These
typos were introduced from commit v2.24.0-1-g9917eca794 (l10n: zh_TW:
add translation for v2.24.0, 2019-11-20 19:14:22 +0800).

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2021-05-20 12:56:10 +08:00
Jean-Noël Avila
4d0a2a608d l10n: fr: v2.32.0 round 1 
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
 2021-05-19 18:58:25 +02:00
Emir Sarı
99234d5905 l10n: tr: v2.32.0-r1 
Signed-off-by: Emir Sarı <bitigchi@me.com>
 2021-05-17 20:32:32 +03:00
rlespinasse
7434b92798 l10n: fr: fixed inconsistencies 
Signed-off-by: rlespinasse <romain.lespinasse@gmail.com>
 2021-05-17 15:16:25 +02:00
Vincent Tam
9bafe049d6 l10n: fr.po fixed inconsistencies 
Signed-off-by: Vincent Tam <sere@live.hk>
 2021-05-17 15:16:25 +02:00
Daniel Santos
e9488197ad l10n: pt_PT: add Portuguese translations part 2 
* Eliminated 'Negation of emptiness' of 'nenhum' (not one/none)
* Eliminated 'Negation of emptiness' of 'nada' (nothing)
* Transformed 'Não' (No) into affirmative
* Some other translations
* Transforming 'não' (no) into affirmative
* From junção-de-3 to tri-junção

Signed-off-by: Daniel Santos <hello@brighterdan.com>
 2021-05-17 09:42:44 +01:00
Jiang Xin
2b95ebb4fd l10n: git.pot: v2.32.0 round 1 (126 new, 26 removed) 
Generate po/git.pot from v2.32.0-rc0 for git v2.32.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2021-05-17 16:06:49 +08:00
Alex Henrie
afb82d1db0
l10n: Update Catalan translation 
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
 2021-05-14 21:14:52 +02:00
Alexey Roslyakov
e5b66bb324 l10n: ru.po: fix typo in Russian translation 
Signed-off-by: Alexey Roslyakov <alexey.roslyakov@gmail.com>
 2021-05-13 12:48:37 +03:00
Jiang Xin
473eb54151 l10n: zh_CN: for git v2.31.0 l10n round 1 and 2 
Translate 161 new messages (5104t0f0u) for git 2.31.0.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2021-03-15 00:05:25 +08:00
Jiang Xin
4bc948a743 Merge branch 'master' of github.com:vnwildman/git 
* 'master' of github.com:vnwildman/git:
  l10n: vi.po(5104t): for git v2.31.0 l10n round 2
 2021-03-15 00:04:47 +08:00
Jiang Xin
e196890735 Merge branch 'l10n/zh_TW/210301' of github.com:l10n-tw/git-po 
* 'l10n/zh_TW/210301' of github.com:l10n-tw/git-po:
  l10n: zh_TW.po: v2.31.0 round 2 (15 untranslated)
 2021-03-14 22:35:44 +08:00
Jiang Xin
84bc81478e Merge branch 'po-id' of github.com:bagasme/git-po 
* 'po-id' of github.com:bagasme/git-po:
  l10n: Add translation team info
  l10n: start Indonesian translation
 2021-03-14 22:35:17 +08:00
Jiang Xin
bd5fba827b Merge branch 'master' of github.com:Softcatala/git-po 
* 'master' of github.com:Softcatala/git-po:
  l10n: Update Catalan translation
 2021-03-14 22:34:46 +08:00
Jiang Xin
2d897529b2 Merge branch 'russian-l10n' of github.com:DJm00n/git-po-ru 
* 'russian-l10n' of github.com:DJm00n/git-po-ru:
  l10n: ru.po: update Russian translation
 2021-03-14 22:34:12 +08:00
Jiang Xin
799df2e406 Merge branch 'pt-PT' of github.com:git-l10n-pt-PT/git-po 
* 'pt-PT' of github.com:git-l10n-pt-PT/git-po:
  l10n: pt_PT: add Portuguese translations part 1
 2021-03-14 22:33:26 +08:00
Matthias Rüster
834845142d l10n: de.po: Update German translation for Git v2.31.0 
Reviewed-by: Ralf Thielow <ralf.thielow@gmail.com>
Reviewed-by: Phillip Szelat <phillip.szelat@gmail.com>
Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com>
 2021-03-08 19:49:33 +01:00
Daniel Santos
408985d301 l10n: pt_PT: add Portuguese translations part 1 
* Newlines corrected.
* Add concept translation table.
* Translated some.
* Corrected some.
* Corrected some 'Negation of Emptiness'.

Signed-off-by: Daniel Santos <hello@brighterdan.com>
 2021-03-08 15:21:51 +00:00
Tran Ngoc Quan
1369935987 l10n: vi.po(5104t): for git v2.31.0 l10n round 2 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2021-03-08 09:03:04 +07:00
Christopher Diaz Riveros
b0adcc311b l10n: es: 2.31.0 round 2 
Signed-off-by: Christopher Diaz Riveros <christopher.diaz.riv@gmail.com>
 2021-03-07 18:31:14 -05:00
Bagas Sanjaya
c21ad4d941 l10n: Add translation team info 
Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
 2021-03-07 19:38:29 +07:00
Bagas Sanjaya
8c4abfb8be l10n: start Indonesian translation 
* Initialize PO file
  * Translate init-db.c
  * Translate wt-status.c
  * Translate builtin/clone.c
  * Translate builtin/checkout.c
  * Translate builtin/fetch.c
  * Complete core translations:
    * builtin/remote.c
    * builtin/index-pack.c
    * push.c
    * reset.c
  * Sync with l10n upstream

Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
 2021-03-07 19:38:07 +07:00
Yi-Jyun Pan
8278f87022 l10n: zh_TW.po: v2.31.0 round 2 (15 untranslated) 
Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com>
 2021-03-06 02:43:34 +08:00
Alexander Shopov
2f176de687 l10n: bg.po: Updated Bulgarian translation (5104t) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2021-03-05 12:12:34 +01:00
Jiang Xin
1ecef023a9 Merge branch 'fr_next' of github.com:jnavila/git 
* 'fr_next' of github.com:jnavila/git:
  l10n: fr: v2.31 rnd 2
 2021-03-05 13:47:07 +08:00
Jiang Xin
5b888ad949 Merge branch 'master' of github.com:nafmo/git-l10n-sv 
* 'master' of github.com:nafmo/git-l10n-sv:
  l10n: sv.po: Update Swedish translation (5104t0f0u)
 2021-03-05 13:46:25 +08:00
Jean-Noël Avila
068cb92300 l10n: fr: v2.31 rnd 2 
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
 2021-03-04 21:53:45 +01:00
Emir Sarı
f6a7e896b8 l10n: tr: v2.31.0-rc1 
Signed-off-by: Emir Sarı <bitigchi@me.com>
 2021-03-04 22:29:24 +03:00
Peter Krefting
929dc48e96 l10n: sv.po: Update Swedish translation (5104t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2021-03-04 19:10:43 +01:00
Jiang Xin
9b7e82b940 l10n: git.pot: v2.31.0 round 2 (9 new, 8 removed) 
Generate po/git.pot from v2.31.0-rc1 for git v2.31.0 l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2021-03-04 22:41:21 +08:00
Emir Sarı
3ed77c4792 l10n: tr: v2.31.0-rc0 
Signed-off-by: Emir Sarı <bitigchi@me.com>
 2021-03-02 20:14:46 +08:00
Jiang Xin
75f5efcba2 Merge branch 'master' of github.com:nafmo/git-l10n-sv 
* 'master' of github.com:nafmo/git-l10n-sv:
  l10n: sv.po: Update Swedish translation (5103t0f0u)
 2021-03-01 10:01:02 +08:00
Jiang Xin
0b71d789a8 Merge branch 'pl' of github.com:Arusekk/git-po 
* 'pl' of github.com:Arusekk/git-po:
  l10n: pl.po: Update translation
 2021-03-01 09:59:07 +08:00
Peter Krefting
fe8885258b l10n: sv.po: Update Swedish translation (5103t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2021-02-28 22:22:46 +01:00
Arusekk
fa42d191c6 l10n: pl.po: Update translation 
Signed-off-by: Arusekk <arek_koz@o2.pl>
 2021-02-27 17:17:32 +01:00
Jean-Noël Avila
5ff5a30652 l10n: fr: v2.31.0 rnd 1 
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
 2021-02-27 15:47:45 +01:00
Jiang Xin
712b0ed6ec l10n: git.pot: v2.31.0 round 1 (155 new, 89 removed) 
Generate po/git.pot from v2.31.0-rc0 for git v2.31.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2021-02-26 22:09:42 +08:00
Jordi Mas
a9926ecd54 l10n: Update Catalan translation 
Signed-off-by: Jordi Mas <jmas@softcatala.org>
 2021-02-24 09:14:56 +01:00
Dimitriy Ryazantcev
a093f0ba95 l10n: ru.po: update Russian translation 
Kudos to Philipp Bartsch for whitespace fixes and his helper script[1].

[1]: https://git.grmr.de/phil/pocheck

Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
 2021-01-29 21:45:17 +02:00
Ævar Arnfjörð Bjarmason
d162b25f95 tests: remove support for GIT_TEST_GETTEXT_POISON 
This removes the ability to inject "poison" gettext() messages via the
GIT_TEST_GETTEXT_POISON special test setup.

I initially added this as a compile-time option in bb946bba76 (i18n:
add GETTEXT_POISON to simulate unfriendly translator, 2011-02-22), and
most recently modified to be toggleable at runtime in
6cdccfce1e (i18n: make GETTEXT_POISON a runtime option, 2018-11-08)..

The reason for its removal is that the trade-off of maintaining it
v.s. what it's getting us has long since flipped. When gettext was
integrated in 5e9637c629 (i18n: add infrastructure for translating
Git with gettext, 2011-11-18) there was understandable concern on the
Git ML that in marking messages for translation en-masse we'd
inadvertently mark plumbing messages. The GETTEXT_POISON facility was
a way to smoke those out via our test suite.

Nowadays however we're done (or almost entirely done) with any marking
of messages for translation. New messages are usually marked by their
authors, who'll know whether it makes sense to translate them or
not. If not any errors in marking the messages are much more likely to
be spotted in review than in the the initial deluge of i18n patches in
the 2011-2012 era.

So let's just remove this. This leaves the test suite in a state where
we still have a lot of test_i18n, C_LOCALE_OUTPUT
etc. uses. Subsequent commits will remove those too.

The change to t/lib-rebase.sh is a selective revert of the relevant
part of f2d17068fd (i18n: rebase-interactive: mark comments of squash
for translation, 2016-06-17), and the comment in
t/t3406-rebase-message.sh is from c7108bf9ed (i18n: rebase: mark
messages for translation, 2012-07-25).

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2021-01-21 15:50:01 -08:00
Jiang Xin
d13389bf27 l10n: zh_CN: for git v2.30.0 l10n round 1 and 2 
Translate 71 new messages (5037t0f0u) for git 2.30.0.

Reviewed-by: 依云 <lilydjwg@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2020-12-27 19:23:27 +08:00
Jiang Xin
ecc0c5841b Merge branch 'l10n/zh_TW/201223' of github.com:l10n-tw/git-po 
* 'l10n/zh_TW/201223' of github.com:l10n-tw/git-po:
  l10n: zh_TW.po: v2.30.0 round 2 (1 untranslated)
 2020-12-25 15:12:02 +08:00
pan93412
6806dd88f3 l10n: zh_TW.po: v2.30.0 round 2 (1 untranslated) 
Signed-off-by: pan93412 <pan93412@gmail.com>
 2020-12-25 12:16:13 +08:00
Arusekk
b77b318bd2 l10n: pl.po: add translation and set team leader 
Signed-off-by: Arusekk <arek_koz@o2.pl>
 2020-12-23 23:51:43 +01:00
m4sk1n
f6d254c157 l10n: pl.po: started Polish translation 
Signed-off-by: Arusekk <arek_koz@o2.pl>
 2020-12-23 22:51:30 +01:00
Matthias Rüster
6fe3d27d00 l10n: de.po: Update German translation for Git 2.30.0 
Reviewed-by: Ralf Thielow <ralf.thielow@gmail.com>
Reviewed-by: Phillip Szelat <phillip.szelat@gmail.com>
Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com>
 2020-12-23 13:41:53 +01:00
Jiang Xin
4953317e6b Merge branch 'master' of github.com:Softcatala/git-po 
* 'master' of github.com:Softcatala/git-po:
  l10n: Update Catalan translation
 2020-12-23 08:44:44 +08:00
Jordi Mas
9d82565c2e l10n: Update Catalan translation 
Signed-off-by: Jordi Mas <jmas@softcatala.org>
 2020-12-22 18:04:53 +01:00
Alexander Shopov
da0e79d6fa l10n: bg.po: Updated Bulgarian translation (5037t) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2020-12-22 17:49:18 +01:00
Jiang Xin
44840426ec Merge branch 'fr_2.30_rnd2' of github.com:jnavila/git 
* 'fr_2.30_rnd2' of github.com:jnavila/git:
  l10n: fr.po v2.30.0 rnd 2
 2020-12-22 08:46:17 +08:00
Jean-Noël Avila
aa13df664e l10n: fr.po v2.30.0 rnd 2 
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
 2020-12-21 18:53:19 +01:00
Emir Sarı
cc2a21c415 l10n: tr: v2.30.0-r2 
Signed-off-by: Emir Sarı <bitigchi@me.com>
 2020-12-21 12:32:52 +03:00
Peter Krefting
035b991fae l10n: sv.po: Update Swedish translation (5037t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2020-12-21 08:10:43 +01:00
Tran Ngoc Quan
2a48769ec2 l10n: vi.po(5037t): v2.30.0 rnd 2 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2020-12-21 08:45:38 +07:00
Jiang Xin
d0b62a5259 l10n: git.pot: v2.30.0 round 2 (1 new, 2 removed) 
Generate po/git.pot from v2.30.0-rc1 for git v2.30.0 l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2020-12-21 07:11:59 +08:00
Jordi Mas
da5bf7b515 l10n: Update Catalan translation 
Signed-off-by: Jordi Mas <jmas@softcatala.org>
 2020-12-19 23:52:12 +01:00
Jiang Xin
7715c382e8 Merge branch 'fr_next' of github.com:jnavila/git into git-po-master 
* 'fr_next' of github.com:jnavila/git:
  l10n: fr.po: v2.30.0 rnd 1
  l10n: fr.po Fix a typo
  l10n: fr fix misleading message
 2020-12-17 08:41:27 +08:00
Jiang Xin
763d202212 Merge branch '2.30-rc1' of github.com:bitigchi/git-po 
* '2.30-rc1' of github.com:bitigchi/git-po:
  l10n: tr: v2.30.0-r1
 2020-12-17 08:39:48 +08:00
Jean-Noël Avila
02cc663a76 l10n: fr.po: v2.30.0 rnd 1 
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
 2020-12-16 22:26:55 +01:00
Baptiste Fontaine
5e38c80fa7 l10n: fr.po Fix a typo 
Signed-off-by: Baptiste Fontaine <b@ptistefontaine.fr>
 2020-12-16 21:30:52 +01:00
Jean-Noël Avila
af60d9552a l10n: fr fix misleading message 
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
Reported-by: Sami Boukortt <sami@boukortt.com>
 2020-12-16 21:30:52 +01:00
Emir Sarı
9a161f8234 l10n: tr: v2.30.0-r1 
Signed-off-by: Emir Sarı <bitigchi@me.com>
 2020-12-16 15:31:50 +03:00
Peter Krefting
bafe27cf07 l10n: sv.po: Update Swedish translation (5038t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2020-12-15 21:42:13 +01:00
Jiang Xin
0c32704f6a l10n: git.pot: v2.30.0 round 1 (70 new, 45 removed) 
Generate po/git.pot from v2.30.0-rc0 for git v2.30.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2020-12-15 16:27:56 +08:00
Jiang Xin
2b4cb0057b Merge branch 'master' of github.com:Softcatala/git-po 
* 'master' of github.com:Softcatala/git-po:
  l10n: Update Catalan translation
 2020-10-18 09:56:33 +08:00
Jiang Xin
d9488fea41 l10n: zh_CN: for git v2.29.0 l10n round 1 and 2 
Translate 124 new messages (5013t0f0u) for git 2.29.0.

Reviewed-by: 依云 <lilydjwg@gmail.com>
Reviewed-by: Fangyi Zhou <me@fangyi.io>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2020-10-18 09:55:03 +08:00
Matthias Rüster
0cc3679465 l10n: de.po: Update German translation for Git 2.29.0 
Reviewed-by: Ralf Thielow <ralf.thielow@gmail.com>
Reviewed-by: Phillip Szelat <phillip.szelat@gmail.com>
Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com>
 2020-10-15 19:19:51 +02:00
Jiang Xin
d10afaf4a3 Merge branch 'pt-PT' of github.com:git-l10n-pt-PT/git-po 
* 'pt-PT' of github.com:git-l10n-pt-PT/git-po:
  l10n: pt_PT: make on po/pt_PT.po
  l10n: Portuguese translation team has changed. Wohoo!
 2020-10-14 09:35:03 +08:00
Tran Ngoc Quan
8d41d1045c l10n: vi(5013t): Updated translation for v2.29.0 rd2 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2020-10-13 08:38:20 +07:00
Daniel Santos
c8774d0670 l10n: pt_PT: make on po/pt_PT.po 
Pull from the language Coordenator repository and
`make` done at the top-level directory.

Signed-off-by: Daniel Santos <hello@brighterdan.com>
 2020-10-12 10:05:29 +01:00
Daniel Santos
f055b51f19 l10n: Portuguese translation team has changed. Wohoo! 
I am excited. Because I like a lot languages, and because I believe this
is the way to contribute to a large number of Portuguese speaking
person.

Jiang Xin and last Portuguese team gave me the lead. Thank you very
much. Honored to be a part of such a project.

Signed-off-by: Daniel Santos <hello@brighterdan.com>
 2020-10-12 10:05:29 +01:00
Jiang Xin
20c4a228a5 Merge branch 'master' of github.com:alshopov/git-po 
* 'master' of github.com:alshopov/git-po:
  l10n: bg.po: Updated Bulgarian translation (5013t)
 2020-10-12 15:19:19 +08:00
Jiang Xin
844fd55b24 Merge branch 'master' of github.com:nafmo/git-l10n-sv 
* 'master' of github.com:nafmo/git-l10n-sv:
  l10n: sv.po: Update Swedish translation (5013t0f0u)
 2020-10-12 15:18:03 +08:00
Jiang Xin
4ba082a037 Merge branch 'update-italian-translation' of github.com:AlessandroMenti/git-po 
* 'update-italian-translation' of github.com:AlessandroMenti/git-po:
  l10n: it.po: update the Italian translation
 2020-10-12 15:11:30 +08:00
Alexander Shopov
9a1497faca l10n: bg.po: Updated Bulgarian translation (5013t) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2020-10-11 15:01:10 +02:00
Peter Krefting
db7ca47599 l10n: sv.po: Update Swedish translation (5013t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2020-10-11 11:54:47 +01:00
Jiang Xin
c0ebb749ea Merge branch 'l10n/zh_TW/201010' of github.com:l10n-tw/git-po 
* 'l10n/zh_TW/201010' of github.com:l10n-tw/git-po:
  l10n: zh_TW.po: v2.29.0 round 2 (2 untranslated)
 2020-10-11 16:12:01 +08:00
Alessandro Menti
4f03210134
l10n: it.po: update the Italian translation 
Update the Italian translation for Git 2.29.0, round 2.

Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it>
 2020-10-11 10:06:13 +02:00
Jiang Xin
bb7de4d7ab Merge branch '2.29-r2' of github.com:bitigchi/git-po 
* '2.29-r2' of github.com:bitigchi/git-po:
  l10n: tr: v2.29.0 round 2
 2020-10-11 09:46:46 +08:00
Emir Sarı
fbc6b82f0a l10n: tr: v2.29.0 round 2 
Signed-off-by: Emir Sarı <bitigchi@me.com>
 2020-10-10 14:41:15 +03:00
pan93412
bc66326381
l10n: zh_TW.po: v2.29.0 round 2 (2 untranslated) 
Signed-off-by: pan93412 <pan93412@gmail.com>
 2020-10-10 19:34:56 +08:00
Jean-Noël Avila
8a62da92e5 l10n: fr: v2.29.0 rnd 2 
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
 2020-10-10 13:11:18 +02:00
Jiang Xin
1fd0dd7224 l10n: git.pot: v2.29.0 round 2 (1 new, 1 removed) 
Generate po/git.pot from v2.29.0-rc1 for git v2.29.0 l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2020-10-10 09:33:19 +08:00
Jiang Xin
c6b9837a4c Merge branch 'fr_2.29.0_rnd_1' of github.com:jnavila/git 
* 'fr_2.29.0_rnd_1' of github.com:jnavila/git:
  l10n: fr: v2.29.0 rnd 1
 2020-10-08 20:27:51 +08:00
Jean-Noël Avila
8dadc33bfb l10n: fr: v2.29.0 rnd 1 
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
 2020-10-07 21:55:55 +02:00
Alessandro Menti
283aa916c6
l10n: it.po: update the Italian translation for Git 2.29.0 round 1 
Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it>
 2020-10-07 21:45:09 +02:00
Emir Sarı
ae372f11d4 l10n: tr: v2.29.0 round 1 
Signed-off-by: Emir Sarı <bitigchi@me.com>
 2020-10-06 16:44:21 +03:00
Jordi Mas
008a5d481e l10n: Update Catalan translation 
Signed-off-by: Jordi Mas <jmas@softcatala.org>
 2020-10-06 11:36:15 +02:00
Jiang Xin
e13da2db28 l10n: git.pot: v2.29.0 round 1 (124 new, 42 removed) 
Generate po/git.pot from v2.29.0-rc0 for git v2.29.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2020-10-06 09:16:18 +08:00
brian m. carlson
d9cd433147 po: add missing letter for French message 
Add the missing "e" in "de".  While it is possible in French to omit it,
that only occurs with an apostrophe and only when the next word starts
with a vowel or mute h, which is not the case here.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Acked-by: Jean-Noël Avila <jn.avila@free.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2020-08-28 14:02:07 -07:00
Jiang Xin
05b3a3d730 Merge branch 'master' of github.com:Softcatala/git-po 
* 'master' of github.com:Softcatala/git-po:
  l10n: Update Catalan translation
 2020-07-27 00:05:41 +08:00
Christopher Diaz Riveros
7b0e326ba9 l10n: es: 2.28.0 round 1 
Signed-off-by: Christopher Diaz Riveros <christopher.diaz.riv@gmail.com>
 2020-07-26 10:12:01 -05:00
Matthias Rüster
45f83df1b5 l10n: de.po: Update German translation for Git v2.28.0 
Reviewed-by: Ralf Thielow <ralf.thielow@gmail.com>
Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com>
 2020-07-24 20:35:30 +02:00
Ralf Thielow
7112e051c7 l10n: de.po: fix grammar 
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com>
 2020-07-24 20:33:38 +02:00
Jiang Xin
7157c2b5c9 l10n: zh_CN: for git v2.28.0 l10n round 1 
Translate 70 new messages (4931t0f0u) for git 2.28.0.

Reviewed-by: Fangyi Zhou <me@fangyi.io>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2020-07-21 16:31:13 +08:00
Jiang Xin
0c5ead43fd Merge branch 'l10n/zh_TW/200716' of github.com:l10n-tw/git-po 
* 'l10n/zh_TW/200716' of github.com:l10n-tw/git-po:
  l10n: zh_TW.po: v2.28.0 round 1 (0 untranslated)
 2020-07-21 16:00:54 +08:00
Yi-Jyun Pan
6b77569371
l10n: zh_TW.po: v2.28.0 round 1 (0 untranslated) 
Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com>
 2020-07-20 18:39:27 +08:00
Đoàn Trần Công Danh
877c10b5e3 l10n: vi.po: correct "ident line" translation 
While we're at it, fix some minor misspelling
and improve translation for 3-way-merging.

Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2020-07-20 08:55:12 +07:00
Tran Ngoc Quan
ebf9785bec l10n: vi.po(4931t): Updated translation for v2.28.0 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2020-07-20 08:54:50 +07:00
Jiang Xin
a4ef0982a0 Merge branch 'fr_v2.28.0_rnd1' of github.com:jnavila/git 
* 'fr_v2.28.0_rnd1' of github.com:jnavila/git:
  l10n: fr v2.28.0 round 1
 2020-07-13 08:39:23 +08:00
Jean-Noël Avila
0c7696ed67 l10n: fr v2.28.0 round 1 
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
 2020-07-12 18:15:44 +02:00
Jiang Xin
186ae86782 Merge branch 'master' of github.com:nafmo/git-l10n-sv 
* 'master' of github.com:nafmo/git-l10n-sv:
  l10n: sv.po: Update Swedish translation (4931t0f0u)
 2020-07-12 17:53:39 +08:00
Peter Krefting
f32ab4e3c9 l10n: sv.po: Update Swedish translation (4931t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2020-07-11 17:52:58 +01:00
Alessandro Menti
dda29f3782
l10n: it.po: update the Italian translation for Git 2.28.0 round 1 
Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it>
 2020-07-11 15:38:10 +02:00
Emir Sarı
73d50566ca l10n: tr: v2.28.0 round 1 
Signed-off-by: Emir Sarı <bitigchi@me.com>
 2020-07-10 13:07:30 +03:00
Jiang Xin
d84f4abf5f l10n: git.pot: v2.28.0 round 1 (70 new, 14 removed) 
Generate po/git.pot from v2.28.0-rc0 for git v2.28.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2020-07-10 09:54:33 +08:00
Jordi Mas
169b91f936 l10n: Update Catalan translation 
Signed-off-by: Jordi Mas <jmas@softcatala.org>
 2020-07-09 20:01:42 +02:00
Jiang Xin
cb26198ec6 Merge branch 'master' of github.com:ruester/git-po-de 
* 'master' of github.com:ruester/git-po-de:
  l10n: de.po: Fix typo in the German translation of octopus
  l10n: de.po: Update German translation for Git 2.27.0
 2020-05-30 11:26:53 +08:00
Jiang Xin
e228b2c9a8 Merge branch of github.com:AlessandroMenti/git-po 
* 'update-italian-translation' of github.com:AlessandroMenti/git-po:
  l10n: it.po: update for Git 2.27.0 round #2
 2020-05-30 11:25:17 +08:00
Yi-Jyun Pan
1064a30054 l10n: zh_TW.po: v2.27.0 round 2 (0 untranslated) 
Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com>
 2020-05-30 00:37:53 +08:00
Yi-Jyun Pan
710636a908 l10n: zh_TW.po: v2.27.0 round 1 (0 untranslated) 
Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com>
 2020-05-30 00:34:15 +08:00
Jan Engelhardt
9d18eae6b2 l10n: de.po: Fix typo in the German translation of octopus 
Signed-off-by: Jan Engelhardt <jengelh@inai.de>
Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com>
 2020-05-29 16:47:34 +02:00
Matthias Rüster
7045aa9c84 l10n: de.po: Update German translation for Git 2.27.0 
Reviewed-by: Ralf Thielow <ralf.thielow@gmail.com>
Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com>
 2020-05-29 16:46:53 +02:00
Alessandro Menti
a09c79f5c8
l10n: it.po: update for Git 2.27.0 round #2 
Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it>
 2020-05-28 07:53:00 +02:00
Jiang Xin
7af3e5bcf7 Merge branch 'fr_2.27.0rnd2' of github.com:jnavila/git 
* 'fr_2.27.0rnd2' of github.com:jnavila/git:
  l10n: fr.po v2.27.0 rnd 2
 2020-05-28 10:46:04 +08:00
Jiang Xin
2c0f79caf0 Merge branch 'master' of github.com:bitigchi/git-po 
* 'master' of github.com:bitigchi/git-po:
  l10n: tr: v2.27.0 round 2
 2020-05-28 10:45:33 +08:00
Jiang Xin
ba6f6f6bd2 Merge branch 'master' of github.com:alshopov/git-po 
* 'master' of github.com:alshopov/git-po:
  l10n: bg.po: Updated Bulgarian translation (4875t)
 2020-05-28 10:45:11 +08:00
Jiang Xin
b3183376be Merge branch 'master' of github.com:Softcatala/git-po 
* 'master' of github.com:Softcatala/git-po:
  l10n: Update Catalan translation
 2020-05-28 10:44:21 +08:00
Emir Sarı
61c7f0466e l10n: tr: v2.27.0 round 2 
Signed-off-by: Emir Sarı <bitigchi@me.com>
 2020-05-27 12:48:41 +03:00
Jean-Noël Avila
f0882a0b4f l10n: fr.po v2.27.0 rnd 2 
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
 2020-05-27 11:18:48 +02:00
Alexander Shopov
22563117de l10n: bg.po: Updated Bulgarian translation (4875t) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2020-05-27 09:44:34 +02:00
Jordi Mas
b6d7940422 l10n: Update Catalan translation 
Signed-off-by: Jordi Mas <jmas@softcatala.org>
 2020-05-27 08:59:48 +02:00
Peter Krefting
3eff1ed3a3 l10n: sv.po: Update Swedish translation (4875t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2020-05-27 07:41:28 +01:00
Tran Ngoc Quan
4b4cf76771 l10n: vi(4875t): Updated Vietnamses translation for 2.27.0rd2 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2020-05-27 08:08:20 +07:00
Jiang Xin
349ede6ae7 l10n: zh_CN: for git v2.27.0 l10n round 1~2 
Translate 73 new messages (4875t0f0u) for git 2.27.0.

Reviewed-by: 依云 <lilydjwg@gmail.com>
Reviewed-by: Fangyi Zhou <me@fangyi.io>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2020-05-27 07:39:48 +08:00
Jiang Xin
b3f6cd79ab l10n: git.pot: v2.27.0 round 2 (+1) 
Generate po/git.pot from v2.27.0-rc2 for git v2.27.0 l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2020-05-27 07:24:01 +08:00
Jordi Mas
ad58801042 l10n: Update Catalan translation 
Signed-off-by: Jordi Mas <jmas@softcatala.org>
 2020-05-22 07:59:22 +02:00
Tran Ngoc Quan
e9269c0f82 l10n: vi(4874t): Updated Vietnamses translation for 2.27.0 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2020-05-21 08:22:57 +07:00
Jiang Xin
1140772df4 Merge branch 'next' of github.com:ChrisADR/git-po 
* 'next' of github.com:ChrisADR/git-po:
  l10n: es: 2.27.0 round 1
 2020-05-20 08:07:30 +08:00
Jiang Xin
3d5545ce16 Merge branch 'master' of github.com:Softcatala/git-po 
* 'master' of github.com:Softcatala/git-po:
  l10n: Update Catalan translation

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2020-05-18 09:26:24 +08:00
Christopher Diaz Riveros
848c9e1d9e l10n: es: 2.27.0 round 1 
Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org>
 2020-05-17 18:51:17 -05:00
Jiang Xin
0b214881c4 Merge branch 'master' of github.com:alshopov/git-po into git-po-master 
* 'master' of github.com:alshopov/git-po:
  l10n: bg.po: Updated Bulgarian translation (4868t)
 2020-05-17 09:39:00 +08:00
Jiang Xin
722ab588c5 Merge branch 'fr_2.27.0_rnd1' of github.com:jnavila/git 
* 'fr_2.27.0_rnd1' of github.com:jnavila/git:
  l10n: fr v2.27.0 rnd 1
 2020-05-17 09:28:44 +08:00
Alexander Shopov
5163ba92b1 l10n: bg.po: Updated Bulgarian translation (4868t) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2020-05-16 13:08:00 +02:00
Jean-Noël Avila
dc46d27a5e l10n: fr v2.27.0 rnd 1 
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
 2020-05-16 12:49:09 +02:00
Jiang Xin
2e8c27b3d3 Merge branch 'git-2.27-round-1' of github.com:bitigchi/git-po 
* 'git-2.27-round-1' of github.com:bitigchi/git-po:
  l10n: tr: v2.27.0 round 1
 2020-05-16 18:30:57 +08:00
Jiang Xin
4226ffa400 Merge branch 'master' of github.com:nafmo/git-l10n-sv 
* 'master' of github.com:nafmo/git-l10n-sv:
  l10n: sv.po: Update Swedish translation (4839t0f0u)
 2020-05-16 18:28:21 +08:00
Peter Krefting
a6cfc0e3d6 l10n: sv.po: Update Swedish translation (4839t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2020-05-15 12:21:42 +01:00
Emir Sarı
3d38157284 l10n: tr: v2.27.0 round 1 
Signed-off-by: Emir Sarı <bitigchi@me.com>
 2020-05-15 14:16:43 +03:00
Alessandro Menti
6c82da1bd2
l10n: it.po: update the Italian translation for Git 2.27.0 round 1 
Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it>
 2020-05-15 08:39:23 +02:00
Jiang Xin
bfef3f9d23 l10n: git.pot: v2.27.0 round 1 (72 new, 37 removed) 
Generate po/git.pot from v2.27.0-rc0 for git v2.27.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2020-05-15 09:12:03 +08:00
Jordi Mas
db7bfba9ad l10n: Update Catalan translation 
Signed-off-by: Jordi Mas <jmas@softcatala.org>
 2020-05-10 10:52:58 +02:00
Jiang Xin
1557364fb4 l10n: tr.po: change file mode to 644 
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2020-03-21 18:26:56 +08:00
Matthias Rüster
1ae3a389c7 l10n: de.po: Update German translation for Git 2.26.0 
Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com>
Reviewed-by: Ralf Thielow <ralf.thielow@gmail.com>
Reviewed-by: Phillip Szelat <phillip.szelat@gmail.com>
 2020-03-20 12:19:22 +01:00
Ralf Thielow
5804c6ec40 l10n: de.po: add missing space 
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2020-03-20 10:45:37 +01:00
Emir Sarı
4914ba4bcf l10n: tr: Fix a couple of ambiguities 
Signed-off-by: Emir Sarı <bitigchi@me.com>
 2020-03-20 01:36:24 +03:00
Jordi Mas
f0c03bcf95 l10n: Update Catalan translation 
Signed-off-by: Jordi Mas <jmas@softcatala.org>
 2020-03-18 20:24:20 +01:00
Peter Krefting
d7d8b208da l10n: sv.po: Update Swedish translation (4839t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2020-03-17 18:33:22 +01:00
Fangyi Zhou
440e7442d1 l10n: zh_CN: Revise v2.26.0 translation 
Signed-off-by: Fangyi Zhou <me@fangyi.io>
Reviewed-by: 依云 <lilydjwg@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2020-03-17 14:05:22 +08:00
Jiang Xin
2b472aae5c l10n: zh_CN: for git v2.26.0 l10n round 1 and 2 
Translate 79 new messages (4839t0f0u) for git 2.26.0.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2020-03-17 14:05:22 +08:00
Tran Ngoc Quan
ee94b979b2 l10n: vi(4839t): Updated Vietnamese translation for v2.26.0 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2020-03-16 15:21:58 +08:00
Đoàn Trần Công Danh
15fa8d9667 l10n: vi: fix translation + grammar 
- context should be translated to ngữ cảnh instead of nội dung
- add missing accents
- switch adjective and secondary objects position:
	* The formatted English text will be "To remove '+/-' lines",
	it should be translated to "Để bỏ dòng bắt đầu với '+/-'

Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
 2020-03-16 15:21:58 +08:00
Yi-Jyun
1fae9a4b1b l10n: zh_TW.po: v2.26.0 round 2 (0 untranslated) 
Revision 2.

Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com>
 2020-03-15 01:58:00 +08:00
Yi-Jyun
c73cfd5c79 l10n: zh_TW.po: v2.26.0 round 1 (11 untranslated) 
Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com>
 2020-03-15 01:57:37 +08:00
Jiang Xin
25f7d68ba9 Merge branch of github.com:ChrisADR/git-po into master 
* 'next' of github.com:ChrisADR/git-po:
  l10n: es: 2.26.0 round#2
 2020-03-12 18:41:56 +08:00
Alessandro Menti
17ed936e96
l10n: it.po: update the Italian translation for Git 2.26.0 round 2 
Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it>
 2020-03-12 07:52:58 +01:00
Christopher Diaz Riveros
1afe18a3bb l10n: es: 2.26.0 round#2 
Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org>
 2020-03-11 23:19:58 -05:00
Jiang Xin
5ab9217a3c Merge branch of github.com:alshopov/git-po into master 
* 'git-l10n_git-po_master' of github.com:alshopov/git-po:
  l10n: bg.po: Updated Bulgarian translation (4839t)
 2020-03-12 10:17:22 +08:00
Jiang Xin
c6713676d6 Merge branch of github.com:bitigchi/git-po into master 
* 'tr_translations_2.26.1' of github.com:bitigchi/git-po:
  l10n: tr: v2.26.0 round 2
 2020-03-12 10:15:49 +08:00
Alexander Shopov
b22e556314 l10n: bg.po: Updated Bulgarian translation (4839t) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2020-03-12 00:04:37 +01:00
Emir Sarı
2713dec02d l10n: tr: v2.26.0 round 2 
Signed-off-by: Emir Sarı <bitigchi@me.com>
 2020-03-12 00:09:51 +03:00
Jean-Noël Avila
c9ef57cc3a l10n: fr : v2.26.0 rnd 2 
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
 2020-03-11 21:19:25 +01:00
Jiang Xin
051fae4d51 l10n: git.pot: v2.26.0 round 2 (7 new, 2 removed) 
Generate po/git.pot from v2.26.0-rc1 for git v2.26.0 l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2020-03-11 15:27:39 +08:00
Emir Sarı
9643441983 l10n: tr: Add glossary for Turkish translations 
Signed-off-by: Emir Sarı <bitigchi@me.com>
 2020-03-10 23:31:48 +03:00
Jiang Xin
438393202c Merge branch 'master' of github.com:nafmo/git-l10n-sv 
* 'master' of github.com:nafmo/git-l10n-sv:
  l10n: sv.po: Update Swedish translation (4835t0f0u)
 2020-03-10 14:28:22 +08:00
Jiang Xin
fa89e04fe1 Merge branch 'fr_2.26.0' of github.com:jnavila/git 
* 'fr_2.26.0' of github.com:jnavila/git:
  l10n: fr v2.26.0 rnd1
 2020-03-10 14:26:58 +08:00
Peter Krefting
2591c4cf6d l10n: sv.po: Update Swedish translation (4835t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2020-03-09 21:02:58 +01:00
Emir Sarı
dd2c269652 l10n: tr: Add Turkish translations 
Signed-off-by: Emir Sarı <bitigchi@me.com>
 2020-03-09 21:41:28 +03:00
Emir Sarı
8f4f099f8b l10n: tr: Add Turkish translation team info 
Signed-off-by: Emir Sarı <bitigchi@me.com>
 2020-03-09 21:39:08 +03:00
Jean-Noël Avila
4d9c2902a1 l10n: fr v2.26.0 rnd1 
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
 2020-03-08 23:26:01 +01:00
Jiang Xin
ad182bee3f Merge branch of github.com:alshopov/git-po into master 
* 'git-l10n_git-po_master' of github.com:alshopov/git-po:
  l10n: bg.po: Updated Bulgarian translation (4835t)
 2020-03-08 23:44:13 +08:00
Alessandro Menti
23fa46712a
l10n: it.po: update the Italian translation for Git 2.26.0 round 1 
Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it>
 2020-03-07 09:57:36 +01:00
Alexander Shopov
98f24073a5 l10n: bg.po: Updated Bulgarian translation (4835t) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2020-03-06 07:52:57 +01:00
Jiang Xin
f7c6172e97 l10n: git.pot: v2.26.0 round 1 (73 new, 38 removed) 
Generate po/git.pot from v2.26.0-rc0 for git v2.26.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2020-03-06 14:27:08 +08:00
Jordi Mas
6d1210e133 l10n: Update Catalan translation 
Signed-off-by: Jordi Mas <jmas@softcatala.org>
 2020-03-01 12:58:32 +01:00
Jordi Mas
7979dfe1d4 l10n: Update Catalan translation 
Signed-off-by: Jordi Mas <jmas@softcatala.org>
 2020-01-22 07:31:43 +01:00
Jiang Xin
ddc12c429b l10n: zh_CN: for git v2.25.0 l10n round 1 
Translate 119 new messages (4800t0f0u) for git 2.25.0.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2020-01-12 19:22:02 +08:00
Jiang Xin
e23b95e75b Merge branch 'master' of github.com:Softcatala/git-po into git-po-master 
* 'master' of github.com:Softcatala/git-po:
  l10n: Update Catalan translation
 2020-01-11 16:04:21 +08:00
Jordi Mas
a20ae3ee29 l10n: Update Catalan translation 
Signed-off-by: Jordi Mas <jmas@softcatala.org>
 2020-01-10 22:21:55 +01:00
Matthias Rüster
63a5650a49 l10n: de.po: Update German translation v2.25.0 round 1 
Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com>
Reviewed-by: Ralf Thielow <ralf.thielow@gmail.com>
Reviewed-by: Phillip Szelat <phillip.szelat@gmail.com>
 2020-01-10 12:04:03 +01:00
Thomas Braun
75449c1b39 l10n: de.po: Reword generation numbers 
The english term generation is here not used in the sense of "to
generate" but in the sense of "generations of beings".

This corrects the initial translation from cf4c0c25 (l10n: update German
translation, 2018-12-06).

Fixed-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2020-01-10 12:04:03 +01:00
Alexander Shopov
6b6a9803fb l10n: bg.po: Updated Bulgarian translation (4800t) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2020-01-09 16:32:25 +01:00
Christopher Diaz Riveros
7fdc5f296f l10n: es: 2.25.0 round #1 
Signed-off-by: Christopher Diaz Riveros <christopher.diaz.riv@gmail.com>
 2020-01-06 09:18:43 -05:00
Peter Krefting
9d48668cd5 l10n: sv.po: Update Swedish translation (4800t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2020-01-04 19:53:30 +01:00
Jiang Xin
3a05aacddd Merge branch 'fr_v2.25.0_rnd1' of github.com:jnavila/git into master 
* 'fr_v2.25.0_rnd1' of github.com:jnavila/git:
  l10n: fr.po v2.25.0 rnd 1
 2020-01-04 08:46:36 +08:00
Jean-Noël Avila
4c5081614c l10n: fr.po v2.25.0 rnd 1 
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
 2020-01-03 18:47:15 +01:00
Tran Ngoc Quan
5bb457409c l10n: vi(4800t): Updated Vietnamese translation v2.25.0 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2020-01-03 14:12:58 +07:00
Jiang Xin
d6a6263f5f Merge branch 'translation_191231' of github.com:l10n-tw/git-po into git-po-master 
* 'translation_191231' of github.com:l10n-tw/git-po:
  l10n: zh_TW.po: update translation for v2.25.0 round 1
 2020-01-01 11:15:05 +08:00
pan93412
13185fd241 l10n: zh_TW.po: update translation for v2.25.0 round 1 
Signed-off-by: pan93412 <pan93412@gmail.com>
 2019-12-31 21:17:41 +08:00
Alessandro Menti
0d3ce942b0
l10n: it.po: update the Italian translation for Git 2.25.0 
Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it>
 2019-12-30 09:48:44 +01:00
Jiang Xin
578c793731 l10n: git.pot: v2.25.0 round 1 (119 new, 13 removed) 
Generate po/git.pot from v2.25.0-rc0 for git v2.25.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2019-12-30 08:52:42 +08:00
Jordi Mas
9e341f62ca l10n: Update Catalan translation 
Signed-off-by: Jordi Mas <jmas@softcatala.org>
 2019-12-27 18:23:20 +01:00
Yi-Jyun Pan
9917eca794 l10n: zh_TW: add translation for v2.24.0 
Based on commit a5cd71ca4a ("l10n: zh_CN: for git v2.24.0 l10n round
1~2", 2019-10-29).

Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com>
Reviewed-by: Franklin Weng <franklin@goodhorse.idv.tw>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2019-11-25 10:07:12 +08:00
Jiang Xin
a5cd71ca4a l10n: zh_CN: for git v2.24.0 l10n round 1~2 
Translate 36 new messages (4694t0f0u) for git 2.24.0.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2019-11-02 20:51:12 +08:00
Matthias Rüster
798d66e35d l10n: de.po: Update German translation 
Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com>
Reviewed-by: Ralf Thielow <ralf.thielow@gmail.com>
Reviewed-by: Phillip Szelat <phillip.szelat@gmail.com>
 2019-10-31 09:35:59 +01:00
Peter Krefting
c1d0038746 l10n: sv.po: Update Swedish translation (4695t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2019-10-30 23:22:13 +01:00
Jiang Xin
5b7594abdc Merge branch 'master' of github.com:vnwildman/git 
* 'master' of github.com:vnwildman/git:
  l10n: vi(4694t): Updated translation for v2.24.0
 2019-10-30 14:07:58 +08:00
Jiang Xin
034d33653a Merge branch 'next' of github.com:ChrisADR/git-po 
* 'next' of github.com:ChrisADR/git-po:
  l10n: es: 2.24.0 round 2
 2019-10-30 14:02:22 +08:00
Alexander Shopov
1294a85b7c l10n: bg.po: Updated Bulgarian translation (4694) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2019-10-29 11:37:45 +01:00
Tran Ngoc Quan
f126a1fb0f l10n: vi(4694t): Updated translation for v2.24.0 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2019-10-29 14:38:42 +07:00
Christopher Diaz Riveros
77200e9332 l10n: es: 2.24.0 round 2 
Signed-off-by: Christopher Diaz Riveros <christopher.diaz.riv@gmail.com>
 2019-10-28 19:21:27 -05:00
Jiang Xin
e42df36b42 Merge branch 'l10n/it/update-italian-translation' 
* 'update-italian-translation' of github.com:AlessandroMenti/git-po:
  l10n: it.po: update the Italian translation for Git 2.24.0 round #2
 2019-10-29 07:27:51 +08:00
Alessandro Menti
5e196e8ae0
l10n: it.po: update the Italian translation for Git 2.24.0 round #2 
Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it>
 2019-10-28 20:44:05 +01:00
Jean-Noël Avila
51728480fe l10n: fr v2.24.0 rnd2 
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
 2019-10-28 20:36:01 +01:00
Jiang Xin
045a548698 l10n: git.pot: v2.24.0 round 2 (1 new) 
Generate po/git.pot from v2.24.0-rc1 for git v2.24.0 l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2019-10-28 13:20:37 +08:00
Alessandro Menti
370784e0e6
l10n: it.po: update the Italian translation for Git 2.24.0 
Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it>
 2019-10-22 20:05:10 +02:00
Jiang Xin
cc73c68603 Merge branch 'master' of github.com:jnavila/git into git-po-master 
* 'master' of github.com:jnavila/git:
  l10n: fr 2.24.0 rnd 1
 2019-10-22 09:47:23 +08:00
Jiang Xin
907843be3b Merge branch 'master' of github.com:alshopov/git-po into git-po-master 
* 'master' of github.com:alshopov/git-po:
  l10n: bg.po: Updated Bulgarian translation (4693)
 2019-10-22 09:16:24 +08:00
Jean-Noël Avila
13bcea8c7f l10n: fr 2.24.0 rnd 1 
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
 2019-10-21 20:49:16 +02:00
Jiang Xin
135480a616 Merge remote-tracking branch 'git-po/master' into git-po-master 
* git-po/master:
  l10n: sv.po: Update Swedish translation (4674t0f0u)
  l10n: Update Catalan translation
 2019-10-21 19:57:27 +08:00
Jiang Xin
3d0a05b464 l10n: git.pot: v2.24.0 round 1 (35 new, 16 removed) 
Generate po/git.pot from v2.24.0-rc0 for git v2.24.0 l10n round 1.

Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com>
 2019-10-21 19:56:08 +08:00
Alexander Shopov
f757409e36 l10n: bg.po: Updated Bulgarian translation (4693) 
Synced with 2.24-rc0

Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2019-10-19 12:20:43 +02:00
Peter Krefting
51eeaf4aa7 l10n: sv.po: Update Swedish translation (4674t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2019-08-17 20:16:34 +01:00
Jordi Mas
5bace62582 l10n: Update Catalan translation 
Signed-off-by: Jordi Mas <jmas@softcatala.org>
 2019-08-17 09:55:01 +02:00
Jiang Xin
a6cd2cc485 l10n: zh_CN: for git v2.23.0 l10n round 1~2 
Translate 128 new messages (4674t0f0u) for git 2.23.0.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2019-08-16 16:59:17 +08:00
Matthias Ruester
1f5ab2d1ae l10n: de.po: Update German translation 
Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com>
Reviewed-by: Ralf Thielow <ralf.thielow@gmail.com>
Reviewed-by: Phillip Szelat <phillip.szelat@gmail.com>
 2019-08-12 18:48:08 +02:00
Jiang Xin
5900439e88 Merge branch 'master' of https://github.com/vnwildman/git 
* 'master' of https://github.com/vnwildman/git:
  l10n: vi(4674t): Updated translation for Vietnamese
 2019-08-12 16:04:28 +08:00
Jiang Xin
ba82e37314 Merge branch 'update-italian-translation' of github.com:AlessandroMenti/git-po 
* 'update-italian-translation' of github.com:AlessandroMenti/git-po:
  l10n: it.po: update the Italian localization for v2.23.0 round 2
 2019-08-12 16:02:08 +08:00
Jiang Xin
6c1a7dd97c Merge branch 'next' of https://github.com/ChrisADR/git-po 
* 'next' of https://github.com/ChrisADR/git-po:
  l10n: es: 2.23.0 round 2
 2019-08-12 16:00:14 +08:00
Alessandro Menti
ad1d0a52dd
l10n: it.po: update the Italian localization for v2.23.0 round 2 
Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it>
 2019-08-11 11:54:27 +02:00
Tran Ngoc Quan
8a4adfdd2d l10n: vi(4674t): Updated translation for Vietnamese 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2019-08-11 07:14:07 +07:00
Christopher Diaz Riveros
3f3e3f9209 l10n: es: 2.23.0 round 2 
Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org>
 2019-08-10 13:17:33 -05:00
Jean-Noël Avila
ec688f776c l10n: fr v2.23.0 round 2 
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
 2019-08-10 18:17:31 +02:00
Jiang Xin
466c88fa0e l10n: git.pot: v2.23.0 round 2 (4 new, 6 removed) 
Generate po/git.pot from v2.23.0-rc2 for git v2.23.0 l10n round 2.

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

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

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

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

Git 2.23-rc0

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

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

This change fixes that error in the German translation.

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

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

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

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

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

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

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

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

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

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

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

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-06-21 09:42:49 -07:00
Jordi Mas
197866e4b3 l10n: Update Catalan translation 
Signed-off-by: Jordi Mas <jmas@softcatala.org>
 2019-06-08 08:32:49 +02:00
Jiang Xin
0cdb8d2db2 Merge branch 'fr_review' of git://github.com/jnavila/git 
* 'fr_review' of git://github.com/jnavila/git:
  l10n: fr.po: Review French translation
 2019-06-07 16:51:09 +08:00