Commit 32871100 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 17ff746b
......@@ -53,6 +53,7 @@ Comment[gl]=Engadir as contas de Internet
Comment[hu]=Adja hozzá online fiókjait
Comment[it]=Aggiungi i tuoi account online
Comment[ko]=내 온라인 계정 추가
Comment[lt]=Pridėti savo internetines paskyras
Comment[nl]=Uw online accounts toevoegen
Comment[pl]=Dodaj swoje konta internetowe
Comment[pt]=Adicione as Suas Contas 'Online'
......
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