Commit b99fffe4 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 78abd385
......@@ -79,7 +79,7 @@ Comment[da]=Information om batteri, strømforsyning, dvale og PowerDevil.
Comment[de]=Informationen zu Akku, Netzanschluss, Standby-Modus und PowerDevil.
Comment[el]=Πληροφορίες μπαταρίας, AC, αδράνειας και PowerDevil
Comment[en_GB]=Battery, AC, sleep and PowerDevil information.
Comment[es]=Información de batería, CA, hibernación y PowerDevil.
Comment[es]=Información de batería, CA, suspensión y PowerDevil.
Comment[et]=Aku, voolutoite, puhkeseisundi ja PowerDevili teave.
Comment[eu]=Bateria, korronte alternoa, loa eta PowerDevil-i buruzko informazioa.
Comment[fi]=Akku, vaihtovirta, nukkumis- ja PowerDevil-tiedot.
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