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

@@ -3,6 +3,7 @@ Exec=dbus-run-session @CMAKE_INSTALL_FULL_LIBEXECDIR@/startplasma-dev.sh -waylan
 DesktopNames=KDE
 Name=Plasma (Development, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
 Name[ca]=Plasma (Desenvolupament, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
+Name[es]=Plasma (Desarrollo, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
 Name[lt]=Plasma (Plėtojimas, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
 Name[pt]=Plasma (Desenvolvimento, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
 Name[uk]=Пзазма (Розробка, Wayland ${CMAKE_INSTALL_FULL_BINDIR})

login-sessions/plasmawayland.desktop.cmake

@@ -4,6 +4,8 @@ TryExec=${CMAKE_INSTALL_FULL_BINDIR}/startplasma-wayland
 DesktopNames=KDE
 Name=Plasma (Wayland)
 Name[ca]=Plasma (Wayland)
+Name[cs]=Plasma (Wayland)
+Name[es]=Plasma (Wayland)
 Name[lt]=Plasma (Wayland)
 Name[pt]=Plasma (Wayland)
 Name[uk]=Плазма (Wayland)

login-sessions/plasmax11-dev.desktop.cmake

@@ -4,6 +4,7 @@ Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/startplasma-dev.sh -x11
 DesktopNames=KDE
 Name=Plasma (Development, X11 ${CMAKE_INSTALL_FULL_BINDIR})
 Name[ca]=Plasma (Desenvolupament, X11 ${CMAKE_INSTALL_FULL_BINDIR})
+Name[es]=Plasma (Desarrollo, X11 ${CMAKE_INSTALL_FULL_BINDIR})
 Name[lt]=Plasma (Plėtojimas, X11 ${CMAKE_INSTALL_FULL_BINDIR})
 Name[pt]=Plasma (Desenvolvimento, X11 ${CMAKE_INSTALL_FULL_BINDIR})
 Name[uk]=Пзазма (Розробка, X11 ${CMAKE_INSTALL_FULL_BINDIR})

menu/desktop/kf5-network.directory

@@ -2,6 +2,8 @@
 Type=Directory
 Name=Network
 Name[ca]=Xarxa
+Name[cs]=Síť
+Name[es]=Red
 Name[lt]=Tinklas
 Name[pt]=Rede
 Name[uk]=Мережа