On Sun, Jun 11, 2017 at 03:18:43PM +0200, Kornel Benko wrote: > Am Sonntag, 11. Juni 2017 um 15:07:20, schrieb Enrico Forestieri > <for...@lyx.org> > > On Sun, Jun 11, 2017 at 02:59:52PM +0200, Kornel Benko wrote: > > > > > Am Sonntag, 11. Juni 2017 um 14:03:07, schrieb Enrico Forestieri > > > <for...@lyx.org> > > > > commit 570ad4219eb4394399c4dc9d57a0ab76f8242047 > > > > Author: Enrico Forestieri <for...@lyx.org> > > > > Date: Sun Jun 11 14:02:02 2017 +0200 > > > > > > > > Remerge strings again after last change > > > > > > > > > > This remerging in the repo while translating 'old' po file is really > > > disturbing. > > > > > > Could you (and Uwe!) please leave sk.po untouched? > > > > I think this is a collaborative effort. But I'll left you alone next time > > I should remerge strings by doing git co po/sk.po after remerging. > > > > Thanks. > > The problem is, I don't need remerging 2.2 to 2.3, since I am working always > the other way around. > My 'source' is master.
It was a mere update of strings in master, so only new strings are added. -- Enrico
