From f3b1522bf691aa8c93946c802da6b5bd9bdbf6f9 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 20 Aug 2019 05:05:24 +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"
---
 applets/clock/metadata.desktop            | 2 +-
 shell/metadata.desktop                    | 1 +
 touchscreentest/org.kde.touchtest.desktop | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/applets/clock/metadata.desktop b/applets/clock/metadata.desktop
index 7d010403..c88cc543 100644
--- a/applets/clock/metadata.desktop
+++ b/applets/clock/metadata.desktop
@@ -29,7 +29,7 @@ Comment=Time displayed in a digital format
 Comment[ca]=Mostra l'hora en un format digital
 Comment[ca@valencia]=Mostra l'hora en un format digital
 Comment[cs]=Čas zobrazený v digitální podobě
-Comment[de]=Zeigt die Uhrzeit in digitaler Form an.
+Comment[de]=Zeigt die Uhrzeit in digitaler Form an
 Comment[en_GB]=Time displayed in a digital format
 Comment[es]=La hora mostrada en formato digital
 Comment[fi]=Aika näytettynä digitaalimuodossa
diff --git a/shell/metadata.desktop b/shell/metadata.desktop
index 59aa7f10..fbf9ffb8 100644
--- a/shell/metadata.desktop
+++ b/shell/metadata.desktop
@@ -26,6 +26,7 @@ Comment=Plasma shell for phones
 Comment[ca]=Espai de treball Plasma per a telèfons
 Comment[ca@valencia]=Espai de treball Plasma per a telèfons
 Comment[cs]=Plasma Shell pro telefony
+Comment[de]=Plasma-Shell für Telefone
 Comment[es]=Interfaz de Plasma para teléfonos
 Comment[fr]=Terminal Plasma pour smartphones
 Comment[gl]=Intérprete de ordes de Plasma para móbiles
diff --git a/touchscreentest/org.kde.touchtest.desktop b/touchscreentest/org.kde.touchtest.desktop
index 023ec90d..02f576b7 100755
--- a/touchscreentest/org.kde.touchtest.desktop
+++ b/touchscreentest/org.kde.touchtest.desktop
@@ -3,6 +3,7 @@ Name=Touch Test
 Name[ca]=Prova el tàctil
 Name[ca@valencia]=Prova el tàctil
 Name[cs]=Test doteku
+Name[de]=Touch-Test
 Name[en_GB]=Touch Test
 Name[es]=Prueba táctil
 Name[fi]=Kosketustesti