Commit graph

163 commits

Author SHA1 Message Date
Ralf Thielow 1a8e08cdf4 Merge branch 'maint' into master
* maint: (10 commits)
  l10n: de.po: translate one new message
  l10n: de.po: unify translation of "ahead" and "behind"
  l10n: de.po: collection of improvements
  l10n: de.po: translate "remote" as "extern"
  l10n: de.po: translate "track" as "beobachten"
  ...

Conflicts:
	po/de.po
2012-05-09 18:44:37 +02: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
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
Ralf Thielow 839f7f8eed l10n: Update German translation
Translate new messages for git master branch.

Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
2012-05-02 07:46:35 +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
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