development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-13 13:24:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
42320 commits 6 branches 951 tags 512 MiB
Commit graph

451 commits

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