SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Author: l10n daemon script

libcolorcorrect/kded/colorcorrectlocationupdater.desktop

@@ -9,6 +9,7 @@ Name[fr]=Actualisation de géolocalisation ColorCorrect
 Name[gl]=Actualizador de geolocalización de ColorCorrect
 Name[it]=ColorCorrect Geolocation Updater
 Name[nl]=Bijwerker van kleurgecorrigeerde geo-locatie
+Name[nn]=ColorCorrect geolokasjonsoppdaterar
 Name[pl]=Uaktualnianie położenia geograficznego dla poprawnej barwy
 Name[pt]=Actualização da Geo-Localização da Correcção de Cores
 Name[pt_BR]=Atualizador de geolocalização do ColorCorrect