Initial merge

[David Faure]

On Friday 04 February 2011, Johannes Sixt wrote:
> The assumption is that any change that happened to
> these files since the transition to git is automatically generated, and
> any manual change I would have made would be overwritten by Script Kiddy
> on its next run.

No, scripty only overrides translations, not other changes.

> Or lets state it in a completely different way: I assume that there are no
> changes in *.desktop and similar files in any of the branches that need
> forward-porting.

This, on the other hand, is probably true. At least I try to never "forget to 
forwardport", there's no reason not to forwardport immediately
[unlike the other way around, as discussed elsewhere in this thread].

-- 
David Faure, faure at kde.org, http://www.davidfaure.fr
Sponsored by Nokia to work on KDE, incl. Konqueror (http://www.konqueror.org).