Commit 81adcf9c 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 3624a1a9
......@@ -122,6 +122,7 @@ 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[fr]=Un afficheur rapide de fichiers d'interface graphique « Qt Designer »
Comment[it]=Un visualizzatore veloce per i file UI di Qt Designer
Comment[nl]=Een snelle viewer voor Qt Designer UI bestand
Comment[pl]=Szybka przeglądarka dla plików UI Qt Designera
......
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