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-02-17 05:51:58 +01:00
parent 904370ea7b
commit fb6681d5a5
2 changed files with 3 additions and 0 deletions

View file

@ -8,6 +8,7 @@ Name[eu]=Bilatu eta exekutatu
Name[ko]=
Name[lt]=Ieškoti ir paleisti
Name[nl]=Zoeken en uitvoeren
Name[nn]=Søk og køyr
Name[pt]=Pesquisar e Executar
Name[pt_BR]=Pesquisar e executar
Name[ru]=Поиск и запуск
@ -25,6 +26,7 @@ Comment[eu]=Bilatu eta exekutatu aplikazioak eta zerbitzuak
Comment[ko]=
Comment[lt]=Ieškoti ir paleisti programas bei tarnybas
Comment[nl]=Zoeken en uitvoeren van toepassingen en services
Comment[nn]=Søk etter og køyr program og tenester
Comment[pt]=Pesquisa e executa aplicações e serviços
Comment[pt_BR]=Pesquisa e executa aplicativos e serviços
Comment[ru]=Поиск и запуск приложений и служб

View file

@ -51,6 +51,7 @@ Comment[it]=Shell di Plasma per telefoni
Comment[ko]= Plasma
Comment[lt]=Plasma apvalkalas, skirtas telefonams
Comment[nl]=Plasma-shell voor telefoons
Comment[nn]=Plasma-skal for telefonar
Comment[pl]=Powłoka Plazmy dla telefonów
Comment[pt]=Área de trabalho Plasma para telemóveis
Comment[pt_BR]=Plasma Shell para telefones