Commit 7b617984 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 a84b932e
......@@ -56,7 +56,7 @@ 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 KDE 4
Description[ca@valencia]=Un tema net i lleuger per al KDE4
Description[ca@valencia]=Un tema net i lleuger per al KDE 4
Description[da]=Et let og enkelt tema til KDE4
Description[de]=Ein einfaches und sauberes Design für KDE4.
Description[el]=Ένα απλό και ελαφρύ θέμα για το 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