From c6aafe23de36dd99f133b80bbfc106c16c3386aa Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 6 Dec 2015 09:17:34 +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"
---
 clients/aurorae/themes/plastik/package/metadata.desktop | 1 +
 effects/kwineffect.desktop                              | 1 +
 kcmkwin/kwinoptions/kwinactions.desktop                 | 1 +
 kcmkwin/kwinoptions/kwinadvanced.desktop                | 1 +
 kcmkwin/kwinoptions/kwinmoving.desktop                  | 1 +
 kwin.notifyrc                                           | 1 +
 6 files changed, 6 insertions(+)

diff --git a/clients/aurorae/themes/plastik/package/metadata.desktop b/clients/aurorae/themes/plastik/package/metadata.desktop
index 2ee7f2f619..1d6f2bbc47 100644
--- a/clients/aurorae/themes/plastik/package/metadata.desktop
+++ b/clients/aurorae/themes/plastik/package/metadata.desktop
@@ -89,6 +89,7 @@ Name[zh_CN]=Plastik
 Name[zh_TW]=Plastik
 Comment=The classic theme known from KDE 3
 Comment[ar]=السّمة الكلاسيكيّة المعروفة من كدي 3
+Comment[ast]=El tema clásicu conocíu de KDE 3
 Comment[bs]=Klasična tema iz KDE 3
 Comment[ca]=El tema clàssic conegut des del KDE 3
 Comment[ca@valencia]=El tema clàssic conegut des del KDE 3
diff --git a/effects/kwineffect.desktop b/effects/kwineffect.desktop
index 44db3109a2..8bf7e4771b 100644
--- a/effects/kwineffect.desktop
+++ b/effects/kwineffect.desktop
@@ -5,6 +5,7 @@ X-KDE-ServiceType=KWin/Effect
 Comment=KWin Effect
 Comment[af]=KWin-effek
 Comment[ar]=تأثيرات كوين
+Comment[ast]=Efeutu de KWin
 Comment[be]=Эфекты KWin
 Comment[be@latin]=Efekty akońnika „KWin”
 Comment[bg]=Ефект KWin
diff --git a/kcmkwin/kwinoptions/kwinactions.desktop b/kcmkwin/kwinoptions/kwinactions.desktop
index dfecf8e67b..3fc55d7743 100644
--- a/kcmkwin/kwinoptions/kwinactions.desktop
+++ b/kcmkwin/kwinoptions/kwinactions.desktop
@@ -100,6 +100,7 @@ Name[zh_CN]=动作
 Name[zh_TW]=動作
 
 Comment=Mouse Actions on Windows
+Comment[ast]=Aiciones del mur en ventanes
 Comment[bs]=Akcioje miša na prozorima
 Comment[ca]=Accions del ratolí en les finestres
 Comment[ca@valencia]=Accions del ratolí en les finestres
diff --git a/kcmkwin/kwinoptions/kwinadvanced.desktop b/kcmkwin/kwinoptions/kwinadvanced.desktop
index 7e16147732..56d5c6b4fc 100644
--- a/kcmkwin/kwinoptions/kwinadvanced.desktop
+++ b/kcmkwin/kwinoptions/kwinadvanced.desktop
@@ -100,6 +100,7 @@ Name[zh_CN]=高级
 Name[zh_TW]=進階
 
 Comment=Advanced Window Management Features
+Comment[ast]=Carauterístiques avanzaes de xestión de ventanes
 Comment[bs]=Napredne mogućnosti upravljanja prozoeima
 Comment[ca]=Característiques avançades per a la gestió de les finestres
 Comment[ca@valencia]=Característiques avançades per a la gestió de les finestres
diff --git a/kcmkwin/kwinoptions/kwinmoving.desktop b/kcmkwin/kwinoptions/kwinmoving.desktop
index 5d6031cc29..c5d7a2d374 100644
--- a/kcmkwin/kwinoptions/kwinmoving.desktop
+++ b/kcmkwin/kwinoptions/kwinmoving.desktop
@@ -98,6 +98,7 @@ Name[zh_CN]=移动
 Name[zh_TW]=移動
 
 Comment=Window Moving
+Comment[ast]=Movición de ventanes
 Comment[bs]=Kretanje prozora
 Comment[ca]=Moviment de les finestres
 Comment[ca@valencia]=Moviment de les finestres
diff --git a/kwin.notifyrc b/kwin.notifyrc
index ceba037953..62b505b603 100644
--- a/kwin.notifyrc
+++ b/kwin.notifyrc
@@ -2,6 +2,7 @@
 IconName=kwin
 Comment=KWin Window Manager
 Comment[ar]=مدير النوافذ كوين
+Comment[ast]=Xestor de ventanes KWin
 Comment[bg]=Мениджър на прозорци KWin
 Comment[bs]=Menadžer prozora K‑vin
 Comment[ca]=Gestor de finestres KWin