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"
This commit is contained in:
l10n daemon script
2019-07-21 05:20:01 +02:00
parent bfeba242ea
commit ed9fe37985

View File

@@ -8,6 +8,7 @@ Comment[ca@valencia]=Connectors d'esdeveniments per al KRfb.
Comment[de]=Ereignis-Module für KRfb
Comment[en_GB]=Event plugins for KRfb
Comment[es]=Complementos de eventos para KRfb
Comment[fr]=Modules externes d'événements pour Krfb
Comment[gl]=Complementos de eventos para KRfb
Comment[it]=Estensioni degli eventi per KRfb
Comment[ko]=KRfb 이벤트 플러그인