[meld/Python3: 20/20] Merge branch 'master' into Python3

[Kai Willadsen <kaiw src gnome org>]

commit 50a62f4f62908645001492373acd5c9c5a3dd513
Merge: 1424df9 750cf67
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Jul 16 09:47:05 2016 +1000

    Merge branch 'master' into Python3

 data/org.gnome.meld.gschema.xml |    2 +-
 help/sv/sv.po                   |   24 +-
 meld/diffutil.py                |   33 +-
 meld/filediff.py                |   56 ++-
 meld/meldbuffer.py              |    9 +
 meld/misc.py                    |   29 +-
 meld/sourceview.py              |    1 +
 meld/vc/__init__.py             |    3 +-
 po/POTFILES.in                  |    1 +
 po/id.po                        | 1427 ++++++++++++++++++++++++---------------
 po/pt.po                        |  683 +++++++++++++------
 test/test_filediff.py           |   15 +-
 12 files changed, 1506 insertions(+), 777 deletions(-)
---
diff --cc meld/filediff.py
index 7659a5d,99276bc..00a672d
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@@ -1274,6 -1291,14 +1289,12 @@@ class FileDiff(melddoc.MeldDoc, gnomegl
                      bufs[1].delete_mark(start_marks[1])
                      bufs[1].delete_mark(end_marks[1])
  
+                     if not self.linediffer.has_chunk(to_pane, chunk):
+                         return
+ 
+                     text1 = bufs[0].get_text(starts[0], ends[0], False)
 -                    text1 = text_type(text1, 'utf8')
+                     textn = bufs[1].get_text(starts[1], ends[1], False)
 -                    textn = text_type(textn, 'utf8')
+ 
                      if texts != (text1, textn):
                          return