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"

ktnef/src/org.kde.ktnef.desktop

@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=KTnef
 Name[af]=KTnef
+Name[ast]=KTnef
 Name[bg]=KTnef
 Name[br]=KTnef
 Name[bs]=KTnef

src/data/kmail2.notifyrc

@@ -3,6 +3,7 @@ IconName=kmail
 Comment=KMail
 Comment[af]=KMail
 Comment[ar]=برنامج البريد KMail
+Comment[ast]=KMail
 Comment[bg]=KMail
 Comment[br]=KMail
 Comment[bs]=KMail
@@ -115,6 +116,7 @@ Name[x-test]=xxAkonadi server sent a warningxx
 Name[zh_CN]=Akonadi 服务器发送了一条警告信息
 Name[zh_TW]=Akonadi 伺服器送出一個警告
 Comment=Akonadi server sent a warning
+Comment[ast]=El sirvidor Akonadi unvió una alvertencia
 Comment[bs]=Akonadi server poslao upozorenje
 Comment[ca]=El servidor Akonadi ha enviat un avís
 Comment[ca@valencia]=El servidor Akonadi ha enviat un avís
@@ -204,6 +206,7 @@ Name[x-test]=xxAkonadi server sent an errorxx
 Name[zh_CN]=Akonadi 服务器发送了一条错误信息
 Name[zh_TW]=Akonadi 伺服器送出一個錯誤
 Comment=Akonadi server sent an error
+Comment[ast]=El sirvidor Akonadi unvió un fallu
 Comment[bs]=Akonadi server poslao grešku
 Comment[ca]=El servidor Akonadi ha enviat un error
 Comment[ca@valencia]=El servidor Akonadi ha enviat un error
@@ -293,6 +296,7 @@ Name[x-test]=xxA resource is brokenxx
 Name[zh_CN]=资源已损坏
 Name[zh_TW]=某個資源已損毀
 Comment=A resource change its state to broken
+Comment[ast]=Un recursu camudó'l so estáu a rotu
 Comment[bs]=Promjena resursa  je prekinuta
 Comment[ca]=Un recurs canvia el seu estat a trencat
 Comment[ca@valencia]=Un recurs canvia el seu estat a trencat
@@ -385,6 +389,7 @@ Name[x-test]=xxError While Checking Mailxx
 Name[zh_CN]=检查邮件时出错
 Name[zh_TW]=檢查郵件時發生錯誤
 Comment=There was an error while checking for new mail
+Comment[ast]=Hebo un fallu entrín se comprobaba corréu nuevu
 Comment[bs]=Nastala je greška prilikom provjere ima li novog maila
 Comment[ca]=S'ha produït un error en comprovar el correu nou
 Comment[ca@valencia]=S'ha produït un error en comprovar el correu nou

src/data/kmail_config_accounts.desktop

@@ -16,6 +16,7 @@ X-DocPath=kmail/index.html#configure-accounts
 Name=Accounts
 Name[af]=Rekeninge
 Name[ar]=الحِسابات
+Name[ast]=Cuentes
 Name[be]=Рахункі
 Name[bg]=Сметки
 Name[br]=Kontoù
@@ -150,6 +151,7 @@ Comment[x-test]=xxSetup for Sending and Receiving Messagesxx
 Comment[zh_CN]=收发邮件设置
 Comment[zh_TW]=發送與接收信件設定
 X-KDE-Keywords=kmail,accounts
+X-KDE-Keywords[ast]=kmail,cuentes
 X-KDE-Keywords[bs]=kmail, nalozi
 X-KDE-Keywords[ca]=kmail,comptes
 X-KDE-Keywords[ca@valencia]=kmail,comptes

src/data/kmail_config_appearance.desktop

@@ -154,6 +154,7 @@ Comment[x-test]=xxCustomize Visual Appearancexx
 Comment[zh_CN]=自定义视觉外观
 Comment[zh_TW]=調整視覺顯示
 X-KDE-Keywords=kmail,appearance
+X-KDE-Keywords[ast]=kmail,aspeutu
 X-KDE-Keywords[bs]=kmail, izgled
 X-KDE-Keywords[ca]=kmail,aparença
 X-KDE-Keywords[ca@valencia]=kmail,aparença

src/data/kmail_config_composer.desktop

@@ -16,6 +16,7 @@ X-DocPath=kmail/index.html#configure-composer
 Name=Composer
 Name[af]=Composer
 Name[ar]=المؤلف
+Name[ast]=Compositor
 Name[bg]=Редактор
 Name[br]=Skridaozer
 Name[bs]=Composer
