1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-07 09:43:00 +01:00
Commit graph

57 commits

Author SHA1 Message Date
Peter Krefting
3f0812f68d Update Swedish translation (728t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2012-05-29 09:28:34 +01:00
Ralf Thielow
042e9f94a7 l10n: de.po: translate 3 new messages
Translate 3 new messages for upcoming git 1.7.10.3.

Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
2012-05-15 19:09:02 +02:00
Jiang Xin
eff6d3a9e3 l10n: zh_CN.po: translate 3 new messages
Translate 3 new messages for upcoming git 1.7.10.3.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-05-15 12:07:00 +08:00
Jiang Xin
b741611c06 l10n: Update git.pot (3 new, 2 removed messages)
Generate po/git.pot from v1.7.10.2-35-g0b9f4:

 * 3 new l10n messages at lines: 2743, 2751, 2759.

 * 2 removed l10n messages from lines: 1879, 2757.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-05-15 06:36:36 +08:00
Jiang Xin
2f64542f9c l10n: zh_CN.po: translate 1 new message
Translate new message '[new ref]' since git 1.7.10.1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-05-12 14:56:06 +08:00
Ralf Thielow
1ec31a33e2 l10n: de.po: translate one new message
Translate one new messages came from git.pot
update in 7795e42 (l10n: Update git.pot (1 new messages)).
It also updates and reformats the de.po file due to "msgmerge".

Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
2012-05-08 19:19:36 +02:00
Ralf Thielow
90d25380df l10n: de.po: unify translation of "ahead" and "behind"
Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
2012-05-08 19:19:35 +02:00
Ralf Thielow
b9f3b4c1ba l10n: de.po: collection of improvements
A list of improvements for German translation
which contains a couple of spellings and grammar.

Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
2012-05-08 19:19:30 +02:00
Ralf Thielow
080d422139 l10n: de.po: translate "remote" as "extern"
The word "remote" was translated as "entfernt"
and "anders". Both of them aren't really good
because "anders" in German means "other" and
"entfernt" has two different meanings and could
result in confusion to the users.
We've changed the translation to "extern".

Suggested-by: Jan Krüger <jk@jk.gs>
Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
2012-05-08 19:16:14 +02:00
Ralf Thielow
1ef3ab1648 l10n: de.po: translate "track" as "beobachten"
The word "track" was translated as "verfolgen"
and "folgen". We've decided to translate "track" in
the meaning of tracked files/content as "beobachten"
and in the remote-tracking sense as "folgen".

Suggested-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
2012-05-08 19:16:14 +02:00
Ralf Thielow
9bdd868744 l10n: add new members to German translation team
Add Thomas Rast, Jan Krüger and Christian Stimming
to German translation team.

Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
2012-05-08 19:16:14 +02:00
Thomas Rast
232f61300b l10n: de.po: collection of suggestions
A long list of suggested changes to the translation.  None of them are
clear-cut, though I of course think they are an improvement ;-)

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
2012-05-08 19:16:07 +02:00
Thomas Rast
b41597d3d5 l10n: de.po: translate "bad" as "ungültig" ("invalid")
"schlecht" doesn't quite sound right to me, especially in messages
like "bad object" where the object doesn't even exist in the first
place.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
2012-05-08 19:15:52 +02:00
Thomas Rast
f6e1224d6b l10n: de.po: hopefully uncontroversial fixes
These are all obviously wrong, such as typos or messages where the
current translation is based on a misunderstanding of the original
message.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
2012-05-08 19:15:41 +02:00
Thomas Rast
7eba504686 l10n: de.po: translate "bare" as "bloß"
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
2012-05-08 18:47:04 +02:00
Jiang Xin
7795e424c6 l10n: Update git.pot (1 new messages)
Changes of po/git.pot from v1.7.10.1 to v1.7.10.1-36-g42325:

 * 1 new l10n message at line: 1761

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-05-08 15:49:57 +08:00
Ralf Thielow
720e309bf6 l10n: Initial German translation
Helped-by: Thomas Kuchs
Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
2012-05-01 16:28:58 +02:00
Jiang Xin
73a60cd252 l10n: Update Simplified Chinese translation
Translate 2 new messages come from git maint branch.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-04-28 22:53:41 +08:00
Jiang Xin
df3ef6fb98 l10n: Update git.pot (2 new messages)
Changes of po/git.pot from v1.7.10 to v1.7.10-55-g868d6

 * 2 new l10n messages at lines: 1583, 2730

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-04-28 20:35:24 +08:00
Ralf Thielow
01b127cdc5 l10n: Add the German translation team and initialize de.po
Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-04-28 08:25:48 +08:00
Byrial Jensen
36cbbde3bf l10n: Add Danish team (da) to list of teams 2012-04-12 02:03:30 +02:00
Byrial Jensen
a48313d8b7 l10n: New da.po file with 0 translations 2012-04-12 02:03:12 +02:00
Marco Sousa
3c863e247e l10n: Updated pt_PT language 2012-04-11 00:04:30 +02:00
Vincent van Ravesteijn
18ac610272 l10n: Add the Dutch translation team and initialize nl.po
Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org>
2012-04-02 14:20:54 +02:00
Marco Sousa
833662295e l10n: Inital Portuguese Portugal language (pt_PT)
Signed-off-by: Marco Sousa <marcomsousa@gmail.com>
2012-04-02 09:46:11 +08:00
Jiang Xin
7e238ab7ba l10n: Improve zh_CN translation for Git 1.7.10-rc3
Improvements of zh_CN translations:

 - Update translation for msg "Changes not staged for commit:".
 - Remove unnecessary leading spaces for some messages.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-03-30 17:02:12 +08:00
