mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-05 16:52:59 +01:00
Code Activity
50934 commits 6 branches 956 tags 492 MiB
Commit graph

696 commits

Author SHA1 Message Date
Jean-Noel Avila
3d5f390525 l10n: fr.po: v2.12.0 round 2 3139t 
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
 2017-02-18 00:12:26 +01:00
Jiang Xin
a4d94835af l10n: git.pot: v2.12.0 round 2 (2 new) 
Generate po/git.pot from v2.12.0-rc1 for git v2.12.0 l10n round 2.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

l10n-2.8.0-rnd3-fr

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

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

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

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

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

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

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

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

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
 2016-03-25 14:04:58 -01:00
Jiang Xin
103ee5c21e Merge branch 'master' of https://github.com/vnwildman/git 
* 'master' of https://github.com/vnwildman/git:
  l10n: vi.po (2530t): Update translation
 2016-03-23 23:01:51 +08:00
Jiang Xin
70749562fb Merge branch 'master' of git://github.com/alexhenrie/git-po 
* 'master' of git://github.com/alexhenrie/git-po:
  l10n: ca.po: update translation
 2016-03-23 22:48:14 +08:00
Vasco Almeida
b3076a0920 l10n: pt_PT: Update and add new translations 
Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
 2016-03-22 16:23:56 -01:00
Alex Henrie
4ee278bb34 l10n: ca.po: update translation 
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
 2016-03-21 23:04:22 -06:00
Tran Ngoc Quan
c2d674031f l10n: vi.po (2530t): Update translation 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2016-03-21 07:21:04 +07:00
Ray Chen
26e4cbec45 l10n: zh_CN: review for git v2.8.0 l10n round 2 
Signed-off-by: Ray Chen <oldsharp@gmail.com>
 2016-03-20 18:46:02 +08:00
Ralf Thielow
29a382db05 l10n: de.po: add missing newlines 
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2016-03-17 19:31:33 +01:00
Ralf Thielow
603b3ac355 l10n: de.po: translate 22 new messages 
Translate 22 new messages came from git.pot update in f1522b2
(l10n: git.pot: v2.8.0 round 2 (21 new, 1 removed)) and a5a4168
(l10n: git.pot: Add one new message for Git 2.8.0).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Matthias Rüster <matthias.ruester@gmail.com>
 2016-03-17 18:57:34 +01:00
Jiang Xin
dcb941ee47 Merge branch 'fr_v2.8.0_r3' of git://github.com/jnavila/git 
* 'fr_v2.8.0_r3' of git://github.com/jnavila/git:
  l10n: fr.po v2.8.0 round 3
 2016-03-17 00:11:54 +08:00
Jiang Xin
13857b23e2 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-03-17 00:11:13 +08:00
Jiang Xin
6821537c25 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 (2530t0f0u)
 2016-03-17 00:10:23 +08:00
Changwoo Ryu
0cb61997a4 l10n: ko.po: Update Korean translation 
Signed-off-by: Changwoo Ryu <cwryu@debian.org>
 2016-03-16 10:33:12 +09:00
Jean-Noel Avila
23508cbbc2 l10n: fr.po v2.8.0 round 3 
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
 2016-03-15 23:01:59 +01:00
