From 505c1f8cbac5f6d3d7d6d827607a2761b148aed9 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 7 Apr 2015 13:16:44 +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"
---
 examples/applets/bugreport/metadata.desktop             | 1 -
 examples/applets/compactrepresentation/metadata.desktop | 1 -
 examples/applets/helloworld/metadata.desktop            | 1 -
 examples/applets/notes/metadata.desktop                 | 1 -
 examples/applets/qmltasks/metadata.desktop              | 1 -
 5 files changed, 5 deletions(-)

diff --git a/examples/applets/bugreport/metadata.desktop b/examples/applets/bugreport/metadata.desktop
index 5be6a6a19..db0e07d77 100644
--- a/examples/applets/bugreport/metadata.desktop
+++ b/examples/applets/bugreport/metadata.desktop
@@ -65,7 +65,6 @@ Keywords[x-test]=xxplasmaxx;xxbugzillaxx;xxbugxx;xxdevelopmentxx;xxsupportxx;
 Keywords[zh_CN]=plasma;bugzilla;bug;development;support;错误;开发;支持;
 Keywords[zh_TW]=plasma;bugzilla;bug;development;support;
 Name=Bug
-Name[ast]=Fallu
 Name[ca]=Error
 Name[cs]=Chyba
 Name[da]=Programfejl
diff --git a/examples/applets/compactrepresentation/metadata.desktop b/examples/applets/compactrepresentation/metadata.desktop
index 9e2b7f776..84d2acbd2 100644
--- a/examples/applets/compactrepresentation/metadata.desktop
+++ b/examples/applets/compactrepresentation/metadata.desktop
@@ -4,7 +4,6 @@ Encoding=UTF-8
 Keywords=
 Name=hello world
 Name[ar]=أهلًا يا عالم
-Name[ast]=hola mundiu
 Name[bs]=zdravo raja
 Name[ca]=hola món
 Name[cs]=Hello World
diff --git a/examples/applets/helloworld/metadata.desktop b/examples/applets/helloworld/metadata.desktop
index fb48b091e..b89052948 100644
--- a/examples/applets/helloworld/metadata.desktop
+++ b/examples/applets/helloworld/metadata.desktop
@@ -4,7 +4,6 @@ Encoding=UTF-8
 Keywords=
 Name=hello world
 Name[ar]=أهلًا يا عالم
-Name[ast]=hola mundiu
 Name[bs]=zdravo raja
 Name[ca]=hola món
 Name[cs]=Hello World
diff --git a/examples/applets/notes/metadata.desktop b/examples/applets/notes/metadata.desktop
index a9defb25a..cd67e79a0 100644
--- a/examples/applets/notes/metadata.desktop
+++ b/examples/applets/notes/metadata.desktop
@@ -36,7 +36,6 @@ Comment[zh_TW]=如何管理 Drop 資料的範例
 Encoding=UTF-8
 Keywords=
 Name=Example notes
-Name[ast]=Notes d'exemplu
 Name[bs]=Primjer bilješke
 Name[ca]=Notes d'exemple
 Name[da]=Eksempel på noter
diff --git a/examples/applets/qmltasks/metadata.desktop b/examples/applets/qmltasks/metadata.desktop
index e319b1b3d..b454d1a0c 100644
--- a/examples/applets/qmltasks/metadata.desktop
+++ b/examples/applets/qmltasks/metadata.desktop
@@ -1,7 +1,6 @@
 [Desktop Entry]
 Name=Poor Man's Tasks
 Name[ar]=مهام الرجل الفقير
-Name[ast]=Xeres d'un home probe
 Name[bs]=Zadaci siromašnog čovjeka
 Name[ca]=Tasques senzilles
 Name[da]=Fattigmands opgaveliste