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-05-21 06:10:44 +02:00
parent 3c628b921e
commit af8c4c9392

View file

@ -26,12 +26,14 @@ Comment=Plasma shell for phones
Comment[ca]=Espai de treball Plasma per a telèfons
Comment[ca@valencia]=Espai de treball Plasma per a telèfons
Comment[es]=Interfaz de Plasma para teléfonos
Comment[it]=Shell di Plasma per telefoni
Comment[ko]= Plasma
Comment[nl]=Plasma-shell voor telefoons
Comment[pt]=Área de trabalho Plasma para telemóveis
Comment[sv]=Plasma skal för telefoner
Comment[uk]=Оболонка Плазми для телефонів
Comment[x-test]=xxPlasma shell for phonesxx
Comment[zh_TW]= Plasma Shell
Type=Service
X-KDE-ServiceTypes=Plasma/Shell