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
Add is_temp return to 'get_path_for_conflict' for non-temporary files

Depending on the VC, we sometimes create new temporary files using
direct VC calls, and sometimes reuse existing files from the conflict.
This patch adds an boolean return to get_path_from_conflict to
indicate whether the returned file is temporary and should be cleaned
up, or whether we should leave it alone.
Fix is_temp being passed to the actual diff emit
Add svn is_temp vars, and clean up
Merge branch 'master' into svn-updates

Conflicts:
	meld/vcview.py