From 85b1a822c0b415692a341920afcd6de9fcb613ff Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 5 Feb 2021 07:46:31 +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/plasmax11.desktop.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/login-sessions/plasmax11.desktop.cmake b/login-sessions/plasmax11.desktop.cmake index 56a88bda4..35fdf9b97 100644 --- a/login-sessions/plasmax11.desktop.cmake +++ b/login-sessions/plasmax11.desktop.cmake @@ -10,6 +10,7 @@ Name[ca]=Plasma (X11) Name[en_GB]=Plasma (X11) Name[es]=Plasma (X11) Name[eu]=Plasma (X11) +Name[fi]=Plasma (X11) Name[fr]=Plasma (X11) Name[hu]=Plasma (X11) Name[ia]=Plasma (X11)