Commit 3624a1a9 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 ae5edb4c
......@@ -120,6 +120,7 @@ Comment[ca]=Un visor ràpid de fitxer UI de Qt Designer
Comment[ca@valencia]=Un visor ràpid de fitxer UI de Qt Designer
Comment[cs]=Rychlý prohlížeč souborů UI programu Qt Designer
Comment[de]=Schnelle Anzeige von UI-Dateien des Qt Designer
Comment[en_GB]=A quick viewer for Qt Designer UI File
Comment[es]=Un rápido visor para archivos de interfaz de usuario de Qt Designer
Comment[it]=Un visualizzatore veloce per i file UI di Qt Designer
Comment[nl]=Een snelle viewer voor Qt Designer UI bestand
......
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