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"

src/org.kde.blinken.desktop

@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Blinken
+Name[ast]=Blinken
 Name[bg]=Blinken
 Name[bs]=Blinken
 Name[ca]=Blinken
@@ -56,6 +57,7 @@ Name[x-test]=xxBlinkenxx
 Name[zh_CN]=Blinken
 Name[zh_TW]=記憶_BlinKen
 GenericName=Memory Enhancement Game
+GenericName[ast]=Xuegu p'ameyorar la memoria
 GenericName[bg]=Игра за упражнение на паметта
 GenericName[bs]=Igra za poboljšanje pamćenja
 GenericName[ca]=Un joc per millorar la memòria
@@ -110,6 +112,7 @@ Exec=blinken
 Icon=blinken
 Type=Application
 Comment=A memory enhancement game
+Comment[ast]=Un xuegu p'ameyorar la memoria
 Comment[bg]=Игра за упражнение на паметта
 Comment[bs]=Igra za bolje pamćenje
 Comment[ca]=Un joc per millorar la memòria