@@ -129,6 +130,7 @@ Comment[x-test]=xxMessage Composer Settingsxx
 Comment[zh_CN]=信件撰写器设置
 Comment[zh_TW]=訊息編寫器設定
 X-KDE-Keywords=kmail,composer
+X-KDE-Keywords[ast]=kmail,compositor
 X-KDE-Keywords[bs]=kmail, composer
 X-KDE-Keywords[ca]=kmail,editor
 X-KDE-Keywords[ca@valencia]=kmail,editor

src/data/kmail_config_identity.desktop

@@ -16,6 +16,7 @@ X-DocPath=kmail/index.html#configure-identity
 Name=Identities
 Name[af]=Identities
 Name[ar]=الهويات
+Name[ast]=Identidaes
 Name[be]=Увасабленні
 Name[bg]=Самоличност
 Name[br]=Anvelezhioù
@@ -151,6 +152,7 @@ Comment[x-test]=xxManage Identitiesxx
 Comment[zh_CN]=管理身份
 Comment[zh_TW]=管理身份
 X-KDE-Keywords=kmail,identity
+X-KDE-Keywords[ast]=kmail,identidá
 X-KDE-Keywords[bs]=kmail, identitet
 X-KDE-Keywords[ca]=kmail,identitat
 X-KDE-Keywords[ca@valencia]=kmail,identitat

src/data/kmail_config_plugins.desktop

@@ -14,5 +14,71 @@ X-KDE-Weight=600
 X-DocPath=kmail/index.html
 
 Name=Plugins
+Name[af]=Inprop modules
+Name[ar]=الملحقات
+Name[bg]=Приставки
+Name[br]=Lugantoù
+Name[bs]=Dodaci
+Name[ca]=Connectors
+Name[ca@valencia]=Connectors
+Name[cs]=Moduly
+Name[cy]=Ategion
+Name[da]=Plugin
+Name[de]=Module
+Name[el]=Πρόσθετα
+Name[en_GB]=Plugins
+Name[eo]=Kromaĵoj
+Name[es]=Complementos
+Name[et]=Pluginad
+Name[eu]=Plugin-ak
+Name[fa]=وصله‌ها
+Name[fi]=Liitännäiset
+Name[fr]=Modules externes
+Name[fy]=Plugins
+Name[ga]=Breiseáin
+Name[gl]=Engadidos
+Name[he]=תוספים
+Name[hu]=Bővítőmodulok
+Name[ia]=Plug-ins
+Name[is]=Íforrit
+Name[it]=Estensioni
+Name[ja]=プラグイン
+Name[ka]=მოდულები
+Name[kk]=Плагин модульдері
+Name[km]=កម្មវិធី​ជំនួយ
+Name[ko]=플러그인
+Name[lt]=Papildiniai
+Name[lv]=Spraudņi
+Name[mai]=प्लगिन
+Name[mk]=Приклучоци
+Name[mr]=प्लगइन्स
+Name[ms]=Plugin
+Name[nb]=Programtillegg
+Name[nds]=Modulen
+Name[ne]=प्लगइन
+Name[nl]=Plug-ins
+Name[pa]=ਪਲੱਗਇਨਾਂ
+Name[pl]=Wtyczki
+Name[pt]='Plugins'
+Name[pt_BR]=Plugins
+Name[ro]=Extensii
+Name[ru]=Модули
+Name[sk]=Moduly
+Name[sl]=Vstavki
+Name[sr]=Прикључци
+Name[sr@ijekavian]=Прикључци
+Name[sr@ijekavianlatin]=Priključci
+Name[sr@latin]=Priključci
+Name[sv]=Insticksprogram
+Name[ta]=சொருகுப்பொருள்கள்
+Name[th]=โปรแกรมเสริม
+Name[tr]=Eklentiler
+Name[ug]=قىستۇرما
+Name[uk]=Додатки
+Name[uz]=Plaginlar
+Name[uz@cyrillic]=Плагинлар
+Name[wa]=Tchôkes-divins
+Name[zh_CN]=插件
+Name[zh_TW]=外掛程式
 Comment=Settings Plugins
 X-KDE-Keywords=kmail,plugins

src/data/kmail_config_security.desktop

@@ -16,6 +16,7 @@ X-DocPath=kmail/index.html#configure-security
 Name=Security
 Name[af]=Sekuriteit
 Name[ar]=الأمن
+Name[ast]=Seguranza
 Name[be]=Бяспека
 Name[bg]=Сигурност
 Name[br]=Surentez
