Commit c8bae783 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 81adcf9c
......@@ -133,6 +133,7 @@ Comment[sr@ijekavian]=Брзи приказивач за УИ фајлове К
Comment[sr@ijekavianlatin]=Brzi prikazivač za UI fajlove QtDesignera
Comment[sr@latin]=Brzi prikazivač za UI fajlove QtDesignera
Comment[sv]=En snabbvisning av en Qt Designer UI-fil
Comment[tr]=QT Tasarım UI dosyası için hızlı görüntüleyici
Comment[uk]=Швидкий засіб перегляду для файлів UI Qt Designer
Comment[x-test]=xxA quick viewer for Qt Designer UI Filexx
MimeType=application/x-designer;
......
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