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-04-23 06:34:57 +02:00
parent c2c58ca015
commit 772d284e83
1 changed files with 15 additions and 0 deletions

View File

@ -1,7 +1,22 @@
[Desktop Entry] [Desktop Entry]
Name=Alligator Name=Alligator
Name[ca]=Alligator
Name[et]=Alligator
Name[nl]=Alligator
Name[uk]=Alligator
Name[x-test]=xxAlligatorxx
Comment=Mobile Feed Reader Comment=Mobile Feed Reader
Comment[ca]=Lector de fonts per a mòbil
Comment[et]=Mobiili uudistelugeja
Comment[nl]=Mobiele feedlezer
Comment[uk]=Програма для читання подач на мобільному
Comment[x-test]=xxMobile Feed Readerxx
GenericName=Feed Reader GenericName=Feed Reader
GenericName[ca]=Lector de fonts
GenericName[et]=Uudistelugeja
GenericName[nl]=Feedlezer
GenericName[uk]=Читання подач
GenericName[x-test]=xxFeed Readerxx
Encoding=UTF-8 Encoding=UTF-8
Icon=alligator Icon=alligator
Exec=alligator Exec=alligator