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

@@ -68,6 +68,7 @@ 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

examples/applets/compactrepresentation/metadata.desktop

@@ -4,6 +4,7 @@ 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

examples/applets/helloworld/metadata.desktop

@@ -4,6 +4,7 @@ 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

examples/applets/notes/metadata.desktop

@@ -36,6 +36,7 @@ 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

examples/applets/qmltasks/metadata.desktop

@@ -1,6 +1,7 @@
 [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