Commit a67cafee 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 804e0cd6
......@@ -164,6 +164,7 @@ Comment[nn]=Verktøy for skjermforstørring
Comment[pl]=Narzędzie powiększania ekranu
Comment[pt]=Uma ferramenta de ampliação do ecrã
Comment[pt_BR]=Uma lupa para a tela
Comment[ru]=Инструмент увеличения для экрана
Comment[sk]=Nástroj na priblíženie obrazovky
Comment[sl]=Orodje za približanje zaslona
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