Jim Meyering
65c2b2b509 correct a few doubled-word nits in comments and documentation
Found by running this command:
$ git ls-files -z|xargs -0 perl -0777 -n \
 -e 'while (/\b(then?|[iao]n|i[fst]|but|f?or|at|and|[dt]o)\s+\1\b/gims)' \
 -e '  {' \
 -e '    $n = ($` =~ tr/\n/\n/ + 1);' \
 -e '    ($v = $&) =~ s/\n/\\n/g;' \
 -e '    print "$ARGV:$n:$v\n";' \
 -e '  }'

Why not just git grep -E ...?
That wouldn't work then the doubled words are separated by a newline.
This is derived from a Makefile syntax-check rule in gnulib's maint.mk:
  http://git.sv.gnu.org/cgit/gnulib.git/tree/top/maint.mk

Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-03-28 11:18:35 -07:00
Jiang Xin
3601b1d359 Add url of Swedish l10n team in TEAMS file
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-03-27 17:11:34 +08:00
Jiang Xin
90e6ef5320 l10n: Review zh_CN translation for Git 1.7.10-rc1
Overall review of the zh_CN translation:

 - Distinguish the translations of index and stage, though they are the
   same thing.

 - Many other fixes, e.g., add the lost periods at the end of translated
   sentences.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-03-27 16:09:03 +08:00
Peter Krefting
0e641b1f95 Update Swedish translation (724t0f0u).
- Update for 1.7.10-rc1.
- Add a missing -e when generaring the "Untracked files" message.
- Fixed some wordings after playing with the localized version.
2012-03-27 16:09:03 +08:00
Jiang Xin
dac1de7de5 l10n: Update zh_CN translation for Git 1.7.10-rc1
Translate 1 new message from Git 1.7.10-rc1: "Gitdir '$a' is ..."

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-03-16 22:35:58 +08:00
Jiang Xin
a2c01b55ff l10n: Update git.pot (1 new message)
Changes of po/git.pot from v1.7.10-rc0 to v1.7.10-rc1:

 * 1 new l10n message at line: 3361.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-03-16 20:32:59 +08:00
