From: Jiang Xin <worldhello.net@gmail.com>
To: "Junio C Hamano" <gitster@pobox.com>,
"Ralf Thielow" <ralf.thielow@googlemail.com>,
"Thomas Rast" <trast@student.ethz.ch>, "Jan Krüger" <jk@jk.gs>,
"Christian Stimming" <stimming@tuhh.de>
Cc: Git List <git@vger.kernel.org>
Subject: Pull request for master branch with update of de.po
Date: Tue, 8 May 2012 09:09:20 +0800 [thread overview]
Message-ID: <CANYiYbHhgdQgJajR-_moQuiX8ZEfdAWQ8+z1AHJDFa3HO5sQgQ@mail.gmail.com> (raw)
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
reply other threads:[~2012-05-08 1:09 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CANYiYbHhgdQgJajR-_moQuiX8ZEfdAWQ8+z1AHJDFa3HO5sQgQ@mail.gmail.com \
--to=worldhello.net@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jk@jk.gs \
--cc=ralf.thielow@googlemail.com \
--cc=stimming@tuhh.de \
--cc=trast@student.ethz.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).