@@ -88,6 +89,7 @@ Name[zh_TW]=安全性
 Comment=Security & Privacy Settings
 Comment[af]=Sekuriteit en provaatheid opstelling
 Comment[ar]= إعدادات الأمن و الخصوصية
+Comment[ast]=Axustes de seguranza y privacidá
 Comment[be]=Настаўленні бяспекі і прыватнасці
 Comment[bg]=Настройки на сигурността
 Comment[br]=Kefluniadur surentez ar buhez prevez
@@ -153,6 +155,7 @@ Comment[x-test]=xxSecurity & Privacy Settingsxx
 Comment[zh_CN]=安全和隐私设置
 Comment[zh_TW]=安全性與隱私設定
 X-KDE-Keywords=kmail,security
+X-KDE-Keywords[ast]=kmail,seguranza
 X-KDE-Keywords[bs]=kmail, sigurnost
 X-KDE-Keywords[ca]=kmail,seguretat
 X-KDE-Keywords[ca@valencia]=kmail,seguretat

src/data/org.kde.kmail.desktop

@@ -2,6 +2,7 @@
 Name=KMail
 Name[af]=KMail
 Name[ar]=برنامج البريد KMail
+Name[ast]=KMail
 Name[be]=KMail
 Name[bg]=KMail
 Name[br]=KMail
@@ -196,6 +197,7 @@ Actions=Composer;CheckMail;
 
 [Desktop Action Composer]
 Name=New Message
+Name[ast]=Mensaxe nuevu
 Name[ca]=Missatge nou
 Name[ca@valencia]=Missatge nou
 Name[cs]=Nová zpráva

src/kcm_kpimidentities/kcm_kpimidentities.desktop

@@ -12,6 +12,7 @@ X-DocPath=kmail/index.html#configure-identity
 Name=Identities
 Name[af]=Identities
 Name[ar]=الهويات
+Name[ast]=Identidaes
 Name[be]=Увасабленні
 Name[bg]=Самоличност
 Name[br]=Anvelezhioù
@@ -147,6 +148,7 @@ Comment[x-test]=xxManage Identitiesxx
 Comment[zh_CN]=管理身份
 Comment[zh_TW]=管理身份
 X-KDE-Keywords=kmail,identity
+X-KDE-Keywords[ast]=kmail,identidá
 X-KDE-Keywords[bs]=kmail, identitet
 X-KDE-Keywords[ca]=kmail,identitat
 X-KDE-Keywords[ca@valencia]=kmail,identitat

src/kontactplugin/kmail/kcmkmailsummary.desktop

@@ -13,6 +13,7 @@ X-KDE-Weight=200
 
 Name=New Messages
 Name[ar]=رسائل جديدة
+Name[ast]=Mensaxes nuevos
 Name[be]=Новыя паведамленні
 Name[bg]=MSN
 Name[bs]=Nove poruke

src/kontactplugin/kmail/kmail.setdlg

@@ -2,6 +2,7 @@
 Name=Mail
 Name[af]=Pos
 Name[ar]=البريد
+Name[ast]=Mail
 Name[be]=Пошта
 Name[bg]=Mail
 Name[br]=Lizher

src/kontactplugin/kmail/kmailplugin.desktop

@@ -88,6 +88,7 @@ Comment[zh_TW]=Kontact KMail 外掛程式
 Name=Mail
 Name[af]=Pos
 Name[ar]=البريد
+Name[ast]=Mail
 Name[be]=Пошта
 Name[bg]=Mail
 Name[br]=Lizher

src/kontactplugin/summary/kcmkontactsummary.desktop

@@ -13,6 +13,7 @@ X-KDE-Weight=1
 
 Name=Summaries
 Name[ar]=الملخّصات
+Name[ast]=Sumarios
 Name[bs]=Kratki sadržaji
 Name[ca]=Resums
 Name[ca@valencia]=Resums

src/kontactplugin/summary/summary.setdlg

@@ -2,6 +2,7 @@
 Name=Summary
 Name[af]=Opsomming
 Name[ar]=الملخّص
+Name[ast]=Sumariu
 Name[bg]=Summary
 Name[br]=Diverrañ
 Name[bs]=Rezime

src/kontactplugin/summary/summaryplugin.desktop

@@ -75,6 +75,7 @@ Comment[zh_TW]=Kontact 摘要檢視外掛程式
 Name=Summary
 Name[af]=Opsomming
 Name[ar]=الملخّص
+Name[ast]=Sumariu
 Name[bg]=Summary
 Name[br]=Diverrañ
 Name[bs]=Rezime