Thynson
6672dc8e69 l10n: Improve zh_CN translation for msg "not something we can merge"
Signed-off-by: Thynson <lanxingcan@gmail.com>
2012-03-09 00:22:56 +08:00
Thynson
1aabac6580 l10n: Improve zh_CN trans for msg that cannot fast-forward
Signed-off-by: Thynson <lanxingcan@gmail.com>
2012-03-09 00:22:49 +08:00
Jiang Xin
14c8bced15 l10n: Update zh_CN translation for 1.7.10-rc0
Translate 1 new message from Git 1.7.10-rc0.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-03-08 20:55:37 +08:00
Peter Krefting
6874b9edb1 Update Swedish translation (732t0f0u).
This update includes a replay of some review fixes from the initial
translation run in 2010, which I cannot find having committed anywhere.

Add myself to the po/TEAMS file as well.

Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2012-03-08 10:56:37 +01:00
Peter Krefting
0eb8fa3a05 po/sv.po: add Swedish translation
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
(cherry picked from commit 54ce07007c7988268d43619c580e81fbca09d37b)
2012-03-08 09:28:35 +01:00
Jiang Xin
2b911f8185 l10n: Update git.pot (1 new message)
Update file 'po/git.pot' to v1.7.10-rc0:

* Add 1 new l10n string in the new generated "git.pot" file at line:
  191

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-03-08 10:20:20 +08:00
Jiang Xin
13ef396635 Merge v1.7.10-rc0 for git l10n update 2012-03-08 10:17:21 +08:00
Jiang Xin
aa9565f7cc l10n: Update zh_CN translation for 1.7.9.2
In order to show detailed dirty status of submodules in long format,
git stripped the last ", " from the concatenate sting by a two-byte
backstep. So for keeping the two-byte backstep valid, won't touch the
end ", " for translation.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-03-05 13:33:43 +08:00
Thynson
2d0dc47464 l10n: Improve commit msg for zh_CN translation
Signed-off-by: Thynson <lanxingcan@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-03-02 16:50:35 +08:00
Thynson
1b150dc96f l10n: Improve zh_CN translation for msg that make empty commit when amend.
Signed-off-by: Thynson <lanxingcan@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-03-02 16:37:15 +08:00
Thynson
a9ce45430b l10n: Improve zh_CN translation for empty cherry-pick msg.
Signed-off-by: Thynson <lanxingcan@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-03-02 16:28:10 +08:00
Thynson
70fc47bf56 l10n: Improve zh_CN translation for msg about branch deletion deny
Signed-off-by: Thynson <lanxingcan@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-03-02 16:18:22 +08:00
Thynson
8ea38f47bb l10n: Improve zh_CN translation for lines insertion and deletion.
Signed-off-by: Thynson <lanxingcan@gmail.com>
2012-03-02 16:09:21 +08:00
Junio C Hamano
11ec817fed Merge branch 'master' of https://github.com/git-l10n/git-po into l10n
* 'master' of https://github.com/git-l10n/git-po:
  l10n: leave leading space unchanged for zh_CN.po
2012-03-01 20:51:37 -08:00
Jiang Xin
75b182aee7 Update l10n guide: change the repository URL, etc
Host the l10n coordinator repository in a dedicated github organization
account "git-l10n", so that the team may have a more permanent home.
Also add a hint about reference of TEAMS file for l10n contributors.

Update TEAMS file with new zh_CN l10n team members and a repository URL.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-03-01 20:50:49 -08:00
ws3389
61bc0753f1 l10n: leave leading space unchanged for zh_CN.po
Signed-off-by: ws3389 <willsmith3389@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-03-01 00:23:14 +08:00
Junio C Hamano
271ce198cd Update l10n guide
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-02-29 00:10:30 -08:00
Jiang Xin
7ac1c0adeb l10n: update Chinese translation to the new git.po
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-02-28 12:24:54 +08:00