Re: Regression in fr.po
On Sat, Jan 23, 2016 at 01:51:51PM -0500, Guillaume Munch wrote: > Le 23/01/2016 03:40, Jean-Pierre Chrétien a écrit : > >Anyway, I will soon sync 2.1 into 2.2, before release of beta of course (is > >that still on February 7th ?). > Lastly, Scott said that beta was going to be delayed, but I do not know how > much. We will release beta soon after #9794 is resolved. Scott signature.asc Description: PGP signature
Re: Regression in fr.po
Le 23/01/2016 03:40, Jean-Pierre Chrétien a écrit : The reason is that I'm not through the update of fr.po for master, I have yet to collect the changes I made to fr.po for branch since April 2015 (the last time I synced 2.2. with 2.1) and insert them in 2.2. Usually I do this using the diff-po.pl script available on trac. I remember trying a merge of 2.1 into 2.2, but I thing the diff is a cleaner practice. I do not know if there is a standard practice, using msgmerge I guess: if so, I would expect the developers to apply it ans ask for update of the 2.2 po file. Anyway, I will soon sync 2.1 into 2.2, before release of beta of course (is that still on February 7th ?). Thanks for the info Jean-Pierre, good to know. I was assuming that the merge was done before starting the translations, so when I saw the update to fr.po on master I assumed that it had been forgotten. So this is entirely a false alarm. It is also good to learn a bit more about the process, for instance I did not know that you made the merge yourself. This interests me in the perspective of the script I had written some time ago to replace "..." with proper ellipses, that needs to be run right after merge (but this will not be before 2.3). I will need to know exactly at which stage of the process do that. Thank you for all your careful work on the French translation. Lastly, Scott said that beta was going to be delayed, but I do not know how much. Guillaume
Re: Regression in fr.po
Guillaume Munch lyx.org> writes:
>
> The log at the top of fr.po in master ends as follows:
> # --
> # 20 avril 2015 : retour à la typo Fixme au lieu de FiXme suite à un échange
> # avec Jûrgen Spitzmûller
> # --
> # 29 décembre 2015 : mise à jour en vue de 2.2.0
> # --
> # 02 janvier 2016 : résolution de conflits de raccourcis
> # revue du vocabulaire du module Boîtes graphiques
> # --
>
> The same log in 2.1.x ends as follows:
> # --
> # 23 mars 2015 : correction de quelques traductions suite synchro fr.po
> pour 2.2
> # --
> # 19 mai 2015 : traduction des messages du module PDF forms
> # --
> # 18 juin 2015 : revue de la traduction des menus de formulaires PDF
> # --
> # 15 septembre 2015 : correction de raccourcis clavier problématiques
> #(bogues #9745 & #9761) - Guillaume Munch
> # --
>
> In particular, the corrections from 15 Sept. 2015 are lost between
> stable and master ("Search" and "Replace" share the same accelerator R
> again in every dialog). At the time of my patch, I was told to commit to
> stable because it would automatically be merged into master at string
> freeze.
>
> Were the instructions given to me the correct ones? How come we have
> lost those fixes? Is it just a local problem or does that indicate that
> there may be other regressions with other translations? What do we do to
> repair this?
The reason is that I'm not through the update of fr.po for master, I have
yet to collect the changes I made to fr.po for branch since April 2015 (the
last time I synced 2.2. with 2.1) and insert them in 2.2.
Usually I do this using the diff-po.pl script available on trac. I remember
trying a merge of 2.1 into 2.2, but I thing the diff is a cleaner practice.
I do not know if there is a standard practice, using msgmerge I guess: if
so, I would expect the developers to apply it ans ask for update of the 2.2
po file.
Anyway, I will soon sync 2.1 into 2.2, before release of beta of course (is
that still on February 7th ?).
--
Jean-Pierre
