From efde8569a5b85698c77c0eee16e23991c6a05deb Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 9 Jan 2018 04:57:16 +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/konsolerun.desktop      | 3 ++-
 desktop/org.kde.konsole.desktop | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/desktop/konsolerun.desktop b/desktop/konsolerun.desktop
index 6b610c39..13e996c7 100644
--- a/desktop/konsolerun.desktop
+++ b/desktop/konsolerun.desktop
@@ -38,7 +38,7 @@ Name[nb]=Kjør i Konsole
 Name[nds]=Binnen Konsole lopen
 Name[nl]=In Konsole uitvoeren
 Name[nn]=Køyr i konsoll
-Name[pa]=ਕੰਨਸੋਲ ਵਿੱਚ ਚਲਾਓ
+Name[pa]=ਕਨਸੋਲ ਵਿੱਚ ਚਲਾਓ
 Name[pl]=Uruchom w konsoli
 Name[pt]=Executar no Konsole
 Name[pt_BR]=Executar no Konsole
@@ -80,6 +80,7 @@ Comment[ko]=Konsole에서 실행
 Comment[nb]=Kjør inne i Konsole
 Comment[nl]=In Konsole uitvoeren
 Comment[nn]=Køyr inni konsoll
+Comment[pa]=ਕਨਸੋਲ ਵਿੱਚ ਚਲਾਓ
 Comment[pl]=Uruchom wewnątrz konsoli
 Comment[pt]=Executar no Konsole
 Comment[pt_BR]=Executar no Konsole
diff --git a/desktop/org.kde.konsole.desktop b/desktop/org.kde.konsole.desktop
index ea7d4e35..163a72de 100755
--- a/desktop/org.kde.konsole.desktop
+++ b/desktop/org.kde.konsole.desktop
@@ -303,6 +303,7 @@ Name[ko]=새 탭 열기
 Name[nb]=Åpne en ny fane
 Name[nl]=Een nieuw tabblad openen
 Name[nn]=Opna ny fane
+Name[pa]=ਨਵੀਂ ਟੈਬ ਖੋਲ੍ਹੋ
 Name[pl]=Otwórz nową kartę
 Name[pt]=Abrir uma Nova Página
 Name[pt_BR]=Abre uma nova aba