Commit 457babb2 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 ce00b0eb
......@@ -90,7 +90,7 @@ Comment[gl]=Visor de iconas para artistas e desenvolvedores
Comment[hu]=Ikonnézőke művészeknek és fejlesztőknek
Comment[id]=Pempratinjau ikon untuk Artis dan Developer
Comment[it]=Anteprime delle icone per artisti e sviluppatori
Comment[ko]=예술가와 개발자를 위한 아이콘 뷰어
Comment[ko]=예술가와 개발자 아이콘 뷰어
Comment[lt]=Piktogramų peržiūros programa, skirta dailininkams ir kūrėjams
Comment[nl]=Pictogramviewer voor kunstenaars en ontwikkelaars
Comment[nn]=Førehandsvising av ikon for kunstnarar og utviklarar
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