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 2018-08-06 05:33:12 +02:00
parent 872715f4e0
commit 4f699fbc01
1 changed files with 1 additions and 0 deletions

View File

@ -17,6 +17,7 @@ Name[uk]=Запуск фонової служби зовнішньої кома
Name[x-test]=xxStart external command daemonxx
Description=Administrative privileges are required to manage disks
Description[ca]=Es requereixen privilegis d'administrador per gestionar discs
Description[ca@valencia]=Es requereixen privilegis d'administrador per gestionar discs
Description[fi]=Levyjen hallinta vaatii pääkäyttäjäoikeuksia
Description[lt]=Diskų tvarkymui reikalingos administratoriaus teisės
Description[nl]=Er zijn administratieve rechten vereist om schijven te beheren