Commit c9596027 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 7a6e7342
......@@ -80,7 +80,7 @@ Comment[mr]=स्निपेट्स व्यवस्थापन समा
Comment[nb]=Verktøyvisning med innebygd tekstbithåndtering
Comment[nds]=Warktüüch, de de Snippelpleeg inbett
Comment[nl]=Hulpmiddelweergave met ingebed beheer van fragmenten
Comment[nn]=Verktøyvisning med innebygd tekstbithandtering
Comment[nn]=Verktøyvising med innebygd tekstbithandtering
Comment[pl]=Widok narzędzia osadzający zarządzanie fragmentami
Comment[pt]=Área de ferramentas que incorpora a gestão dos excertos
Comment[pt_BR]=Área de ferramentas que incorpora o gerenciamento de trechos
......
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