[PATCH] [PUSHED] fdo#39468: translate German comments (=> writer)
Tor Lillqvist
tml at iki.fi
Wed May 30 09:38:57 PDT 2012
Thanks. I pushed the first one, but the second one did not apply,
severa patch hunks failed. Could you please check that?
Probably your source code is out of sync and you need to do a git
pull. You might run into merge conflicts when you do that because of
slight changes needed to your patch(es) when they were committed by me
(because files had changed slightly in some context lines since you
had started editing them), so it might be best to first save your
unpushed work, and then git reset --hard origin (hmm, I hope I
remember that right), then git pull -r.
--tml
More information about the LibreOffice
mailing list