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"

applets/devicenotifier/package/metadata.desktop

@@ -24,7 +24,7 @@ Name[pt]=Discos & Dispositivos
 Name[pt_BR]=Discos e dispositivos
 Name[ro]=Disc și dispozitive
 Name[ru]=Диски и устройства
-Name[sk]=Disky a Zariadenia
+Name[sk]=Disky a zariadenia
 Name[sl]=Diski in naprave
 Name[sv]=Diskar och enheter
 Name[tg]=Дискҳо ва дастгоҳҳо

login-sessions/plasmax11.desktop.cmake

@@ -4,6 +4,15 @@ Exec=${CMAKE_INSTALL_FULL_BINDIR}/startplasma-x11
 TryExec=${CMAKE_INSTALL_FULL_BINDIR}/startplasma-x11
 DesktopNames=KDE
 Name=Plasma (X11)
+Name[ca]=Plasma (X11)
+Name[es]=Plasma (X11)
+Name[eu]=Plasma (X11)
+Name[hu]=Plasma (X11)
+Name[nl]=Plasma (X11)
+Name[pt]=Plasma (X11)
+Name[sv]=Plasma (X11)
+Name[uk]=Плазма (X11)
+Name[x-test]=xxPlasma (X11)xx
 Comment=Plasma by KDE
 Comment[ar]=بلازما كدي
 Comment[ast]=Plasma por KDE