Commit 2811ab0e 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 b9c32c88
......@@ -91,7 +91,7 @@ Comment[et]=KAlarmi automaatne käivitamine sisselogimisel
Comment[fi]=KAlarmin automaattikäynnistys kirjauduttaessa
Comment[fr]=Démarrage à la connexion de KAlarm
Comment[ga]=Tosaigh KAlarm go huathoibríoch ag am logála isteach
Comment[gl]=Inicio automático do KAlarm
Comment[gl]=Inicio automático de KAlarm
Comment[hu]=A KAlarm emlékeztető szolgáltatás automatikus elindítása
Comment[ia]=Autoinitio de KAlarm al accesso initial
Comment[it]=Avvio automatico di KAlarm all'accesso
......
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