Commit 2ec5e7b3 authored by Script Kiddy's avatar Script Kiddy

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 366ab44b
......@@ -168,6 +168,7 @@ Comment[ia]=Un programma pro pinger facilemente
Comment[is]=Einfalt forrit til að teikna og mála myndir
Comment[it]=Un programma di disegno semplice da usare
Comment[ko]=사용하기 쉬운 그리기 프로그램
Comment[lt]=Paprasta piešimo programa
Comment[nl]=Een gemakkelijk te gebruiken tekenprogramma
Comment[nn]=Eit teikneprogram som er lett å bruka
Comment[pl]=Łatwy w użyciu program do malowania
......
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