Peter Krefting
aaa89ad442 l10n: sv.po: Update Swedish translation (2530t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2016-03-15 22:37:55 +01:00
Dimitriy Ryazantcev
da0e97de21 l10n: ru.po: update Russian translation 
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
 2016-03-15 20:55:36 +02:00
Jiang Xin
5c0c220c53 l10n: zh_CN: for git v2.8.0 l10n round 3 
Update 1 new translations (2530t0f0u) for git v2.8.0-rc2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2016-03-16 00:27:40 +08:00
Jiang Xin
a5a41683dc l10n: git.pot: Add one new message for Git 2.8.0 
Add one new message came from this commit:

* df22724 wt-status: allow "ahead " to be picked up by l10n

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2016-03-16 00:20:14 +08:00
Jiang Xin
3495628d4b l10n: zh_CN: for git v2.8.0 l10n round 2 
Update 21 new translations (2529t0f0u) for git v2.8.0-rc2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2016-03-16 00:07:06 +08:00
Jean-Noel Avila
7a2c7e58dc l10n: fr.po v2.8.0 round 2 
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
 2016-03-14 20:29:04 +01:00
Jiang Xin
a08823768e 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-03-13 21:41:46 +08:00
Dimitriy Ryazantcev
f3aeef1170 l10n: ru.po: update Russian translation 
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
 2016-03-13 02:07:09 +02:00
Changwoo Ryu
03ac0e5fff l10n: ko: Update Korean translation 
Signed-off-by: Changwoo Ryu <cwryu@debian.org>
 2016-03-13 02:32:52 +09:00
Jiang Xin
f1522b2770 l10n: git.pot: v2.8.0 round 2 (21 new, 1 removed) 
Generate po/git.pot from v2.8.0-rc2 for git v2.8.0 l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2016-03-12 22:05:35 +08:00
Jiang Xin
276ceeaa49 l10n: zh_CN: for git v2.8.0 l10n round 1 
Update 48 new translations (2509t0f0u) for git v2.8.0-rc0.

Reviewed-by: Ray Chen <oldsharp@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

l10n: zh_CN: review for git v2.8.0 l10n round 1
 2016-03-12 22:00:34 +08:00
Ralf Thielow
1d30f899e2 l10n: de.po: translate 48 new messages 
Translate 48 new messages came from git.pot update in
9eb3984 (l10n: git.pot: v2.8.0 round 1 (48 new, 16 removed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Matthias Rüster <matthias.ruester@gmail.com>
 2016-03-05 08:20:16 +01:00
Ralf Thielow
ae45b9aca8 l10n: de.po: translate "command" as "Befehl" 
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Phillip Sz <phillip.szelat@gmail.com>
 2016-03-05 08:20:16 +01:00
Ralf Thielow
28ab8b234e l10n: de.po: fix interactive rebase message 
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2016-03-05 08:20:15 +01:00
Ralf Thielow
384905ead7 l10n: de.po: add space to abbreviation "z. B." 
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Phillip Sz <phillip.szelat@gmail.com>
 2016-03-05 08:20:15 +01:00
Christoph Hoopmann
9410812bd6 l10n: de.po: fix typo 
Signed-off-by: Christoph Hoopmann <christophhoopmann@gmail.com>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2016-03-05 08:20:15 +01:00
Ralf Thielow
48f977ebb7 l10n: TEAMS: update Ralf Thielow's email address 
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2016-03-05 11:07:28 +08:00
Jiang Xin
7f941a0216 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 (2509t0f0u)
  l10n: sv.po: Fix inconsistent translation of "progress meter"
 2016-03-05 10:06:20 +08:00
Jiang Xin
269cbc6ee0 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-03-05 10:05:32 +08:00
Peter Krefting
7f278d8381 l10n: sv.po: Update Swedish translation (2509t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2016-03-04 15:22:46 +01:00
Peter Krefting
c674d82673 l10n: sv.po: Fix inconsistent translation of "progress meter" 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2016-03-04 15:06:59 +01:00
Changwoo Ryu
207294269b l10n: ko.po: Update Korean translation 
Signed-off-by: Changwoo Ryu <cwryu@debian.org>
 2016-03-03 13:14:52 +09:00
Dimitriy Ryazantcev
03eb39a61a l10n: ru.po: update Russian translation 
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
 2016-03-02 17:37:55 +02:00
Jiang Xin
75b01c2190 Merge branch 'master' of https://github.com/vnwildman/git 
* 'master' of https://github.com/vnwildman/git:
  l10n: vi.po (2509t): Updated Vietnamese translation
 2016-02-29 23:31:58 +08:00
Tran Ngoc Quan
0c966d8450 l10n: vi.po (2509t): Updated Vietnamese translation 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2016-02-29 07:47:45 +07:00
Jean-Noel Avila
3d8b14c2bc l10n: fr.po v2.8.0 round 1 2509t 
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
 2016-02-28 22:44:35 +01:00
Audric Schiltknecht
a56b3a9676 l10n: fr.po: Correct case in sentence 
Signed-off-by: Audric Schiltknecht <storm@chemicalstorm.org>
 2016-02-28 16:59:18 +01:00
Jiang Xin
9eb3984b81 l10n: git.pot: v2.8.0 round 1 (48 new, 16 removed) 
Generate po/git.pot from v2.8.0-rc0 for git v2.8.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2016-02-28 20:32:52 +08:00
Changwoo Ryu
c6cd26696c l10n: ko.po: Add Korean translation 
Signed-off-by: Changwoo Ryu <cwryu@debian.org>
Signed-off-by: Hyunjun Kim <yoloseem@users.noreply.github.com>
 2016-01-03 19:07:29 +09:00
Ralf Thielow
02103b3289 l10n: de.po: translate 68 new messages 
Translate 68 new messages came from git.pot update in
f4f2c8f (l10n: git.pot: v2.7.0 round 1 (66 new, 29 removed)) and
2c0ca05 (l10n: git.pot: v2.7.0 round 2 (2 new, 2 removed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Matthias Rüster <matthias.ruester@gmail.com>
 2015-12-29 19:53:17 +01:00
Ralf Thielow
503b1ef7b2 l10n: de.po: improve some translations 
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Phillip Sz <phillip.szelat@gmail.com>
 2015-12-29 19:53:17 +01:00
Dimitriy Ryazantcev
5fa9ab8080 l10n: ru.po: update Russian translation 
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
 2015-12-28 23:16:00 +08:00
Jiang Xin
9011cf9233 Merge branch 'master' of git://github.com/alshopov/git-po 
* 'master' of git://github.com/alshopov/git-po:
  l10n: Updated Bulgarian translation of git (2477t,0f,0u)
 2015-12-28 23:13:15 +08:00
Alexander Shopov
c5e5e68647 l10n: Updated Bulgarian translation of git (2477t,0f,0u) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2015-12-28 11:33:41 +02:00
Alex Henrie
62c9705d75 l10n: ca.po: update translation 
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
 2015-12-27 21:42:59 -07:00
Jiang Xin
89f80d72c1 l10n: zh_CN: for git v2.7.0 l10n round 2 
Update 2 translations (2477t0f0u) for git v2.7.0-rc1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2015-12-26 21:22:53 +08:00
Jiang Xin
707a423f81 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 (2477t0f0u)
  l10n: sv: Fix bad translation
 2015-12-26 21:22:30 +08:00
Peter Krefting
9ff1198e67 l10n: sv.po: Update Swedish translation (2477t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2015-12-26 12:27:15 +01:00
Peter Krefting
171e58a148 l10n: sv: Fix bad translation 
Found-by: Sebastian Rasmussen <sebras@gmail.com>
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2015-12-26 12:24:44 +01:00
Jean-Noel Avila
f938915aad l10n: fr.po v2.7.0 round 2 (2477t) 
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
 2015-12-24 07:38:22 +01:00
Jiang Xin
2c0ca0506e l10n: git.pot: v2.7.0 round 2 (2 new, 2 removed) 
Generate po/git.pot from v2.7.0-rc1-44-g1d88dab for git v2.7.0 l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2015-12-22 22:51:43 +08:00
Jiang Xin
94550ed38c l10n: zh_CN: for git v2.7.0 l10n round 1 
Update 66 translations (2477t0f0u) for git v2.7.0-rc0.

Reviewed-by: Ray Chen <oldsharp@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2015-12-20 19:33:14 +08:00
Jiang Xin
5b82d4ee29 Merge branch 'master' of git://github.com/alexhenrie/git-po 
* 'master' of git://github.com/alexhenrie/git-po:
  l10n: ca.po: update translation
 2015-12-20 19:32:26 +08:00
Jiang Xin
13691905d0 Merge branch 'fr_v2.7.0' of git://github.com/jnavila/git 
* 'fr_v2.7.0' of git://github.com/jnavila/git:
  l10n: fr v2.7.0 round 1 (2477t)
 2015-12-20 19:31:47 +08:00
Jiang Xin
e976d7af41 Merge branch 'master' of git://github.com/alshopov/git-po 
* 'master' of git://github.com/alshopov/git-po:
  l10n: Updated Bulgarian translation of git (2477t,0f,0u)
 2015-12-20 19:30:52 +08:00
Alex Henrie
0d8e36f314 l10n: ca.po: update translation 
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
 2015-12-18 23:38:23 -07:00
Jean-Noel Avila
ffd5159bcc l10n: fr v2.7.0 round 1 (2477t) 
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
 2015-12-18 22:00:37 +01:00
Alexander Shopov
aeef7d84f4 l10n: Updated Bulgarian translation of git (2477t,0f,0u) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2015-12-18 10:36:21 +02:00
Peter Krefting
fbc63eb656 l10n: sv.po: Update Swedish translation (2477t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2015-12-18 09:09:41 +01:00
Tran Ngoc Quan
843565a8ed l10n: vi.po: Updated translation (2477t) 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2015-12-12 14:34:08 +07:00
Jiang Xin
f4f2c8f87e l10n: git.pot: v2.7.0 round 1 (66 new, 29 removed) 
Generate po/git.pot from v2.7.0-rc0 for git v2.7.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2015-12-11 23:37:11 +08:00
Audric Schiltknecht
7f0871c954 l10n: fr.po: Fix typo 
Signed-off-by: Audric Schiltknecht <storm@chemicalstorm.org>
 2015-12-04 18:38:58 -05:00
Élie Bouttier
3b93d3f34b l10n: fr.po: Fix typo 
Signed-off-by: Élie Bouttier <elie@bouttier.eu>
 2015-11-04 16:57:00 +01:00
Dimitriy Ryazantcev
82aa9b751f l10n: ru.po: update Russian translation 
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
 2015-09-30 18:01:23 +03:00
Phillip Sz
18a21c1956 l10n: de.po: better language for one string 
Just one string I think we could translate better.

Signed-off-by: Phillip Sz <phillip.szelat@gmail.com>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2015-09-20 18:49:09 +02:00
Ralf Thielow
2e0f3663f5 l10n: de.po: translate 2 messages 
Translate 2 messages came from git.pot update in e447091
(l10n: git.pot: v2.6.0 round 2 (3 improvements)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Phillip Sz <phillip.szelat@gmail.com>
 2015-09-20 18:49:09 +02:00
Tran Ngoc Quan
5fc31c1f81 l10n: Update and review Vietnamese translation (2440t) 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2015-09-21 00:44:47 +08:00
Jean-Noel Avila
84486b1ebe l10n: fr.po v2.6.0 round 2 (2440t) 
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
 2015-09-21 00:44:47 +08:00
Jiang Xin
03ea3327da l10n: zh_CN: for git v2.6.0 l10n round 2 
Update 2 translations (2440t0f0u) for git v2.6.0-rc2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2015-09-21 00:44:47 +08:00
Alex Henrie
3ffa1ab2c8 l10n: ca.po: update translation 
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
 2015-09-21 00:44:47 +08:00
Jiang Xin
80d1b4817a l10n: git.pot: v2.6.0 round 2 (3 improvements) 
Introduce three i18n improvements from the following commits:

* tag, update-ref: improve description of option "create-reflog"
* pull: don't mark values for option "rebase" for translation
* show-ref: place angle brackets around variables in usage string

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2015-09-21 00:44:46 +08:00
Ralf Thielow
e6e86ed4c4 l10n: de.po: translate 123 new messages 
Translate 123 new messages came from git.pot update in df0617b
(l10n: git.pot: v2.6.0 round 1 (123 new, 41 removed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Phillip Sz <phillip.szelat@gmail.com>
Acked-by: Matthias Rüster <matthias.ruester@gmail.com>
 2015-09-21 00:35:49 +08:00
Jean-Noel Avila
7a43c952de l10n: fr.po v2.6.0 round 1 (2441t) 
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
 2015-09-21 00:35:42 +08:00
Jiang Xin
61d93a2aab Merge branch 'master' of github.com:jiangxin/git 
* 'master' of github.com:jiangxin/git:
  l10n: zh_CN: for git v2.6.0 l10n round 1
  l10n: zh_CN: Update Git Glossary: "commit message"
  l10n: zh_CN: Update Git Glossary: pickaxe
  l10n: zh_CN: Update Git Glossary: fork
  l10n: zh_CN: Update Git Glossary: tag
  l10n: zh_CN: Update Git Glossary: "dumb", "smart"
  l10n: zh_CN: Update Git Glossary: SHA-1
  l10n: zh_CN: Add Surrounding Spaces
  l10n: zh_CN: Add translations for Git glossary
  l10n: TEAMS: stash inactive zh_CN team members
  l10n: zh_CN: Update Translation of "tag"
  l10n: zh_CN: Unify Translation of "packfile"
  l10n: zh_CN: Update Translation: "tag object"
 2015-09-10 23:14:16 +08:00
Peter Krefting
d8455d17af l10n: sv.po: Update Swedish translation (2441t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2015-09-09 21:47:09 +01:00
Jiang Xin
1b7f4a3454 l10n: zh_CN: for git v2.6.0 l10n round 1 
Update 123 translations (2441t0f0u) for git v2.6.0-rc0.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Reviewed-by: Ray Chen <oldsharp@gmail.com>
 2015-09-08 23:07:20 +08:00
Tran Ngoc Quan
f29938849a l10n: Updated Vietnamese translation (2441t) 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2015-09-07 08:54:05 +07:00
Jiang Xin
9049ba7c0f Merge branch 'master' of github.com:jiangxin/git into master 
* 'master' of github.com:jiangxin/git:
  l10n: zh_CN: Update Git Glossary: "commit message"
  l10n: zh_CN: Update Git Glossary: pickaxe
  l10n: zh_CN: Update Git Glossary: fork
  l10n: zh_CN: Update Git Glossary: tag
  l10n: zh_CN: Update Git Glossary: "dumb", "smart"
  l10n: zh_CN: Update Git Glossary: SHA-1
  l10n: zh_CN: Add Surrounding Spaces
  l10n: zh_CN: Add translations for Git glossary
  l10n: TEAMS: stash inactive zh_CN team members
  l10n: zh_CN: Update Translation of "tag"
  l10n: zh_CN: Unify Translation of "packfile"
  l10n: zh_CN: Update Translation: "tag object"

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2015-09-05 09:26:26 +08:00
Jiang Xin
df0617bfa7 l10n: git.pot: v2.6.0 round 1 (123 new, 41 removed) 
Generate po/git.pot from v2.6.0-rc0-24-gec371ff for git v2.6.0 l10n
round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2015-09-05 09:21:10 +08:00
Ray Chen
667599e825 l10n: zh_CN: Update Git Glossary: "commit message" 
Add "commit message" to glossary.  Translate it as "提交信息".

Signed-off-by: Ray Chen <oldsharp@gmail.com>
 2015-08-25 09:47:50 +08:00
Ray Chen
12e59059ee l10n: zh_CN: Update Git Glossary: pickaxe 
Translate the term "pickaxe" as "挖掘".

Initially proposed by @louy2 .

Signed-off-by: Ray Chen <oldsharp@gmail.com>
 2015-08-23 15:12:22 +08:00
Ray Chen
e397e7e353 l10n: zh_CN: Update Git Glossary: fork 
Remove "复刻" from translation option list of "fork", keeping "派生"
as the only one.

In Git context, by talking about the term "fork", one usually mean the
procedure that divides a branch into two or more history lines.  That
is quite like the "fork" concept in programming, which split a process
into two or more independent processes.

On the other hand, "复刻" by itself means "copy" or "mirror".  It is
considered more suitable for describing the procedure like
"fork a repository", which is common on public repository hosting
services, such as GitHub.  However, this is beyond the scope of
core-Git.  As a l10n work for core-Git, "复刻" should be removed here.

There used to be another option - "分岔".  Its a good idea to
translate "fork point" as "分岔点".  However, "派生点" is as good,
too.  So this option is finally discarded.

Also fix a relevant translation issue which was introduced in
`160fb2b`.

Signed-off-by: Ray Chen <oldsharp@gmail.com>
 2015-08-23 15:12:22 +08:00
Ray Chen
933c015e37 l10n: zh_CN: Update Git Glossary: tag 
Add verb form translation of tag.

Signed-off-by: Ray Chen <oldsharp@gmail.com>
 2015-08-23 15:12:22 +08:00
Ray Chen
755c831b9f l10n: zh_CN: Update Git Glossary: "dumb", "smart" 
"dumb/smart HTTP protocol" are normally considered as phrases.
Add "protocol" as a suffix after them makes more sense.

Signed-off-by: Ray Chen <oldsharp@gmail.com>
 2015-08-23 15:12:22 +08:00
Ray Chen
ee7589bb22 l10n: zh_CN: Update Git Glossary: SHA-1 
It's quite common to see the term "SHA-1" remain untranslated in many
l10n works. So update the "SHA-1" entry in Git glossary to match this
behavior.

Signed-off-by: Ray Chen <oldsharp@gmail.com>
 2015-08-23 15:11:57 +08:00
Philip Oakley
a6926b837e po/README: Update directions for l10n contributors 
Some Linux distributions (such as Ubuntu) have their own l10n workflows,
and their translations may be different.  Add notes for this case for
l10n translators.

Signed-off-by: Philip Oakley <philipoakley@iee.org>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-08-17 12:12:26 -07:00
Ray Chen
4375c10e28 l10n: zh_CN: Add Surrounding Spaces 
Some English words inside the Chinese sentences appear without
surrounding spaces, which are considered irregular.

This commit try to fix this issue, with the help of some regular
express patterns.

Signed-off-by: Ray Chen <oldsharp@gmail.com>
 2015-08-10 18:15:46 +08:00
Jiang Xin
160fb2b28b l10n: zh_CN: Add translations for Git glossary 
Add translations of Git glossary (most of them are from the command `git
help glossary`) in the header of `zh_CN.po`.  Also fixes some translations
according to this glossary, such as "pathspec", "repository", "refspec".

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Ray Chen <oldsharp@gmail.com>
 2015-08-07 17:59:31 +08:00
Jiang Xin
bbdf0acc7d l10n: TEAMS: stash inactive zh_CN team members 
Add Ray Chen as member of zh_CN l10n team member, and move other
inactive zh_CN l10n team members to the header of zh_CN.po.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2015-08-04 00:43:08 +08:00
Ray Chen
55a16ee487 l10n: zh_CN: Update Translation of "tag" 
- "tag" translated as "标签".
- "annotated tag" translated as "附注标签".
- "mergetag" translated as "合并标签".
- "tag name" translated as "标签名称".
- Relevant adjustments.

Signed-off-by: Ray Chen <oldsharp@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2015-07-30 23:42:27 +08:00
Ray Chen
dbd6cced19 l10n: zh_CN: Unify Translation of "packfile" 
Signed-off-by: Ray Chen <oldsharp@gmail.com>
 2015-07-28 13:26:41 +08:00
Ray Chen
53438e8fe2 l10n: zh_CN: Update Translation: "tag object" 
* "tag object" translated as "标签对象".
* "objects to be packed" translated as "待打包对象".
* Add "那些", for better reading experience.

Signed-off-by: Ray Chen <oldsharp@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2015-07-27 23:39:37 +08:00
Alex Henrie
cdab3cacf6 l10n: ca.po: update translation 
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
 2015-07-20 11:54:40 -06:00
Jiang Xin
01d597feec Merge branch 'master' of https://github.com/ralfth/git-po-de 
* 'master' of https://github.com/ralfth/git-po-de:
  l10n: de.po: translate 9 new messages
 2015-07-16 07:44:43 +08:00
Ralf Thielow
f1e80c0829 l10n: de.po: translate 9 new messages 
Translate 9 new messages came from git.pot update in a4156d2
(l10n: git.pot: v2.5.0 round 2 (9 new, 5 removed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Phillip Sz <phillip.szelat@gmail.com>
 2015-07-15 20:30:52 +02:00
Alexander Shopov
619b8f8636 l10n: Updated Bulgarian translation of git (2359t,0f,0u) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2015-07-15 20:34:23 +03:00
Jiang Xin
5bb01d4f02 l10n: zh_CN: for git v2.5.0 l10n round 2 
Update 9 translations (2359t0f0u) for git v2.5.0-rc2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2015-07-15 23:21:08 +08:00
Peter Krefting
e557179a63 l10n: sv.po: Update Swedish translation (2359t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2015-07-15 12:54:11 +01:00
Jiang Xin
297230d490 Merge branch 'fr_v2.5.0-round2' of git://github.com/jnavila/git 
* 'fr_v2.5.0-round2' of git://github.com/jnavila/git:
  l10n: fr v2.5.0 round 2 (2359t)
 2015-07-15 07:06:49 +08:00
Jean-Noel Avila
be67fb4fc9 l10n: fr v2.5.0 round 2 (2359t) 
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
 2015-07-14 23:03:24 +02:00
Jiang Xin
9ce8613349 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
 2015-07-14 22:30:12 +08:00
Dimitriy Ryazantcev
a3e55f72ba l10n: ru.po: update Russian translation 
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
 2015-07-14 16:34:00 +03:00
Tran Ngoc Quan
21f637378d l10n: Updated Vietnamese translation (2359t) 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2015-07-14 07:30:51 +07:00
Jiang Xin
a4156d2034 l10n: git.pot: v2.5.0 round 2 (9 new, 5 removed) 
Generate po/git.pot from v2.5.0-rc2 for git v2.5.0 l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2015-07-14 07:20:08 +08:00
Ralf Thielow
262ea4a6c0 l10n: de.po: translate 65 new messages 
Translate 65 new messages came from git.pot update in
64f23b0 (l10n: git.pot: v2.5.0 round 1 (65 new, 15 removed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2015-07-08 19:50:38 +02:00
Ralf Thielow
43d2401456 l10n: de.po: translate "index" as "Index" 
The term "index" is translated as "Staging-Area" to
match a majority of German books and to not confuse
Git beginners who don't know about Git's index.

"Staging Area" is used in German books as a thing where
content can be staged for commit.  While the translation
is good for those kind of messages, it's bad for messages
that mean the Git index as the tree state or the index
file, in which case we should translate as "Index".

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2015-07-08 19:38:42 +02:00
Ralf Thielow
121f7b0509 l10n: de.po: fix translation of "head nodes" 
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Phillip Sz <phillip.szelat@gmail.com>
 2015-07-08 19:38:42 +02:00
Jiang Xin
7aea43ff4e l10n: zh_CN: for git v2.5.0 l10n round 1 
Update 65 translations (2355t0f0u) for git v2.5.0-rc0.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2015-07-05 23:13:37 +08:00
Alex Henrie
7363e66904 l10n: ca.po: update translation 
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
 2015-07-01 22:22:02 -06:00
Jiang Xin
1976f9b527 Merge branch 'fr_2.5.0_round1' of git://github.com/jnavila/git 
* 'fr_2.5.0_round1' of git://github.com/jnavila/git:
  l10n: fr.po v2.5.0-rc0 (2355t)
 2015-07-02 07:01:51 +08:00
Jean-Noel Avila
7b0580583a l10n: fr.po v2.5.0-rc0 (2355t) 
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
Signed-off-by: Claude Dioudonnat <cdioudonnat@itnetwork.fr>
 2015-06-30 21:35:11 +02:00
Jiang Xin
cda2ef6470 Merge branch 'master' of git://github.com/alshopov/git-po 
* 'master' of git://github.com/alshopov/git-po:
  l10n: Updated Bulgarian translation of git (2355t,0f,0u)
 2015-06-29 06:41:44 +08:00