From b95d34eede65b5746e4224f4f6eef2aec17ee85a Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 13 Jan 2020 09:35:20 +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"
---
 desktop/org.kde.konsole.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/desktop/org.kde.konsole.desktop b/desktop/org.kde.konsole.desktop
index de604f73..fdcf8ac7 100755
--- a/desktop/org.kde.konsole.desktop
+++ b/desktop/org.kde.konsole.desktop
@@ -302,7 +302,7 @@ Name[eu]=Ireki fitxa berri bat
 Name[fa]=باز کردن یک برگه جدید
 Name[fi]=Avaa uusi välilehti
 Name[fr]=Ouvrir un nouvel onglet
-Name[gl]=Abrir unha lapela nova
+Name[gl]=Abrir un novo separador
 Name[he]=פתח כרטיסיה חדשה
 Name[hu]=Új lap megnyitása
 Name[ia]=Aperi un nove scheda