Commit d6fc3053 authored by Script Kiddy's avatar Script Kiddy

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"
parent 5287d0b6
[Desktop Entry]
Name=Communicator
Name[ca]=Comunicador
Name[ca@valencia]=Comunicador
Name[lt]=Pranešėjas
Name[nl]=Communicator
Name[pt]=Comunicador
Name[sk]=Komunikátor
Name[sv]=Communicator
Name[uk]=Комунікатор
Name[zh_TW]=通訊工具
TryExec=communicator
Exec=communicator %U
Terminal=false
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment