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
f40762a220
commit
60bba03afa
|
@ -3,6 +3,7 @@ Icon=partitionmanager
|
|||
|
||||
[org.kde.kpmcore.externalcommand.init]
|
||||
Name=Start external command daemon
|
||||
Name[ast]=Aniciu del degorriu de comandos esternos
|
||||
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ů
|
||||
|
|
Loading…
Reference in New Issue