From 0015ff2ac60bb93d0a5b85abc2014974e8f8dd83 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 17 Feb 2019 08:30:42 +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"
---
 scripts/minimizeall/metadata.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/minimizeall/metadata.desktop b/scripts/minimizeall/metadata.desktop
index 7c39742c78..3a71e739ca 100644
--- a/scripts/minimizeall/metadata.desktop
+++ b/scripts/minimizeall/metadata.desktop
@@ -7,7 +7,7 @@ Name[da]=Minimér alle
 Name[de]=Alle minimieren
 Name[el]=ΕλαχιστοποίησηΌλων
 Name[en_GB]=MinimiseAll
-Name[es]=Maximizar todo
+Name[es]=Minimizar todo
 Name[et]=Kõigi minimeerimine
 Name[eu]=Minimizatu guztiak
 Name[fi]=Pienennä kaikki