Commit 2c4f4a34 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 973d4534
......@@ -102,7 +102,7 @@ Comment[pl]=Ustawienia podsumowania dat specjalnych
Comment[pt]=Configuração do Resumo das Próximas Datas Especiais
Comment[pt_BR]=Configuração do resumo da próximas datas especiais
Comment[ro]=Configurare Sumar zile speciale apropiate
Comment[ru]=Настройка показа предстоящих особых дат
Comment[ru]=Настройка дайджеста предстоящих особых дат
Comment[sk]=Súhrnný výber nadchádzajúcich mimoriadnych termínov
Comment[sl]=Nastavitve povzetka posebnih prihodnjih datumov
Comment[sr]=Подешавање сажетка наступајућих посебних датума
......
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