Commit 99425df6 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 d9a8fee4
......@@ -41,7 +41,7 @@ Comment[sl]=Videz in občutek
Comment[sv]=Utseende och känsla
Comment[uk]=Вигляд і поведінка
Comment[x-test]=xxLook and Feelxx
Comment[zh_CN]=观感
Comment[zh_CN]=外貌和观感
Icon=preferences-desktop-theme
Exec=plasma-settings -m kcm_mobile_theme
......
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