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 2020-07-13 05:37:57 +02:00
parent 1ef7aa5330
commit f2948904eb
1 changed files with 1 additions and 1 deletions

View File

@ -19,7 +19,7 @@ Name[uk]=Alligator
Name[x-test]=xxAlligatorxx
Comment=Mobile Feed Reader
Comment[ca]=Lector de fonts per al mòbil
Comment[ca@valencia]=Lector de fonts per a mòbil
Comment[ca@valencia]=Lector de fonts per al mòbil
Comment[cs]=Mobilní čtečka kanálů
Comment[et]=Mobiili uudistelugeja
Comment[fr]=Lecteur nomade de fils d'actualité