* Pull request for master branch with update of de.po
@ 2012-05-08 1:09 Jiang Xin
0 siblings, 0 replies; only message in thread
From: Jiang Xin @ 2012-05-08 1:09 UTC (permalink / raw)
To: Junio C Hamano, Ralf Thielow, Thomas Rast, Jan Krüger,
Christian Stimming
Cc: Git List
Hi Junio and members of German l10n team,
This pull request for master branch includes update of German translations.
Ralf merged their hacks on maint branch to master branch, and resolved
conflicts in de.po which are hard for me to resolved. Thanks Ralf.
The same issue needs Junio to make the final decision:
One commit (fbd994d) by Thomas hacks a file "git-gui/po/de.po",
which is outside of "po/" directory.
The following changes since commit 34875f4a53b9e495622553a671776f66dc37eb2b:
The eighth batch of topics graduated to 'master' (2012-05-02 14:38:43 -0700)
are available in the git repository at:
https://github.com/git-l10n/git-po/ master
for you to fetch changes up to 80e4ba8ddb3224f40a1a896b2db8aa3a83cc0dab:
Merge branch 'maint' into master (2012-05-07 20:44:21 +0200)
----------------------------------------------------------------
Jiang Xin (1):
l10n: Update git.pot (273 new, 15 removed messages)
Ralf Thielow (6):
l10n: add new members to German translation team
l10n: de.po: translate "track" as "beobachten"
l10n: de.po: translate "remote" as "extern"
l10n: de.po: collection of improvements
l10n: de.po: unify translation of "ahead" and "behind"
Merge branch 'maint' into master
Thomas Rast (4):
de.po: translate "bare" as "bloß"
de.po: hopefully uncontroversial fixes
de.po: translate "bad" as "ungültig" ("invalid")
de.po: collection of suggestions
git-gui/po/de.po | 2 +-
po/TEAMS | 3 +
po/de.po | 479 +++++-----
po/git.pot | 2724 ++++++++++++++++++++++++++++++++++++++++--------------
4 files changed, 2245 insertions(+), 963 deletions(-)
--
Jiang Xin
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-05-08 1:09 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-05-08 1:09 Pull request for master branch with update of de.po Jiang Xin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.