Commit 23af6f6a 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 b32c7290
......@@ -154,6 +154,7 @@ GenericName[zh_TW]=繪圖程式
Comment=An easy-to-use paint program
Comment[ca]=Un programa de pintura senzill d'usar
Comment[ca@valencia]=Un programa de pintura senzill d'usar
Comment[da]=Et nemt tegneprogram
Comment[de]=Ein einfach zu benutzendes Mal- und Zeichenprogramm
Comment[el]=Ένα εύκολο στη χρήση πρόγραμμα ζωγραφικής
Comment[en_GB]=An easy-to-use paint program
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