From fa36628a8bbe3bd516e4d3d123153e39fa1cd260 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 5 May 2022 01:46:17 +0000 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" --- src/kcmkwin/kwinscripts/kwinscripts.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/kcmkwin/kwinscripts/kwinscripts.json b/src/kcmkwin/kwinscripts/kwinscripts.json index 9185b9d038..7c8d0a7bb7 100644 --- a/src/kcmkwin/kwinscripts/kwinscripts.json +++ b/src/kcmkwin/kwinscripts/kwinscripts.json @@ -11,6 +11,7 @@ "Description[it]": "Gestisci gli script di KWin", "Description[nl]": "KWin-scripts beheren", "Description[pl]": "Zarządzanie skryptami KWin", + "Description[pt]": "Gerir os programas do KWin", "Description[pt_BR]": "Gerencia os scripts do KWin", "Description[sl]": "Upravljaj KWin Scripte", "Description[sv]": "Hantera Kwin-skript", @@ -30,6 +31,7 @@ "Name[it]": "Script di KWin", "Name[nl]": "KWin-scripts", "Name[pl]": "Skrypty KWin", + "Name[pt]": "Programas do KWin", "Name[pt_BR]": "Scripts do KWin", "Name[sl]": "KWin Scripti", "Name[sv]": "Kwin-skript",