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-30 06:20:02 +02:00
parent a07c910b1e
commit db8c6053b3
1 changed files with 3 additions and 0 deletions

View File

@ -5,6 +5,7 @@ Name[et]=Alligator
Name[ko]=Alligator
Name[nl]=Alligator
Name[pt]=Alligator
Name[ru]=Alligator
Name[sk]=Alligator
Name[sv]=Alligator
Name[uk]=Alligator
@ -15,6 +16,7 @@ Comment[et]=Mobiili uudistelugeja
Comment[ko]=모바일 피드 리더
Comment[nl]=Mobiele feedlezer
Comment[pt]=Leitor Móvel de Fontes
Comment[ru]=Чтение лент новостей для мобильных устройств
Comment[sv]=Mobil kanalläsare
Comment[uk]=Програма для читання подач на мобільному
Comment[x-test]=xxMobile Feed Readerxx
@ -24,6 +26,7 @@ GenericName[et]=Uudistelugeja
GenericName[ko]=피드 리더
GenericName[nl]=Feedlezer
GenericName[pt]=Leitor de Fontes
GenericName[ru]=Чтение лент новостей
GenericName[sk]=Čítačka RSS kanálov
GenericName[sv]=Kanalläsare
GenericName[uk]=Читання подач