Commit e2ed6453 authored by Script Kiddy's avatar Script Kiddy
Browse files

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 c1357eef
......@@ -35,7 +35,7 @@ Comment[sk]=Zobrazí príklady Kirigami komponentov a umožní vám hrať sa s n
Comment[sv]=Visar exempel på komponenter i Kirigami och låter dig leka med dem
Comment[uk]=Показує приклади компонентів Kirigami і надає вам змогу попрацювати з ними
Comment[x-test]=xxShows examples of Kirigami components and allows you to play with themxx
Comment[zh_CN]=显示 Kirigami 组件并允许您使用它们进行游戏
Comment[zh_CN]=显示 Kirigami 组件实例并允许您用它们
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