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/data/kmail_config_plugins.desktop

@@ -97,6 +97,10 @@ Comment[pl]=Wtyczki ustawień
 Comment[pt]='Plugins' de Configuração
 Comment[sk]=Pluginy nastavení
 Comment[sl]=Nastavi vstavke
+Comment[sr]=Прикључци за поставке
+Comment[sr@ijekavian]=Прикључци за поставке
+Comment[sr@ijekavianlatin]=Priključci za postavke
+Comment[sr@latin]=Priključci za postavke
 Comment[sv]=Inställningsinsticksprogram
 Comment[uk]=Додатки параметрів
 Comment[x-test]=xxSettings Pluginsxx
@@ -114,6 +118,10 @@ X-KDE-Keywords[pl]=kmail,wtyczki
 X-KDE-Keywords[pt]=kmail,plugins
 X-KDE-Keywords[sk]=kmail,pluginy
 X-KDE-Keywords[sl]=kmail,vstavki
+X-KDE-Keywords[sr]=kmail,plugins,К‑пошта,прикључци
+X-KDE-Keywords[sr@ijekavian]=kmail,plugins,К‑пошта,прикључци
+X-KDE-Keywords[sr@ijekavianlatin]=kmail,plugins,K‑pošta,priključci
+X-KDE-Keywords[sr@latin]=kmail,plugins,K‑pošta,priključci
 X-KDE-Keywords[sv]=kmail,insticksprogram
 X-KDE-Keywords[uk]=kmail,plugins,додатки,кмейл
 X-KDE-Keywords[x-test]=xxkmailxx,xxpluginsxx