From 6400bcbd2f60aca2b7c0a626e748d889b289d2cf Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 6 Jun 2022 01:42:59 +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"
---
 kcms/autostart/kcm_autostart.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kcms/autostart/kcm_autostart.desktop b/kcms/autostart/kcm_autostart.desktop
index 103ad6f5e..2da4d9a52 100644
--- a/kcms/autostart/kcm_autostart.desktop
+++ b/kcms/autostart/kcm_autostart.desktop
@@ -25,7 +25,7 @@ Name[ml]=സ്വയം തുടങ്ങുന്നവ
 Name[nl]=Autostart
 Name[nn]=Autostart
 Name[pa]=ਆਟੋ-ਸਟਾਰਟ
-Name[pl]=Samo-uruchamiane
+Name[pl]=Samouruchamiane
 Name[pt]=Arranque
 Name[pt_BR]=Iniciar automaticamente
 Name[ro]=Pornire automată