Commit 498511c8 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 b54a764a
......@@ -152,7 +152,9 @@ GenericName[zh_HK]=繪圖程式
GenericName[zh_TW]=繪圖程式
Comment=An easy-to-use paint program
Comment[ca]=Un programa de pintura senzill d'usar
Comment[es]=Un programa para pintar fácil de usar
Comment[fi]=Helppokäyttöinen piirto-ohjelma
Comment[nl]=Een gemakkelijk te gebruiken tekenprogramma
Comment[pt]=Um programa de pintura simples de usar
Comment[pt_BR]=Um programa de desenho fácil de usar
......
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