Hi, after applying the patch, entries in date.c turned into this -#: 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] "%" +#: date.c:122 +#, fuzzy, c-format +msgid "%<PRIuMAX> second ago" +msgid_plural "%<PRIuMAX> seconds ago" +msgstr[0] "vor %lu Sekunde" +msgstr[1] "vor %lu Sekunden" ... which seems to be OK. A full diff after updating de.po after this patch can be found at https://pastebin.com/5yeSnGQj. Ralf 2017-07-21 18:10 GMT+02:00 Junio C Hamano <gitster@xxxxxxxxx>: > Ralf Thielow <ralf.thielow@xxxxxxxxx> 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@xxxxxxxxxxxxxxxxxxxxxxxxxxx%3E/#t > > Also, if you can, please try the patch in > > <xmqqfudrkkci.fsf@xxxxxxxxxxxxxxxxxxxxxxxxxxx> > > 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. >
