Commit 435e3c7a 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 b3981c06
......@@ -121,6 +121,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[el]=Ένας γρήγορος προβολέας αρχείων Qt Designer UI
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 »
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