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"

data/profiles/Shell.profile

@@ -3,6 +3,7 @@ Name=Shell
 Name[af]=Tolk
 Name[ar]=الصدفة
 Name[as]=শ্বেল
+Name[ast]=Shell
 Name[be@latin]=Abałonka
 Name[bg]=Обвивка
 Name[bn]=শেল
@@ -90,6 +91,7 @@ Comment=Konsole default profile
 Comment[af]=Konsole verstekprofiel
 Comment[ar]=لوحة الإعدادات المبدئية
 Comment[as]=Konsole ৰ অবিকল্পিত পাৰ্শ্বৰূপ
+Comment[ast]=Perfil por defeutu de Konsole
 Comment[be@latin]=Zmoŭčany profil prahramy „Konsole”
 Comment[bg]=Профил по подразбиране за Konsole
 Comment[bn]=কনসোল ডিফল্ট প্রোফাইল