resolving i18n merge conflicts, is there a policy fot i18n commits?

[Thomas Lübking]

Is there any policy on i18n commits/conflicts, ie. like only 4.8 is up to  
date (seems to me?) so one can safely
git merge -Xtheirs origin/KDE/4.8

The problem is that i get like a bazillion conflicts in .desktop files and  
i can't resolve them by hand, since i cannot read most of the conflicts :-(

Cheers,
Thomas