Re: Problems merging stable to gui-release

[fgnievinski]

I'd suggest the following:
- delete the gui-release .ts files
- copy the ts from stable into gui-release
- run lupdate, which will:
    - keep existing translations, 
    - insert missing source strings, and
    - update location line numbers.
The only requirement is to halt 
translation contributions to gui-release
until a string freeze is eventually announced.

If you prefer an alternative, considering
that .ts files are not merge friendly, 
it might be possible to workaround
the location lines with this:
  lconvert -locations none -i one.ts -o one.ts
after all, locations are only used for the Qt 
Linguist app to show the context source code, 
assuming it's available in the translators 
machine.  but even with this, I've seen the 
same message appearing at different locations 
within different versions of the same ts file.

-F.

<https://qt.gitorious.org/qt/qt/source/4710365249f35556d27e49b56be7fb4a667a096a:tools/linguist/lupdate/main.cpp>




--
View this message in context: 
http://octave.1599824.n4.nabble.com/Problems-merging-stable-to-gui-release-tp4661381p4661393.html
Sent from the Octave - Maintainers mailing list archive at Nabble.com.