Updated Polish translation
Open folder comparison when 'Compare'ing folders in VC view

I'm not sure why we support this, but this is how it worked prior to
the direct-file-access changes in 1.7.1, so restoring that behaviour
here. Also, tracebacks are bad.
Updated Slovenian translation
Updated Brazilian Portuguese translation
Updated Czech translation
Updated Spanish translation
Updated Hungarian translation
Updated Hungarian translation
Add conflict_map to git
For conflicts, use MERGED by default, don't change permissions if file is the same