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 2022-07-15 01:49:14 +00:00
parent d2824deed0
commit 29d5afaacf
2 changed files with 3 additions and 0 deletions

View file

@ -15,6 +15,7 @@ Name[ia]=Plasma Mobile (Disveloppamento)
Name[ko]=Plasma 모바일(개발)
Name[nl]=Plasma-mobiel (ontwikkeling)
Name[pt]=Plasma Mobile (Desenvolvimento)
Name[pt_BR]=Plasma Mobile (desenvolvimento)
Name[sl]=Plasma Mobile (Razvoj)
Name[tr]=Plasma Mobile (Geliştirme)
Name[uk]=Мобільна Плазма (версія у розробці)

View file

@ -16,6 +16,7 @@ Name[ko]=Halcyon
Name[nl]=Halcyon
Name[pa]=ਿ
Name[pt]=Halcyon
Name[pt_BR]=Halcyon
Name[sl]=Halcyon
Name[sv]=Halcyon
Name[tr]=Halikon
@ -33,6 +34,7 @@ Description[ko]=간단함과 사용 편의성에 초점을 맞춘 모바일 홈
Description[nl]=Een startscherm voor een mobiel gericht op eenvoud en gebruiksgemak.
Description[pa]= -, ਿ ਿ
Description[pt]=Um ecrã inicial para dispositivos móveis focado na simplicidade e facilidade de uso.
Description[pt_BR]=Uma tela inicial móvel focada na simplicidade e facilidade de uso.
Description[sl]=Mobilni domači zaslon, enostavnega videza in uporabe.
Description[sv]=En hemskärm för mobiler fokuserad på enkelhet och användbarhet.
Description[tr]=Yalınlığa ve kullanım kolaylığına odaklanmış, taşınabilir bir ana ekran.