development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-11-05 18:59:29 +00:00
Code Issues Projects Releases Packages Wiki Activity
44487 commits 6 branches 956 tags 491 MiB
Commit graph

507 commits

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