Commit 2d81f9f6 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 3bae1d57
......@@ -55,7 +55,7 @@ Name[zh_CN]=KGoldRunner 默认
Name[zh_TW]=KGoldRunner 預設
Description=A light and clean theme for KDE4
Description[bs]=Blaga i čista tema za KDE4
Description[ca]=Un tema net i lleuger per al KDE4
Description[ca]=Un tema net i lleuger per al KDE 4
Description[ca@valencia]=Un tema net i lleuger per al KDE4
Description[da]=Et let og enkelt tema til KDE4
Description[de]=Ein einfaches und sauberes Design für KDE4.
......
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