mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-20 23:58:49 +02:00
Code
49,877 Commits 6 Branches 956 Tags 349 MiB
77482d05d4
Commit Graph

666 Commits

Author SHA1 Message Date
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
Alexander Shopov
e1f7037167 l10n: Updated Bulgarian translation of git (2355t,0f,0u) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2015-06-28 22:50:10 +03:00
Peter Krefting
a7ec9810be l10n: sv.po: Update Swedish translation (2355t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2015-06-28 18:50:20 +01:00
Tran Ngoc Quan
bd8202f3ac l10n: Updated Vietnamese translation (2355t) 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2015-06-28 14:46:18 +07:00
Jiang Xin
64f23b0c20 l10n: git.pot: v2.5.0 round 1 (65 new, 15 removed) 
Generate po/git.pot from v2.5.0-rc0 for git v2.5.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2015-06-27 19:18:04 +08:00
Michael J Gruber
a9845c5f50 l10n: de.po: translation fix for fall-back to 3way merge 
The English version is correct, but misleading: It is not the 3way merge
that is being patched also, but that is being fallen back to also.

The German version translates the former meaning. Make it translate the
latter.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2015-06-12 20:40:04 +02:00
Michael J Gruber
47a1657ab9 l10n: de.po: punctuation fixes 
This respects the ellipsis style used in de.po.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2015-06-12 20:40:04 +02:00
Michael J Gruber
872b1f26b8 l10n: de.po: grammar fix 
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2015-06-12 20:40:04 +02:00
Phillip Sz
39f9819931 l10n: de.po: change error message from "sagen" to "Meinten Sie" 
We should not use "sagen" if someone has written something wrong.
Although it's "say" in English, we should not use it in German
and instead use our normal error message.

Signed-off-by: Phillip Sz <phillip.szelat@gmail.com>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2015-06-12 20:39:42 +02:00
Jiang Xin
44cc742a8c
Merge branch 'master' of git://github.com/alexhenrie/git-po 
* 'master' of git://github.com/alexhenrie/git-po:
  l10n: ca.po: update translation
 2015-04-09 08:21:39 +08:00
Jiang Xin
689664ae94 l10n: TEAMS: Change repository URL of zh_CN 
Repository URL of zh_CN l10n for Git has been changed over 2 years,
update po/TEAMS for it.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2015-04-09 08:20:32 +08:00
Alex Henrie
c888305e1e l10n: ca.po: update translation 
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
 2015-04-07 18:07:47 -06:00
Alexander Shopov
f88c11346c l10n: Updated Bulgarian translation of git (2305t,0f,0u) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2015-04-07 11:23:18 +03:00
Peter Krefting
9386878f69 l10n: sv.po: Update Swedish translation (2305t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2015-04-07 08:45:20 +01:00
Ralf Thielow
ddc7d46d9e l10n: de.po: translate one message 
Translate one message came from git.pot update in 6eebb35
(l10n: git.pot: v2.4.0 round 2 (1 update)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2015-04-05 19:10:29 +02:00
Jean-Noel Avila
fa54b52432 l10n: fr.po v2.4.0 round 2 
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
 2015-04-04 18:04:56 +02:00
Dimitriy Ryazantcev
9af95af05f l10n: ru: updated Russian translation 
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
 2015-04-03 16:30:14 +03:00
Tran Ngoc Quan
a4acd09bd9 l10n: vi.po(2305t): Updated 1 new string 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2015-04-03 08:55:06 +07:00
Jiang Xin
44f518e68e l10n: zh_CN: for git v2.4.0 l10n round 2 
Translate 1 update message (2305t0f0u) for git v2.4.0 l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2015-04-03 08:39:57 +08:00
Jiang Xin
6eebb35ec0 l10n: git.pot: v2.4.0 round 2 (1 update) 
Generate po/git.pot from v2.4.0-rc1 for git v2.4.0 l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2015-04-03 08:16:53 +08:00
Matthias Rüster
918de7523d l10n: de.po: translate 'symbolic link' as 'symbolische Verknüpfung' 
The use of 'symbolische Verknüpfung' for 'symbolic link' is more common
than 'symbolischer Verweis'.

Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2015-04-02 18:35:33 +02:00
Ralf Thielow
668fa6c951 l10n: de.po: translate 99 new messages 
Translate 99 messages came from git.pot update in c2ea120
(l10n: git.pot: v2.4.0 round 1 (99 new, 92 removed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2015-04-02 18:35:28 +02:00
Ralf Thielow
1c8f034ddb l10n: de.po: fix messages with abbreviated hashs 
The three dots in messages where the hash is abbreviated
were misinterpreted and are fixed with this commit.

Noticed-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2015-04-02 18:29:03 +02:00
Phillip Sz
c9f0dbf143 l10n: de.po: add space before ellipsis 
Signed-off-by: Phillip Sz <phillip.szelat@gmail.com>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2015-04-02 18:29:03 +02:00
Tran Ngoc Quan
02507f42a0 l10n: vi.po: Updated Vietnamese translation 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2015-03-31 09:48:38 +08:00
Jiang Xin
814ff3141e l10n: zh_CN: translations for git v2.4.0-rc0 
Translate 99 updated messages (2305t0f0u) for git v2.4.0-rc0.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2015-03-31 09:43:58 +08:00
Jiang Xin
d0cec149b2 Merge branch 'fr-v2.4.0-rc0' of git://github.com/jnavila/git 
* 'fr-v2.4.0-rc0' of git://github.com/jnavila/git:
  l10n: fr.po v2.4.0-rc0 round 1
 2015-03-31 09:38:47 +08:00
Jean-Noel Avila
7298ca7b2e l10n: fr.po v2.4.0-rc0 round 1 
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
 2015-03-30 10:54:05 +02:00
Alex Henrie
d03ead9836 l10n: ca.po: update translation 
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
 2015-03-28 15:07:36 -06:00
Dimitriy Ryazantcev
76f92c1684 l10n: ru: updated Russian translation 
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
 2015-03-27 12:54:35 +02:00
Peter Krefting
dc76d8fec9 l10n: sv.po: Update Swedish translation (2305t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2015-03-27 09:57:48 +01:00
Jiang Xin
c12468b71c Merge branch 'maint' 
* maint:
  l10n: de.po: fix negation for commit -a with paths
 2015-03-27 14:02:01 +08:00
Jiang Xin
c2ea120885 l10n: git.pot: v2.4.0 round 1 (99 new, 92 removed) 
Generate po/git.pot from v2.4.0-rc0 for git v2.4.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2015-03-27 13:35:23 +08:00
Dimitriy Ryazantcev
f088104490 l10n: ru: added Russian translation 
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
 2015-03-23 13:24:17 +02:00
Michael J Gruber
d0017928cb l10n: de.po: fix negation for commit -a with paths 
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2015-02-27 18:30:45 +01:00
Alex Henrie
7471cf88f5 l10n: ca.po: Fix trailing whitespace 
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
 2015-01-30 15:02:34 -07:00
Jiang Xin
b4fde1e37d Merge branch 'master' of git://github.com/alexhenrie/git-po 
* 'master' of git://github.com/alexhenrie/git-po:
  l10n: ca.po: update translation
 2015-01-27 15:00:48 +08:00
Michael J Gruber
07586ebd4f l10n: de.po: correct singular form 
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2015-01-26 19:36:04 +01:00
Michael J Gruber
2f334c6461 l10n: de.po: translate "leave behind" correctly 
This message is about leaving orphaned commits behind, not about
behind an upstream branch. Try to make this clear.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2015-01-26 19:36:04 +01:00
Benedikt Heine
3b36ef9188 l10n: de.po: fix typo 
Signed-off-by: Benedikt Heine <bebe@bebehei.de>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2015-01-26 19:36:04 +01:00
Alex Henrie
573ed5e147 l10n: ca.po: update translation 
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
 2015-01-26 10:12:50 -07:00
Jiang Xin
1e60744913 l10n: correct indentation of show-branch usage 
An indentation error was found right after we started l10n round 2, and
commit d6589d1 (show-branch: fix indentation of usage string) and this
update would fix it.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2015-01-21 15:35:37 +08:00
Ralf Thielow
a235de4bd2 l10n: de.po: translate 3 messages 
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2015-01-20 19:23:57 +01:00
Jiang Xin
d9d56b2357 l10n: zh_CN: various fixes on command arguments 
Updated translations for Git 2.3.0 l10n round 2, and fixed various
translations for command arguments.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2015-01-19 10:23:53 +08:00
Jiang Xin
07361f12ab Merge branch 'v2.3.0' of git://github.com/jnavila/git 
* 'v2.3.0' of git://github.com/jnavila/git:
  l10n: fr.po v2.3.0 round 2
 2015-01-19 10:12:46 +08:00
Jiang Xin
482f68e741 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 (2298t0f0u)
 2015-01-19 10:10:57 +08:00
Tran Ngoc Quan
d1f9c7b77e l10n: vi.po(2298t): Updated 3 new strings 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2015-01-19 07:20:28 +07:00
Peter Krefting
0ef279509b l10n: sv.po: Update Swedish translation (2298t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2015-01-18 20:30:18 +01:00
Jean-Noel Avila
bf41b712c7 l10n: fr.po v2.3.0 round 2 
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
 2015-01-18 17:03:27 +01:00
Jiang Xin
105979f71c l10n: git.pot: v2.3.0 round 2 (3 updated) 
Generate po/git.pot from v2.3.0-rc0-44-ga94655d for git v2.3.0 l10n
round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2015-01-18 11:26:57 +08:00
Ralf Thielow
124d80928d l10n: de.po: translate 13 new messages 
Translate 13 new messages came from git.pot update in
beb691f (l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2015-01-17 18:10:46 +01:00
Ralf Thielow
e1a05ad851 l10n: de.po: fix typo 
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2015-01-17 18:10:02 +01:00
Ralf Thielow
463243d49c l10n: de.po: translate "track" as "versionieren" 
Suggested-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2015-01-17 18:09:56 +01:00
Jiang Xin
04cb2f28cc l10n: zh_CN: translations for git v2.3.0-rc0 
Translate 13 new messages (2298t0f0u) for git v2.3.0-rc0.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2015-01-17 15:28:36 +08:00
Peter Krefting
2a26377047 l10n: sv.po: Update Swedish translation (2298t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2015-01-14 22:55:49 +01:00
Jean-Noel Avila
9905988a57 l10n: fr.po v2.3.0 round 1 
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
 2015-01-13 20:23:41 +01:00
Tran Ngoc Quan
fbf5d8c3d0 l10n: vi.po(2298t): Updated and change Plural-Forms 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2015-01-13 14:23:12 +07:00
Jiang Xin
beb691f770 l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed) 
Generate po/git.pot from v2.3.0-rc0 for git v2.3.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2015-01-13 14:05:57 +08:00
Joan Perals
47103bd6b3 l10n: ca.po: various fixes 
Signed-off-by: Joan Perals Tresserra <j.pertres@gmail.com>
 2014-12-23 21:22:04 -07:00
Hartmut Henkel
ae1dcc52c1 l10n: de.po: fix typos 
Signed-off-by: Hartmut Henkel <hartmut_henkel@gmx.de>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2014-11-28 19:08:50 +01:00
Jiang Xin
7ba2ba7d12 l10n: remove a superfluous translation for push.c 
Ralf reported that '--recurse-submodules' option in push.c should not be
translated [1].  Before his commit is merged, remove superfluous
translations for push.c.

[1] http://www.spinics.net/lists/git/msg241964.html

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2014-11-20 16:23:43 +08:00
Ralf Thielow
e6c1c391a8 l10n: de.po: translate 2 messages 
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2014-11-20 07:16:18 +01:00
Ralf Thielow
388a439ca9 l10n: de.po: translate 2 new messages 
Signed-off-by: Phillip Sz <phillip.szelat@gmail.com>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2014-11-20 07:16:18 +01:00
Jiang Xin
9aeb4c2b57 l10n: batch updates for one trivial change 
In order to catch up with the release of Git 2.2.0 final, make a batch
l10n update for the new l10n change brought by commit d52adf1 (trailer:
display a trailer without its trailing newline).

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2014-11-20 10:53:48 +08:00
Jiang Xin
e3f9cab742 l10n: git.pot: v2.2.0 round 2 (1 updated) 
Generate po/git.pot from v2.2.0-rc2-23-gca0107e for git v2.2.0 l10n
round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2014-11-20 10:03:10 +08:00
Alex Henrie
b3e4c47565 l10n: Update Catalan translation 
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
 2014-11-17 20:22:48 -07:00
Ralf Thielow
d544b2d495 l10n: de.po: translate 62 new messages 
Translate 62 new messages came from git.pot update in 16742b0
(l10n: git.pot: proposed updates for v2.2.0 (+62)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2014-11-15 18:22:05 +01:00
Stefan Beller
744437f8e6 l10n: de.po: Fixup one translation 
English grammar with German words doesn't make it a German translation. ;)

Signed-off-by: Stefan Beller <stefanbeller@gmail.com>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2014-11-15 18:21:58 +01:00
Ralf Thielow
c616d845b5 l10n: de.po: use imperative form for command options 
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2014-11-14 19:21:52 +01:00
Alexander Shopov
6c31a5e94a l10n: Updated Bulgarian translation of git (2296t,0f,0u) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2014-11-02 19:11:08 +02:00
Jiang Xin
220c313cc3 l10n: zh_CN: translations for git v2.2.0-rc0 
Translate 62 new messages (2296t0f0u) for git v2.2.0-rc0.  Also changed
the translation of bare (repository).

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2014-11-02 10:59:00 +08:00
Jiang Xin
94dd79e9fe Merge branch 'fr_2.2.0' of git://github.com/jnavila/git 
* 'fr_2.2.0' of git://github.com/jnavila/git:
  l10n: fr.po (2296t) update for version 2.2.0
 2014-11-02 10:12:29 +08:00
Jiang Xin
ac4a73dd25 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 (2296t0f0u)
 2014-11-02 10:11:27 +08:00
Peter Krefting
5331bfd785 l10n: sv.po: Update Swedish translation (2296t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2014-11-01 20:17:37 +01:00
Jean-Noel Avila
f507e5dd62 l10n: fr.po (2296t) update for version 2.2.0 
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
Signed-off-by: Grégoire Paris <gparis@universcine.com>
 2014-11-01 16:51:49 +01:00
Tran Ngoc Quan
4dcd03eaee l10n: vi.po: Update new message strings 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2014-11-01 09:07:24 +07:00
Jiang Xin
d07a63e47c l10n: git.pot: v2.2.0 round 1 (62 new, 23 removed) 
Generate po/git.pot from v2.2.0-rc0 for git v2.2.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2014-11-01 07:47:46 +08:00
Phillip Sz
061540fcf7 l10n: de.po: use comma before "um" 
This patch adds a comma before the "um". See:
http://www.duden.de/sprachwissen/rechtschreibregeln/komma#K117

Signed-off-by: Phillip Sz <phillip.szelat@gmail.com>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2014-09-25 20:26:27 +02:00
Phillip Sz
f51ccda810 l10n: de.po: change Email to E-Mail 
Change all Email to E-Mail, as this is the correct form in German.

Signed-off-by: Phillip Sz <phillip.szelat@gmail.com>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2014-09-25 20:25:55 +02:00
Ralf Thielow
89a0ead829 po/TEAMS: add new member to German translation team 
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2014-09-25 20:25:30 +02:00
Ralf Thielow
782ac539ea po/TEAMS: add new members to German translation team 
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2014-08-29 07:08:17 +02:00
Ralf Thielow
d35ea4dec6 l10n: de.po: translate 38 new messages 
Translate 38 new messages came from git.pot update in fe05e19
(l10n: git.pot: v2.1.0 round 1 (38 new, 9 removed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2014-08-29 07:07:59 +02:00
Ralf Thielow
869951babc l10n: de.po: improve message when switching branches 
Suggested-by: Stefan Beller <stefanbeller@gmail.com>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2014-08-23 19:17:38 +02:00
Ralf Thielow
795b9ff872 l10n: de.po: fix typo 
Reported-by: Hartmut Henkel
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2014-08-23 19:17:38 +02:00
Alex Henrie
47abf17be5 po/TEAMS: Add Catalan team 
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
 2014-08-22 20:10:30 -06:00
Alex Henrie
0082d82183 l10n: Add Catalan translation 
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
 2014-08-22 20:10:22 -06:00
Jean-Noel Avila
f7fbc357f8 l10n: fr.po (2257t) update for version 2.1.0 
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
 2014-08-07 09:07:18 +02:00
Jiang Xin
b9e343e640 Merge remote-tracking branch 'l10n/vi/vnwildman/master' 
* l10n/vi/vnwildman/master:
  l10n: vi.po (2257t): Update translation
 2014-08-05 23:07:22 +08:00
Jiang Xin
4b71297969 Merge branch 'master' of github.com:alshopov/git-po 
* 'master' of github.com:alshopov/git-po:
  l10n: Updated Bulgarian translation of git (2257t,0f,0u)
 2014-08-05 22:41:00 +08:00
Peter Krefting
dc4a1ba99c l10n: sv.po: Update Swedish translation (2257t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2014-08-05 13:49:51 +01:00
Tran Ngoc Quan
8d388239fd l10n: vi.po (2257t): Update translation 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2014-08-05 07:35:56 +07:00
Alexander Shopov
aafbee8c4b l10n: Updated Bulgarian translation of git (2257t,0f,0u) 
Sync with tags v2.1.0-rc1 and v2.0.4

Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2014-08-04 21:30:38 +03:00
Jiang Xin
6acbf03300 l10n: zh_CN: translations for git v2.1.0-rc0 
Translate 37 new messages (2257t0f0u) for git v2.1.0-rc0.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2014-08-04 16:42:40 +08:00
Jiang Xin
afc344c4ad Merge commit 'bg/alshopov/master' 
* commit 'bg/alshopov/master':
  l10n: Updated Bulgarian translation of git (2247t,0f,0u)
  l10n: Updated Bulgarian translation of git (2228t,0f,0u)
 2014-08-04 16:38:00 +08:00
Jiang Xin
6d0081ad61 Merge remote-tracking branch 'sv/nafmo/master' 
* sv/nafmo/master:
  l10n: Fix more typos in the Swedish translations
 2014-08-04 16:33:18 +08:00
Jiang Xin
fe05e196c5 l10n: git.pot: v2.1.0 round 1 (38 new, 9 removed) 
Generate po/git.pot from v2.1.0-rc0 for git v2.1.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2014-08-04 14:51:24 +08:00
Alexander Shopov
c099f8c7ed l10n: Updated Bulgarian translation of git (2247t,0f,0u) 
Used make po/git.pot from git-l10n/git-po/master

Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2014-08-03 13:14:03 +03:00
Alexander Shopov
642c7fab1d l10n: Updated Bulgarian translation of git (2228t,0f,0u) 
Used po/git.pot from git-l10n/git-po/master

Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2014-08-03 13:11:46 +03:00
Peter Krefting
7cefd3431a l10n: Fix more typos in the Swedish translations 
Thanks-to: Anders Jonsson <anders.jonsson@norsjovallen.se>
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2014-06-24 19:52:47 +01:00
Grégoire Paris
a6e888397c fr: a lot of good fixups 
Signed-off-by: Grégoire Paris <postmaster@greg0ire.fr>
Acked-by: Jean-Noel Avila <jn.avila@free.fr>
 2014-05-17 19:08:59 +02:00
Alexander Shopov
1c3c8410ef l10n: Updated Bulgarian translation of git (1307t0f921u) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2014-05-11 17:09:01 +03:00
Peter Krefting
80dad719fb l10n: Fix a couple of typos in the Swedish translation 
Thanks-to: Anders Jonsson <anders.jonsson@norsjovallen.se>
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2014-05-07 07:06:37 +01:00
Ralf Thielow
94f94fcbf2 l10n: de.po: improve hint for autocorrected command execution 
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2014-04-29 06:12:31 +02:00
Ralf Thielow
74c17bb84b l10n: de.po: translate 45 new messages 
Translate 45 new messages came from git.pot update in 5e078fc
(l10n: git.pot: v2.0.0 round 1 (45 new, 28 removed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Thomas Rast <tr@thomasrast.ch>
 2014-04-29 06:12:25 +02:00
Ralf Thielow
3957310734 l10n: de.po: correct translation of "completed" after resolving deltas 
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2014-04-29 06:11:09 +02:00
Jiang Xin
6c94aba5fa l10n: zh_CN.po: translate 46 new messages (2229t0f0u) 
Translations for git v2.0.0-rc0.  Also correct translatioins on relative
date in date.c with help from Brian Gesiak ($gmane/246390).

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2014-04-23 13:00:08 +08:00
Jiang Xin
937ca16645 Merge branch 'fr-po' of git://github.com/jnavila/git 
* 'fr-po' of git://github.com/jnavila/git:
  l10n: fr translation for v2.0.0rc0 (2228t)
 2014-04-23 12:33:47 +08:00
Jean-Noel Avila
2233806207 l10n: fr translation for v2.0.0rc0 (2228t) 
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
Signed-off-by: Matthieu Baerts <matttbe@gmail.com>
Signed-off-by: Xavier Mehrenberger <xavier.mehrenberger@gmail.com>
 2014-04-22 21:41:16 +02:00
Peter Krefting
d372b5cf6e l10n: Update Swedish translation (2228t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2014-04-22 10:26:02 +01:00
Tran Ngoc Quan
15fbbed790 l10n: vi.po (2228t): Update and minor fix 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2014-04-20 15:22:26 +07:00
Jiang Xin
5e078fcd83 l10n: git.pot: v2.0.0 round 1 (45 new, 28 removed) 
Generate po/git.pot from v2.0.0-rc0 for git v2.0.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2014-04-19 12:55:29 +08:00
Sandy Carter
16216b6ab1 i18n: proposed command missing leading dash 
Add missing leading dash to proposed commands in french output when
using the command:
    git branch --set-upstream remotename/branchname
and when upstream is gone

Signed-off-by: Sandy Carter <sandy.carter@savoirfairelinux.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-03-05 22:10:24 +08:00
Ralf Thielow
92cd3e35a0 l10n: de.po: correct message when hiding commits by craft 
The recent translation was giving the idea that all commits
based on a graft were meant to be hidden. Make it clear that
it is the graft commit itself.

Reported-by: David Kastrup <dak@gnu.org>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2014-02-12 07:16:03 +01:00
Ralf Thielow
0dd2a2c9b4 l10n: de.po: translate 28 new messages 
Translate 28 new messages came from git.pot update in
df49095 (l10n: git.pot: v1.9 round 1 (27 new, 11 removed)
and d57b24b (l10n: git.pot: v1.9 round 2 (1 new)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2014-02-12 07:15:55 +01:00
Jiang Xin
98b2761d5e l10n: zh_CN.po: Disambiguation for rebase 
Disambiguate the Chinese translation for "rebase", and update other
related entries.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2014-02-06 23:15:33 +08:00
Jiang Xin
8376b58d1c l10n: zh_CN.po: translate 1 new message (2211t0f0u) 
Update translation for git v1.9-rc2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2014-02-03 10:53:18 +08:00
Jiang Xin
afa41284a2 Merge branch 'master' of git://github.com/nafmo/git-l10n-sv 
* 'master' of git://github.com/nafmo/git-l10n-sv:
  l10n: Update Swedish translation (2211t0f0u)
 2014-02-03 09:47:27 +08:00
Jiang Xin
e8f4a7cb6e Merge branch 'master' of git://github.com/vnwildman/git 
* 'master' of git://github.com/vnwildman/git:
  l10n: vi.po (2211t): Updated one new string
 2014-02-03 09:45:14 +08:00
Tran Ngoc Quan
8620ed578b l10n: vi.po (2211t): Updated one new string 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2014-02-03 07:49:47 +07:00
Peter Krefting
b6c0df8948 l10n: Update Swedish translation (2211t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2014-02-02 17:22:21 +01:00
Jean-Noel Avila
893fcc3e4d l10n: fr: 1.9rc2 2211t 
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
 2014-02-02 14:38:05 +01:00
Jiang Xin
d57b24b60b l10n: git.pot: v1.9 round 2 (1 new) 
Generate po/git.pot from v1.9-rc2 for git v1.9 l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2014-02-01 08:07:02 +08:00
Alexander Shopov
25e2fbb4e2 l10n: Bulgarian translation of git (222t21f1967u) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2014-01-29 14:29:15 +02:00
Alexander Shopov
5123e7d54f po/TEAMS: Added Bulgarian team 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2014-01-28 19:16:53 +02:00
Jiang Xin
608a82348b l10n: remove 2 blank translations on Danish, Dutch 
Two l10n teams haven't contributed a single translation for about two
years since they was initialized with a blank template.  Remove them
can make the Git package smaller and give opportunities to other
contributors.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2014-01-25 06:17:14 +08:00
Jiang Xin
cfff71a961 l10n: zh_CN.po: translate 27 messages (2210t0f0u) 
Translations for git v1.9-rc0, and also update translations on "graft"
and "reference repository".

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2014-01-25 06:17:14 +08:00
Peter Krefting
d74d01808a l10n: Update Swedish translation (2210t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2014-01-21 09:26:56 +01:00
Jiang Xin
812b5e1c11 Merge branch 'fr-po' of git://github.com/jnavila/git 
* 'fr-po' of git://github.com/jnavila/git:
  [fr] update french translation 2210/2210
 2014-01-18 22:49:27 +08:00
Jean-Noel Avila
561580eadd [fr] update french translation 2210/2210 
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
 2014-01-18 14:44:13 +01:00
Tran Ngoc Quan
5832c3f2f4 l10n: vi.po (2210t): Updated git-core translation 
* Updated new strings
 * Fix typos and review
 * Change meaning of stage

Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2014-01-18 09:07:40 +07:00
Jiang Xin
df49095ac2 l10n: git.pot: v1.9 round 1 (27 new, 11 removed) 
Generate po/git.pot from v1.9-rc0 for git v1.9 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2014-01-18 07:45:37 +08:00