Commit 1158f308 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 fe481721
......@@ -28,6 +28,7 @@ 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[ko]=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