Commit b5c077ce 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 44a40bca
......@@ -56,8 +56,8 @@ Name[x-test]=xxKwave Sound Editorxx
Name[zh_CN]=Kwave 声音编辑器
Name[zh_TW]=Kwave 音效編輯器
Comment=A sound editor by KDE
Comment[ca]=Un editor de so creat per la comunitat KDE
Comment[ca@valencia]=Un editor de so creat per la comunitat KDE
Comment[ca]=Un editor de so, creat per la comunitat KDE
Comment[ca@valencia]=Un editor de so, creat per la comunitat KDE
Comment[cs]=Editor zvuku od KDE
Comment[de]=Ein Sound-Editor von KDE
Comment[el]=Ένας επεξεργαστής ήχου από το KDE
......
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