From 71a03a0b71413a7df86a16eade4745fc04e077df Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 23 Jun 2019 05:14:13 +0200
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"
---
 krunner/krunner.desktop                       |  1 +
 .../plasmawayland-dev.desktop.cmake           | 44 +++++++++++++++++++
 login-sessions/plasmax11-dev.desktop.cmake    | 44 +++++++++++++++++++
 3 files changed, 89 insertions(+)

diff --git a/krunner/krunner.desktop b/krunner/krunner.desktop
index 0ca61308a..4ab9659df 100644
--- a/krunner/krunner.desktop
+++ b/krunner/krunner.desktop
@@ -62,6 +62,7 @@ Name[eu]=Exekutatu komandoa arbelaren edukiaren gain
 Name[it]=Esegui comando sui contenuti degli appunti
 Name[ko]=클립보드 내용에서 명령 실행하기
 Name[nl]=Commando uitvoeren op klembordinhoud
+Name[pl]=Wykonaj polecenie na zawartości schowka
 Name[pt]=Executar o comando no conteúdo da área de transferência
 Name[pt_BR]=Executar comando no conteúdo da área de transferência
 Name[sv]=Kör kommando med klippbordets innehåll
diff --git a/login-sessions/plasmawayland-dev.desktop.cmake b/login-sessions/plasmawayland-dev.desktop.cmake
index 9319029fc..b98339095 100644
--- a/login-sessions/plasmawayland-dev.desktop.cmake
+++ b/login-sessions/plasmawayland-dev.desktop.cmake
@@ -3,4 +3,48 @@ Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/startplasma-dev.sh -wayland
 DesktopNames=KDE
 Name=Plasma (Development ${CMAKE_INSTALL_FULL_BINDIR})
 Comment=Plasma by KDE
+Comment[ar]=بلازما كدي
+Comment[bs]=Plazma od strane KDe
+Comment[ca]=Plasma, creat per la comunitat KDE
+Comment[ca@valencia]=Plasma, creat per la comunitat KDE
+Comment[cs]=Plasma z KDE
+Comment[da]=Plasma fra KDE
+Comment[de]=Plasma von KDE
+Comment[el]=Plasma από το KDE
+Comment[en_GB]=Plasma by KDE
+Comment[es]=Plasma, por KDE
+Comment[et]=KDE Plasma
+Comment[eu]=KDEren Plasma
+Comment[fi]=Plasma KDE:ltä
+Comment[fr]=Plasma, par KDE
+Comment[gl]=Plasma, fornecido por KDE.
+Comment[he]=פלזמה באמצעות KDE
+Comment[hu]=Plasma a KDE-től
+Comment[id]=Plasma oleh KDE
+Comment[is]=Plasma frá KDE
+Comment[it]=Plasma di KDE
+Comment[ja]=Plasma by KDE
+Comment[ko]=KDE Plasma
+Comment[lt]=Plasmą sukūrė KDE
+Comment[nb]=Plasma av KDE
+Comment[nds]=Plasma vun KDE
+Comment[nl]=Plasma door KDE
+Comment[nn]=Plasma frå KDE
+Comment[pa]=KDE ਵਲੋਂ ਪਲਾਜ਼ਮਾ
+Comment[pl]=Plazma dzięki KDE
+Comment[pt]=Plasma do KDE
+Comment[pt_BR]=Plasma do KDE
+Comment[ru]=KDE Plasma
+Comment[sk]=Plasma od KDE
+Comment[sl]=KDE Plasma
+Comment[sr]=Плазма од КДЕ‑а
+Comment[sr@ijekavian]=Плазма од КДЕ‑а
+Comment[sr@ijekavianlatin]=Plasma od KDE‑a
+Comment[sr@latin]=Plasma od KDE‑a
+Comment[sv]=Plasma av KDE
+Comment[tr]=KDE Plasma
+Comment[uk]=Плазма KDE
+Comment[x-test]=xxPlasma by KDExx
+Comment[zh_CN]=KDE Plasma
+Comment[zh_TW]=Plasma by KDE
 X-KDE-PluginInfo-Version=${PROJECT_VERSION}
diff --git a/login-sessions/plasmax11-dev.desktop.cmake b/login-sessions/plasmax11-dev.desktop.cmake
index d07148d28..cdd088678 100644
--- a/login-sessions/plasmax11-dev.desktop.cmake
+++ b/login-sessions/plasmax11-dev.desktop.cmake
@@ -4,4 +4,48 @@ Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/startplasma-dev.sh -x11
 DesktopNames=KDE
 Name=Plasma (Development ${CMAKE_INSTALL_FULL_BINDIR})
 Comment=Plasma by KDE
+Comment[ar]=بلازما كدي
+Comment[bs]=Plazma od strane KDe
+Comment[ca]=Plasma, creat per la comunitat KDE
+Comment[ca@valencia]=Plasma, creat per la comunitat KDE
+Comment[cs]=Plasma z KDE
+Comment[da]=Plasma fra KDE
+Comment[de]=Plasma von KDE
+Comment[el]=Plasma από το KDE
+Comment[en_GB]=Plasma by KDE
+Comment[es]=Plasma, por KDE
+Comment[et]=KDE Plasma
+Comment[eu]=KDEren Plasma
+Comment[fi]=Plasma KDE:ltä
+Comment[fr]=Plasma, par KDE
+Comment[gl]=Plasma, fornecido por KDE.
+Comment[he]=פלזמה באמצעות KDE
+Comment[hu]=Plasma a KDE-től
+Comment[id]=Plasma oleh KDE
+Comment[is]=Plasma frá KDE
+Comment[it]=Plasma di KDE
+Comment[ja]=Plasma by KDE
+Comment[ko]=KDE Plasma
+Comment[lt]=Plasmą sukūrė KDE
+Comment[nb]=Plasma av KDE
+Comment[nds]=Plasma vun KDE
+Comment[nl]=Plasma door KDE
+Comment[nn]=Plasma frå KDE
+Comment[pa]=KDE ਵਲੋਂ ਪਲਾਜ਼ਮਾ
+Comment[pl]=Plazma dzięki KDE
+Comment[pt]=Plasma do KDE
+Comment[pt_BR]=Plasma do KDE
+Comment[ru]=KDE Plasma
+Comment[sk]=Plasma od KDE
+Comment[sl]=KDE Plasma
+Comment[sr]=Плазма од КДЕ‑а
+Comment[sr@ijekavian]=Плазма од КДЕ‑а
+Comment[sr@ijekavianlatin]=Plasma od KDE‑a
+Comment[sr@latin]=Plasma od KDE‑a
+Comment[sv]=Plasma av KDE
+Comment[tr]=KDE Plasma
+Comment[uk]=Плазма KDE
+Comment[x-test]=xxPlasma by KDExx
+Comment[zh_CN]=KDE Plasma
+Comment[zh_TW]=Plasma by KDE
 X-KDE-PluginInfo-Version=${PROJECT_VERSION}