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

@@ -10,6 +10,7 @@ Name[en_GB]=Plasma (Development, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
 Name[es]=Plasma (Desarrollo, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
 Name[et]=Plasma (arendus, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
 Name[eu]=Plasma (Garapena, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
+Name[fi]=Plasma (kehitys, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
 Name[fr]=Plasma (Développement, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
 Name[gl]=Plasma (desenvolvemento, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
 Name[hu]=Plasma (Fejlesztői verzió, Wayland ${CMAKE_INSTALL_FULL_BINDIR})

login-sessions/plasmawayland.desktop.cmake

@@ -12,6 +12,7 @@ Name[en_GB]=Plasma (Wayland)
 Name[es]=Plasma (Wayland)
 Name[et]=Plasma (Wayland)
 Name[eu]=Plasma (Wayland)
+Name[fi]=Plasma (Wayland)
 Name[fr]=Plasma (Wayland)
 Name[gl]=Plasma (Wayland)
 Name[hu]=Plasma (Wayland)

login-sessions/plasmax11-dev.desktop.cmake

@@ -11,6 +11,7 @@ Name[en_GB]=Plasma (Development, X11 ${CMAKE_INSTALL_FULL_BINDIR})
 Name[es]=Plasma (Desarrollo, X11 ${CMAKE_INSTALL_FULL_BINDIR})
 Name[et]=Plasma (arendus, X11 ${CMAKE_INSTALL_FULL_BINDIR})
 Name[eu]=Plasma (Garapena, X11 ${CMAKE_INSTALL_FULL_BINDIR})
+Name[fi]=Plasma (kehitys, X11 ${CMAKE_INSTALL_FULL_BINDIR})
 Name[fr]=Plasma (Développement, X11 ${CMAKE_INSTALL_FULL_BINDIR})
 Name[gl]=Plasma (desenvolvemento, X11 ${CMAKE_INSTALL_FULL_BINDIR})
 Name[hu]=Plasma (Fejlesztői verzió, X11 ${CMAKE_INSTALL_FULL_BINDIR})

menu/desktop/kf5-network.directory

@@ -10,6 +10,7 @@ Name[en_GB]=Network
 Name[es]=Red
 Name[et]=Võrk
 Name[eu]=Sarea
+Name[fi]=Verkko
 Name[fr]=Réseau
 Name[gl]=Rede
 Name[hu]=Hálózat