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
6921398ba3
commit
52c29aaf10
|
@ -52,7 +52,7 @@ Description[nl]=Er zijn administratieve rechten vereist om schijven te beheren
|
|||
Description[pl]=Do zarządzania dyskami wymagane są uprawnienia administratora
|
||||
Description[pt]=São necessários privilégios de administrador para gerir os discos
|
||||
Description[pt_BR]=São necessários privilégios administrativos para gerenciar discos
|
||||
Description[sk]=Práva správcu sú potrebné na správu diskov
|
||||
Description[sk]=Na správu diskov sa vyžadujú práva správcu
|
||||
Description[sv]=Administratörsprivilegier krävs för att hantera diskar
|
||||
Description[uk]=Для керування дисками потрібні права доступу адміністратора (root)
|
||||
Description[x-test]=xxAdministrative privileges are required to manage disksxx
|
||||
|
|
Loading…
Reference in New Issue