From fa55a95bde9910b66b6ec9cdde6277aa9ffebeb5 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 9 Jan 2018 05:07:12 +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"
---
 applets/systemmonitor/net/metadata.desktop                    | 2 +-
 .../applauncher/plasma-containmentactions-applauncher.desktop | 4 ++--
 .../paste/plasma-containmentactions-paste.desktop             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/applets/systemmonitor/net/metadata.desktop b/applets/systemmonitor/net/metadata.desktop
index 2c8730790..a4086cff4 100644
--- a/applets/systemmonitor/net/metadata.desktop
+++ b/applets/systemmonitor/net/metadata.desktop
@@ -111,7 +111,7 @@ Comment[nds]=En Kieker för den Nettwark-Bruuk
 Comment[nl]=Toont het netwerkgebruik
 Comment[nn]=Overvaking av nettverksbruk
 Comment[or]=ଗୋଟିଏ ନେଟୱର୍କ ବ୍ୟବହାର ବିଧି ନିରିକ୍ଷକ
-Comment[pa]=ਇੱਕ ਨੈੱਟਵਰਕ ਵਰਤੋਂ ਮਾਨੀਟਰ
+Comment[pa]=ਨੈੱਟਵਰਕ ਵਰਤੋਂ ਨਿਗਰਾਨ
 Comment[pl]=Monitoruje wykorzystanie sieci
 Comment[pt]=Um monitor da utilização da rede
 Comment[pt_BR]=Um monitor de utilização da rede
diff --git a/containmentactions/applauncher/plasma-containmentactions-applauncher.desktop b/containmentactions/applauncher/plasma-containmentactions-applauncher.desktop
index 1c50b95fa..f7f7eea0d 100644
--- a/containmentactions/applauncher/plasma-containmentactions-applauncher.desktop
+++ b/containmentactions/applauncher/plasma-containmentactions-applauncher.desktop
@@ -55,7 +55,7 @@ Name[ne]=अनुप्रयोक सुरुआतकर्ता
 Name[nl]=Programmastarter
 Name[nn]=Programstartar
 Name[or]=ପ୍ରୟୋଗ ଆରମ୍ଭକର୍ତ୍ତା
-Name[pa]=ਐਪਲੀਕੇਸ਼ ਲਾਂਚਰ
+Name[pa]=ਐਪਲੀਕੇਸ਼ਨ ਲਾਂਚਰ
 Name[pl]=Aktywator programów
 Name[pt]=Lançador de Aplicações
 Name[pt_BR]=Lançador de aplicativos
@@ -129,7 +129,7 @@ Comment[nb]=Enkel programstarter
 Comment[nds]=Eenfach Programmoproper
 Comment[nl]=Eenvoudige programmastarter
 Comment[nn]=Enkel programstartar
-Comment[pa]=ਸਧਾਰਨ ਐਪਲੀਕੇਸ਼ ਲਾਂਚਰ
+Comment[pa]=ਸਧਾਰਨ ਐਪਲੀਕੇਸ਼ਨ ਲਾਂਚਰ
 Comment[pl]=Uruchamia programy w prosty sposób
 Comment[pt]=Lançador de aplicações simples
 Comment[pt_BR]=Lançador de aplicativos simples
diff --git a/containmentactions/paste/plasma-containmentactions-paste.desktop b/containmentactions/paste/plasma-containmentactions-paste.desktop
index 925f35f05..2b9a6cf32 100644
--- a/containmentactions/paste/plasma-containmentactions-paste.desktop
+++ b/containmentactions/paste/plasma-containmentactions-paste.desktop
@@ -109,7 +109,7 @@ Comment[nb]=Lager et skjermelement av innholdet fra utklippstavla
 Comment[nds]=Stellt ut den Twischenaflaag-Inholt en Lüttprogramm op
 Comment[nl]=Maakt een widget aan uit de inhoud van het klembord
 Comment[nn]=Lag eit element frå innhaldet på utklippstavla
-Comment[pa]=ਕਲਿੱਪਬੋਰਡ ਦੀ ਸਮੱਗਰੀ ਤੋਂ ਵਿਦਜੈੱਟ ਬਣਾਉ
+Comment[pa]=ਕਲਿੱਪਬੋਰਡ ਦੀ ਸਮੱਗਰੀ ਤੋਂ ਵਿਦਜੈੱਟ ਬਣਾਓ
 Comment[pl]=Wyświetla zawartość schowka
 Comment[pt]=Cria um elemento a partir do conteúdo da área de transferência
 Comment[pt_BR]=Cria um widget a partir do conteúdo da área de transferência