svn up might break translations

[Frederik Schwarzer]

On Monday, May 23, 2022 11:08:37 PM CEST Freek de Kruijf wrote:
> Op maandag 23 mei 2022 22:29:55 CEST schreef Frederik Schwarzer:
> > On Saturday, May 21, 2022 10:41:15 AM CEST Freek de Kruijf wrote:
> > > Op zaterdag 21 mei 2022 10:08:01 CEST schreef Antoni Bella 
Pérez:
> > Hi,
> > 
> > > >   I prefer make svn up before copy new translations and go
> > > >   on...
> > > >   Possible>
> > > > 
> > > > cross translations? See the local diff. Toni
> > > > 
> > > > Sent from Yahoo Mail on Android
> > > > 
> > > >   On dv., de maig 20, 2022 at 23:57, Frederik
> > > >   Schwarzer<schwarzer at kde.org>>
> > > > 
> > > > wrote:   Hi,
> > > > 
> > > > we currently have a problem with our workflow.
> > > > 
> > > > For some time now Lokalize formats even short strings as:
> > > > 
> > > > msgstr ""
> > > > "Foo"
> > > > 
> > > > 
> > > > Our server-side scripts then update the files to make them
> > > > look
> > > > like:
> > > > 
> > > > msgstr "Foo"
> > > > 
> > > > 
> > > > If now the translator wants to commit the changes a few days
> > > > later,
> > > > svn complains that we need to run "svn up" first.
> > > > 
> > > > SVN performs a merge then and creates messages like:
> > > > 
> > > > msgstr "Foo"
> > > > "Foo"
> > > > 
> > > > ... resulting in strings like "FooFoo" in the GUI.
> > > > 
> > > > 
> > > > Has enyone else seen this?
> > > 
> > > In my workflow, before doing any work on translations, I do an
> > > "svn
> > > up". After finishing translating on that day, I do a commit
> > > before
> > > midnight.
> > 
> > The problem with this is that "midnight" does not have any meaning
> > wrt skripty. It runs for ... I don't know ... 15 hours or so? So
> > it might throw sticks between your legs during the day. :D
> > 
> > > When I get new versions of .po files from other translators, I
> > > also
> > > first do an "svn up", put the received .po file in its location,
> > > replacing the newest one from the svn server.
> > > 
> > > I also have the .pot files available, also renewed with "svn up"
> > > and I do a merge of the .pot file with the new .po file, which
> > > is what happens on the svn server during the night. So it is
> > > not really necessary, but after the merge I can check whether
> > > new elements need some work. Again a commit before midnight.
> > 
> > For this I use Lokalize. That way I do not have to wait for the
> > next skripty run or merge with the .pot file to see if there are
> > translations missing.
> 
> Midnight for me is -1:00 UTC or -2:00 UTC (DST)
> 
> I am not aware of a sync action in Lokalize.
> 
> > See:
> > Sync -> Open file for sync/merge
> > Sync -> Copy all new translations
> 
> Is this using kdesvn? I only use the command line.

The Sync action is from Lokalize. You can find it in the menu, if you 
have a PO file open for editing.

Cheers,
Frederik