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-28 05:18:46 +02:00
parent 71d375d0d9
commit 9d8b2f8daf

View file

@ -31,6 +31,7 @@ Comment[gl]=Intérprete de ordes de Plasma para móbiles
Comment[it]=Shell di Plasma per telefoni Comment[it]=Shell di Plasma per telefoni
Comment[ko]= Plasma Comment[ko]= Plasma
Comment[nl]=Plasma-shell voor telefoons Comment[nl]=Plasma-shell voor telefoons
Comment[pl]=Powłoka Plazmy dla telefonów
Comment[pt]=Área de trabalho Plasma para telemóveis Comment[pt]=Área de trabalho Plasma para telemóveis
Comment[sv]=Plasma skal för telefoner Comment[sv]=Plasma skal för telefoner
Comment[uk]=Оболонка Плазми для телефонів Comment[uk]=Оболонка Плазми для телефонів