From 5075f16fdb22939a19233d8469919d1fe248894a Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 6 Feb 2016 09:46:26 +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"
---
 desktop/konsolehere.desktop      | 1 +
 desktop/konsolepart.desktop      | 1 +
 desktop/konsolerun.desktop       | 1 +
 desktop/org.kde.konsole.desktop  | 2 ++
 desktop/terminalemulator.desktop | 1 +
 5 files changed, 6 insertions(+)

diff --git a/desktop/konsolehere.desktop b/desktop/konsolehere.desktop
index da5cbb61..f5e7892f 100644
--- a/desktop/konsolehere.desktop
+++ b/desktop/konsolehere.desktop
@@ -110,6 +110,7 @@ Comment[es]=Abre una terminal en la carpeta actual
 Comment[ia]=Aperi un terminal al dossier currente
 Comment[it]=Apre un terminale alla cartella attuale
 Comment[nl]=Opent een terminal in de huidige map
+Comment[pl]=Otwiera terminal w bieżącym katalogu
 Comment[pt]=Abre um terminal na pasta actual
 Comment[pt_BR]=Abre um terminal na pasta atual
 Comment[sk]=Otvorí terminál v aktuálnom priečinku
diff --git a/desktop/konsolepart.desktop b/desktop/konsolepart.desktop
index 65ad3793..f0ea2672 100644
--- a/desktop/konsolepart.desktop
+++ b/desktop/konsolepart.desktop
@@ -112,6 +112,7 @@ Comment[es]=Acceso a la línea de órdenes
 Comment[ia]=Accesso a linea de commando
 Comment[it]=Accesso alla riga di comando
 Comment[nl]=Toegang tot de opdrachtregel
+Comment[pl]=Dostęp do wiersza poleceń
 Comment[pt]=Acesso à linha de comandos
 Comment[pt_BR]=Acesso à linha de comandos
 Comment[sk]=Prístup na príkazový riadok
diff --git a/desktop/konsolerun.desktop b/desktop/konsolerun.desktop
index 6503f4ad..e188c272 100644
--- a/desktop/konsolerun.desktop
+++ b/desktop/konsolerun.desktop
@@ -65,6 +65,7 @@ Comment[es]=Ejecutar en Konsole
 Comment[ia]=Executa intra Konsole
 Comment[it]=Esegui in Konsole
 Comment[nl]=In Konsole uitvoeren
+Comment[pl]=Uruchom wewnątrz konsoli
 Comment[pt]=Executar no Konsole
 Comment[pt_BR]=Executar no Konsole
 Comment[sk]=Spustiť v Konsole
diff --git a/desktop/org.kde.konsole.desktop b/desktop/org.kde.konsole.desktop
index 93137bed..4232be52 100755
--- a/desktop/org.kde.konsole.desktop
+++ b/desktop/org.kde.konsole.desktop
@@ -196,6 +196,7 @@ Comment[es]=Acceso a la línea de órdenes
 Comment[ia]=Accesso a linea de commando
 Comment[it]=Accesso alla riga di comando
 Comment[nl]=Toegang tot de opdrachtregel
+Comment[pl]=Dostęp do wiersza poleceń
 Comment[pt]=Acesso à linha de comandos
 Comment[pt_BR]=Acesso à linha de comandos
 Comment[sk]=Prístup na príkazový riadok
@@ -261,6 +262,7 @@ Name[es]=Abrir una nueva pestaña
 Name[ia]=Aperi un nove scheda
 Name[it]=Apri in una nuova scheda
 Name[nl]=Een nieuw tabblad openen
+Name[pl]=Otwórz nową kartę
 Name[pt]=Abrir uma Nova Página
 Name[pt_BR]=Abre uma nova aba
 Name[sk]=Otvoriť novú kartu
diff --git a/desktop/terminalemulator.desktop b/desktop/terminalemulator.desktop
index 6c5f6467..9b1f999e 100644
--- a/desktop/terminalemulator.desktop
+++ b/desktop/terminalemulator.desktop
@@ -103,6 +103,7 @@ Comment[es]=Acceso a la línea de órdenes
 Comment[ia]=Accesso a linea de commando
 Comment[it]=Accesso alla riga di comando
 Comment[nl]=Toegang tot de opdrachtregel
+Comment[pl]=Dostęp do wiersza poleceń
 Comment[pt]=Acesso à linha de comandos
 Comment[pt_BR]=Acesso à linha de comandos
 Comment[sk]=Prístup na príkazový riadok