Commit a9c61870 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 65a98253
......@@ -60,7 +60,7 @@ Comment[it]=Metti i grafici più strani sul tuo desktop!
Comment[kk]=Үстеліңізге сиқырлы графиктерді шығарыңыз!
Comment[km]=Put the weirdest plots on your desktop!
Comment[ko]=데스크톱에 재미있는 플롯을 그리십시오!
Comment[lt]=Dėkite keisčiausius brėžinius ant savo darbastalio!
Comment[lt]=Dėkite keisčiausius brėžinius ant savo darbalaukio!
Comment[nb]=Legg de merkeligste plott på skrivebordet!
Comment[nds]=De snaakschsten Plots för Dien Schriefdisch!
Comment[nl]=Zet de wonderlijkste plots op uw bureaublad!
......
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