From 0c453d520f84a68c51e11cb53a5b0d2b7eaedf81 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 22 Nov 2015 09:56:21 +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"
---
 kcmkwin/kwinoptions/kwinadvanced.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kcmkwin/kwinoptions/kwinadvanced.desktop b/kcmkwin/kwinoptions/kwinadvanced.desktop
index 90944a9152..7e16147732 100644
--- a/kcmkwin/kwinoptions/kwinadvanced.desktop
+++ b/kcmkwin/kwinoptions/kwinadvanced.desktop
@@ -11,6 +11,7 @@ X-KDE-PluginKeyword=kwinadvanced
 Name=Advanced
 Name[af]=Gevorderd
 Name[ar]=متقدم
+Name[ast]=Avanzao
 Name[be]=Асаблівы
 Name[be@latin]=Asablivaje
 Name[bg]=Допълнителни