Commit f65d91a7 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 ac26dbb3
......@@ -26,6 +26,8 @@ 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[en_GB]=Widget Browser for Kirigami
GenericName[es]=Explorador de elementos gráficos para Kirigami
GenericName[nl]=Widget-browser voor Kirigami
GenericName[pt]=Navegador de Elementos do Kirigami
GenericName[sv]=Grafisk komponentbläddrare för 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