Torsdag 26 februar 2009 20:59:34 skrev Stephan Kulow:

Since 2008-11-19 we were prefering the translations in SVN over those in our packages after (as far as my memory) complaints from italian team. Since Factory is open again and sees new upstream texts, we also kept old translations alive.

So I had to change this back, but I wondered what to do with the conflicts that happen between upstream and our teams. So I create now an extra update-desktop-files-conflicts.*.po file that will only contain comments, but gives you a chance to review style differences between upstream/package translations and yours.

So it looks e.g. like this: #, fuzzy #~ msgctxt "Comment(digikamimageplugin_whitebalance.desktop)" #~ msgid "White balance correction plugin for digiKam" #~ msgstr "" #~ "Packages:\n" #~ "Estensione di digiKam per la correzione del bilanciamento del bianco\n" #~ "SVN:\n" #~ "Plugin di correzione del bilanciamento del bianco per digiKam"

I guess somewhen around 11.2 release we'll either switch back the default to give teams a way to fix bugs that aren't overwritten by outdated package translations. Or we find a way to overwrite specific translations, but I see no good way atm. Till then: if you find a bug in the desktop files: let upstream know.

It's still unclear for me which translation (opensuse svn or upstream) will appear for the user in the final product when there's a conflict :-| I'm a little confused about the following too. The Akregator button in the left pane of Kontact with factory KDE packages is translated as "Kilder". This is the relevant string in opensuse trunk (update-desktop-files-kde- services.da.po) I think: #: /usr/share/kde4/services/kontact/akregatorplugin.desktop msgctxt "Name(akregatorplugin.desktop)" msgid "Feeds" msgstr "Kilder" In KDE stable branch (desktop_kdepim) the relevant string is this one (I think): #: kontact/plugins/akregator/akregator.setdlg:2 #: kontact/plugins/akregator/akregatorplugin.desktop:70 msgctxt "Name" msgid "Feeds" msgstr "Feeds" This string does not appear in the conflicts file. I guess cuz they don't match exactly. I wonder if this is a temporary problem, or something we'll see later on as well. -- To unsubscribe, e-mail: opensuse-translation+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-translation+help@opensuse.org

Mandag 16 marts 2009 13:21:02 skrev Stephan Kulow:

The scripts to merge the upstream translations in has a default on what to prefer and that's upstream for now (packages built). I'm free to change it to not overwrite changes in SVN though when we're nearing RC phase. That's what happened at 11.1 because (I think it was) italian team complained about the poor quality of KDE translations and it was not possible to get this fixed upstream in time.

Good. Think I finally understand now ;-)

What's in KDE branch is less interesting. In the desktop file there is no translation at all - as KDE leaves out 1:1 translations. As such it appears untranslated to my scripts. And because it's untranslated upstream, openSUSE fills the gap. Hard to do right I'm afraid.

Ok, I see this is a weird corner case then. I'll just fix it manually in openSUSE svn. No worries. -- To unsubscribe, e-mail: opensuse-translation+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-translation+help@opensuse.org