development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-30 14:03:28 +00:00
Code Issues Projects Releases Packages Wiki Activity
48725 commits 6 branches 956 tags 486 MiB
Commit graph

611 commits

Author SHA1 Message Date
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