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-14 05:20:41 +02:00
parent bd03f2114d
commit 731c11f9c7

View file

@ -26,6 +26,7 @@ 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[gl]=Intérprete de ordes de Plasma para móbiles
Comment[it]=Shell di Plasma per telefoni
Comment[ko]= Plasma
Comment[nl]=Plasma-shell voor telefoons