From 3deb48b2520ab7b9344c5d179148e8af4b17e064 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 25 Jun 2017 05:43:31 +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"
---
 kcmkwin/kwinscreenedges/kwintouchscreen.desktop | 1 +
 scripts/minimizeall/metadata.desktop            | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop
index adef1393f9..61048876be 100644
--- a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop
+++ b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop
@@ -22,6 +22,7 @@ Name[eu]=Ukimen-pantaila
 Name[fi]=Kosketusnäyttö
 Name[he]=מסך מגע
 Name[it]=Schermo a sfioramento
+Name[lt]=Jutiklinis ekranas
 Name[nl]=Aanraakscherm
 Name[pl]=Ekran dotykowy
 Name[pt]=Ecrã Táctil
diff --git a/scripts/minimizeall/metadata.desktop b/scripts/minimizeall/metadata.desktop
index 8bd1bc81c4..a40d56d3c2 100644
--- a/scripts/minimizeall/metadata.desktop
+++ b/scripts/minimizeall/metadata.desktop
@@ -19,7 +19,7 @@ Name[ia]=MaximizaOmne
 Name[it]=Minimizza tutto
 Name[ja]=すべて最小化
 Name[ko]=모두최소화
-Name[lt]=SumažintiVisus
+Name[lt]=Sumažinti visus
 Name[nb]=Minimer alt
 Name[nl]=Alles-minimaliseren
 Name[nn]=Minimer alle