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"

lookandfeel.twilight/metadata.desktop

@@ -7,6 +7,7 @@ Comment[es]=Brisa crepúsculo por KDE VDG
 Comment[et]=Breeze videvik KDE VDG-lt
 Comment[it]=Brezza crepuscolo a cura del VDG di KDE
 Comment[nl]=Breeze Twilight door de KDE VDG
+Comment[nn]=Breeze skumring frå KDE VDG
 Comment[pt]=Brisa da Madrugada da VDG do KDE
 Comment[sl]=Sapica ob mraku s strani KDE VDG
 Comment[sv]=Breeze skymning av KDE:s visuella designgrupp
@@ -20,6 +21,7 @@ Name[es]=Brisa crepúsculo
 Name[et]=Breeze videvik
 Name[it]=Brezza crepuscolo
 Name[nl]=Breeze Twilight
+Name[nn]=Breeze skumring
 Name[pt]=Brisa da Madrugada
 Name[sl]=Sapica ob mraku
 Name[sv]=Breeze skymning