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"

dataengines/devicenotifications/devicenotifications.notifyrc

@@ -47,6 +47,7 @@ Name[lv]=Ierīču paziņotājs
 Name[mk]=Известувач за уреди
 Name[ml]=ഡിവൈസ് നോട്ടിഫയര്‍
 Name[mr]=साधन निदर्शक
+Name[nb]=Enhetsvarsler
 Name[nds]=Bescheden över Reedschappen
 Name[nl]=Apparaatmelder
 Name[nn]=Einingsvarslar