Commit 0c8c5f4c 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 e5df18dc
......@@ -24,6 +24,13 @@ Name[x-test]=xxKirigami Galleryxx
Name[zh_CN]=Kirigami 画廊
Name[zh_TW]=Kirigami 畫廊
GenericName=Widget Browser for Kirigami
GenericName[ca]=Explorador d'estris per al Kirigami
GenericName[ca@valencia]=Explorador d'estris per al Kirigami
GenericName[nl]=Widget-browser voor Kirigami
GenericName[pt]=Navegador de Elementos do Kirigami
GenericName[uk]=Браузер віджетів для Kirigami
GenericName[x-test]=xxWidget Browser for Kirigamixx
GenericName[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
......
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