Commit f5b422eb 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 e2ed6453
......@@ -18,6 +18,7 @@ Name[sv]=Kirigami-galleri
Name[uk]=Галерея Kirigami
Name[x-test]=xxKirigami Galleryxx
Name[zh_CN]=Kirigami 画廊
Name[zh_TW]=Kirigami 畫廊
Comment=Shows examples of Kirigami components and allows you to play with them
Comment[ca]=Mostra exemples de components del Kirigami i permet jugar-hi
Comment[ca@valencia]=Mostra exemples de components del Kirigami i permet jugar-hi
......@@ -36,6 +37,7 @@ 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_TW]=顯示 Kirigami 元件的範例檔案,且允許您使用這些檔案
Type=Application
Exec=kirigami2gallery
......
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