Commit d5730a17 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 5c71524e
......@@ -80,7 +80,7 @@ Description[is]=Sjálfgefið KDE 4 þema fyrir Kigo
Description[it]=Il tema predefinito di Kigo per KDE4
Description[kk]=Kigo-ның KDE 4-тегі нақышы
Description[km]=ស្បែក​លំនាំ​ដើម​របស់​ Kigo សម្រាប់ KDE 4
Description[ko]=KDE 4를 위한 Kigo 기본 테마
Description[ko]=KDE 4 Kigo 기본 테마
Description[lv]=Kigo noklusējuma tēma priekš KDE4
Description[mr]=केडीई४ करिता किगो मूलभूत शैली
Description[nb]=Standard Kigo-tema for 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