mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-15 05:33:04 +01:00
Code Activity
39998 commits 6 branches 956 tags 518 MiB
Commit graph

342 commits

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