Commit 990ac4a7 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 c3d33556
......@@ -39,7 +39,7 @@ Comment[de]=Ein Skrooge-Modul zur Überwachung von Rückzahlungen
Comment[el]=Ένα πρόσθετο του skrooge για την παρακολούθηση επιστροφών
Comment[en_GB]=A skrooge plugin to follow refund
Comment[es]=Un complemento de Skrooge para seguir los reembolsos
Comment[et]=Skrooge rahaliikumiste jälgimise plugin
Comment[et]=Skrooge hüvituste jälgimise plugin
Comment[fi]=Skroogen korvauksenseurantaliitännäinen
Comment[fr]=Un module externe Skrooge pour le suivi des remboursements
Comment[gl]=Un complemento de Skrooge para o seguimento de devolucións.
......
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