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"

login-sessions/plasmawayland-dev.desktop.cmake

@@ -2,30 +2,6 @@
 Exec=dbus-run-session @CMAKE_INSTALL_FULL_LIBEXECDIR@/startplasma-dev.sh -wayland
 DesktopNames=KDE
 Name=Plasma (Development, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
-Name[ca]=Plasma (Desenvolupament ${CMAKE_INSTALL_FULL_BINDIR})
-Name[ca@valencia]=Plasma (Desenvolupament ${CMAKE_INSTALL_FULL_BINDIR})
-Name[de]=Plasma (Development ${CMAKE_INSTALL_FULL_BINDIR})
-Name[en_GB]=Plasma (Development ${CMAKE_INSTALL_FULL_BINDIR})
-Name[es]=Plasma (Desarrollo ${CMAKE_INSTALL_FULL_BINDIR})
-Name[eu]=Plasma (Garapena ${CMAKE_INSTALL_FULL_BINDIR})
-Name[fi]=Plasma (kehitys ${CMAKE_INSTALL_FULL_BINDIR})
-Name[fr]=Plasma (Développement ${CMAKE_INSTALL_FULL_BINDIR})
-Name[gl]=Plasma (${CMAKE_INSTALL_FULL_BINDIR} de desenvolvemento)
-Name[id]=Plasma (Pengembangan${CMAKE_INSTALL_FULL_BINDIR})
-Name[it]=Plasma (Sviluppo ${CMAKE_INSTALL_FULL_BINDIR})
-Name[lt]=Plasma (Plėtojimas ${CMAKE_INSTALL_FULL_BINDIR})
-Name[nl]=Plasma (Ontwikkeling ${CMAKE_INSTALL_FULL_BINDIR})
-Name[nn]=Plasma (utvikling ${CMAKE_INSTALL_FULL_BINDIR})
-Name[pl]=Plazma (Rozwój ${CMAKE_INSTALL_FULL_BINDIR})
-Name[pt]=Plasma (Desenvolvimento ${CMAKE_INSTALL_FULL_BINDIR})
-Name[pt_BR]=Plasma (Desenvolvimento ${CMAKE_INSTALL_FULL_BINDIR})
-Name[ru]=Plasma (разрабатываемая версия ${CMAKE_INSTALL_FULL_BINDIR})
-Name[sk]=Plasma (Development ${CMAKE_INSTALL_FULL_BINDIR})
-Name[sv]=Plasma (utveckling ${CMAKE_INSTALL_FULL_BINDIR})
-Name[uk]=Пзазма (Розробка ${CMAKE_INSTALL_FULL_BINDIR})
-Name[x-test]=xxPlasma (Development ${CMAKE_INSTALL_FULL_BINDIR})xx
-Name[zh_CN]=Plasma (开发 ${CMAKE_INSTALL_FULL_BINDIR})
-Name[zh_TW]=Plasma（開發版本 ${CMAKE_INSTALL_FULL_BINDIR}）
 Comment=Plasma by KDE
 Comment[ar]=بلازما كدي
 Comment[bs]=Plazma od strane KDe

login-sessions/plasmawayland.desktop.cmake

@@ -3,51 +3,6 @@ Exec=dbus-run-session ${CMAKE_INSTALL_FULL_BINDIR}/startplasma-wayland
 TryExec=${CMAKE_INSTALL_FULL_BINDIR}/startplasma-wayland
 DesktopNames=KDE
 Name=Plasma (Wayland)
-Name[ar]=بلازما
-Name[bs]=Plazma
-Name[ca]=Plasma
-Name[ca@valencia]=Plasma
-Name[cs]=Plasma
-Name[da]=Plasma
-Name[de]=Plasma
-Name[el]=Plasma
-Name[en_GB]=Plasma
-Name[es]=Plasma
-Name[et]=Plasma
-Name[eu]=Plasma
-Name[fi]=Plasma
-Name[fr]=Plasma
-Name[gl]=Plasma
-Name[he]=פלזמה
-Name[hu]=Plasma
-Name[id]=Plasma
-Name[is]=Plasma
-Name[it]=Plasma
-Name[ja]=プラズマ
-Name[ko]=Plasma
-Name[lt]=Plasma
-Name[nb]=Plasma
-Name[nds]=Plasma
-Name[nl]=Plasma
-Name[nn]=Plasma
-Name[pa]=ਪਲਾਜ਼ਮਾ
-Name[pl]=Plazma
-Name[pt]=Plasma
-Name[pt_BR]=Plasma
-Name[ru]=Plasma
-Name[sk]=Plasma
-Name[sl]=Plasma
-Name[sr]=Плазма
-Name[sr@ijekavian]=Плазма
-Name[sr@ijekavianlatin]=Plasma
-Name[sr@latin]=Plasma
-Name[sv]=Plasma
-Name[tg]=Плазма
-Name[tr]=Plama
-Name[uk]=Плазма
-Name[x-test]=xxPlasmaxx
-Name[zh_CN]=Plasma
-Name[zh_TW]=Plasma
 Comment=Plasma by KDE
 Comment[ar]=بلازما كدي
 Comment[bs]=Plazma od strane KDe

login-sessions/plasmax11-dev.desktop.cmake

@@ -3,30 +3,6 @@ Type=XSession
 Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/startplasma-dev.sh -x11
 DesktopNames=KDE
 Name=Plasma (Development, X11 ${CMAKE_INSTALL_FULL_BINDIR})
-Name[ca]=Plasma (Desenvolupament ${CMAKE_INSTALL_FULL_BINDIR})
-Name[ca@valencia]=Plasma (Desenvolupament ${CMAKE_INSTALL_FULL_BINDIR})
-Name[de]=Plasma (Development ${CMAKE_INSTALL_FULL_BINDIR})
-Name[en_GB]=Plasma (Development ${CMAKE_INSTALL_FULL_BINDIR})
-Name[es]=Plasma (Desarrollo ${CMAKE_INSTALL_FULL_BINDIR})
-Name[eu]=Plasma (Garapena ${CMAKE_INSTALL_FULL_BINDIR})
-Name[fi]=Plasma (kehitys ${CMAKE_INSTALL_FULL_BINDIR})
-Name[fr]=Plasma (Développement ${CMAKE_INSTALL_FULL_BINDIR})
-Name[gl]=Plasma (${CMAKE_INSTALL_FULL_BINDIR} de desenvolvemento)
-Name[id]=Plasma (Pengembangan${CMAKE_INSTALL_FULL_BINDIR})
-Name[it]=Plasma (Sviluppo ${CMAKE_INSTALL_FULL_BINDIR})
-Name[lt]=Plasma (Plėtojimas ${CMAKE_INSTALL_FULL_BINDIR})
-Name[nl]=Plasma (Ontwikkeling ${CMAKE_INSTALL_FULL_BINDIR})
-Name[nn]=Plasma (utvikling ${CMAKE_INSTALL_FULL_BINDIR})
-Name[pl]=Plazma (Rozwój ${CMAKE_INSTALL_FULL_BINDIR})
-Name[pt]=Plasma (Desenvolvimento ${CMAKE_INSTALL_FULL_BINDIR})
-Name[pt_BR]=Plasma (Desenvolvimento ${CMAKE_INSTALL_FULL_BINDIR})
-Name[ru]=Plasma (разрабатываемая версия ${CMAKE_INSTALL_FULL_BINDIR})
-Name[sk]=Plasma (Development ${CMAKE_INSTALL_FULL_BINDIR})
-Name[sv]=Plasma (utveckling ${CMAKE_INSTALL_FULL_BINDIR})
-Name[uk]=Пзазма (Розробка ${CMAKE_INSTALL_FULL_BINDIR})
-Name[x-test]=xxPlasma (Development ${CMAKE_INSTALL_FULL_BINDIR})xx
-Name[zh_CN]=Plasma (开发 ${CMAKE_INSTALL_FULL_BINDIR})
-Name[zh_TW]=Plasma（開發版本 ${CMAKE_INSTALL_FULL_BINDIR}）
 Comment=Plasma by KDE
 Comment[ar]=بلازما كدي
 Comment[bs]=Plazma od strane KDe