Commit e25a1c95 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 364eea36
......@@ -129,6 +129,7 @@ Comment[nl]=Een snelle viewer voor Qt Designer UI bestand
Comment[pl]=Szybka przeglądarka dla plików UI Qt Designera
Comment[pt]=Um visualizador rápido para os ficheiros UI do Qt Designer
Comment[sk]=Rýchly prehliadač pre súbor UI Qt Designer
Comment[sl]=Hitri pregledovalnik datotek UI Snovalnika Qt
Comment[sr]=Брзи приказивач за УИ фајлове КуТ‑дизајнера
Comment[sr@ijekavian]=Брзи приказивач за УИ фајлове КуТ‑дизајнера
Comment[sr@ijekavianlatin]=Brzi prikazivač za UI fajlove QtDesignera
Supports Markdown
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