-also merge strings translated in 2.2.3 but not master (only affects ar.po, ia.po, pt_BR.po and sv.po) as a service for your translators
- some translations for de.po
This is a complete remerge of strings (done with cmake) except for fr.po and
sv.po. Those files had already been remerged after the last string changes,
but they use a different sorting, so I did not want to produce an unneeded
diff.
The differences in the comment lines are a well known problem we have: The
last remerge was done on windows, mine was done on linux.
This was discussed in the thread "Translations of Math environments in LyX
output for LyX 2.2" at http://www.mail-archive.com/lyx-docs@lists.lyx.org/msg08633.html
and has been reviewed. The problem was that in 2.1, the portuguese translation
was correct in lib/layouttranslations but different in po/pt_PT.po. In fact,
the translation is the same for all three languages spanish, portuguese and
brazilian portuguese.
After some discussion between Georger, Pedro, Pavel and me Georger came to the
conclusion that Mapa is not the correct translation of Chart in this context.
Originally he proposed Gráfico, but since that would be identical to the
translation of Graph we decided that Diagram is better. It is a bit more
general than Gráfico, but it is also used in pt_PT, and the german translation
uses the german equivalent, which is more general as well. Those who need a
Gráfico can still use Graph.
Unfortunately Geoger based the new .po file on the remerged one at
259196e1a6, so we have now the situation that pt_BR is remerged, but the
other languages are not.
The translations have been merged by calling
python development/tools/mergepo.py -n ../lyx-2.1-git/po
cd po; make update-gmo
For some languages it may make sense to merge also changed translations,
but this neds to be decided by the individual translators.
These have been added by 36d7b40c, before we had always UNIX only.
poedit can read the mixed files just fine, but python polib (which is used
in po/lyx_pot.py) refuses to load files with mixed endings.