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:
parent
b0663ba1b5
commit
c23fbc0c24
|
@ -18,6 +18,7 @@ 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[cs]=Pro správu disků jsou potřeba práva administrátora
|
||||
Description[es]=Se necesitan permisos de administrador para gestionar discos
|
||||
Description[fi]=Levyjen hallinta vaatii pääkäyttäjäoikeuksia
|
||||
Description[lt]=Diskų tvarkymui reikalingos administratoriaus teisės
|
||||
|
|
Loading…
Reference in New Issue