From 4db599dcf82743f915a4e5c227f17abc0ea2968a Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 6 Aug 2016 09:58:49 +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"
---
 .../plasma-wallpaper/package/metadata.desktop | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/templates/plasma-wallpaper/package/metadata.desktop b/templates/plasma-wallpaper/package/metadata.desktop
index 6e9305b5f..35a08ce52 100644
--- a/templates/plasma-wallpaper/package/metadata.desktop
+++ b/templates/plasma-wallpaper/package/metadata.desktop
@@ -1,5 +1,36 @@
 [Desktop Entry]
 Name=%{APPNAME}
+Name[ast]=%{APPNAME}
+Name[ca]=%{APPNAME}
+Name[ca@valencia]=%{APPNAME}
+Name[cs]=%{APPNAME}
+Name[da]=%{APPNAME}
+Name[de]=%{APPNAME}
+Name[en_GB]=%{APPNAME}
+Name[es]=%{APPNAME}
+Name[fi]=%{APPNAME}
+Name[gd]=%{APPNAME}
+Name[gl]=%{APPNAME}
+Name[it]=%{APPNAME}
+Name[ko]=%{APPNAME}
+Name[nb]=%{APPNAME}
+Name[nl]=%{APPNAME}
+Name[nn]=%{APPNAME}
+Name[pl]=%{APPNAME}
+Name[pt]=%{APPNAME}
+Name[pt_BR]=%{APPNAME}
+Name[ru]=%{APPNAME}
+Name[sk]=%{APPNAME}
+Name[sl]=%{APPNAME}
+Name[sr]=%{APPNAME}
+Name[sr@ijekavian]=%{APPNAME}
+Name[sr@ijekavianlatin]=%{APPNAME}
+Name[sr@latin]=%{APPNAME}
+Name[sv]=%{APPNAME}
+Name[uk]=%{APPNAME}
+Name[x-test]=xx%{APPNAME}xx
+Name[zh_CN]=%{APPNAME}
+Name[zh_TW]=%{APPNAME}
 
 Type=Service
 Icon=plasma