From: Junio C Hamano <gitster@pobox.com>
To: Ralf Thielow <ralf.thielow@gmail.com>
Cc: git@vger.kernel.org,
"Matthias Rüster" <matthias.ruester@gmail.com>,
"Thomas Rast" <tr@thomasrast.ch>, "Jan Krüger" <jk@jk.gs>,
"Christian Stimming" <stimming@tuhh.de>,
"Phillip Szelat" <phillip.szelat@gmail.com>,
"Magnus Görlitz" <magnus.goerlitz@googlemail.com>
Subject: Re: [PATCH v2] l10n: de.po: update German translation
Date: Fri, 21 Jul 2017 09:10:20 -0700 [thread overview]
Message-ID: <xmqqshhphitv.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170721151144.4410-1-ralf.thielow@gmail.com> (Ralf Thielow's message of "Fri, 21 Jul 2017 17:11:44 +0200")
Ralf Thielow <ralf.thielow@gmail.com> writes:
> #: date.c:116
> msgid "in the future"
> msgstr "in der Zukunft"
>
> #: date.c:122 date.c:129 date.c:136 date.c:143 date.c:149 date.c:156 date.c:167
> #: date.c:175 date.c:180
> msgid "%"
> msgid_plural "%"
> -msgstr[0] ""
> -msgstr[1] ""
> +msgstr[0] "%"
> +msgstr[1] "%"
Sorry, but I think these need re-translation after -rc1 because the po/git.pot
is generated incorrectly. See the discussion:
https://public-inbox.org/git/%3Cxmqqk233klvd.fsf@gitster.mtv.corp.google.com%3E/#t
Also, if you can, please try the patch in
<xmqqfudrkkci.fsf@gitster.mtv.corp.google.com>
like so:
$ git reset --hard origin/master
$ git am <that message>
$ make pot
$ git commit -m 'update po/git.pot' -a
$ cd po
$ msgmerge --add-location --backup-off -U de.po git.pot
to make sure you get corrected entries for date.c. If it works out
correctly, I'd want to ship -rc1 with that Makefile fix so that
Jiang can do the first four commands above to give translators a
correct po/git.pot to base their work on.
Thanks.
next prev parent reply other threads:[~2017-07-21 16:10 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-14 16:12 [PATCH] l10n: de.po: update German translation Ralf Thielow
2017-07-20 18:36 ` Matthias Rüster
2017-07-21 15:11 ` [PATCH v2] " Ralf Thielow
2017-07-21 16:10 ` Junio C Hamano [this message]
2017-07-21 16:32 ` Ralf Thielow
2017-07-21 17:21 ` Junio C Hamano
2017-07-21 17:01 ` [PATCH v3] " Ralf Thielow
-- strict thread matches above, loose matches on Subject: below --
2017-04-30 18:47 [PATCH] " Ralf Thielow
2017-04-30 19:11 ` [PATCH v2] " Ralf Thielow
2017-05-01 12:19 ` Simon Ruderich
2017-05-02 16:34 ` Ralf Thielow
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=xmqqshhphitv.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jk@jk.gs \
--cc=magnus.goerlitz@googlemail.com \
--cc=matthias.ruester@gmail.com \
--cc=phillip.szelat@gmail.com \
--cc=ralf.thielow@gmail.com \
--cc=stimming@tuhh.de \
--cc=tr@thomasrast.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).