Am Donnerstag, 21. April 2016 um 22:20:53, schrieb Georg Baum <georg.b...@post.rwth-aachen.de> > Scott Kostyshak wrote: > > > On Thu, Apr 21, 2016 at 08:13:18AM +0100, Jean-Pierre Chrétien wrote: > >> Le 20/04/2016 18:19, Scott Kostyshak a écrit : > >> > On Wed, Apr 20, 2016 at 02:19:50PM +0100, Jean-Pierre Chrétien wrote: > >> > >> > > There has been a remerge since my last update, without new > >> > > translations needed, so the answer seems to be no. > >> > > > >> > > Just to be sure... > >> > > >> > It could be the layout commits, for which I did say I would allow a > >> > potential exception to the string freeze. > >> > Uwe is this indeed the case? > > I am not Uwe, but I know the answer as well; It is Yes. The last remerge was > on April 5 (except for one or two languages, e.g. de), the changed layouts > have been added afterwards. > > >> > Also see: > >> > https://www.mail-archive.com/search?l=mid&q=neot1d%24lnj%241%40ger.gmane.org > >> > >> I checked on my side with (in po dir) > >> make lyx-2.2.0dev.pot-update > >> make fr.po > >> > >> I get 15 fuzzies and 6 unstranslated, so a string translation round seems > >> needed before release. > >> May I do it on the freshly updated fr.po file, or must I wait for > >> instructions from Uwe? > > > > If you know what to do, then go ahead. Uwe can you handle the rest? > > This is unfortunately difficult: > > - If Uwe does a remerge we will get the broken line endings again. > - If Jean-Pierre or I do a remerge we will get an exploded diff (32 MiB for > all languages) because of the totally different sorting on unix (msguniq) > vs. windows (gettext). Because of this it will also be almost impossible to > see the real changes, e.g. if some strings have been deleted.
I could. I am doing it already all the time for sk.po.
> Unless somebody has an idea how to quickly work around the line ending bug
> my guess would be that the best option would be that Uwe does the remerge,
> then sends the resulting files to me, I remove the stray \r and submit. For
> 2.3 I intend do write a platform independent msguniq replacement in python,
> so that this problem is solved.
>
> >> > Thanks to everyone for help with the po files. I should have been more
> >> > involved with this process.
>
> Don't worry, it is all fine. The only thing that could have been done
> earlier is the string remerge after changed layout strings were allowed in.
>
>
> I updated sv.gmo and pt_BR.gmo BTW, since these updates have been forgotten
> when the .po files have been updated. I did this without asking since we
> always keep the .gmo files up to date, and there is only one way to update
> them.
>
>
> Georg
Kornel
signature.asc
Description: This is a digitally signed message part.
