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
24d9d1bd73
commit
4828645e18
|
@ -3,6 +3,16 @@ Icon=partitionmanager
|
|||
|
||||
[org.kde.kpmcore.externalcommand.init]
|
||||
Name=Start external command daemon
|
||||
Name[ca]=Inicia el dimoni d'ordres externes
|
||||
Name[nl]=Start externe opdrachtdaemon
|
||||
Name[pt]=Iniciar o servidor de comandos externos
|
||||
Name[uk]=Запуск фонової служби зовнішньої команди
|
||||
Name[x-test]=xxStart external command daemonxx
|
||||
Description=Root privileges are needed to manage disks
|
||||
Description[ca]=Es requereixen privilegis d'administrador per gestionar discs
|
||||
Description[nl]=Er zijn root-privileges vereist om schijven te beheren
|
||||
Description[pt]=São necessários privilégios de 'root' (administrador) para gerir os discos
|
||||
Description[uk]=Для керування дисками потрібні права доступу адміністратора (root)
|
||||
Description[x-test]=xxRoot privileges are needed to manage disksxx
|
||||
Policy=auth_admin
|
||||
Persistence=session
|
||||
|
|
Loading…
Reference in New Issue