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-18 05:48:08 +02:00
parent 080d5ec729
commit d6e65e4fab
1 changed files with 3 additions and 0 deletions

View File

@ -11,6 +11,7 @@ Name[ko]=Alligator
Name[nl]=Alligator
Name[nn]=Alligator
Name[pt]=Alligator
Name[pt_BR]=Alligator
Name[ru]=Alligator
Name[sk]=Alligator
Name[sl]=Alligator
@ -28,6 +29,7 @@ Comment[ko]=모바일 피드 리더
Comment[nl]=Mobiele feedlezer
Comment[nn]=Mobil kjeldelesar
Comment[pt]=Leitor Móvel de Fontes
Comment[pt_BR]=Leitor de fonte de notícias móvel
Comment[ru]=Чтение лент новостей для мобильных устройств
Comment[sl]=Mobilni bralnik novic
Comment[sv]=Mobil kanalläsare
@ -44,6 +46,7 @@ GenericName[ko]=피드 리더
GenericName[nl]=Feedlezer
GenericName[nn]=Kjeldelesar
GenericName[pt]=Leitor de Fontes
GenericName[pt_BR]=Leitor de fontes de notícias
GenericName[ru]=Чтение лент новостей
GenericName[sk]=Čítačka RSS kanálov
GenericName[sl]=Bralnik novic