[Libreoffice] Weekly merge of libreoffice-3-4 -> master

[Andras Timar]

Hi Kendy,

2011/6/6 Jan Holesovsky <kendy at suse.cz>:
> - translations: Andras, I think it is correct to leave out the
>  translations from merging; or not?

No, merging translations between branches does not look useful to me.
I think it's too early to do anything with translations on master.
Translators should finish their work on 3-4 first. I think I'll open
the 3.5 translation in Pootle later, when we start producing alpha or
beta builds for 3.5.

Thanks,
Andras