Commit 803338c7 authored by Script Kiddy's avatar Script Kiddy

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 73ce583d
......@@ -43,6 +43,7 @@ Comment[cs]=KAddressBook běží v režimu pro import souborů
Comment[de]=KAddressBook läuft im Modus Dateiimport
Comment[en_GB]=KAddressBook running in file import mode
Comment[es]=KAddressbook ejecutándose en modo de importación de archivos
Comment[fi]=KAddressBook on käynnissä tiedostontuontitilassa
Comment[fr]=KAddressbook fonctionnant en mode import de fichier
Comment[it]=KAddressBook in esecuzione in modalità importazione di file
Comment[nl]=KAddressbook actief in modus bestand importeren
......
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