Commit Graph

1033 Commits

Author SHA1 Message Date
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
Jiang Xin
d014920079 Merge branch 'master' of git://github.com/alshopov/git-po
* 'master' of git://github.com/alshopov/git-po:
  l10n: bg.po: Updated Bulgarian translation (4581t)
2019-06-07 16:50:23 +08:00
Cédric Malard
82eb147dbb l10n: fr.po: Review French translation
Signed-off-by: Cédric Malard <c.malard-git@valdun.net>
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
2019-06-07 08:54:28 +02:00
Matthias Rüster
219829ae83 l10n: de.po: Update German translation
Reviewed-by: Ralf Thielow <ralf.thielow@gmail.com>
Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com>
2019-06-06 07:03:26 +02:00
Ralf Thielow
8c18948b78 l10n: de.po: improve description of 'git reset --quiet'
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2019-06-06 07:03:25 +02:00
Matthias Rüster
d314d77577 l10n: TEAMS: Change German translation team leader
Acked-by: Ralf Thielow <ralf.thielow@gmail.com>
Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com>
2019-06-05 20:48:37 +02:00
Alexander Shopov
de2b0545ee l10n: bg.po: Updated Bulgarian translation (4581t)
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2019-06-05 08:51:15 +02:00
Fangyi Zhou
5b5336320b l10n: zh_CN: Revision for git v2.22.0 l10n
Revise 51 translations, improving consistency for some phrased.
Update email address for Fangyi Zhou

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

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

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

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

Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2019-05-14 14:47:37 +01:00
Jiang Xin
d93ef2a150 l10n: git.pot: v2.22.0 round 1 (270 new, 56 removed)
Generate po/git.pot from v2.22.0-rc0 for git v2.22.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2019-05-14 17:09:58 +08:00
Jordi Mas
5a36d17c55 l10n: Update Catalan translation
Signed-off-by: Jordi Mas <jmas@softcatala.org>
2019-03-29 07:18:55 +01:00
Jordi Mas
3ece05c5f4 l10n: Fixes to Catalan translation
Signed-off-by: Jordi Mas <jmas@softcatala.org>
2019-03-02 19:12:58 +01:00
Tran Ngoc Quan
1fc5279fdb l10n: Updated Vietnamese translation for v2.21 rd2
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2019-03-01 19:23:16 +08:00
Jean-Noël Avila
29b168aa44 l10n: fr.po remove obsolete entries
On NetBSD, the version of msgfmt is still 0.14.4. There's no hope for
an upgrade due to some GPLv3 allergy of NetBSD's. This version chokes
on heavily decorated commented entries in po files. It's safer to get
rid of all these obsolete entries.

Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
2019-02-26 21:53:01 +01:00
Alexander Shopov
ab8f4f5d73 l10n: bg.po: Updated Bulgarian translation (4363t)
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2019-02-23 23:29:23 +02:00
Jiang Xin
e7bc80b7ea Merge branch 'master' of https://github.com/ralfth/git-po-de 2019-02-22 22:18:12 +08:00
Ralf Thielow
e5a5d5c2c8 l10n: update German translation
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Reviewed-by: Matthias Rüster <matthias.ruester@gmail.com>
2019-02-22 08:47:26 +01:00
Jiang Xin
54fca18313 Merge branch 'bg-submodule-helper-typo' of github.com:pclouds/git-po 2019-02-20 21:40:54 +08:00
Fangyi Zhou
8e4e0555f2 l10n: zh_CN: Revision for git v2.21.0 l10n
Signed-off-by: Fangyi Zhou <fangyi.zhou@yuriko.moe>
2019-02-20 21:33:56 +08:00
Jiang Xin
069917778f l10n: zh_CN: for git v2.21.0 l10n round 1~2
Translate 214 new messages (4363t0f0u) for git 2.21.0.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2019-02-20 21:33:56 +08:00
Nguyễn Thái Ngọc Duy
c2d8f4c73a l10n: bg.po: correct typo
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
2019-02-20 20:32:40 +07:00
Peter Krefting
34692d22fa l10n: Update Swedish translation (4363t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2019-02-20 08:56:20 +01:00
Sebastian Staudt
a8a6b15c01 l10n: de.po: fix grammar in message for tag.c
Signed-off-by: Sebastian Staudt <koraktor@gmail.com>
2019-02-19 13:53:29 +01:00
Sebastian Staudt
40cbe8ad14 l10n: de.po: fix a message for index-pack.c
Signed-off-by: Sebastian Staudt <koraktor@gmail.com>
2019-02-19 13:53:29 +01:00
Sebastian Staudt
567349f54e l10n: de.po: consistent translation of 'root commit'
'root commit' is usually translated as 'Root-Commit'. But in one
occasion it‘s translated as 'Basis-Commit' which is the translation
for 'base commit'.

Signed-off-by: Sebastian Staudt <koraktor@gmail.com>
2019-02-19 13:53:29 +01:00
Alessandro Menti
bb236fb44a l10n: it: update the Italian translation
Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it>
2019-02-19 10:07:24 +08:00
Jiang Xin
10e6e9fdea Merge branch 'master' of https://github.com/Softcatala/git-po 2019-02-17 15:28:15 +08:00
Christopher Diaz Riveros
cf69bcadee l10n: es: 2.21.0 round 2
Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org>
2019-02-16 15:22:07 -05:00