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

@@ -83,8 +83,10 @@ Name=Device Status
 Name[az]=Qurğuların statusu
 Name[ca]=Estat del dispositiu
 Name[cs]=Stav zařízení
+Name[de]=Gerätestatus
 Name[en_GB]=Device Status
 Name[es]=Estado del dispositivo
+Name[fi]=Laitteen tila
 Name[fr]=État du périphérique
 Name[ia]=Stato de dispositivo
 Name[id]=Status Perangkat

kcms/desktoptheme/plasma-themes.knsrc

@@ -3,8 +3,10 @@ Name=Plasma Themes
 Name[az]=Plasma mövzuları
 Name[ca]=Temes del Plasma
 Name[cs]=Motivy Plasmy
+Name[de]=Plasma-Designs
 Name[en_GB]=Plasma Themes
 Name[es]=Temas de Plasma
+Name[fi]=Plasma-teemat
 Name[fr]=Thèmes Plasma
 Name[ia]=Themas de Plasma
 Name[it]=Temi di Plasma