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-07-30 05:24:01 +02:00
parent 0ee516b2f2
commit 184702fc1a
1 changed files with 2 additions and 0 deletions

View File

@ -4,6 +4,7 @@ Icon=partitionmanager
[org.kde.kpmcore.externalcommand.init]
Name=Start external command daemon
Name[ca]=Inicia el dimoni d'ordres externes
Name[ca@valencia]=Inicia el dimoni d'ordres externes
Name[cs]=Spustit démona externích příkazů
Name[nl]=Start externe opdrachtdaemon
Name[pt]=Iniciar o servidor de comandos externos
@ -13,6 +14,7 @@ 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[ca@valencia]=Es requereixen privilegis d'administrador per gestionar discs
Description[cs]=Pro správu disků jsou potřeba práva uživatele
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