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"

desktop/org.kde.konsole.desktop

@@ -262,6 +262,7 @@ Name[sl]=Odpri novo okno
 Name[sv]=Öppna ett nytt fönster
 Name[tr]=Yeni Pencere Aç
 Name[uk]=Відкрити нове вікно
+Name[x-test]=xxOpen a New Windowxx
 Name[zh_CN]=打开新窗口
 Name[zh_TW]=開啟新視窗
 Exec=konsole
@@ -294,6 +295,7 @@ Name[sk]=Otvoriť novú kartu
 Name[sl]=Odpri nov zavihek
 Name[sv]=Öppna en ny flik
 Name[uk]=Відкрити нову вкладку
+Name[x-test]=xxOpen a New Tabxx
 Name[zh_CN]=打开新标签
 Name[zh_TW]=開啟新分頁
 Exec=konsole --new-tab