[PATCH] [PUSHED] fdo#39468: translate German comments (=> writer)
Philipp Riemer
ruderphilipp at gmail.com
Wed May 30 12:29:48 PDT 2012
Hmm... I have to admit that Tor's last mail bothered me. Thus, I spent
my evening at home in front of the PC fixing/ re-applying the changes
after fetching the newest files. The results of my work are in the
three patches attached to this mail.
Cheers,
Philipp
2012/5/30 Tor Lillqvist <tml at iki.fi>:
> 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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-cleaned-up-several-files-in-sw-source-core-undo.patch
Type: application/octet-stream
Size: 34396 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20120530/5766c584/attachment-0003.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-re-formatted-sw-source-core-undo-undel.cxx.patch
Type: application/octet-stream
Size: 13942 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20120530/5766c584/attachment-0004.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0003-cleaned-up-several-files-in-sw-source-core-undo.patch
Type: application/octet-stream
Size: 26940 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20120530/5766c584/attachment-0005.obj>
More information about the LibreOffice
mailing list