[meld/Python3] (20 commits) ...Merge branch 'master' into Python3

[Kai Willadsen <kaiw src gnome org>]

Summary of changes:

  2b138bb... Updated POTFILES.in (*)
  7c36068... Updated Portuguese translation (*)
  3dddd7b... vc: Add darcs to list of loaded plugins (bgo#766185) (*)
  ff6f12b... data: Fix unknown-text in meld-dark style (*)
  ca74bdc... Default configuration: consider .osc as a version control s (*)
  177f199... Updated Swedish translation (*)
  a2f22b6... filediff, meldbuffer: Support file comparisons from pipes ( (*)
  e9701c5... filediff, diffutil: Scroll all chunks on screen at once (bg (*)
  8972b92... sourceview: Fix custom candidate return (bgo#768129) (*)
  8f2dcd1... misc: Fix performance of interval merging (bgo#768300) (*)
  760f63a... test_filediff: Add expected text test to filter text testca (*)
  080a20c... misc: Avoid string copies during filtering (bgo#768300) (*)
  35c48e3... Updated Indonesian translation (cherry picked from commit 4 (*)
  4de4229... diffutil: Add a few docstrings (*)
  949260f... filediff: Variable renaming for some slight clarity (*)
  5548efe... filediff: Reorder apply_highlight to get the text as late a (*)
  fe204cf... diffutil: New helper for whether a chunk still exists in th (*)
  a0a5a7e... filediff: Check if chunk being highlighted is still valid ( (*)
  750cf67... filediff: Fix refactoring snafu (*)
  50a62f4... Merge branch 'master' into Python3

(*) This commit already existed in another branch; no separate mail sent