From a22bccc6d78ec67147df8b4cc225cb59075e1ff8 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 3 Feb 2021 08:32:09 +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 8d50f4eda..56a88bda4 100644 --- a/login-sessions/plasmax11.desktop.cmake +++ b/login-sessions/plasmax11.desktop.cmake @@ -20,6 +20,7 @@ Name[nn]=Plasma (X11) Name[pa]=ਪਲਾਜ਼ਮਾ (X11) Name[pl]=Plazma (X11) Name[pt]=Plasma (X11) +Name[pt_BR]=Plasma (X11) Name[ru]=Plasma (X11) Name[sk]=Plasma (X11) Name[sl]=Plasma (X11)