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-01-12 01:49:44 +00:00
parent e57c9d1552
commit 28df23863e
1 changed files with 6 additions and 0 deletions

View File

@ -8,3 +8,9 @@ Actions=open;
Exec=partitionmanager "--device=%d"
Icon=partitionmanager
Name=Reformat or Edit with Partition Manager
Name[az]=Bölmələr Meneceri ilə yenidən formatlayın və ya düzəliş edin
Name[ca]=Reformatació i edició amb el gestor de particions
Name[cs]=Přeformátovat nebo upravit pomocí Správce diskových oddílů
Name[es]=Volver a formatear o editar con el gestor de particiones
Name[nl]=Met Partitiebeheerder opnieuw formatteren of bewerken
Name[x-test]=xxReformat or Edit with Partition Managerxx