From 97ff2a209f5f00c164eb8ff02e25edbfd5302a30 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 21 Mar 2020 05:57:28 +0100 Subject: [PATCH] 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 | 1 + login-sessions/plasmawayland.desktop.cmake | 1 + login-sessions/plasmax11-dev.desktop.cmake | 1 + menu/desktop/kf5-network.directory | 1 + 4 files changed, 4 insertions(+) diff --git a/login-sessions/plasmawayland-dev.desktop.cmake b/login-sessions/plasmawayland-dev.desktop.cmake index 3e58d466a..c17da78b9 100644 --- a/login-sessions/plasmawayland-dev.desktop.cmake +++ b/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}) diff --git a/login-sessions/plasmawayland.desktop.cmake b/login-sessions/plasmawayland.desktop.cmake index 1a36a9c77..d2b914912 100644 --- a/login-sessions/plasmawayland.desktop.cmake +++ b/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) diff --git a/login-sessions/plasmax11-dev.desktop.cmake b/login-sessions/plasmax11-dev.desktop.cmake index f3bce66d3..7b467d3f1 100644 --- a/login-sessions/plasmax11-dev.desktop.cmake +++ b/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}) diff --git a/menu/desktop/kf5-network.directory b/menu/desktop/kf5-network.directory index 59b78eed7..08974b18a 100644 --- a/menu/desktop/kf5-network.directory +++ b/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