From cc45a7da802d01c1493a06f023b55c01f84e3624 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sat, 12 Dec 2015 10:33:35 +1000
Subject: [PATCH 01/51] setup_win32: Fix for library include order issues
 related to msys

An update of msysgit has somehow pulled in libffi into the path that
cx_freeze searches to find its libraries. On the only build box that
matters, this causes us to include a 64-bit libffi with our
otherwise-32-bit build, breaking everything.

I won't even pretend to understand how the change in this patch
fixes the problem, but after several hours fighting Windows +
cx_freeze path resolution I also really, really don't care.
---
 setup_win32.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup_win32.py b/setup_win32.py
index 9e7f3bdf..b72dd20b 100644
--- a/setup_win32.py
+++ b/setup_win32.py
@@ -66,6 +66,7 @@
     "includes": ["gi"],
     "packages": ["gi", "weakref"],
     "include_files": include_files,
+    "bin_path_excludes": [""],
 }
 
 

From 6e2357fd90bded2e79f077283fddcc76f353f718 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sun, 1 May 2016 09:22:37 +1000
Subject: [PATCH 02/51] setup_win32: Sync up windows build script

---
 setup_win32.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/setup_win32.py b/setup_win32.py
index b72dd20b..e0a78822 100644
--- a/setup_win32.py
+++ b/setup_win32.py
@@ -146,12 +146,15 @@
          ['COPYING', 'NEWS']
          ),
         ('share/meld',
-         ['data/meld.css', 'data/meld-dark.css']
+         ['data/meld.css']
          ),
         ('share/meld/icons',
          glob.glob("data/icons/*.png") +
          glob.glob("data/icons/COPYING*")
          ),
+        ('share/meld/styles',
+         glob.glob("data/styles/*.xml")
+         ),
         ('share/meld/ui',
          glob.glob("data/ui/*.ui") + glob.glob("data/ui/*.xml")
          ),

From 9fd29449575aff54ae0fb57cc8136df8bdbf49af Mon Sep 17 00:00:00 2001
From: pbgc <pbgc@oninet.pt>
Date: Tue, 10 May 2016 05:44:30 +1000
Subject: [PATCH 03/51] vc: Add darcs to list of loaded plugins (bgo#766185)

---
 meld/vc/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meld/vc/__init__.py b/meld/vc/__init__.py
index b710cb4f..656167fd 100644
--- a/meld/vc/__init__.py
+++ b/meld/vc/__init__.py
@@ -28,7 +28,7 @@
 
 # FIXME: This is a horrible hack to help cx_Freeze pick up these plugins when
 # freezing the distributable package.
-from . import git, mercurial, bzr, svn
+from . import git, mercurial, bzr, svn, darcs
 
 # Tuple with module name and vc.NAME field, ordered according to best-guess
 # as to which VC a user is likely to want by default in a multiple-VC situation
@@ -37,6 +37,7 @@
     "mercurial",
     "bzr",
     "svn",
+    "darcs",
 )
 
 _plugins = [importlib.import_module("." + vc, __package__) for vc in vc_names]

From 35e959e0dd48956b9b6ca93a8bd5e80c91f79052 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sat, 14 May 2016 06:51:38 +1000
Subject: [PATCH 04/51] data: Fix unknown-text in meld-dark style

---
 data/styles/meld-dark.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/styles/meld-dark.xml b/data/styles/meld-dark.xml
index da892515..74c49e84 100644
--- a/data/styles/meld-dark.xml
+++ b/data/styles/meld-dark.xml
@@ -11,7 +11,7 @@
   <style name="meld:error" background="#fce94f" foreground="#faad3d" line-background="#fdf8cd"/>
   <style name="meld:inline" background="#3465a4"/>
   <style name="meld:current-line-highlight" background="#111100"/>
-  <style name="meld:unknown-text" background="#aaaaaa"/>
+  <style name="meld:unknown-text" foreground="#aaaaaa"/>
   <style name="meld:syncpoint-outline" foreground="#bbbbbb"/>
   <style name="meld:current-chunk-highlight" background="#rgba(255, 255, 255, 0.1)"/>
   <style name="meld:dimmed" foreground="#999999"/>

From 19706f716df793323048fcd9bb13b695adb27735 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Wed, 18 May 2016 17:40:16 +0200
Subject: [PATCH 05/51] Default configuration: consider .osc as a version
 control system

.osc is used by the Open Build Service (http://openbuildservice.org/).
---
 data/org.gnome.meld.gschema.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/org.gnome.meld.gschema.xml b/data/org.gnome.meld.gschema.xml
index b48facd7..f4239564 100644
--- a/data/org.gnome.meld.gschema.xml
+++ b/data/org.gnome.meld.gschema.xml
@@ -220,7 +220,7 @@
             [
               ("Backups", true, "#*# .#* ~* *~ *.{orig,bak,swp}"),
               ("OS-specific metadata", true, ".DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db Desktop.ini"),
-              ("Version Control", true, "_MTN .bzr .svn .svn .hg .fslckout _FOSSIL_ .fos CVS _darcs .git .svn"),
+              ("Version Control", true, "_MTN .bzr .svn .svn .hg .fslckout _FOSSIL_ .fos CVS _darcs .git .svn .osc"),
               ("Binaries", true, "*.{pyc,a,obj,o,so,la,lib,dll,exe}"),
               ("Media", false, "*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}")
             ]

From 75e250576fe723a8b164b4b87169e70f6667f84b Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Wed, 8 Jun 2016 08:18:05 +1000
Subject: [PATCH 06/51] filediff, meldbuffer: Support file comparisons from
 pipes (bgo#765021)

With the move to GtkSourceFileLoader, etc., we unintentionally lost the
ability to read from named pipes, because yours truly had no idea this
worked at all. This patch is a slightly hacky approach to handle
switching to the stream-based loading in GtkSourceFileLoader if it
appears that the GFile we have doesn't point to a regular file.
---
 meld/filediff.py   | 11 ++++++++---
 meld/meldbuffer.py |  9 +++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/meld/filediff.py b/meld/filediff.py
index 357fb8d4..b1e3c59c 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1047,10 +1047,15 @@ def set_files(self, files):
             self.fileentry[pane].set_file(gfile)
             self.msgarea_mgr[pane].clear()
 
-            self.textbuffer[pane].data.reset(gfile)
+            buf = self.textbuffer[pane]
+            buf.data.reset(gfile)
+
+            if buf.data.is_special:
+                loader = GtkSource.FileLoader.new_from_stream(
+                    buf, buf.data.sourcefile, buf.data.gfile.read())
+            else:
+                loader = GtkSource.FileLoader.new(buf, buf.data.sourcefile)
 
-            loader = GtkSource.FileLoader.new(
-                self.textbuffer[pane], self.textbuffer[pane].data.sourcefile)
             if custom_candidates:
                 loader.set_candidate_encodings(custom_candidates)
             loader.load_async(
diff --git a/meld/meldbuffer.py b/meld/meldbuffer.py
index 9e758874..0e7a9356 100644
--- a/meld/meldbuffer.py
+++ b/meld/meldbuffer.py
@@ -196,6 +196,15 @@ def gfiletarget(self):
             return Gio.File.new_for_path(self.savefile)
         return self.gfile
 
+    @property
+    def is_special(self):
+        try:
+            info = self._gfile.query_info(
+                Gio.FILE_ATTRIBUTE_STANDARD_TYPE, 0, None)
+            return info.get_file_type() == Gio.FileType.SPECIAL
+        except (AttributeError, GLib.GError):
+            return False
+
     @property
     def writable(self):
         try:

From b758c1a64a894b5d2624a9cdf696e3adcc29d220 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sun, 19 Jun 2016 10:18:08 +1000
Subject: [PATCH 07/51] conf: Forgotten post-release version bump

---
 meld/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meld/conf.py b/meld/conf.py
index fb0129ce..d949873b 100644
--- a/meld/conf.py
+++ b/meld/conf.py
@@ -3,7 +3,7 @@
 import sys
 
 __package__ = "meld"
-__version__ = "3.16.0"
+__version__ = "3.16.1"
 
 # START; these paths are clobbered on install by meld.build_helpers
 DATADIR = os.path.join(sys.prefix, "share", "meld")

From 36e5478e5565a3b6e4c8fc93eb05751ccedf3fc0 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sun, 19 Jun 2016 10:21:43 +1000
Subject: [PATCH 08/51] Update NEWS

---
 NEWS | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/NEWS b/NEWS
index 32c97293..2c5f0150 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,17 @@
 
+2016-06-19 meld 3.16.1
+======================
+
+  Fixes:
+
+   * Fix regression in support for file comparisons from pipes (Kai Willadsen)
+   * Add open build service directories to the version control filter
+     (Dominique Leuenberger)
+   * Add darcs to list of loaded plugins (pbgc)
+   * Fix the dark style (Kai Willadsen)
+   * Windows build fixes (Kai Willadsen)
+
+
 2016-05-01 meld 3.16.0
 ======================
 

From ba15b43bf1024e90111e2a40e22e1296536f72bd Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sun, 19 Jun 2016 10:22:22 +1000
Subject: [PATCH 09/51] Post-release version bump

---
 meld/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meld/conf.py b/meld/conf.py
index d949873b..f92501d4 100644
--- a/meld/conf.py
+++ b/meld/conf.py
@@ -3,7 +3,7 @@
 import sys
 
 __package__ = "meld"
-__version__ = "3.16.1"
+__version__ = "3.16.2"
 
 # START; these paths are clobbered on install by meld.build_helpers
 DATADIR = os.path.join(sys.prefix, "share", "meld")

From 30a656e22c3111b257f8bdbdaedea5f6b4066b5f Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Fri, 1 Jul 2016 07:30:52 +1000
Subject: [PATCH 10/51] sourceview: Fix custom candidate return (bgo#768129)

---
 meld/sourceview.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meld/sourceview.py b/meld/sourceview.py
index d455bd7a..6eba778b 100644
--- a/meld/sourceview.py
+++ b/meld/sourceview.py
@@ -48,6 +48,7 @@ def get_custom_encoding_candidates():
         # get_default_candidates() is only available in GtkSourceView 3.18
         # and we'd rather use their defaults than our old detect list.
         pass
+    return custom_candidates
 
 
 class LanguageManager(object):

From d176eae8283bcff563d995aed460f17062220d99 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sat, 2 Jul 2016 08:28:05 +1000
Subject: [PATCH 11/51] misc: Fix performance of interval merging (bgo#768300)

Interval merge was constantly pop()ing from the list head, which is very
slow on standard Python lists. Just moving to a deque gets rid of this
from profiles on large lists of ignored intervals.
---
 meld/misc.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/meld/misc.py b/meld/misc.py
index aa135385..60b5eef9 100644
--- a/meld/misc.py
+++ b/meld/misc.py
@@ -18,6 +18,7 @@
 """Module of commonly used helper classes and functions
 """
 
+import collections
 import os
 import errno
 import shutil
@@ -480,12 +481,12 @@ def merge_intervals(interval_list):
     if len(interval_list) < 2:
         return interval_list
 
-    interval_list.sort()
-    merged_intervals = [interval_list.pop(0)]
+    interval_list = collections.deque(sorted(interval_list))
+    merged_intervals = [interval_list.popleft()]
     current_start, current_end = merged_intervals[-1]
 
     while interval_list:
-        new_start, new_end = interval_list.pop(0)
+        new_start, new_end = interval_list.popleft()
 
         if current_end >= new_end:
             continue

From 47dd0faf3fbcfc885c4b9cf7aea301153c04d516 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sat, 2 Jul 2016 10:20:08 +1000
Subject: [PATCH 12/51] test_filediff: Add expected text test to filter text
 testcase

---
 test/test_filediff.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/test/test_filediff.py b/test/test_filediff.py
index d3f8acab..86b97594 100644
--- a/test/test_filediff.py
+++ b/test/test_filediff.py
@@ -8,61 +8,71 @@
 from meld.filters import FilterEntry
 
 
-@pytest.mark.parametrize("text, ignored_ranges", [
+@pytest.mark.parametrize("text, ignored_ranges, expected_text", [
     #    0123456789012345678901234567890123456789012345678901234567890123456789
     # Matching without groups
     (
         "# asdasdasdasdsad",
         [(0, 17)],
+        "",
     ),
     # Matching with single group
     (
         "asdasdasdasdsab",
         [(1, 14)],
+        "ab",
     ),
     # Matching with multiple groups
     (
         "xasdyasdz",
         [(1, 4), (5, 8)],
+        "xyz",
     ),
     # Matching with multiple partially overlapping filters
     (
         "qaqxqbyqzq",
         [(2, 6), (7, 8)],
+        "qayzq",
     ),
     # Matching with multiple fully overlapping filters
     (
         "qaqxqybqzq",
         [(2, 8)],
+        "qazq",
     ),
     # Matching with and without groups, with single dominated match
     (
         "# asdasdasdasdsab",
         [(0, 17)],
+        "",
     ),
     # Matching with and without groups, with partially overlapping filters
     (
         "/*a*/ub",
         [(0, 6)],
+        "b",
     ),
     # Non-matching with groups
     (
         "xasdyasdx",
         [],
+        "xasdyasdx",
     ),
     # Multiple lines with non-overlapping filters
     (
         "#ab\na2b",
         [(0, 3), (5, 6)],
+        "\nab",
     ),
     # CVS keyword
     (
         "$Author: John Doe $",
         [(8, 18)],
+        "$Author:$",
     ),
 
 ])
-def test_filter_text(text, ignored_ranges):
+def test_filter_text(text, ignored_ranges, expected_text):
     filter_patterns = [
         '#.*',
         '/\*.*\*/',
@@ -102,3 +112,4 @@ def test_filter_text(text, ignored_ranges):
     print("Toggles:", toggles)
 
     assert toggles == ignored_ranges
+    assert text == expected_text

From de6061ad7aab445812636447e52258eec5d3dc77 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sat, 2 Jul 2016 10:20:56 +1000
Subject: [PATCH 13/51] misc: Avoid string copies during filtering (bgo#768300)

When we switched over to doing better regex filtering and highlighting
of ignored regions, we changed the way we were applying filters from a
simple multiple-regex approach to a merged-span based approach. This is
fine, except that this also changed the way we sliced the existing text
to produce the filtered version.

Prior to this commit, we removed matching filtered text by
concatenating two string slices, which is extremely slow in Python due
to the overhead of string allocation, among other things. With this
patch, we use a more idiomatic approach of grabbing all of the text
sections that we care about and concatenating them in a single join
operation at the end.

The test case in bgo#768300 was previously extremely slow (I gave up
waiting), but with this change takes a few seconds.

This commit also switches up the role of the "cutter" function, which
now only applies changes rather than expecting to modify the text. Text
modification is carried out by apply_text_filters itself, since it can
do so much more efficiently.
---
 meld/filediff.py |  7 ++-----
 meld/misc.py     | 22 ++++++++++++++--------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/meld/filediff.py b/meld/filediff.py
index b1e3c59c..e44049fa 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -755,19 +755,16 @@ def _filter_text(self, txt, buf, txt_start_iter, txt_end_iter):
         dimmed_tag = buf.get_tag_table().lookup("dimmed")
         buf.remove_tag(dimmed_tag, txt_start_iter, txt_end_iter)
 
-        def cutter(txt, start, end):
-            assert txt[start:end].count("\n") == 0
-            txt = txt[:start] + txt[end:]
+        def highlighter(start, end):
             start_iter = txt_start_iter.copy()
             start_iter.forward_chars(start)
             end_iter = txt_start_iter.copy()
             end_iter.forward_chars(end)
             buf.apply_tag(dimmed_tag, start_iter, end_iter)
-            return txt
 
         try:
             regexes = [f.filter for f in self.text_filters if f.active]
-            txt = misc.apply_text_filters(txt, regexes, cutter)
+            txt = misc.apply_text_filters(txt, regexes, apply_fn=highlighter)
         except AssertionError:
             if not self.warned_bad_comparison:
                 misc.error_dialog(
diff --git a/meld/misc.py b/meld/misc.py
index 60b5eef9..aea2b3e3 100644
--- a/meld/misc.py
+++ b/meld/misc.py
@@ -503,15 +503,13 @@ def merge_intervals(interval_list):
     return merged_intervals
 
 
-def apply_text_filters(txt, regexes, cutter=lambda txt, start, end:
-                       txt[:start] + txt[end:]):
+def apply_text_filters(txt, regexes, apply_fn=None):
     """Apply text filters
 
     Text filters "regexes", resolved as regular expressions are applied
     to "txt".
 
-    "cutter" defines the way how to apply them. Default is to just cut
-    out the matches.
+    "apply_fn" is a callable run for each filtered interval
     """
     filter_ranges = []
     for r in regexes:
@@ -533,7 +531,15 @@ def apply_text_filters(txt, regexes, cutter=lambda txt, start, end:
 
     filter_ranges = merge_intervals(filter_ranges)
 
-    for (start, end) in reversed(filter_ranges):
-        txt = cutter(txt, start, end)
-
-    return txt
+    if apply_fn:
+        for (start, end) in reversed(filter_ranges):
+            apply_fn(start, end)
+
+    offset = 0
+    result_txts = []
+    for (start, end) in filter_ranges:
+        assert txt[start:end].count("\n") == 0
+        result_txts.append(txt[offset:start])
+        offset = end
+    result_txts.append(txt[offset:])
+    return "".join(result_txts)

From 498c11750116334aa8503c3e4f49aafdcd96809a Mon Sep 17 00:00:00 2001
From: Andika Triwidada <atriwidada@gnome.org>
Date: Wed, 6 Jul 2016 06:39:39 +0000
Subject: [PATCH 14/51] Updated Indonesian translation

---
 po/id.po | 1471 ++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 921 insertions(+), 550 deletions(-)

diff --git a/po/id.po b/po/id.po
index c307c2a0..cb445cf0 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,11 +5,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: meld master\n"
+"Project-Id-Version: meld meld-3-16\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=meld&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-10-09 21:07+0000\n"
-"PO-Revision-Date: 2014-10-10 13:29+0700\n"
+"POT-Creation-Date: 2016-05-01 10:47+0000\n"
+"PO-Revision-Date: 2016-07-06 13:39+0700\n"
 "Last-Translator: Andika Triwidada <andika@gmail.com>\n"
 "Language-Team: Indonesian <gnome@i15n.org>\n"
 "Language: id\n"
@@ -17,22 +17,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.7\n"
+"X-Generator: Poedit 1.8.8\n"
 
-#: ../bin/meld:138
+#: ../bin/meld:144
 msgid "Cannot import: "
 msgstr "Tak bisa mengimpor:"
 
-#: ../bin/meld:141
+#: ../bin/meld:147
 #, c-format
 msgid "Meld requires %s or higher."
 msgstr "Meld memerlukan %s atau lebih tinggi."
 
-#: ../bin/meld:145
+#: ../bin/meld:151
 msgid "Meld does not support Python 3."
 msgstr "Meld tidak mendukung Python 3."
 
-#: ../bin/meld:193
+#: ../bin/meld:200
 #, c-format
 msgid ""
 "Couldn't load Meld-specific CSS (%s)\n"
@@ -41,7 +41,8 @@ msgstr ""
 "Tak bisa memuat CSS spesifik Meld (%s)\n"
 "%s"
 
-#: ../data/meld.desktop.in.h:1 ../data/ui/meldapp.ui.h:1
+#: ../data/meld.desktop.in.h:1 ../data/meld.appdata.xml.in.h:1
+#: ../data/ui/meldapp.ui.h:1
 msgid "Meld"
 msgstr "Meld"
 
@@ -53,11 +54,16 @@ msgstr "Penampil Diff"
 msgid "Meld Diff Viewer"
 msgstr "Meld Penampil Diff"
 
-#: ../data/meld.desktop.in.h:4
+#: ../data/meld.desktop.in.h:4 ../data/meld.appdata.xml.in.h:2
 msgid "Compare and merge your files"
 msgstr "Membandingkan dan menggabung berkas-berkas Anda"
 
-#: ../data/meld.appdata.xml.in.h:1
+#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: ../data/meld.desktop.in.h:6
+msgid "diff;merge;"
+msgstr "diff;merge;"
+
+#: ../data/meld.appdata.xml.in.h:3
 msgid ""
 "Meld is a visual diff and merge tool targeted at developers. Meld helps you "
 "compare files, directories, and version controlled projects. It provides "
@@ -70,7 +76,7 @@ msgstr ""
 "berkas dan direktori, dan mendukung banyak kendali sistem versi termasuk "
 "Git, Mercurial, Bazaar, dan Subversion."
 
-#: ../data/meld.appdata.xml.in.h:2
+#: ../data/meld.appdata.xml.in.h:4
 msgid ""
 "Meld helps you review code changes, understand patches, and makes enormous "
 "merge conflicts slightly less painful."
@@ -107,16 +113,21 @@ msgid "If true, the window statusbar is visible."
 msgstr "Bila berisi true, bilah status jendela tampak."
 
 #: ../data/org.gnome.meld.gschema.xml.h:7
-msgid "Automatically detected text encodings"
-msgstr "Enkoding teks yang dideteksi secara otomatis "
+msgid "Additional automatically detected text encodings"
+msgstr "Tambahan enkoding teks yang dideteksi secara otomatis"
 
 #: ../data/org.gnome.meld.gschema.xml.h:8
 msgid ""
-"These text encodings will be automatically used (in order) to try to decode "
-"loaded text files."
+"Meld will use these text encodings to try to decode loaded text files before "
+"trying any other encodings. In addition to the encodings in this list, UTF-8 "
+"and the current locale-default encoding will always be used; other encodings "
+"may also be tried, depending on the user's locale."
 msgstr ""
-"Enkoding teks ini akan dipakai secara otomatis (sesuai urutan) untuk mencoba "
-"mendekode berkas teks yang dimuat."
+"Meld akan memakai pengkodean teks ini untuk mencoba men-decode berkas teks "
+"yang dimuat sebelum mencoba sebarang encoding lain. Sebagai tambahan ke "
+"encoding dalam daftar ini, UTF-8 dan encoding baku locale saat ini akan "
+"selalu dipakai; encoding lain mungkin juga dicoba, bergantung kepada locale "
+"pengguna."
 
 #: ../data/org.gnome.meld.gschema.xml.h:9
 msgid "Width of an indentation step"
@@ -159,7 +170,6 @@ msgstr ""
 "Meld, ini secara baku mati."
 
 #: ../data/org.gnome.meld.gschema.xml.h:17
-#| msgid "Use s_yntax highlighting"
 msgid "Color scheme to use for syntax highlighting"
 msgstr "Skema warna yang digunakan untuk penyorotan sintaks"
 
@@ -213,11 +223,10 @@ msgstr "Gunakan fonta monospace bawaan sistem"
 
 #: ../data/org.gnome.meld.gschema.xml.h:26
 msgid ""
-"If false, the defined custom font will be used instead of the system "
-"monospace font."
+"If false, custom-font will be used instead of the system monospace font."
 msgstr ""
-"Bila berisi false, fonta ubahan yang didefinisikan akan dipakai sebagai "
-"ganti fonta monospace sistem."
+"Bila berisi false, fonta ubahan akan dipakai sebagai ganti fonta monospace "
+"sistem."
 
 #: ../data/org.gnome.meld.gschema.xml.h:27
 msgid "Custom font"
@@ -248,11 +257,11 @@ msgstr "Gunakan penyunting bawaan sistem"
 
 #: ../data/org.gnome.meld.gschema.xml.h:32
 msgid ""
-"If false, the defined custom editor will be used instead of the system "
-"editor when opening files externally."
+"If false, custom-editor-command will be used instead of the system editor "
+"when opening files externally."
 msgstr ""
-"Bila berisi false, penyunting ubahan yang didefinisikan akan dipakai sebagai "
-"ganti penyunting sistem ketika membuka berkas secara eksternal."
+"Bila berisi false, perintah penyunting ubahan akan dipakai sebagai ganti "
+"penyunting sistem ketika membuka berkas secara eksternal."
 
 #: ../data/org.gnome.meld.gschema.xml.h:33
 msgid "The custom editor launch command"
@@ -279,7 +288,7 @@ msgstr ""
 "Daftar nama kolom dalam perbandingan folder dan apakah mereka mesti "
 "ditampilkan."
 
-#: ../data/org.gnome.meld.gschema.xml.h:37 ../data/ui/preferences.ui.h:31
+#: ../data/org.gnome.meld.gschema.xml.h:37 ../data/ui/preferences.ui.h:32
 msgid "Ignore symbolic links"
 msgstr "Abaikan taut simbolik"
 
@@ -321,21 +330,35 @@ msgstr ""
 "berbeda. Ini berguna ketika membandingkan berkas antar sistem berkas dengan "
 "resolusi penanda waktu yang berbeda."
 
-#: ../data/org.gnome.meld.gschema.xml.h:43
+#: ../data/org.gnome.meld.gschema.xml.h:43 ../data/ui/preferences.ui.h:30
+msgid "Apply text filters during folder comparisons"
+msgstr "Terapkan penyaring teks selama perbandingan folder"
+
+#: ../data/org.gnome.meld.gschema.xml.h:44
+msgid ""
+"If true, folder comparisons that compare file contents also apply active "
+"text filters and the blank line trimming option, and ignore newline "
+"differences."
+msgstr ""
+"Bila berisi true, perbandingan folder yang membandingkan isi berkas juga "
+"menerapkan penyaring teks aktif dan opsi pemangkasan baris kosong, dan "
+"mengabaikan perbedaan baris baru."
+
+#: ../data/org.gnome.meld.gschema.xml.h:45
 msgid "File status filters"
 msgstr "Penyaring status berkas"
 
-#: ../data/org.gnome.meld.gschema.xml.h:44
+#: ../data/org.gnome.meld.gschema.xml.h:46
 msgid "List of statuses used to filter visible files in folder comparison."
 msgstr ""
 "Daftar dari status yang dipakai untuk menyaring berkas yang tampak dalam "
 "perbandingan folder."
 
-#: ../data/org.gnome.meld.gschema.xml.h:45
+#: ../data/org.gnome.meld.gschema.xml.h:47
 msgid "Show the version control console output"
 msgstr "Tampilkan keluaran konsol kendali versi"
 
-#: ../data/org.gnome.meld.gschema.xml.h:46
+#: ../data/org.gnome.meld.gschema.xml.h:48
 msgid ""
 "If true, a console output section will be shown in version control views, "
 "showing the commands run for version control operations."
@@ -344,22 +367,22 @@ msgstr ""
 "kendali versi, menunjukkan perintah yang dijalankan bagi operasi kendali "
 "versi."
 
-#: ../data/org.gnome.meld.gschema.xml.h:47
+#: ../data/org.gnome.meld.gschema.xml.h:49
 msgid "Version control pane position"
 msgstr "Posisi panel kendali versi"
 
-#: ../data/org.gnome.meld.gschema.xml.h:48
+#: ../data/org.gnome.meld.gschema.xml.h:50
 msgid ""
 "This is the height of the main version control tree when the console pane is "
 "shown."
 msgstr ""
 "Ini adalah tinggi phon kendali versi utama ketika panel konsol ditampilkan."
 
-#: ../data/org.gnome.meld.gschema.xml.h:49
+#: ../data/org.gnome.meld.gschema.xml.h:51
 msgid "Present version comparisons as left-local/right-remote"
 msgstr "Sajikan perbandingan versi sebagai kiri-lokal/kanan-jauh"
 
-#: ../data/org.gnome.meld.gschema.xml.h:50
+#: ../data/org.gnome.meld.gschema.xml.h:52
 msgid ""
 "If true, version control comparisons will use a left-is-local, right-is-"
 "remote scheme to determine what order to present files in panes. Otherwise, "
@@ -370,13 +393,13 @@ msgstr ""
 "dalam panel. Bila tidak, skema left-adalah-milik-mereka, kanan-adalah-"
 "milikku dipakai."
 
-#: ../data/org.gnome.meld.gschema.xml.h:51
+#: ../data/org.gnome.meld.gschema.xml.h:53
 msgid "Order for files in three-way version control merge comparisons"
 msgstr "Urutan bagi berkas dalam perbandingan merge kendali versi tiga arah"
 
-#: ../data/org.gnome.meld.gschema.xml.h:52
+#: ../data/org.gnome.meld.gschema.xml.h:54
 msgid ""
-"Choices for file order are remote/merge/local and local/merged/remote. This "
+"Choices for file order are remote/merged/local and local/merged/remote. This "
 "preference only affects three-way comparisons launched from the version "
 "control view, so is used solely for merges/conflict resolution within Meld."
 msgstr ""
@@ -385,11 +408,11 @@ msgstr ""
 "diluncurkan dari tilikan kendali versi, sehingga hanya dipakai untuk "
 "resolusi merge/konflik di dalam Meld."
 
-#: ../data/org.gnome.meld.gschema.xml.h:53
+#: ../data/org.gnome.meld.gschema.xml.h:55
 msgid "Show margin in commit message editor"
 msgstr "Tampilkan marjin dalam penyunting pesan komit"
 
-#: ../data/org.gnome.meld.gschema.xml.h:54
+#: ../data/org.gnome.meld.gschema.xml.h:56
 msgid ""
 "If true, a guide will be displayed to show what column the margin is at in "
 "the version control commit message editor."
@@ -397,11 +420,11 @@ msgstr ""
 "Bila berisi true, suatu panduan akan ditampilkan untuk menunjukkan marjin "
 "pada kolom mana dalam penyunting pesan komit kendali versi."
 
-#: ../data/org.gnome.meld.gschema.xml.h:55
+#: ../data/org.gnome.meld.gschema.xml.h:57
 msgid "Margin column in commit message editor"
 msgstr "Marjin kolom dalam penyunting pesan komit"
 
-#: ../data/org.gnome.meld.gschema.xml.h:56
+#: ../data/org.gnome.meld.gschema.xml.h:58
 msgid ""
 "The column at which to show the margin in the version control commit message "
 "editor."
@@ -409,35 +432,34 @@ msgstr ""
 "Kolom tempat menunjukkan posisi marjin dalam penyunting pesan komit kendali "
 "versi."
 
-#: ../data/org.gnome.meld.gschema.xml.h:57
+#: ../data/org.gnome.meld.gschema.xml.h:59
 msgid "Automatically hard-wrap commit messages"
 msgstr "Secara otomatis melipat isi pesan komit"
 
-#: ../data/org.gnome.meld.gschema.xml.h:58
+#: ../data/org.gnome.meld.gschema.xml.h:60
 msgid ""
 "If true, the version control commit message editor will hard-wrap (i.e., "
-"insert line breaks) at the defined commit margin before commit."
+"insert line breaks) at the commit margin before commit."
 msgstr ""
 "Bila berisi true, penyunting pesan komit kendali versi akan melipat (yaitu "
-"menyisipkan pemecah baris) pada marjin komit yang didefinisikan sebelum "
-"komit."
+"menyisipkan pemecah baris) pada marjin komit sebelum komit."
 
-#: ../data/org.gnome.meld.gschema.xml.h:59
+#: ../data/org.gnome.meld.gschema.xml.h:61
 msgid "Version control status filters"
 msgstr "Penyaring status kendali versi"
 
-#: ../data/org.gnome.meld.gschema.xml.h:60
+#: ../data/org.gnome.meld.gschema.xml.h:62
 msgid ""
 "List of statuses used to filter visible files in version control comparison."
 msgstr ""
 "Daftar status yang dipakai untuk menyaring berkas yang tampak dalam "
 "perbandingan kendali versi."
 
-#: ../data/org.gnome.meld.gschema.xml.h:61
+#: ../data/org.gnome.meld.gschema.xml.h:63
 msgid "Filename-based filters"
 msgstr "Penyaring berbasis nama berkas"
 
-#: ../data/org.gnome.meld.gschema.xml.h:62
+#: ../data/org.gnome.meld.gschema.xml.h:64
 msgid ""
 "List of predefined filename-based filters that, if active, will remove "
 "matching files from a folder comparison."
@@ -445,11 +467,11 @@ msgstr ""
 "Daftar penyaring berbasis nama berkas yang terpradefinisi, yang bila aktif, "
 "akan menghapus berkas yang cocok dari perbandingan folder."
 
-#: ../data/org.gnome.meld.gschema.xml.h:63
+#: ../data/org.gnome.meld.gschema.xml.h:65
 msgid "Text-based filters"
 msgstr "Penyaring berbasis teks"
 
-#: ../data/org.gnome.meld.gschema.xml.h:64
+#: ../data/org.gnome.meld.gschema.xml.h:66
 msgid ""
 "List of predefined text-based regex filters that, if active, will remove "
 "text from being used in a file comparison. The text will still be displayed, "
@@ -459,6 +481,22 @@ msgstr ""
 "menghapus teks agar tidak dipakai dalam perbandingan berkas. Teks masih akan "
 "ditampilkan, tapi tak akan menyumbang ke perbandingan itu sendiri."
 
+#: ../data/styles/meld-base.xml.h:1
+msgid "Meld base scheme"
+msgstr "Skema basis Meld"
+
+#: ../data/styles/meld-base.xml.h:2
+msgid "Base color scheme for Meld highlighting"
+msgstr "Skema warna basis untuk penyorotan Meld"
+
+#: ../data/styles/meld-dark.xml.h:1
+msgid "Meld dark scheme"
+msgstr "Skema gelap Meld"
+
+#: ../data/styles/meld-dark.xml.h:2
+msgid "Dark color scheme for Meld highlighting"
+msgstr "Skema warna gelap untuk penyorotan Meld"
+
 #: ../data/ui/application.ui.h:1
 msgid "About Meld"
 msgstr "Tentang Meld"
@@ -477,7 +515,7 @@ msgstr "Situs web"
 
 #: ../data/ui/application.ui.h:5
 msgid "translator-credits"
-msgstr "Andika Triwidada <andika@gmail.com>, 2013, 2014."
+msgstr "Andika Triwidada <andika@gmail.com>, 2013, 2014, 2016."
 
 #: ../data/ui/application.ui.h:6
 msgid "_Preferences"
@@ -488,10 +526,14 @@ msgid "_Help"
 msgstr "_Bantuan"
 
 #: ../data/ui/application.ui.h:8
+msgid "Keyboard Shortcuts"
+msgstr "Tombol Pintas"
+
+#: ../data/ui/application.ui.h:9
 msgid "_About"
 msgstr "Tent_ang"
 
-#: ../data/ui/application.ui.h:9
+#: ../data/ui/application.ui.h:10
 msgid "_Quit"
 msgstr "_Keluar"
 
@@ -523,7 +565,7 @@ msgstr "Salin ke kanan"
 msgid "Delete selected"
 msgstr "Hapus yang dipilih"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1451
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:860 ../meld/filediff.py:1366
 msgid "Hide"
 msgstr "Sembunyikan"
 
@@ -559,7 +601,7 @@ msgstr "Baru"
 msgid "Show new"
 msgstr "Tampilkan yang baru"
 
-#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:71
+#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:74
 msgid "Modified"
 msgstr "Diubah"
 
@@ -592,7 +634,7 @@ msgid "_Add"
 msgstr "T_ambah"
 
 #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:747
+#: ../meld/vcview.py:649
 msgid "_Remove"
 msgstr "_Hapus"
 
@@ -613,8 +655,8 @@ msgid "Move _Down"
 msgstr "_Turunkan"
 
 #. Create icon and filename CellRenderer
-#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:363
-#: ../meld/vcview.py:203
+#: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35
+#: ../meld/dirdiff.py:374
 msgid "Name"
 msgstr "Nama"
 
@@ -631,26 +673,200 @@ msgid "Remove selected filter"
 msgstr "Hapus penyaring yang dipilih"
 
 #: ../data/ui/filediff.ui.h:1
+msgid "Format as Patch..."
+msgstr "Format sebagai Patch..."
+
+#: ../data/ui/filediff.ui.h:2
+msgid "Create a patch using differences between files"
+msgstr "Buat patch memakai perbedaan antar berkas"
+
+#: ../data/ui/filediff.ui.h:3
+msgid "Save A_ll"
+msgstr "Simpan Semu_a"
+
+#: ../data/ui/filediff.ui.h:4
+msgid "Save all files in the current comparison"
+msgstr "Simpan semua berkas dalam perbandingan saat ini"
+
+#: ../data/ui/filediff.ui.h:5
+msgid "Revert files to their saved versions"
+msgstr "Kembalikan berkas ke versi tersimpan"
+
+#: ../data/ui/filediff.ui.h:6
+msgid "Add Synchronization Point"
+msgstr "Tambahkan Titik Sinkronisasi"
+
+#: ../data/ui/filediff.ui.h:7
+msgid "Add a synchronization point for changes between files"
+msgstr "Tambahkan satu titik sinkronisasi untuk perubahan antar berkas"
+
+#: ../data/ui/filediff.ui.h:8
+msgid "Clear Synchronization Points"
+msgstr "Bersihkan Titik Sinkronisasi"
+
+#: ../data/ui/filediff.ui.h:9
+msgid "Clear sychronization points for changes between files"
+msgstr "Bersihkan titik sinkronisasi untuk perubahan antar berkas"
+
+#: ../data/ui/filediff.ui.h:10
+msgid "Previous Conflict"
+msgstr "Konflik Sebelumnya"
+
+#: ../data/ui/filediff.ui.h:11
+msgid "Go to the previous conflict"
+msgstr "Pindah ke konflik sebelumnya"
+
+#: ../data/ui/filediff.ui.h:12
+msgid "Next Conflict"
+msgstr "Konflik Selanjutnya"
+
+#: ../data/ui/filediff.ui.h:13
+msgid "Go to the next conflict"
+msgstr "Pindah ke konflik selanjutnya"
+
+#: ../data/ui/filediff.ui.h:14
+msgid "Push to Left"
+msgstr "Push ke Kiri"
+
+#: ../data/ui/filediff.ui.h:15
+msgid "Push current change to the left"
+msgstr "Push perubahan saat ini ke kiri"
+
+#: ../data/ui/filediff.ui.h:16
+msgid "Push to Right"
+msgstr "Push ke Kanan"
+
+#: ../data/ui/filediff.ui.h:17
+msgid "Push current change to the right"
+msgstr "Push perubahan saat ini ke kanan"
+
+#: ../data/ui/filediff.ui.h:18
+msgid "Pull from Left"
+msgstr "Pull dari Kiri"
+
+#: ../data/ui/filediff.ui.h:19
+msgid "Pull change from the left"
+msgstr "Pull perubahan dari kiri"
+
+#: ../data/ui/filediff.ui.h:20
+msgid "Pull from Right"
+msgstr "Pull dari Kanan"
+
+#: ../data/ui/filediff.ui.h:21
+msgid "Pull change from the right"
+msgstr "Pull perubahan dari kanan"
+
+#: ../data/ui/filediff.ui.h:22
+msgid "Copy Above Left"
+msgstr "Salin Di Atas Kiri"
+
+#: ../data/ui/filediff.ui.h:23
+msgid "Copy change above the left chunk"
+msgstr "Salin perubahan di atas chunk kiri"
+
+#: ../data/ui/filediff.ui.h:24
+msgid "Copy Below Left"
+msgstr "Salin Di Bawah Kiri"
+
+#: ../data/ui/filediff.ui.h:25
+msgid "Copy change below the left chunk"
+msgstr "Salin perubahan di bawah chunk kiri"
+
+#: ../data/ui/filediff.ui.h:26
+msgid "Copy Above Right"
+msgstr "Salin Di Atas Kanan"
+
+#: ../data/ui/filediff.ui.h:27
+msgid "Copy change above the right chunk"
+msgstr "Salin perubahan di atas chunk kanan"
+
+#: ../data/ui/filediff.ui.h:28
+msgid "Copy Below Right"
+msgstr "Salin Di Bawah Kanan"
+
+#: ../data/ui/filediff.ui.h:29
+msgid "Copy change below the right chunk"
+msgstr "Salin perubahan di bawah chunk kanan"
+
+#: ../data/ui/filediff.ui.h:30
+msgid "Delete"
+msgstr "Hapus"
+
+#: ../data/ui/filediff.ui.h:31
+msgid "Delete change"
+msgstr "Hapus perubahan"
+
+#: ../data/ui/filediff.ui.h:32
+msgid "Merge All from Left"
+msgstr "Merge Semua dari Kiri"
+
+#: ../data/ui/filediff.ui.h:33
+msgid "Merge all non-conflicting changes from the left"
+msgstr "Merge semua perubahan yang tak konflik dari kiri"
+
+#: ../data/ui/filediff.ui.h:34
+msgid "Merge All from Right"
+msgstr "Merge Semua dari Kanan"
+
+#: ../data/ui/filediff.ui.h:35
+msgid "Merge all non-conflicting changes from the right"
+msgstr "Merge semua perubahan yang tak konflik dari kanan"
+
+#: ../data/ui/filediff.ui.h:36
+msgid "Merge All"
+msgstr "Merge Semua"
+
+#: ../data/ui/filediff.ui.h:37
+msgid "Merge all non-conflicting changes from left and right panes"
+msgstr "Merge semua perubahan yang tak konflik dari panel kiri dan kanan"
+
+#: ../data/ui/filediff.ui.h:38
+msgid "Previous Pane"
+msgstr "Panel Sebelumnya"
+
+#: ../data/ui/filediff.ui.h:39
+msgid "Move keyboard focus to the previous document in this comparison"
+msgstr "Pindahkan fokus papan tik ke dokumen sebelumnya dalam perbandingan ini"
+
+#: ../data/ui/filediff.ui.h:40
+msgid "Next Pane"
+msgstr "Panel Selanjutnya"
+
+#: ../data/ui/filediff.ui.h:41
+msgid "Move keyboard focus to the next document in this comparison"
+msgstr ""
+"Pindahkan fokus papan tik ke dokumen selanjutnya dalam perbandingan ini"
+
+#: ../data/ui/filediff.ui.h:42
+msgid "Lock Scrolling"
+msgstr "Kunci Pengguliran"
+
+#: ../data/ui/filediff.ui.h:43
+msgid "Lock scrolling of all panes"
+msgstr "Kunci pengguliran semua panel"
+
+#: ../data/ui/filediff.ui.h:44
 msgid "Save changes to documents before closing?"
 msgstr "Simpan perubahan ke dokumen sebelum menutup?"
 
-#: ../data/ui/filediff.ui.h:2
+#: ../data/ui/filediff.ui.h:45
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Bila Anda tak menyimpan, perubahan akan hilang selamanya."
 
-#: ../data/ui/filediff.ui.h:3
+#: ../data/ui/filediff.ui.h:46
 msgid "Close _without Saving"
 msgstr "Tutup _Tanpa Menyimpan"
 
-#: ../data/ui/filediff.ui.h:4
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:942 ../meld/filediff.py:1432
+#: ../meld/filediff.py:1500
 msgid "_Cancel"
 msgstr "_Batal"
 
-#: ../data/ui/filediff.ui.h:5
+#: ../data/ui/filediff.ui.h:48
 msgid "_Save"
 msgstr "_Simpan"
 
-#: ../data/ui/filediff.ui.h:6
+#: ../data/ui/filediff.ui.h:49
 msgid ""
 "This file can not be written to. You may click here to unlock this file and "
 "make changes anyway, but these changes must be saved to a new file."
@@ -659,28 +875,28 @@ msgstr ""
 "kunci berkas dan membuat perubahan, tapi perubahan tersebut mesti disimpan "
 "ke suatu berkas baru."
 
-#: ../data/ui/filediff.ui.h:7
+#: ../data/ui/filediff.ui.h:50
 msgid "File 3"
 msgstr "Berkas 3"
 
-#: ../data/ui/filediff.ui.h:8
+#: ../data/ui/filediff.ui.h:51
 msgid "File 2"
 msgstr "Berkas 2"
 
-#: ../data/ui/filediff.ui.h:9
+#: ../data/ui/filediff.ui.h:52
 msgid "File 1"
 msgstr "Berkas 1"
 
-#: ../data/ui/filediff.ui.h:10
+#: ../data/ui/filediff.ui.h:53
 msgid "Revert unsaved changes to documents?"
 msgstr "Batalkan perubahan yang belum tersimpan ke dokumen?"
 
-#: ../data/ui/filediff.ui.h:11
+#: ../data/ui/filediff.ui.h:54
 msgid "Changes made to the following documents will be permanently lost:\n"
 msgstr ""
 "Perubahan yang dibuat ke dokumen-dokumen berikut akan hilang selamanya:\n"
 
-#: ../data/ui/findbar.ui.h:1
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:943 ../meld/filediff.py:1433
 msgid "_Replace"
 msgstr "_Timpa"
 
@@ -728,7 +944,7 @@ msgstr "Format sebagai Patch"
 msgid "Copy to Clipboard"
 msgstr "Salin ke Papan Klip"
 
-#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:119
+#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:149
 msgid "Save Patch"
 msgstr "Simpan Patch"
 
@@ -833,7 +1049,6 @@ msgid "Use s_yntax highlighting"
 msgstr "Gunakan penyorotan s_intaks"
 
 #: ../data/ui/preferences.ui.h:22
-#| msgid "Change highlighting incomplete"
 msgid "Syntax highlighting color scheme:"
 msgstr "Skema warna penyorotan sintaks:"
 
@@ -865,51 +1080,51 @@ msgstr "B_andingkan berkas hanya berdasarkan ukuran dan penanda waktu"
 msgid "_Timestamp resolution:"
 msgstr "Resolusi penanda wak_tu:"
 
-#: ../data/ui/preferences.ui.h:30
+#: ../data/ui/preferences.ui.h:31
 msgid "Symbolic Links"
 msgstr "Taut Simbolik"
 
-#: ../data/ui/preferences.ui.h:32
+#: ../data/ui/preferences.ui.h:33
 msgid "Visible Columns"
 msgstr "Kolom Yang Nampak"
 
-#: ../data/ui/preferences.ui.h:33
+#: ../data/ui/preferences.ui.h:34
 msgid "Folder Comparisons"
 msgstr "Perbandingan Folder"
 
-#: ../data/ui/preferences.ui.h:34
+#: ../data/ui/preferences.ui.h:35
 msgid "Version Comparisons"
 msgstr "Perbandingan Versi"
 
-#: ../data/ui/preferences.ui.h:35
+#: ../data/ui/preferences.ui.h:36
 msgid "_Order when comparing file revisions:"
 msgstr "_Urutan ketika membandingkan revisi berkas:"
 
-#: ../data/ui/preferences.ui.h:36
+#: ../data/ui/preferences.ui.h:37
 msgid "Order when _merging files:"
 msgstr "Urutan ketika _merge berkas"
 
-#: ../data/ui/preferences.ui.h:37
+#: ../data/ui/preferences.ui.h:38
 msgid "Commit Messages"
 msgstr "Pesan Komit"
 
-#: ../data/ui/preferences.ui.h:38
+#: ../data/ui/preferences.ui.h:39
 msgid "Show _right margin at:"
 msgstr "Tampilkan ma_rjin kanan pada:"
 
-#: ../data/ui/preferences.ui.h:39
+#: ../data/ui/preferences.ui.h:40
 msgid "Automatically _break lines at right margin on commit"
 msgstr "Otomatis lipat _baris pada marjin kanan saat komit"
 
-#: ../data/ui/preferences.ui.h:40
+#: ../data/ui/preferences.ui.h:41
 msgid "Version Control"
 msgstr "Kendali Versi"
 
-#: ../data/ui/preferences.ui.h:41
+#: ../data/ui/preferences.ui.h:42
 msgid "Filename filters"
 msgstr "Penyaring nama berkas"
 
-#: ../data/ui/preferences.ui.h:42
+#: ../data/ui/preferences.ui.h:43
 msgid ""
 "When performing directory comparisons, you may filter out files and "
 "directories by name. Each pattern is a list of shell style wildcards "
@@ -919,23 +1134,23 @@ msgstr ""
 "direktori menurut namanya. Setiap pola adalah daftar dari wildcard gaya "
 "shell yang dipisahkan oleh spasi."
 
-#: ../data/ui/preferences.ui.h:43 ../meld/meldwindow.py:103
+#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:104
 msgid "File Filters"
 msgstr "Penyaring Berkas"
 
-#: ../data/ui/preferences.ui.h:44
+#: ../data/ui/preferences.ui.h:45
 msgid "Change trimming"
 msgstr "Ubah pemangkasan"
 
-#: ../data/ui/preferences.ui.h:45
+#: ../data/ui/preferences.ui.h:46
 msgid "Trim blank line differences from the start and end of changes"
 msgstr "Pangkas perbedaan baris kosong dari awal dan akhir perubahan"
 
-#: ../data/ui/preferences.ui.h:46
+#: ../data/ui/preferences.ui.h:47
 msgid "Text filters"
 msgstr "Penyaring teks"
 
-#: ../data/ui/preferences.ui.h:47
+#: ../data/ui/preferences.ui.h:48
 msgid ""
 "When performing file comparisons, you may ignore certain types of changes. "
 "Each pattern here is a python regular expression which replaces matching "
@@ -949,45 +1164,290 @@ msgstr ""
 "dilakukan. Bila ekspresi memuat grup, hanya grup tersebut yang diganti. "
 "Lihat manual pengguna untuk rincian lebih lanjut."
 
-#: ../data/ui/preferences.ui.h:48
+#: ../data/ui/preferences.ui.h:49
 msgid "Text Filters"
 msgstr "Penyaring Teks"
 
-#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:623
+#: ../data/ui/shortcuts.ui.h:1
+msgctxt "shortcut window"
+msgid "General"
+msgstr "Umum"
+
+#: ../data/ui/shortcuts.ui.h:2
+msgctxt "shortcut window"
 msgid "New comparison"
 msgstr "Perbandingan baru"
 
-#: ../data/ui/tab-placeholder.ui.h:2
+#: ../data/ui/shortcuts.ui.h:3
+msgctxt "shortcut window"
+msgid "Close a comparison"
+msgstr "Tutup suatu perbandingan"
+
+#: ../data/ui/shortcuts.ui.h:4
+msgctxt "shortcut window"
+msgid "Quit Meld"
+msgstr "Keluar Meld"
+
+#: ../data/ui/shortcuts.ui.h:5
+msgctxt "shortcut window"
+msgid "Stop the current action"
+msgstr "Hentikan aksi saat ini"
+
+#: ../data/ui/shortcuts.ui.h:6
+msgctxt "shortcut window"
+msgid "Refresh comparison"
+msgstr "Segarkan perbandingan"
+
+#: ../data/ui/shortcuts.ui.h:7
+msgctxt "shortcut window"
+msgid "Fullscreen"
+msgstr "Layar Penuh"
+
+#: ../data/ui/shortcuts.ui.h:8
+msgctxt "shortcut window"
+msgid "Tabs"
+msgstr "Tab"
+
+#: ../data/ui/shortcuts.ui.h:9
+msgctxt "shortcut window"
+msgid "Go to previous tab"
+msgstr "Ke tab sebelumnya"
+
+#: ../data/ui/shortcuts.ui.h:10
+msgctxt "shortcut window"
+msgid "Go to next tab"
+msgstr "Ke tab selanjutnya"
+
+#: ../data/ui/shortcuts.ui.h:11
+msgctxt "shortcut window"
+msgid "Switch to tab"
+msgstr "Tukar ke tab"
+
+#: ../data/ui/shortcuts.ui.h:12
+msgctxt "shortcut window"
+msgid "Move tab left"
+msgstr "Pindahkan tab ke kiri"
+
+#: ../data/ui/shortcuts.ui.h:13
+msgctxt "shortcut window"
+msgid "Move tab right"
+msgstr "Pindahkan tab ke kanan"
+
+#: ../data/ui/shortcuts.ui.h:14
+msgctxt "shortcut window"
+msgid "Changes"
+msgstr "Perubahan"
+
+#: ../data/ui/shortcuts.ui.h:15
+msgctxt "shortcut window"
+msgid "Go to previous change"
+msgstr "Ke perubahan sebelumnya"
+
+#: ../data/ui/shortcuts.ui.h:16
+msgctxt "shortcut window"
+msgid "Go to next change"
+msgstr "Ke perubahan selanjutnya"
+
+#: ../data/ui/shortcuts.ui.h:17
+msgctxt "shortcut window"
+msgid "Editing"
+msgstr "Menyunting"
+
+#: ../data/ui/shortcuts.ui.h:18
+msgctxt "shortcut window"
+msgid "Undo"
+msgstr "Tak jadi"
+
+#: ../data/ui/shortcuts.ui.h:19
+msgctxt "shortcut window"
+msgid "Redo"
+msgstr "Jadi lagi"
+
+#: ../data/ui/shortcuts.ui.h:20
+msgctxt "shortcut window"
+msgid "Cut"
+msgstr "Potong"
+
+#: ../data/ui/shortcuts.ui.h:21
+msgctxt "shortcut window"
+msgid "Copy"
+msgstr "Salin"
+
+#: ../data/ui/shortcuts.ui.h:22
+msgctxt "shortcut window"
+msgid "Paste"
+msgstr "Tempel"
+
+#: ../data/ui/shortcuts.ui.h:23
+msgctxt "shortcut window"
+msgid "Find"
+msgstr "Cari"
+
+#: ../data/ui/shortcuts.ui.h:24
+msgctxt "shortcut window"
+msgid "Find Next"
+msgstr "Cari Selanjutnya"
+
+#: ../data/ui/shortcuts.ui.h:25
+msgctxt "shortcut window"
+msgid "Find Previous"
+msgstr "Cari Sebelumnya"
+
+#: ../data/ui/shortcuts.ui.h:26
+msgctxt "shortcut window"
+msgid "Replace"
+msgstr "Ganti"
+
+#: ../data/ui/shortcuts.ui.h:27
+msgctxt "shortcut window"
 msgid "File comparison"
 msgstr "Perbandingan berkas"
 
-#: ../data/ui/tab-placeholder.ui.h:3
-msgid "Directory comparison"
-msgstr "Perbandingan direktori"
+#: ../data/ui/shortcuts.ui.h:28
+msgctxt "shortcut window"
+msgid "Save current file"
+msgstr "Simpan berkas kini"
+
+#: ../data/ui/shortcuts.ui.h:29
+msgctxt "shortcut window"
+msgid "Save current file to new path"
+msgstr "Simpan berkas saat ini ke path baru"
+
+#: ../data/ui/shortcuts.ui.h:30
+msgctxt "shortcut window"
+msgid "Save all files in comparison"
+msgstr "Simpan semua berkas dalam perbandingan"
+
+#: ../data/ui/shortcuts.ui.h:31
+msgctxt "shortcut window"
+msgid "Previous conflict"
+msgstr "Konflik sebelumnya"
+
+#: ../data/ui/shortcuts.ui.h:32
+msgctxt "shortcut window"
+msgid "Next conflict"
+msgstr "Konflik selanjutnya"
+
+#: ../data/ui/shortcuts.ui.h:33
+msgctxt "shortcut window"
+msgid "Push change to left"
+msgstr "Push perubahan ke kiri"
+
+#: ../data/ui/shortcuts.ui.h:34
+msgctxt "shortcut window"
+msgid "Push change to right"
+msgstr "Push perubahan ke kanan"
+
+#: ../data/ui/shortcuts.ui.h:35
+msgctxt "shortcut window"
+msgid "Pull change from left"
+msgstr "Pull perubahan dari kiri"
 
-#: ../data/ui/tab-placeholder.ui.h:4
-msgid "Version control view"
-msgstr "Tilikan kendali versi"
+#: ../data/ui/shortcuts.ui.h:36
+msgctxt "shortcut window"
+msgid "Pull change from right"
+msgstr "Pull perubahan dari kanan"
 
-#: ../data/ui/tab-placeholder.ui.h:5
-msgid "_3-way comparison"
-msgstr "Perbandingan _3 pihak"
+#: ../data/ui/shortcuts.ui.h:37
+msgctxt "shortcut window"
+msgid "Copy change above left"
+msgstr "Salin perubahan di atas kiri"
 
-#: ../data/ui/tab-placeholder.ui.h:6
-msgid "Select Third File"
-msgstr "Pilih Berkas Ke Tiga"
+#: ../data/ui/shortcuts.ui.h:38
+msgctxt "shortcut window"
+msgid "Copy change below left"
+msgstr "Salin perubahan di bawah kiri"
 
-#: ../data/ui/tab-placeholder.ui.h:7
-msgid "Select Second File"
-msgstr "Pilih Berkas Ke Dua"
+#: ../data/ui/shortcuts.ui.h:39
+msgctxt "shortcut window"
+msgid "Copy change above right"
+msgstr "Salin perubahan di atas kanan"
 
-#: ../data/ui/tab-placeholder.ui.h:8
-msgid "Select First File"
-msgstr "Pilih Berkas Pertama"
+#: ../data/ui/shortcuts.ui.h:40
+msgctxt "shortcut window"
+msgid "Copy change below right"
+msgstr "Salin perubahan di bawah kanan"
 
-#: ../data/ui/tab-placeholder.ui.h:9
-msgid "Select First Folder"
-msgstr "Pilih Folder Pertama"
+#: ../data/ui/shortcuts.ui.h:41
+msgctxt "shortcut window"
+msgid "Delete change"
+msgstr "Hapus perubahan"
+
+#: ../data/ui/shortcuts.ui.h:42
+msgctxt "shortcut window"
+msgid "Previous comparison pane"
+msgstr "Panel perbandingan sebelumnya"
+
+#: ../data/ui/shortcuts.ui.h:43
+msgctxt "shortcut window"
+msgid "Next comparison pane"
+msgstr "Panel perbandingan selanjutnya"
+
+#: ../data/ui/shortcuts.ui.h:44
+msgctxt "shortcut window"
+msgid "Folder comparison"
+msgstr "Perbandingan folder"
+
+#: ../data/ui/shortcuts.ui.h:45
+msgctxt "shortcut window"
+msgid "Copy to left"
+msgstr "Salin ke kiri"
+
+#: ../data/ui/shortcuts.ui.h:46
+msgctxt "shortcut window"
+msgid "Copy to right"
+msgstr "Salin ke kanan"
+
+#: ../data/ui/shortcuts.ui.h:47
+msgctxt "shortcut window"
+msgid "Version control comparison"
+msgstr "Perbandingan kendali versi"
+
+#: ../data/ui/shortcuts.ui.h:48
+msgctxt "shortcut window"
+msgid "Commit to version control"
+msgstr "Komit ke kendali versi"
+
+#: ../data/ui/shortcuts.ui.h:49
+msgctxt "shortcut window"
+msgid "Show/hide console output"
+msgstr "Tampilkan/sembunyikan keluaran konsol"
+
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:668
+msgid "New comparison"
+msgstr "Perbandingan baru"
+
+#: ../data/ui/tab-placeholder.ui.h:2
+msgid "File comparison"
+msgstr "Perbandingan berkas"
+
+#: ../data/ui/tab-placeholder.ui.h:3
+msgid "Directory comparison"
+msgstr "Perbandingan direktori"
+
+#: ../data/ui/tab-placeholder.ui.h:4
+msgid "Version control view"
+msgstr "Tilikan kendali versi"
+
+#: ../data/ui/tab-placeholder.ui.h:5
+msgid "_3-way comparison"
+msgstr "Perbandingan _3 pihak"
+
+#: ../data/ui/tab-placeholder.ui.h:6
+msgid "Select Third File"
+msgstr "Pilih Berkas Ke Tiga"
+
+#: ../data/ui/tab-placeholder.ui.h:7
+msgid "Select Second File"
+msgstr "Pilih Berkas Ke Dua"
+
+#: ../data/ui/tab-placeholder.ui.h:8
+msgid "Select First File"
+msgstr "Pilih Berkas Pertama"
+
+#: ../data/ui/tab-placeholder.ui.h:9
+msgid "Select First Folder"
+msgstr "Pilih Folder Pertama"
 
 #: ../data/ui/tab-placeholder.ui.h:10
 msgid "Select Second Folder"
@@ -1101,7 +1561,7 @@ msgstr "Tanpa _Versi"
 msgid "Show unversioned files"
 msgstr "Tampilkan berkas tanpa versi"
 
-#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:64
+#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:67
 msgid "Ignored"
 msgstr "Diabaikan"
 
@@ -1129,74 +1589,128 @@ msgstr "Log sebelumnya:"
 msgid "Co_mmit"
 msgstr "Ko_mit"
 
-#: ../data/ui/vcview.ui.h:35
+#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:337
+msgid "Location"
+msgstr "Lokasi"
+
+#: ../data/ui/vcview.ui.h:37
+msgid "Status"
+msgstr "Status"
+
+#: ../data/ui/vcview.ui.h:38
+msgid "Extra"
+msgstr "Ekstra"
+
+#: ../data/ui/vcview.ui.h:39
 msgid "Console output"
 msgstr "Keluaran konsol"
 
-#: ../data/ui/vcview.ui.h:36
+#: ../data/ui/vcview.ui.h:40
 msgid "Push local commits to remote?"
 msgstr "Push komit lokal ke remote?"
 
-#: ../data/ui/vcview.ui.h:37
+#: ../data/ui/vcview.ui.h:41
 msgid "The commits to be pushed are determined by your version control system."
 msgstr "Komit yang akan di-push ditentukan oleh sistem kendali versi Anda."
 
-#: ../data/ui/vcview.ui.h:38
+#: ../data/ui/vcview.ui.h:42
 msgid "_Push commits"
 msgstr "_Push komit"
 
+#: ../meld/const.py:12
+msgid "UNIX (LF)"
+msgstr "UNIX (LF)"
+
+#: ../meld/const.py:13
+msgid "DOS/Windows (CR-LF)"
+msgstr "DOS/Windows (CR-LF)"
+
+#: ../meld/const.py:14
+msgid "Mac OS (CR)"
+msgstr "Mac OS (CR)"
+
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:381 ../meld/preferences.py:82
+#: ../meld/dirdiff.py:392 ../meld/preferences.py:82
 msgid "Size"
 msgstr "Ukuran"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:389 ../meld/preferences.py:83
+#: ../meld/dirdiff.py:400 ../meld/preferences.py:83
 msgid "Modification time"
 msgstr "Waktu modifikasi"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:397 ../meld/preferences.py:84
+#: ../meld/dirdiff.py:408 ../meld/preferences.py:84
 msgid "Permissions"
 msgstr "Ijin"
 
-#: ../meld/dirdiff.py:543
+#: ../meld/dirdiff.py:538
 #, python-format
 msgid "Hide %s"
 msgstr "Sembunyikan %s"
 
-#: ../meld/dirdiff.py:672 ../meld/dirdiff.py:694
+#: ../meld/dirdiff.py:670 ../meld/dirdiff.py:694
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Memindai %s"
 
-#: ../meld/dirdiff.py:823
+#: ../meld/dirdiff.py:827
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Selesai"
 
-#: ../meld/dirdiff.py:830
+#: ../meld/dirdiff.py:835
+msgid "Folders have no differences"
+msgstr "Folder-folder tak punya perbedaan"
+
+#: ../meld/dirdiff.py:837
+msgid "Contents of scanned files in folders are identical."
+msgstr "Isi berkas yang dipindai dalam folder-folder identik."
+
+#: ../meld/dirdiff.py:839
+msgid ""
+"Scanned files in folders appear identical, but contents have not been "
+"scanned."
+msgstr ""
+"Berkas-berkas yang dipindai dalam folder-folder tampak identik, tapi isi "
+"belum dipindai."
+
+#: ../meld/dirdiff.py:842
+msgid "File filters are in use, so not all files have been scanned."
+msgstr ""
+"Penyaring berkas sedang dipakai, maka tidak semua berkas telah dipindai."
+
+#: ../meld/dirdiff.py:844
+msgid "Text filters are in use and may be masking content differences."
+msgstr "Penyaring teks sedang dipakai dan mungkin menutupi perbedaan isi."
+
+#: ../meld/dirdiff.py:862 ../meld/filediff.py:1368 ../meld/filediff.py:1398
+#: ../meld/filediff.py:1400 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122
+msgid "Hi_de"
+msgstr "Sem_bunyikan"
+
+#: ../meld/dirdiff.py:872
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Galat berganda terjadi ketika memindai folder ini"
 
-#: ../meld/dirdiff.py:831
+#: ../meld/dirdiff.py:873
 msgid "Files with invalid encodings found"
 msgstr "Berkas dengan pengkodean tak valid ditemukan"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:833
+#: ../meld/dirdiff.py:875
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "Beberapa berkas memiliki pengkodean yang salah. Namanya kurang lebih seperti:"
 
-#: ../meld/dirdiff.py:835
+#: ../meld/dirdiff.py:877
 msgid "Files hidden by case insensitive comparison"
 msgstr ""
 "Berkasn yang disembunyikan oleh perbandingan yang tak membedakan huruf besar "
 "kecil"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:837
+#: ../meld/dirdiff.py:879
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1205,30 +1719,30 @@ msgstr ""
 "sistem berkas yang peka huruf besar kecil. Berkas-berkas berikut dalam "
 "folder ini tersembunyi:
"
 
-#: ../meld/dirdiff.py:848
+#: ../meld/dirdiff.py:890
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "'%s' disembunyikan oleh '%s'"
 
-#: ../meld/dirdiff.py:873 ../meld/filediff.py:1126 ../meld/filediff.py:1277
-#: ../meld/filediff.py:1453 ../meld/filediff.py:1483 ../meld/filediff.py:1485
-msgid "Hi_de"
-msgstr "Sem_bunyikan"
+#: ../meld/dirdiff.py:946
+#, python-format
+msgid "Replace folder “%s”?"
+msgstr "Timpa folder “%s”?"
 
-#: ../meld/dirdiff.py:904
+#: ../meld/dirdiff.py:948
 #, python-format
 msgid ""
-"'%s' exists.\n"
-"Overwrite?"
+"Another folder with the same name already exists in “%s”.\n"
+"If you replace the existing folder, all files in it will be lost."
 msgstr ""
-"'%s' sudah ada.\n"
-"Timpa?"
+"Folder lain dengan nama sama telah ada dalam \"%s\".\n"
+"Bila Anda menimpa folder yang ada, semua berkas di dalamnya akan hilang."
 
-#: ../meld/dirdiff.py:912
+#: ../meld/dirdiff.py:961
 msgid "Error copying file"
 msgstr "Galat saat menyalin berkas"
 
-#: ../meld/dirdiff.py:913
+#: ../meld/dirdiff.py:962
 #, python-format
 msgid ""
 "Couldn't copy %s\n"
@@ -1241,268 +1755,102 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/dirdiff.py:936
+#: ../meld/dirdiff.py:985
 #, python-format
 msgid "Error deleting %s"
 msgstr "Galat saat menghapus %s"
 
-#: ../meld/filediff.py:243
-msgid "Format as Patch..."
-msgstr "Format sebagai Patch..."
-
-#: ../meld/filediff.py:244
-msgid "Create a patch using differences between files"
-msgstr "Buat patch memakai perbedaan antar berkas"
-
-#: ../meld/filediff.py:246
-msgid "Save A_ll"
-msgstr "Simpan Semu_a"
-
-#: ../meld/filediff.py:247
-msgid "Save all files in the current comparison"
-msgstr "Simpan semua berkas dalam perbandingan saat ini"
-
-#: ../meld/filediff.py:250
-msgid "Revert files to their saved versions"
-msgstr "Kembalikan berkas ke versi tersimpan"
-
-#: ../meld/filediff.py:252
-msgid "Add Synchronization Point"
-msgstr "Tambahkan Titik Sinkronisasi"
-
-#: ../meld/filediff.py:253
-msgid "Add a manual point for synchronization of changes between files"
-msgstr "Tambahkan satu titik manual untuk sinkronisasi perubahan antar berkas"
-
-#: ../meld/filediff.py:256
-msgid "Clear Synchronization Points"
-msgstr "Bersihkan Titik Sinkronisasi"
-
-#: ../meld/filediff.py:257
-msgid "Clear manual change sychronization points"
-msgstr "Bersihkan perubahan manual titik-titik sinkronisasi"
-
-#: ../meld/filediff.py:259
-msgid "Previous Conflict"
-msgstr "Konflik Sebelumnya"
-
-#: ../meld/filediff.py:260
-msgid "Go to the previous conflict"
-msgstr "Pindah ke konflik sebelumnya"
-
-#: ../meld/filediff.py:262
-msgid "Next Conflict"
-msgstr "Konflik Selanjutnya"
-
-#: ../meld/filediff.py:263
-msgid "Go to the next conflict"
-msgstr "Pindah ke konflik selanjutnya"
-
-#: ../meld/filediff.py:265
-msgid "Push to Left"
-msgstr "Push ke Kiri"
-
-#: ../meld/filediff.py:266
-msgid "Push current change to the left"
-msgstr "Push perubahan saat ini ke kiri"
-
-#: ../meld/filediff.py:269
-msgid "Push to Right"
-msgstr "Push ke Kanan"
-
-#: ../meld/filediff.py:270
-msgid "Push current change to the right"
-msgstr "Push perubahan saat ini ke kanan"
-
-#: ../meld/filediff.py:274
-msgid "Pull from Left"
-msgstr "Pull dari Kiri"
-
-#: ../meld/filediff.py:275
-msgid "Pull change from the left"
-msgstr "Pull perubahan dari kiri"
-
-#: ../meld/filediff.py:278
-msgid "Pull from Right"
-msgstr "Pull dari Kanan"
-
-#: ../meld/filediff.py:279
-msgid "Pull change from the right"
-msgstr "Pull perubahan dari kanan"
-
-#: ../meld/filediff.py:281
-msgid "Copy Above Left"
-msgstr "Salin Di Atas Kiri"
-
-#: ../meld/filediff.py:282
-msgid "Copy change above the left chunk"
-msgstr "Salin perubahan di atas chunk kiri"
-
-#: ../meld/filediff.py:284
-msgid "Copy Below Left"
-msgstr "Salin Di Bawah Kiri"
-
-#: ../meld/filediff.py:285
-msgid "Copy change below the left chunk"
-msgstr "Salin perubahan di bawah chunk kiri"
-
-#: ../meld/filediff.py:287
-msgid "Copy Above Right"
-msgstr "Salin Di Atas Kanan"
-
-#: ../meld/filediff.py:288
-msgid "Copy change above the right chunk"
-msgstr "Salin perubahan di atas chunk kanan"
-
-#: ../meld/filediff.py:290
-msgid "Copy Below Right"
-msgstr "Salin Di Bawah Kanan"
-
-#: ../meld/filediff.py:291
-msgid "Copy change below the right chunk"
-msgstr "Salin perubahan di bawah chunk kanan"
-
-#: ../meld/filediff.py:293
-msgid "Delete"
-msgstr "Hapus"
-
-#: ../meld/filediff.py:294
-msgid "Delete change"
-msgstr "Hapus perubahan"
-
-#: ../meld/filediff.py:296
-msgid "Merge All from Left"
-msgstr "Merge Semua dari Kiri"
-
-#: ../meld/filediff.py:297
-msgid "Merge all non-conflicting changes from the left"
-msgstr "Merge semua perubahan yang tak konflik dari kiri"
-
-#: ../meld/filediff.py:299
-msgid "Merge All from Right"
-msgstr "Merge Semua dari Kanan"
-
-#: ../meld/filediff.py:300
-msgid "Merge all non-conflicting changes from the right"
-msgstr "Merge semua perubahan yang tak konflik dari kanan"
-
-#: ../meld/filediff.py:302
-msgid "Merge All"
-msgstr "Merge Semua"
-
-#: ../meld/filediff.py:303
-msgid "Merge all non-conflicting changes from left and right panes"
-msgstr "Merge semua perubahan yang tak konflik dari panel kiri dan kanan"
-
-#: ../meld/filediff.py:307
-msgid "Cycle Through Documents"
-msgstr "Berpindah Antar Dokumen"
-
-#: ../meld/filediff.py:308
-msgid "Move keyboard focus to the next document in this comparison"
-msgstr ""
-"Pindahkan fokus papan tik ke dokumen selanjutnya dalam perbandingan ini"
-
-#: ../meld/filediff.py:314
-msgid "Lock Scrolling"
-msgstr "Kunci Pengguliran"
-
-#: ../meld/filediff.py:315
-msgid "Lock scrolling of all panes"
-msgstr "Kunci pengguliran semua panel"
+#: ../meld/dirdiff.py:1492
+msgid "No folder"
+msgstr "Tidak ada folder"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:474
+#: ../meld/filediff.py:357
 msgid "INS"
 msgstr "INS"
 
-#: ../meld/filediff.py:474
+#: ../meld/filediff.py:357
 msgid "OVR"
 msgstr "OVR"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:476
+#: ../meld/filediff.py:359
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Brs %i, Kol %i"
 
-#: ../meld/filediff.py:823
-#, python-format
+#: ../meld/filediff.py:774
+msgid "Comparison results will be inaccurate"
+msgstr "Hasil perbandingan tidak akan akurat"
+
+#: ../meld/filediff.py:776
 msgid ""
-"Filter '%s' changed the number of lines in the file. Comparison will be "
-"incorrect. See the user manual for more details."
+"A filter changed the number of lines in the file, which is unsupported. The "
+"comparison will not be accurate."
 msgstr ""
-"Penyaring '%s' mengubah cacah baris dalam berkas. Perbandingan akan salah. "
-"Lihat manual pengguna untuk rincian lebih lanjut."
+"Suatu penyaring mengubah cacah baris dalam berkas, yang tidak didukung. "
+"Perbandingan tidak akan akurat."
 
-#: ../meld/filediff.py:892
+#: ../meld/filediff.py:834
 msgid "Mark conflict as resolved?"
 msgstr "Tandai konflik sebagai terselesaikan?"
 
-#: ../meld/filediff.py:894
+#: ../meld/filediff.py:836
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
 "Bila konflik sukses dipecahkan, Anda dapat menandainya sebagai terpecahkan "
 "sekarang."
 
-#: ../meld/filediff.py:896
+#: ../meld/filediff.py:838
 msgid "Cancel"
 msgstr "Batal"
 
-#: ../meld/filediff.py:897
+#: ../meld/filediff.py:839
 msgid "Mark _Resolved"
 msgstr "Tandai Te_rselesaikan"
 
-#: ../meld/filediff.py:1113
+#: ../meld/filediff.py:1084
 #, python-format
-msgid "[%s] Set num panes"
-msgstr "[%s] Tata cacah panel"
+msgid "There was a problem opening the file “%s”."
+msgstr "Ada masalah saat membuka berkas \"%s\"."
 
-#: ../meld/filediff.py:1120
+#: ../meld/filediff.py:1092
 #, python-format
-msgid "[%s] Opening files"
-msgstr "[%s] Membuka berkas"
-
-#: ../meld/filediff.py:1143 ../meld/filediff.py:1153 ../meld/filediff.py:1166
-#: ../meld/filediff.py:1172
-msgid "Could not read file"
-msgstr "Tak bisa baca berkas"
+msgid "File %s appears to be a binary file."
+msgstr "Berkas %s tampaknya berkas biner."
 
-#: ../meld/filediff.py:1144
-#, python-format
-msgid "[%s] Reading files"
-msgstr "[%s] Membaca berkas"
-
-#: ../meld/filediff.py:1154
-#, python-format
-msgid "%s appears to be a binary file."
-msgstr "%s nampaknya berkas biner."
+#: ../meld/filediff.py:1094
+msgid "Do you want to open the file using the default application?"
+msgstr "Apakah Anda ingin membuka berkas memakai aplikasi baku?"
 
-#: ../meld/filediff.py:1167
-#, python-format
-msgid "%s is not in encodings: %s"
-msgstr "%s tidak dalam pengkodean: %s"
+#: ../meld/filediff.py:1096
+msgid "Open"
+msgstr "Buka"
 
-#: ../meld/filediff.py:1205
+#: ../meld/filediff.py:1112
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Menghitung perbedaan"
 
-#: ../meld/filediff.py:1272
+#: ../meld/filediff.py:1177
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Berkas %s telah berubah pada disk"
 
-#: ../meld/filediff.py:1273
+#: ../meld/filediff.py:1178
 msgid "Do you want to reload the file?"
 msgstr "Apakah Anda ingin memuat ulang berkas?"
 
-#: ../meld/filediff.py:1276
+#: ../meld/filediff.py:1180
 msgid "_Reload"
 msgstr "Muat _Ulang"
 
-#: ../meld/filediff.py:1442
+#: ../meld/filediff.py:1331
+msgid "Files are identical"
+msgstr "Berkas identik"
+
+#: ../meld/filediff.py:1344
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1510,19 +1858,28 @@ msgstr ""
 "Penyaring teks sedang dipakai, dan mungkin menutupi perbedaan antara berkas. "
 "Apakah Anda ingin membandingkan berkas-berkas yang tak tersaring?"
 
-#: ../meld/filediff.py:1448
-msgid "Files are identical"
-msgstr "Berkas identik"
+#: ../meld/filediff.py:1349
+msgid "Files differ in line endings only"
+msgstr "Berkas berbeda hanya pada akhiran baris"
 
-#: ../meld/filediff.py:1456
+#: ../meld/filediff.py:1351
+#, python-format
+msgid ""
+"Files are identical except for differing line endings:\n"
+"%s"
+msgstr ""
+"Berkas-berkas identik kecuali perbedaan akhiran baris:\n"
+"%s"
+
+#: ../meld/filediff.py:1371
 msgid "Show without filters"
 msgstr "Tampilkan tanpa penyaring"
 
-#: ../meld/filediff.py:1478
+#: ../meld/filediff.py:1393
 msgid "Change highlighting incomplete"
 msgstr "Penyorotan perubahan tak lengkap"
 
-#: ../meld/filediff.py:1479
+#: ../meld/filediff.py:1394
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1531,88 +1888,94 @@ msgstr ""
 "untuk lebih panjanga sehingga menyorot perubahan yang lebih besar, walaupun "
 "ini mungkin lambat."
 
-#: ../meld/filediff.py:1487
+#: ../meld/filediff.py:1402
 msgid "Keep highlighting"
 msgstr "Tetap menyorot"
 
-#: ../meld/filediff.py:1489
+#: ../meld/filediff.py:1404
 msgid "_Keep highlighting"
 msgstr "_Tetap menyorot"
 
-#: ../meld/filediff.py:1620
+#: ../meld/filediff.py:1436
 #, python-format
-msgid ""
-"\"%s\" exists!\n"
-"Overwrite?"
-msgstr ""
-"\"%s\" sudah ada!\n"
-"Timpa?"
+msgid "Replace file “%s”?"
+msgstr "Timpa berkas “%s”?"
 
-#: ../meld/filediff.py:1633
+#: ../meld/filediff.py:1438
 #, python-format
 msgid ""
-"Error writing to %s\n"
-"\n"
-"%s."
+"A file with this name already exists in “%s”.\n"
+"If you replace the existing file, its contents will be lost."
 msgstr ""
-"Galat saat menulis ke %s\n"
-"\n"
-"%s."
+"Sebuah berkas dengan nama ini telah ada dalam \"%s\".\n"
+"Bila Anda menimpa berkas yang ada, isinya akan hilang."
 
-#: ../meld/filediff.py:1644
+#: ../meld/filediff.py:1455
 msgid "Save Left Pane As"
 msgstr "Simpan Panel Kiri Sebagai"
 
-#: ../meld/filediff.py:1646
+#: ../meld/filediff.py:1457
 msgid "Save Middle Pane As"
 msgstr "Simpan Panel Tengah Sebagai"
 
-#: ../meld/filediff.py:1648
+#: ../meld/filediff.py:1459
 msgid "Save Right Pane As"
 msgstr "Simpan Panel Kanan Sebagai"
 
-#: ../meld/filediff.py:1661
+#: ../meld/filediff.py:1473
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Berkas %s telah berubah pada disk sejak dibuka"
 
-#: ../meld/filediff.py:1663
+#: ../meld/filediff.py:1475
 msgid "If you save it, any external changes will be lost."
 msgstr "Bila Anda menyimpannya, perubahan eksternal akan hilang."
 
-#: ../meld/filediff.py:1666
+#: ../meld/filediff.py:1478
 msgid "Save Anyway"
 msgstr "Simpan Saja"
 
-#: ../meld/filediff.py:1667
+#: ../meld/filediff.py:1479
 msgid "Don't Save"
 msgstr "Jangan Simpan"
 
-#: ../meld/filediff.py:1691
+#: ../meld/filediff.py:1501
+msgid "_Save as UTF-8"
+msgstr "_Simpan sebagai UTF-8"
+
+#: ../meld/filediff.py:1504
 #, python-format
-msgid ""
-"This file '%s' contains a mixture of line endings.\n"
-"\n"
-"Which format would you like to use?"
-msgstr ""
-"Berkas '%s' memuat beberapa macam akhir baris.\n"
-"\n"
-"Format mana yang ingin Anda pakai?"
+msgid "Couldn't encode text as “%s”"
+msgstr "Tak bisa meng-encode teks sebagai \"%s\""
 
-#: ../meld/filediff.py:1707
+#: ../meld/filediff.py:1506
 #, python-format
 msgid ""
-"'%s' contains characters not encodable with '%s'\n"
+"File “%s” contains characters that can't be encoded using encoding “%s”.\n"
 "Would you like to save as UTF-8?"
 msgstr ""
-"'%s' memuat karakter yang tak bisa dienkode dengan '%s'\n"
+"Berkas \"%s\" memuat karakter yang tak bisa dienkode dengan \"%s\".\n"
 "Apakah Anda ingin menyimpan sebagai UTF-8?"
 
-#: ../meld/filediff.py:2070
+#: ../meld/filediff.py:1543 ../meld/patchdialog.py:125
+#, python-format
+msgid "Could not save file %s."
+msgstr "Tak bisa menyimpan berkas %s."
+
+#: ../meld/filediff.py:1544 ../meld/patchdialog.py:126
+#, python-format
+msgid ""
+"Couldn't save file due to:\n"
+"%s"
+msgstr ""
+"Tidak bisa menyimpan berkas karena:\n"
+"%s"
+
+#: ../meld/filediff.py:1890
 msgid "Live comparison updating disabled"
 msgstr "Pemutakhiran perbandingan live dinonaktifkan"
 
-#: ../meld/filediff.py:2071
+#: ../meld/filediff.py:1891
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1623,349 +1986,361 @@ msgstr ""
 "dan pemutakhiran secara live akan dilanjutkan ketika titik penyelarasan "
 "dibersihkan."
 
-#: ../meld/filemerge.py:48
+#: ../meld/filemerge.py:37
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Sedang merge berkas"
 
-#: ../meld/gutterrendererchunk.py:90
+#: ../meld/gutterrendererchunk.py:159
 msgid "Copy _up"
 msgstr "Salin _naik"
 
-#: ../meld/gutterrendererchunk.py:91
+#: ../meld/gutterrendererchunk.py:160
 msgid "Copy _down"
 msgstr "Salin _turun"
 
-#: ../meld/meldapp.py:170
+#: ../meld/meldapp.py:177
 msgid "wrong number of arguments supplied to --diff"
 msgstr "banyaknya argumen yang diberikan ke --diff salah"
 
-#: ../meld/meldapp.py:175
+#: ../meld/meldapp.py:182
 msgid "Start with an empty window"
 msgstr "Mulai dengan jendela kosong"
 
-#: ../meld/meldapp.py:176 ../meld/meldapp.py:178
+#: ../meld/meldapp.py:183 ../meld/meldapp.py:185
 msgid "file"
 msgstr "berkas"
 
-#: ../meld/meldapp.py:176 ../meld/meldapp.py:180
+#: ../meld/meldapp.py:183 ../meld/meldapp.py:187
 msgid "folder"
 msgstr "folder"
 
-#: ../meld/meldapp.py:177
+#: ../meld/meldapp.py:184
 msgid "Start a version control comparison"
 msgstr "Mulai suatu perbandingan kendali versi"
 
-#: ../meld/meldapp.py:179
+#: ../meld/meldapp.py:186
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Mulai perbandingan berkas 2 atau 3 pihak"
 
-#: ../meld/meldapp.py:181
+#: ../meld/meldapp.py:188
 msgid "Start a 2- or 3-way folder comparison"
 msgstr "Mulai perbandingan folder 2 atau 3 pihak"
 
-#: ../meld/meldapp.py:224
+#: ../meld/meldapp.py:231
 #, python-format
 msgid "Error: %s\n"
 msgstr "Galat: %s\n"
 
-#: ../meld/meldapp.py:231
+#: ../meld/meldapp.py:238
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld adalah alat perbandingan berkas dan direktori."
 
-#: ../meld/meldapp.py:235
+#: ../meld/meldapp.py:242
 msgid "Set label to use instead of file name"
 msgstr "Tata label yang akan dipakai sebagai ganti nama berkas"
 
-#: ../meld/meldapp.py:238
+#: ../meld/meldapp.py:245
 msgid "Open a new tab in an already running instance"
 msgstr "Buka tab baru pada instansi yang sedang berjalan"
 
-#: ../meld/meldapp.py:241
+#: ../meld/meldapp.py:248
 msgid "Automatically compare all differing files on startup"
 msgstr "Otomatis membandingkan semua berkas yang berbeda saat awal mula"
 
-#: ../meld/meldapp.py:244
+#: ../meld/meldapp.py:251
 msgid "Ignored for compatibility"
 msgstr "Diabaikan untuk kompatibilitas"
 
-#: ../meld/meldapp.py:248
+#: ../meld/meldapp.py:255
 msgid "Set the target file for saving a merge result"
 msgstr "Tata berkas target untuk menyimpan hasil merge"
 
-#: ../meld/meldapp.py:251
+#: ../meld/meldapp.py:258
 msgid "Automatically merge files"
 msgstr "Otomatis me-merge berkas"
 
-#: ../meld/meldapp.py:255
+#: ../meld/meldapp.py:262
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "Muat perbandingan yang disimpan dari suatu berkas perbandingan Meld"
 
-#: ../meld/meldapp.py:259
+#: ../meld/meldapp.py:266
 msgid "Create a diff tab for the supplied files or folders"
 msgstr "Buat suatu tab diff bagi berkas atau folder yang diberikan"
 
-#: ../meld/meldapp.py:279
+#: ../meld/meldapp.py:286
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "terlalu banyak argumen (diinginkan 0-3, diperoleh %d)"
 
-#: ../meld/meldapp.py:282
+#: ../meld/meldapp.py:289
 msgid "can't auto-merge less than 3 files"
 msgstr "tak bisa merge otomatis kurang dari 3 berkas"
 
-#: ../meld/meldapp.py:284
+#: ../meld/meldapp.py:291
 msgid "can't auto-merge directories"
 msgstr "tak bisa merge otomatis direktori"
 
-#: ../meld/meldapp.py:298
+#: ../meld/meldapp.py:305
 msgid "Error reading saved comparison file"
 msgstr "Galat saat membaca berkas perbandingan yang disimpan"
 
+#: ../meld/meldapp.py:332
+#, python-format
+msgid "invalid path or URI \"%s\""
+msgstr "path atau URI \"%s\" tidak valid"
+
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:137
+#: ../meld/meldbuffer.py:132
 msgid "<unnamed>"
 msgstr "<tanpa nama>"
 
-#: ../meld/melddoc.py:78 ../meld/melddoc.py:79
+#: ../meld/melddoc.py:83 ../meld/melddoc.py:84
 msgid "untitled"
 msgstr "tanpa judul"
 
-#: ../meld/meldwindow.py:48
+#: ../meld/meldwindow.py:49
 msgid "_File"
 msgstr "_Berkas"
 
-#: ../meld/meldwindow.py:49
+#: ../meld/meldwindow.py:50
 msgid "_New Comparison..."
 msgstr "Perba_ndingan Baru..."
 
-#: ../meld/meldwindow.py:50
+#: ../meld/meldwindow.py:51
 msgid "Start a new comparison"
 msgstr "Mulai suatu perbandingan baru"
 
-#: ../meld/meldwindow.py:53
+#: ../meld/meldwindow.py:54
 msgid "Save the current file"
 msgstr "Simpan berkas saat ini"
 
-#: ../meld/meldwindow.py:55
+#: ../meld/meldwindow.py:56
 msgid "Save As..."
 msgstr "Simpan Sebagai..."
 
-#: ../meld/meldwindow.py:56
+#: ../meld/meldwindow.py:57
 msgid "Save the current file with a different name"
 msgstr "Simpan berkas saat ini dengan nama lain"
 
-#: ../meld/meldwindow.py:59
+#: ../meld/meldwindow.py:60
 msgid "Close the current file"
 msgstr "Tutup berkas saat ini"
 
-#: ../meld/meldwindow.py:62
+#: ../meld/meldwindow.py:63
 msgid "_Edit"
 msgstr "_Sunting"
 
-#: ../meld/meldwindow.py:64
+#: ../meld/meldwindow.py:65
 msgid "Undo the last action"
 msgstr "Batalkan aksi terakhir"
 
-#: ../meld/meldwindow.py:67
+#: ../meld/meldwindow.py:68
 msgid "Redo the last undone action"
 msgstr "Jadikan lagi aksi terakhir yang dibatalkan"
 
-#: ../meld/meldwindow.py:69
+#: ../meld/meldwindow.py:70
 msgid "Cut the selection"
 msgstr "Potong yang dipilih"
 
-#: ../meld/meldwindow.py:71
+#: ../meld/meldwindow.py:72
 msgid "Copy the selection"
 msgstr "Salin yang dipilih"
 
-#: ../meld/meldwindow.py:73
+#: ../meld/meldwindow.py:74
 msgid "Paste the clipboard"
 msgstr "Tempel yang dipilih"
 
-#: ../meld/meldwindow.py:75
+#: ../meld/meldwindow.py:76
 msgid "Find..."
 msgstr "Cari..."
 
-#: ../meld/meldwindow.py:75
+#: ../meld/meldwindow.py:76
 msgid "Search for text"
 msgstr "Mencari teks"
 
-#: ../meld/meldwindow.py:77
+#: ../meld/meldwindow.py:78
 msgid "Find Ne_xt"
 msgstr "Cari Sela_njutnya"
 
-#: ../meld/meldwindow.py:78
+#: ../meld/meldwindow.py:79
 msgid "Search forwards for the same text"
 msgstr "Cari terus teks yang sama"
 
-#: ../meld/meldwindow.py:80
+#: ../meld/meldwindow.py:81
 msgid "Find _Previous"
 msgstr "Cari Se_belumnya"
 
-#: ../meld/meldwindow.py:81
+#: ../meld/meldwindow.py:82
 msgid "Search backwards for the same text"
 msgstr "Cari mundur teks yang sama"
 
-#: ../meld/meldwindow.py:84
+#: ../meld/meldwindow.py:85
 msgid "_Replace..."
 msgstr "_Gantikan..."
 
-#: ../meld/meldwindow.py:85
+#: ../meld/meldwindow.py:86
 msgid "Find and replace text"
 msgstr "Cari dan gantikan teks"
 
-#: ../meld/meldwindow.py:88
+#: ../meld/meldwindow.py:89
 msgid "_Changes"
 msgstr "_Perubahan"
 
-#: ../meld/meldwindow.py:89
+#: ../meld/meldwindow.py:90
 msgid "Next Change"
 msgstr "Perubahan Selanjutnya"
 
-#: ../meld/meldwindow.py:90
+#: ../meld/meldwindow.py:91
 msgid "Go to the next change"
 msgstr "Pergi ke perubahan selanjutnya"
 
-#: ../meld/meldwindow.py:92
+#: ../meld/meldwindow.py:93
 msgid "Previous Change"
 msgstr "Perubahan Sebelumnya"
 
-#: ../meld/meldwindow.py:93
+#: ../meld/meldwindow.py:94
 msgid "Go to the previous change"
 msgstr "Pergi ke perubahan sebelumnya"
 
-#: ../meld/meldwindow.py:95
+#: ../meld/meldwindow.py:96
 msgid "Open Externally"
 msgstr "Buka Secara Eksternal"
 
-#: ../meld/meldwindow.py:96
+#: ../meld/meldwindow.py:97
 msgid "Open selected file or directory in the default external application"
 msgstr "Buka berkas atau direktori yang dipilih dalam aplikasi eksternal baku"
 
-#: ../meld/meldwindow.py:100
+#: ../meld/meldwindow.py:101
 msgid "_View"
 msgstr "_Tilik"
 
-#: ../meld/meldwindow.py:101
+#: ../meld/meldwindow.py:102
 msgid "File Status"
 msgstr "Status Berkas"
 
-#: ../meld/meldwindow.py:102
+#: ../meld/meldwindow.py:103
 msgid "Version Status"
 msgstr "Status Versi"
 
-#: ../meld/meldwindow.py:105
+#: ../meld/meldwindow.py:106
 msgid "Stop the current action"
 msgstr "Hentikan aksi saat ini"
 
-#: ../meld/meldwindow.py:108
+#: ../meld/meldwindow.py:109
 msgid "Refresh the view"
 msgstr "Segarkan tilikan"
 
-#: ../meld/meldwindow.py:111
+#: ../meld/meldwindow.py:112
 msgid "_Tabs"
 msgstr "_Tab"
 
-#: ../meld/meldwindow.py:112
+#: ../meld/meldwindow.py:113
 msgid "_Previous Tab"
 msgstr "Tab Se_belumnya"
 
-#: ../meld/meldwindow.py:113
+#: ../meld/meldwindow.py:114
 msgid "Activate previous tab"
 msgstr "Aktifkan tab sebelumnya"
 
-#: ../meld/meldwindow.py:115
+#: ../meld/meldwindow.py:116
 msgid "_Next Tab"
 msgstr "Tab Sela_njutnya"
 
-#: ../meld/meldwindow.py:116
+#: ../meld/meldwindow.py:117
 msgid "Activate next tab"
 msgstr "Aktifkan tab selanjutnya"
 
-#: ../meld/meldwindow.py:119
+#: ../meld/meldwindow.py:120
 msgid "Move Tab _Left"
 msgstr "Pindahkan Tab Ke K_iri"
 
-#: ../meld/meldwindow.py:120
+#: ../meld/meldwindow.py:121
 msgid "Move current tab to left"
 msgstr "Pindahkan tab saat ini ke kiri"
 
-#: ../meld/meldwindow.py:123
+#: ../meld/meldwindow.py:124
 msgid "Move Tab _Right"
 msgstr "Pindahkan Tab Ke K_anan"
 
-#: ../meld/meldwindow.py:124
+#: ../meld/meldwindow.py:125
 msgid "Move current tab to right"
 msgstr "Pindahkan tab saat ini ke kanan"
 
-#: ../meld/meldwindow.py:128
+#: ../meld/meldwindow.py:129
 msgid "Fullscreen"
 msgstr "Layar Penuh"
 
-#: ../meld/meldwindow.py:129
+#: ../meld/meldwindow.py:130
 msgid "View the comparison in fullscreen"
 msgstr "Tilik perbandingan dalam layar penuh"
 
-#: ../meld/meldwindow.py:131
+#: ../meld/meldwindow.py:132
 msgid "_Toolbar"
 msgstr "Bilah Ala_t"
 
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:133
 msgid "Show or hide the toolbar"
 msgstr "Tampilkan atau sembunyikan bilah alat"
 
-#: ../meld/meldwindow.py:141
+#: ../meld/meldwindow.py:143
 msgid "Open Recent"
 msgstr "Buka Terkini"
 
-#: ../meld/meldwindow.py:142
+#: ../meld/meldwindow.py:144
 msgid "Open recent files"
 msgstr "Buka berkas yang baru-baru ini"
 
-#: ../meld/meldwindow.py:164
+#: ../meld/meldwindow.py:166
 msgid "_Meld"
 msgstr "_Meld"
 
-#: ../meld/meldwindow.py:165
+#: ../meld/meldwindow.py:167
 msgid "Quit the program"
 msgstr "Keluar program"
 
-#: ../meld/meldwindow.py:167
+#: ../meld/meldwindow.py:169
 msgid "Prefere_nces"
 msgstr "Prefere_nsi"
 
-#: ../meld/meldwindow.py:168
+#: ../meld/meldwindow.py:170
 msgid "Configure the application"
 msgstr "Atur konfigurasi aplikasi"
 
-#: ../meld/meldwindow.py:170
+#: ../meld/meldwindow.py:172
 msgid "_Contents"
 msgstr "_Isi"
 
-#: ../meld/meldwindow.py:171
+#: ../meld/meldwindow.py:173
 msgid "Open the Meld manual"
 msgstr "Buka manual Meld"
 
-#: ../meld/meldwindow.py:173
+#: ../meld/meldwindow.py:175
 msgid "About this application"
 msgstr "Tentang aplikasi ini"
 
-#: ../meld/meldwindow.py:546
+#: ../meld/meldwindow.py:587
 msgid "Switch to this tab"
 msgstr "Tukar ke tab ini"
 
-#: ../meld/meldwindow.py:657
+#: ../meld/meldwindow.py:702
 #, python-format
 msgid "Need three files to auto-merge, got: %r"
 msgstr "Perlu tiga berkas untuk merge otomatis, mendapat: %r"
 
-#: ../meld/meldwindow.py:671
+#: ../meld/meldwindow.py:716
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Tak bisa membandingkan campuran berkas dan direktori"
 
+#: ../meld/misc.py:202
+#, python-format
+msgid "Couldn't find colour scheme details for %s-%s; this is a bad install"
+msgstr ""
+"Tak bisa temukan rincian skema warna bagi %s-%s; ini adalah instalasi yang "
+"buruk"
+
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:218
+#: ../meld/misc.py:287
 msgid "[None]"
 msgstr "[Nihil]"
 
@@ -1977,197 +2352,192 @@ msgstr "label"
 msgid "pattern"
 msgstr "pola"
 
-#: ../meld/recent.py:114
+#: ../meld/recent.py:115
 msgid "Version control:"
 msgstr "Kendali versi:"
 
-#: ../meld/ui/notebooklabel.py:65
+#: ../meld/ui/notebooklabel.py:63
 msgid "Close tab"
 msgstr "Tutup tab"
 
-#: ../meld/ui/vcdialogs.py:61
+#: ../meld/ui/vcdialogs.py:50
 msgid "No files will be committed"
 msgstr "Tak ada berkas yang akan dikomit"
 
 #. Translators: First %s is replaced by translated "%d unpushed
 #. commits", second %s is replaced by translated "%d branches"
-#: ../meld/vc/git.py:126
+#: ../meld/vc/git.py:95
 #, python-format
 msgid "%s in %s"
 msgstr "%s dalam %s"
 
 #. Translators: These messages cover the case where there is
 #. only one branch, and are not part of another message.
-#: ../meld/vc/git.py:127 ../meld/vc/git.py:134
+#: ../meld/vc/git.py:96 ../meld/vc/git.py:103
 #, python-format
 msgid "%d unpushed commit"
 msgid_plural "%d unpushed commits"
 msgstr[0] "%d komit belum di-push"
 
-#: ../meld/vc/git.py:129
+#: ../meld/vc/git.py:98
 #, python-format
 msgid "%d branch"
 msgid_plural "%d branches"
 msgstr[0] "%d branch"
 
-#: ../meld/vc/git.py:348
+#: ../meld/vc/git.py:352
 #, python-format
 msgid "Mode changed from %s to %s"
 msgstr "Mode diubah dari %s ke %s"
 
-#: ../meld/vc/_vc.py:47
+#: ../meld/vc/git.py:360
+msgid "Partially staged"
+msgstr "Di-stage sebagian"
+
+#: ../meld/vc/git.py:360
+msgid "Staged"
+msgstr "Di-stage"
+
+#. Translators: This is the displayed name of a version control system
+#. when no version control system is actually found.
+#: ../meld/vc/_null.py:38
+msgid "None"
+msgstr "Nihil"
+
+#: ../meld/vc/svn.py:216
+#, python-format
+msgid "Rev %s"
+msgstr "Rev %s"
+
+#: ../meld/vc/_vc.py:52
 msgid "Merged"
 msgstr "Di-merge"
 
-#: ../meld/vc/_vc.py:47
+#: ../meld/vc/_vc.py:52
 msgid "Base"
 msgstr "Basis"
 
-#: ../meld/vc/_vc.py:47
+#: ../meld/vc/_vc.py:52
 msgid "Local"
 msgstr "Lokal"
 
-#: ../meld/vc/_vc.py:47
+#: ../meld/vc/_vc.py:52
 msgid "Remote"
 msgstr "Remote"
 
-#: ../meld/vc/_vc.py:65
+#: ../meld/vc/_vc.py:68
 msgid "Unversioned"
 msgstr "Tanpa versi"
 
-#: ../meld/vc/_vc.py:68
+#: ../meld/vc/_vc.py:71
 msgid "Error"
 msgstr "Galat"
 
-#: ../meld/vc/_vc.py:70
+#: ../meld/vc/_vc.py:73
 msgid "Newly added"
 msgstr "Baru ditambahkan"
 
-#: ../meld/vc/_vc.py:72
+#: ../meld/vc/_vc.py:75
 msgid "Renamed"
 msgstr "Diubah nama"
 
-#: ../meld/vc/_vc.py:73
+#: ../meld/vc/_vc.py:76
 msgid "Conflict"
 msgstr "Konflik"
 
-#: ../meld/vc/_vc.py:74
+#: ../meld/vc/_vc.py:77
 msgid "Removed"
 msgstr "Dihapus"
 
-#: ../meld/vc/_vc.py:75
+#: ../meld/vc/_vc.py:78
 msgid "Missing"
 msgstr "Kurang"
 
-#: ../meld/vc/_vc.py:76
+#: ../meld/vc/_vc.py:79
 msgid "Not present"
 msgstr "Tak ada"
 
-#: ../meld/vcview.py:233 ../meld/vcview.py:417
-msgid "Location"
-msgstr "Lokasi"
-
-#: ../meld/vcview.py:234
-msgid "Status"
-msgstr "Status"
-
-#: ../meld/vcview.py:235
-msgid "Revision"
-msgstr "Revisi"
-
-#: ../meld/vcview.py:236
-msgid "Options"
-msgstr "Opsi"
-
-#. TRANSLATORS: this is an error message when a version control
-#. application isn't installed or can't be found
-#: ../meld/vcview.py:324
+#. Translators: This error message is shown when a version
+#. control binary isn't installed.
+#: ../meld/vcview.py:255
 #, python-format
-msgid "%s not installed"
-msgstr "%s tidak terpasang"
-
-#. TRANSLATORS: this is an error message when a version
-#. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:328
-msgid "Invalid repository"
-msgstr "Repositori tak valid"
+msgid "%(name)s (%(cmd)s not installed)"
+msgstr "%(name)s (%(cmd)s tidak terpasang)"
 
-#: ../meld/vcview.py:337
+#. Translators: This error message is shown when a version
+#. controlled repository is invalid.
+#: ../meld/vcview.py:259
 #, python-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+msgid "%(name)s (Invalid repository)"
+msgstr "%(name)s (Repositori tak valid)"
 
-#: ../meld/vcview.py:339 ../meld/vcview.py:347
-msgid "None"
-msgstr "Nihil"
-
-#: ../meld/vcview.py:358
+#: ../meld/vcview.py:280
 msgid "No valid version control system found in this folder"
 msgstr "Tak ada sistem kendali versi yang valid dalam folder ini"
 
-#: ../meld/vcview.py:360
+#: ../meld/vcview.py:282
 msgid "Only one version control system found in this folder"
 msgstr "Hanya satu sistem kendali versi ditemukan dalam folder ini"
 
-#: ../meld/vcview.py:362
+#: ../meld/vcview.py:284
 msgid "Choose which version control system to use"
 msgstr "Pilih sistem kendali mana yang akan dipakai"
 
-#. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:417
+#. TRANSLATORS: This is the location of the directory being viewed
+#: ../meld/vcview.py:337
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:431 ../meld/vcview.py:439
+#: ../meld/vcview.py:357
 #, python-format
 msgid "Scanning %s"
 msgstr "Memindai %s"
 
-#: ../meld/vcview.py:479
+#: ../meld/vcview.py:396
 msgid "(Empty)"
 msgstr "(Kosong)"
 
-#: ../meld/vcview.py:522
+#: ../meld/vcview.py:440
 #, python-format
 msgid "%s — local"
 msgstr "%s — lokal"
 
-#: ../meld/vcview.py:523
+#: ../meld/vcview.py:441
 #, python-format
 msgid "%s — remote"
 msgstr "%s — remote"
 
-#: ../meld/vcview.py:531
+#: ../meld/vcview.py:449
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (lokal, merge, remote)"
 
-#: ../meld/vcview.py:536
+#: ../meld/vcview.py:454
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (remote, merge, lokal)"
 
-#: ../meld/vcview.py:547
+#: ../meld/vcview.py:465
 #, python-format
 msgid "%s — repository"
 msgstr "%s — repositori"
 
-#: ../meld/vcview.py:553
+#: ../meld/vcview.py:471
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (kerja, repositori)"
 
-#: ../meld/vcview.py:557
+#: ../meld/vcview.py:475
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (repositori, kerja)"
 
-#: ../meld/vcview.py:741
+#: ../meld/vcview.py:643
 msgid "Remove folder and all its files?"
 msgstr "Hapus folder dan semua berkasnya?"
 
-#: ../meld/vcview.py:743
+#: ../meld/vcview.py:645
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2175,10 +2545,11 @@ msgstr ""
 "Ini akan menghapus semua berkas dan folder yang dipilih, dan semua berkas di "
 "dalam sebarang folder yang dipilih, dari kendali versi."
 
-#: ../meld/vcview.py:777
+#: ../meld/vcview.py:670
 #, python-format
 msgid "Error removing %s"
 msgstr "Galat saat menghapus %s"
 
-#~ msgid "Regular expression error"
-#~ msgstr "Galat ekspresi reguler"
+#: ../meld/vcview.py:750
+msgid "Clear"
+msgstr "Bersihkan"

From 83f3175b3e47b917b51ac84f5331af10f179eedd Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sat, 30 Jul 2016 07:30:36 +1000
Subject: [PATCH 15/51] Update NEWS

---
 NEWS | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/NEWS b/NEWS
index 2c5f0150..b8313254 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,17 @@
 
+2016-07-30 meld 3.16.2
+======================
+
+  Fixes:
+
+   * Fix performance regression in text filtering (Kai Willadsen)
+   * Fix regression in respecting custom text encoding (Kai Willadsen)
+
+  Translations:
+
+   * Andika Triwidada (id)
+
+
 2016-06-19 meld 3.16.1
 ======================
 

From f21926a0f5103bd5abab2666843c49671d0c639b Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sat, 30 Jul 2016 07:30:59 +1000
Subject: [PATCH 16/51] Post-release version bump

---
 meld/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meld/conf.py b/meld/conf.py
index f92501d4..c446c5c1 100644
--- a/meld/conf.py
+++ b/meld/conf.py
@@ -3,7 +3,7 @@
 import sys
 
 __package__ = "meld"
-__version__ = "3.16.2"
+__version__ = "3.16.3"
 
 # START; these paths are clobbered on install by meld.build_helpers
 DATADIR = os.path.join(sys.prefix, "share", "meld")

From 74062af4c4ae0daea41e743757eec802638e6e0b Mon Sep 17 00:00:00 2001
From: Anders Jonsson <anders.jonsson@norsjovallen.se>
Date: Sat, 13 Aug 2016 10:48:30 +0000
Subject: [PATCH 17/51] Updated Swedish translation

---
 help/sv/sv.po | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/help/sv/sv.po b/help/sv/sv.po
index 7b51984b..3bca93bf 100644
--- a/help/sv/sv.po
+++ b/help/sv/sv.po
@@ -5,16 +5,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: meld master\n"
-"POT-Creation-Date: 2015-07-21 21:35+0000\n"
-"PO-Revision-Date: 2015-07-21 23:47+0200\n"
-"Last-Translator: Josef Andersson <josef.andersson@fripost.org>\n"
+"POT-Creation-Date: 2016-07-29 21:31+0000\n"
+"PO-Revision-Date: 2016-08-13 12:47+0200\n"
+"Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.2\n"
+"X-Generator: Poedit 1.8.8\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -32,8 +32,7 @@ msgstr "3"
 #: C/resolving-conflicts.page:10 C/preferences.page:10 C/file-changes.page:10
 #: C/file-mode.page:11 C/flattened-view.page:10 C/index.page:8
 #: C/vc-mode.page:10 C/keyboard-shortcuts.page:10 C/introduction.page:10
-#: C/folder-mode.page:10 C/missing-functionality.page:10
-#: C/command-line.page:10
+#: C/folder-mode.page:10 C/missing-functionality.page:10 C/command-line.page:10
 msgid "Kai Willadsen"
 msgstr "Kai Willadsen"
 
@@ -1440,9 +1439,9 @@ msgid "Find the next instance of the string."
 msgstr "Hitta nästa förekomst av strängen."
 
 #. (itstool) path: td/p
-#: C/keyboard-shortcuts.page:90 C/keyboard-shortcuts.page:96
-msgid "<keyseq><key>Alt</key><key>Up</key></keyseq>"
-msgstr "<keyseq><key>Alt</key><key>Upp</key></keyseq>"
+#: C/keyboard-shortcuts.page:90
+msgid "<keyseq><key>Alt</key><key>Down</key></keyseq>"
+msgstr "<keyseq><key>Alt</key><key>Ned</key></keyseq>"
 
 #. (itstool) path: td/p
 #: C/keyboard-shortcuts.page:91
@@ -1452,6 +1451,11 @@ msgid ""
 msgstr ""
 "Gå till nästa skillnad. (också <keyseq><key>Ctrl</key><key>D</key></keyseq>)"
 
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:96
+msgid "<keyseq><key>Alt</key><key>Up</key></keyseq>"
+msgstr "<keyseq><key>Alt</key><key>Upp</key></keyseq>"
+
 #. (itstool) path: td/p
 #: C/keyboard-shortcuts.page:97
 msgid ""

From 3948c570f8bdae2a2817f852201bd42c24e3f191 Mon Sep 17 00:00:00 2001
From: Tiago Santos <tiagofsantos81@sapo.pt>
Date: Sun, 14 Aug 2016 21:30:18 +0000
Subject: [PATCH 18/51] Updated Portuguese translation

---
 po/pt.po | 603 ++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 424 insertions(+), 179 deletions(-)

diff --git a/po/pt.po b/po/pt.po
index b8fb1572..c6e2c165 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -3,22 +3,23 @@
 # This file is distributed under the same license as the meld package.
 # Duarte Loreto <happyguy_pt@hotmail.com>, 2003.
 # Pedro Albuquerque <palbuquerque73@gmail.com>, 2015.
+# Tiago Santos <tiagofsantos81@sapo.pt>, 2014 - 2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.6\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=meld&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-12-19 01:26+0000\n"
-"PO-Revision-Date: 2015-12-19 08:17+0000\n"
-"Last-Translator: Pedro Albuquerque <palbuquerque73@gmail.com>\n"
-"Language-Team: Português <palbuquerque73@gmail.com>\n"
+"POT-Creation-Date: 2016-08-13 10:48+0000\n"
+"PO-Revision-Date: 2016-08-14 22:28+0100\n"
+"Last-Translator: Tiago Santos <tiagofsantos81@sapo.pt>\n"
+"Language-Team: Duarte Loreto <happyguy_pt@hotmail.com>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Gtranslator 2.91.6\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\\n\n"
+"X-Generator: Poedit 1.8.7.1\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../bin/meld:144
 msgid "Cannot import: "
@@ -42,7 +43,8 @@ msgstr ""
 "Impossível carregar a CSS (%s) específica do Meld\n"
 "%s"
 
-#: ../data/meld.desktop.in.h:1 ../data/ui/meldapp.ui.h:1
+#: ../data/meld.desktop.in.h:1 ../data/meld.appdata.xml.in.h:1
+#: ../data/ui/meldapp.ui.h:1
 msgid "Meld"
 msgstr "Meld"
 
@@ -54,7 +56,7 @@ msgstr "Visualizador de diferenças"
 msgid "Meld Diff Viewer"
 msgstr "Visualizador de Diferenças Meld"
 
-#: ../data/meld.desktop.in.h:4
+#: ../data/meld.desktop.in.h:4 ../data/meld.appdata.xml.in.h:2
 msgid "Compare and merge your files"
 msgstr "Compare e una os seus ficheiros."
 
@@ -63,7 +65,7 @@ msgstr "Compare e una os seus ficheiros."
 msgid "diff;merge;"
 msgstr "diff;diferenças;comparar;unir;"
 
-#: ../data/meld.appdata.xml.in.h:1
+#: ../data/meld.appdata.xml.in.h:3
 msgid ""
 "Meld is a visual diff and merge tool targeted at developers. Meld helps you "
 "compare files, directories, and version controlled projects. It provides "
@@ -76,7 +78,7 @@ msgstr ""
 "ficheiros como de pastas. Suporta vários sistemas de controlo de versão, "
 "incluindo Git, Mercurial, Bazaar e Subversion."
 
-#: ../data/meld.appdata.xml.in.h:2
+#: ../data/meld.appdata.xml.in.h:4
 msgid ""
 "Meld helps you review code changes, understand patches, and makes enormous "
 "merge conflicts slightly less painful."
@@ -113,7 +115,6 @@ msgid "If true, the window statusbar is visible."
 msgstr "Se verdadeiro, a barra de estado está visível."
 
 #: ../data/org.gnome.meld.gschema.xml.h:7
-#| msgid "Automatically detected text encodings"
 msgid "Additional automatically detected text encodings"
 msgstr "Codificações de texto adicionais automaticamente detetadas"
 
@@ -515,7 +516,7 @@ msgstr "Página Web"
 msgid "translator-credits"
 msgstr ""
 "Pedro Albuquerque <palbuquerque73@gmail.com>\n"
-"Tiago S. <almosthumane@portugalmail.pt>"
+"Tiago Santos <tiagofsantos81@sapo.pt>"
 
 #: ../data/ui/application.ui.h:6
 msgid "_Preferences"
@@ -526,10 +527,14 @@ msgid "_Help"
 msgstr "Aj_Uda"
 
 #: ../data/ui/application.ui.h:8
+msgid "Keyboard Shortcuts"
+msgstr "Atalhos de teclado"
+
+#: ../data/ui/application.ui.h:9
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../data/ui/application.ui.h:9
+#: ../data/ui/application.ui.h:10
 msgid "_Quit"
 msgstr "_Sair"
 
@@ -561,7 +566,7 @@ msgstr "Copiar para a direita"
 msgid "Delete selected"
 msgstr "Apagar selecção"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:856 ../meld/filediff.py:1379
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:860 ../meld/filediff.py:1368
 msgid "Hide"
 msgstr "Ocultar %s"
 
@@ -597,7 +602,7 @@ msgstr "Novo"
 msgid "Show new"
 msgstr "Apresentar novo"
 
-#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:73
+#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:74
 msgid "Modified"
 msgstr "Alterado"
 
@@ -652,7 +657,7 @@ msgstr "Mover para _Baixo"
 
 #. Create icon and filename CellRenderer
 #: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35
-#: ../meld/dirdiff.py:372
+#: ../meld/dirdiff.py:374
 msgid "Name"
 msgstr "Nome"
 
@@ -854,8 +859,8 @@ msgstr "Se não gravar, as alterações serão irremediavelmente perdidas."
 msgid "Close _without Saving"
 msgstr "Fechar sem gra_Var"
 
-#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:938 ../meld/filediff.py:1445
-#: ../meld/filediff.py:1513
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:942 ../meld/filediff.py:1434
+#: ../meld/filediff.py:1502
 msgid "_Cancel"
 msgstr "_Cancelar"
 
@@ -893,7 +898,7 @@ msgstr ""
 "Alterações feitas aos seguintes documentos serão irremediavelmente "
 "perdidas:\n"
 
-#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:939 ../meld/filediff.py:1446
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:943 ../meld/filediff.py:1435
 msgid "_Replace"
 msgstr "Substitui_R"
 
@@ -1131,7 +1136,7 @@ msgstr ""
 "Cada padrão é uma lista de descritores estilo linha de comandos, separados "
 "por espaços."
 
-#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:103
+#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:104
 msgid "File Filters"
 msgstr "Filtros de Ficheiros"
 
@@ -1165,7 +1170,252 @@ msgstr ""
 msgid "Text Filters"
 msgstr "Filtros de Texto"
 
-#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:651
+#: ../data/ui/shortcuts.ui.h:1
+msgctxt "shortcut window"
+msgid "General"
+msgstr "Geral"
+
+#: ../data/ui/shortcuts.ui.h:2
+msgctxt "shortcut window"
+msgid "New comparison"
+msgstr "Nova comparação"
+
+#: ../data/ui/shortcuts.ui.h:3
+msgctxt "shortcut window"
+msgid "Close a comparison"
+msgstr "Fechar comparação"
+
+#: ../data/ui/shortcuts.ui.h:4
+msgctxt "shortcut window"
+msgid "Quit Meld"
+msgstr "Sair do Meld"
+
+#: ../data/ui/shortcuts.ui.h:5
+msgctxt "shortcut window"
+msgid "Stop the current action"
+msgstr "Parar a ação atual"
+
+#: ../data/ui/shortcuts.ui.h:6
+msgctxt "shortcut window"
+msgid "Refresh comparison"
+msgstr "Atualizar comparação"
+
+#: ../data/ui/shortcuts.ui.h:7
+msgctxt "shortcut window"
+msgid "Fullscreen"
+msgstr "Ecrã completo"
+
+#: ../data/ui/shortcuts.ui.h:8
+msgctxt "shortcut window"
+msgid "Tabs"
+msgstr "Separadores"
+
+#: ../data/ui/shortcuts.ui.h:9
+msgctxt "shortcut window"
+msgid "Go to previous tab"
+msgstr "Ir para o separador anterior"
+
+#: ../data/ui/shortcuts.ui.h:10
+msgctxt "shortcut window"
+msgid "Go to next tab"
+msgstr "Ir para o separador seguinte"
+
+#: ../data/ui/shortcuts.ui.h:11
+msgctxt "shortcut window"
+msgid "Switch to tab"
+msgstr "Mudar para o separador"
+
+#: ../data/ui/shortcuts.ui.h:12
+msgctxt "shortcut window"
+msgid "Move tab left"
+msgstr "Mover separador à es_querda"
+
+#: ../data/ui/shortcuts.ui.h:13
+msgctxt "shortcut window"
+msgid "Move tab right"
+msgstr "Mover sepa_rador à direita"
+
+#: ../data/ui/shortcuts.ui.h:14
+msgctxt "shortcut window"
+msgid "Changes"
+msgstr "Alterações"
+
+#: ../data/ui/shortcuts.ui.h:15
+msgctxt "shortcut window"
+msgid "Go to previous change"
+msgstr "Ir para a alteração anterior"
+
+#: ../data/ui/shortcuts.ui.h:16
+msgctxt "shortcut window"
+msgid "Go to next change"
+msgstr "Ir para a alteração seguinte"
+
+#: ../data/ui/shortcuts.ui.h:17
+msgctxt "shortcut window"
+msgid "Editing"
+msgstr "Editar"
+
+#: ../data/ui/shortcuts.ui.h:18
+msgctxt "shortcut window"
+msgid "Undo"
+msgstr "Desfazer"
+
+#: ../data/ui/shortcuts.ui.h:19
+msgctxt "shortcut window"
+msgid "Redo"
+msgstr "Refazer"
+
+#: ../data/ui/shortcuts.ui.h:20
+msgctxt "shortcut window"
+msgid "Cut"
+msgstr "Cortar"
+
+#: ../data/ui/shortcuts.ui.h:21
+msgctxt "shortcut window"
+msgid "Copy"
+msgstr "Copiar"
+
+#: ../data/ui/shortcuts.ui.h:22
+msgctxt "shortcut window"
+msgid "Paste"
+msgstr "Colar"
+
+#: ../data/ui/shortcuts.ui.h:23
+msgctxt "shortcut window"
+msgid "Find"
+msgstr "Localizar"
+
+#: ../data/ui/shortcuts.ui.h:24
+msgctxt "shortcut window"
+msgid "Find Next"
+msgstr "Localizar seguinte"
+
+#: ../data/ui/shortcuts.ui.h:25
+msgctxt "shortcut window"
+msgid "Find Previous"
+msgstr "Localizar anterior"
+
+#: ../data/ui/shortcuts.ui.h:26
+msgctxt "shortcut window"
+msgid "Replace"
+msgstr "Substituir"
+
+#: ../data/ui/shortcuts.ui.h:27
+msgctxt "shortcut window"
+msgid "File comparison"
+msgstr "Comparação de ficheiros"
+
+#: ../data/ui/shortcuts.ui.h:28
+msgctxt "shortcut window"
+msgid "Save current file"
+msgstr "Gravar o ficheiro atual"
+
+#: ../data/ui/shortcuts.ui.h:29
+msgctxt "shortcut window"
+msgid "Save current file to new path"
+msgstr "Gravar o ficheiro num novo caminho"
+
+#: ../data/ui/shortcuts.ui.h:30
+msgctxt "shortcut window"
+msgid "Save all files in comparison"
+msgstr "Gravar todos os ficheiros na comparação"
+
+#: ../data/ui/shortcuts.ui.h:31
+msgctxt "shortcut window"
+msgid "Previous conflict"
+msgstr "Conflito anterior"
+
+#: ../data/ui/shortcuts.ui.h:32
+msgctxt "shortcut window"
+msgid "Next conflict"
+msgstr "Conflito seguinte"
+
+#: ../data/ui/shortcuts.ui.h:33
+msgctxt "shortcut window"
+msgid "Push change to left"
+msgstr "Empurrar alteração atual para a esquerda"
+
+#: ../data/ui/shortcuts.ui.h:34
+msgctxt "shortcut window"
+msgid "Push change to right"
+msgstr "Empurrar alteração atual para a direita"
+
+#: ../data/ui/shortcuts.ui.h:35
+msgctxt "shortcut window"
+msgid "Pull change from left"
+msgstr "Puxar alteração da esquerda"
+
+#: ../data/ui/shortcuts.ui.h:36
+msgctxt "shortcut window"
+msgid "Pull change from right"
+msgstr "Puxar alteração da direita"
+
+#: ../data/ui/shortcuts.ui.h:37
+msgctxt "shortcut window"
+msgid "Copy change above left"
+msgstr "Copiar alteração acima do bloco esquerdo"
+
+#: ../data/ui/shortcuts.ui.h:38
+msgctxt "shortcut window"
+msgid "Copy change below left"
+msgstr "Copiar alteração abaixo do bloco esquerdo"
+
+#: ../data/ui/shortcuts.ui.h:39
+msgctxt "shortcut window"
+msgid "Copy change above right"
+msgstr "Copiar alteração acima do bloco direito"
+
+#: ../data/ui/shortcuts.ui.h:40
+msgctxt "shortcut window"
+msgid "Copy change below right"
+msgstr "Copiar alteração abaixo do bloco direito"
+
+#: ../data/ui/shortcuts.ui.h:41
+msgctxt "shortcut window"
+msgid "Delete change"
+msgstr "Eliminar alteração"
+
+#: ../data/ui/shortcuts.ui.h:42
+msgctxt "shortcut window"
+msgid "Previous comparison pane"
+msgstr "Painel de comparação anterior"
+
+#: ../data/ui/shortcuts.ui.h:43
+msgctxt "shortcut window"
+msgid "Next comparison pane"
+msgstr "Próximo painel de comparação"
+
+#: ../data/ui/shortcuts.ui.h:44
+msgctxt "shortcut window"
+msgid "Folder comparison"
+msgstr "Comparação de pastas"
+
+#: ../data/ui/shortcuts.ui.h:45
+msgctxt "shortcut window"
+msgid "Copy to left"
+msgstr "Copiar para a esquerda"
+
+#: ../data/ui/shortcuts.ui.h:46
+msgctxt "shortcut window"
+msgid "Copy to right"
+msgstr "Copiar para a direita"
+
+#: ../data/ui/shortcuts.ui.h:47
+msgctxt "shortcut window"
+msgid "Version control comparison"
+msgstr "Comparação de controlo de versão"
+
+#: ../data/ui/shortcuts.ui.h:48
+msgctxt "shortcut window"
+msgid "Commit to version control"
+msgstr "Submeter ao controlo de versão"
+
+#: ../data/ui/shortcuts.ui.h:49
+msgctxt "shortcut window"
+msgid "Show/hide console output"
+msgstr "Alternar saída da consola"
+
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:668
 msgid "New comparison"
 msgstr "Nova comparação"
 
@@ -1313,7 +1563,7 @@ msgstr "Sem _Versão"
 msgid "Show unversioned files"
 msgstr "Mostrar ficheiros sem versão"
 
-#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:66
+#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:67
 msgid "Ignored"
 msgstr "Ignorado"
 
@@ -1384,44 +1634,44 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:390 ../meld/preferences.py:82
+#: ../meld/dirdiff.py:392 ../meld/preferences.py:82
 msgid "Size"
 msgstr "Tamanho"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:398 ../meld/preferences.py:83
+#: ../meld/dirdiff.py:400 ../meld/preferences.py:83
 msgid "Modification time"
 msgstr "Hora de modificação"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:406 ../meld/preferences.py:84
+#: ../meld/dirdiff.py:408 ../meld/preferences.py:84
 msgid "Permissions"
 msgstr "Permissões"
 
-#: ../meld/dirdiff.py:536
+#: ../meld/dirdiff.py:538
 #, python-format
 msgid "Hide %s"
 msgstr "Esconder %s"
 
-#: ../meld/dirdiff.py:668 ../meld/dirdiff.py:690
+#: ../meld/dirdiff.py:670 ../meld/dirdiff.py:694
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] A analizar %s"
 
-#: ../meld/dirdiff.py:823
+#: ../meld/dirdiff.py:827
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Terminado"
 
-#: ../meld/dirdiff.py:831
+#: ../meld/dirdiff.py:835
 msgid "Folders have no differences"
 msgstr "As pastas não têm diferenças"
 
-#: ../meld/dirdiff.py:833
+#: ../meld/dirdiff.py:837
 msgid "Contents of scanned files in folders are identical."
 msgstr "Os conteúdos de ficheiros pesquisados nas pastas são idênticos."
 
-#: ../meld/dirdiff.py:835
+#: ../meld/dirdiff.py:839
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1429,44 +1679,43 @@ msgstr ""
 "Os ficheiros pesquisados nas pastas parecem idênticos, mas os conteúdos não "
 "foram pesquisados."
 
-#: ../meld/dirdiff.py:838
+#: ../meld/dirdiff.py:842
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 "Os filtros de ficheiros estão em uso, pelo que nem todos os ficheiros foram "
 "pesquisados."
 
-#: ../meld/dirdiff.py:840
+#: ../meld/dirdiff.py:844
 msgid "Text filters are in use and may be masking content differences."
 msgstr ""
 "Os filtros de texto estão em uso e podem estar a mascarar diferenças de "
 "conteúdo."
 
-#: ../meld/dirdiff.py:858 ../meld/filediff.py:1381 ../meld/filediff.py:1411
-#: ../meld/filediff.py:1413 ../meld/ui/msgarea.py:109
-#: ../meld/ui/msgarea.py:122
+#: ../meld/dirdiff.py:862 ../meld/filediff.py:1370 ../meld/filediff.py:1400
+#: ../meld/filediff.py:1402 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122
 msgid "Hi_de"
 msgstr "_Ocultar"
 
-#: ../meld/dirdiff.py:868
+#: ../meld/dirdiff.py:872
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Ocorreram múltiplos erros ao pesquisar esta pasta"
 
-#: ../meld/dirdiff.py:869
+#: ../meld/dirdiff.py:873
 msgid "Files with invalid encodings found"
 msgstr "Encontrados ficheiros com codificação inválida"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:871
+#: ../meld/dirdiff.py:875
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "Alguns ficheiros tinham uma codificação incorreta. Os nomes são algo como:"
 
-#: ../meld/dirdiff.py:873
+#: ../meld/dirdiff.py:877
 msgid "Files hidden by case insensitive comparison"
 msgstr "Ficheiros ocultos por comparação insensível a maiúsculas"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:875
+#: ../meld/dirdiff.py:879
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1475,17 +1724,17 @@ msgstr ""
 "ficheiros sensível a maiúsculas. Os seguintes ficheiros nesta pasta estão "
 "ocultos:"
 
-#: ../meld/dirdiff.py:886
+#: ../meld/dirdiff.py:890
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "'%s' escondido por '%s'"
 
-#: ../meld/dirdiff.py:942
+#: ../meld/dirdiff.py:946
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Substituir pasta “%s”?"
 
-#: ../meld/dirdiff.py:944
+#: ../meld/dirdiff.py:948
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1495,11 +1744,11 @@ msgstr ""
 "Se substituir a pasta existente, todos os ficheiros nela contidos serão "
 "perdidos."
 
-#: ../meld/dirdiff.py:957
+#: ../meld/dirdiff.py:961
 msgid "Error copying file"
 msgstr "Erro ao copiar o ficheiro"
 
-#: ../meld/dirdiff.py:958
+#: ../meld/dirdiff.py:962
 #, python-format
 msgid ""
 "Couldn't copy %s\n"
@@ -1512,102 +1761,101 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:981
+#: ../meld/dirdiff.py:985
 #, python-format
 msgid "Error deleting %s"
 msgstr "Erro ao eliminar %s"
 
-#: ../meld/dirdiff.py:1486
+#: ../meld/dirdiff.py:1492
 msgid "No folder"
 msgstr "Sem pasta"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:359
+#: ../meld/filediff.py:357
 msgid "INS"
 msgstr "INS"
 
-#: ../meld/filediff.py:359
+#: ../meld/filediff.py:357
 msgid "OVR"
 msgstr "SUBS"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:361
+#: ../meld/filediff.py:359
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Lin %i, Col %i"
 
-#: ../meld/filediff.py:792
+#: ../meld/filediff.py:771
 msgid "Comparison results will be inaccurate"
 msgstr "Os resultados da comparação serão imprecisos"
 
-#: ../meld/filediff.py:794
-#, python-format
+#: ../meld/filediff.py:773
 msgid ""
-"Filter “%s” changed the number of lines in the file, which is unsupported. "
-"The comparison will not be accurate."
+"A filter changed the number of lines in the file, which is unsupported. The "
+"comparison will not be accurate."
 msgstr ""
-"O filtro \"%s\" alterou o número de linhas no ficheiro, o que não é "
-"suportado. A comparação será imprecisa."
+"O filtro alterou o número de linhas no ficheiro, o que não é suportado. A "
+"comparação será imprecisa."
 
-#: ../meld/filediff.py:852
+#: ../meld/filediff.py:831
 msgid "Mark conflict as resolved?"
 msgstr "Marcar conflito como resolvido?"
 
-#: ../meld/filediff.py:854
+#: ../meld/filediff.py:833
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
 "Se o conflito foi resolvido com sucesso, pode agora marcá-lo como resolvido."
 
-#: ../meld/filediff.py:856
+#: ../meld/filediff.py:835
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../meld/filediff.py:857
+#: ../meld/filediff.py:836
 msgid "Mark _Resolved"
 msgstr "Marcar _Resolvido"
 
-#: ../meld/filediff.py:1097
+#: ../meld/filediff.py:1086
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Houve um problema ao abrir o ficheiro \"%s\"."
 
-#: ../meld/filediff.py:1105
+#: ../meld/filediff.py:1094
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "%s parece ser um ficheiro binário."
 
-#: ../meld/filediff.py:1107
+#: ../meld/filediff.py:1096
 msgid "Do you want to open the file using the default application?"
 msgstr "Quer abrir o ficheiro usando a aplicação predefinida?"
 
-#: ../meld/filediff.py:1109
+#: ../meld/filediff.py:1098
 msgid "Open"
 msgstr "Abrir"
 
-#: ../meld/filediff.py:1125
+#: ../meld/filediff.py:1114
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] A calcular diferenças"
 
-#: ../meld/filediff.py:1190
+#: ../meld/filediff.py:1179
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "O ficheiro %s foi alterado no disco"
 
-#: ../meld/filediff.py:1191
+#: ../meld/filediff.py:1180
 msgid "Do you want to reload the file?"
 msgstr "Quer recarregar o ficheiro?"
 
-#: ../meld/filediff.py:1193
+#: ../meld/filediff.py:1182
 msgid "_Reload"
 msgstr "_Recarregar"
 
-#: ../meld/filediff.py:1344
+#: ../meld/filediff.py:1333
 msgid "Files are identical"
 msgstr "Os ficheiros são idênticos"
 
-#: ../meld/filediff.py:1357
+#: ../meld/filediff.py:1346
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1615,11 +1863,11 @@ msgstr ""
 "Os filtros de texto estão em uso e podem estar a mascarar diferenças entre "
 "os ficheiros. Quer comparar os ficheiros sem filtragem?"
 
-#: ../meld/filediff.py:1362
+#: ../meld/filediff.py:1351
 msgid "Files differ in line endings only"
 msgstr "Os ficheiros só diferem nos fins de linha"
 
-#: ../meld/filediff.py:1364
+#: ../meld/filediff.py:1353
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1628,15 +1876,15 @@ msgstr ""
 "Os ficheiros são idênticos, exceto por diferentes fins de linha:\n"
 "%s"
 
-#: ../meld/filediff.py:1384
+#: ../meld/filediff.py:1373
 msgid "Show without filters"
 msgstr "Mostrar sem filtros"
 
-#: ../meld/filediff.py:1406
+#: ../meld/filediff.py:1395
 msgid "Change highlighting incomplete"
 msgstr "Alterar realce incompleto"
 
-#: ../meld/filediff.py:1407
+#: ../meld/filediff.py:1396
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1645,20 +1893,20 @@ msgstr ""
 "forçar o Meld para demorar mais a realçar alterações grandes, mas pode ser "
 "lento."
 
-#: ../meld/filediff.py:1415
+#: ../meld/filediff.py:1404
 msgid "Keep highlighting"
 msgstr "Manter realce"
 
-#: ../meld/filediff.py:1417
+#: ../meld/filediff.py:1406
 msgid "_Keep highlighting"
 msgstr "_Manter realce"
 
-#: ../meld/filediff.py:1449
+#: ../meld/filediff.py:1438
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Substituir ficheiro “%s”?"
 
-#: ../meld/filediff.py:1451
+#: ../meld/filediff.py:1440
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -1667,45 +1915,45 @@ msgstr ""
 "Um ficheiro com este nome já existe em \"%s\".\n"
 "Se substituir o ficheiro existente, o seu conteúdo será perdido."
 
-#: ../meld/filediff.py:1468
+#: ../meld/filediff.py:1457
 msgid "Save Left Pane As"
 msgstr "Gravar painel esquerdo como"
 
-#: ../meld/filediff.py:1470
+#: ../meld/filediff.py:1459
 msgid "Save Middle Pane As"
 msgstr "Gravar painel central como"
 
-#: ../meld/filediff.py:1472
+#: ../meld/filediff.py:1461
 msgid "Save Right Pane As"
 msgstr "Gravar painel direito como"
 
-#: ../meld/filediff.py:1486
+#: ../meld/filediff.py:1475
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "O ficheiro %s foi alterado no disco desde que foi aberto"
 
-#: ../meld/filediff.py:1488
+#: ../meld/filediff.py:1477
 msgid "If you save it, any external changes will be lost."
 msgstr "Se o gravar, todas as alterações externas serão perdidas."
 
-#: ../meld/filediff.py:1491
+#: ../meld/filediff.py:1480
 msgid "Save Anyway"
 msgstr "Gravar mesmo assim"
 
-#: ../meld/filediff.py:1492
+#: ../meld/filediff.py:1481
 msgid "Don't Save"
 msgstr "Não gravar"
 
-#: ../meld/filediff.py:1514
+#: ../meld/filediff.py:1503
 msgid "_Save as UTF-8"
 msgstr "Gravar como UTF-8"
 
-#: ../meld/filediff.py:1517
+#: ../meld/filediff.py:1506
 #, python-format
 msgid "Couldn't encode text as “%s”"
 msgstr "Impossível codificar texto como \"%s\""
 
-#: ../meld/filediff.py:1519
+#: ../meld/filediff.py:1508
 #, python-format
 msgid ""
 "File “%s” contains characters that can't be encoded using encoding “%s”.\n"
@@ -1715,12 +1963,12 @@ msgstr ""
 "\".\n"
 "Quer gravar como UTF-8?"
 
-#: ../meld/filediff.py:1556 ../meld/patchdialog.py:125
+#: ../meld/filediff.py:1545 ../meld/patchdialog.py:125
 #, python-format
 msgid "Could not save file %s."
 msgstr "Impossível gravar o ficheiro %s."
 
-#: ../meld/filediff.py:1557 ../meld/patchdialog.py:126
+#: ../meld/filediff.py:1546 ../meld/patchdialog.py:126
 #, python-format
 msgid ""
 "Couldn't save file due to:\n"
@@ -1729,11 +1977,11 @@ msgstr ""
 "Impossível gravar o ficheiro porque:\n"
 "%s"
 
-#: ../meld/filediff.py:1903
+#: ../meld/filediff.py:1892
 msgid "Live comparison updating disabled"
 msgstr "Atualização ao vivo da comparação desativada"
 
-#: ../meld/filediff.py:1904
+#: ../meld/filediff.py:1893
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1748,11 +1996,11 @@ msgstr ""
 msgid "[%s] Merging files"
 msgstr "[%s] A unir ficheiros"
 
-#: ../meld/gutterrendererchunk.py:148
+#: ../meld/gutterrendererchunk.py:159
 msgid "Copy _up"
 msgstr "Copiar a_Cima"
 
-#: ../meld/gutterrendererchunk.py:149
+#: ../meld/gutterrendererchunk.py:160
 msgid "Copy _down"
 msgstr "Copiar a_Baixo"
 
@@ -1848,7 +2096,7 @@ msgid "invalid path or URI \"%s\""
 msgstr "Caminho ou URI inválido \"%s\""
 
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:127
+#: ../meld/meldbuffer.py:132
 msgid "<unnamed>"
 msgstr "<sem título>"
 
@@ -1856,247 +2104,247 @@ msgstr "<sem título>"
 msgid "untitled"
 msgstr "sem título"
 
-#: ../meld/meldwindow.py:48
+#: ../meld/meldwindow.py:49
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ../meld/meldwindow.py:49
+#: ../meld/meldwindow.py:50
 msgid "_New Comparison..."
 msgstr "_Nova comparação..."
 
-#: ../meld/meldwindow.py:50
+#: ../meld/meldwindow.py:51
 msgid "Start a new comparison"
 msgstr "Iniciar uma nova comparação"
 
-#: ../meld/meldwindow.py:53
+#: ../meld/meldwindow.py:54
 msgid "Save the current file"
 msgstr "Gravar o ficheiro atual"
 
-#: ../meld/meldwindow.py:55
+#: ../meld/meldwindow.py:56
 msgid "Save As..."
 msgstr "Gravar como..."
 
-#: ../meld/meldwindow.py:56
+#: ../meld/meldwindow.py:57
 msgid "Save the current file with a different name"
 msgstr "Gravar o ficheiro atual com um nome diferente"
 
-#: ../meld/meldwindow.py:59
+#: ../meld/meldwindow.py:60
 msgid "Close the current file"
 msgstr "Fechar o ficheiro atual"
 
-#: ../meld/meldwindow.py:62
+#: ../meld/meldwindow.py:63
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../meld/meldwindow.py:64
+#: ../meld/meldwindow.py:65
 msgid "Undo the last action"
 msgstr "Desfazer a última ação"
 
-#: ../meld/meldwindow.py:67
+#: ../meld/meldwindow.py:68
 msgid "Redo the last undone action"
 msgstr "Refazer a última ação desfeita"
 
-#: ../meld/meldwindow.py:69
+#: ../meld/meldwindow.py:70
 msgid "Cut the selection"
 msgstr "Cortar a seleção"
 
-#: ../meld/meldwindow.py:71
+#: ../meld/meldwindow.py:72
 msgid "Copy the selection"
 msgstr "Copiar a seleção"
 
-#: ../meld/meldwindow.py:73
+#: ../meld/meldwindow.py:74
 msgid "Paste the clipboard"
 msgstr "Colar a área de transferência"
 
-#: ../meld/meldwindow.py:75
+#: ../meld/meldwindow.py:76
 msgid "Find..."
 msgstr "Localizar..."
 
-#: ../meld/meldwindow.py:75
+#: ../meld/meldwindow.py:76
 msgid "Search for text"
 msgstr "Procurar texto"
 
-#: ../meld/meldwindow.py:77
+#: ../meld/meldwindow.py:78
 msgid "Find Ne_xt"
 msgstr "Localizar segui_Nte"
 
-#: ../meld/meldwindow.py:78
+#: ../meld/meldwindow.py:79
 msgid "Search forwards for the same text"
 msgstr "Procura o mesmo texto para a frente"
 
-#: ../meld/meldwindow.py:80
+#: ../meld/meldwindow.py:81
 msgid "Find _Previous"
 msgstr "Localizar _Anterior"
 
-#: ../meld/meldwindow.py:81
+#: ../meld/meldwindow.py:82
 msgid "Search backwards for the same text"
 msgstr "Procura o mesmo texto para trás"
 
-#: ../meld/meldwindow.py:84
+#: ../meld/meldwindow.py:85
 msgid "_Replace..."
 msgstr "Substitui_R..."
 
-#: ../meld/meldwindow.py:85
+#: ../meld/meldwindow.py:86
 msgid "Find and replace text"
 msgstr "Localizar e substituir texto"
 
-#: ../meld/meldwindow.py:88
+#: ../meld/meldwindow.py:89
 msgid "_Changes"
 msgstr "_Alterações"
 
-#: ../meld/meldwindow.py:89
+#: ../meld/meldwindow.py:90
 msgid "Next Change"
 msgstr "Alteração seguinte"
 
-#: ../meld/meldwindow.py:90
+#: ../meld/meldwindow.py:91
 msgid "Go to the next change"
 msgstr "Ir para a alteração seguinte"
 
-#: ../meld/meldwindow.py:92
+#: ../meld/meldwindow.py:93
 msgid "Previous Change"
 msgstr "Alteração anterior"
 
-#: ../meld/meldwindow.py:93
+#: ../meld/meldwindow.py:94
 msgid "Go to the previous change"
 msgstr "Ir para a alteração anterior"
 
-#: ../meld/meldwindow.py:95
+#: ../meld/meldwindow.py:96
 msgid "Open Externally"
 msgstr "Abrir externamente"
 
-#: ../meld/meldwindow.py:96
+#: ../meld/meldwindow.py:97
 msgid "Open selected file or directory in the default external application"
 msgstr "Abrir ficheiro ou pasta selecionados na aplicação externa predefinida"
 
-#: ../meld/meldwindow.py:100
+#: ../meld/meldwindow.py:101
 msgid "_View"
 msgstr "_Ver"
 
-#: ../meld/meldwindow.py:101
+#: ../meld/meldwindow.py:102
 msgid "File Status"
 msgstr "Estado do ficheiro"
 
-#: ../meld/meldwindow.py:102
+#: ../meld/meldwindow.py:103
 msgid "Version Status"
 msgstr "Estado da versão"
 
-#: ../meld/meldwindow.py:105
+#: ../meld/meldwindow.py:106
 msgid "Stop the current action"
 msgstr "Parar a ação atual"
 
-#: ../meld/meldwindow.py:108
+#: ../meld/meldwindow.py:109
 msgid "Refresh the view"
 msgstr "Atualizar a vista"
 
-#: ../meld/meldwindow.py:111
+#: ../meld/meldwindow.py:112
 msgid "_Tabs"
 msgstr "_Separadores"
 
-#: ../meld/meldwindow.py:112
+#: ../meld/meldwindow.py:113
 msgid "_Previous Tab"
 msgstr "Se_Parador anterior"
 
-#: ../meld/meldwindow.py:113
+#: ../meld/meldwindow.py:114
 msgid "Activate previous tab"
 msgstr "Ativar separador anterior"
 
-#: ../meld/meldwindow.py:115
+#: ../meld/meldwindow.py:116
 msgid "_Next Tab"
 msgstr "Separador segui_Nte"
 
-#: ../meld/meldwindow.py:116
+#: ../meld/meldwindow.py:117
 msgid "Activate next tab"
 msgstr "Ativar separador seguinte"
 
-#: ../meld/meldwindow.py:119
+#: ../meld/meldwindow.py:120
 msgid "Move Tab _Left"
-msgstr "Mover separador à es_Querda"
+msgstr "Mover separador à es_querda"
 
-#: ../meld/meldwindow.py:120
+#: ../meld/meldwindow.py:121
 msgid "Move current tab to left"
 msgstr "Mover o separador atual para a esquerda"
 
-#: ../meld/meldwindow.py:123
+#: ../meld/meldwindow.py:124
 msgid "Move Tab _Right"
-msgstr "Mover sepa_Rador à direita"
+msgstr "Mover separador à di_reita"
 
-#: ../meld/meldwindow.py:124
+#: ../meld/meldwindow.py:125
 msgid "Move current tab to right"
 msgstr "Mover o separador atual para a direita"
 
-#: ../meld/meldwindow.py:128
+#: ../meld/meldwindow.py:129
 msgid "Fullscreen"
 msgstr "Ecrã completo"
 
-#: ../meld/meldwindow.py:129
+#: ../meld/meldwindow.py:130
 msgid "View the comparison in fullscreen"
 msgstr "Ver a comparação em ecrã completo"
 
-#: ../meld/meldwindow.py:131
+#: ../meld/meldwindow.py:132
 msgid "_Toolbar"
 msgstr "Barra de ferramen_Tas"
 
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:133
 msgid "Show or hide the toolbar"
 msgstr "Mostrar ou ocultar a barra de ferramentas"
 
-#: ../meld/meldwindow.py:142
+#: ../meld/meldwindow.py:143
 msgid "Open Recent"
 msgstr "Abrir recentes"
 
-#: ../meld/meldwindow.py:143
+#: ../meld/meldwindow.py:144
 msgid "Open recent files"
 msgstr "Abrir ficheiros recentes"
 
-#: ../meld/meldwindow.py:165
+#: ../meld/meldwindow.py:166
 msgid "_Meld"
 msgstr "_Meld"
 
-#: ../meld/meldwindow.py:166
+#: ../meld/meldwindow.py:167
 msgid "Quit the program"
 msgstr "Sair do programa"
 
-#: ../meld/meldwindow.py:168
+#: ../meld/meldwindow.py:169
 msgid "Prefere_nces"
 msgstr "Preferê_Ncias"
 
-#: ../meld/meldwindow.py:169
+#: ../meld/meldwindow.py:170
 msgid "Configure the application"
 msgstr "Configurar a aplicação"
 
-#: ../meld/meldwindow.py:171
+#: ../meld/meldwindow.py:172
 msgid "_Contents"
 msgstr "_Conteúdo"
 
-#: ../meld/meldwindow.py:172
+#: ../meld/meldwindow.py:173
 msgid "Open the Meld manual"
 msgstr "Abrir o manual do Meld"
 
-#: ../meld/meldwindow.py:174
+#: ../meld/meldwindow.py:175
 msgid "About this application"
 msgstr "Acerca desta aplicação"
 
-#: ../meld/meldwindow.py:575
+#: ../meld/meldwindow.py:587
 msgid "Switch to this tab"
 msgstr "Mudar para este separador"
 
-#: ../meld/meldwindow.py:685
+#: ../meld/meldwindow.py:702
 #, python-format
 msgid "Need three files to auto-merge, got: %r"
 msgstr "Necessários três ficheiros para união automática, obtidos %r"
 
-#: ../meld/meldwindow.py:699
+#: ../meld/meldwindow.py:716
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Impossível comparar uma mistura de ficheiros e pastas"
 
-#: ../meld/misc.py:168
+#: ../meld/misc.py:203
 #, python-format
 msgid "Couldn't find colour scheme details for %s-%s; this is a bad install"
 msgstr ""
 "Impossível encontrar detalhes do esquema de cores para %s-%s; má instalação"
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:255
+#: ../meld/misc.py:288
 msgid "[None]"
 msgstr "[Nenhum]"
 
@@ -2112,7 +2360,7 @@ msgstr "padrão"
 msgid "Version control:"
 msgstr "Controlo de versão:"
 
-#: ../meld/ui/notebooklabel.py:68
+#: ../meld/ui/notebooklabel.py:63
 msgid "Close tab"
 msgstr "Fechar separador"
 
@@ -2143,16 +2391,16 @@ msgid_plural "%d branches"
 msgstr[0] "%d ramo"
 msgstr[1] "%d ramos"
 
-#: ../meld/vc/git.py:350
+#: ../meld/vc/git.py:352
 #, python-format
 msgid "Mode changed from %s to %s"
 msgstr "Modo alterado de %s para %s"
 
-#: ../meld/vc/git.py:358
+#: ../meld/vc/git.py:360
 msgid "Partially staged"
 msgstr "Parcialmente em estágio"
 
-#: ../meld/vc/git.py:358
+#: ../meld/vc/git.py:360
 msgid "Staged"
 msgstr "Em estágio"
 
@@ -2167,51 +2415,51 @@ msgstr "Nenhum"
 msgid "Rev %s"
 msgstr "Rev %s"
 
-#: ../meld/vc/_vc.py:51
+#: ../meld/vc/_vc.py:52
 msgid "Merged"
 msgstr "Unidos"
 
-#: ../meld/vc/_vc.py:51
+#: ../meld/vc/_vc.py:52
 msgid "Base"
 msgstr "Base"
 
-#: ../meld/vc/_vc.py:51
+#: ../meld/vc/_vc.py:52
 msgid "Local"
 msgstr "Local"
 
-#: ../meld/vc/_vc.py:51
+#: ../meld/vc/_vc.py:52
 msgid "Remote"
 msgstr "Remoto"
 
-#: ../meld/vc/_vc.py:67
+#: ../meld/vc/_vc.py:68
 msgid "Unversioned"
 msgstr "Sem versão"
 
-#: ../meld/vc/_vc.py:70
+#: ../meld/vc/_vc.py:71
 msgid "Error"
 msgstr "Erro"
 
-#: ../meld/vc/_vc.py:72
+#: ../meld/vc/_vc.py:73
 msgid "Newly added"
 msgstr "Recentemente adicionados"
 
-#: ../meld/vc/_vc.py:74
+#: ../meld/vc/_vc.py:75
 msgid "Renamed"
 msgstr "Renomeados"
 
-#: ../meld/vc/_vc.py:75
+#: ../meld/vc/_vc.py:76
 msgid "Conflict"
 msgstr "Conflito"
 
-#: ../meld/vc/_vc.py:76
+#: ../meld/vc/_vc.py:77
 msgid "Removed"
 msgstr "Removido"
 
-#: ../meld/vc/_vc.py:77
+#: ../meld/vc/_vc.py:78
 msgid "Missing"
 msgstr "Em falta"
 
-#: ../meld/vc/_vc.py:78
+#: ../meld/vc/_vc.py:79
 msgid "Not present"
 msgstr "Não presentes"
 
@@ -2590,9 +2838,6 @@ msgstr "Limpar"
 #~ msgid "CVS Log"
 #~ msgstr "Registo CVS"
 
-#~ msgid "Edit"
-#~ msgstr "Editar"
-
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">Some files have been modified.\n"
 #~ "Which ones would you like to save?</span>"

From 34db619762131bd96327eb12a37e82bb4006d8e2 Mon Sep 17 00:00:00 2001
From: Vasily Galkin <galkin-vv@yandex.ru>
Date: Thu, 18 Aug 2016 11:56:28 +0300
Subject: [PATCH 19/51] vcview: Go to parent directory until existing one found
 (bgo#770076)

After this change when meld is passed non-existing path it opens the first
existing parent.
---
 meld/vcview.py | 52 ++++++++++++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/meld/vcview.py b/meld/vcview.py
index e4422a76..a5f678ec 100644
--- a/meld/vcview.py
+++ b/meld/vcview.py
@@ -239,30 +239,36 @@ def populate_vcs_for_location(self, location):
         vcs_model = self.combobox_vcs.get_model()
         vcs_model.clear()
 
-        # VC systems work at the directory level, so make sure we're checking
-        # for VC support there instead of on a specific file.
+        # VC systems can be executed at the directory level, so make sure
+        # we're checking for VC support there instead of
+        # on a specific file or on deleted/unexisting path inside vc
         location = os.path.abspath(location or ".")
-        if os.path.isfile(location):
-            location = os.path.dirname(location)
-
-        for avc in vc.get_vcs(location):
-            err_str = ''
-            vc_details = {'name': avc.NAME, 'cmd': avc.CMD}
-
-            if not avc.is_installed():
-                # Translators: This error message is shown when a version
-                # control binary isn't installed.
-                err_str = _("%(name)s (%(cmd)s not installed)")
-            elif not avc.valid_repo(location):
-                # Translators: This error message is shown when a version
-                # controlled repository is invalid.
-                err_str = _("%(name)s (Invalid repository)")
-
-            if err_str:
-                vcs_model.append([err_str % vc_details, avc, False])
-                continue
-
-            vcs_model.append([avc.NAME, avc(location), True])
+        while not os.path.isdir(location):
+            parent_location = os.path.dirname(location)
+            if len(parent_location) >= len(location):
+                # no existing parent: for example unexisting drive on Windows
+                break
+            location = parent_location
+        else:
+            # existing parent directory was found
+            for avc in vc.get_vcs(location):
+                err_str = ''
+                vc_details = {'name': avc.NAME, 'cmd': avc.CMD}
+
+                if not avc.is_installed():
+                    # Translators: This error message is shown when a version
+                    # control binary isn't installed.
+                    err_str = _("%(name)s (%(cmd)s not installed)")
+                elif not avc.valid_repo(location):
+                    # Translators: This error message is shown when a version
+                    # controlled repository is invalid.
+                    err_str = _("%(name)s (Invalid repository)")
+
+                if err_str:
+                    vcs_model.append([err_str % vc_details, avc, False])
+                    continue
+
+                vcs_model.append([avc.NAME, avc(location), True])
 
         valid_vcs = [(i, r[1].NAME) for i, r in enumerate(vcs_model) if r[2]]
         default_active = min(valid_vcs)[0] if valid_vcs else 0

From 32a3877293dd48e278c432b3178059c5f7842032 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sun, 21 Aug 2016 07:36:22 +1000
Subject: [PATCH 20/51] Update AppData to include new fields and switch the
 contact

Since the contact is primarily there for update requests, there's not
much point in it going to a list it's not subscribed to... I just end
up moderating it anyway.
---
 data/meld.appdata.xml.in | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/data/meld.appdata.xml.in b/data/meld.appdata.xml.in
index 99d6220a..dfde438a 100644
--- a/data/meld.appdata.xml.in
+++ b/data/meld.appdata.xml.in
@@ -27,20 +27,23 @@
     <kudo>UserDocs</kudo>
   </kudos>
   <screenshots>
-    <screenshot type="default" width="992" height="759">
+    <screenshot type="default" height="759" width="992">
       <image>http://meldmerge.org/images/meld-filediff-full.png</image>
     </screenshot>
-    <screenshot width="655" height="532">
+    <screenshot height="532" width="655">
       <image>http://meldmerge.org/images/meld-dircomp-full.png</image>
     </screenshot>
-    <screenshot width="655" height="532">
+    <screenshot height="532" width="655">
       <image>http://meldmerge.org/images/meld-vc-full.png</image>
     </screenshot>
   </screenshots>
   <url type="homepage">http://meldmerge.org</url>
+  <url type="help">http://meldmerge.org/help/</url>
   <url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=meld</url>
   <url type="donation">http://www.gnome.org/friends/</url>
-  <update_contact>meld-list@gnome.org</update_contact>
+  <url type="translate">https://wiki.gnome.org/TranslationProject</url>
+  <update_contact>kai.willadsen@gmail.com</update_contact>
   <project_group>GNOME</project_group>
+  <_developer_name>The GNOME Project</_developer_name>
   <translation type="gettext">meld</translation>
 </component>

From aceb3998e85a90792c35bb3dd318b8370a4f8832 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Dr=C4=85g?= <piotrdrag@gmail.com>
Date: Sun, 21 Aug 2016 09:45:58 +0200
Subject: [PATCH 21/51] Updated Polish translation

---
 po/pl.po | 202 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 102 insertions(+), 100 deletions(-)

diff --git a/po/pl.po b/po/pl.po
index f6739dcf..68acdf58 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-08 14:34+0100\n"
-"PO-Revision-Date: 2016-03-08 14:35+0100\n"
+"POT-Creation-Date: 2016-08-21 09:44+0200\n"
+"PO-Revision-Date: 2016-08-21 09:45+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <gnomepl@aviary.pl>\n"
 "Language: pl\n"
@@ -21,8 +21,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-Language: Polish\n"
-"X-Poedit-Country: Poland\n"
 
 #: ../bin/meld:144
 msgid "Cannot import: "
@@ -89,6 +87,10 @@ msgstr ""
 "Program Meld pomaga przeglądać zmiany w kodzie, rozumieć poprawki i choć "
 "trochę ułatwić olbrzymie konflikty scalania."
 
+#: ../data/meld.appdata.xml.in.h:5
+msgid "The GNOME Project"
+msgstr "Projekt GNOME"
+
 #: ../data/mime/meld.xml.in.h:1
 msgid "Meld comparison description"
 msgstr "Opis porównywania programu Meld"
@@ -580,7 +582,7 @@ msgstr "Kopiuje element na prawo"
 msgid "Delete selected"
 msgstr "Usuwa zaznaczone"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1381
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:860 ../meld/filediff.py:1368
 msgid "Hide"
 msgstr "Ukryj"
 
@@ -647,7 +649,7 @@ msgid "_Add"
 msgstr "_Dodaj"
 
 #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:649
+#: ../meld/vcview.py:655
 msgid "_Remove"
 msgstr "U_suń"
 
@@ -669,7 +671,7 @@ msgstr "Przesuń w _dół"
 
 #. Create icon and filename CellRenderer
 #: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35
-#: ../meld/dirdiff.py:372
+#: ../meld/dirdiff.py:374
 msgid "Name"
 msgstr "Nazwa"
 
@@ -870,8 +872,8 @@ msgstr ""
 msgid "Close _without Saving"
 msgstr "Zamknij _bez zapisywania"
 
-#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1447
-#: ../meld/filediff.py:1515
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:942 ../meld/filediff.py:1434
+#: ../meld/filediff.py:1502
 msgid "_Cancel"
 msgstr "_Anuluj"
 
@@ -908,7 +910,7 @@ msgid "Changes made to the following documents will be permanently lost:\n"
 msgstr ""
 "Zmiany naniesione do poniższych dokumentów zostaną bezpowrotnie utracone:\n"
 
-#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1448
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:943 ../meld/filediff.py:1435
 msgid "_Replace"
 msgstr "Z_amień"
 
@@ -1602,7 +1604,7 @@ msgstr "Wcześniejsze zmiany:"
 msgid "Co_mmit"
 msgstr "_Zatwierdź"
 
-#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:337
+#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:343
 msgid "Location"
 msgstr "Położenie"
 
@@ -1643,44 +1645,44 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:390 ../meld/preferences.py:82
+#: ../meld/dirdiff.py:392 ../meld/preferences.py:82
 msgid "Size"
 msgstr "Rozmiar"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:398 ../meld/preferences.py:83
+#: ../meld/dirdiff.py:400 ../meld/preferences.py:83
 msgid "Modification time"
 msgstr "Czas modyfikacji"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:406 ../meld/preferences.py:84
+#: ../meld/dirdiff.py:408 ../meld/preferences.py:84
 msgid "Permissions"
 msgstr "Uprawnienia"
 
-#: ../meld/dirdiff.py:536
+#: ../meld/dirdiff.py:538
 #, python-format
 msgid "Hide %s"
 msgstr "Ukryj %s"
 
-#: ../meld/dirdiff.py:668 ../meld/dirdiff.py:692
+#: ../meld/dirdiff.py:670 ../meld/dirdiff.py:694
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Skanowanie %s"
 
-#: ../meld/dirdiff.py:825
+#: ../meld/dirdiff.py:827
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Ukończono"
 
-#: ../meld/dirdiff.py:833
+#: ../meld/dirdiff.py:835
 msgid "Folders have no differences"
 msgstr "Katalogi się nie różnią"
 
-#: ../meld/dirdiff.py:835
+#: ../meld/dirdiff.py:837
 msgid "Contents of scanned files in folders are identical."
 msgstr "Treść zeskanowanych plików w katalogach jest identyczna."
 
-#: ../meld/dirdiff.py:837
+#: ../meld/dirdiff.py:839
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1688,40 +1690,40 @@ msgstr ""
 "Zeskanowane pliki wydają się identyczne, ale treść mogła nie zostać "
 "zeskanowana."
 
-#: ../meld/dirdiff.py:840
+#: ../meld/dirdiff.py:842
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 "Filtry plików są używane, więc nie wszystkie pliki zostały zeskanowane."
 
-#: ../meld/dirdiff.py:842
+#: ../meld/dirdiff.py:844
 msgid "Text filters are in use and may be masking content differences."
 msgstr "Filtry tekstowe są używane i mogą ukrywać różnice między plikami."
 
-#: ../meld/dirdiff.py:860 ../meld/filediff.py:1383 ../meld/filediff.py:1413
-#: ../meld/filediff.py:1415 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122
+#: ../meld/dirdiff.py:862 ../meld/filediff.py:1370 ../meld/filediff.py:1400
+#: ../meld/filediff.py:1402 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122
 msgid "Hi_de"
 msgstr "_Ukryj"
 
-#: ../meld/dirdiff.py:870
+#: ../meld/dirdiff.py:872
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Wystąpiło wiele błędów podczas skanowania tego katalogu"
 
-#: ../meld/dirdiff.py:871
+#: ../meld/dirdiff.py:873
 msgid "Files with invalid encodings found"
 msgstr "Odnaleziono pliki z nieprawidłowym kodowaniem znaków"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:873
+#: ../meld/dirdiff.py:875
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "Niektóre pliki mają nieprawidłowe kodowanie znaków. Nazwy tych plików to:"
 
-#: ../meld/dirdiff.py:875
+#: ../meld/dirdiff.py:877
 msgid "Files hidden by case insensitive comparison"
 msgstr "Pliku ukryte przez porównywanie bez uwzględniania wielkości liter"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:877
+#: ../meld/dirdiff.py:879
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1730,17 +1732,17 @@ msgstr ""
 "systemie plików, który rozróżnia wielkość liter. Następujące pliki w tym "
 "katalogu zostały ukryte:"
 
-#: ../meld/dirdiff.py:888
+#: ../meld/dirdiff.py:890
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "„%s” ukryty przez „%s”"
 
-#: ../meld/dirdiff.py:944
+#: ../meld/dirdiff.py:946
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Zastąpić katalog „%s”?"
 
-#: ../meld/dirdiff.py:946
+#: ../meld/dirdiff.py:948
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1750,11 +1752,11 @@ msgstr ""
 "Zastąpienie istniejącego katalogu spowoduje utratę wszystkich plików w nim "
 "zawartych."
 
-#: ../meld/dirdiff.py:959
+#: ../meld/dirdiff.py:961
 msgid "Error copying file"
 msgstr "Błąd podczas kopiowania pliku"
 
-#: ../meld/dirdiff.py:960
+#: ../meld/dirdiff.py:962
 #, python-format
 msgid ""
 "Couldn't copy %s\n"
@@ -1767,35 +1769,35 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/dirdiff.py:983
+#: ../meld/dirdiff.py:985
 #, python-format
 msgid "Error deleting %s"
 msgstr "Błąd podczas usuwania %s"
 
-#: ../meld/dirdiff.py:1488
+#: ../meld/dirdiff.py:1492
 msgid "No folder"
 msgstr "Brak katalogu"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:359
+#: ../meld/filediff.py:357
 msgid "INS"
 msgstr "WST"
 
-#: ../meld/filediff.py:359
+#: ../meld/filediff.py:357
 msgid "OVR"
 msgstr "ZAS"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:361
+#: ../meld/filediff.py:359
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Wrsz %i, kol %i"
 
-#: ../meld/filediff.py:794
+#: ../meld/filediff.py:771
 msgid "Comparison results will be inaccurate"
 msgstr "Wyniki porównania będą niepoprawne"
 
-#: ../meld/filediff.py:796
+#: ../meld/filediff.py:773
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1803,66 +1805,66 @@ msgstr ""
 "Filtr zmienił liczbę wierszy w pliku, co nie jest obsługiwane. Porównanie "
 "będzie niepoprawne."
 
-#: ../meld/filediff.py:854
+#: ../meld/filediff.py:831
 msgid "Mark conflict as resolved?"
 msgstr "Oznaczyć konflikt jako rozwiązany?"
 
-#: ../meld/filediff.py:856
+#: ../meld/filediff.py:833
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
 "Jeśli konflikt został pomyślnie rozwiązany, to można go teraz jako taki "
 "oznaczyć."
 
-#: ../meld/filediff.py:858
+#: ../meld/filediff.py:835
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: ../meld/filediff.py:859
+#: ../meld/filediff.py:836
 msgid "Mark _Resolved"
 msgstr "Oznacz jako _rozwiązane"
 
-#: ../meld/filediff.py:1099
+#: ../meld/filediff.py:1086
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Wystąpił problem podczas otwierania pliku „%s”."
 
-#: ../meld/filediff.py:1107
+#: ../meld/filediff.py:1094
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Plik %s wygląda na plik binarny."
 
-#: ../meld/filediff.py:1109
+#: ../meld/filediff.py:1096
 msgid "Do you want to open the file using the default application?"
 msgstr "Otworzyć go w domyślnym programie?"
 
-#: ../meld/filediff.py:1111
+#: ../meld/filediff.py:1098
 msgid "Open"
 msgstr "Otwórz"
 
-#: ../meld/filediff.py:1127
+#: ../meld/filediff.py:1114
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Analizowanie różnic"
 
-#: ../meld/filediff.py:1192
+#: ../meld/filediff.py:1179
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Plik %s został zmieniony na dysku"
 
-#: ../meld/filediff.py:1193
+#: ../meld/filediff.py:1180
 msgid "Do you want to reload the file?"
 msgstr "Ponownie wczytać plik?"
 
-#: ../meld/filediff.py:1195
+#: ../meld/filediff.py:1182
 msgid "_Reload"
 msgstr "_Wczytaj ponownie"
 
-#: ../meld/filediff.py:1346
+#: ../meld/filediff.py:1333
 msgid "Files are identical"
 msgstr "Pliki są identyczne"
 
-#: ../meld/filediff.py:1359
+#: ../meld/filediff.py:1346
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1870,11 +1872,11 @@ msgstr ""
 "Filtry tekstowe są używane i mogą ukrywać różnice między plikami. Porównać "
 "pliki bez uwzględniania filtrów?"
 
-#: ../meld/filediff.py:1364
+#: ../meld/filediff.py:1351
 msgid "Files differ in line endings only"
 msgstr "Pliki różnią się tylko znacznikami końca wierszy"
 
-#: ../meld/filediff.py:1366
+#: ../meld/filediff.py:1353
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1883,15 +1885,15 @@ msgstr ""
 "Pliki są identyczne, z wyjątkiem różnych znaczników końca wierszy:\n"
 "%s"
 
-#: ../meld/filediff.py:1386
+#: ../meld/filediff.py:1373
 msgid "Show without filters"
 msgstr "Wyświetl bez filtrów"
 
-#: ../meld/filediff.py:1408
+#: ../meld/filediff.py:1395
 msgid "Change highlighting incomplete"
 msgstr "Wyróżnianie zmian jest niepełne"
 
-#: ../meld/filediff.py:1409
+#: ../meld/filediff.py:1396
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1899,20 +1901,20 @@ msgstr ""
 "Niektóre zmiany nie zostały wyróżnione, ponieważ były za duże. Można "
 "wymusić, aby program Meld wyróżnił większe zmiany, ale może to być wolne."
 
-#: ../meld/filediff.py:1417
+#: ../meld/filediff.py:1404
 msgid "Keep highlighting"
 msgstr "Wyróżniaj dalej"
 
-#: ../meld/filediff.py:1419
+#: ../meld/filediff.py:1406
 msgid "_Keep highlighting"
 msgstr "_Wyróżniaj dalej"
 
-#: ../meld/filediff.py:1451
+#: ../meld/filediff.py:1438
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Zastąpić plik „%s”?"
 
-#: ../meld/filediff.py:1453
+#: ../meld/filediff.py:1440
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -1921,47 +1923,47 @@ msgstr ""
 "Plik o tej samej nazwie już istnieje w „%s”.\n"
 "Zastąpienie istniejącego pliku spowoduje utratę jego zawartości."
 
-#: ../meld/filediff.py:1470
+#: ../meld/filediff.py:1457
 msgid "Save Left Pane As"
 msgstr "Zapis lewego panelu jako"
 
-#: ../meld/filediff.py:1472
+#: ../meld/filediff.py:1459
 msgid "Save Middle Pane As"
 msgstr "Zapis środkowego panelu jako"
 
-#: ../meld/filediff.py:1474
+#: ../meld/filediff.py:1461
 msgid "Save Right Pane As"
 msgstr "Zapis prawego panelu jako"
 
-#: ../meld/filediff.py:1488
+#: ../meld/filediff.py:1475
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Plik %s został zmieniony na dysku od czasu jego otwarcia"
 
-#: ../meld/filediff.py:1490
+#: ../meld/filediff.py:1477
 msgid "If you save it, any external changes will be lost."
 msgstr ""
 "Jeżeli plik zostanie zapisany, to wszystkie zewnętrzne zmiany zostaną "
 "utracone."
 
-#: ../meld/filediff.py:1493
+#: ../meld/filediff.py:1480
 msgid "Save Anyway"
 msgstr "Zapisz mimo to"
 
-#: ../meld/filediff.py:1494
+#: ../meld/filediff.py:1481
 msgid "Don't Save"
 msgstr "Nie zapisuj"
 
-#: ../meld/filediff.py:1516
+#: ../meld/filediff.py:1503
 msgid "_Save as UTF-8"
 msgstr "_Zapisz za pomocą UTF-8"
 
-#: ../meld/filediff.py:1519
+#: ../meld/filediff.py:1506
 #, python-format
 msgid "Couldn't encode text as “%s”"
 msgstr "Nie można zakodować tekstu za pomocą „%s”"
 
-#: ../meld/filediff.py:1521
+#: ../meld/filediff.py:1508
 #, python-format
 msgid ""
 "File “%s” contains characters that can't be encoded using encoding “%s”.\n"
@@ -1971,12 +1973,12 @@ msgstr ""
 "„%s”.\n"
 "Zapisać za pomocą kodowania UTF-8?"
 
-#: ../meld/filediff.py:1558 ../meld/patchdialog.py:125
+#: ../meld/filediff.py:1545 ../meld/patchdialog.py:125
 #, python-format
 msgid "Could not save file %s."
 msgstr "Nie można zapisać pliku %s."
 
-#: ../meld/filediff.py:1559 ../meld/patchdialog.py:126
+#: ../meld/filediff.py:1546 ../meld/patchdialog.py:126
 #, python-format
 msgid ""
 "Couldn't save file due to:\n"
@@ -1985,11 +1987,11 @@ msgstr ""
 "Nie można zapisać pliku z powodu:\n"
 "%s"
 
-#: ../meld/filediff.py:1905
+#: ../meld/filediff.py:1892
 msgid "Live comparison updating disabled"
 msgstr "Wyłączono aktualizowanie porównań na żywo"
 
-#: ../meld/filediff.py:1906
+#: ../meld/filediff.py:1893
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2105,7 +2107,7 @@ msgid "invalid path or URI \"%s\""
 msgstr "nieprawidłowa ścieżka lub adres URL „%s”"
 
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:127
+#: ../meld/meldbuffer.py:132
 msgid "<unnamed>"
 msgstr "<bez nazwy>"
 
@@ -2346,7 +2348,7 @@ msgstr "Automatyczne scalenie wymaga trzech plików, otrzymano: %r"
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Jednoczesne porównanie plików i katalogów nie jest możliwe"
 
-#: ../meld/misc.py:179
+#: ../meld/misc.py:203
 #, python-format
 msgid "Couldn't find colour scheme details for %s-%s; this is a bad install"
 msgstr ""
@@ -2354,7 +2356,7 @@ msgstr ""
 "instalacja"
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:264
+#: ../meld/misc.py:288
 msgid "[None]"
 msgstr "[Brak]"
 
@@ -2477,86 +2479,86 @@ msgstr "Nieobecny"
 
 #. Translators: This error message is shown when a version
 #. control binary isn't installed.
-#: ../meld/vcview.py:255
+#: ../meld/vcview.py:261
 #, python-format
 msgid "%(name)s (%(cmd)s not installed)"
 msgstr "%(name)s (program %(cmd)s nie jest zainstalowany)"
 
 #. Translators: This error message is shown when a version
 #. controlled repository is invalid.
-#: ../meld/vcview.py:259
+#: ../meld/vcview.py:265
 #, python-format
 msgid "%(name)s (Invalid repository)"
 msgstr "%(name)s (nieprawidłowe repozytorium)"
 
-#: ../meld/vcview.py:280
+#: ../meld/vcview.py:286
 msgid "No valid version control system found in this folder"
 msgstr ""
 "W tym katalogu nie odnaleziono żadnego prawidłowego systemu kontroli wersji"
 
-#: ../meld/vcview.py:282
+#: ../meld/vcview.py:288
 msgid "Only one version control system found in this folder"
 msgstr "W tym katalogu odnaleziono tylko jeden system kontroli wersji"
 
-#: ../meld/vcview.py:284
+#: ../meld/vcview.py:290
 msgid "Choose which version control system to use"
 msgstr "Proszę wybrać system kontroli wersji do użycia"
 
 #. TRANSLATORS: This is the location of the directory being viewed
-#: ../meld/vcview.py:337
+#: ../meld/vcview.py:343
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:357
+#: ../meld/vcview.py:363
 #, python-format
 msgid "Scanning %s"
 msgstr "Skanowanie %s"
 
-#: ../meld/vcview.py:396
+#: ../meld/vcview.py:402
 msgid "(Empty)"
 msgstr "(Pusty)"
 
-#: ../meld/vcview.py:440
+#: ../meld/vcview.py:446
 #, python-format
 msgid "%s — local"
 msgstr "%s — lokalne"
 
-#: ../meld/vcview.py:441
+#: ../meld/vcview.py:447
 #, python-format
 msgid "%s — remote"
 msgstr "%s — zdalne"
 
-#: ../meld/vcview.py:449
+#: ../meld/vcview.py:455
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (lokalne, scalanie, zdalne)"
 
-#: ../meld/vcview.py:454
+#: ../meld/vcview.py:460
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (zdalne, scalanie, lokalne)"
 
-#: ../meld/vcview.py:465
+#: ../meld/vcview.py:471
 #, python-format
 msgid "%s — repository"
 msgstr "%s — repozytorium"
 
-#: ../meld/vcview.py:471
+#: ../meld/vcview.py:477
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (kopia robocza, repozytorium)"
 
-#: ../meld/vcview.py:475
+#: ../meld/vcview.py:481
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (repozytorium, kopia robocza)"
 
-#: ../meld/vcview.py:643
+#: ../meld/vcview.py:649
 msgid "Remove folder and all its files?"
 msgstr "Usunąć katalog i wszystkie zawarte w nim pliki?"
 
-#: ../meld/vcview.py:645
+#: ../meld/vcview.py:651
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2564,11 +2566,11 @@ msgstr ""
 "Spowoduje to usunięcie z systemu kontroli wersji wszystkich zaznaczonych "
 "plików i katalogów, a także wszystkich plików w zaznaczonych katalogach."
 
-#: ../meld/vcview.py:670
+#: ../meld/vcview.py:676
 #, python-format
 msgid "Error removing %s"
 msgstr "Błąd podczas usuwania %s"
 
-#: ../meld/vcview.py:750
+#: ../meld/vcview.py:756
 msgid "Clear"
 msgstr "Wyczyść"

From 48597198cb53f19a81ae2f468e2a1d3a7833e5aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20=C4=8Cernock=C3=BD?= <marek@manet.cz>
Date: Sun, 21 Aug 2016 11:11:51 +0200
Subject: [PATCH 22/51] Updated Czech translation

---
 po/cs.po | 204 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 104 insertions(+), 100 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 090b35e3..989ef0d6 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,13 +8,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: meld\n"
+"Project-Id-Version: meld meld-3.16\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=meld&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-03-13 17:33+0000\n"
-"PO-Revision-Date: 2016-03-14 04:20+0100\n"
+"POT-Creation-Date: 2016-08-20 21:39+0000\n"
+"PO-Revision-Date: 2016-08-21 11:08+0200\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
-"Language-Team: Czech <gnome-cs-list@gnome.org>\n"
+"Language-Team: čeština <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,6 +89,10 @@ msgstr ""
 "Pomocí aplikace Meld můžete kontrolovat změny kódu, pochopit jednotlivé "
 "záplaty a řešit konflikty při rozsáhlém slučování více bezbolestně."
 
+#: ../data/meld.appdata.xml.in.h:5
+msgid "The GNOME Project"
+msgstr "Projekt GNOME"
+
 #: ../data/mime/meld.xml.in.h:1
 msgid "Meld comparison description"
 msgstr "Definice porovnávání Meld"
@@ -567,7 +571,7 @@ msgstr "Kopírovat doprava"
 msgid "Delete selected"
 msgstr "Odstranit vybrané"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1381
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:860 ../meld/filediff.py:1368
 msgid "Hide"
 msgstr "Skrýt"
 
@@ -636,7 +640,7 @@ msgid "_Add"
 msgstr "_Přidat"
 
 #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:649
+#: ../meld/vcview.py:655
 msgid "_Remove"
 msgstr "_Odstranit"
 
@@ -658,7 +662,7 @@ msgstr "Přesunout _dolů"
 
 #. Create icon and filename CellRenderer
 #: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35
-#: ../meld/dirdiff.py:372
+#: ../meld/dirdiff.py:374
 msgid "Name"
 msgstr "Název"
 
@@ -858,8 +862,8 @@ msgstr "Pokud se změny neuloží, budou trvale ztraceny."
 msgid "Close _without Saving"
 msgstr "Zavřít _bez uložení"
 
-#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1447
-#: ../meld/filediff.py:1515
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:942 ../meld/filediff.py:1434
+#: ../meld/filediff.py:1502
 msgid "_Cancel"
 msgstr "_Zrušit"
 
@@ -896,7 +900,7 @@ msgstr "Vrátit stav před neuložené změny v dokumentu?"
 msgid "Changes made to the following documents will be permanently lost:\n"
 msgstr "Změny provedené v následujících dokumentech budou trvale ztraceny:\n"
 
-#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1448
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:943 ../meld/filediff.py:1435
 msgid "_Replace"
 msgstr "Nahradi_t"
 
@@ -1589,7 +1593,7 @@ msgstr "Předchozí záznamy:"
 msgid "Co_mmit"
 msgstr "Co_mmit"
 
-#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:337
+#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:343
 msgid "Location"
 msgstr "Umístění"
 
@@ -1631,44 +1635,44 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:390 ../meld/preferences.py:82
+#: ../meld/dirdiff.py:392 ../meld/preferences.py:82
 msgid "Size"
 msgstr "Velikost"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:398 ../meld/preferences.py:83
+#: ../meld/dirdiff.py:400 ../meld/preferences.py:83
 msgid "Modification time"
 msgstr "Čas změny"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:406 ../meld/preferences.py:84
+#: ../meld/dirdiff.py:408 ../meld/preferences.py:84
 msgid "Permissions"
 msgstr "Oprávnění"
 
-#: ../meld/dirdiff.py:536
+#: ../meld/dirdiff.py:538
 #, python-format
 msgid "Hide %s"
 msgstr "Skrýt %s"
 
-#: ../meld/dirdiff.py:668 ../meld/dirdiff.py:692
+#: ../meld/dirdiff.py:670 ../meld/dirdiff.py:694
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Prochází se %s"
 
-#: ../meld/dirdiff.py:825
+#: ../meld/dirdiff.py:827
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Hotovo"
 
-#: ../meld/dirdiff.py:833
+#: ../meld/dirdiff.py:835
 msgid "Folders have no differences"
 msgstr "Mezi složkami není žádný rozdíl"
 
-#: ../meld/dirdiff.py:835
+#: ../meld/dirdiff.py:837
 msgid "Contents of scanned files in folders are identical."
 msgstr "Obsah kontrolovaných souborů ve složkách je stejný."
 
-#: ../meld/dirdiff.py:837
+#: ../meld/dirdiff.py:839
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1676,42 +1680,42 @@ msgstr ""
 "Kontrolované soubory ve složkách vypadají stejně, ale nebyl kontrolován "
 "jejich obsah."
 
-#: ../meld/dirdiff.py:840
+#: ../meld/dirdiff.py:842
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 "Jsou používány filtry souborů, takže ne všechny soubory byly kontrolovány."
 
-#: ../meld/dirdiff.py:842
+#: ../meld/dirdiff.py:844
 msgid "Text filters are in use and may be masking content differences."
 msgstr ""
 "Jsou používány textové filtry a může dojít k zamaskování rozdílů mezi "
 "soubory."
 
-#: ../meld/dirdiff.py:860 ../meld/filediff.py:1383 ../meld/filediff.py:1413
-#: ../meld/filediff.py:1415 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122
+#: ../meld/dirdiff.py:862 ../meld/filediff.py:1370 ../meld/filediff.py:1400
+#: ../meld/filediff.py:1402 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122
 msgid "Hi_de"
 msgstr "_Skrýt"
 
-#: ../meld/dirdiff.py:870
+#: ../meld/dirdiff.py:872
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Při skenování této složky došlo k několika chybám"
 
-#: ../meld/dirdiff.py:871
+#: ../meld/dirdiff.py:873
 msgid "Files with invalid encodings found"
 msgstr "Nalezeny soubory s neplatným kódováním"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:873
+#: ../meld/dirdiff.py:875
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "Některé soubory měly neplatné kódování. Názvy jsou přibližně následující:"
 
-#: ../meld/dirdiff.py:875
+#: ../meld/dirdiff.py:877
 msgid "Files hidden by case insensitive comparison"
 msgstr "Soubory skryty porovnáním nerozlišujícím velikost písmen"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:877
+#: ../meld/dirdiff.py:879
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1719,17 +1723,17 @@ msgstr ""
 "Provádí se porovnání nerozlišující velikost písmen na systému souborů "
 "rozlišujícím velikost písmen. Některé soubory v této složce jsou skryté:"
 
-#: ../meld/dirdiff.py:888
+#: ../meld/dirdiff.py:890
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "„%s“ skryto v „%s“"
 
-#: ../meld/dirdiff.py:944
+#: ../meld/dirdiff.py:946
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Nahradit složku „%s“?"
 
-#: ../meld/dirdiff.py:946
+#: ../meld/dirdiff.py:948
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1738,11 +1742,11 @@ msgstr ""
 "V „%s“ již existuje jiná složka se stejným názvem.\n"
 "Pokud stávající složku nahradíte, budou všechny soubory v ní ztraceny."
 
-#: ../meld/dirdiff.py:959
+#: ../meld/dirdiff.py:961
 msgid "Error copying file"
 msgstr "Chyba při kopírování souboru"
 
-#: ../meld/dirdiff.py:960
+#: ../meld/dirdiff.py:962
 #, python-format
 msgid ""
 "Couldn't copy %s\n"
@@ -1755,35 +1759,35 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/dirdiff.py:983
+#: ../meld/dirdiff.py:985
 #, python-format
 msgid "Error deleting %s"
 msgstr "Chyba při mazání %s"
 
-#: ../meld/dirdiff.py:1488
+#: ../meld/dirdiff.py:1492
 msgid "No folder"
 msgstr "Žádná složka"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:359
+#: ../meld/filediff.py:357
 msgid "INS"
 msgstr "VKL"
 
-#: ../meld/filediff.py:359
+#: ../meld/filediff.py:357
 msgid "OVR"
 msgstr "PŘE"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:361
+#: ../meld/filediff.py:359
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Řád %i, sl %i"
 
-#: ../meld/filediff.py:794
+#: ../meld/filediff.py:771
 msgid "Comparison results will be inaccurate"
 msgstr "Výsledky porovnávání budou nepřesné"
 
-#: ../meld/filediff.py:796
+#: ../meld/filediff.py:773
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1791,64 +1795,64 @@ msgstr ""
 "Filtr změnil počet řádků v souboru, což není podporováno. Porovnání nebude "
 "správné."
 
-#: ../meld/filediff.py:854
+#: ../meld/filediff.py:831
 msgid "Mark conflict as resolved?"
 msgstr "Označit konflikt jako vyřešený?"
 
-#: ../meld/filediff.py:856
+#: ../meld/filediff.py:833
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr "Pokud byl konflikt vyřešen úspěšně, můžete jej označit za vyřešený."
 
-#: ../meld/filediff.py:858
+#: ../meld/filediff.py:835
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: ../meld/filediff.py:859
+#: ../meld/filediff.py:836
 msgid "Mark _Resolved"
 msgstr "Označi_t za vyřešené"
 
-#: ../meld/filediff.py:1099
+#: ../meld/filediff.py:1086
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Vyskytl se problém při otevírání souboru „%s“."
 
-#: ../meld/filediff.py:1107
+#: ../meld/filediff.py:1094
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Soubor %s je zřejmě binární."
 
-#: ../meld/filediff.py:1109
+#: ../meld/filediff.py:1096
 msgid "Do you want to open the file using the default application?"
 msgstr "Chcete soubor otevřít pomocí výchozí aplikace?"
 
-#: ../meld/filediff.py:1111
+#: ../meld/filediff.py:1098
 msgid "Open"
 msgstr "Otevřít"
 
-#: ../meld/filediff.py:1127
+#: ../meld/filediff.py:1114
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Počítají se rozdíly"
 
-#: ../meld/filediff.py:1192
+#: ../meld/filediff.py:1179
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Soubor „%s“ byl změněn na disku."
 
-#: ../meld/filediff.py:1193
+#: ../meld/filediff.py:1180
 msgid "Do you want to reload the file?"
 msgstr "Chcete soubor znovu načíst?"
 
-#: ../meld/filediff.py:1195
+#: ../meld/filediff.py:1182
 msgid "_Reload"
 msgstr "Zno_vu načíst"
 
-#: ../meld/filediff.py:1346
+#: ../meld/filediff.py:1333
 msgid "Files are identical"
 msgstr "Soubory jsou stejné"
 
-#: ../meld/filediff.py:1359
+#: ../meld/filediff.py:1346
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1856,11 +1860,11 @@ msgstr ""
 "Jsou používány textové filtry a může dojít k zamaskování rozdílů mezi "
 "soubory. Chcete porovnat nefiltrované soubory?"
 
-#: ../meld/filediff.py:1364
+#: ../meld/filediff.py:1351
 msgid "Files differ in line endings only"
 msgstr "Soubory se liší pouze zakončením řádků"
 
-#: ../meld/filediff.py:1366
+#: ../meld/filediff.py:1353
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1869,15 +1873,15 @@ msgstr ""
 "Soubory jsou shodné, vyjma rozdílného zakončení řádků:\n"
 "%s"
 
-#: ../meld/filediff.py:1386
+#: ../meld/filediff.py:1373
 msgid "Show without filters"
 msgstr "Zobrazit bez filtrů"
 
-#: ../meld/filediff.py:1408
+#: ../meld/filediff.py:1395
 msgid "Change highlighting incomplete"
 msgstr "Změnit zvýraznění neúplných"
 
-#: ../meld/filediff.py:1409
+#: ../meld/filediff.py:1396
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1886,20 +1890,20 @@ msgstr ""
 "přimět k používání větší délky, aby se zvýraznily i rozsáhlé změny, ale může "
 "to pak být pomalé."
 
-#: ../meld/filediff.py:1417
+#: ../meld/filediff.py:1404
 msgid "Keep highlighting"
 msgstr "Zachovat zvýrazňování"
 
-#: ../meld/filediff.py:1419
+#: ../meld/filediff.py:1406
 msgid "_Keep highlighting"
 msgstr "Z_achovat zvýrazňování"
 
-#: ../meld/filediff.py:1451
+#: ../meld/filediff.py:1438
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Nahradit soubor „%s“?"
 
-#: ../meld/filediff.py:1453
+#: ../meld/filediff.py:1440
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -1908,45 +1912,45 @@ msgstr ""
 "V „%s“ již existuje soubor se stejným názvem.\n"
 "Pokud stávající soubor nahradíte, jeho obsah bude ztracen."
 
-#: ../meld/filediff.py:1470
+#: ../meld/filediff.py:1457
 msgid "Save Left Pane As"
 msgstr "Uložení levého panelu jako"
 
-#: ../meld/filediff.py:1472
+#: ../meld/filediff.py:1459
 msgid "Save Middle Pane As"
 msgstr "Uložení prostředního panelu jako"
 
-#: ../meld/filediff.py:1474
+#: ../meld/filediff.py:1461
 msgid "Save Right Pane As"
 msgstr "Uložení pravého panelu jako"
 
-#: ../meld/filediff.py:1488
+#: ../meld/filediff.py:1475
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Soubor „%s“ byl od doby, co jste jej otevřeli, změněn."
 
-#: ../meld/filediff.py:1490
+#: ../meld/filediff.py:1477
 msgid "If you save it, any external changes will be lost."
 msgstr "Pokud jej uložíte, budou vnější změny ztraceny."
 
-#: ../meld/filediff.py:1493
+#: ../meld/filediff.py:1480
 msgid "Save Anyway"
 msgstr "Přesto uložit"
 
-#: ../meld/filediff.py:1494
+#: ../meld/filediff.py:1481
 msgid "Don't Save"
 msgstr "Neukládat"
 
-#: ../meld/filediff.py:1516
+#: ../meld/filediff.py:1503
 msgid "_Save as UTF-8"
 msgstr "_Uložit v UTF-8"
 
-#: ../meld/filediff.py:1519
+#: ../meld/filediff.py:1506
 #, python-format
 msgid "Couldn't encode text as “%s”"
 msgstr "Text nelze zakódovat jako „%s“"
 
-#: ../meld/filediff.py:1521
+#: ../meld/filediff.py:1508
 #, python-format
 msgid ""
 "File “%s” contains characters that can't be encoded using encoding “%s”.\n"
@@ -1955,12 +1959,12 @@ msgstr ""
 "Soubor „%s“ obsahuje znaky, které nelze zakódovat pomocí kódování „%s“\n"
 "Chcete jej uložit v UTF-8?"
 
-#: ../meld/filediff.py:1558 ../meld/patchdialog.py:125
+#: ../meld/filediff.py:1545 ../meld/patchdialog.py:125
 #, python-format
 msgid "Could not save file %s."
 msgstr "Nelze uložit soubor %s."
 
-#: ../meld/filediff.py:1559 ../meld/patchdialog.py:126
+#: ../meld/filediff.py:1546 ../meld/patchdialog.py:126
 #, python-format
 msgid ""
 "Couldn't save file due to:\n"
@@ -1969,11 +1973,11 @@ msgstr ""
 "Nelze uložit soubor z důvodu:\n"
 "%s"
 
-#: ../meld/filediff.py:1905
+#: ../meld/filediff.py:1892
 msgid "Live comparison updating disabled"
 msgstr "Živá aktualizace porovnání zakázána"
 
-#: ../meld/filediff.py:1906
+#: ../meld/filediff.py:1893
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2088,7 +2092,7 @@ msgid "invalid path or URI \"%s\""
 msgstr "neplatná cesta nebo adresa URI „%s“"
 
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:127
+#: ../meld/meldbuffer.py:132
 msgid "<unnamed>"
 msgstr "<bez názvu>"
 
@@ -2329,14 +2333,14 @@ msgstr "Pro automatické sloučení jsou zapotřebí tři soubory, obdržen: %r"
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Nelze porovnávat směs souborů a složek"
 
-#: ../meld/misc.py:179
+#: ../meld/misc.py:203
 #, python-format
 msgid "Couldn't find colour scheme details for %s-%s; this is a bad install"
 msgstr ""
 "Ve schématu barev nelze najít údaj pro %s-%s. Jedná se o chybnou instalaci"
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:264
+#: ../meld/misc.py:288
 msgid "[None]"
 msgstr "[Žádný]"
 
@@ -2459,85 +2463,85 @@ msgstr "Není přítomno"
 
 #. Translators: This error message is shown when a version
 #. control binary isn't installed.
-#: ../meld/vcview.py:255
+#: ../meld/vcview.py:261
 #, python-format
 msgid "%(name)s (%(cmd)s not installed)"
 msgstr "%(name)s (%(cmd)s není nainstalováno)"
 
 #. Translators: This error message is shown when a version
 #. controlled repository is invalid.
-#: ../meld/vcview.py:259
+#: ../meld/vcview.py:265
 #, python-format
 msgid "%(name)s (Invalid repository)"
 msgstr "%(name)s (neplatný repozitář)"
 
-#: ../meld/vcview.py:280
+#: ../meld/vcview.py:286
 msgid "No valid version control system found in this folder"
 msgstr "V této složce nebyl nalezen žádný platný systém správy verzí"
 
-#: ../meld/vcview.py:282
+#: ../meld/vcview.py:288
 msgid "Only one version control system found in this folder"
 msgstr "V této složce byl nalezen jen jeden systém správy verzí"
 
-#: ../meld/vcview.py:284
+#: ../meld/vcview.py:290
 msgid "Choose which version control system to use"
 msgstr "Vyberte, který systém správy verzí se má použít"
 
 #. TRANSLATORS: This is the location of the directory being viewed
-#: ../meld/vcview.py:337
+#: ../meld/vcview.py:343
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:357
+#: ../meld/vcview.py:363
 #, python-format
 msgid "Scanning %s"
 msgstr "Prochází se %s"
 
-#: ../meld/vcview.py:396
+#: ../meld/vcview.py:402
 msgid "(Empty)"
 msgstr "(Prázdný)"
 
-#: ../meld/vcview.py:440
+#: ../meld/vcview.py:446
 #, python-format
 msgid "%s — local"
 msgstr "%s — místní"
 
-#: ../meld/vcview.py:441
+#: ../meld/vcview.py:447
 #, python-format
 msgid "%s — remote"
 msgstr "%s — vzdálený"
 
-#: ../meld/vcview.py:449
+#: ../meld/vcview.py:455
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (místní, sloučený, vzdálený)"
 
-#: ../meld/vcview.py:454
+#: ../meld/vcview.py:460
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (vzdálený, sloučený, místní)"
 
-#: ../meld/vcview.py:465
+#: ../meld/vcview.py:471
 #, python-format
 msgid "%s — repository"
 msgstr "%s — repozitář"
 
-#: ../meld/vcview.py:471
+#: ../meld/vcview.py:477
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (pracovní, repozitář)"
 
-#: ../meld/vcview.py:475
+#: ../meld/vcview.py:481
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (repozitář, pracovní)"
 
-#: ../meld/vcview.py:643
+#: ../meld/vcview.py:649
 msgid "Remove folder and all its files?"
 msgstr "Odstranit složku a všechny soubory v ní?"
 
-#: ../meld/vcview.py:645
+#: ../meld/vcview.py:651
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2545,11 +2549,11 @@ msgstr ""
 "Tímto se ze správy verzí odstraní všechny vybrané soubory a složky (a "
 "všechny soubory v těchto složkách)."
 
-#: ../meld/vcview.py:670
+#: ../meld/vcview.py:676
 #, python-format
 msgid "Error removing %s"
 msgstr "Chyba při odstraňování %s"
 
-#: ../meld/vcview.py:750
+#: ../meld/vcview.py:756
 msgid "Clear"
 msgstr "Vymazat"

From 6ff5340a33b049d3dece206099417d9e788d080d Mon Sep 17 00:00:00 2001
From: Anders Jonsson <anders.jonsson@norsjovallen.se>
Date: Sun, 21 Aug 2016 20:36:39 +0000
Subject: [PATCH 23/51] Updated Swedish translation

---
 po/sv.po | 150 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 78 insertions(+), 72 deletions(-)

diff --git a/po/sv.po b/po/sv.po
index 1f8312b6..ed0dbbc8 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -4,21 +4,23 @@
 # Daniel Nylander <po@danielnylander.se>, 2006, 2007, 2008, 2009, 2011.
 # Sebastian Rasmussen <sebras@gmail.com>, 2015.
 # Josef Andersson <josef.andersson@fripost.org>, 2014, 2015, 2016.
+# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2016.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=meld&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-04-15 22:51+0000\n"
-"PO-Revision-Date: 2016-03-17 17:04+0100\n"
-"Last-Translator: Josef Andersson <josef.andersson@fripost.org>\n"
+"POT-Creation-Date: 2016-08-20 21:39+0000\n"
+"PO-Revision-Date: 2016-08-21 22:34+0200\n"
+"Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.4\n"
+"X-Generator: Poedit 1.8.8\n"
 "X-Project-Style: gnome\n"
 
 #: ../bin/meld:144
@@ -86,6 +88,10 @@ msgstr ""
 "Meld hjälper dig att granska kodändringar, förstå programfixar och göra "
 "enorma sammanfogningskonflikter något mindre smärtsamma."
 
+#: ../data/meld.appdata.xml.in.h:5
+msgid "The GNOME Project"
+msgstr "GNOME-projektet"
+
 #: ../data/mime/meld.xml.in.h:1
 msgid "Meld comparison description"
 msgstr "Meld jämförelsebeskrivning"
@@ -565,7 +571,7 @@ msgstr "Kopiera till höger"
 msgid "Delete selected"
 msgstr "Ta bort markerade"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:860 ../meld/filediff.py:1366
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:860 ../meld/filediff.py:1368
 msgid "Hide"
 msgstr "Dölj"
 
@@ -633,7 +639,7 @@ msgid "_Add"
 msgstr "_Lägg till"
 
 #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:649
+#: ../meld/vcview.py:655
 msgid "_Remove"
 msgstr "_Ta bort"
 
@@ -856,8 +862,8 @@ msgstr "Sparar du inte kommer ändringar att gå förlorade för alltid."
 msgid "Close _without Saving"
 msgstr "Stäng _utan att spara"
 
-#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:942 ../meld/filediff.py:1432
-#: ../meld/filediff.py:1500
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:942 ../meld/filediff.py:1434
+#: ../meld/filediff.py:1502
 msgid "_Cancel"
 msgstr "_Avbryt"
 
@@ -894,7 +900,7 @@ msgid "Changes made to the following documents will be permanently lost:\n"
 msgstr ""
 "Ändringar utförda i följande dokument kommer att gå förlorade för alltid:\n"
 
-#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:943 ../meld/filediff.py:1433
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:943 ../meld/filediff.py:1435
 msgid "_Replace"
 msgstr "_Ersätt"
 
@@ -1587,7 +1593,7 @@ msgstr "Föregående loggar:"
 msgid "Co_mmit"
 msgstr "Che_cka in"
 
-#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:337
+#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:343
 msgid "Location"
 msgstr "Plats"
 
@@ -1680,8 +1686,8 @@ msgstr "Filfilter används, och därför har inte alla filer genomsökts."
 msgid "Text filters are in use and may be masking content differences."
 msgstr "Textfilter används och kan dölja skillnader i innehåll."
 
-#: ../meld/dirdiff.py:862 ../meld/filediff.py:1368 ../meld/filediff.py:1398
-#: ../meld/filediff.py:1400 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122
+#: ../meld/dirdiff.py:862 ../meld/filediff.py:1370 ../meld/filediff.py:1400
+#: ../meld/filediff.py:1402 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122
 msgid "Hi_de"
 msgstr "_Dölj"
 
@@ -1771,11 +1777,11 @@ msgstr "ÖVR"
 msgid "Ln %i, Col %i"
 msgstr "Rad %i, kolumn %i"
 
-#: ../meld/filediff.py:774
+#: ../meld/filediff.py:771
 msgid "Comparison results will be inaccurate"
 msgstr "Jämförelseresultat kommer att bli osäkra"
 
-#: ../meld/filediff.py:776
+#: ../meld/filediff.py:773
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1783,64 +1789,64 @@ msgstr ""
 "Ett filter ändrade antalet rader i filen vilket inte stöds. Jämförelsen "
 "kommer att vara osäker."
 
-#: ../meld/filediff.py:834
+#: ../meld/filediff.py:831
 msgid "Mark conflict as resolved?"
 msgstr "Markera konflikten som löst?"
 
-#: ../meld/filediff.py:836
+#: ../meld/filediff.py:833
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr "Om konflikten gick att lösa kan du markera den som löst nu."
 
-#: ../meld/filediff.py:838
+#: ../meld/filediff.py:835
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../meld/filediff.py:839
+#: ../meld/filediff.py:836
 msgid "Mark _Resolved"
 msgstr "Markera som _löst"
 
-#: ../meld/filediff.py:1084
+#: ../meld/filediff.py:1086
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Det uppstod ett problem vid öppnandet av filen ”%s”."
 
-#: ../meld/filediff.py:1092
+#: ../meld/filediff.py:1094
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Filen %s verkar vara en binärfil."
 
-#: ../meld/filediff.py:1094
+#: ../meld/filediff.py:1096
 msgid "Do you want to open the file using the default application?"
 msgstr "Vill du öppna filen med standardprogrammet?"
 
-#: ../meld/filediff.py:1096
+#: ../meld/filediff.py:1098
 msgid "Open"
 msgstr "Öppna"
 
-#: ../meld/filediff.py:1112
+#: ../meld/filediff.py:1114
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Beräknar skillnader"
 
-#: ../meld/filediff.py:1177
+#: ../meld/filediff.py:1179
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Filen %s har ändrats på disk"
 
-#: ../meld/filediff.py:1178
+#: ../meld/filediff.py:1180
 msgid "Do you want to reload the file?"
 msgstr "Vill du läsa om filen?"
 
-#: ../meld/filediff.py:1180
+#: ../meld/filediff.py:1182
 msgid "_Reload"
 msgstr "_Läs om"
 
-#: ../meld/filediff.py:1331
+#: ../meld/filediff.py:1333
 msgid "Files are identical"
 msgstr "Filerna är identiska"
 
-#: ../meld/filediff.py:1344
+#: ../meld/filediff.py:1346
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1848,11 +1854,11 @@ msgstr ""
 "Textfilter används och kan dölja skillnader mellan filer. Vill du jämföra de "
 "ofiltrerade filerna?"
 
-#: ../meld/filediff.py:1349
+#: ../meld/filediff.py:1351
 msgid "Files differ in line endings only"
 msgstr "Filer skiljer sig endast vad gäller radslut"
 
-#: ../meld/filediff.py:1351
+#: ../meld/filediff.py:1353
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1861,15 +1867,15 @@ msgstr ""
 "Filerna är identiska förutom radavsluten:\n"
 "%s"
 
-#: ../meld/filediff.py:1371
+#: ../meld/filediff.py:1373
 msgid "Show without filters"
 msgstr "Visa utan filer"
 
-#: ../meld/filediff.py:1393
+#: ../meld/filediff.py:1395
 msgid "Change highlighting incomplete"
 msgstr "Ändra markering av ofärdiga"
 
-#: ../meld/filediff.py:1394
+#: ../meld/filediff.py:1396
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1878,20 +1884,20 @@ msgstr ""
 "Meld till att längre tid på sig att markera större ändringar, men det kan "
 "bli långsamt."
 
-#: ../meld/filediff.py:1402
+#: ../meld/filediff.py:1404
 msgid "Keep highlighting"
 msgstr "Använd markering"
 
-#: ../meld/filediff.py:1404
+#: ../meld/filediff.py:1406
 msgid "_Keep highlighting"
 msgstr "_Använd markering"
 
-#: ../meld/filediff.py:1436
+#: ../meld/filediff.py:1438
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Ersätt filen ”%s”?"
 
-#: ../meld/filediff.py:1438
+#: ../meld/filediff.py:1440
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -1900,45 +1906,45 @@ msgstr ""
 "En fil med detta namn existerar redan i ”%s”.\n"
 "Om du ersätter befintlig fil kommer dess innehåll att gå förlorat."
 
-#: ../meld/filediff.py:1455
+#: ../meld/filediff.py:1457
 msgid "Save Left Pane As"
 msgstr "Spara vänsterpanel som"
 
-#: ../meld/filediff.py:1457
+#: ../meld/filediff.py:1459
 msgid "Save Middle Pane As"
 msgstr "Spara mittenpanel som"
 
-#: ../meld/filediff.py:1459
+#: ../meld/filediff.py:1461
 msgid "Save Right Pane As"
 msgstr "Spara högerpanel som"
 
-#: ../meld/filediff.py:1473
+#: ../meld/filediff.py:1475
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Filen %s har ändrats på disk sedan den öppnades"
 
-#: ../meld/filediff.py:1475
+#: ../meld/filediff.py:1477
 msgid "If you save it, any external changes will be lost."
 msgstr "Om du sparar den kommer alla externa ändringar att gå förlorade."
 
-#: ../meld/filediff.py:1478
+#: ../meld/filediff.py:1480
 msgid "Save Anyway"
 msgstr "Spara ändå"
 
-#: ../meld/filediff.py:1479
+#: ../meld/filediff.py:1481
 msgid "Don't Save"
 msgstr "Spara inte"
 
-#: ../meld/filediff.py:1501
+#: ../meld/filediff.py:1503
 msgid "_Save as UTF-8"
 msgstr "_Spara som UTF-8"
 
-#: ../meld/filediff.py:1504
+#: ../meld/filediff.py:1506
 #, python-format
 msgid "Couldn't encode text as “%s”"
 msgstr "Kunde inte koda text som ”%s”"
 
-#: ../meld/filediff.py:1506
+#: ../meld/filediff.py:1508
 #, python-format
 msgid ""
 "File “%s” contains characters that can't be encoded using encoding “%s”.\n"
@@ -1947,12 +1953,12 @@ msgstr ""
 "Filen ”%s” innehåller tecken som inte kan kodas med kodningen ”%s”\n"
 "Vill du spara som UTF-8?"
 
-#: ../meld/filediff.py:1543 ../meld/patchdialog.py:125
+#: ../meld/filediff.py:1545 ../meld/patchdialog.py:125
 #, python-format
 msgid "Could not save file %s."
 msgstr "Kunde inte spara filen %s."
 
-#: ../meld/filediff.py:1544 ../meld/patchdialog.py:126
+#: ../meld/filediff.py:1546 ../meld/patchdialog.py:126
 #, python-format
 msgid ""
 "Couldn't save file due to:\n"
@@ -1961,11 +1967,11 @@ msgstr ""
 "Kunde in spara fil beroende på:\n"
 "%s"
 
-#: ../meld/filediff.py:1890
+#: ../meld/filediff.py:1892
 msgid "Live comparison updating disabled"
 msgstr "Inaktivera realtidsuppdateringar av jämförelser"
 
-#: ../meld/filediff.py:1891
+#: ../meld/filediff.py:1893
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2322,7 +2328,7 @@ msgstr "Behöver tre filer för att auto-sammanfoga, fick: %r"
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Kan inte jämföra en blandning av filer och kataloger"
 
-#: ../meld/misc.py:202
+#: ../meld/misc.py:203
 #, python-format
 msgid "Couldn't find colour scheme details for %s-%s; this is a bad install"
 msgstr ""
@@ -2330,7 +2336,7 @@ msgstr ""
 "installation"
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:287
+#: ../meld/misc.py:288
 msgid "[None]"
 msgstr "[Ingen]"
 
@@ -2451,85 +2457,85 @@ msgstr "Inte närvarande"
 
 #. Translators: This error message is shown when a version
 #. control binary isn't installed.
-#: ../meld/vcview.py:255
+#: ../meld/vcview.py:261
 #, python-format
 msgid "%(name)s (%(cmd)s not installed)"
 msgstr "%(name)s (%(cmd)s inte installerad)"
 
 #. Translators: This error message is shown when a version
 #. controlled repository is invalid.
-#: ../meld/vcview.py:259
+#: ../meld/vcview.py:265
 #, python-format
 msgid "%(name)s (Invalid repository)"
 msgstr "%(name)s (Ogiltigt förråd)"
 
-#: ../meld/vcview.py:280
+#: ../meld/vcview.py:286
 msgid "No valid version control system found in this folder"
 msgstr "Inget giltigt versionshanteringssystem hittades i denna mapp"
 
-#: ../meld/vcview.py:282
+#: ../meld/vcview.py:288
 msgid "Only one version control system found in this folder"
 msgstr "Endast ett versionshanteringssystem hittades i denna mapp"
 
-#: ../meld/vcview.py:284
+#: ../meld/vcview.py:290
 msgid "Choose which version control system to use"
 msgstr "Välj vilket versionshanteringssystem som ska användas"
 
 #. TRANSLATORS: This is the location of the directory being viewed
-#: ../meld/vcview.py:337
+#: ../meld/vcview.py:343
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:357
+#: ../meld/vcview.py:363
 #, python-format
 msgid "Scanning %s"
 msgstr "Söker igenom %s"
 
-#: ../meld/vcview.py:396
+#: ../meld/vcview.py:402
 msgid "(Empty)"
 msgstr "(Tom)"
 
-#: ../meld/vcview.py:440
+#: ../meld/vcview.py:446
 #, python-format
 msgid "%s — local"
 msgstr "%s — lokal"
 
-#: ../meld/vcview.py:441
+#: ../meld/vcview.py:447
 #, python-format
 msgid "%s — remote"
 msgstr "%s — fjärr"
 
-#: ../meld/vcview.py:449
+#: ../meld/vcview.py:455
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (lokal, sammanfoga, fjärr)"
 
-#: ../meld/vcview.py:454
+#: ../meld/vcview.py:460
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (fjärr, sammanfoga, lokal)"
 
-#: ../meld/vcview.py:465
+#: ../meld/vcview.py:471
 #, python-format
 msgid "%s — repository"
 msgstr "%s — förråd"
 
-#: ../meld/vcview.py:471
+#: ../meld/vcview.py:477
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (arbetskopia, förråd)"
 
-#: ../meld/vcview.py:475
+#: ../meld/vcview.py:481
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (förråd, arbetskopia)"
 
-#: ../meld/vcview.py:643
+#: ../meld/vcview.py:649
 msgid "Remove folder and all its files?"
 msgstr "Ta bort mapp och dess filer?"
 
-#: ../meld/vcview.py:645
+#: ../meld/vcview.py:651
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2537,12 +2543,12 @@ msgstr ""
 "Det här kommer att ta bort alla markerade filer och mappar samt alla filer i "
 "markerade mappar från versionshantering."
 
-#: ../meld/vcview.py:670
+#: ../meld/vcview.py:676
 #, python-format
 msgid "Error removing %s"
 msgstr "Fel vid borttagning av %s"
 
-#: ../meld/vcview.py:750
+#: ../meld/vcview.py:756
 msgid "Clear"
 msgstr "Töm"
 

From e4f505fa23a0218c9277c55c093a96f8f6371620 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20Mesk=C3=B3?= <meskobalazs@gmail.com>
Date: Mon, 22 Aug 2016 15:35:11 +0000
Subject: [PATCH 24/51] Updated Hungarian translation

---
 po/hu.po | 213 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 107 insertions(+), 106 deletions(-)

diff --git a/po/hu.po b/po/hu.po
index 796375a4..f905ceb7 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -9,16 +9,16 @@ msgstr ""
 "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=meld&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-03-07 23:25+0000\n"
-"PO-Revision-Date: 2016-03-08 00:30+0100\n"
-"Last-Translator: Gabor Kelemen <kelemeng at ubuntu dot com>\n"
+"POT-Creation-Date: 2016-08-20 21:39+0000\n"
+"PO-Revision-Date: 2016-08-22 16:55+0200\n"
+"Last-Translator: Meskó Balázs <meskobalazs@gmail.com>\n"
 "Language-Team: Hungarian <openscope at googlegroups dot com>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.8.8\n"
 
 #: ../bin/meld:144
 msgid "Cannot import: "
@@ -85,6 +85,10 @@ msgstr ""
 "A Meld segít kódváltozások áttekintésében, foltok megértésében és a hatalmas "
 "összefésülési ütközéseket valamivel fájdalommentesebbé teszi."
 
+#: ../data/meld.appdata.xml.in.h:5
+msgid "The GNOME Project"
+msgstr "A GNOME projekt"
+
 #: ../data/mime/meld.xml.in.h:1
 msgid "Meld comparison description"
 msgstr "Meld összehasonlítás-leírás"
@@ -561,7 +565,7 @@ msgstr "Másolás a jobb oldalra"
 msgid "Delete selected"
 msgstr "Kijelölt törlése"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1381
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:860 ../meld/filediff.py:1368
 msgid "Hide"
 msgstr "Elrejtés"
 
@@ -630,7 +634,7 @@ msgid "_Add"
 msgstr "Hozzá_adás"
 
 #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:649
+#: ../meld/vcview.py:655
 msgid "_Remove"
 msgstr "_Eltávolítás"
 
@@ -652,7 +656,7 @@ msgstr "Mozgatás _le"
 
 #. Create icon and filename CellRenderer
 #: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35
-#: ../meld/dirdiff.py:372
+#: ../meld/dirdiff.py:374
 msgid "Name"
 msgstr "Név"
 
@@ -852,8 +856,8 @@ msgstr "Ha nem ment, akkor a változtatások véglegesen elvesznek."
 msgid "Close _without Saving"
 msgstr "Bezárás mentés _nélkül"
 
-#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1447
-#: ../meld/filediff.py:1515
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:942 ../meld/filediff.py:1434
+#: ../meld/filediff.py:1502
 msgid "_Cancel"
 msgstr "Mé_gse"
 
@@ -889,7 +893,7 @@ msgstr "Visszavonja a dokumentumok mentetlen változtatásait?"
 msgid "Changes made to the following documents will be permanently lost:\n"
 msgstr "A következő dokumentumok változásai véglegesen elvesznek:\n"
 
-#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1448
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:943 ../meld/filediff.py:1435
 msgid "_Replace"
 msgstr "_Csere"
 
@@ -1582,7 +1586,7 @@ msgstr "Előző naplók:"
 msgid "Co_mmit"
 msgstr "_Kommit"
 
-#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:337
+#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:343
 msgid "Location"
 msgstr "Hely"
 
@@ -1623,44 +1627,44 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:390 ../meld/preferences.py:82
+#: ../meld/dirdiff.py:392 ../meld/preferences.py:82
 msgid "Size"
 msgstr "Méret"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:398 ../meld/preferences.py:83
+#: ../meld/dirdiff.py:400 ../meld/preferences.py:83
 msgid "Modification time"
 msgstr "Módosítási idő"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:406 ../meld/preferences.py:84
+#: ../meld/dirdiff.py:408 ../meld/preferences.py:84
 msgid "Permissions"
 msgstr "Jogosultságok"
 
-#: ../meld/dirdiff.py:536
+#: ../meld/dirdiff.py:538
 #, python-format
 msgid "Hide %s"
 msgstr "%s elrejtése"
 
-#: ../meld/dirdiff.py:668 ../meld/dirdiff.py:692
+#: ../meld/dirdiff.py:670 ../meld/dirdiff.py:694
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] %s beolvasása"
 
-#: ../meld/dirdiff.py:825
+#: ../meld/dirdiff.py:827
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Kész"
 
-#: ../meld/dirdiff.py:833
+#: ../meld/dirdiff.py:835
 msgid "Folders have no differences"
 msgstr "A mappák közt nincs eltérés"
 
-#: ../meld/dirdiff.py:835
+#: ../meld/dirdiff.py:837
 msgid "Contents of scanned files in folders are identical."
 msgstr "A mappákban vizsgált fájlok tartalma azonos."
 
-#: ../meld/dirdiff.py:837
+#: ../meld/dirdiff.py:839
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1668,42 +1672,42 @@ msgstr ""
 "A mappákban vizsgált fájlok azonosnak tűnnek, de a tartalom nem lett "
 "vizsgálva."
 
-#: ../meld/dirdiff.py:840
+#: ../meld/dirdiff.py:842
 msgid "File filters are in use, so not all files have been scanned."
 msgstr "A fájlszűrők használata miatt nem lett megvizsgálva minden fájl."
 
-#: ../meld/dirdiff.py:842
+#: ../meld/dirdiff.py:844
 msgid "Text filters are in use and may be masking content differences."
 msgstr ""
 "Szöveges szűrők vannak használatban, és elfedhetik a fájlok közti "
 "különbségeket."
 
-#: ../meld/dirdiff.py:860 ../meld/filediff.py:1383 ../meld/filediff.py:1413
-#: ../meld/filediff.py:1415 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122
+#: ../meld/dirdiff.py:862 ../meld/filediff.py:1370 ../meld/filediff.py:1400
+#: ../meld/filediff.py:1402 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122
 msgid "Hi_de"
 msgstr "_Elrejtés"
 
-#: ../meld/dirdiff.py:870
+#: ../meld/dirdiff.py:872
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Több hiba történt a mappa vizsgálatakor"
 
-#: ../meld/dirdiff.py:871
+#: ../meld/dirdiff.py:873
 msgid "Files with invalid encodings found"
 msgstr "Érvénytelen kódolású fájlok találhatók"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:873
+#: ../meld/dirdiff.py:875
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "Egyes fájlok kódolása érvénytelen. A nevek a következők:"
 
-#: ../meld/dirdiff.py:875
+#: ../meld/dirdiff.py:877
 msgid "Files hidden by case insensitive comparison"
 msgstr ""
 "Kis- és nagybetűket meg nem különböztető összehasonlítás által elrejtett "
 "fájlok"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:877
+#: ../meld/dirdiff.py:879
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1711,17 +1715,17 @@ msgstr ""
 "Kis- és nagybetűkre nem érzékeny összehasonlítást futtat nagybetűérzékeny "
 "fájlrendszeren. A mappa alábbi fájljai el lettek rejtve:"
 
-#: ../meld/dirdiff.py:888
+#: ../meld/dirdiff.py:890
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "„%s” rejtve „%s” által"
 
-#: ../meld/dirdiff.py:944
+#: ../meld/dirdiff.py:946
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Cseréli ezt a mappát: „%s”?"
 
-#: ../meld/dirdiff.py:946
+#: ../meld/dirdiff.py:948
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1730,11 +1734,11 @@ msgstr ""
 "Már létezik ugyanilyen nevű mappa itt: „%s”.\n"
 "Ha cseréli a meglévő mappát, akkor minden benne lévő fájl elvész."
 
-#: ../meld/dirdiff.py:959
+#: ../meld/dirdiff.py:961
 msgid "Error copying file"
 msgstr "Hiba a fájl másolásakor"
 
-#: ../meld/dirdiff.py:960
+#: ../meld/dirdiff.py:962
 #, python-format
 msgid ""
 "Couldn't copy %s\n"
@@ -1747,104 +1751,101 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/dirdiff.py:983
+#: ../meld/dirdiff.py:985
 #, python-format
 msgid "Error deleting %s"
 msgstr "Hiba %s törlésekor"
 
-#: ../meld/dirdiff.py:1488
+#: ../meld/dirdiff.py:1492
 msgid "No folder"
 msgstr "Nincs mappa"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:359
+#: ../meld/filediff.py:357
 msgid "INS"
 msgstr "BESZ"
 
-#: ../meld/filediff.py:359
+#: ../meld/filediff.py:357
 msgid "OVR"
 msgstr "ÁTÍR"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:361
+#: ../meld/filediff.py:359
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "%i. sor, %i. oszlop"
 
-#: ../meld/filediff.py:794
+#: ../meld/filediff.py:771
 msgid "Comparison results will be inaccurate"
 msgstr "Az összehasonlítás eredményei pontatlanok lesznek"
 
-#: ../meld/filediff.py:796
-#| msgid ""
-#| "Filter “%s” changed the number of lines in the file, which is "
-#| "unsupported. The comparison will not be accurate."
+#: ../meld/filediff.py:773
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
 msgstr ""
-"Egy szűrő megváltoztatta a fájl sorainak számát, ami nem támogatott. "
-"Az összehasonlítás pontatlan lesz."
+"Egy szűrő megváltoztatta a fájl sorainak számát, ami nem támogatott. Az "
+"összehasonlítás pontatlan lesz."
 
-#: ../meld/filediff.py:854
+#: ../meld/filediff.py:831
 msgid "Mark conflict as resolved?"
 msgstr "Megjelöli az ütközést feloldottként?"
 
-#: ../meld/filediff.py:856
+#: ../meld/filediff.py:833
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
 "Ha az ütközést sikeresen feloldotta, akkor most megjelölheti feloldottként."
 
-#: ../meld/filediff.py:858
+#: ../meld/filediff.py:835
 msgid "Cancel"
 msgstr "Mégse"
 
-#: ../meld/filediff.py:859
+#: ../meld/filediff.py:836
 msgid "Mark _Resolved"
 msgstr "Megjelölés _feloldottként"
 
-#: ../meld/filediff.py:1099
+#: ../meld/filediff.py:1086
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Hiba történt a fájl („%s”) megnyitásakor."
 
-#: ../meld/filediff.py:1107
+#: ../meld/filediff.py:1094
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "%s bináris fájlnak tűnik."
 
-#: ../meld/filediff.py:1109
+#: ../meld/filediff.py:1096
 msgid "Do you want to open the file using the default application?"
 msgstr "Meg szeretné nyitni a fájlt az alapértelmezett alkalmazással?"
 
-#: ../meld/filediff.py:1111
+#: ../meld/filediff.py:1098
 msgid "Open"
 msgstr "Megnyitás"
 
-#: ../meld/filediff.py:1127
+#: ../meld/filediff.py:1114
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Eltérések számítása"
 
-#: ../meld/filediff.py:1192
+#: ../meld/filediff.py:1179
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "%s fájl megváltozott a lemezen"
 
-#: ../meld/filediff.py:1193
+#: ../meld/filediff.py:1180
 msgid "Do you want to reload the file?"
 msgstr "Újratölti a fájlt?"
 
-#: ../meld/filediff.py:1195
+#: ../meld/filediff.py:1182
 msgid "_Reload"
 msgstr "Új_ratöltés"
 
-#: ../meld/filediff.py:1346
+#: ../meld/filediff.py:1333
 msgid "Files are identical"
 msgstr "A fájlok azonosak"
 
-#: ../meld/filediff.py:1359
+#: ../meld/filediff.py:1346
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1852,11 +1853,11 @@ msgstr ""
 "Szöveges szűrők vannak használatban, és elfedhetik a fájlok közti "
 "különbségeket. Szeretné a szűretlen fájlokat összehasonlítani?"
 
-#: ../meld/filediff.py:1364
+#: ../meld/filediff.py:1351
 msgid "Files differ in line endings only"
 msgstr "A fájlok csak a sorvégekben térnek el"
 
-#: ../meld/filediff.py:1366
+#: ../meld/filediff.py:1353
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1865,15 +1866,15 @@ msgstr ""
 "A fájlok azonosak a sorvégjelektől eltekintve:\n"
 "%s"
 
-#: ../meld/filediff.py:1386
+#: ../meld/filediff.py:1373
 msgid "Show without filters"
 msgstr "Megjelenítés szűrők nélkül"
 
-#: ../meld/filediff.py:1408
+#: ../meld/filediff.py:1395
 msgid "Change highlighting incomplete"
 msgstr "Részleges kiemelés módosítása"
 
-#: ../meld/filediff.py:1409
+#: ../meld/filediff.py:1396
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1881,20 +1882,20 @@ msgstr ""
 "Egyes változtatások nincsenek kiemelve, mert túl nagyok. A Meld kiemelheti "
 "ezeket a nagyobb változtatásokat, de lassú lehet."
 
-#: ../meld/filediff.py:1417
+#: ../meld/filediff.py:1404
 msgid "Keep highlighting"
 msgstr "Kiemelés továbbra is"
 
-#: ../meld/filediff.py:1419
+#: ../meld/filediff.py:1406
 msgid "_Keep highlighting"
 msgstr "_Kiemelés továbbra is"
 
-#: ../meld/filediff.py:1451
+#: ../meld/filediff.py:1438
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Cseréli a fájlt: „%s”?"
 
-#: ../meld/filediff.py:1453
+#: ../meld/filediff.py:1440
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -1903,45 +1904,45 @@ msgstr ""
 "Már létezik ilyen nevű fájl itt: „%s”.\n"
 "Ha lecseréli a meglévő fájlt, akkor a tartalma elvész."
 
-#: ../meld/filediff.py:1470
+#: ../meld/filediff.py:1457
 msgid "Save Left Pane As"
 msgstr "Bal ablaktábla mentése másként"
 
-#: ../meld/filediff.py:1472
+#: ../meld/filediff.py:1459
 msgid "Save Middle Pane As"
 msgstr "Középső ablaktábla mentése másként"
 
-#: ../meld/filediff.py:1474
+#: ../meld/filediff.py:1461
 msgid "Save Right Pane As"
 msgstr "Jobb ablaktábla mentése másként"
 
-#: ../meld/filediff.py:1488
+#: ../meld/filediff.py:1475
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "A(z) %s fájl megváltozott a lemezen a megnyitása óta"
 
-#: ../meld/filediff.py:1490
+#: ../meld/filediff.py:1477
 msgid "If you save it, any external changes will be lost."
 msgstr "Ha menti, minden külső változtatás elvész."
 
-#: ../meld/filediff.py:1493
+#: ../meld/filediff.py:1480
 msgid "Save Anyway"
 msgstr "Mentés mindenképp"
 
-#: ../meld/filediff.py:1494
+#: ../meld/filediff.py:1481
 msgid "Don't Save"
 msgstr "Ne mentse"
 
-#: ../meld/filediff.py:1516
+#: ../meld/filediff.py:1503
 msgid "_Save as UTF-8"
 msgstr "Mentés _UTF-8-ként"
 
-#: ../meld/filediff.py:1519
+#: ../meld/filediff.py:1506
 #, python-format
 msgid "Couldn't encode text as “%s”"
 msgstr "Nem kódolható a szöveg mint „%s”"
 
-#: ../meld/filediff.py:1521
+#: ../meld/filediff.py:1508
 #, python-format
 msgid ""
 "File “%s” contains characters that can't be encoded using encoding “%s”.\n"
@@ -1950,12 +1951,12 @@ msgstr ""
 "„%s” a(z) „%s” használatával kódolhatatlan karaktereket tartalmaz.\n"
 "Szeretné UTF-8 kódolással menteni?"
 
-#: ../meld/filediff.py:1558 ../meld/patchdialog.py:125
+#: ../meld/filediff.py:1545 ../meld/patchdialog.py:125
 #, python-format
 msgid "Could not save file %s."
 msgstr "A fájl (%s) nem menthető."
 
-#: ../meld/filediff.py:1559 ../meld/patchdialog.py:126
+#: ../meld/filediff.py:1546 ../meld/patchdialog.py:126
 #, python-format
 msgid ""
 "Couldn't save file due to:\n"
@@ -1964,11 +1965,11 @@ msgstr ""
 "A fájl nem menthető. Ok:\n"
 "%s"
 
-#: ../meld/filediff.py:1905
+#: ../meld/filediff.py:1892
 msgid "Live comparison updating disabled"
 msgstr "Az élő összehasonlítás-frissítés kikapcsolva"
 
-#: ../meld/filediff.py:1906
+#: ../meld/filediff.py:1893
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2083,7 +2084,7 @@ msgid "invalid path or URI \"%s\""
 msgstr "érvénytelen útvonal vagy URI: „%s”"
 
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:127
+#: ../meld/meldbuffer.py:132
 msgid "<unnamed>"
 msgstr "<névtelen>"
 
@@ -2325,13 +2326,13 @@ msgstr "Az automatikus összefésüléshez három fájl kell, érkezett: %r"
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Fájlok és könyvtárak keveréke nem hasonlítható össze."
 
-#: ../meld/misc.py:179
+#: ../meld/misc.py:203
 #, python-format
 msgid "Couldn't find colour scheme details for %s-%s; this is a bad install"
 msgstr "Nem találhatók a színséma adatai ehhez: %s-%s, ez telepítési hiba"
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:264
+#: ../meld/misc.py:288
 msgid "[None]"
 msgstr "[Semmi]"
 
@@ -2452,85 +2453,85 @@ msgstr "Nincs jelen"
 
 #. Translators: This error message is shown when a version
 #. control binary isn't installed.
-#: ../meld/vcview.py:255
+#: ../meld/vcview.py:261
 #, python-format
 msgid "%(name)s (%(cmd)s not installed)"
 msgstr "%(name)s (%(cmd)s nincs telepítve)"
 
 #. Translators: This error message is shown when a version
 #. controlled repository is invalid.
-#: ../meld/vcview.py:259
+#: ../meld/vcview.py:265
 #, python-format
 msgid "%(name)s (Invalid repository)"
 msgstr "%(name)s (Érvénytelen tároló)"
 
-#: ../meld/vcview.py:280
+#: ../meld/vcview.py:286
 msgid "No valid version control system found in this folder"
 msgstr "Nem található használható verziókövető rendszer ebben a mappában"
 
-#: ../meld/vcview.py:282
+#: ../meld/vcview.py:288
 msgid "Only one version control system found in this folder"
 msgstr "Csak egy verziókövető rendszer található ebben a mappában"
 
-#: ../meld/vcview.py:284
+#: ../meld/vcview.py:290
 msgid "Choose which version control system to use"
 msgstr "Válassza ki a használandó verziókövető rendszert"
 
 #. TRANSLATORS: This is the location of the directory being viewed
-#: ../meld/vcview.py:337
+#: ../meld/vcview.py:343
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:357
+#: ../meld/vcview.py:363
 #, python-format
 msgid "Scanning %s"
 msgstr "%s vizsgálata"
 
-#: ../meld/vcview.py:396
+#: ../meld/vcview.py:402
 msgid "(Empty)"
 msgstr "(Üres)"
 
-#: ../meld/vcview.py:440
+#: ../meld/vcview.py:446
 #, python-format
 msgid "%s — local"
 msgstr "%s – helyi"
 
-#: ../meld/vcview.py:441
+#: ../meld/vcview.py:447
 #, python-format
 msgid "%s — remote"
 msgstr "%s – távoli"
 
-#: ../meld/vcview.py:449
+#: ../meld/vcview.py:455
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (helyi, összefésült, távoli)"
 
-#: ../meld/vcview.py:454
+#: ../meld/vcview.py:460
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (távoli, összefésült, helyi)"
 
-#: ../meld/vcview.py:465
+#: ../meld/vcview.py:471
 #, python-format
 msgid "%s — repository"
 msgstr "%s – tároló"
 
-#: ../meld/vcview.py:471
+#: ../meld/vcview.py:477
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (munka, tároló)"
 
-#: ../meld/vcview.py:475
+#: ../meld/vcview.py:481
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (tároló, munka)"
 
-#: ../meld/vcview.py:643
+#: ../meld/vcview.py:649
 msgid "Remove folder and all its files?"
 msgstr "Eltávolítja a mappát és benne minden fájlt?"
 
-#: ../meld/vcview.py:645
+#: ../meld/vcview.py:651
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2538,12 +2539,12 @@ msgstr ""
 "Ez eltávolítja az összes kijelölt fájlt és mappát, valamint minden fájlt a "
 "kijelölt mappákon belül a verziókövetőből."
 
-#: ../meld/vcview.py:670
+#: ../meld/vcview.py:676
 #, python-format
 msgid "Error removing %s"
 msgstr "Hiba %s eltávolításakor"
 
-#: ../meld/vcview.py:750
+#: ../meld/vcview.py:756
 msgid "Clear"
 msgstr "Törlés"
 

From 9115865265e05217f59d71eaabcb0f995a2d6672 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B8=D1=80=D0=BE=D1=81=D0=BB=D0=B0=D0=B2=20=D0=9D?=
 =?UTF-8?q?=D0=B8=D0=BA=D0=BE=D0=BB=D0=B8=D1=9B?=
 <miroslavnikolic@rocketmail.com>
Date: Mon, 22 Aug 2016 21:45:58 +0200
Subject: [PATCH 25/51] Updated Serbian translation

---
 po/sr.po       | 208 ++++++++++++++++++++++++-------------------------
 po/sr@latin.po | 208 ++++++++++++++++++++++++-------------------------
 2 files changed, 208 insertions(+), 208 deletions(-)

diff --git a/po/sr.po b/po/sr.po
index 9c71b093..02014ced 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,8 +1,7 @@
 # Serbian translation of meld
 # Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2016.
 # This file is distributed under the same license as the meld package.
-#
-# Translators: 
+# Translators:
 # Данило Шеган <dsegan@gmx.net>
 # Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011—2016.
 msgid ""
@@ -10,10 +9,10 @@ msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=meld&ke"
 "ywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-03-08 13:36+0000\n"
-"PO-Revision-Date: 2016-03-09 09:19+0200\n"
+"POT-Creation-Date: 2016-08-22 15:35+0000\n"
+"PO-Revision-Date: 2016-08-22 21:12+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"Language-Team: српски <gnome-sr@googlegroups.org>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -87,6 +86,10 @@ msgstr ""
 "Мелд вам помаже да прегледате измене у коду, да разумете закрпе, и огромне "
 "сукобе стапања чини мање болним."
 
+#: ../data/meld.appdata.xml.in.h:5
+msgid "The GNOME Project"
+msgstr "Гномов пројекат"
+
 #: ../data/mime/meld.xml.in.h:1
 msgid "Meld comparison description"
 msgstr "Опис Мелдовог поређења"
@@ -564,7 +567,7 @@ msgstr "Умножите десно"
 msgid "Delete selected"
 msgstr "Обриши изабрано"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1381
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:860 ../meld/filediff.py:1368
 msgid "Hide"
 msgstr "Сакриј"
 
@@ -633,7 +636,7 @@ msgid "_Add"
 msgstr "_Додај"
 
 #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:649
+#: ../meld/vcview.py:655
 msgid "_Remove"
 msgstr "_Уклони"
 
@@ -655,7 +658,7 @@ msgstr "Премести _доле"
 
 #. Create icon and filename CellRenderer
 #: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35
-#: ../meld/dirdiff.py:372
+#: ../meld/dirdiff.py:374
 msgid "Name"
 msgstr "Назив"
 
@@ -855,8 +858,8 @@ msgstr "Ако не сачувате, измене ће бити трајно и
 msgid "Close _without Saving"
 msgstr "Затвори _без чувања"
 
-#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1447
-#: ../meld/filediff.py:1515
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:942 ../meld/filediff.py:1434
+#: ../meld/filediff.py:1502
 msgid "_Cancel"
 msgstr "_Откажи"
 
@@ -893,7 +896,7 @@ msgstr "Да повратим несачуване измене у докуме
 msgid "Changes made to the following documents will be permanently lost:\n"
 msgstr "Измене начињене над следећим документима ће бити трајно изгубљене:\n"
 
-#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1448
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:943 ../meld/filediff.py:1435
 msgid "_Replace"
 msgstr "_Замени"
 
@@ -1585,7 +1588,7 @@ msgstr "Претходни дневници:"
 msgid "Co_mmit"
 msgstr "У_гради"
 
-#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:337
+#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:343
 msgid "Location"
 msgstr "Путања"
 
@@ -1627,44 +1630,44 @@ msgid "Mac OS (CR)"
 msgstr "Мек ОС (CR)"
 
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:390 ../meld/preferences.py:82
+#: ../meld/dirdiff.py:392 ../meld/preferences.py:82
 msgid "Size"
 msgstr "Величина"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:398 ../meld/preferences.py:83
+#: ../meld/dirdiff.py:400 ../meld/preferences.py:83
 msgid "Modification time"
 msgstr "Време измене"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:406 ../meld/preferences.py:84
+#: ../meld/dirdiff.py:408 ../meld/preferences.py:84
 msgid "Permissions"
 msgstr "Овлашћења"
 
-#: ../meld/dirdiff.py:536
+#: ../meld/dirdiff.py:538
 #, python-format
 msgid "Hide %s"
 msgstr "Сакриј „%s“"
 
-#: ../meld/dirdiff.py:668 ../meld/dirdiff.py:692
+#: ../meld/dirdiff.py:670 ../meld/dirdiff.py:694
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] прегледам „%s“"
 
-#: ../meld/dirdiff.py:825
+#: ../meld/dirdiff.py:827
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Готово"
 
-#: ../meld/dirdiff.py:833
+#: ../meld/dirdiff.py:835
 msgid "Folders have no differences"
 msgstr "Фасцикле се не разликују"
 
-#: ../meld/dirdiff.py:835
+#: ../meld/dirdiff.py:837
 msgid "Contents of scanned files in folders are identical."
 msgstr "Садржаји прегледаних датотека у фасциклама су исти."
 
-#: ../meld/dirdiff.py:837
+#: ../meld/dirdiff.py:839
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1672,38 +1675,38 @@ msgstr ""
 "Прегледане датотеке у фасциклама изгледа да су исте, али садржај није "
 "прегледан."
 
-#: ../meld/dirdiff.py:840
+#: ../meld/dirdiff.py:842
 msgid "File filters are in use, so not all files have been scanned."
 msgstr "Филтери датотека су у употреби, тако да нису све датотеке прегледане."
 
-#: ../meld/dirdiff.py:842
+#: ../meld/dirdiff.py:844
 msgid "Text filters are in use and may be masking content differences."
 msgstr "Филтери текста су у употреби и можда су замаскирали разлике садржаја."
 
-#: ../meld/dirdiff.py:860 ../meld/filediff.py:1383 ../meld/filediff.py:1413
-#: ../meld/filediff.py:1415 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122
+#: ../meld/dirdiff.py:862 ../meld/filediff.py:1370 ../meld/filediff.py:1400
+#: ../meld/filediff.py:1402 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122
 msgid "Hi_de"
 msgstr "_Сакриј"
 
-#: ../meld/dirdiff.py:870
+#: ../meld/dirdiff.py:872
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Дошло је до више грешака за време претраживања ове фасцикле"
 
-#: ../meld/dirdiff.py:871
+#: ../meld/dirdiff.py:873
 msgid "Files with invalid encodings found"
 msgstr "Пронађене су датотеке са неисправним кодирањем"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:873
+#: ../meld/dirdiff.py:875
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "Неке датотеке бејаху у неисправном кодирању. Називи су нешто као:"
 
-#: ../meld/dirdiff.py:875
+#: ../meld/dirdiff.py:877
 msgid "Files hidden by case insensitive comparison"
 msgstr "Датотеке скривене поређењем неосетљивим на величину слова"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:877
+#: ../meld/dirdiff.py:879
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1711,17 +1714,17 @@ msgstr ""
 "Покренули сте поређење независно од величине слова на систему датотека где "
 "је она битна. Неке датотеке нису видљиве:"
 
-#: ../meld/dirdiff.py:888
+#: ../meld/dirdiff.py:890
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "„%s“ сакривено од стране „%s“"
 
-#: ../meld/dirdiff.py:944
+#: ../meld/dirdiff.py:946
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Да заменим фасциклу „%s“?"
 
-#: ../meld/dirdiff.py:946
+#: ../meld/dirdiff.py:948
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1730,11 +1733,11 @@ msgstr ""
 "Фасцикла са истим називом већ постоји у „%s“.\n"
 "Ако замените постојећу фасциклу, све датотеке у њој биће изгубљене."
 
-#: ../meld/dirdiff.py:959
+#: ../meld/dirdiff.py:961
 msgid "Error copying file"
 msgstr "Грешка умножавања датотеке"
 
-#: ../meld/dirdiff.py:960
+#: ../meld/dirdiff.py:962
 #, python-format
 msgid ""
 "Couldn't copy %s\n"
@@ -1747,38 +1750,35 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/dirdiff.py:983
+#: ../meld/dirdiff.py:985
 #, python-format
 msgid "Error deleting %s"
 msgstr "Грешка брисања „%s“"
 
-#: ../meld/dirdiff.py:1488
+#: ../meld/dirdiff.py:1492
 msgid "No folder"
 msgstr "Нема фасцикле"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:359
+#: ../meld/filediff.py:357
 msgid "INS"
 msgstr "УМЕТ"
 
-#: ../meld/filediff.py:359
+#: ../meld/filediff.py:357
 msgid "OVR"
 msgstr "ПРЕП"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:361
+#: ../meld/filediff.py:359
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Ред %i, место %i"
 
-#: ../meld/filediff.py:794
+#: ../meld/filediff.py:771
 msgid "Comparison results will be inaccurate"
 msgstr "Резултати поређења биће нетачни"
 
-#: ../meld/filediff.py:796
-#| msgid ""
-#| "Filter “%s” changed the number of lines in the file, which is "
-#| "unsupported. The comparison will not be accurate."
+#: ../meld/filediff.py:773
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1786,64 +1786,64 @@ msgstr ""
 "Филтер је изменио број редова у датотеци, а то није подржано. Поређење неће "
 "бити тачно."
 
-#: ../meld/filediff.py:854
+#: ../meld/filediff.py:831
 msgid "Mark conflict as resolved?"
 msgstr "Да означим сукоб решеним?"
 
-#: ../meld/filediff.py:856
+#: ../meld/filediff.py:833
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr "Ако је сукоб успешно решен, сада га можете означити решеним."
 
-#: ../meld/filediff.py:858
+#: ../meld/filediff.py:835
 msgid "Cancel"
 msgstr "Откажи"
 
-#: ../meld/filediff.py:859
+#: ../meld/filediff.py:836
 msgid "Mark _Resolved"
 msgstr "Означи _решеним"
 
-#: ../meld/filediff.py:1099
+#: ../meld/filediff.py:1086
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Дошло је до проблема отварања датотеке „%s“."
 
-#: ../meld/filediff.py:1107
+#: ../meld/filediff.py:1094
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Изгледа да је „%s“ извршна датотека."
 
-#: ../meld/filediff.py:1109
+#: ../meld/filediff.py:1096
 msgid "Do you want to open the file using the default application?"
 msgstr "Да ли желите да отворите датотеку користећи основни програм?"
 
-#: ../meld/filediff.py:1111
+#: ../meld/filediff.py:1098
 msgid "Open"
 msgstr "Отвори"
 
-#: ../meld/filediff.py:1127
+#: ../meld/filediff.py:1114
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "Срачунавам разлике [%s]"
 
-#: ../meld/filediff.py:1192
+#: ../meld/filediff.py:1179
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Датотека „%s“ је измењена на диску"
 
-#: ../meld/filediff.py:1193
+#: ../meld/filediff.py:1180
 msgid "Do you want to reload the file?"
 msgstr "Да ли желите поново да учитате датотеку?"
 
-#: ../meld/filediff.py:1195
+#: ../meld/filediff.py:1182
 msgid "_Reload"
 msgstr "_Учитај поново"
 
-#: ../meld/filediff.py:1346
+#: ../meld/filediff.py:1333
 msgid "Files are identical"
 msgstr "Датотеке су истоветне"
 
-#: ../meld/filediff.py:1359
+#: ../meld/filediff.py:1346
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1851,11 +1851,11 @@ msgstr ""
 "Коришћени су филтери текста, а могу постојати и замаскиране разлике између "
 "датотека. Да ли желите да поредите неиздвојене датотеке?"
 
-#: ../meld/filediff.py:1364
+#: ../meld/filediff.py:1351
 msgid "Files differ in line endings only"
 msgstr "Датотеке се разликују само по завршецима редова"
 
-#: ../meld/filediff.py:1366
+#: ../meld/filediff.py:1353
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1864,15 +1864,15 @@ msgstr ""
 "Датотеке су истоветне али се разликују само по завршецима редова:\n"
 "%s"
 
-#: ../meld/filediff.py:1386
+#: ../meld/filediff.py:1373
 msgid "Show without filters"
 msgstr "Приказује без филтера"
 
-#: ../meld/filediff.py:1408
+#: ../meld/filediff.py:1395
 msgid "Change highlighting incomplete"
 msgstr "Истицање измена није довршено"
 
-#: ../meld/filediff.py:1409
+#: ../meld/filediff.py:1396
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1880,20 +1880,20 @@ msgstr ""
 "Неке измене нису истакнуте зато што су превелике. Можете да приморате Мелд "
 "да продужи са истицањем већих измена, иако то може бити споро."
 
-#: ../meld/filediff.py:1417
+#: ../meld/filediff.py:1404
 msgid "Keep highlighting"
 msgstr "Задржите истицање"
 
-#: ../meld/filediff.py:1419
+#: ../meld/filediff.py:1406
 msgid "_Keep highlighting"
 msgstr "_Задржи истицање"
 
-#: ../meld/filediff.py:1451
+#: ../meld/filediff.py:1438
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Да заменим датотеку „%s“?"
 
-#: ../meld/filediff.py:1453
+#: ../meld/filediff.py:1440
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -1902,45 +1902,45 @@ msgstr ""
 "Датотека са овим називом већ постоји у „%s“.\n"
 "Ако замените постојећу датотеку, њен садржај биће изгубљен."
 
-#: ../meld/filediff.py:1470
+#: ../meld/filediff.py:1457
 msgid "Save Left Pane As"
 msgstr "Сачувај леву површ као"
 
-#: ../meld/filediff.py:1472
+#: ../meld/filediff.py:1459
 msgid "Save Middle Pane As"
 msgstr "Сачувај средњу површ као"
 
-#: ../meld/filediff.py:1474
+#: ../meld/filediff.py:1461
 msgid "Save Right Pane As"
 msgstr "Сачувај десну површ као"
 
-#: ../meld/filediff.py:1488
+#: ../meld/filediff.py:1475
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Датотека „%s“ је измењена на диску након отварања"
 
-#: ../meld/filediff.py:1490
+#: ../meld/filediff.py:1477
 msgid "If you save it, any external changes will be lost."
 msgstr "Ако је сачувате, све спољне измене ће бити изгубљене."
 
-#: ../meld/filediff.py:1493
+#: ../meld/filediff.py:1480
 msgid "Save Anyway"
 msgstr "Ипак сачувај"
 
-#: ../meld/filediff.py:1494
+#: ../meld/filediff.py:1481
 msgid "Don't Save"
 msgstr "Немој чувати"
 
-#: ../meld/filediff.py:1516
+#: ../meld/filediff.py:1503
 msgid "_Save as UTF-8"
 msgstr "_Сачувај као УТФ-8"
 
-#: ../meld/filediff.py:1519
+#: ../meld/filediff.py:1506
 #, python-format
 msgid "Couldn't encode text as “%s”"
 msgstr "Не могу да кодирам текст као „%s“"
 
-#: ../meld/filediff.py:1521
+#: ../meld/filediff.py:1508
 #, python-format
 msgid ""
 "File “%s” contains characters that can't be encoded using encoding “%s”.\n"
@@ -1949,12 +1949,12 @@ msgstr ""
 "„%s“ садржи знакове који се не могу кодирати употребом кодирања „%s“\n"
 "Да ли желите да сачувате као УТФ-8?"
 
-#: ../meld/filediff.py:1558 ../meld/patchdialog.py:125
+#: ../meld/filediff.py:1545 ../meld/patchdialog.py:125
 #, python-format
 msgid "Could not save file %s."
 msgstr "Не могу да сачувам датотеку „%s“."
 
-#: ../meld/filediff.py:1559 ../meld/patchdialog.py:126
+#: ../meld/filediff.py:1546 ../meld/patchdialog.py:126
 #, python-format
 msgid ""
 "Couldn't save file due to:\n"
@@ -1963,11 +1963,11 @@ msgstr ""
 "Не могу да сачувам датотеку због следећег:\n"
 "%s"
 
-#: ../meld/filediff.py:1905
+#: ../meld/filediff.py:1892
 msgid "Live comparison updating disabled"
 msgstr "Искључено је живо ажурирање поређења"
 
-#: ../meld/filediff.py:1906
+#: ../meld/filediff.py:1893
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2083,7 +2083,7 @@ msgid "invalid path or URI \"%s\""
 msgstr "неисправна путања или адреса „%s“"
 
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:127
+#: ../meld/meldbuffer.py:132
 msgid "<unnamed>"
 msgstr "<неименован>"
 
@@ -2324,14 +2324,14 @@ msgstr "Потребне су три датотеке за само-спајањ
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Не могу да поредим мешавину датотека и фасцикли"
 
-#: ../meld/misc.py:179
+#: ../meld/misc.py:203
 #, python-format
 msgid "Couldn't find colour scheme details for %s-%s; this is a bad install"
 msgstr ""
 "Не могу да нађем појединости шеме боје за „%s-%s“; јер је лоше инсталирана"
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:264
+#: ../meld/misc.py:288
 msgid "[None]"
 msgstr "[ништа]"
 
@@ -2456,85 +2456,85 @@ msgstr "Није присутно"
 
 #. Translators: This error message is shown when a version
 #. control binary isn't installed.
-#: ../meld/vcview.py:255
+#: ../meld/vcview.py:261
 #, python-format
 msgid "%(name)s (%(cmd)s not installed)"
 msgstr "%(name)s („%(cmd)s“ није инсталирана)"
 
 #. Translators: This error message is shown when a version
 #. controlled repository is invalid.
-#: ../meld/vcview.py:259
+#: ../meld/vcview.py:265
 #, python-format
 msgid "%(name)s (Invalid repository)"
 msgstr "%(name)s (Неисправна ризница)"
 
-#: ../meld/vcview.py:280
+#: ../meld/vcview.py:286
 msgid "No valid version control system found in this folder"
 msgstr "У овој фасцикли није пронађен исправан систем управљања издањем"
 
-#: ../meld/vcview.py:282
+#: ../meld/vcview.py:288
 msgid "Only one version control system found in this folder"
 msgstr "У овој фасцикли је пронађен само један систем управљања издањем"
 
-#: ../meld/vcview.py:284
+#: ../meld/vcview.py:290
 msgid "Choose which version control system to use"
 msgstr "Изаберите који систем управљања издањем ће бити коришћен"
 
 #. TRANSLATORS: This is the location of the directory being viewed
-#: ../meld/vcview.py:337
+#: ../meld/vcview.py:343
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:357
+#: ../meld/vcview.py:363
 #, python-format
 msgid "Scanning %s"
 msgstr "Прегледам „%s“"
 
-#: ../meld/vcview.py:396
+#: ../meld/vcview.py:402
 msgid "(Empty)"
 msgstr "(Празно)"
 
-#: ../meld/vcview.py:440
+#: ../meld/vcview.py:446
 #, python-format
 msgid "%s — local"
 msgstr "%s — месна"
 
-#: ../meld/vcview.py:441
+#: ../meld/vcview.py:447
 #, python-format
 msgid "%s — remote"
 msgstr "%s — удаљена"
 
-#: ../meld/vcview.py:449
+#: ../meld/vcview.py:455
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (месна, спојена, удаљена)"
 
-#: ../meld/vcview.py:454
+#: ../meld/vcview.py:460
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (удаљена, спојена, месна)"
 
-#: ../meld/vcview.py:465
+#: ../meld/vcview.py:471
 #, python-format
 msgid "%s — repository"
 msgstr "%s — ризница"
 
-#: ../meld/vcview.py:471
+#: ../meld/vcview.py:477
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (радна, ризница)"
 
-#: ../meld/vcview.py:475
+#: ../meld/vcview.py:481
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (ризница, радна)"
 
-#: ../meld/vcview.py:643
+#: ../meld/vcview.py:649
 msgid "Remove folder and all its files?"
 msgstr "Да уклоним фасциклу и све њене датотеке?"
 
-#: ../meld/vcview.py:645
+#: ../meld/vcview.py:651
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2542,12 +2542,12 @@ msgstr ""
 "Ово ће уклонити све изабране датотеке и фасцикле, и све датотеке унутар свих "
 "изабраних фасцикли, из управљања издањем."
 
-#: ../meld/vcview.py:670
+#: ../meld/vcview.py:676
 #, python-format
 msgid "Error removing %s"
 msgstr "Грешка при уклањању „%s“"
 
-#: ../meld/vcview.py:750
+#: ../meld/vcview.py:756
 msgid "Clear"
 msgstr "Очисти"
 
diff --git a/po/sr@latin.po b/po/sr@latin.po
index de30f9d5..087f83ac 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -1,8 +1,7 @@
 # Serbian translation of meld
 # Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2016.
 # This file is distributed under the same license as the meld package.
-#
-# Translators: 
+# Translators:
 # Danilo Šegan <dsegan@gmx.net>
 # Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2011—2016.
 msgid ""
@@ -10,10 +9,10 @@ msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=meld&ke"
 "ywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-03-08 13:36+0000\n"
-"PO-Revision-Date: 2016-03-09 09:19+0200\n"
+"POT-Creation-Date: 2016-08-22 15:35+0000\n"
+"PO-Revision-Date: 2016-08-22 21:12+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"Language-Team: srpski <gnome-sr@googlegroups.org>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -87,6 +86,10 @@ msgstr ""
 "Meld vam pomaže da pregledate izmene u kodu, da razumete zakrpe, i ogromne "
 "sukobe stapanja čini manje bolnim."
 
+#: ../data/meld.appdata.xml.in.h:5
+msgid "The GNOME Project"
+msgstr "Gnomov projekat"
+
 #: ../data/mime/meld.xml.in.h:1
 msgid "Meld comparison description"
 msgstr "Opis Meldovog poređenja"
@@ -564,7 +567,7 @@ msgstr "Umnožite desno"
 msgid "Delete selected"
 msgstr "Obriši izabrano"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1381
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:860 ../meld/filediff.py:1368
 msgid "Hide"
 msgstr "Sakrij"
 
@@ -633,7 +636,7 @@ msgid "_Add"
 msgstr "_Dodaj"
 
 #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:649
+#: ../meld/vcview.py:655
 msgid "_Remove"
 msgstr "_Ukloni"
 
@@ -655,7 +658,7 @@ msgstr "Premesti _dole"
 
 #. Create icon and filename CellRenderer
 #: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35
-#: ../meld/dirdiff.py:372
+#: ../meld/dirdiff.py:374
 msgid "Name"
 msgstr "Naziv"
 
@@ -855,8 +858,8 @@ msgstr "Ako ne sačuvate, izmene će biti trajno izgubljene."
 msgid "Close _without Saving"
 msgstr "Zatvori _bez čuvanja"
 
-#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1447
-#: ../meld/filediff.py:1515
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:942 ../meld/filediff.py:1434
+#: ../meld/filediff.py:1502
 msgid "_Cancel"
 msgstr "_Otkaži"
 
@@ -893,7 +896,7 @@ msgstr "Da povratim nesačuvane izmene u dokumentima?"
 msgid "Changes made to the following documents will be permanently lost:\n"
 msgstr "Izmene načinjene nad sledećim dokumentima će biti trajno izgubljene:\n"
 
-#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1448
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:943 ../meld/filediff.py:1435
 msgid "_Replace"
 msgstr "_Zameni"
 
@@ -1585,7 +1588,7 @@ msgstr "Prethodni dnevnici:"
 msgid "Co_mmit"
 msgstr "U_gradi"
 
-#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:337
+#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:343
 msgid "Location"
 msgstr "Putanja"
 
@@ -1627,44 +1630,44 @@ msgid "Mac OS (CR)"
 msgstr "Mek OS (CR)"
 
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:390 ../meld/preferences.py:82
+#: ../meld/dirdiff.py:392 ../meld/preferences.py:82
 msgid "Size"
 msgstr "Veličina"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:398 ../meld/preferences.py:83
+#: ../meld/dirdiff.py:400 ../meld/preferences.py:83
 msgid "Modification time"
 msgstr "Vreme izmene"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:406 ../meld/preferences.py:84
+#: ../meld/dirdiff.py:408 ../meld/preferences.py:84
 msgid "Permissions"
 msgstr "Ovlašćenja"
 
-#: ../meld/dirdiff.py:536
+#: ../meld/dirdiff.py:538
 #, python-format
 msgid "Hide %s"
 msgstr "Sakrij „%s“"
 
-#: ../meld/dirdiff.py:668 ../meld/dirdiff.py:692
+#: ../meld/dirdiff.py:670 ../meld/dirdiff.py:694
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] pregledam „%s“"
 
-#: ../meld/dirdiff.py:825
+#: ../meld/dirdiff.py:827
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Gotovo"
 
-#: ../meld/dirdiff.py:833
+#: ../meld/dirdiff.py:835
 msgid "Folders have no differences"
 msgstr "Fascikle se ne razlikuju"
 
-#: ../meld/dirdiff.py:835
+#: ../meld/dirdiff.py:837
 msgid "Contents of scanned files in folders are identical."
 msgstr "Sadržaji pregledanih datoteka u fasciklama su isti."
 
-#: ../meld/dirdiff.py:837
+#: ../meld/dirdiff.py:839
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1672,38 +1675,38 @@ msgstr ""
 "Pregledane datoteke u fasciklama izgleda da su iste, ali sadržaj nije "
 "pregledan."
 
-#: ../meld/dirdiff.py:840
+#: ../meld/dirdiff.py:842
 msgid "File filters are in use, so not all files have been scanned."
 msgstr "Filteri datoteka su u upotrebi, tako da nisu sve datoteke pregledane."
 
-#: ../meld/dirdiff.py:842
+#: ../meld/dirdiff.py:844
 msgid "Text filters are in use and may be masking content differences."
 msgstr "Filteri teksta su u upotrebi i možda su zamaskirali razlike sadržaja."
 
-#: ../meld/dirdiff.py:860 ../meld/filediff.py:1383 ../meld/filediff.py:1413
-#: ../meld/filediff.py:1415 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122
+#: ../meld/dirdiff.py:862 ../meld/filediff.py:1370 ../meld/filediff.py:1400
+#: ../meld/filediff.py:1402 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122
 msgid "Hi_de"
 msgstr "_Sakrij"
 
-#: ../meld/dirdiff.py:870
+#: ../meld/dirdiff.py:872
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Došlo je do više grešaka za vreme pretraživanja ove fascikle"
 
-#: ../meld/dirdiff.py:871
+#: ../meld/dirdiff.py:873
 msgid "Files with invalid encodings found"
 msgstr "Pronađene su datoteke sa neispravnim kodiranjem"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:873
+#: ../meld/dirdiff.py:875
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "Neke datoteke bejahu u neispravnom kodiranju. Nazivi su nešto kao:"
 
-#: ../meld/dirdiff.py:875
+#: ../meld/dirdiff.py:877
 msgid "Files hidden by case insensitive comparison"
 msgstr "Datoteke skrivene poređenjem neosetljivim na veličinu slova"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:877
+#: ../meld/dirdiff.py:879
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1711,17 +1714,17 @@ msgstr ""
 "Pokrenuli ste poređenje nezavisno od veličine slova na sistemu datoteka gde "
 "je ona bitna. Neke datoteke nisu vidljive:"
 
-#: ../meld/dirdiff.py:888
+#: ../meld/dirdiff.py:890
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "„%s“ sakriveno od strane „%s“"
 
-#: ../meld/dirdiff.py:944
+#: ../meld/dirdiff.py:946
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Da zamenim fasciklu „%s“?"
 
-#: ../meld/dirdiff.py:946
+#: ../meld/dirdiff.py:948
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1730,11 +1733,11 @@ msgstr ""
 "Fascikla sa istim nazivom već postoji u „%s“.\n"
 "Ako zamenite postojeću fasciklu, sve datoteke u njoj biće izgubljene."
 
-#: ../meld/dirdiff.py:959
+#: ../meld/dirdiff.py:961
 msgid "Error copying file"
 msgstr "Greška umnožavanja datoteke"
 
-#: ../meld/dirdiff.py:960
+#: ../meld/dirdiff.py:962
 #, python-format
 msgid ""
 "Couldn't copy %s\n"
@@ -1747,38 +1750,35 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/dirdiff.py:983
+#: ../meld/dirdiff.py:985
 #, python-format
 msgid "Error deleting %s"
 msgstr "Greška brisanja „%s“"
 
-#: ../meld/dirdiff.py:1488
+#: ../meld/dirdiff.py:1492
 msgid "No folder"
 msgstr "Nema fascikle"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:359
+#: ../meld/filediff.py:357
 msgid "INS"
 msgstr "UMET"
 
-#: ../meld/filediff.py:359
+#: ../meld/filediff.py:357
 msgid "OVR"
 msgstr "PREP"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:361
+#: ../meld/filediff.py:359
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Red %i, mesto %i"
 
-#: ../meld/filediff.py:794
+#: ../meld/filediff.py:771
 msgid "Comparison results will be inaccurate"
 msgstr "Rezultati poređenja biće netačni"
 
-#: ../meld/filediff.py:796
-#| msgid ""
-#| "Filter “%s” changed the number of lines in the file, which is "
-#| "unsupported. The comparison will not be accurate."
+#: ../meld/filediff.py:773
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1786,64 +1786,64 @@ msgstr ""
 "Filter je izmenio broj redova u datoteci, a to nije podržano. Poređenje neće "
 "biti tačno."
 
-#: ../meld/filediff.py:854
+#: ../meld/filediff.py:831
 msgid "Mark conflict as resolved?"
 msgstr "Da označim sukob rešenim?"
 
-#: ../meld/filediff.py:856
+#: ../meld/filediff.py:833
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr "Ako je sukob uspešno rešen, sada ga možete označiti rešenim."
 
-#: ../meld/filediff.py:858
+#: ../meld/filediff.py:835
 msgid "Cancel"
 msgstr "Otkaži"
 
-#: ../meld/filediff.py:859
+#: ../meld/filediff.py:836
 msgid "Mark _Resolved"
 msgstr "Označi _rešenim"
 
-#: ../meld/filediff.py:1099
+#: ../meld/filediff.py:1086
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Došlo je do problema otvaranja datoteke „%s“."
 
-#: ../meld/filediff.py:1107
+#: ../meld/filediff.py:1094
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Izgleda da je „%s“ izvršna datoteka."
 
-#: ../meld/filediff.py:1109
+#: ../meld/filediff.py:1096
 msgid "Do you want to open the file using the default application?"
 msgstr "Da li želite da otvorite datoteku koristeći osnovni program?"
 
-#: ../meld/filediff.py:1111
+#: ../meld/filediff.py:1098
 msgid "Open"
 msgstr "Otvori"
 
-#: ../meld/filediff.py:1127
+#: ../meld/filediff.py:1114
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "Sračunavam razlike [%s]"
 
-#: ../meld/filediff.py:1192
+#: ../meld/filediff.py:1179
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Datoteka „%s“ je izmenjena na disku"
 
-#: ../meld/filediff.py:1193
+#: ../meld/filediff.py:1180
 msgid "Do you want to reload the file?"
 msgstr "Da li želite ponovo da učitate datoteku?"
 
-#: ../meld/filediff.py:1195
+#: ../meld/filediff.py:1182
 msgid "_Reload"
 msgstr "_Učitaj ponovo"
 
-#: ../meld/filediff.py:1346
+#: ../meld/filediff.py:1333
 msgid "Files are identical"
 msgstr "Datoteke su istovetne"
 
-#: ../meld/filediff.py:1359
+#: ../meld/filediff.py:1346
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1851,11 +1851,11 @@ msgstr ""
 "Korišćeni su filteri teksta, a mogu postojati i zamaskirane razlike između "
 "datoteka. Da li želite da poredite neizdvojene datoteke?"
 
-#: ../meld/filediff.py:1364
+#: ../meld/filediff.py:1351
 msgid "Files differ in line endings only"
 msgstr "Datoteke se razlikuju samo po završecima redova"
 
-#: ../meld/filediff.py:1366
+#: ../meld/filediff.py:1353
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1864,15 +1864,15 @@ msgstr ""
 "Datoteke su istovetne ali se razlikuju samo po završecima redova:\n"
 "%s"
 
-#: ../meld/filediff.py:1386
+#: ../meld/filediff.py:1373
 msgid "Show without filters"
 msgstr "Prikazuje bez filtera"
 
-#: ../meld/filediff.py:1408
+#: ../meld/filediff.py:1395
 msgid "Change highlighting incomplete"
 msgstr "Isticanje izmena nije dovršeno"
 
-#: ../meld/filediff.py:1409
+#: ../meld/filediff.py:1396
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1880,20 +1880,20 @@ msgstr ""
 "Neke izmene nisu istaknute zato što su prevelike. Možete da primorate Meld "
 "da produži sa isticanjem većih izmena, iako to može biti sporo."
 
-#: ../meld/filediff.py:1417
+#: ../meld/filediff.py:1404
 msgid "Keep highlighting"
 msgstr "Zadržite isticanje"
 
-#: ../meld/filediff.py:1419
+#: ../meld/filediff.py:1406
 msgid "_Keep highlighting"
 msgstr "_Zadrži isticanje"
 
-#: ../meld/filediff.py:1451
+#: ../meld/filediff.py:1438
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Da zamenim datoteku „%s“?"
 
-#: ../meld/filediff.py:1453
+#: ../meld/filediff.py:1440
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -1902,45 +1902,45 @@ msgstr ""
 "Datoteka sa ovim nazivom već postoji u „%s“.\n"
 "Ako zamenite postojeću datoteku, njen sadržaj biće izgubljen."
 
-#: ../meld/filediff.py:1470
+#: ../meld/filediff.py:1457
 msgid "Save Left Pane As"
 msgstr "Sačuvaj levu površ kao"
 
-#: ../meld/filediff.py:1472
+#: ../meld/filediff.py:1459
 msgid "Save Middle Pane As"
 msgstr "Sačuvaj srednju površ kao"
 
-#: ../meld/filediff.py:1474
+#: ../meld/filediff.py:1461
 msgid "Save Right Pane As"
 msgstr "Sačuvaj desnu površ kao"
 
-#: ../meld/filediff.py:1488
+#: ../meld/filediff.py:1475
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Datoteka „%s“ je izmenjena na disku nakon otvaranja"
 
-#: ../meld/filediff.py:1490
+#: ../meld/filediff.py:1477
 msgid "If you save it, any external changes will be lost."
 msgstr "Ako je sačuvate, sve spoljne izmene će biti izgubljene."
 
-#: ../meld/filediff.py:1493
+#: ../meld/filediff.py:1480
 msgid "Save Anyway"
 msgstr "Ipak sačuvaj"
 
-#: ../meld/filediff.py:1494
+#: ../meld/filediff.py:1481
 msgid "Don't Save"
 msgstr "Nemoj čuvati"
 
-#: ../meld/filediff.py:1516
+#: ../meld/filediff.py:1503
 msgid "_Save as UTF-8"
 msgstr "_Sačuvaj kao UTF-8"
 
-#: ../meld/filediff.py:1519
+#: ../meld/filediff.py:1506
 #, python-format
 msgid "Couldn't encode text as “%s”"
 msgstr "Ne mogu da kodiram tekst kao „%s“"
 
-#: ../meld/filediff.py:1521
+#: ../meld/filediff.py:1508
 #, python-format
 msgid ""
 "File “%s” contains characters that can't be encoded using encoding “%s”.\n"
@@ -1949,12 +1949,12 @@ msgstr ""
 "„%s“ sadrži znakove koji se ne mogu kodirati upotrebom kodiranja „%s“\n"
 "Da li želite da sačuvate kao UTF-8?"
 
-#: ../meld/filediff.py:1558 ../meld/patchdialog.py:125
+#: ../meld/filediff.py:1545 ../meld/patchdialog.py:125
 #, python-format
 msgid "Could not save file %s."
 msgstr "Ne mogu da sačuvam datoteku „%s“."
 
-#: ../meld/filediff.py:1559 ../meld/patchdialog.py:126
+#: ../meld/filediff.py:1546 ../meld/patchdialog.py:126
 #, python-format
 msgid ""
 "Couldn't save file due to:\n"
@@ -1963,11 +1963,11 @@ msgstr ""
 "Ne mogu da sačuvam datoteku zbog sledećeg:\n"
 "%s"
 
-#: ../meld/filediff.py:1905
+#: ../meld/filediff.py:1892
 msgid "Live comparison updating disabled"
 msgstr "Isključeno je živo ažuriranje poređenja"
 
-#: ../meld/filediff.py:1906
+#: ../meld/filediff.py:1893
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2083,7 +2083,7 @@ msgid "invalid path or URI \"%s\""
 msgstr "neispravna putanja ili adresa „%s“"
 
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:127
+#: ../meld/meldbuffer.py:132
 msgid "<unnamed>"
 msgstr "<neimenovan>"
 
@@ -2324,14 +2324,14 @@ msgstr "Potrebne su tri datoteke za samo-spajanje, dobih: %r"
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Ne mogu da poredim mešavinu datoteka i fascikli"
 
-#: ../meld/misc.py:179
+#: ../meld/misc.py:203
 #, python-format
 msgid "Couldn't find colour scheme details for %s-%s; this is a bad install"
 msgstr ""
 "Ne mogu da nađem pojedinosti šeme boje za „%s-%s“; jer je loše instalirana"
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:264
+#: ../meld/misc.py:288
 msgid "[None]"
 msgstr "[ništa]"
 
@@ -2456,85 +2456,85 @@ msgstr "Nije prisutno"
 
 #. Translators: This error message is shown when a version
 #. control binary isn't installed.
-#: ../meld/vcview.py:255
+#: ../meld/vcview.py:261
 #, python-format
 msgid "%(name)s (%(cmd)s not installed)"
 msgstr "%(name)s („%(cmd)s“ nije instalirana)"
 
 #. Translators: This error message is shown when a version
 #. controlled repository is invalid.
-#: ../meld/vcview.py:259
+#: ../meld/vcview.py:265
 #, python-format
 msgid "%(name)s (Invalid repository)"
 msgstr "%(name)s (Neispravna riznica)"
 
-#: ../meld/vcview.py:280
+#: ../meld/vcview.py:286
 msgid "No valid version control system found in this folder"
 msgstr "U ovoj fascikli nije pronađen ispravan sistem upravljanja izdanjem"
 
-#: ../meld/vcview.py:282
+#: ../meld/vcview.py:288
 msgid "Only one version control system found in this folder"
 msgstr "U ovoj fascikli je pronađen samo jedan sistem upravljanja izdanjem"
 
-#: ../meld/vcview.py:284
+#: ../meld/vcview.py:290
 msgid "Choose which version control system to use"
 msgstr "Izaberite koji sistem upravljanja izdanjem će biti korišćen"
 
 #. TRANSLATORS: This is the location of the directory being viewed
-#: ../meld/vcview.py:337
+#: ../meld/vcview.py:343
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:357
+#: ../meld/vcview.py:363
 #, python-format
 msgid "Scanning %s"
 msgstr "Pregledam „%s“"
 
-#: ../meld/vcview.py:396
+#: ../meld/vcview.py:402
 msgid "(Empty)"
 msgstr "(Prazno)"
 
-#: ../meld/vcview.py:440
+#: ../meld/vcview.py:446
 #, python-format
 msgid "%s — local"
 msgstr "%s — mesna"
 
-#: ../meld/vcview.py:441
+#: ../meld/vcview.py:447
 #, python-format
 msgid "%s — remote"
 msgstr "%s — udaljena"
 
-#: ../meld/vcview.py:449
+#: ../meld/vcview.py:455
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (mesna, spojena, udaljena)"
 
-#: ../meld/vcview.py:454
+#: ../meld/vcview.py:460
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (udaljena, spojena, mesna)"
 
-#: ../meld/vcview.py:465
+#: ../meld/vcview.py:471
 #, python-format
 msgid "%s — repository"
 msgstr "%s — riznica"
 
-#: ../meld/vcview.py:471
+#: ../meld/vcview.py:477
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (radna, riznica)"
 
-#: ../meld/vcview.py:475
+#: ../meld/vcview.py:481
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (riznica, radna)"
 
-#: ../meld/vcview.py:643
+#: ../meld/vcview.py:649
 msgid "Remove folder and all its files?"
 msgstr "Da uklonim fasciklu i sve njene datoteke?"
 
-#: ../meld/vcview.py:645
+#: ../meld/vcview.py:651
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2542,12 +2542,12 @@ msgstr ""
 "Ovo će ukloniti sve izabrane datoteke i fascikle, i sve datoteke unutar svih "
 "izabranih fascikli, iz upravljanja izdanjem."
 
-#: ../meld/vcview.py:670
+#: ../meld/vcview.py:676
 #, python-format
 msgid "Error removing %s"
 msgstr "Greška pri uklanjanju „%s“"
 
-#: ../meld/vcview.py:750
+#: ../meld/vcview.py:756
 msgid "Clear"
 msgstr "Očisti"
 

From 67501ce5c7ca6e70971205bf13521860ca1c37f4 Mon Sep 17 00:00:00 2001
From: Tiago Santos <tiagofsantos81@sapo.pt>
Date: Tue, 23 Aug 2016 17:00:52 +0000
Subject: [PATCH 26/51] Updated Portuguese translation

---
 po/pt.po | 112 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 58 insertions(+), 54 deletions(-)

diff --git a/po/pt.po b/po/pt.po
index c6e2c165..f1c22302 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: 2.6\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=meld&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-08-13 10:48+0000\n"
-"PO-Revision-Date: 2016-08-14 22:28+0100\n"
+"POT-Creation-Date: 2016-08-22 15:35+0000\n"
+"PO-Revision-Date: 2016-08-23 17:58+0100\n"
 "Last-Translator: Tiago Santos <tiagofsantos81@sapo.pt>\n"
 "Language-Team: Duarte Loreto <happyguy_pt@hotmail.com>\n"
 "Language: pt\n"
@@ -86,6 +86,10 @@ msgstr ""
 "O Meld ajuda-o a rever alterações de código, a compreender patches e a "
 "tornar enormes conflitos de união em algo menos doloroso."
 
+#: ../data/meld.appdata.xml.in.h:5
+msgid "The GNOME Project"
+msgstr "O Projeto GNOME"
+
 #: ../data/mime/meld.xml.in.h:1
 msgid "Meld comparison description"
 msgstr "Descrição da comparação do Meld"
@@ -524,7 +528,7 @@ msgstr "_Preferências"
 
 #: ../data/ui/application.ui.h:7
 msgid "_Help"
-msgstr "Aj_Uda"
+msgstr "Aj_uda"
 
 #: ../data/ui/application.ui.h:8
 msgid "Keyboard Shortcuts"
@@ -548,7 +552,7 @@ msgstr "Comparar ficheiros selecionados"
 
 #: ../data/ui/dirdiff.ui.h:3
 msgid "Copy to _Left"
-msgstr "Copiar para a _Esquerda"
+msgstr "Copiar para a _esquerda"
 
 #: ../data/ui/dirdiff.ui.h:4
 msgid "Copy to left"
@@ -556,7 +560,7 @@ msgstr "Copiar para a esquerda"
 
 #: ../data/ui/dirdiff.ui.h:5
 msgid "Copy to _Right"
-msgstr "Copiar para a _Direita"
+msgstr "Copiar para a _direita"
 
 #: ../data/ui/dirdiff.ui.h:6
 msgid "Copy to right"
@@ -635,7 +639,7 @@ msgid "_Add"
 msgstr "_Adicionar"
 
 #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:649
+#: ../meld/vcview.py:655
 msgid "_Remove"
 msgstr "_Remover"
 
@@ -645,7 +649,7 @@ msgstr "Mover item para cima"
 
 #: ../data/ui/EditableList.ui.h:7
 msgid "Move _Up"
-msgstr "Mover para _Cima"
+msgstr "Mover para _cima"
 
 #: ../data/ui/EditableList.ui.h:8
 msgid "Move item down"
@@ -653,7 +657,7 @@ msgstr "Mover item para baixo"
 
 #: ../data/ui/EditableList.ui.h:9
 msgid "Move _Down"
-msgstr "Mover para _Baixo"
+msgstr "Mover para _baixo"
 
 #. Create icon and filename CellRenderer
 #: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35
@@ -857,7 +861,7 @@ msgstr "Se não gravar, as alterações serão irremediavelmente perdidas."
 
 #: ../data/ui/filediff.ui.h:46
 msgid "Close _without Saving"
-msgstr "Fechar sem gra_Var"
+msgstr "Fechar sem gra_var"
 
 #: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:942 ../meld/filediff.py:1434
 #: ../meld/filediff.py:1502
@@ -928,11 +932,11 @@ msgstr "_Comparar maiúsculas"
 
 #: ../data/ui/findbar.ui.h:8
 msgid "Who_le word"
-msgstr "Pa_Lavra completa"
+msgstr "Pa_lavra completa"
 
 #: ../data/ui/findbar.ui.h:9
 msgid "Regular e_xpression"
-msgstr "E_Xpressão regular"
+msgstr "E_xpressão regular"
 
 #: ../data/ui/findbar.ui.h:10
 msgid "Wrapped"
@@ -1012,7 +1016,7 @@ msgstr "_Usar a letra de largura fixa do sistema"
 
 #: ../data/ui/preferences.ui.h:12
 msgid "_Editor font:"
-msgstr "Letra do _Editor"
+msgstr "Letra do _editor"
 
 #: ../data/ui/preferences.ui.h:13
 msgid "Display"
@@ -1020,7 +1024,7 @@ msgstr "Ecrã"
 
 #: ../data/ui/preferences.ui.h:14
 msgid "_Tab width:"
-msgstr "Largura do se_Parador:"
+msgstr "Largura do se_parador:"
 
 #: ../data/ui/preferences.ui.h:15
 msgid "_Insert spaces instead of tabs"
@@ -1028,11 +1032,11 @@ msgstr "_Inserir espaços em vez de tabulações"
 
 #: ../data/ui/preferences.ui.h:16
 msgid "Enable text _wrapping"
-msgstr "Permitir ajuste de _Texto"
+msgstr "Permitir ajuste de _texto"
 
 #: ../data/ui/preferences.ui.h:17
 msgid "Do not _split words over two lines"
-msgstr "Não dividir palavra_S em duas linhas"
+msgstr "Não dividir palavra_s em duas linhas"
 
 #: ../data/ui/preferences.ui.h:18
 msgid "Highlight _current line"
@@ -1040,11 +1044,11 @@ msgstr "Realçar _Linha atual"
 
 #: ../data/ui/preferences.ui.h:19
 msgid "Show _line numbers"
-msgstr "Mostrar _Números de linha"
+msgstr "Mostrar _números de linha"
 
 #: ../data/ui/preferences.ui.h:20
 msgid "Show w_hitespace"
-msgstr "Mostrar símbolos nos espaços em _Branco"
+msgstr "Mostrar símbolos nos espaços em _branco"
 
 #: ../data/ui/preferences.ui.h:21
 msgid "Use s_yntax highlighting"
@@ -1064,7 +1068,7 @@ msgstr "Usar editor pre_Definido do sistema"
 
 #: ../data/ui/preferences.ui.h:25
 msgid "Edito_r command:"
-msgstr "Comando do edito_R:"
+msgstr "Comando do edito_r:"
 
 #: ../data/ui/preferences.ui.h:26
 msgid "Editor"
@@ -1076,7 +1080,7 @@ msgstr "Comparação rasa"
 
 #: ../data/ui/preferences.ui.h:28
 msgid "C_ompare files based only on size and timestamp"
-msgstr "C_Omparar ficheiros baseado só em data e timestamp"
+msgstr "C_omparar ficheiros baseado só em data e timestamp"
 
 #: ../data/ui/preferences.ui.h:29
 msgid "_Timestamp resolution:"
@@ -1104,7 +1108,7 @@ msgstr "_Ordem ao comparar revisões de ficheiros:"
 
 #: ../data/ui/preferences.ui.h:37
 msgid "Order when _merging files:"
-msgstr "Orde_M ao unir ficheiros:"
+msgstr "Orde_m ao unir ficheiros:"
 
 #: ../data/ui/preferences.ui.h:38
 msgid "Commit Messages"
@@ -1112,11 +1116,11 @@ msgstr "Mensagens de commit"
 
 #: ../data/ui/preferences.ui.h:39
 msgid "Show _right margin at:"
-msgstr "Mostrar margem di_Reita em:"
+msgstr "Mostrar margem di_reita em:"
 
 #: ../data/ui/preferences.ui.h:40
 msgid "Automatically _break lines at right margin on commit"
-msgstr "Que_Brar linhas automaticamente na margem direita"
+msgstr "Que_brar linhas automaticamente na margem direita"
 
 #: ../data/ui/preferences.ui.h:41
 msgid "Version Control"
@@ -1473,7 +1477,7 @@ msgstr "C_omparar"
 
 #: ../data/ui/vcview.ui.h:3
 msgid "Co_mmit..."
-msgstr "Co_Mmit..."
+msgstr "Co_mmit..."
 
 #: ../data/ui/vcview.ui.h:4
 msgid "Commit changes to version control"
@@ -1489,7 +1493,7 @@ msgstr "Atualizar cópia de trabalho a partir do controlo de versão"
 
 #: ../data/ui/vcview.ui.h:7
 msgid "_Push"
-msgstr "Em_Purrar"
+msgstr "Em_purrar"
 
 #: ../data/ui/vcview.ui.h:8
 msgid "Push local changes to remote"
@@ -1505,7 +1509,7 @@ msgstr "Remover ao controlo de versão"
 
 #: ../data/ui/vcview.ui.h:13
 msgid "Mar_k as Resolved"
-msgstr "Mar_Car como resolvido"
+msgstr "Mar_car como resolvido"
 
 #: ../data/ui/vcview.ui.h:14
 msgid "Mark as resolved in version control"
@@ -1589,9 +1593,9 @@ msgstr "Diários anteriores:"
 
 #: ../data/ui/vcview.ui.h:34
 msgid "Co_mmit"
-msgstr "Co_Mmit"
+msgstr "Co_mmit"
 
-#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:337
+#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:343
 msgid "Location"
 msgstr "Localização"
 
@@ -1619,7 +1623,7 @@ msgstr ""
 
 #: ../data/ui/vcview.ui.h:42
 msgid "_Push commits"
-msgstr "Em_Purrar commits"
+msgstr "Em_purrar commits"
 
 #: ../meld/const.py:12
 msgid "UNIX (LF)"
@@ -1813,7 +1817,7 @@ msgstr "Cancelar"
 
 #: ../meld/filediff.py:836
 msgid "Mark _Resolved"
-msgstr "Marcar _Resolvido"
+msgstr "Marcar _resolvido"
 
 #: ../meld/filediff.py:1086
 #, python-format
@@ -1998,11 +2002,11 @@ msgstr "[%s] A unir ficheiros"
 
 #: ../meld/gutterrendererchunk.py:159
 msgid "Copy _up"
-msgstr "Copiar a_Cima"
+msgstr "Copiar a_cima"
 
 #: ../meld/gutterrendererchunk.py:160
 msgid "Copy _down"
-msgstr "Copiar a_Baixo"
+msgstr "Copiar a_baixo"
 
 #: ../meld/meldapp.py:177
 msgid "wrong number of arguments supplied to --diff"
@@ -2166,7 +2170,7 @@ msgstr "Procurar texto"
 
 #: ../meld/meldwindow.py:78
 msgid "Find Ne_xt"
-msgstr "Localizar segui_Nte"
+msgstr "Localizar segui_nte"
 
 #: ../meld/meldwindow.py:79
 msgid "Search forwards for the same text"
@@ -2174,7 +2178,7 @@ msgstr "Procura o mesmo texto para a frente"
 
 #: ../meld/meldwindow.py:81
 msgid "Find _Previous"
-msgstr "Localizar _Anterior"
+msgstr "Localizar _anterior"
 
 #: ../meld/meldwindow.py:82
 msgid "Search backwards for the same text"
@@ -2282,7 +2286,7 @@ msgstr "Ver a comparação em ecrã completo"
 
 #: ../meld/meldwindow.py:132
 msgid "_Toolbar"
-msgstr "Barra de ferramen_Tas"
+msgstr "Barra de ferramen_tas"
 
 #: ../meld/meldwindow.py:133
 msgid "Show or hide the toolbar"
@@ -2306,7 +2310,7 @@ msgstr "Sair do programa"
 
 #: ../meld/meldwindow.py:169
 msgid "Prefere_nces"
-msgstr "Preferê_Ncias"
+msgstr "Preferê_ncias"
 
 #: ../meld/meldwindow.py:170
 msgid "Configure the application"
@@ -2465,85 +2469,85 @@ msgstr "Não presentes"
 
 #. Translators: This error message is shown when a version
 #. control binary isn't installed.
-#: ../meld/vcview.py:255
+#: ../meld/vcview.py:261
 #, python-format
 msgid "%(name)s (%(cmd)s not installed)"
 msgstr "%(name)s (%(cmd)s não instalado)"
 
 #. Translators: This error message is shown when a version
 #. controlled repository is invalid.
-#: ../meld/vcview.py:259
+#: ../meld/vcview.py:265
 #, python-format
 msgid "%(name)s (Invalid repository)"
 msgstr "%(name)s (repositório inválido)"
 
-#: ../meld/vcview.py:280
+#: ../meld/vcview.py:286
 msgid "No valid version control system found in this folder"
 msgstr "Não se encontrou um sistema de controlo de versão válido nesta pasta"
 
-#: ../meld/vcview.py:282
+#: ../meld/vcview.py:288
 msgid "Only one version control system found in this folder"
 msgstr "Só se encontrou um sistema de controlo de versão válido nesta pasta"
 
-#: ../meld/vcview.py:284
+#: ../meld/vcview.py:290
 msgid "Choose which version control system to use"
 msgstr "Escolha qual o sistema de controlo de versão a usar"
 
 #. TRANSLATORS: This is the location of the directory being viewed
-#: ../meld/vcview.py:337
+#: ../meld/vcview.py:343
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:357
+#: ../meld/vcview.py:363
 #, python-format
 msgid "Scanning %s"
 msgstr "A analisar %s"
 
-#: ../meld/vcview.py:396
+#: ../meld/vcview.py:402
 msgid "(Empty)"
 msgstr "(Vazio)"
 
-#: ../meld/vcview.py:440
+#: ../meld/vcview.py:446
 #, python-format
 msgid "%s — local"
 msgstr "%s — local"
 
-#: ../meld/vcview.py:441
+#: ../meld/vcview.py:447
 #, python-format
 msgid "%s — remote"
 msgstr "%s — remoto"
 
-#: ../meld/vcview.py:449
+#: ../meld/vcview.py:455
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (local, unir, remoto)"
 
-#: ../meld/vcview.py:454
+#: ../meld/vcview.py:460
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (remoto, unir, local)"
 
-#: ../meld/vcview.py:465
+#: ../meld/vcview.py:471
 #, python-format
 msgid "%s — repository"
 msgstr "%s — repositório"
 
-#: ../meld/vcview.py:471
+#: ../meld/vcview.py:477
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (trabalho, repositório)"
 
-#: ../meld/vcview.py:475
+#: ../meld/vcview.py:481
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (repositório, trabalho)"
 
-#: ../meld/vcview.py:643
+#: ../meld/vcview.py:649
 msgid "Remove folder and all its files?"
 msgstr "Remover pasta e todos os ficheiros?"
 
-#: ../meld/vcview.py:645
+#: ../meld/vcview.py:651
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2551,12 +2555,12 @@ msgstr ""
 "Isto vai remover todos os ficheiros e pastas selecionados e todos os "
 "ficheiros dentro das pastas selecionadas do controlo de versão."
 
-#: ../meld/vcview.py:670
+#: ../meld/vcview.py:676
 #, python-format
 msgid "Error removing %s"
 msgstr "Erro ao remover %s"
 
-#: ../meld/vcview.py:750
+#: ../meld/vcview.py:756
 msgid "Clear"
 msgstr "Limpar"
 

From f0d42a73cf5dcdb25c4d009c78ef8d2d5840092b Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sat, 27 Aug 2016 07:45:08 +1000
Subject: [PATCH 27/51] patchdialog: Fix patch creation for missing newline
 (bgo#770336)

The patch formatted by our patch dialog ends up weirdly joining
together the two parts of a changed chunk if the left hand side of the
chunk doesn't end in a newline. This will only be the case if the chunk
in question covers the last line of a file, and the file doesn't end in
a newline.

The workaround here is more annoying than it should have to be, because
Python doesn't expose what it considers to be a newline character
anywhere.
---
 meld/patchdialog.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/meld/patchdialog.py b/meld/patchdialog.py
index 916a45d5..cabaa5f1 100644
--- a/meld/patchdialog.py
+++ b/meld/patchdialog.py
@@ -86,6 +86,17 @@ def update_patch(self):
             start, end = b.get_bounds()
             text = text_type(b.get_text(start, end, False), 'utf8')
             lines = text.splitlines(True)
+
+            # Ensure that the last line ends in a newline
+            barelines = text.splitlines(False)
+            if barelines and lines and barelines[-1] == lines[-1]:
+                # Final line lacks a line-break; add in a best guess
+                if len(lines) > 1:
+                    previous_linebreak = lines[-2][len(barelines[-2]):]
+                else:
+                    previous_linebreak = "\n"
+                lines[-1] += previous_linebreak
+
             texts.append(lines)
 
         names = [self.filediff.textbuffer[i].data.label for i in range(3)]

From 2318d9ffaede0da18e6c7b9b6c866be9c6bd43ce Mon Sep 17 00:00:00 2001
From: Daniel Mustieles <daniel.mustieles@gmail.com>
Date: Mon, 29 Aug 2016 12:25:06 +0000
Subject: [PATCH 28/51] Updated Spanish translation

---
 po/es.po | 203 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 102 insertions(+), 101 deletions(-)

diff --git a/po/es.po b/po/es.po
index 89607b1a..fcb8bcf2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "Project-Id-Version: meld.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=meld&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-03-16 13:30+0000\n"
-"PO-Revision-Date: 2016-03-17 10:01+0100\n"
+"POT-Creation-Date: 2016-08-20 21:39+0000\n"
+"PO-Revision-Date: 2016-08-29 14:20+0200\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n"
 "Language: es\n"
@@ -91,6 +91,10 @@ msgstr ""
 "Meld le ayuda a revisar cambios en el código, entender parches y resolver "
 "problemas de mezcla de archivos de manera sencilla."
 
+#: ../data/meld.appdata.xml.in.h:5
+msgid "The GNOME Project"
+msgstr "El proyecto GNOME"
+
 #: ../data/mime/meld.xml.in.h:1
 msgid "Meld comparison description"
 msgstr "Descripción de la comparación de Meld"
@@ -579,7 +583,7 @@ msgstr "Copiar a la derecha"
 msgid "Delete selected"
 msgstr "Eliminar seleccionados"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:859 ../meld/filediff.py:1363
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:860 ../meld/filediff.py:1368
 msgid "Hide"
 msgstr "Ocultar"
 
@@ -648,7 +652,7 @@ msgid "_Add"
 msgstr "_Añadir"
 
 #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:649
+#: ../meld/vcview.py:655
 msgid "_Remove"
 msgstr "_Eliminar"
 
@@ -670,7 +674,7 @@ msgstr "_Bajar"
 
 #. Create icon and filename CellRenderer
 #: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35
-#: ../meld/dirdiff.py:373
+#: ../meld/dirdiff.py:374
 msgid "Name"
 msgstr "Nombre"
 
@@ -873,8 +877,8 @@ msgstr "Los cambios se perderán permanentemente si no los guarda."
 msgid "Close _without Saving"
 msgstr "Cerrar _sin guardar"
 
-#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:941 ../meld/filediff.py:1429
-#: ../meld/filediff.py:1497
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:942 ../meld/filediff.py:1434
+#: ../meld/filediff.py:1502
 msgid "_Cancel"
 msgstr "_Cancelar"
 
@@ -913,7 +917,7 @@ msgstr ""
 "Los cambios realizados a los siguientes documentos se perderán para "
 "siempre:\n"
 
-#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:942 ../meld/filediff.py:1430
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:943 ../meld/filediff.py:1435
 msgid "_Replace"
 msgstr "_Reemplazar"
 
@@ -1609,7 +1613,7 @@ msgstr "Registros anteriores:"
 msgid "Co_mmit"
 msgstr "E_fectuar"
 
-#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:337
+#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:343
 msgid "Location"
 msgstr "Lugar"
 
@@ -1651,44 +1655,44 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:391 ../meld/preferences.py:82
+#: ../meld/dirdiff.py:392 ../meld/preferences.py:82
 msgid "Size"
 msgstr "Tamaño"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:399 ../meld/preferences.py:83
+#: ../meld/dirdiff.py:400 ../meld/preferences.py:83
 msgid "Modification time"
 msgstr "Hora de modificación"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:407 ../meld/preferences.py:84
+#: ../meld/dirdiff.py:408 ../meld/preferences.py:84
 msgid "Permissions"
 msgstr "Permisos"
 
-#: ../meld/dirdiff.py:537
+#: ../meld/dirdiff.py:538
 #, python-format
 msgid "Hide %s"
 msgstr "Ocultar %s"
 
-#: ../meld/dirdiff.py:669 ../meld/dirdiff.py:693
+#: ../meld/dirdiff.py:670 ../meld/dirdiff.py:694
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Buscando %s"
 
-#: ../meld/dirdiff.py:826
+#: ../meld/dirdiff.py:827
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Hecho"
 
-#: ../meld/dirdiff.py:834
+#: ../meld/dirdiff.py:835
 msgid "Folders have no differences"
 msgstr "No hay diferencias entre las carpetas"
 
-#: ../meld/dirdiff.py:836
+#: ../meld/dirdiff.py:837
 msgid "Contents of scanned files in folders are identical."
 msgstr "El contenido de los archivos analizados en carpetas es idéntico."
 
-#: ../meld/dirdiff.py:838
+#: ../meld/dirdiff.py:839
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1696,45 +1700,45 @@ msgstr ""
 "Los archivos analizados en las carpetas parecen idénticos, pero no se ha "
 "analizado el contenido."
 
-#: ../meld/dirdiff.py:841
+#: ../meld/dirdiff.py:842
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 "Se están usando filtros de archivos, por lo que no se han analizado todos "
 "los archivos."
 
-#: ../meld/dirdiff.py:843
+#: ../meld/dirdiff.py:844
 msgid "Text filters are in use and may be masking content differences."
 msgstr ""
 "Se están usando filtros de texto, y pueden estar ocultando diferencias entre "
 "archivos."
 
-#: ../meld/dirdiff.py:861 ../meld/filediff.py:1365 ../meld/filediff.py:1395
-#: ../meld/filediff.py:1397 ../meld/ui/msgarea.py:109
+#: ../meld/dirdiff.py:862 ../meld/filediff.py:1370 ../meld/filediff.py:1400
+#: ../meld/filediff.py:1402 ../meld/ui/msgarea.py:109
 #: ../meld/ui/msgarea.py:122
 msgid "Hi_de"
 msgstr "_Ocultar"
 
-#: ../meld/dirdiff.py:871
+#: ../meld/dirdiff.py:872
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Ocurrieron varios errores al escanear esta carpeta"
 
-#: ../meld/dirdiff.py:872
+#: ../meld/dirdiff.py:873
 msgid "Files with invalid encodings found"
 msgstr "Se encontraron archivos con codificaciones no válidas"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:874
+#: ../meld/dirdiff.py:875
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "Algunos archivos tienen una codificación incorrecta. Los nombres son como "
 "esto:"
 
-#: ../meld/dirdiff.py:876
+#: ../meld/dirdiff.py:877
 msgid "Files hidden by case insensitive comparison"
 msgstr "Archivos ocultos por una comparación no sensible a capitalización"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:878
+#: ../meld/dirdiff.py:879
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1743,17 +1747,17 @@ msgstr ""
 "sensible a capitalización. Los siguientes archivos de esta carpeta archivos "
 "están ocultos:"
 
-#: ../meld/dirdiff.py:889
+#: ../meld/dirdiff.py:890
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "«%s» oculto por «%s»"
 
-#: ../meld/dirdiff.py:945
+#: ../meld/dirdiff.py:946
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "¿Reemplazar la carpeta «%s»?"
 
-#: ../meld/dirdiff.py:947
+#: ../meld/dirdiff.py:948
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1762,11 +1766,11 @@ msgstr ""
 "Ya existe otra carpeta con el mismo nombre en «%s».\n"
 "Si reemplaza la carpeta existente, se perderán todos sus archivos."
 
-#: ../meld/dirdiff.py:960
+#: ../meld/dirdiff.py:961
 msgid "Error copying file"
 msgstr "Error al copiar el archivo"
 
-#: ../meld/dirdiff.py:961
+#: ../meld/dirdiff.py:962
 #, python-format
 msgid ""
 "Couldn't copy %s\n"
@@ -1779,38 +1783,35 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/dirdiff.py:984
+#: ../meld/dirdiff.py:985
 #, python-format
 msgid "Error deleting %s"
 msgstr "Error al eliminar %s"
 
-#: ../meld/dirdiff.py:1489
+#: ../meld/dirdiff.py:1492
 msgid "No folder"
 msgstr "No hay ninguna carpeta"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:359
+#: ../meld/filediff.py:357
 msgid "INS"
 msgstr "INS"
 
-#: ../meld/filediff.py:359
+#: ../meld/filediff.py:357
 msgid "OVR"
 msgstr "SOB"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:361
+#: ../meld/filediff.py:359
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Lín %i, Col %i"
 
-#: ../meld/filediff.py:776
+#: ../meld/filediff.py:771
 msgid "Comparison results will be inaccurate"
 msgstr "Los resultados de la comparación pueden no ser precisos"
 
-#: ../meld/filediff.py:778
-#| msgid ""
-#| "Filter “%s” changed the number of lines in the file, which is "
-#| "unsupported. The comparison will not be accurate."
+#: ../meld/filediff.py:773
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1818,65 +1819,65 @@ msgstr ""
 "Un filtro cambia el número de líneas en el archivo, lo que no está "
 "soportado. La comparación no será exacta."
 
-#: ../meld/filediff.py:836
+#: ../meld/filediff.py:831
 msgid "Mark conflict as resolved?"
 msgstr "¿Marcar conflicto como resuelto?"
 
-#: ../meld/filediff.py:838
+#: ../meld/filediff.py:833
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
 "Si el conflicto se ha resuelto con éxito, debe marcarlo como resuelto ahora."
 
-#: ../meld/filediff.py:840
+#: ../meld/filediff.py:835
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../meld/filediff.py:841
+#: ../meld/filediff.py:836
 msgid "Mark _Resolved"
 msgstr "Mar_car como resuelto"
 
-#: ../meld/filediff.py:1081
+#: ../meld/filediff.py:1086
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Ha habido un problema al abrir el archivo «%s»."
 
-#: ../meld/filediff.py:1089
+#: ../meld/filediff.py:1094
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "El archivo %s parece ser un archivo binario."
 
-#: ../meld/filediff.py:1091
+#: ../meld/filediff.py:1096
 msgid "Do you want to open the file using the default application?"
 msgstr "¿Quiere abrir el archivo usando la aplicación predeterminada?"
 
-#: ../meld/filediff.py:1093
+#: ../meld/filediff.py:1098
 msgid "Open"
 msgstr "Abrir"
 
-#: ../meld/filediff.py:1109
+#: ../meld/filediff.py:1114
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Calculando las diferencias"
 
-#: ../meld/filediff.py:1174
+#: ../meld/filediff.py:1179
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "El archivo %s ha cambiado en el disco"
 
-#: ../meld/filediff.py:1175
+#: ../meld/filediff.py:1180
 msgid "Do you want to reload the file?"
 msgstr "¿Quiere recargar el archivo?"
 
-#: ../meld/filediff.py:1177
+#: ../meld/filediff.py:1182
 msgid "_Reload"
 msgstr "_Recargar"
 
-#: ../meld/filediff.py:1328
+#: ../meld/filediff.py:1333
 msgid "Files are identical"
 msgstr "Los campos son idénticos"
 
-#: ../meld/filediff.py:1341
+#: ../meld/filediff.py:1346
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1884,11 +1885,11 @@ msgstr ""
 "Se están usando filtros de texto, y pueden estar ocultando diferencias entre "
 "archivos. ¿Quiere comprar los archivos no filtrados?"
 
-#: ../meld/filediff.py:1346
+#: ../meld/filediff.py:1351
 msgid "Files differ in line endings only"
 msgstr "Los archivos difieren en los finales de línea"
 
-#: ../meld/filediff.py:1348
+#: ../meld/filediff.py:1353
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1897,15 +1898,15 @@ msgstr ""
 "Los archivos son idénticos excepto por los finales de línea:\n"
 "%s"
 
-#: ../meld/filediff.py:1368
+#: ../meld/filediff.py:1373
 msgid "Show without filters"
 msgstr "Mostrar sin filtros"
 
-#: ../meld/filediff.py:1390
+#: ../meld/filediff.py:1395
 msgid "Change highlighting incomplete"
 msgstr "Cambiar el resaltado incompleto"
 
-#: ../meld/filediff.py:1391
+#: ../meld/filediff.py:1396
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1914,20 +1915,20 @@ msgstr ""
 "forzar a Meld para que resalte los cambios largos, aunque esto haga que sea "
 "más lento."
 
-#: ../meld/filediff.py:1399
+#: ../meld/filediff.py:1404
 msgid "Keep highlighting"
 msgstr "Mantener el resaltado"
 
-#: ../meld/filediff.py:1401
+#: ../meld/filediff.py:1406
 msgid "_Keep highlighting"
 msgstr "_Mantener el resaltado"
 
-#: ../meld/filediff.py:1433
+#: ../meld/filediff.py:1438
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "¿Reemplazar el archivo «%s»?"
 
-#: ../meld/filediff.py:1435
+#: ../meld/filediff.py:1440
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -1936,45 +1937,45 @@ msgstr ""
 "Ya existe un archivo con el mismo nombre en «%s».\n"
 "Si reemplaza el archivo existente, se perderá su contenido."
 
-#: ../meld/filediff.py:1452
+#: ../meld/filediff.py:1457
 msgid "Save Left Pane As"
 msgstr "Guardar panel izquierdo como"
 
-#: ../meld/filediff.py:1454
+#: ../meld/filediff.py:1459
 msgid "Save Middle Pane As"
 msgstr "Guardar el panel central como"
 
-#: ../meld/filediff.py:1456
+#: ../meld/filediff.py:1461
 msgid "Save Right Pane As"
 msgstr "Guardar el panel derecho como"
 
-#: ../meld/filediff.py:1470
+#: ../meld/filediff.py:1475
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "El archivo %s ha cambiado en el disco desde que se abrió"
 
-#: ../meld/filediff.py:1472
+#: ../meld/filediff.py:1477
 msgid "If you save it, any external changes will be lost."
 msgstr "Si lo guarda, los cambios externos se perderán."
 
-#: ../meld/filediff.py:1475
+#: ../meld/filediff.py:1480
 msgid "Save Anyway"
 msgstr "Guardar de todas formas"
 
-#: ../meld/filediff.py:1476
+#: ../meld/filediff.py:1481
 msgid "Don't Save"
 msgstr "No guardar"
 
-#: ../meld/filediff.py:1498
+#: ../meld/filediff.py:1503
 msgid "_Save as UTF-8"
 msgstr "_Guardar como UTF-8"
 
-#: ../meld/filediff.py:1501
+#: ../meld/filediff.py:1506
 #, python-format
 msgid "Couldn't encode text as “%s”"
 msgstr "No se pudo codificar el texto como «%s»"
 
-#: ../meld/filediff.py:1503
+#: ../meld/filediff.py:1508
 #, python-format
 msgid ""
 "File “%s” contains characters that can't be encoded using encoding “%s”.\n"
@@ -1983,12 +1984,12 @@ msgstr ""
 "El archivo «%s» contiene caracteres no codificables con «%s».\n"
 "¿Quiere guardarlos como UTF-8?"
 
-#: ../meld/filediff.py:1540 ../meld/patchdialog.py:125
+#: ../meld/filediff.py:1545 ../meld/patchdialog.py:125
 #, python-format
 msgid "Could not save file %s."
 msgstr "No se pudo guardar el archivo %s."
 
-#: ../meld/filediff.py:1541 ../meld/patchdialog.py:126
+#: ../meld/filediff.py:1546 ../meld/patchdialog.py:126
 #, python-format
 msgid ""
 "Couldn't save file due to:\n"
@@ -1997,11 +1998,11 @@ msgstr ""
 "No se pudo guardar el archivo debido a:\n"
 "%s"
 
-#: ../meld/filediff.py:1887
+#: ../meld/filediff.py:1892
 msgid "Live comparison updating disabled"
 msgstr "Actualización de la comparación en directo desactivada"
 
-#: ../meld/filediff.py:1888
+#: ../meld/filediff.py:1893
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2119,7 +2120,7 @@ msgid "invalid path or URI \"%s\""
 msgstr "ruta u URI «%s» no válido"
 
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:127
+#: ../meld/meldbuffer.py:132
 msgid "<unnamed>"
 msgstr "<sin nombre>"
 
@@ -2362,7 +2363,7 @@ msgstr "Se necesita tres archivos para la mezcla automática, se obtuvieron: %r"
 msgid "Cannot compare a mixture of files and directories"
 msgstr "No se puede comparar una mezcla de archivos y carpetas"
 
-#: ../meld/misc.py:179
+#: ../meld/misc.py:203
 #, python-format
 msgid "Couldn't find colour scheme details for %s-%s; this is a bad install"
 msgstr ""
@@ -2370,7 +2371,7 @@ msgstr ""
 "una instalación incorrecta"
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:264
+#: ../meld/misc.py:288
 msgid "[None]"
 msgstr "[Ninguno]"
 
@@ -2491,87 +2492,87 @@ msgstr "No presente"
 
 #. Translators: This error message is shown when a version
 #. control binary isn't installed.
-#: ../meld/vcview.py:255
+#: ../meld/vcview.py:261
 #, python-format
 msgid "%(name)s (%(cmd)s not installed)"
 msgstr "%(name)s (%(cmd)s no está instalado)"
 
 #. Translators: This error message is shown when a version
 #. controlled repository is invalid.
-#: ../meld/vcview.py:259
+#: ../meld/vcview.py:265
 #, python-format
 msgid "%(name)s (Invalid repository)"
 msgstr "%(name)s (Repositorio no válido)"
 
-#: ../meld/vcview.py:280
+#: ../meld/vcview.py:286
 msgid "No valid version control system found in this folder"
 msgstr ""
 "No se ha encontrado un sistema de control de versiones válido en esta carpeta"
 
-#: ../meld/vcview.py:282
+#: ../meld/vcview.py:288
 msgid "Only one version control system found in this folder"
 msgstr ""
 "Sólo se ha encontrado un sistema de control de versiones en esta carpeta"
 
-#: ../meld/vcview.py:284
+#: ../meld/vcview.py:290
 msgid "Choose which version control system to use"
 msgstr "Elegir qué sistema de control de versiones usar"
 
 #. TRANSLATORS: This is the location of the directory being viewed
-#: ../meld/vcview.py:337
+#: ../meld/vcview.py:343
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:357
+#: ../meld/vcview.py:363
 #, python-format
 msgid "Scanning %s"
 msgstr "Analizando %s"
 
-#: ../meld/vcview.py:396
+#: ../meld/vcview.py:402
 msgid "(Empty)"
 msgstr "(Vacío)"
 
-#: ../meld/vcview.py:440
+#: ../meld/vcview.py:446
 #, python-format
 msgid "%s — local"
 msgstr "%s — local"
 
-#: ../meld/vcview.py:441
+#: ../meld/vcview.py:447
 #, python-format
 msgid "%s — remote"
 msgstr "%s — remoto"
 
-#: ../meld/vcview.py:449
+#: ../meld/vcview.py:455
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (local, mezcla, remoto)"
 
-#: ../meld/vcview.py:454
+#: ../meld/vcview.py:460
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (remoto, mezcla, local)"
 
-#: ../meld/vcview.py:465
+#: ../meld/vcview.py:471
 #, python-format
 msgid "%s — repository"
 msgstr "%s — repositorio"
 
-#: ../meld/vcview.py:471
+#: ../meld/vcview.py:477
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (funcionando, repositorio)"
 
-#: ../meld/vcview.py:475
+#: ../meld/vcview.py:481
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (repositorio, funcionando)"
 
-#: ../meld/vcview.py:643
+#: ../meld/vcview.py:649
 msgid "Remove folder and all its files?"
 msgstr "¿Quitar la carpeta y todos sus archivos?"
 
-#: ../meld/vcview.py:645
+#: ../meld/vcview.py:651
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2579,12 +2580,12 @@ msgstr ""
 "Esto quitará todos los archivos y carpetas seleccionadas, y todos los "
 "archivos de las carpetas seleccionadas, del control de versiones."
 
-#: ../meld/vcview.py:670
+#: ../meld/vcview.py:676
 #, python-format
 msgid "Error removing %s"
 msgstr "Error al quitar %s"
 
-#: ../meld/vcview.py:750
+#: ../meld/vcview.py:756
 msgid "Clear"
 msgstr "Limpiar"
 

From 62f56937874492fed50d59733d80678346a5d65f Mon Sep 17 00:00:00 2001
From: Rafael Fontenelle <rafaelff@gnome.org>
Date: Sat, 3 Sep 2016 13:24:00 +0000
Subject: [PATCH 29/51] Updated Brazilian Portuguese translation

---
 po/pt_BR.po | 211 ++++++++++++++++++++++++++--------------------------
 1 file changed, 106 insertions(+), 105 deletions(-)

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 79bc5821..ba93a963 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,10 +13,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=meld&k"
-"eywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-03-18 01:30+0000\n"
-"PO-Revision-Date: 2016-03-18 04:06-0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=meld&ke"
+"ywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2016-08-20 21:39+0000\n"
+"PO-Revision-Date: 2016-09-03 10:21-0200\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
@@ -92,6 +92,10 @@ msgstr ""
 "Meld auxilia você a revisar alterações no código, entender patches e tornar "
 "enormes conflitos de mesclagem um pouco menos dolorosos."
 
+#: ../data/meld.appdata.xml.in.h:5
+msgid "The GNOME Project"
+msgstr "O Projeto GNOME"
+
 #: ../data/mime/meld.xml.in.h:1
 msgid "Meld comparison description"
 msgstr "Descrição da comparação do Meld"
@@ -207,8 +211,8 @@ msgid ""
 "('word')."
 msgstr ""
 "Linhas nos comparações de arquivos serão quebradas de acordo com essa "
-"configuração, seja nenhuma (\"none\"), seja em qualquer caractere (\"char\"), "
-"seja apenas ao final das palavras (\"word\")."
+"configuração, seja nenhuma (\"none\"), seja em qualquer caractere (\"char"
+"\"), seja apenas ao final das palavras (\"word\")."
 
 #: ../data/org.gnome.meld.gschema.xml.h:23
 msgid "Highlight current line"
@@ -580,7 +584,7 @@ msgstr "Copia para a direita"
 msgid "Delete selected"
 msgstr "Exclui os selecionados"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:859 ../meld/filediff.py:1363
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:860 ../meld/filediff.py:1368
 msgid "Hide"
 msgstr "Ocultar"
 
@@ -647,7 +651,7 @@ msgid "_Add"
 msgstr "_Adicionar"
 
 #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:649
+#: ../meld/vcview.py:655
 msgid "_Remove"
 msgstr "_Remover"
 
@@ -669,7 +673,7 @@ msgstr "Mover para _baixo"
 
 #. Create icon and filename CellRenderer
 #: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35
-#: ../meld/dirdiff.py:373
+#: ../meld/dirdiff.py:374
 msgid "Name"
 msgstr "Nome"
 
@@ -870,8 +874,8 @@ msgstr "Se você não salvar, as mudanças serão perdidas permanentemente."
 msgid "Close _without Saving"
 msgstr "_Fechar sem salvar"
 
-#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:941 ../meld/filediff.py:1429
-#: ../meld/filediff.py:1497
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:942 ../meld/filediff.py:1434
+#: ../meld/filediff.py:1502
 msgid "_Cancel"
 msgstr "_Cancelar"
 
@@ -909,7 +913,7 @@ msgid "Changes made to the following documents will be permanently lost:\n"
 msgstr ""
 "Mudanças feitas nos seguintes documentos serão perdidas permanentemente:\n"
 
-#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:942 ../meld/filediff.py:1430
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:943 ../meld/filediff.py:1435
 msgid "_Replace"
 msgstr "_Substituir"
 
@@ -1602,7 +1606,7 @@ msgstr "Logs anteriores:"
 msgid "Co_mmit"
 msgstr "Sub_meter"
 
-#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:337
+#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:343
 msgid "Location"
 msgstr "Localização"
 
@@ -1645,44 +1649,44 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:391 ../meld/preferences.py:82
+#: ../meld/dirdiff.py:392 ../meld/preferences.py:82
 msgid "Size"
 msgstr "Tamanho"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:399 ../meld/preferences.py:83
+#: ../meld/dirdiff.py:400 ../meld/preferences.py:83
 msgid "Modification time"
 msgstr "Hora da modificação"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:407 ../meld/preferences.py:84
+#: ../meld/dirdiff.py:408 ../meld/preferences.py:84
 msgid "Permissions"
 msgstr "Permissões"
 
-#: ../meld/dirdiff.py:537
+#: ../meld/dirdiff.py:538
 #, python-format
 msgid "Hide %s"
 msgstr "Ocultar %s"
 
-#: ../meld/dirdiff.py:669 ../meld/dirdiff.py:693
+#: ../meld/dirdiff.py:670 ../meld/dirdiff.py:694
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Varrendo %s"
 
-#: ../meld/dirdiff.py:826
+#: ../meld/dirdiff.py:827
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Concluído"
 
-#: ../meld/dirdiff.py:834
+#: ../meld/dirdiff.py:835
 msgid "Folders have no differences"
 msgstr "As pastas têm nenhuma diferença"
 
-#: ../meld/dirdiff.py:836
+#: ../meld/dirdiff.py:837
 msgid "Contents of scanned files in folders are identical."
 msgstr "Conteúdos de arquivos verificados em pastas são idênticos."
 
-#: ../meld/dirdiff.py:838
+#: ../meld/dirdiff.py:839
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1690,44 +1694,44 @@ msgstr ""
 "Arquivos verificados em pastas parecem ser idênticos, mas conteúdos não "
 "foram verificados."
 
-#: ../meld/dirdiff.py:841
+#: ../meld/dirdiff.py:842
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 "Filtros de arquivo estão em uso, portanto nem todos os arquivos foram "
 "verificados."
 
-#: ../meld/dirdiff.py:843
+#: ../meld/dirdiff.py:844
 msgid "Text filters are in use and may be masking content differences."
 msgstr ""
 "Filtros de texto estão sendo usados e podem estar escondendo diferenças no "
 "conteúdo."
 
-#: ../meld/dirdiff.py:861 ../meld/filediff.py:1365 ../meld/filediff.py:1395
-#: ../meld/filediff.py:1397 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122
+#: ../meld/dirdiff.py:862 ../meld/filediff.py:1370 ../meld/filediff.py:1400
+#: ../meld/filediff.py:1402 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122
 msgid "Hi_de"
 msgstr "Ocu_ltar"
 
-#: ../meld/dirdiff.py:871
+#: ../meld/dirdiff.py:872
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Ocorreram vários erros ao varrer este diretório"
 
-#: ../meld/dirdiff.py:872
+#: ../meld/dirdiff.py:873
 msgid "Files with invalid encodings found"
 msgstr "Arquivos com codificações inválidas encontrados"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:874
+#: ../meld/dirdiff.py:875
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "Alguns arquivos estavam com uma codificação incorreta. Os nomes são algo "
 "como:"
 
-#: ../meld/dirdiff.py:876
+#: ../meld/dirdiff.py:877
 msgid "Files hidden by case insensitive comparison"
 msgstr "Arquivos ocultos pela comparação não sensível a maiusculização"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:878
+#: ../meld/dirdiff.py:879
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1736,17 +1740,17 @@ msgstr ""
 "minúsculas em um sistema de arquivos que diferencia. Os seguintes arquivos "
 "neste diretório ficam ocultos:"
 
-#: ../meld/dirdiff.py:889
+#: ../meld/dirdiff.py:890
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "\"%s\" ocultado por \"%s\""
 
-#: ../meld/dirdiff.py:945
+#: ../meld/dirdiff.py:946
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Substituir pasta \"%s\"?"
 
-#: ../meld/dirdiff.py:947
+#: ../meld/dirdiff.py:948
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1755,11 +1759,11 @@ msgstr ""
 "Uma outra pasta com o mesmo nome já existe em \"%s\".\n"
 "Se você substituir a pasta existente, todos os arquivos nela serão perdidos."
 
-#: ../meld/dirdiff.py:960
+#: ../meld/dirdiff.py:961
 msgid "Error copying file"
 msgstr "Erro ao copiar arquivo"
 
-#: ../meld/dirdiff.py:961
+#: ../meld/dirdiff.py:962
 #, python-format
 msgid ""
 "Couldn't copy %s\n"
@@ -1772,38 +1776,35 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/dirdiff.py:984
+#: ../meld/dirdiff.py:985
 #, python-format
 msgid "Error deleting %s"
 msgstr "Erro ao excluir %s"
 
-#: ../meld/dirdiff.py:1489
+#: ../meld/dirdiff.py:1492
 msgid "No folder"
 msgstr "Nenhum pasta"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:359
+#: ../meld/filediff.py:357
 msgid "INS"
 msgstr "INS"
 
-#: ../meld/filediff.py:359
+#: ../meld/filediff.py:357
 msgid "OVR"
 msgstr "SBR"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:361
+#: ../meld/filediff.py:359
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Lin %i, Col %i"
 
-#: ../meld/filediff.py:776
+#: ../meld/filediff.py:771
 msgid "Comparison results will be inaccurate"
 msgstr "Resultados da comparação será imprecisa"
 
-#: ../meld/filediff.py:778
-#| msgid ""
-#| "Filter “%s” changed the number of lines in the file, which is "
-#| "unsupported. The comparison will not be accurate."
+#: ../meld/filediff.py:773
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1811,66 +1812,66 @@ msgstr ""
 "Um filtro alterou o número de linhas no arquivo, não havendo suporte a essa "
 "alteração. A comparação pode não ser precisa."
 
-#: ../meld/filediff.py:836
+#: ../meld/filediff.py:831
 msgid "Mark conflict as resolved?"
 msgstr "Marcar como resolvido?"
 
-#: ../meld/filediff.py:838
+#: ../meld/filediff.py:833
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
 "Se o conflito foi resolvido com sucesso, você pode marcá-lo como resolvido "
 "agora."
 
-#: ../meld/filediff.py:840
+#: ../meld/filediff.py:835
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../meld/filediff.py:841
+#: ../meld/filediff.py:836
 msgid "Mark _Resolved"
 msgstr "Marcar como _resolvido"
 
-#: ../meld/filediff.py:1081
+#: ../meld/filediff.py:1086
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Ocorreu um problema ao abrir o arquivo \"%s\"."
 
-#: ../meld/filediff.py:1089
+#: ../meld/filediff.py:1094
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "O arquivo %s parece ser um arquivo binário."
 
-#: ../meld/filediff.py:1091
+#: ../meld/filediff.py:1096
 msgid "Do you want to open the file using the default application?"
 msgstr "Você gostaria de abrir o arquivo usando o aplicativo padrão?"
 
-#: ../meld/filediff.py:1093
+#: ../meld/filediff.py:1098
 msgid "Open"
 msgstr "Abrir"
 
-#: ../meld/filediff.py:1109
+#: ../meld/filediff.py:1114
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Analisando diferenças"
 
-#: ../meld/filediff.py:1174
+#: ../meld/filediff.py:1179
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "O arquivo %s foi alterado em disco"
 
-#: ../meld/filediff.py:1175
+#: ../meld/filediff.py:1180
 msgid "Do you want to reload the file?"
 msgstr "Deseja recarregar o arquivo?"
 
-#: ../meld/filediff.py:1177
+#: ../meld/filediff.py:1182
 msgid "_Reload"
 msgstr "_Recarregar"
 
-#: ../meld/filediff.py:1328
+#: ../meld/filediff.py:1333
 msgid "Files are identical"
 msgstr "Os arquivos são idênticos"
 
-#: ../meld/filediff.py:1341
+#: ../meld/filediff.py:1346
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1878,11 +1879,11 @@ msgstr ""
 "Filtros de texto estão sendo usados e podem estar escondendo diferenças "
 "entre os arquivos. Você gostaria de comparar os arquivos sem filtro?"
 
-#: ../meld/filediff.py:1346
+#: ../meld/filediff.py:1351
 msgid "Files differ in line endings only"
 msgstr "Arquivos se diferenciam nos fins de linha apenas"
 
-#: ../meld/filediff.py:1348
+#: ../meld/filediff.py:1353
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1891,15 +1892,15 @@ msgstr ""
 "Arquivos são idênticos, exceto pela diferença entre fins de linha:\n"
 "%s"
 
-#: ../meld/filediff.py:1368
+#: ../meld/filediff.py:1373
 msgid "Show without filters"
 msgstr "Mostrar sem filtros"
 
-#: ../meld/filediff.py:1390
+#: ../meld/filediff.py:1395
 msgid "Change highlighting incomplete"
 msgstr "Alteração de destaque incompleta"
 
-#: ../meld/filediff.py:1391
+#: ../meld/filediff.py:1396
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1908,20 +1909,20 @@ msgstr ""
 "grandes. Você pode forçar o Meld a levar mais tempo para destacar alterações "
 "longas, porém isso pode ser bem lento."
 
-#: ../meld/filediff.py:1399
+#: ../meld/filediff.py:1404
 msgid "Keep highlighting"
 msgstr "Mantém destaque"
 
-#: ../meld/filediff.py:1401
+#: ../meld/filediff.py:1406
 msgid "_Keep highlighting"
 msgstr "_Manter destaque"
 
-#: ../meld/filediff.py:1433
+#: ../meld/filediff.py:1438
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Substituir arquivo \"%s\"?"
 
-#: ../meld/filediff.py:1435
+#: ../meld/filediff.py:1440
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -1930,45 +1931,45 @@ msgstr ""
 "Um arquivo com esse nome já existe em \"%s\".\n"
 "Se você substituir o arquivo existente, seu conteúdo será perdido."
 
-#: ../meld/filediff.py:1452
+#: ../meld/filediff.py:1457
 msgid "Save Left Pane As"
 msgstr "Salvar o painel esquerdo como"
 
-#: ../meld/filediff.py:1454
+#: ../meld/filediff.py:1459
 msgid "Save Middle Pane As"
 msgstr "Salvar o painel do meio como"
 
-#: ../meld/filediff.py:1456
+#: ../meld/filediff.py:1461
 msgid "Save Right Pane As"
 msgstr "Salvar o painel direito como"
 
-#: ../meld/filediff.py:1470
+#: ../meld/filediff.py:1475
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "O arquivo %s foi alterado em disco após ter sido aberto"
 
-#: ../meld/filediff.py:1472
+#: ../meld/filediff.py:1477
 msgid "If you save it, any external changes will be lost."
 msgstr "Se você não salvá-lo, quaisquer mudanças externas serão perdidas."
 
-#: ../meld/filediff.py:1475
+#: ../meld/filediff.py:1480
 msgid "Save Anyway"
 msgstr "Salvar mesmo assim"
 
-#: ../meld/filediff.py:1476
+#: ../meld/filediff.py:1481
 msgid "Don't Save"
 msgstr "Não salvar"
 
-#: ../meld/filediff.py:1498
+#: ../meld/filediff.py:1503
 msgid "_Save as UTF-8"
 msgstr "_Salvar como UTF-8"
 
-#: ../meld/filediff.py:1501
+#: ../meld/filediff.py:1506
 #, python-format
 msgid "Couldn't encode text as “%s”"
 msgstr "Não foi possível codificar o texto como \"%s\""
 
-#: ../meld/filediff.py:1503
+#: ../meld/filediff.py:1508
 #, python-format
 msgid ""
 "File “%s” contains characters that can't be encoded using encoding “%s”.\n"
@@ -1978,12 +1979,12 @@ msgstr ""
 "codificação \"%s\"\n"
 "Você gostaria de salvar como UTF-8?"
 
-#: ../meld/filediff.py:1540 ../meld/patchdialog.py:125
+#: ../meld/filediff.py:1545 ../meld/patchdialog.py:125
 #, python-format
 msgid "Could not save file %s."
 msgstr "Não foi possível salvar o arquivo %s."
 
-#: ../meld/filediff.py:1541 ../meld/patchdialog.py:126
+#: ../meld/filediff.py:1546 ../meld/patchdialog.py:126
 #, python-format
 msgid ""
 "Couldn't save file due to:\n"
@@ -1992,11 +1993,11 @@ msgstr ""
 "Não foi possível salvar o arquivo pois:\n"
 "%s"
 
-#: ../meld/filediff.py:1887
+#: ../meld/filediff.py:1892
 msgid "Live comparison updating disabled"
 msgstr "Atualização em tempo real de comparação desabilitada"
 
-#: ../meld/filediff.py:1888
+#: ../meld/filediff.py:1893
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2112,7 +2113,7 @@ msgid "invalid path or URI \"%s\""
 msgstr "caminho inválido ou URI \"%s\""
 
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:127
+#: ../meld/meldbuffer.py:132
 msgid "<unnamed>"
 msgstr "<sem nome>"
 
@@ -2355,7 +2356,7 @@ msgstr ""
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Não foi possível comparar uma mistura de arquivos e diretórios"
 
-#: ../meld/misc.py:179
+#: ../meld/misc.py:203
 #, python-format
 msgid "Couldn't find colour scheme details for %s-%s; this is a bad install"
 msgstr ""
@@ -2363,7 +2364,7 @@ msgstr ""
 "uma instalação ruim"
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:264
+#: ../meld/misc.py:288
 msgid "[None]"
 msgstr "[Nenhum]"
 
@@ -2484,85 +2485,85 @@ msgstr "Não presente"
 
 #. Translators: This error message is shown when a version
 #. control binary isn't installed.
-#: ../meld/vcview.py:255
+#: ../meld/vcview.py:261
 #, python-format
 msgid "%(name)s (%(cmd)s not installed)"
 msgstr "%(name)s (%(cmd)s não instalado)"
 
 #. Translators: This error message is shown when a version
 #. controlled repository is invalid.
-#: ../meld/vcview.py:259
+#: ../meld/vcview.py:265
 #, python-format
 msgid "%(name)s (Invalid repository)"
 msgstr "%(name)s (Repositório inválido)"
 
-#: ../meld/vcview.py:280
+#: ../meld/vcview.py:286
 msgid "No valid version control system found in this folder"
 msgstr "Nenhum sistema de controle de versão válido localizado nesta pasta"
 
-#: ../meld/vcview.py:282
+#: ../meld/vcview.py:288
 msgid "Only one version control system found in this folder"
 msgstr "Apenas um sistema de controle de versão foi localizado nesta pasta"
 
-#: ../meld/vcview.py:284
+#: ../meld/vcview.py:290
 msgid "Choose which version control system to use"
 msgstr "Escolha qual sistema de controle de versão a ser usado"
 
 #. TRANSLATORS: This is the location of the directory being viewed
-#: ../meld/vcview.py:337
+#: ../meld/vcview.py:343
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:357
+#: ../meld/vcview.py:363
 #, python-format
 msgid "Scanning %s"
 msgstr "Varrendo %s"
 
-#: ../meld/vcview.py:396
+#: ../meld/vcview.py:402
 msgid "(Empty)"
 msgstr "(Vazio)"
 
-#: ../meld/vcview.py:440
+#: ../meld/vcview.py:446
 #, python-format
 msgid "%s — local"
 msgstr "%s — local"
 
-#: ../meld/vcview.py:441
+#: ../meld/vcview.py:447
 #, python-format
 msgid "%s — remote"
 msgstr "%s — remoto"
 
-#: ../meld/vcview.py:449
+#: ../meld/vcview.py:455
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (local, mesclagem, remoto)"
 
-#: ../meld/vcview.py:454
+#: ../meld/vcview.py:460
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (remoto, mesclagem, local)"
 
-#: ../meld/vcview.py:465
+#: ../meld/vcview.py:471
 #, python-format
 msgid "%s — repository"
 msgstr "%s — repositório"
 
-#: ../meld/vcview.py:471
+#: ../meld/vcview.py:477
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (em trabalho, repositório)"
 
-#: ../meld/vcview.py:475
+#: ../meld/vcview.py:481
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (repositório, em trabalho)"
 
-#: ../meld/vcview.py:643
+#: ../meld/vcview.py:649
 msgid "Remove folder and all its files?"
 msgstr "Remover pasta e todos seus arquivos?"
 
-#: ../meld/vcview.py:645
+#: ../meld/vcview.py:651
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2570,12 +2571,12 @@ msgstr ""
 "Isso vai remover todos os arquivos e pastas selecionados, e todos arquivos "
 "dentro de quaisquer pastas selecionadas, do controle de versão."
 
-#: ../meld/vcview.py:670
+#: ../meld/vcview.py:676
 #, python-format
 msgid "Error removing %s"
 msgstr "Erro ao remover %s"
 
-#: ../meld/vcview.py:750
+#: ../meld/vcview.py:756
 msgid "Clear"
 msgstr "Limpar"
 

From 1854c679cf5bf67470094050ad3cbd36fb2699ec Mon Sep 17 00:00:00 2001
From: Rafael Fontenelle <rafaelff@gnome.org>
Date: Mon, 5 Sep 2016 00:35:48 +0000
Subject: [PATCH 30/51] Updated Brazilian Portuguese translation

---
 po/pt_BR.po | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/po/pt_BR.po b/po/pt_BR.po
index ba93a963..a0e3fd0b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -15,8 +15,8 @@ msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=meld&ke"
 "ywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-08-20 21:39+0000\n"
-"PO-Revision-Date: 2016-09-03 10:21-0200\n"
+"POT-Creation-Date: 2016-09-03 13:24+0000\n"
+"PO-Revision-Date: 2016-09-04 21:34-0200\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
@@ -299,7 +299,7 @@ msgstr ""
 
 #: ../data/org.gnome.meld.gschema.xml.h:37 ../data/ui/preferences.ui.h:32
 msgid "Ignore symbolic links"
-msgstr "Ignora ligações simbólicas"
+msgstr "Ignorar ligações simbólicas"
 
 #: ../data/org.gnome.meld.gschema.xml.h:38
 msgid ""
@@ -961,7 +961,7 @@ msgstr "Formatar como patch"
 msgid "Copy to Clipboard"
 msgstr "Copiar para a área de transferência"
 
-#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:149
+#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:160
 msgid "Save Patch"
 msgstr "Salvar patch"
 
@@ -1161,7 +1161,7 @@ msgstr "Aparar alterações"
 
 #: ../data/ui/preferences.ui.h:46
 msgid "Trim blank line differences from the start and end of changes"
-msgstr "Apara diferenças de linhas vazias do início e fim de alterações"
+msgstr "Aparar diferenças de linhas vazias do início e fim de alterações"
 
 #: ../data/ui/preferences.ui.h:47
 msgid "Text filters"
@@ -1911,7 +1911,7 @@ msgstr ""
 
 #: ../meld/filediff.py:1404
 msgid "Keep highlighting"
-msgstr "Mantém destaque"
+msgstr "Manter destaque"
 
 #: ../meld/filediff.py:1406
 msgid "_Keep highlighting"
@@ -1979,12 +1979,12 @@ msgstr ""
 "codificação \"%s\"\n"
 "Você gostaria de salvar como UTF-8?"
 
-#: ../meld/filediff.py:1545 ../meld/patchdialog.py:125
+#: ../meld/filediff.py:1545 ../meld/patchdialog.py:136
 #, python-format
 msgid "Could not save file %s."
 msgstr "Não foi possível salvar o arquivo %s."
 
-#: ../meld/filediff.py:1546 ../meld/patchdialog.py:126
+#: ../meld/filediff.py:1546 ../meld/patchdialog.py:137
 #, python-format
 msgid ""
 "Couldn't save file due to:\n"

From 890953f7028151b7b20453ef33e9990ee48affbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mario=20Bl=C3=A4ttermann?= <mario.blaettermann@gmail.com>
Date: Fri, 9 Sep 2016 18:38:44 +0000
Subject: [PATCH 31/51] Updated German translation

---
 po/de.po | 204 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 104 insertions(+), 100 deletions(-)

diff --git a/po/de.po b/po/de.po
index fb367325..d88629c7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,16 +14,16 @@ msgstr ""
 "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=meld&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-03-15 20:11+0000\n"
-"PO-Revision-Date: 2016-03-15 23:33+0100\n"
-"Last-Translator: Bernd Homuth <dev@hmt.im>\n"
+"POT-Creation-Date: 2016-08-20 21:39+0000\n"
+"PO-Revision-Date: 2016-09-09 20:38+0200\n"
+"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.7\n"
+"X-Generator: Poedit 1.8.9\n"
 "X-Poedit-Bookmarks: -1,351,-1,-1,-1,-1,-1,-1,-1,-1\n"
 
 #: ../bin/meld:144
@@ -92,6 +92,10 @@ msgstr ""
 "bereitet Ihnen bei  großen Zusammenführungskonflikten etwas wenige "
 "Kopfschmerzen."
 
+#: ../data/meld.appdata.xml.in.h:5
+msgid "The GNOME Project"
+msgstr "Das GNOME-Projekt"
+
 #: ../data/mime/meld.xml.in.h:1
 msgid "Meld comparison description"
 msgstr "Meld Vergleichsbeschreibung"
@@ -589,7 +593,7 @@ msgstr "Nach rechts kopieren"
 msgid "Delete selected"
 msgstr "Markierte löschen"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:859 ../meld/filediff.py:1363
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:860 ../meld/filediff.py:1368
 msgid "Hide"
 msgstr "Verbergen"
 
@@ -658,7 +662,7 @@ msgid "_Add"
 msgstr "_Hinzufügen"
 
 #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:649
+#: ../meld/vcview.py:655
 msgid "_Remove"
 msgstr "_Löschen"
 
@@ -680,7 +684,7 @@ msgstr "Hin_unter schieben"
 
 #. Create icon and filename CellRenderer
 #: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35
-#: ../meld/dirdiff.py:373
+#: ../meld/dirdiff.py:374
 msgid "Name"
 msgstr "Name"
 
@@ -881,8 +885,8 @@ msgstr "Wenn Sie nicht speichern, gehen die Änderungen verloren."
 msgid "Close _without Saving"
 msgstr "Schließen _ohne zu Speichern"
 
-#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:941 ../meld/filediff.py:1429
-#: ../meld/filediff.py:1497
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:942 ../meld/filediff.py:1434
+#: ../meld/filediff.py:1502
 msgid "_Cancel"
 msgstr "A_bbrechen"
 
@@ -919,7 +923,7 @@ msgstr "Nicht gespeicherte Dokumentenänderungen zurücknehmen?"
 msgid "Changes made to the following documents will be permanently lost:\n"
 msgstr "Änderungen der folgenden Dokumente werden verloren gehen:\n"
 
-#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:942 ../meld/filediff.py:1430
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:943 ../meld/filediff.py:1435
 msgid "_Replace"
 msgstr "E_rsetzen"
 
@@ -1613,7 +1617,7 @@ msgstr "Vorherige Mitteilungen:"
 msgid "Co_mmit"
 msgstr "Co_mmit"
 
-#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:337
+#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:343
 msgid "Location"
 msgstr "Ort"
 
@@ -1656,44 +1660,44 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:391 ../meld/preferences.py:82
+#: ../meld/dirdiff.py:392 ../meld/preferences.py:82
 msgid "Size"
 msgstr "Größe"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:399 ../meld/preferences.py:83
+#: ../meld/dirdiff.py:400 ../meld/preferences.py:83
 msgid "Modification time"
 msgstr "Änderungszeit"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:407 ../meld/preferences.py:84
+#: ../meld/dirdiff.py:408 ../meld/preferences.py:84
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: ../meld/dirdiff.py:537
+#: ../meld/dirdiff.py:538
 #, python-format
 msgid "Hide %s"
 msgstr "%s verbergen"
 
-#: ../meld/dirdiff.py:669 ../meld/dirdiff.py:693
+#: ../meld/dirdiff.py:670 ../meld/dirdiff.py:694
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] %s wird durchsucht"
 
-#: ../meld/dirdiff.py:826
+#: ../meld/dirdiff.py:827
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Fertig"
 
-#: ../meld/dirdiff.py:834
+#: ../meld/dirdiff.py:835
 msgid "Folders have no differences"
 msgstr "Keine Unterschiede zwischen Ordnern"
 
-#: ../meld/dirdiff.py:836
+#: ../meld/dirdiff.py:837
 msgid "Contents of scanned files in folders are identical."
 msgstr "Inhalte der untersuchten Dateien in den Ordnern sind identisch."
 
-#: ../meld/dirdiff.py:838
+#: ../meld/dirdiff.py:839
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1701,43 +1705,43 @@ msgstr ""
 "Untersuchte Dateien in den Ordner scheinen identisch zu sein, jedoch wurden "
 "die Dateiinhalte nicht geprüft."
 
-#: ../meld/dirdiff.py:841
+#: ../meld/dirdiff.py:842
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 "Dateifilter wurden verwendet, deshalb wurden nicht alle Dateien untersucht."
 
-#: ../meld/dirdiff.py:843
+#: ../meld/dirdiff.py:844
 msgid "Text filters are in use and may be masking content differences."
 msgstr ""
 "Textfilter werden verwendet, welche Unterschiede zwischen Dateien maskieren "
 "könnten."
 
-#: ../meld/dirdiff.py:861 ../meld/filediff.py:1365 ../meld/filediff.py:1395
-#: ../meld/filediff.py:1397 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122
+#: ../meld/dirdiff.py:862 ../meld/filediff.py:1370 ../meld/filediff.py:1400
+#: ../meld/filediff.py:1402 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122
 msgid "Hi_de"
 msgstr "Ver_bergen"
 
-#: ../meld/dirdiff.py:871
+#: ../meld/dirdiff.py:872
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Beim Einlesen dieses Ordners traten mehrere Fehler auf"
 
-#: ../meld/dirdiff.py:872
+#: ../meld/dirdiff.py:873
 msgid "Files with invalid encodings found"
 msgstr "Dateien mit ungültigen Kodierungen gefunden"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:874
+#: ../meld/dirdiff.py:875
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "Einige Dateien lagen in einer inkorrekten Kodierung vor. Folgende Namen sind "
 "davon betroffen:"
 
-#: ../meld/dirdiff.py:876
+#: ../meld/dirdiff.py:877
 msgid "Files hidden by case insensitive comparison"
 msgstr "Dateien durch von Schreibweise unabhängigen Vergleich verborgen"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:878
+#: ../meld/dirdiff.py:879
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1746,17 +1750,17 @@ msgstr ""
 "auf einem Dateisystem durch, welches zwischen Groß- und Kleinschreibung "
 "unterscheidet. Die folgenden Dateien in diesem Ordner sind nicht sichtbar:"
 
-#: ../meld/dirdiff.py:889
+#: ../meld/dirdiff.py:890
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "»%s« verborgen durch »%s«"
 
-#: ../meld/dirdiff.py:945
+#: ../meld/dirdiff.py:946
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Ordner »%s« ersetzen?"
 
-#: ../meld/dirdiff.py:947
+#: ../meld/dirdiff.py:948
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1765,11 +1769,11 @@ msgstr ""
 "Ein Ordner mit diesem Namen existiert bereits in »%s«.\n"
 "Wenn Sie den vorhandenen Ordner ersetzen, gehen alle Dateien darin verloren."
 
-#: ../meld/dirdiff.py:960
+#: ../meld/dirdiff.py:961
 msgid "Error copying file"
 msgstr "Fehler beim Kopieren der Datei"
 
-#: ../meld/dirdiff.py:961
+#: ../meld/dirdiff.py:962
 #, python-format
 msgid ""
 "Couldn't copy %s\n"
@@ -1782,35 +1786,35 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/dirdiff.py:984
+#: ../meld/dirdiff.py:985
 #, python-format
 msgid "Error deleting %s"
 msgstr "Fehler beim Löschen von »%s«"
 
-#: ../meld/dirdiff.py:1489
+#: ../meld/dirdiff.py:1492
 msgid "No folder"
 msgstr "Kein Ordner"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:359
+#: ../meld/filediff.py:357
 msgid "INS"
 msgstr "EINF"
 
-#: ../meld/filediff.py:359
+#: ../meld/filediff.py:357
 msgid "OVR"
 msgstr "ÜBR"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:361
+#: ../meld/filediff.py:359
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Zeile %i, Spalte %i"
 
-#: ../meld/filediff.py:776
+#: ../meld/filediff.py:771
 msgid "Comparison results will be inaccurate"
 msgstr "Ergebnisse werden ungenau sein"
 
-#: ../meld/filediff.py:778
+#: ../meld/filediff.py:773
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1819,66 +1823,66 @@ msgstr ""
 "nicht unterstützt, deshalb wird ein Vergleich keine korrekten Ergebnisse "
 "liefern."
 
-#: ../meld/filediff.py:836
+#: ../meld/filediff.py:831
 msgid "Mark conflict as resolved?"
 msgstr "Konflikt als _gelöst markieren?"
 
-#: ../meld/filediff.py:838
+#: ../meld/filediff.py:833
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
 "Wenn der Konflikt erfolgreich gelöst wurde, können Sie ihn jetzt als gelöst "
 "markieren."
 
-#: ../meld/filediff.py:840
+#: ../meld/filediff.py:835
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../meld/filediff.py:841
+#: ../meld/filediff.py:836
 msgid "Mark _Resolved"
 msgstr "Als _gelöst markieren"
 
-#: ../meld/filediff.py:1081
+#: ../meld/filediff.py:1086
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Beim Öffnen der Datei »%s« ist ein Fehler aufgetreten."
 
-#: ../meld/filediff.py:1089
+#: ../meld/filediff.py:1094
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Datei %s scheint eine Binärdatei zu sein."
 
-#: ../meld/filediff.py:1091
+#: ../meld/filediff.py:1096
 msgid "Do you want to open the file using the default application?"
 msgstr "Gewählte Datei in der vorgegebenen externen Anwendung öffnen?"
 
-#: ../meld/filediff.py:1093
+#: ../meld/filediff.py:1098
 msgid "Open"
 msgstr "Öffnen"
 
-#: ../meld/filediff.py:1109
+#: ../meld/filediff.py:1114
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Unterschiede werden berechnet"
 
-#: ../meld/filediff.py:1174
+#: ../meld/filediff.py:1179
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Die Datei %s wurde auf dem Datenträger geändert"
 
-#: ../meld/filediff.py:1175
+#: ../meld/filediff.py:1180
 msgid "Do you want to reload the file?"
 msgstr "Möchten Sie die Datei neu laden?"
 
-#: ../meld/filediff.py:1177
+#: ../meld/filediff.py:1182
 msgid "_Reload"
 msgstr "_Neu laden"
 
-#: ../meld/filediff.py:1328
+#: ../meld/filediff.py:1333
 msgid "Files are identical"
 msgstr "Dateien sind identisch"
 
-#: ../meld/filediff.py:1341
+#: ../meld/filediff.py:1346
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1886,11 +1890,11 @@ msgstr ""
 "Textfilter werden verwendet, welche Unterschiede zwischen Dateien maskieren "
 "könnten. Wollen Sie die ungefilterten Dateien vergleichen?"
 
-#: ../meld/filediff.py:1346
+#: ../meld/filediff.py:1351
 msgid "Files differ in line endings only"
 msgstr "Dateien unterscheiden sich nur in den Zeilenendungen"
 
-#: ../meld/filediff.py:1348
+#: ../meld/filediff.py:1353
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1899,15 +1903,15 @@ msgstr ""
 "Dateien sind identisch, abgesehen von unterschiedlichen Zeilenenden:\n"
 "%s"
 
-#: ../meld/filediff.py:1368
+#: ../meld/filediff.py:1373
 msgid "Show without filters"
 msgstr "Ungefiltert anzeigen"
 
-#: ../meld/filediff.py:1390
+#: ../meld/filediff.py:1395
 msgid "Change highlighting incomplete"
 msgstr "Änderungsmarkierung unvollständig"
 
-#: ../meld/filediff.py:1391
+#: ../meld/filediff.py:1396
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1916,20 +1920,20 @@ msgstr ""
 "Sie können Meld zur Hervorhebung längerer Änderungen zwingen, was jedoch "
 "langsam sein könnte."
 
-#: ../meld/filediff.py:1399
+#: ../meld/filediff.py:1404
 msgid "Keep highlighting"
 msgstr "Hervorhebung fortführen"
 
-#: ../meld/filediff.py:1401
+#: ../meld/filediff.py:1406
 msgid "_Keep highlighting"
 msgstr "Hervorhebung _fortführen"
 
-#: ../meld/filediff.py:1433
+#: ../meld/filediff.py:1438
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Datei »%s« ersetzen?"
 
-#: ../meld/filediff.py:1435
+#: ../meld/filediff.py:1440
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -1938,46 +1942,46 @@ msgstr ""
 "Eine Datei mit diesem Namen existiert bereits in »%s«.\n"
 "Wenn Sie die vorhandene Datei ersetzen, geht dessen Inhalt verloren."
 
-#: ../meld/filediff.py:1452
+#: ../meld/filediff.py:1457
 msgid "Save Left Pane As"
 msgstr "Linke Ansicht speichern unter"
 
-#: ../meld/filediff.py:1454
+#: ../meld/filediff.py:1459
 msgid "Save Middle Pane As"
 msgstr "Mittlere Ansicht speichern unter"
 
-#: ../meld/filediff.py:1456
+#: ../meld/filediff.py:1461
 msgid "Save Right Pane As"
 msgstr "Rechte Ansicht speichern unter"
 
-#: ../meld/filediff.py:1470
+#: ../meld/filediff.py:1475
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr ""
 "Die Datei %s wurde auf dem Datenträger geändert, seit sie geöffnet wurde"
 
-#: ../meld/filediff.py:1472
+#: ../meld/filediff.py:1477
 msgid "If you save it, any external changes will be lost."
 msgstr "Wenn Sie speichern, gehen externe Änderungen verloren."
 
-#: ../meld/filediff.py:1475
+#: ../meld/filediff.py:1480
 msgid "Save Anyway"
 msgstr "Dennoch speichern"
 
-#: ../meld/filediff.py:1476
+#: ../meld/filediff.py:1481
 msgid "Don't Save"
 msgstr "Nicht Speichern"
 
-#: ../meld/filediff.py:1498
+#: ../meld/filediff.py:1503
 msgid "_Save as UTF-8"
 msgstr "Als UTF-8 _speichern"
 
-#: ../meld/filediff.py:1501
+#: ../meld/filediff.py:1506
 #, python-format
 msgid "Couldn't encode text as “%s”"
 msgstr "Text konnte nicht als »%s« kodiert werden."
 
-#: ../meld/filediff.py:1503
+#: ../meld/filediff.py:1508
 #, python-format
 msgid ""
 "File “%s” contains characters that can't be encoded using encoding “%s”.\n"
@@ -1986,12 +1990,12 @@ msgstr ""
 "Die Datei »%s« enthält Zeichen, die mit »%s« nicht kodierbar sind.\n"
 "Möchten Sie im UTF-8-Format speichern?"
 
-#: ../meld/filediff.py:1540 ../meld/patchdialog.py:125
+#: ../meld/filediff.py:1545 ../meld/patchdialog.py:125
 #, python-format
 msgid "Could not save file %s."
 msgstr "Datei %s konnte nicht gespeichert werden."
 
-#: ../meld/filediff.py:1541 ../meld/patchdialog.py:126
+#: ../meld/filediff.py:1546 ../meld/patchdialog.py:126
 #, python-format
 msgid ""
 "Couldn't save file due to:\n"
@@ -2000,11 +2004,11 @@ msgstr ""
 "Datei konnte nicht gespeichert werden:\n"
 "%s"
 
-#: ../meld/filediff.py:1887
+#: ../meld/filediff.py:1892
 msgid "Live comparison updating disabled"
 msgstr "Direkte Vergleichsaktualisierung deaktiviert"
 
-#: ../meld/filediff.py:1888
+#: ../meld/filediff.py:1893
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2122,7 +2126,7 @@ msgid "invalid path or URI \"%s\""
 msgstr "Ungültiger Pfad oder Adresse »%s«."
 
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:127
+#: ../meld/meldbuffer.py:132
 msgid "<unnamed>"
 msgstr "<unbenannt>"
 
@@ -2364,7 +2368,7 @@ msgstr "Drei Dateien zum automatischen Zusammenführen benötigt, %r erhalten."
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Es kann keine Mischung aus Dateien und Ordnern verglichen werden"
 
-#: ../meld/misc.py:179
+#: ../meld/misc.py:203
 #, python-format
 msgid "Couldn't find colour scheme details for %s-%s; this is a bad install"
 msgstr ""
@@ -2372,7 +2376,7 @@ msgstr ""
 "ist fehlerhaft."
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:264
+#: ../meld/misc.py:288
 msgid "[None]"
 msgstr "[Nichts]"
 
@@ -2493,85 +2497,85 @@ msgstr "Nicht vorhanden"
 
 #. Translators: This error message is shown when a version
 #. control binary isn't installed.
-#: ../meld/vcview.py:255
+#: ../meld/vcview.py:261
 #, python-format
 msgid "%(name)s (%(cmd)s not installed)"
 msgstr "%(name)s (%(cmd)s ist nicht installiert"
 
 #. Translators: This error message is shown when a version
 #. controlled repository is invalid.
-#: ../meld/vcview.py:259
+#: ../meld/vcview.py:265
 #, python-format
 msgid "%(name)s (Invalid repository)"
 msgstr "%(name)s (ungültiger Softwarebestand)"
 
-#: ../meld/vcview.py:280
+#: ../meld/vcview.py:286
 msgid "No valid version control system found in this folder"
 msgstr "Kein gültiges Versionskontrollsystem in diesem Verzeichnis gefunden"
 
-#: ../meld/vcview.py:282
+#: ../meld/vcview.py:288
 msgid "Only one version control system found in this folder"
 msgstr "Nur eine Versionskontrolle in diesem Ordner gefunden"
 
-#: ../meld/vcview.py:284
+#: ../meld/vcview.py:290
 msgid "Choose which version control system to use"
 msgstr "Wählen Sie die zu verwendende Versionskontrolle"
 
 #. TRANSLATORS: This is the location of the directory being viewed
-#: ../meld/vcview.py:337
+#: ../meld/vcview.py:343
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:357
+#: ../meld/vcview.py:363
 #, python-format
 msgid "Scanning %s"
 msgstr "%s wird durchsucht"
 
-#: ../meld/vcview.py:396
+#: ../meld/vcview.py:402
 msgid "(Empty)"
 msgstr "(Leer)"
 
-#: ../meld/vcview.py:440
+#: ../meld/vcview.py:446
 #, python-format
 msgid "%s — local"
 msgstr "%s — lokal"
 
-#: ../meld/vcview.py:441
+#: ../meld/vcview.py:447
 #, python-format
 msgid "%s — remote"
 msgstr "%s — entfernt"
 
-#: ../meld/vcview.py:449
+#: ../meld/vcview.py:455
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (lokal, zusammengeführt, entfernt)"
 
-#: ../meld/vcview.py:454
+#: ../meld/vcview.py:460
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (entfernt, zusammengeführt, lokal)"
 
-#: ../meld/vcview.py:465
+#: ../meld/vcview.py:471
 #, python-format
 msgid "%s — repository"
 msgstr "%s — Softwarebestand"
 
-#: ../meld/vcview.py:471
+#: ../meld/vcview.py:477
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (Arbeitskopie, Softwarebestand)"
 
-#: ../meld/vcview.py:475
+#: ../meld/vcview.py:481
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (Softwarebestand, Arbeitskopie)"
 
-#: ../meld/vcview.py:643
+#: ../meld/vcview.py:649
 msgid "Remove folder and all its files?"
 msgstr "Den Ordner und alle Dateien entfernen?"
 
-#: ../meld/vcview.py:645
+#: ../meld/vcview.py:651
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2579,11 +2583,11 @@ msgstr ""
 "Dadurch werden alle gewählten Dateien, Ordner und deren Inhalte aus der "
 "Versionskontrolle entfernt."
 
-#: ../meld/vcview.py:670
+#: ../meld/vcview.py:676
 #, python-format
 msgid "Error removing %s"
 msgstr "Fehler beim Entfernen von %s"
 
-#: ../meld/vcview.py:750
+#: ../meld/vcview.py:756
 msgid "Clear"
 msgstr "Leeren"

From d34ef315cb895416cd836cca8b874c21f7677552 Mon Sep 17 00:00:00 2001
From: Vasily Galkin <galkin-vv@ya.ru>
Date: Tue, 13 Sep 2016 19:45:51 +0300
Subject: [PATCH 32/51] filediff: Round position to avoid recursive scroll sync
 (bgo#769705)

---
 meld/filediff.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meld/filediff.py b/meld/filediff.py
index e44049fa..c68f48de 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -18,6 +18,7 @@
 
 import copy
 import functools
+import math
 import os
 import time
 
@@ -1715,6 +1716,7 @@ def _sync_vscroll(self, adjustment, master):
                 val += (other_line-int(other_line)) * height
                 val = min(max(val, adj.get_lower()),
                           adj.get_upper() - adj.get_page_size())
+                val = math.floor(val)
                 adj.set_value(val)
 
                 # If we just changed the central bar, make it the master

From 1a59a7832327cbe6a9f6a8d818c36097aadd54d0 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sat, 17 Sep 2016 09:02:06 +1000
Subject: [PATCH 33/51] meldwindow: Fix for GtkWindow sizing API break
 (bgo#771288)

With client-side decorations, the window's saved size and set size
don't round-trip correctly. See bgo#771112 for more fun.
---
 meld/meldwindow.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meld/meldwindow.py b/meld/meldwindow.py
index d4196927..ac5c9abb 100644
--- a/meld/meldwindow.py
+++ b/meld/meldwindow.py
@@ -452,7 +452,8 @@ def on_configure_event(self, window, event):
         state = event.window.get_state()
         nosave = Gdk.WindowState.FULLSCREEN | Gdk.WindowState.MAXIMIZED
         if not (state & nosave):
-            variant = GLib.Variant('(ii)', (event.width, event.height))
+            width, height = self.widget.get_size()
+            variant = GLib.Variant('(ii)', (width, height))
             settings.set_value('window-size', variant)
 
         maximised = state & Gdk.WindowState.MAXIMIZED

From 6ac663a2ebe6eb0dff0e6ebecb4513d407ec4db6 Mon Sep 17 00:00:00 2001
From: Vasily Galkin <galkin-vv@ya.ru>
Date: Sat, 17 Sep 2016 12:08:33 +0300
Subject: [PATCH 34/51] Fix saving of text created in blank comparison
 (bgo#771498)

---
 meld/filediff.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meld/filediff.py b/meld/filediff.py
index c68f48de..0bde620c 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1494,6 +1494,9 @@ def on_file_changed_response(msgarea, response_id, *args):
         text = text_type(buf.get_text(start, end, False), 'utf8')
 
         source_encoding = bufdata.sourcefile.get_encoding()
+        if not source_encoding:
+            # no encoding for new blank comparison
+            source_encoding = GtkSource.Encoding.get_utf8()
         while isinstance(text, unicode):
             try:
                 encoding = source_encoding.get_charset()

From 137154ed2f6696ef35d5a81a69faade326d8b686 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sat, 24 Sep 2016 10:29:29 +1000
Subject: [PATCH 35/51] bin/meld: Setup glib log handler forwarding to Python
 logging

With this change, we hand warning-and-above logs from GTK+ on to our
Python logger, which gets us some consistency of formatting and
destination, but most importantly means that we also get to silence
GTK+ warnings based on whether the running Meld version is stable or
not.

Effectively, this should silence a lot of noisy complaints about
missing allocations and size requests not happening where GTK+'s
expectations have changed and we don't meet them... or the expectations
aren't actually documented anywhere.
---
 bin/meld | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/bin/meld b/bin/meld
index aeb9cd3c..14aa9e3f 100755
--- a/bin/meld
+++ b/bin/meld
@@ -243,6 +243,27 @@ def setup_logging():
     log.addHandler(handler)
 
 
+def setup_glib_logging():
+    from gi.repository import GLib
+    levels = {
+        GLib.LogLevelFlags.LEVEL_WARNING: logging.WARNING,
+        GLib.LogLevelFlags.LEVEL_ERROR: logging.ERROR,
+        GLib.LogLevelFlags.LEVEL_CRITICAL: logging.CRITICAL,
+    }
+    level_flag = (
+        GLib.LogLevelFlags.LEVEL_WARNING |
+        GLib.LogLevelFlags.LEVEL_ERROR |
+        GLib.LogLevelFlags.LEVEL_CRITICAL
+    )
+
+    log_domain = "Gtk"
+    log = logging.getLogger(log_domain)
+
+    def log_adapter(domain, level, message, user_data):
+        log.log(levels[level], message)
+    GLib.log_set_handler(log_domain, level_flag, log_adapter, None)
+
+
 def environment_hacks():
     # We manage cwd ourselves for git operations, and GIT_DIR in particular
     # can mess with this when set.
@@ -257,6 +278,7 @@ if __name__ == '__main__':
     setup_logging()
     disable_stdout_buffering()
     check_requirements()
+    setup_glib_logging()
     setup_resources()
     setup_settings()
     environment_hacks()

From 4f4c9ab6bf732ffbe8271321c0e6fdcf79cb503e Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Mon, 26 Sep 2016 07:15:26 +1000
Subject: [PATCH 36/51] Update NEWS

---
 NEWS | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/NEWS b/NEWS
index b8313254..cd92414e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,33 @@
 
+2016-09-26 meld 3.16.3
+======================
+
+  Fixes:
+
+   * Fix bad scroll syncing and inability to move between comparison chunks in
+     file comparisons (Vasily Galkin)
+   * Improve version control view behaviour when opening missing paths (Vasily
+     Galkin)
+   * Fix saving of text created in blank comparison (Vasily Galkin)
+   * GTK+ 3.22 compatibility fixes for saving window size (Kai Willadsen)
+   * Fix formatted patches missing newlines in certain cases (Kai Willadsen)
+   * Silence GTK+ warning logging if not running in uninstalled (i.e.,
+     development) mode (Kai Willadsen)
+   * Update AppData (Kai Willadsen)
+
+  Translations:
+
+   * Anders Jonsson (sv)
+   * Balázs Meskó (hu)
+   * Daniel Mustieles (es)
+   * Marek Černocký (cs)
+   * Mario Blättermann (de)
+   * Piotr Drąg (pl)
+   * Rafael Fontenelle (pt_BR)
+   * Tiago Santos (pt)
+   * Мирослав Николић (sr, sr@latin)
+
+
 2016-07-30 meld 3.16.2
 ======================
 

From 131d7a32c6394d8c643cf1b8a7ae0ea659402fcc Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Mon, 26 Sep 2016 07:15:47 +1000
Subject: [PATCH 37/51] Post-release version bump

---
 meld/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meld/conf.py b/meld/conf.py
index c446c5c1..f0f924d8 100644
--- a/meld/conf.py
+++ b/meld/conf.py
@@ -3,7 +3,7 @@
 import sys
 
 __package__ = "meld"
-__version__ = "3.16.3"
+__version__ = "3.16.4"
 
 # START; these paths are clobbered on install by meld.build_helpers
 DATADIR = os.path.join(sys.prefix, "share", "meld")

From 0fbbfbc4993f319d68609c2ea470de09fa285e17 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sun, 16 Oct 2016 06:06:29 +1000
Subject: [PATCH 38/51] bin/meld: Fix unintentional glib requirement bump

GLib.log_set_handler() is only available in 2.46, and I definitely
didn't intend that version bump.
---
 bin/meld | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bin/meld b/bin/meld
index 14aa9e3f..1e4c75da 100755
--- a/bin/meld
+++ b/bin/meld
@@ -261,7 +261,12 @@ def setup_glib_logging():
 
     def log_adapter(domain, level, message, user_data):
         log.log(levels[level], message)
-    GLib.log_set_handler(log_domain, level_flag, log_adapter, None)
+
+    try:
+        GLib.log_set_handler(log_domain, level_flag, log_adapter, None)
+    except AttributeError:
+        # Only present in glib 2.46+
+        pass
 
 
 def environment_hacks():

From 2fd56002309443df22156728fb5c62500a4c6b50 Mon Sep 17 00:00:00 2001
From: Patrick Griffis <tingping@tingping.se>
Date: Mon, 17 Oct 2016 01:17:08 -0400
Subject: [PATCH 39/51] Handle style theme not existing

---
 meld/misc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meld/misc.py b/meld/misc.py
index aea2b3e3..ebe78034 100644
--- a/meld/misc.py
+++ b/meld/misc.py
@@ -187,7 +187,7 @@ def colour_lookup_with_fallback(name, attribute):
     from meld.settings import meldsettings
     source_style = meldsettings.style_scheme
 
-    style = source_style.get_style(name)
+    style = source_style.get_style(name) if source_style else None
     style_attr = getattr(style.props, attribute) if style else None
     if not style or not style_attr:
         base_style = get_base_style_scheme()

From 39b3312470a72c4d07678654924ce9fe9060ea84 Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@2xlibre.net>
Date: Mon, 24 Oct 2016 16:16:41 +0200
Subject: [PATCH 40/51] Updated French translation

---
 po/fr.po | 3011 +++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 2048 insertions(+), 963 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index 12383adf..4a4f94c5 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,38 +1,54 @@
 # French translation of Meld.
-# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+# Copyright (C) 2003-2016 Free Software Foundation, Inc.
 # This file is distributed under the same license as the meld package.
 #
 # Stephen Kennedy <steve9000@users.sourceforge.net>, 2003.
 # Jonathan Ernst <jonathan@ernstfamily.ch>, 2006.
-# Claude Paroz <claude@2xlibre.net>, 2006-2011.
+# Claude Paroz <claude@2xlibre.net>, 2006-2016.
 # Robert-André Mauchin <zebob.m@pengzone.org>, 2007.
 # Bruno Brouard <annoa.b@gmail.com>, 2009-2012.
+# Jérôme Sirgue <jsirgue@free.fr>, 2014.
+# Julien Hardelin <jhardlin@orange.fr>, 2014, 2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Meld HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=meld&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-04-30 14:40+0000\n"
-"PO-Revision-Date: 2012-04-15 16:49+0200\n"
-"Last-Translator: Bruno Brouard <annoa.b@gmail.com>\n"
+"POT-Creation-Date: 2016-10-21 21:13+0000\n"
+"PO-Revision-Date: 2016-10-24 16:16+0200\n"
+"Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../bin/meld:103
+#: ../bin/meld:144
 msgid "Cannot import: "
 msgstr "Impossible d'importer : "
 
-#: ../bin/meld:106
+#: ../bin/meld:147
 #, c-format
 msgid "Meld requires %s or higher."
 msgstr "Meld nécessite %s ou supérieur."
 
-#: ../data/meld.desktop.in.h:1 ../data/ui/meldapp.ui.h:1
+#: ../bin/meld:151
+msgid "Meld does not support Python 3."
+msgstr "Meld ne prend pas en charge Python 3."
+
+#: ../bin/meld:200
+#, c-format
+msgid ""
+"Couldn't load Meld-specific CSS (%s)\n"
+"%s"
+msgstr ""
+"Impossible de charger une CSS spécifique de Meld (%s)\n"
+"%s"
+
+#: ../data/meld.desktop.in.h:1 ../data/meld.appdata.xml.in.h:1
+#: ../data/ui/meldapp.ui.h:1
 msgid "Meld"
 msgstr "Meld"
 
@@ -44,10 +60,589 @@ msgstr "Visionneur de différences"
 msgid "Meld Diff Viewer"
 msgstr "Meld visionneur de différences"
 
-#: ../data/meld.desktop.in.h:4
+#: ../data/meld.desktop.in.h:4 ../data/meld.appdata.xml.in.h:2
 msgid "Compare and merge your files"
 msgstr "Comparer et fusionner des fichiers"
 
+#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: ../data/meld.desktop.in.h:6
+msgid "diff;merge;"
+msgstr "diff;fusion;"
+
+#: ../data/meld.appdata.xml.in.h:3
+msgid ""
+"Meld is a visual diff and merge tool targeted at developers. Meld helps you "
+"compare files, directories, and version controlled projects. It provides "
+"two- and three-way comparison of both files and directories, and supports "
+"many version control systems including Git, Mercurial, Bazaar and Subversion."
+msgstr ""
+"Meld est un visionneur de différences et un outil de fusion destiné à des "
+"développeurs. Il aide à comparer des fichiers, des dossiers et des projets "
+"dépendants d'un gestionnaire de version. Il permet des comparaisons de 2 ou "
+"3 fichiers ou dossiers, et prend en charge de nombreux gestionnaires de "
+"version, dont Git, Mercurial, Bazaar et Subversion."
+
+#: ../data/meld.appdata.xml.in.h:4
+msgid ""
+"Meld helps you review code changes, understand patches, and makes enormous "
+"merge conflicts slightly less painful."
+msgstr ""
+"Meld aide à réviser les modifications de code, à comprendre les correctifs "
+"et permet de rendre d'énormes conflits de fusion un peu moins pénibles à "
+"fusionner."
+
+#: ../data/meld.appdata.xml.in.h:5
+msgid "The GNOME Project"
+msgstr "Le projet GNOME"
+
+#: ../data/mime/meld.xml.in.h:1
+msgid "Meld comparison description"
+msgstr "Description de la comparaison Meld"
+
+#: ../data/org.gnome.meld.gschema.xml.h:1
+msgid "Default window size"
+msgstr "Taille par défaut de la fenêtre"
+
+#: ../data/org.gnome.meld.gschema.xml.h:2
+msgid "Default window state"
+msgstr "État par défaut de la fenêtre"
+
+#: ../data/org.gnome.meld.gschema.xml.h:3
+msgid "Show toolbar"
+msgstr "Afficher la barre d'outils"
+
+#: ../data/org.gnome.meld.gschema.xml.h:4
+msgid "If true, the window toolbar is visible."
+msgstr "Si cette option est cochée, la barre d'outils est visible."
+
+#: ../data/org.gnome.meld.gschema.xml.h:5
+msgid "Show statusbar"
+msgstr "Afficher la barre d'état"
+
+#: ../data/org.gnome.meld.gschema.xml.h:6
+msgid "If true, the window statusbar is visible."
+msgstr "Si cette option est cochée, la barre d'état est visible."
+
+#: ../data/org.gnome.meld.gschema.xml.h:7
+msgid "Additional automatically detected text encodings"
+msgstr "Supplément de codages de texte automatiquement détectés"
+
+#: ../data/org.gnome.meld.gschema.xml.h:8
+msgid ""
+"Meld will use these text encodings to try to decode loaded text files before "
+"trying any other encodings. In addition to the encodings in this list, UTF-8 "
+"and the current locale-default encoding will always be used; other encodings "
+"may also be tried, depending on the user's locale."
+msgstr ""
+"Meld utilise ces codages de caractères pour tenter de décoder les fichiers "
+"texte chargés avant d'essayer d'en utiliser d'autres. En plus des codages de "
+"cette liste, UTF-8 et le codage de la langue actuelle par défaut sont "
+"toujours utilisés ; d'autres codages peuvent être essayés, selon la langue "
+"locale de l'utilisateur."
+
+#: ../data/org.gnome.meld.gschema.xml.h:9
+msgid "Width of an indentation step"
+msgstr "Largeur d'un pas d'indentation"
+
+#: ../data/org.gnome.meld.gschema.xml.h:10
+msgid "The number of spaces to use for a single indent step"
+msgstr "Nombre d'espaces à utiliser pour un pas d'indentation"
+
+#: ../data/org.gnome.meld.gschema.xml.h:11
+msgid "Whether to indent using spaces or tabs"
+msgstr ""
+"Indique s'il faut utiliser des espaces ou des tabulations pour indenter"
+
+#: ../data/org.gnome.meld.gschema.xml.h:12
+msgid "If true, any new indentation will use spaces instead of tabs."
+msgstr ""
+"Si cette option est cochée, toute nouvelle indentation utilisera des espaces "
+"au lieu de tabulations."
+
+#: ../data/org.gnome.meld.gschema.xml.h:13
+msgid "Show line numbers"
+msgstr "Afficher les numéros de ligne"
+
+#: ../data/org.gnome.meld.gschema.xml.h:14
+msgid "If true, line numbers will be shown in the gutter of file comparisons."
+msgstr ""
+"Si cette option est cochée, les numéros de ligne s'afficheront dans la barre "
+"centrale des comparaisons de fichiers."
+
+#: ../data/org.gnome.meld.gschema.xml.h:15
+msgid "Highlight syntax"
+msgstr "Coloration syntaxique"
+
+#: ../data/org.gnome.meld.gschema.xml.h:16
+msgid ""
+"Whether to highlight syntax in comparisons. Because of Meld's own color "
+"highlighting, this is off by default."
+msgstr ""
+"Indique si la coloration syntaxique doit être activée dans les comparaisons. "
+"En raison de la coloration propre à Meld, ceci est désactivé par défaut."
+
+#: ../data/org.gnome.meld.gschema.xml.h:17
+msgid "Color scheme to use for syntax highlighting"
+msgstr "Jeu de couleurs à utiliser pour la coloration syntaxique"
+
+#: ../data/org.gnome.meld.gschema.xml.h:18
+msgid "Used by GtkSourceView to determine colors for syntax highlighting"
+msgstr ""
+"Utilisé par GtkSourceView pour définir les couleurs de la coloration "
+"syntaxique"
+
+#: ../data/org.gnome.meld.gschema.xml.h:19
+msgid "Displayed whitespace"
+msgstr "Afficher les espaces"
+
+#: ../data/org.gnome.meld.gschema.xml.h:20
+msgid ""
+"Selector for individual whitespace character types to be shown. Possible "
+"values are 'space', 'tab', 'newline' and 'nbsp'."
+msgstr ""
+"Sélecteur de caractère d'espace à afficher. Les choix possibles sont "
+"« space » (espace), « tab », « newline » (retour à la ligne) et "
+"« nbsp » (espace insécable)."
+
+#: ../data/org.gnome.meld.gschema.xml.h:21
+msgid "Wrap mode"
+msgstr "Mode de retour à la ligne"
+
+#: ../data/org.gnome.meld.gschema.xml.h:22
+msgid ""
+"Lines in file comparisons will be wrapped according to this setting, either "
+"not at all ('none'), at any character ('char') or only at the end of words "
+"('word')."
+msgstr ""
+"Les retours à la ligne dans les comparaisons de fichiers se font selon ce "
+"choix : « none » (pas du tout), « char » (n'importe quel caractère) ou "
+"« word » (seulement à la fin des mots)."
+
+#: ../data/org.gnome.meld.gschema.xml.h:23
+msgid "Highlight current line"
+msgstr "Surligner la ligne actuelle"
+
+#: ../data/org.gnome.meld.gschema.xml.h:24
+msgid ""
+"If true, the line containing the cursor will be highlighted in file "
+"comparisons."
+msgstr ""
+"Si cette option est cochée, la ligne où le curseur se trouve sera surlignée "
+"dans les comparaisons de fichiers."
+
+#: ../data/org.gnome.meld.gschema.xml.h:25
+msgid "Use the system default monospace font"
+msgstr "Utiliser la police à chasse fixe du système"
+
+#: ../data/org.gnome.meld.gschema.xml.h:26
+msgid ""
+"If false, custom-font will be used instead of the system monospace font."
+msgstr ""
+"Si cette option n'est pas cochée, la police personnalisée (« custom-font ») "
+"sera utilisée au lieu de la police à chasse fixe du système."
+
+#: ../data/org.gnome.meld.gschema.xml.h:27
+msgid "Custom font"
+msgstr "Police personnalisée"
+
+#: ../data/org.gnome.meld.gschema.xml.h:28
+msgid ""
+"The custom font to use, stored as a string and parsed as a Pango font "
+"description."
+msgstr ""
+"La police personnalisée à utiliser, sous la forme d'une chaîne de caractères "
+"et analysée comme une description de police Pango."
+
+#: ../data/org.gnome.meld.gschema.xml.h:29
+msgid "Ignore blank lines when comparing files"
+msgstr "Ignorer les lignes vides dans les comparaisons de fichiers."
+
+#: ../data/org.gnome.meld.gschema.xml.h:30
+msgid ""
+"If true, blank lines will be trimmed when highlighting changes between files."
+msgstr ""
+"Si cette option est cochée, les lignes vides sont ignorées dans la mise en "
+"évidence des changements entre fichiers."
+
+#: ../data/org.gnome.meld.gschema.xml.h:31
+msgid "Use the system default editor"
+msgstr "Utiliser l'éditeur par défaut du système"
+
+#: ../data/org.gnome.meld.gschema.xml.h:32
+msgid ""
+"If false, custom-editor-command will be used instead of the system editor "
+"when opening files externally."
+msgstr ""
+"Si cette option n'est pas cochée, l'éditeur personnalisé (« custom-editor-"
+"command ») sera utilisé à la place de l'éditeur par défaut du système lors "
+"de l'ouverture de fichiers en dehors de Meld."
+
+#: ../data/org.gnome.meld.gschema.xml.h:33
+msgid "The custom editor launch command"
+msgstr "Commande de lancement de l'éditeur personnalisé"
+
+#: ../data/org.gnome.meld.gschema.xml.h:34
+msgid ""
+"The command used to launch a custom editor. Some limited templating is "
+"supported here; at the moment '{file}' and '{line}' are recognised tokens."
+msgstr ""
+"La commande utilisée pour lancer un éditeur personnalisé. L'utilisation de "
+"modèle est, dans certaines limites, permise ici ; pour le moment, « {file} » "
+"et « {line} » sont des marqueurs reconnus."
+
+#: ../data/org.gnome.meld.gschema.xml.h:35
+msgid "Columns to display"
+msgstr "Colonnes à afficher"
+
+#: ../data/org.gnome.meld.gschema.xml.h:36
+msgid ""
+"List of column names in folder comparison and whether they should be "
+"displayed."
+msgstr ""
+"Liste des noms de colonnes dans la comparaison de dossiers et choix de leur "
+"affichage ou non."
+
+#: ../data/org.gnome.meld.gschema.xml.h:37 ../data/ui/preferences.ui.h:32
+msgid "Ignore symbolic links"
+msgstr "Ignorer les liens symboliques"
+
+#: ../data/org.gnome.meld.gschema.xml.h:38
+msgid ""
+"If true, folder comparisons do not follow symbolic links when traversing the "
+"folder tree."
+msgstr ""
+"Si cette option est cochée, la comparaison de dossiers ne prendra pas en "
+"compte les liens symboliques en parcourant l'arborescence."
+
+#: ../data/org.gnome.meld.gschema.xml.h:39
+msgid "Use shallow comparison"
+msgstr "Utiliser la comparaison superficielle"
+
+#: ../data/org.gnome.meld.gschema.xml.h:40
+msgid ""
+"If true, folder comparisons compare files based solely on size and mtime, "
+"considering files to be identical if their size and mtime match, and "
+"different otherwise."
+msgstr ""
+"Si cette option est cochée, la comparaison de dossiers vérifiera seulement "
+"la taille et l'horodatage des fichiers, considérant les fichiers comme "
+"identiques si ces valeurs sont égales, comme différents dans le cas inverse."
+
+#: ../data/org.gnome.meld.gschema.xml.h:41
+msgid "File timestamp resolution"
+msgstr "Précision de l'horodatage des fichiers"
+
+#: ../data/org.gnome.meld.gschema.xml.h:42
+msgid ""
+"When comparing based on mtime, this is the minimum difference in nanoseconds "
+"between two files before they're considered to have different mtimes. This "
+"is useful when comparing files between filesystems with different timestamp "
+"resolution."
+msgstr ""
+"Dans une comparaison basée sur l'horodatage, ceci est la différence minimale "
+"en nanosecondes entre deux fichiers avant que leurs horodatages ne soient "
+"considérés comme différents. Ceci est utile pour comparer des fichiers "
+"stockés sur des systèmes de fichiers ayant une précision d'horodatage "
+"différente."
+
+#: ../data/org.gnome.meld.gschema.xml.h:43 ../data/ui/preferences.ui.h:30
+msgid "Apply text filters during folder comparisons"
+msgstr "Appliquer les filtres de texte dans la comparaison de dossiers"
+
+#: ../data/org.gnome.meld.gschema.xml.h:44
+msgid ""
+"If true, folder comparisons that compare file contents also apply active "
+"text filters and the blank line trimming option, and ignore newline "
+"differences."
+msgstr ""
+"Si cette option est cochée, les comparaisons de dossiers qui comparent des "
+"contenus de fichiers appliquent également les filtres de texte actifs et "
+"l'option d'ignorance des lignes vides, et ignore les différences de sauts de "
+"ligne."
+
+#: ../data/org.gnome.meld.gschema.xml.h:45
+msgid "File status filters"
+msgstr "Filtres sur l'état des fichiers"
+
+#: ../data/org.gnome.meld.gschema.xml.h:46
+msgid "List of statuses used to filter visible files in folder comparison."
+msgstr ""
+"Liste des états de fichiers utilisés pour filtrer les fichiers visibles dans "
+"la comparaison de dossiers."
+
+#: ../data/org.gnome.meld.gschema.xml.h:47
+msgid "Show the version control console output"
+msgstr "Afficher la sortie de la console du gestionnaire de versions"
+
+#: ../data/org.gnome.meld.gschema.xml.h:48
+msgid ""
+"If true, a console output section will be shown in version control views, "
+"showing the commands run for version control operations."
+msgstr ""
+"Si cette option est cochée, la sortie de la console sera affichée dans les "
+"affichages de gestionnaire de version, avec les commandes exécutées lors des "
+"opérations de gestion de version."
+
+#: ../data/org.gnome.meld.gschema.xml.h:49
+msgid "Version control pane position"
+msgstr "Position du panneau de gestion de version"
+
+#: ../data/org.gnome.meld.gschema.xml.h:50
+msgid ""
+"This is the height of the main version control tree when the console pane is "
+"shown."
+msgstr ""
+"Hauteur de l'arborescence principale de gestion de version quand le panneau "
+"du terminal est affiché."
+
+#: ../data/org.gnome.meld.gschema.xml.h:51
+msgid "Present version comparisons as left-local/right-remote"
+msgstr ""
+"Afficher les comparaisons de versions sous la forme version locale à gauche, "
+"version distante à droite"
+
+#: ../data/org.gnome.meld.gschema.xml.h:52
+msgid ""
+"If true, version control comparisons will use a left-is-local, right-is-"
+"remote scheme to determine what order to present files in panes. Otherwise, "
+"a left-is-theirs, right-is-mine scheme is used."
+msgstr ""
+"Si cette option est cochée, les comparaisons de gestion de version "
+"présentent le dossier local à gauche, le distant à droite. Autrement, la "
+"disposition inverse est utilisée."
+
+#: ../data/org.gnome.meld.gschema.xml.h:53
+msgid "Order for files in three-way version control merge comparisons"
+msgstr "Ordre des fichiers dans les comparaisons de fusion à trois fichiers"
+
+#: ../data/org.gnome.meld.gschema.xml.h:54
+msgid ""
+"Choices for file order are remote/merged/local and local/merged/remote. This "
+"preference only affects three-way comparisons launched from the version "
+"control view, so is used solely for merges/conflict resolution within Meld."
+msgstr ""
+"Les choix pour l'ordre des fichiers sont : « remote/merged/local » (distant/"
+"fusionné/local et « local/merged/remote » (local/fusionné/distant). Cette "
+"préférence n'affecte que les comparaisons à trois fichiers lancées depuis la "
+"fenêtre de gestion de version ; elle n'est donc utilisée que pour la "
+"résolution des conflits de fusion dans Meld."
+
+#: ../data/org.gnome.meld.gschema.xml.h:55
+msgid "Show margin in commit message editor"
+msgstr "Afficher la marge dans l'éditeur de message de « commit »"
+
+#: ../data/org.gnome.meld.gschema.xml.h:56
+msgid ""
+"If true, a guide will be displayed to show what column the margin is at in "
+"the version control commit message editor."
+msgstr ""
+"Si cette option est cochée, un guide sera affiché pour indiquer à quelle "
+"colonne correspond la marge dans l'éditeur de message de « commit » de la "
+"gestion de version."
+
+#: ../data/org.gnome.meld.gschema.xml.h:57
+msgid "Margin column in commit message editor"
+msgstr "Largeur de la marge dans l'éditeur de message de « commit »"
+
+#: ../data/org.gnome.meld.gschema.xml.h:58
+msgid ""
+"The column at which to show the margin in the version control commit message "
+"editor."
+msgstr ""
+"La colonne à laquelle afficher la marge dans l'éditeur de message de "
+"« commit » de la gestion de version."
+
+#: ../data/org.gnome.meld.gschema.xml.h:59
+msgid "Automatically hard-wrap commit messages"
+msgstr "Retourner à la ligne automatiquement dans les messages de « commit »"
+
+#: ../data/org.gnome.meld.gschema.xml.h:60
+msgid ""
+"If true, the version control commit message editor will hard-wrap (i.e., "
+"insert line breaks) at the commit margin before commit."
+msgstr ""
+"Si cette option est cochée, l'éditeur de message de « commit » insérera "
+"automatiquement des retours à la ligne (sauts de ligne réels) à la marge "
+"définie avant de procéder au « commit »."
+
+#: ../data/org.gnome.meld.gschema.xml.h:61
+msgid "Version control status filters"
+msgstr "Filtres d'état du gestionnaire de version"
+
+#: ../data/org.gnome.meld.gschema.xml.h:62
+msgid ""
+"List of statuses used to filter visible files in version control comparison."
+msgstr ""
+"Liste d'états utilisés pour filtrer les fichiers visibles dans la "
+"comparaison en mode gestionnaire de version."
+
+#: ../data/org.gnome.meld.gschema.xml.h:63
+msgid "Filename-based filters"
+msgstr "Filtres sur le nom de fichier"
+
+#: ../data/org.gnome.meld.gschema.xml.h:64
+msgid ""
+"List of predefined filename-based filters that, if active, will remove "
+"matching files from a folder comparison."
+msgstr ""
+"Liste de filtres de nom de fichier prédéfinis, qui retirent les fichiers "
+"correspondants de la comparaison de dossiers quand ils sont actifs."
+
+#: ../data/org.gnome.meld.gschema.xml.h:65
+msgid "Text-based filters"
+msgstr "Filtres textuels"
+
+#: ../data/org.gnome.meld.gschema.xml.h:66
+msgid ""
+"List of predefined text-based regex filters that, if active, will remove "
+"text from being used in a file comparison. The text will still be displayed, "
+"but won't contribute to the comparison itself."
+msgstr ""
+"Liste de filtres textuels prédéfinis, basés sur les expressions régulières, "
+"qui empêchent l'utilisation du texte correspondant dans les comparaisons de "
+"fichiers. Le texte reste affiché mais n'est pas pris en compte dans la "
+"comparaison."
+
+#: ../data/styles/meld-base.xml.h:1
+msgid "Meld base scheme"
+msgstr "Jeu de couleurs de base"
+
+#: ../data/styles/meld-base.xml.h:2
+msgid "Base color scheme for Meld highlighting"
+msgstr "Jeu de couleurs de base pour la coloration dans Meld"
+
+#: ../data/styles/meld-dark.xml.h:1
+msgid "Meld dark scheme"
+msgstr "Jeu de couleurs sombres"
+
+#: ../data/styles/meld-dark.xml.h:2
+msgid "Dark color scheme for Meld highlighting"
+msgstr "Jeu de couleurs sombres pour la coloration dans Meld"
+
+#: ../data/ui/application.ui.h:1
+msgid "About Meld"
+msgstr "À propos de Meld"
+
+#: ../data/ui/application.ui.h:2
+msgid ""
+"Copyright © 2002-2009 Stephen Kennedy\n"
+"Copyright © 2009-2013 Kai Willadsen"
+msgstr ""
+"Copyright © 2002-2009 Stephen Kennedy\n"
+"Copyright © 2009-2013 Kai Willadsen"
+
+#: ../data/ui/application.ui.h:4
+msgid "Website"
+msgstr "Site Web"
+
+#: ../data/ui/application.ui.h:5
+msgid "translator-credits"
+msgstr ""
+"Stephen Kennedy <steve9000@users.sourceforge.net>, 2003\n"
+"Jonathan Ernst <jonathan@ernstfamily.ch>, 2006\n"
+"Claude Paroz <claude@2xlibre.net>, 2006-2016\n"
+"Robert-André Mauchin <zebob.m@pengzone.org>, 2007\n"
+"Bruno Brouard <annoa.b@gmail.com>, 2009-2010\n"
+"Jérôme Sirgue <jsirgue@free.fr>, 2014"
+
+#: ../data/ui/application.ui.h:6
+msgid "_Preferences"
+msgstr "_Préférences"
+
+#: ../data/ui/application.ui.h:7
+msgid "_Help"
+msgstr "Aid_e"
+
+#: ../data/ui/application.ui.h:8
+msgid "Keyboard Shortcuts"
+msgstr "Raccourcis clavier"
+
+#: ../data/ui/application.ui.h:9
+msgid "_About"
+msgstr "À _propos"
+
+#: ../data/ui/application.ui.h:10
+msgid "_Quit"
+msgstr "_Quitter"
+
+#: ../data/ui/dirdiff.ui.h:1 ../data/ui/vcview.ui.h:1
+msgid "_Compare"
+msgstr "_Comparer"
+
+#: ../data/ui/dirdiff.ui.h:2 ../data/ui/vcview.ui.h:2
+msgid "Compare selected files"
+msgstr "Comparer les fichiers sélectionnés"
+
+#: ../data/ui/dirdiff.ui.h:3
+msgid "Copy to _Left"
+msgstr "Copier vers la _gauche"
+
+#: ../data/ui/dirdiff.ui.h:4
+msgid "Copy to left"
+msgstr "Copie vers la gauche"
+
+#: ../data/ui/dirdiff.ui.h:5
+msgid "Copy to _Right"
+msgstr "Copier vers la _droite"
+
+#: ../data/ui/dirdiff.ui.h:6
+msgid "Copy to right"
+msgstr "Copie vers la droite"
+
+#: ../data/ui/dirdiff.ui.h:7
+msgid "Delete selected"
+msgstr "Effacer la sélection"
+
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:860 ../meld/filediff.py:1369
+msgid "Hide"
+msgstr "Masquer"
+
+#: ../data/ui/dirdiff.ui.h:9
+msgid "Hide selected"
+msgstr "Masquer la sélection"
+
+#: ../data/ui/dirdiff.ui.h:10
+msgid "Ignore Filename Case"
+msgstr "Ignorer la casse des noms de fichiers"
+
+#: ../data/ui/dirdiff.ui.h:11
+msgid ""
+"Consider differently-cased filenames that are otherwise-identical to be the "
+"same"
+msgstr "Ne pas tenir compte de la casse pour comparer les noms de fichiers"
+
+#: ../data/ui/dirdiff.ui.h:12
+msgid "Same"
+msgstr "Identiques"
+
+#: ../data/ui/dirdiff.ui.h:13
+msgid "Show identical"
+msgstr "Afficher les fichiers identiques"
+
+#: ../data/ui/dirdiff.ui.h:14
+msgid "New"
+msgstr "Nouveaux"
+
+#: ../data/ui/dirdiff.ui.h:15
+msgid "Show new"
+msgstr "Afficher les nouveaux fichiers"
+
+#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:74
+msgid "Modified"
+msgstr "Modifiés"
+
+#: ../data/ui/dirdiff.ui.h:17
+msgid "Show modified"
+msgstr "Afficher les objets modifiés"
+
+#: ../data/ui/dirdiff.ui.h:18
+msgid "Filters"
+msgstr "Filtres"
+
+#: ../data/ui/dirdiff.ui.h:19
+msgid "Set active filters"
+msgstr "Définir les filtres actifs"
+
 #: ../data/ui/EditableList.ui.h:1
 msgid "Editable List"
 msgstr "Liste modifiable"
@@ -56,67 +651,286 @@ msgstr "Liste modifiable"
 msgid "Active"
 msgstr "Actif"
 
-#: ../data/ui/EditableList.ui.h:3 ../meld/vcview.py:166
-msgid "Name"
-msgstr "Nom"
-
-#: ../data/ui/EditableList.ui.h:4
-msgid "Pattern"
-msgstr "Motif"
+#: ../data/ui/EditableList.ui.h:3
+msgid "Column Name"
+msgstr "Nom de la colonne"
 
-#: ../data/ui/EditableList.ui.h:5
-msgid "Add new filter"
-msgstr "Ajouter un nouveau filtre"
-
-#: ../data/ui/EditableList.ui.h:6 ../meld/vcview.py:130
+#: ../data/ui/EditableList.ui.h:4 ../data/ui/vcview.ui.h:9
 msgid "_Add"
 msgstr "_Ajouter"
 
-#: ../data/ui/EditableList.ui.h:7
-msgid "Remove selected filter"
-msgstr "Enlève le filtre sélectionné"
-
-#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:132
+#: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
+#: ../meld/vcview.py:655
 msgid "_Remove"
 msgstr "_Supprimer"
 
-#: ../data/ui/EditableList.ui.h:9
+#: ../data/ui/EditableList.ui.h:6
 msgid "Move item up"
 msgstr "Fait monter l'élément"
 
-#: ../data/ui/EditableList.ui.h:10
+#: ../data/ui/EditableList.ui.h:7
 msgid "Move _Up"
 msgstr "_Monter"
 
-#: ../data/ui/EditableList.ui.h:11
+#: ../data/ui/EditableList.ui.h:8
 msgid "Move item down"
 msgstr "Fait descendre l'élément"
 
-#: ../data/ui/EditableList.ui.h:12
+#: ../data/ui/EditableList.ui.h:9
 msgid "Move _Down"
 msgstr "_Descendre"
 
+#. Create icon and filename CellRenderer
+#: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35
+#: ../meld/dirdiff.py:374
+msgid "Name"
+msgstr "Nom"
+
+#: ../data/ui/EditableList.ui.h:11
+msgid "Pattern"
+msgstr "Motif"
+
+#: ../data/ui/EditableList.ui.h:12
+msgid "Add new filter"
+msgstr "Ajouter un nouveau filtre"
+
+#: ../data/ui/EditableList.ui.h:13
+msgid "Remove selected filter"
+msgstr "Enlève le filtre sélectionné"
+
 #: ../data/ui/filediff.ui.h:1
-msgid "Save modified files?"
-msgstr "Enregistrer les fichiers modifiés ?"
+msgid "Format as Patch..."
+msgstr "Créer un correctif (patch)…"
 
 #: ../data/ui/filediff.ui.h:2
-msgid ""
-"Some files have been modified.\n"
-"Which ones would you like to save?"
+msgid "Create a patch using differences between files"
 msgstr ""
-"Des fichiers ont été modifiés.\n"
-"Lesquels souhaitez-vous enregistrer ?"
+"Crée un correctif (patch) en utilisant les différences entre les fichiers"
+
+#: ../data/ui/filediff.ui.h:3
+msgid "Save A_ll"
+msgstr "_Tout enregistrer"
 
 #: ../data/ui/filediff.ui.h:4
-msgid "_Discard Changes"
-msgstr "_Fermer sans enregistrer"
+msgid "Save all files in the current comparison"
+msgstr "Enregistrer tous les fichiers de la comparaison en cours"
 
 #: ../data/ui/filediff.ui.h:5
-msgid "_Save Selected"
-msgstr "_Enregistrer la sélection"
+msgid "Revert files to their saved versions"
+msgstr "Rétablir les fichiers dans leurs versions enregistrées"
+
+#: ../data/ui/filediff.ui.h:6
+msgid "Add Synchronization Point"
+msgstr "Ajouter un point de synchronisation"
+
+#: ../data/ui/filediff.ui.h:7
+msgid "Add a synchronization point for changes between files"
+msgstr ""
+"Ajouter un point de synchronisation des modifications entre les fichiers"
+
+#: ../data/ui/filediff.ui.h:8
+msgid "Clear Synchronization Points"
+msgstr "Effacer les points de synchronisation"
+
+#: ../data/ui/filediff.ui.h:9
+msgid "Clear sychronization points for changes between files"
+msgstr ""
+"Effacer les points de synchronisation des modifications entre les fichiers"
+
+#: ../data/ui/filediff.ui.h:10
+msgid "Previous Conflict"
+msgstr "Conflit précédent"
+
+#: ../data/ui/filediff.ui.h:11
+msgid "Go to the previous conflict"
+msgstr "Retour au conflit précédent"
+
+#: ../data/ui/filediff.ui.h:12
+msgid "Next Conflict"
+msgstr "Conflit suivant"
+
+#: ../data/ui/filediff.ui.h:13
+msgid "Go to the next conflict"
+msgstr "Aller au prochain conflit"
+
+#: ../data/ui/filediff.ui.h:14
+msgid "Push to Left"
+msgstr "Envoyer à gauche"
+
+#: ../data/ui/filediff.ui.h:15
+msgid "Push current change to the left"
+msgstr "Envoyer la modification actuelle vers la gauche"
+
+#: ../data/ui/filediff.ui.h:16
+msgid "Push to Right"
+msgstr "Envoyer à droite"
+
+#: ../data/ui/filediff.ui.h:17
+msgid "Push current change to the right"
+msgstr "Envoyer la modification actuelle vers la droite"
+
+#: ../data/ui/filediff.ui.h:18
+msgid "Pull from Left"
+msgstr "Récupérer de la gauche"
+
+#: ../data/ui/filediff.ui.h:19
+msgid "Pull change from the left"
+msgstr "Récupère la modification de gauche"
+
+#: ../data/ui/filediff.ui.h:20
+msgid "Pull from Right"
+msgstr "Récupérer de la droite"
+
+#: ../data/ui/filediff.ui.h:21
+msgid "Pull change from the right"
+msgstr "Récupère la modification de droite"
+
+#: ../data/ui/filediff.ui.h:22
+msgid "Copy Above Left"
+msgstr "Copier au-dessus à gauche"
+
+#: ../data/ui/filediff.ui.h:23
+msgid "Copy change above the left chunk"
+msgstr "Copie la modification au-dessus du segment de gauche"
+
+#: ../data/ui/filediff.ui.h:24
+msgid "Copy Below Left"
+msgstr "Copier en dessous à gauche"
+
+#: ../data/ui/filediff.ui.h:25
+msgid "Copy change below the left chunk"
+msgstr "Copie la modification en dessous du segment de gauche"
+
+#: ../data/ui/filediff.ui.h:26
+msgid "Copy Above Right"
+msgstr "Copier au-dessus à droite"
+
+#: ../data/ui/filediff.ui.h:27
+msgid "Copy change above the right chunk"
+msgstr "Copie la modification au-dessus du segment de droite"
+
+#: ../data/ui/filediff.ui.h:28
+msgid "Copy Below Right"
+msgstr "Copier en dessous à droite"
+
+#: ../data/ui/filediff.ui.h:29
+msgid "Copy change below the right chunk"
+msgstr "Copie la modification en dessous du segment de droite"
+
+#: ../data/ui/filediff.ui.h:30
+msgid "Delete"
+msgstr "Supprimer"
+
+#: ../data/ui/filediff.ui.h:31
+msgid "Delete change"
+msgstr "Supprimer la modification"
+
+#: ../data/ui/filediff.ui.h:32
+msgid "Merge All from Left"
+msgstr "Fusionner toutes les modifications de gauche"
+
+#: ../data/ui/filediff.ui.h:33
+msgid "Merge all non-conflicting changes from the left"
+msgstr "Fusionne toutes les modifications non conflictuelles de gauche"
+
+#: ../data/ui/filediff.ui.h:34
+msgid "Merge All from Right"
+msgstr "Fusionner toutes les modifications de droite"
+
+#: ../data/ui/filediff.ui.h:35
+msgid "Merge all non-conflicting changes from the right"
+msgstr "Fusionne toutes les modifications non conflictuelles de droite"
+
+#: ../data/ui/filediff.ui.h:36
+msgid "Merge All"
+msgstr "Tout fusionner"
+
+#: ../data/ui/filediff.ui.h:37
+msgid "Merge all non-conflicting changes from left and right panes"
+msgstr ""
+"Fusionne toutes les modifications non conflictuelles des panneaux de gauche "
+"et de droite"
+
+#: ../data/ui/filediff.ui.h:38
+msgid "Previous Pane"
+msgstr "Panneau précédent"
+
+#: ../data/ui/filediff.ui.h:39
+msgid "Move keyboard focus to the previous document in this comparison"
+msgstr ""
+"Déplace le focus clavier vers le document précédent dans cette comparaison"
+
+#: ../data/ui/filediff.ui.h:40
+msgid "Next Pane"
+msgstr "Panneau suivant"
+
+#: ../data/ui/filediff.ui.h:41
+msgid "Move keyboard focus to the next document in this comparison"
+msgstr ""
+"Déplace le focus clavier vers le document suivant dans cette comparaison"
+
+#: ../data/ui/filediff.ui.h:42
+msgid "Lock Scrolling"
+msgstr "Verrouiller le défilement"
+
+#: ../data/ui/filediff.ui.h:43
+msgid "Lock scrolling of all panes"
+msgstr "Verrouille le défilement de tous les panneaux"
+
+#: ../data/ui/filediff.ui.h:44
+msgid "Save changes to documents before closing?"
+msgstr "Enregistrer les modifications des documents avant de fermer ?"
+
+#: ../data/ui/filediff.ui.h:45
+msgid "If you don't save, changes will be permanently lost."
+msgstr ""
+"Si vous n'enregistrez pas, les modifications seront définitivement perdues."
+
+#: ../data/ui/filediff.ui.h:46
+msgid "Close _without Saving"
+msgstr "Fermer _sans enregistrer"
+
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:942 ../meld/filediff.py:1435
+#: ../meld/filediff.py:1506
+msgid "_Cancel"
+msgstr "_Annuler"
+
+#: ../data/ui/filediff.ui.h:48
+msgid "_Save"
+msgstr "_Enregistrer"
+
+#: ../data/ui/filediff.ui.h:49
+msgid ""
+"This file can not be written to. You may click here to unlock this file and "
+"make changes anyway, but these changes must be saved to a new file."
+msgstr ""
+"Le fichier n'est pas accessible en écriture. Cliquez ici pour le "
+"déverrouiller et le modifier quand même, mais les changements devront êtres "
+"enregistrés dans un nouveau fichier."
+
+#: ../data/ui/filediff.ui.h:50
+msgid "File 3"
+msgstr "Fichier 3"
+
+#: ../data/ui/filediff.ui.h:51
+msgid "File 2"
+msgstr "Fichier 2"
+
+#: ../data/ui/filediff.ui.h:52
+msgid "File 1"
+msgstr "Fichier 1"
+
+#: ../data/ui/filediff.ui.h:53
+msgid "Revert unsaved changes to documents?"
+msgstr "Annuler les modifications non enregistrées des documents ?"
+
+#: ../data/ui/filediff.ui.h:54
+msgid "Changes made to the following documents will be permanently lost:\n"
+msgstr ""
+"Les changements apportés aux documents suivants seront définitivement "
+"perdus :\n"
 
-#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:141
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:943 ../meld/filediff.py:1436
 msgid "_Replace"
 msgstr "_Remplacer"
 
@@ -134,195 +948,247 @@ msgstr "_Suivant"
 
 #: ../data/ui/findbar.ui.h:5
 msgid "Find:"
-msgstr "Rechercher :"
+msgstr "Rechercher :"
 
 #: ../data/ui/findbar.ui.h:6
 msgid "Replace _with:"
-msgstr "Remplacer _par :"
+msgstr "Remplacer _par :"
 
 #: ../data/ui/findbar.ui.h:7
-msgid "_Match Case"
-msgstr "Res_pecter la casse"
+msgid "_Match case"
+msgstr "Respecter la _casse"
 
 #: ../data/ui/findbar.ui.h:8
 msgid "Who_le word"
 msgstr "_Mots entiers"
 
 #: ../data/ui/findbar.ui.h:9
-msgid "Regular E_xpression"
+msgid "Regular e_xpression"
 msgstr "E_xpression régulière"
 
-#: ../data/ui/meldapp.ui.h:2
-msgid ""
-"Copyright &#xA9; 2002-2009 Stephen Kennedy\n"
-"Copyright &#xA9; 2009-2012 Kai Willadsen"
-msgstr ""
-"Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2012 Kai Willadsen"
-
-#: ../data/ui/meldapp.ui.h:4
-msgid "translator-credits"
-msgstr ""
-"Stephen Kennedy <steve9000@users.sourceforge.net>, 2003\n"
-"Jonathan Ernst <jonathan@ernstfamily.ch>, 2006\n"
-"Claude Paroz <claude@2xlibre.net>, 2006-2010\n"
-"Robert-André Mauchin <zebob.m@pengzone.org>, 2007\n"
-"Bruno Brouard <annoa.b@gmail.com>, 2009-2010"
-
-#: ../data/ui/meldapp.ui.h:5
-msgid "Choose Files"
-msgstr "Sélectionnez les fichiers"
-
-#: ../data/ui/meldapp.ui.h:6
-msgid "_Three Way Compare"
-msgstr "Comparaison _triple"
-
-#. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:8
-msgid "Mine"
-msgstr "Le mien"
-
-#. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:10
-msgid "Original"
-msgstr "Original"
-
-#. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:12
-msgid "Other"
-msgstr "Autre"
-
-#: ../data/ui/meldapp.ui.h:13
-msgid "_File Comparison"
-msgstr "Comparaison de _fichiers"
-
-#: ../data/ui/meldapp.ui.h:14
-msgid "_Directory Comparison"
-msgstr "Comparaison de _répertoires"
-
-#: ../data/ui/meldapp.ui.h:15
-msgid "Select VC Directory"
-msgstr "Sélectionner le répertoire du gestionnaire de versions"
-
-#: ../data/ui/meldapp.ui.h:16
-msgid "Directory"
-msgstr "Répertoire"
-
-#: ../data/ui/meldapp.ui.h:17
-msgid "_Version Control Browser"
-msgstr "Navigateur du gestionnaire de _versions"
+#: ../data/ui/findbar.ui.h:10
+msgid "Wrapped"
+msgstr "Saut de ligne"
 
+# Mieux vaut donner à la commande le nom de l'action. 
+# patch est beaucoup plus connu des utilisateurs de git que correctif
 #: ../data/ui/patch-dialog.ui.h:1
-msgid "Create Patch"
-msgstr "Créer un correctif"
+msgid "Format as Patch"
+msgstr "Créer un correctif (patch)"
 
 #: ../data/ui/patch-dialog.ui.h:2
-msgid "Create a patch"
-msgstr "Créer un correctif"
+msgid "Copy to Clipboard"
+msgstr "Copier vers le presse-papiers"
 
-#: ../data/ui/patch-dialog.ui.h:3
+#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:160
+msgid "Save Patch"
+msgstr "Enregistrer le correctif"
+
+#: ../data/ui/patch-dialog.ui.h:4
 msgid "Use differences between:"
 msgstr "Utiliser les différences entre :"
 
-#: ../data/ui/patch-dialog.ui.h:4
+#: ../data/ui/patch-dialog.ui.h:5
 msgid "Left and middle panes"
 msgstr "Panneaux de gauche et du milieu"
 
-#: ../data/ui/patch-dialog.ui.h:5
+#: ../data/ui/patch-dialog.ui.h:6
 msgid "Middle and right panes"
 msgstr "Panneaux du milieu et de droite"
 
-#: ../data/ui/patch-dialog.ui.h:6
+#: ../data/ui/patch-dialog.ui.h:7
 msgid "_Reverse patch direction"
 msgstr "Inve_rser la direction du correctif"
 
-#: ../data/ui/patch-dialog.ui.h:7
-msgid "Copy to Clipboard"
-msgstr "Copier vers le presse-papiers"
-
 #: ../data/ui/preferences.ui.h:1
+msgid "Left is remote, right is local"
+msgstr "Distant à gauche, local à droite"
+
+#: ../data/ui/preferences.ui.h:2
+msgid "Left is local, right is remote"
+msgstr "Local à gauche, distant à droite"
+
+#: ../data/ui/preferences.ui.h:3
+msgid "Remote, merge, local"
+msgstr "Distant, fusionné, local"
+
+#: ../data/ui/preferences.ui.h:4
+msgid "Local, merge, remote"
+msgstr "Local, fusionné, distant"
+
+#: ../data/ui/preferences.ui.h:5
+msgid "1ns (ext4)"
+msgstr "1ns (ext4)"
+
+#: ../data/ui/preferences.ui.h:6
+msgid "100ns (NTFS)"
+msgstr "100ns (NTFS)"
+
+#: ../data/ui/preferences.ui.h:7
+msgid "1s (ext2/ext3)"
+msgstr "1s (ext2/ext3)"
+
+#: ../data/ui/preferences.ui.h:8
+msgid "2s (VFAT)"
+msgstr "2s (VFAT)"
+
+#: ../data/ui/preferences.ui.h:9
 msgid "Meld Preferences"
 msgstr "Préférences de Meld"
 
-#: ../data/ui/preferences.ui.h:2
+#: ../data/ui/preferences.ui.h:10
 msgid "Font"
 msgstr "Police"
 
-#: ../data/ui/preferences.ui.h:3
+#: ../data/ui/preferences.ui.h:11
 msgid "_Use the system fixed width font"
 msgstr "_Utiliser la police à chasse fixe du système"
 
-#: ../data/ui/preferences.ui.h:4
+#: ../data/ui/preferences.ui.h:12
 msgid "_Editor font:"
 msgstr "_Police de l'éditeur :"
 
-#: ../data/ui/preferences.ui.h:5
+#: ../data/ui/preferences.ui.h:13
 msgid "Display"
 msgstr "Affichage"
 
-#: ../data/ui/preferences.ui.h:6
+#: ../data/ui/preferences.ui.h:14
 msgid "_Tab width:"
 msgstr "Largeur des _tabulations :"
 
-#: ../data/ui/preferences.ui.h:7
+#: ../data/ui/preferences.ui.h:15
 msgid "_Insert spaces instead of tabs"
 msgstr "Insérer des _espaces au lieu des tabulations"
 
-#: ../data/ui/preferences.ui.h:8
+#: ../data/ui/preferences.ui.h:16
 msgid "Enable text _wrapping"
 msgstr "Acti_ver les sauts de ligne automatiques"
 
-#: ../data/ui/preferences.ui.h:9
+#: ../data/ui/preferences.ui.h:17
 msgid "Do not _split words over two lines"
 msgstr "Ne pas _couper les mots par les sauts de ligne"
 
-#: ../data/ui/preferences.ui.h:10
+#: ../data/ui/preferences.ui.h:18
+msgid "Highlight _current line"
+msgstr "Surligner la ligne _actuelle"
+
+#: ../data/ui/preferences.ui.h:19
 msgid "Show _line numbers"
 msgstr "Afficher les numéros de _ligne"
 
-#: ../data/ui/preferences.ui.h:11
+#: ../data/ui/preferences.ui.h:20
 msgid "Show w_hitespace"
 msgstr "Affic_her les espaces"
 
-#: ../data/ui/preferences.ui.h:12
+#: ../data/ui/preferences.ui.h:21
 msgid "Use s_yntax highlighting"
 msgstr "Utiliser la _coloration syntaxique"
 
-#: ../data/ui/preferences.ui.h:13
-msgid "External editor"
+#: ../data/ui/preferences.ui.h:22
+msgid "Syntax highlighting color scheme:"
+msgstr "Jeu de couleurs de la coloration syntaxique :"
+
+#: ../data/ui/preferences.ui.h:23
+msgid "External Editor"
 msgstr "Éditeur externe"
 
-#: ../data/ui/preferences.ui.h:14
+#: ../data/ui/preferences.ui.h:24
 msgid "Use _default system editor"
 msgstr "Utiliser l'éditeur par _défaut du système"
 
-#: ../data/ui/preferences.ui.h:15
+#: ../data/ui/preferences.ui.h:25
 msgid "Edito_r command:"
 msgstr "Commande de l'éditeu_r :"
 
-#: ../data/ui/preferences.ui.h:16
+#: ../data/ui/preferences.ui.h:26
 msgid "Editor"
 msgstr "Éditeur"
 
-#: ../data/ui/preferences.ui.h:17
+#: ../data/ui/preferences.ui.h:27
+msgid "Shallow Comparison"
+msgstr "Comparaison superficielle"
+
+#: ../data/ui/preferences.ui.h:28
+msgid "C_ompare files based only on size and timestamp"
+msgstr "C_omparer les fichiers selon la taille et l'horodatage uniquement"
+
+#: ../data/ui/preferences.ui.h:29
+msgid "_Timestamp resolution:"
+msgstr "Précision de l'horoda_tage :"
+
+#: ../data/ui/preferences.ui.h:31
+msgid "Symbolic Links"
+msgstr "Liens symboliques"
+
+#: ../data/ui/preferences.ui.h:33
+msgid "Visible Columns"
+msgstr "Colonnes visibles"
+
+#: ../data/ui/preferences.ui.h:34
+msgid "Folder Comparisons"
+msgstr "Comparaisons de dossiers"
+
+#: ../data/ui/preferences.ui.h:35
+msgid "Version Comparisons"
+msgstr "Comparaisons de versions"
+
+#: ../data/ui/preferences.ui.h:36
+msgid "_Order when comparing file revisions:"
+msgstr "_Ordre lors des comparaisons de révisions de fichiers :"
+
+#: ../data/ui/preferences.ui.h:37
+msgid "Order when _merging files:"
+msgstr "Ordre lors des _fusions de fichiers :"
+
+#: ../data/ui/preferences.ui.h:38
+msgid "Commit Messages"
+msgstr "Messages de « commit »"
+
+#: ../data/ui/preferences.ui.h:39
+msgid "Show _right margin at:"
+msgstr "Afficher la marge d_roite à :"
+
+#: ../data/ui/preferences.ui.h:40
+msgid "Automatically _break lines at right margin on commit"
+msgstr "Retour à la ligne automatique lors du « commit »"
+
+#: ../data/ui/preferences.ui.h:41
+msgid "Version Control"
+msgstr "Gestionnaire de versions"
+
+#: ../data/ui/preferences.ui.h:42
+msgid "Filename filters"
+msgstr "Filtres sur les noms de fichiers"
+
+#: ../data/ui/preferences.ui.h:43
 msgid ""
 "When performing directory comparisons, you may filter out files and "
 "directories by name. Each pattern is a list of shell style wildcards "
 "separated by spaces."
 msgstr ""
-"Lors de la comparaison de répertoires, vous pouvez masquer des fichiers et "
-"des dossiers en fonction de leur nom. Chaque motif est une liste de jokers "
-"de type shell séparés par des espaces."
-
-#: ../data/ui/preferences.ui.h:18
-msgid "Ignore symbolic links"
-msgstr "Ignorer les liens symboliques"
+"Lors de la comparaison de dossiers, vous pouvez masquer des fichiers et des "
+"dossiers en fonction de leur nom. Chaque motif est une liste de jokers de "
+"type shell séparés par des espaces."
 
-#: ../data/ui/preferences.ui.h:19
+#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:104
 msgid "File Filters"
 msgstr "Filtres de fichiers"
 
-#: ../data/ui/preferences.ui.h:20
+#: ../data/ui/preferences.ui.h:45
+msgid "Change trimming"
+msgstr "Ignorance des changements « blancs »"
+
+#: ../data/ui/preferences.ui.h:46
+msgid "Trim blank line differences from the start and end of changes"
+msgstr ""
+"Ignorer les différences de lignes vides au début et à la fin des "
+"modifications"
+
+#: ../data/ui/preferences.ui.h:47
+msgid "Text filters"
+msgstr "Filtres textuels"
+
+#: ../data/ui/preferences.ui.h:48
 msgid ""
 "When performing file comparisons, you may ignore certain types of changes. "
 "Each pattern here is a python regular expression which replaces matching "
@@ -336,470 +1202,699 @@ msgstr ""
 "comparaison. Si l'expression contient des groupes, seuls les groupes sont "
 "remplacés. Consultez le manuel d'utilisation pour plus de détails."
 
-#: ../data/ui/preferences.ui.h:21
-msgid "Ignore changes which insert or delete blank lines"
-msgstr ""
-"Ignorer les modifications qui concernent l'insertion ou l'effacement de "
-"lignes vides."
-
-#: ../data/ui/preferences.ui.h:22
+#: ../data/ui/preferences.ui.h:49
 msgid "Text Filters"
-msgstr "Filtres de texte"
+msgstr "Filtres textuels"
+
+#: ../data/ui/shortcuts.ui.h:1
+msgctxt "shortcut window"
+msgid "General"
+msgstr "Général"
+
+#: ../data/ui/shortcuts.ui.h:2
+msgctxt "shortcut window"
+msgid "New comparison"
+msgstr "Nouvelle comparaison"
+
+#: ../data/ui/shortcuts.ui.h:3
+msgctxt "shortcut window"
+msgid "Close a comparison"
+msgstr "Fermer une comparaison"
+
+#: ../data/ui/shortcuts.ui.h:4
+msgctxt "shortcut window"
+msgid "Quit Meld"
+msgstr "Quitter Meld"
+
+#: ../data/ui/shortcuts.ui.h:5
+msgctxt "shortcut window"
+msgid "Stop the current action"
+msgstr "Arrêter l'action en cours"
 
-#: ../data/ui/preferences.ui.h:23
-msgid "Loading"
-msgstr "Chargement"
+#: ../data/ui/shortcuts.ui.h:6
+msgctxt "shortcut window"
+msgid "Refresh comparison"
+msgstr "Actualiser la comparaison"
 
-#: ../data/ui/preferences.ui.h:24
-msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
-msgstr ""
-"Lors du chargement, essayer ces codages dans l'ordre (ex : utf-8, iso8859)"
+#: ../data/ui/shortcuts.ui.h:7
+msgctxt "shortcut window"
+msgid "Fullscreen"
+msgstr "Plein écran"
 
-#: ../data/ui/preferences.ui.h:25
-msgid "Encoding"
-msgstr "Codage des caractères"
+#: ../data/ui/shortcuts.ui.h:8
+msgctxt "shortcut window"
+msgid "Tabs"
+msgstr "Onglets"
+
+#: ../data/ui/shortcuts.ui.h:9
+msgctxt "shortcut window"
+msgid "Go to previous tab"
+msgstr "Aller à l'onglet précédent"
+
+#: ../data/ui/shortcuts.ui.h:10
+msgctxt "shortcut window"
+msgid "Go to next tab"
+msgstr "Aller à l'onglet suivant"
+
+#: ../data/ui/shortcuts.ui.h:11
+msgctxt "shortcut window"
+msgid "Switch to tab"
+msgstr "Basculer vers l'onglet"
+
+#: ../data/ui/shortcuts.ui.h:12
+msgctxt "shortcut window"
+msgid "Move tab left"
+msgstr "Déplacer l'onglet vers la gauche"
+
+#: ../data/ui/shortcuts.ui.h:13
+msgctxt "shortcut window"
+msgid "Move tab right"
+msgstr "Déplacer l'onglet vers la droite"
+
+#: ../data/ui/shortcuts.ui.h:14
+msgctxt "shortcut window"
+msgid "Changes"
+msgstr "Différences"
+
+#: ../data/ui/shortcuts.ui.h:15
+msgctxt "shortcut window"
+msgid "Go to previous change"
+msgstr "Aller à la différence précédente"
+
+#: ../data/ui/shortcuts.ui.h:16
+msgctxt "shortcut window"
+msgid "Go to next change"
+msgstr "Aller à la différence suivante"
+
+#: ../data/ui/shortcuts.ui.h:17
+msgctxt "shortcut window"
+msgid "Editing"
+msgstr "Édition"
+
+#: ../data/ui/shortcuts.ui.h:18
+msgctxt "shortcut window"
+msgid "Undo"
+msgstr "Annuler"
+
+#: ../data/ui/shortcuts.ui.h:19
+msgctxt "shortcut window"
+msgid "Redo"
+msgstr "Rétablir"
+
+#: ../data/ui/shortcuts.ui.h:20
+msgctxt "shortcut window"
+msgid "Cut"
+msgstr "Couper"
+
+#: ../data/ui/shortcuts.ui.h:21
+msgctxt "shortcut window"
+msgid "Copy"
+msgstr "Copier"
+
+#: ../data/ui/shortcuts.ui.h:22
+msgctxt "shortcut window"
+msgid "Paste"
+msgstr "Coller"
+
+#: ../data/ui/shortcuts.ui.h:23
+msgctxt "shortcut window"
+msgid "Find"
+msgstr "Rechercher"
+
+#: ../data/ui/shortcuts.ui.h:24
+msgctxt "shortcut window"
+msgid "Find Next"
+msgstr "Rechercher le suivant"
+
+#: ../data/ui/shortcuts.ui.h:25
+msgctxt "shortcut window"
+msgid "Find Previous"
+msgstr "Rechercher le précédent"
+
+#: ../data/ui/shortcuts.ui.h:26
+msgctxt "shortcut window"
+msgid "Replace"
+msgstr "Remplacer"
+
+#: ../data/ui/shortcuts.ui.h:27
+msgctxt "shortcut window"
+msgid "File comparison"
+msgstr "Comparaison de fichiers"
+
+#: ../data/ui/shortcuts.ui.h:28
+msgctxt "shortcut window"
+msgid "Save current file"
+msgstr "Enregistrer le fichier actuel"
 
-#: ../data/ui/vcview.ui.h:1
-msgid "VC Log"
-msgstr "Journal du gestionnaire de versions"
+#: ../data/ui/shortcuts.ui.h:29
+msgctxt "shortcut window"
+msgid "Save current file to new path"
+msgstr "Enregistrer le fichier actuel à un autre endroit"
 
-#: ../data/ui/vcview.ui.h:2
-msgid "Commit Files"
-msgstr "Valider les fichiers"
+#: ../data/ui/shortcuts.ui.h:30
+msgctxt "shortcut window"
+msgid "Save all files in comparison"
+msgstr "Enregistrer tous les fichiers de la comparaison"
 
-#: ../data/ui/vcview.ui.h:3
-msgid "Previous Logs"
-msgstr "Journaux précédents"
+#: ../data/ui/shortcuts.ui.h:31
+msgctxt "shortcut window"
+msgid "Previous conflict"
+msgstr "Conflit précédent"
 
-#: ../data/ui/vcview.ui.h:4
-msgid "Log Message"
-msgstr "Message du journal"
+#: ../data/ui/shortcuts.ui.h:32
+msgctxt "shortcut window"
+msgid "Next conflict"
+msgstr "Conflit suivant"
 
-#: ../meld/dirdiff.py:232 ../meld/vcview.py:127
-msgid "_Compare"
-msgstr "_Comparer"
+#: ../data/ui/shortcuts.ui.h:33
+msgctxt "shortcut window"
+msgid "Push change to left"
+msgstr "Envoyer la modification vers la gauche"
+
+#: ../data/ui/shortcuts.ui.h:34
+msgctxt "shortcut window"
+msgid "Push change to right"
+msgstr "Envoyer la modification vers la droite"
+
+#: ../data/ui/shortcuts.ui.h:35
+msgctxt "shortcut window"
+msgid "Pull change from left"
+msgstr "Récupérer la modification de gauche"
+
+#: ../data/ui/shortcuts.ui.h:36
+msgctxt "shortcut window"
+msgid "Pull change from right"
+msgstr "Récupérer la modification de droite"
+
+#: ../data/ui/shortcuts.ui.h:37
+msgctxt "shortcut window"
+msgid "Copy change above left"
+msgstr "Copier la modification au-dessus à gauche"
+
+#: ../data/ui/shortcuts.ui.h:38
+msgctxt "shortcut window"
+msgid "Copy change below left"
+msgstr "Copier la modification en dessous à gauche"
+
+#: ../data/ui/shortcuts.ui.h:39
+msgctxt "shortcut window"
+msgid "Copy change above right"
+msgstr "Copier la modification au-dessus à droite"
+
+#: ../data/ui/shortcuts.ui.h:40
+msgctxt "shortcut window"
+msgid "Copy change below right"
+msgstr "Copier la modification en dessous à droite"
+
+#: ../data/ui/shortcuts.ui.h:41
+msgctxt "shortcut window"
+msgid "Delete change"
+msgstr "Supprimer la modification"
 
-#: ../meld/dirdiff.py:232 ../meld/vcview.py:127
-msgid "Compare selected"
-msgstr "Comparer la sélection"
+#: ../data/ui/shortcuts.ui.h:42
+msgctxt "shortcut window"
+msgid "Previous comparison pane"
+msgstr "Panneau de comparaison précédent"
 
-#: ../meld/dirdiff.py:233
-msgid "Copy _Left"
-msgstr "Copier à _gauche"
+#: ../data/ui/shortcuts.ui.h:43
+msgctxt "shortcut window"
+msgid "Next comparison pane"
+msgstr "Panneau de comparaison suivant"
 
-#: ../meld/dirdiff.py:233
-msgid "Copy to left"
-msgstr "Copie vers la gauche"
+#: ../data/ui/shortcuts.ui.h:44
+msgctxt "shortcut window"
+msgid "Folder comparison"
+msgstr "Comparaison de dossiers"
 
-#: ../meld/dirdiff.py:234
-msgid "Copy _Right"
-msgstr "Copier à _droite"
+#: ../data/ui/shortcuts.ui.h:45
+msgctxt "shortcut window"
+msgid "Copy to left"
+msgstr "Copier vers la gauche"
 
-#: ../meld/dirdiff.py:234
+#: ../data/ui/shortcuts.ui.h:46
+msgctxt "shortcut window"
 msgid "Copy to right"
-msgstr "Copie vers la droite"
+msgstr "Copier vers la droite"
 
-#: ../meld/dirdiff.py:235
-msgid "Delete selected"
-msgstr "Effacer la sélection"
+#: ../data/ui/shortcuts.ui.h:47
+msgctxt "shortcut window"
+msgid "Version control comparison"
+msgstr "Comparaison de gestion de version"
 
-#: ../meld/dirdiff.py:236 ../meld/filediff.py:1167
-msgid "Hide"
-msgstr "Masquer"
+#: ../data/ui/shortcuts.ui.h:48
+msgctxt "shortcut window"
+msgid "Commit to version control"
+msgstr "Effectuer le « commit » dans la gestion de version"
 
-#: ../meld/dirdiff.py:236
-msgid "Hide selected"
-msgstr "Masquer la sélection"
+#: ../data/ui/shortcuts.ui.h:49
+msgctxt "shortcut window"
+msgid "Show/hide console output"
+msgstr "Afficher/Masquer la sortie de la console"
 
-#: ../meld/dirdiff.py:240
-msgid "Case"
-msgstr "Casse"
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:669
+msgid "New comparison"
+msgstr "Nouvelle comparaison"
 
-#: ../meld/dirdiff.py:240
-msgid "Ignore case of entries"
-msgstr "Ignorer la casse des entrées"
+#: ../data/ui/tab-placeholder.ui.h:2
+msgid "File comparison"
+msgstr "Comparaison de fichiers"
 
-#: ../meld/dirdiff.py:241
-msgid "Same"
-msgstr "Identique"
+#: ../data/ui/tab-placeholder.ui.h:3
+msgid "Directory comparison"
+msgstr "Comparaison de dossiers"
 
-#: ../meld/dirdiff.py:241
-msgid "Show identical"
-msgstr "Afficher les fichiers identiques"
+#: ../data/ui/tab-placeholder.ui.h:4
+msgid "Version control view"
+msgstr "Affichage de gestion de version"
 
-#: ../meld/dirdiff.py:242
-msgid "New"
-msgstr "Nouveaux"
+#: ../data/ui/tab-placeholder.ui.h:5
+msgid "_3-way comparison"
+msgstr "Comparaison à _3"
 
-#: ../meld/dirdiff.py:242
-msgid "Show new"
-msgstr "Afficher les nouveaux fichiers"
+#: ../data/ui/tab-placeholder.ui.h:6
+msgid "Select Third File"
+msgstr "Sélectionner le troisième fichier"
 
-#: ../meld/dirdiff.py:243
-msgid "Modified"
-msgstr "Modifiés"
+#: ../data/ui/tab-placeholder.ui.h:7
+msgid "Select Second File"
+msgstr "Sélectionner le deuxième fichier"
 
-#: ../meld/dirdiff.py:243 ../meld/vcview.py:140
-msgid "Show modified"
-msgstr "Afficher les objets modifiés"
+#: ../data/ui/tab-placeholder.ui.h:8
+msgid "Select First File"
+msgstr "Sélectionner le premier fichier"
 
-#: ../meld/dirdiff.py:245
-msgid "Filters"
-msgstr "Filtres"
+#: ../data/ui/tab-placeholder.ui.h:9
+msgid "Select First Folder"
+msgstr "Sélectionner le premier dossier"
 
-#: ../meld/dirdiff.py:245
-msgid "Set active filters"
-msgstr "Définir les filtres actifs"
+#: ../data/ui/tab-placeholder.ui.h:10
+msgid "Select Second Folder"
+msgstr "Sélectionner le deuxième dossier"
 
-#: ../meld/dirdiff.py:362
-#, python-format
-msgid "Hide %s"
-msgstr "Masquer %s"
+#: ../data/ui/tab-placeholder.ui.h:11
+msgid "Select Third Folder"
+msgstr "Sélectionner le troisième dossier"
 
-#: ../meld/dirdiff.py:466 ../meld/dirdiff.py:479 ../meld/vcview.py:323
-#: ../meld/vcview.py:347
-#, python-format
-msgid "[%s] Scanning %s"
-msgstr "[%s] En cours d'analyse de %s"
+#: ../data/ui/tab-placeholder.ui.h:12
+msgid "Select A Version-Controlled Folder"
+msgstr "Sélectionner un dossier versionné"
 
-#: ../meld/dirdiff.py:578
-#, python-format
-msgid "[%s] Done"
-msgstr "[%s] Terminé"
+#: ../data/ui/tab-placeholder.ui.h:13
+msgid "_Blank comparison"
+msgstr "Comparaison _vierge"
 
-#: ../meld/dirdiff.py:582
-msgid "Multiple errors occurred while scanning this folder"
-msgstr "Plusieurs erreurs se sont produites lors de l'analyse de ce dossier"
+#: ../data/ui/tab-placeholder.ui.h:14
+msgid "C_ompare"
+msgstr "C_omparer"
 
-#: ../meld/dirdiff.py:583
-msgid "Files with invalid encodings found"
-msgstr "Le codage de caractères de certains fichiers n'est pas valide"
+#: ../data/ui/vcview.ui.h:3
+msgid "Co_mmit..."
+msgstr "Co_mmit…"
 
-#. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:585
-msgid "Some files were in an incorrect encoding. The names are something like:"
-msgstr ""
-"Le codage de caractères de certains fichiers n'est pas correct. Les noms "
-"ressemblent à :"
+#: ../data/ui/vcview.ui.h:4
+msgid "Commit changes to version control"
+msgstr "Soumettre (commit) les modifications dans la gestion de version"
 
-#: ../meld/dirdiff.py:587
-msgid "Files hidden by case insensitive comparison"
-msgstr "Fichiers cachés en raison de la comparaison insensible à la casse"
+#: ../data/ui/vcview.ui.h:5
+msgid "_Update"
+msgstr "Mettre à _jour"
 
-#. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:589
-msgid ""
-"You are running a case insensitive comparison on a case sensitive "
-"filesystem. The following files in this folder are hidden:"
-msgstr ""
-"Vous effectuez une comparaison insensible à la casse sur un système de "
-"fichiers sensible à la casse. Les fichiers suivants de ce dossier sont "
-"masqués :"
+#: ../data/ui/vcview.ui.h:6
+msgid "Update working copy from version control"
+msgstr "Met à jour la copie de travail à partir de la gestion de version"
 
-#: ../meld/dirdiff.py:600
-#, python-format
-msgid "'%s' hidden by '%s'"
-msgstr "« %s » est masqué par « %s »"
+#: ../data/ui/vcview.ui.h:7
+msgid "_Push"
+msgstr "_Pousser (push)"
 
-#: ../meld/dirdiff.py:625 ../meld/filediff.py:1010 ../meld/filediff.py:1171
-msgid "Hi_de"
-msgstr "Mas_quer"
+#: ../data/ui/vcview.ui.h:8
+msgid "Push local changes to remote"
+msgstr "Envoie les modifications locales vers le dépôt distant"
 
-#: ../meld/dirdiff.py:675
-#, python-format
-msgid ""
-"'%s' exists.\n"
-"Overwrite?"
-msgstr ""
-"« %s » existe déjà.\n"
-"Écraser ?"
+#: ../data/ui/vcview.ui.h:10
+msgid "Add to version control"
+msgstr "Ajouter au gestionnaire de version"
 
-#: ../meld/dirdiff.py:682
-#, python-format
-msgid ""
-"Error copying '%s' to '%s'\n"
-"\n"
-"%s."
-msgstr ""
-"Erreur lors de la copie de « %s » vers « %s »\n"
-"\n"
-"%s."
+#: ../data/ui/vcview.ui.h:12
+msgid "Remove from version control"
+msgstr "Retirer du gestionnaire de version"
 
-#: ../meld/dirdiff.py:700 ../meld/vcview.py:536
-#, python-format
-msgid ""
-"'%s' is a directory.\n"
-"Remove recursively?"
-msgstr ""
-"« %s » est un répertoire.\n"
-"Supprimer récursivement ?"
+#: ../data/ui/vcview.ui.h:13
+msgid "Mar_k as Resolved"
+msgstr "Marque_r comme résolu"
 
-#: ../meld/dirdiff.py:707 ../meld/vcview.py:541
-#, python-format
-msgid ""
-"Error removing %s\n"
-"\n"
-"%s."
+#: ../data/ui/vcview.ui.h:14
+msgid "Mark as resolved in version control"
+msgstr "Marque comme résolu pour le gestionnaire de version"
+
+#: ../data/ui/vcview.ui.h:15
+msgid "Re_vert"
+msgstr "Re_venir à l'état précédent"
+
+#: ../data/ui/vcview.ui.h:16
+msgid "Revert working copy to original state"
+msgstr "Rend la copie de travail locale à son état d'origine"
+
+#: ../data/ui/vcview.ui.h:17
+msgid "Delete from working copy"
+msgstr "Supprimer de la copie de travail"
+
+#: ../data/ui/vcview.ui.h:18
+msgid "Console"
+msgstr "Console"
+
+#: ../data/ui/vcview.ui.h:19
+msgid "Show or hide the version control console output pane"
 msgstr ""
-"Erreur lors de la suppression de %s\n"
-"\n"
-"%s."
+"Affiche ou masque le panneau de sortie de la console du gestionnaire de "
+"version"
 
-#: ../meld/dirdiff.py:741
-#, python-format
-msgid "%i second"
-msgid_plural "%i seconds"
-msgstr[0] "%i seconde"
-msgstr[1] "%i secondes"
+#: ../data/ui/vcview.ui.h:20
+msgid "_Flatten"
+msgstr "A_platir"
 
-#: ../meld/dirdiff.py:742
-#, python-format
-msgid "%i minute"
-msgid_plural "%i minutes"
-msgstr[0] "%i minute"
-msgstr[1] "%i minutes"
+#: ../data/ui/vcview.ui.h:21
+msgid "Flatten directories"
+msgstr "Aplatir les dossiers"
 
-#: ../meld/dirdiff.py:743
-#, python-format
-msgid "%i hour"
-msgid_plural "%i hours"
-msgstr[0] "%i heure"
-msgstr[1] "%i heures"
+#: ../data/ui/vcview.ui.h:22
+msgid "_Modified"
+msgstr "_Modifiés"
 
-#: ../meld/dirdiff.py:744
-#, python-format
-msgid "%i day"
-msgid_plural "%i days"
-msgstr[0] "%i jour"
-msgstr[1] "%i jours"
+#: ../data/ui/vcview.ui.h:23
+msgid "Show modified files"
+msgstr "Afficher les fichiers modifiés"
 
-#: ../meld/dirdiff.py:745
-#, python-format
-msgid "%i week"
-msgid_plural "%i weeks"
-msgstr[0] "%i semaine"
-msgstr[1] "%i semaines"
+#: ../data/ui/vcview.ui.h:24
+msgid "_Normal"
+msgstr "_Normal"
 
-#: ../meld/dirdiff.py:746
-#, python-format
-msgid "%i month"
-msgid_plural "%i months"
-msgstr[0] "%i mois"
-msgstr[1] "%i mois"
+#: ../data/ui/vcview.ui.h:25
+msgid "Show normal files"
+msgstr "Afficher les fichiers normaux"
 
-#: ../meld/dirdiff.py:747
-#, python-format
-msgid "%i year"
-msgid_plural "%i years"
-msgstr[0] "%i année"
-msgstr[1] "%i années"
+#: ../data/ui/vcview.ui.h:26
+msgid "Un_versioned"
+msgstr "Non _versionnés"
 
-#: ../meld/filediff.py:295
-msgid "Format as patch..."
-msgstr "Mettre sous forme de correctif..."
+#: ../data/ui/vcview.ui.h:27
+msgid "Show unversioned files"
+msgstr "Afficher les fichiers qui ne sont pas versionnés"
 
-#: ../meld/filediff.py:295
-msgid "Create a patch using differences between files"
-msgstr ""
-"Crée un correctif (patch) en utilisant les différences entre les fichiers"
+#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:67
+msgid "Ignored"
+msgstr "Ignorés"
 
-#: ../meld/filediff.py:296
-msgid "Previous conflict"
-msgstr "Conflit précédent"
+#: ../data/ui/vcview.ui.h:29
+msgid "Show ignored files"
+msgstr "Afficher les fichiers ignorés"
 
-#: ../meld/filediff.py:296
-msgid "Go to the previous conflict"
-msgstr "Revient au conflit précédent"
+#: ../data/ui/vcview.ui.h:30
+msgid "Commit"
+msgstr "Soumettre (commit)"
 
-#: ../meld/filediff.py:297
-msgid "Next conflict"
-msgstr "Conflit suivant"
+#: ../data/ui/vcview.ui.h:31
+msgid "Commit Files"
+msgstr "Fichiers à soumettre"
 
-#: ../meld/filediff.py:297
-msgid "Go to the next conflict"
-msgstr "Va au prochain conflit"
+#: ../data/ui/vcview.ui.h:32
+msgid "Log Message"
+msgstr "Message du journal"
+
+#: ../data/ui/vcview.ui.h:33
+msgid "Previous logs:"
+msgstr "Journaux précédents :"
+
+#: ../data/ui/vcview.ui.h:34
+msgid "Co_mmit"
+msgstr "Sou_mettre"
+
+#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:343
+msgid "Location"
+msgstr "Emplacement"
+
+#: ../data/ui/vcview.ui.h:37
+msgid "Status"
+msgstr "État"
+
+#: ../data/ui/vcview.ui.h:38
+msgid "Extra"
+msgstr "Extra"
+
+#: ../data/ui/vcview.ui.h:39
+msgid "Console output"
+msgstr "Sortie de la console"
+
+#: ../data/ui/vcview.ui.h:40
+msgid "Push local commits to remote?"
+msgstr "Envoyer les « commits » locaux au dépôt distant ?"
+
+#: ../data/ui/vcview.ui.h:41
+msgid "The commits to be pushed are determined by your version control system."
+msgstr ""
+"Les « commits » à envoyer sont déterminés par votre gestionnaire de version."
 
-#: ../meld/filediff.py:298
-msgid "Push to left"
-msgstr "Envoyer à gauche"
+#: ../data/ui/vcview.ui.h:42
+msgid "_Push commits"
+msgstr "_Envoyer (push) les « commits »"
 
-#: ../meld/filediff.py:298
-msgid "Push current change to the left"
-msgstr "Envoie la modification actuelle vers la gauche"
+#: ../meld/const.py:12
+msgid "UNIX (LF)"
+msgstr "UNIX (LF)"
 
-#: ../meld/filediff.py:299
-msgid "Push to right"
-msgstr "Envoyer à droite"
+#: ../meld/const.py:13
+msgid "DOS/Windows (CR-LF)"
+msgstr "DOS/Windows (CR-LF)"
 
-#: ../meld/filediff.py:299
-msgid "Push current change to the right"
-msgstr "Envoie la modification actuelle vers la droite"
+#: ../meld/const.py:14
+msgid "Mac OS (CR)"
+msgstr "Mac OS (CR)"
 
-#. FIXME: using LAST and FIRST is terrible and unreliable icon abuse
-#: ../meld/filediff.py:301
-msgid "Pull from left"
-msgstr "Récupérer de la gauche"
+#. Create file size CellRenderer
+#: ../meld/dirdiff.py:392 ../meld/preferences.py:82
+msgid "Size"
+msgstr "Taille"
 
-#: ../meld/filediff.py:301
-msgid "Pull change from the left"
-msgstr "Récupère la modification de gauche"
+#. Create date-time CellRenderer
+#: ../meld/dirdiff.py:400 ../meld/preferences.py:83
+msgid "Modification time"
+msgstr "Date de modification"
 
-#: ../meld/filediff.py:302
-msgid "Pull from right"
-msgstr "Récupérer de la droite"
+#. Create permissions CellRenderer
+#: ../meld/dirdiff.py:408 ../meld/preferences.py:84
+msgid "Permissions"
+msgstr "Droits"
 
-#: ../meld/filediff.py:302
-msgid "Pull change from the right"
-msgstr "Récupère la modification de droite"
+#: ../meld/dirdiff.py:538
+#, python-format
+msgid "Hide %s"
+msgstr "Masquer %s"
 
-#: ../meld/filediff.py:303
-msgid "Copy above left"
-msgstr "Copier au-dessus de la gauche"
+#: ../meld/dirdiff.py:670 ../meld/dirdiff.py:694
+#, python-format
+msgid "[%s] Scanning %s"
+msgstr "[%s] En cours d'analyse de %s"
 
-#: ../meld/filediff.py:303
-msgid "Copy change above the left chunk"
-msgstr "Copie la modification au-dessus du segment de gauche"
+#: ../meld/dirdiff.py:827
+#, python-format
+msgid "[%s] Done"
+msgstr "[%s] Terminé"
 
-#: ../meld/filediff.py:304
-msgid "Copy below left"
-msgstr "Copier en dessous de la gauche"
+#: ../meld/dirdiff.py:835
+msgid "Folders have no differences"
+msgstr "Les dossiers ne comportent aucune différence"
 
-#: ../meld/filediff.py:304
-msgid "Copy change below the left chunk"
-msgstr "Copie la modification en dessous du segment de gauche"
+#: ../meld/dirdiff.py:837
+msgid "Contents of scanned files in folders are identical."
+msgstr "Les contenus des fichiers examinés dans les dossiers sont identiques."
 
-#: ../meld/filediff.py:305
-msgid "Copy above right"
-msgstr "Copier au-dessus de la droite"
+#: ../meld/dirdiff.py:839
+msgid ""
+"Scanned files in folders appear identical, but contents have not been "
+"scanned."
+msgstr ""
+"Les fichiers examinés dans les dossiers paraissent identiques, mais les "
+"contenus n'ont pas été examinés."
 
-#: ../meld/filediff.py:305
-msgid "Copy change above the right chunk"
-msgstr "Copie la modification au-dessus du segment de droite"
+#: ../meld/dirdiff.py:842
+msgid "File filters are in use, so not all files have been scanned."
+msgstr ""
+"Des filtres de fichier sont en cours d'utilisation, tous les fichiers n'ont "
+"donc pas été examinés."
 
-#: ../meld/filediff.py:306
-msgid "Copy below right"
-msgstr "Copier en dessous de la droite"
+#: ../meld/dirdiff.py:844
+msgid "Text filters are in use and may be masking content differences."
+msgstr ""
+"Des filtres de texte sont actuellement utilisés et il se peut qu'ils "
+"masquent des différences de contenu."
 
-#: ../meld/filediff.py:306
-msgid "Copy change below the right chunk"
-msgstr "Copie la modification en dessous du segement de droite"
+#: ../meld/dirdiff.py:862 ../meld/filediff.py:1371 ../meld/filediff.py:1401
+#: ../meld/filediff.py:1403 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122
+msgid "Hi_de"
+msgstr "Mas_quer"
 
-#: ../meld/filediff.py:307
-msgid "Delete"
-msgstr "Supprimer"
+#: ../meld/dirdiff.py:872
+msgid "Multiple errors occurred while scanning this folder"
+msgstr "Plusieurs erreurs se sont produites lors de l'analyse de ce dossier"
 
-#: ../meld/filediff.py:307
-msgid "Delete change"
-msgstr "Supprimer les modifications"
+#: ../meld/dirdiff.py:873
+msgid "Files with invalid encodings found"
+msgstr "Le codage de caractères de certains fichiers n'est pas valide"
 
-#: ../meld/filediff.py:308
-msgid "Merge all changes from left"
-msgstr "Fusionne toutes les modifications de gauche"
+#. TRANSLATORS: This is followed by a list of files
+#: ../meld/dirdiff.py:875
+msgid "Some files were in an incorrect encoding. The names are something like:"
+msgstr ""
+"Le codage de caractères de certains fichiers n'est pas correct. Les noms "
+"ressemblent à :"
 
-#: ../meld/filediff.py:308
-msgid "Merge all non-conflicting changes from the left"
-msgstr "Fusionne toutes les modifications non-conflictuelles de gauche"
+#: ../meld/dirdiff.py:877
+msgid "Files hidden by case insensitive comparison"
+msgstr "Fichiers cachés en raison de la comparaison insensible à la casse"
 
-#: ../meld/filediff.py:309
-msgid "Merge all changes from right"
-msgstr "Fusionne toutes les modifications de droite"
+#. TRANSLATORS: This is followed by a list of files
+#: ../meld/dirdiff.py:879
+msgid ""
+"You are running a case insensitive comparison on a case sensitive "
+"filesystem. The following files in this folder are hidden:"
+msgstr ""
+"Vous effectuez une comparaison insensible à la casse sur un système de "
+"fichiers sensible à la casse. Les fichiers suivants de ce dossier sont "
+"masqués :"
 
-#: ../meld/filediff.py:309
-msgid "Merge all non-conflicting changes from the right"
-msgstr "Fusionne toutes les modifications non-conflictuelles de droite"
+#: ../meld/dirdiff.py:890
+#, python-format
+msgid "'%s' hidden by '%s'"
+msgstr "« %s » est masqué par « %s »"
 
-#: ../meld/filediff.py:310
-msgid "Merge all non-conflicting"
-msgstr "Fusionne toutes les modifications non-conflictuelles"
+#: ../meld/dirdiff.py:946
+#, python-format
+msgid "Replace folder “%s”?"
+msgstr "Remplacer le dossier « %s » ?"
 
-#: ../meld/filediff.py:310
-msgid "Merge all non-conflicting changes from left and right panes"
+#: ../meld/dirdiff.py:948
+#, python-format
+msgid ""
+"Another folder with the same name already exists in “%s”.\n"
+"If you replace the existing folder, all files in it will be lost."
 msgstr ""
-"Fusionne toutes les modifications non-conflictuelles des panneaux de gauche "
-"et de droite"
+"Un autre dossier avec le même nom existe déjà dans « %s ».\n"
+"Si vous remplacez le fichier existant, tous les fichiers qu'il contient "
+"seront perdus."
 
-#: ../meld/filediff.py:311
-msgid "Cycle through documents"
-msgstr "Parcourir cycliquement les documents"
+#: ../meld/dirdiff.py:961
+msgid "Error copying file"
+msgstr "Erreur lors de la copie du fichier"
 
-#: ../meld/filediff.py:311
-msgid "Move keyboard focus to the next document in this comparison"
+#: ../meld/dirdiff.py:962
+#, python-format
+msgid ""
+"Couldn't copy %s\n"
+"to %s.\n"
+"\n"
+"%s"
 msgstr ""
-"Déplacer le focus clavier vers le document suivant dans cette comparaison"
+"Impossible de copier %s\n"
+"vers %s.\n"
+"\n"
+"%s"
 
-#: ../meld/filediff.py:315
-msgid "Lock scrolling"
-msgstr "Verrouiller le défilement"
+#: ../meld/dirdiff.py:985
+#, python-format
+msgid "Error deleting %s"
+msgstr "Erreur lors de la suppression de %s"
 
-#: ../meld/filediff.py:316
-msgid "Lock scrolling of all panes"
-msgstr "Verrouille le défilement de tous les panneaux"
+#: ../meld/dirdiff.py:1492
+msgid "No folder"
+msgstr "Aucun dossier"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:396
+#: ../meld/filediff.py:358
 msgid "INS"
 msgstr "INS"
 
-#: ../meld/filediff.py:396
+#: ../meld/filediff.py:358
 msgid "OVR"
 msgstr "ÉCR"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:398
+#: ../meld/filediff.py:360
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Ln %i, Col %i"
 
-#: ../meld/filediff.py:722
-#, python-format
+#: ../meld/filediff.py:772
+msgid "Comparison results will be inaccurate"
+msgstr "Les résultats de la comparaison manqueront de précision"
+
+#: ../meld/filediff.py:774
 msgid ""
-"Filter '%s' changed the number of lines in the file. Comparison will be "
-"incorrect. See the user manual for more details."
+"A filter changed the number of lines in the file, which is unsupported. The "
+"comparison will not be accurate."
 msgstr ""
-"Le filtre « %s » a modifié le nombre de lignes du fichier. La comparaison ne "
-"sera plus correcte. Consultez le manuel d'utilisation pour plus de détails."
+"Un filtre a modifié le nombre de lignes du fichier, ce qui n'est pas pris en "
+"charge. La comparaison ne sera pas précise."
 
-#. TRANSLATORS: this is the name of a new file which has not yet been saved
-#: ../meld/filediff.py:809
-msgid "<unnamed>"
-msgstr "<Document non enregistré>"
+#: ../meld/filediff.py:832
+msgid "Mark conflict as resolved?"
+msgstr "Marquer le conflit comme résolu ?"
 
-#: ../meld/filediff.py:998
-#, python-format
-msgid "[%s] Set num panes"
-msgstr "[%s] Régler le nombre de volets"
+#: ../meld/filediff.py:834
+msgid ""
+"If the conflict was resolved successfully, you may mark it as resolved now."
+msgstr ""
+"Si le conflit a été résolu avec succès, vous pouvez maintenant le marquer "
+"comme résolu."
 
-#: ../meld/filediff.py:1004
-#, python-format
-msgid "[%s] Opening files"
-msgstr "[%s] Ouverture des fichiers"
+#: ../meld/filediff.py:836
+msgid "Cancel"
+msgstr "Annuler"
 
-#: ../meld/filediff.py:1028 ../meld/filediff.py:1037 ../meld/filediff.py:1049
-#: ../meld/filediff.py:1055
-msgid "Could not read file"
-msgstr "Impossible de lire le fichier"
+#: ../meld/filediff.py:837
+msgid "Mark _Resolved"
+msgstr "Marquer comme _résolu"
 
-#: ../meld/filediff.py:1029
+#: ../meld/filediff.py:1087
 #, python-format
-msgid "[%s] Reading files"
-msgstr "[%s] Lecture des fichiers"
+msgid "There was a problem opening the file “%s”."
+msgstr "Un problème est survenu lors de l'ouverture du fichier « %s »."
 
-#: ../meld/filediff.py:1038
+#: ../meld/filediff.py:1095
 #, python-format
-msgid "%s appears to be a binary file."
-msgstr "%s semble être un fichier binaire."
+msgid "File %s appears to be a binary file."
+msgstr "Le fichier %s semble être un fichier binaire."
 
-#: ../meld/filediff.py:1050
-#, python-format
-msgid "%s is not in encodings: %s"
-msgstr "%s n'est pas dans un des codages : %s"
+#: ../meld/filediff.py:1097
+msgid "Do you want to open the file using the default application?"
+msgstr "Voulez-vous ouvrir le fichier avec l'application par défaut ?"
 
-#: ../meld/filediff.py:1080 ../meld/filemerge.py:67
+#: ../meld/filediff.py:1099
+msgid "Open"
+msgstr "Ouvrir"
+
+#: ../meld/filediff.py:1115
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Calcul des différences"
 
-#: ../meld/filediff.py:1158
+#: ../meld/filediff.py:1180
+#, python-format
+msgid "File %s has changed on disk"
+msgstr "Le fichier %s a été modifié sur le disque"
+
+#: ../meld/filediff.py:1181
+msgid "Do you want to reload the file?"
+msgstr "Voulez vous recharger le fichier ?"
+
+#: ../meld/filediff.py:1183
+msgid "_Reload"
+msgstr "_Recharger"
+
+#: ../meld/filediff.py:1334
+msgid "Files are identical"
+msgstr "Les fichiers sont identiques"
+
+#: ../meld/filediff.py:1347
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -808,720 +1903,710 @@ msgstr ""
 "masquent des différences entre les fichiers. Voulez-vous comparer les "
 "fichiers non filtrés ?"
 
-#: ../meld/filediff.py:1164
-msgid "Files are identical"
-msgstr "Les fichiers sont identiques"
+#: ../meld/filediff.py:1352
+msgid "Files differ in line endings only"
+msgstr "Les fichiers ne diffèrent que par les fins de lignes"
+
+#: ../meld/filediff.py:1354
+#, python-format
+msgid ""
+"Files are identical except for differing line endings:\n"
+"%s"
+msgstr ""
+"Les fichiers sont identiques sauf dans les fins de lignes :\n"
+"%s"
 
-#: ../meld/filediff.py:1174
+#: ../meld/filediff.py:1374
 msgid "Show without filters"
 msgstr "Afficher sans les filtres"
 
-#: ../meld/filediff.py:1363
-#, python-format
+#: ../meld/filediff.py:1396
+msgid "Change highlighting incomplete"
+msgstr "Surlignage des modifications incomplet"
+
+#: ../meld/filediff.py:1397
 msgid ""
-"\"%s\" exists!\n"
-"Overwrite?"
+"Some changes were not highlighted because they were too large. You can force "
+"Meld to take longer to highlight larger changes, though this may be slow."
 msgstr ""
-"« %s » existe déjà !\n"
-"Écraser ?"
+"Certaines modifications n'ont pas été surlignées car elles sont trop "
+"importantes. Vous pouvez forcer Meld à surligner des modifications plus "
+"importantes, mais cela risque d'être plus long."
+
+#: ../meld/filediff.py:1405
+msgid "Keep highlighting"
+msgstr "Continuer à surligner"
+
+#: ../meld/filediff.py:1407
+msgid "_Keep highlighting"
+msgstr "_Continuer à surligner"
 
-#: ../meld/filediff.py:1376
+#: ../meld/filediff.py:1439
+#, python-format
+msgid "Replace file “%s”?"
+msgstr "Remplacer le fichier « %s » ?"
+
+#: ../meld/filediff.py:1441
 #, python-format
 msgid ""
-"Error writing to %s\n"
-"\n"
-"%s."
+"A file with this name already exists in “%s”.\n"
+"If you replace the existing file, its contents will be lost."
 msgstr ""
-"Erreur lors de l'écriture de %s\n"
-"\n"
-"%s."
+"Un fichier avec le même nom existe déjà dans « %s ».\n"
+"Si vous remplacez le fichier existant, tout son contenu sera perdu."
 
-#: ../meld/filediff.py:1385
+#: ../meld/filediff.py:1458
+msgid "Save Left Pane As"
+msgstr "Enregistrer le panneau de gauche sous"
+
+#: ../meld/filediff.py:1460
+msgid "Save Middle Pane As"
+msgstr "Enregistrer le panneau du milieu sous"
+
+#: ../meld/filediff.py:1462
+msgid "Save Right Pane As"
+msgstr "Enregistrer le panneau de droite sous"
+
+#: ../meld/filediff.py:1476
 #, python-format
-msgid "Choose a name for buffer %i."
-msgstr "Choisissez un nom pour le tampon %i."
+msgid "File %s has changed on disk since it was opened"
+msgstr "Le fichier %s a été modifié sur le disque après son ouverture"
+
+#: ../meld/filediff.py:1478
+msgid "If you save it, any external changes will be lost."
+msgstr "Si vous l'enregistrez, toute modification extérieure sera perdue."
 
-#: ../meld/filediff.py:1400
+#: ../meld/filediff.py:1481
+msgid "Save Anyway"
+msgstr "Enregistrer malgré tout"
+
+#: ../meld/filediff.py:1482
+msgid "Don't Save"
+msgstr "Ne pas enregistrer"
+
+#: ../meld/filediff.py:1507
+msgid "_Save as UTF-8"
+msgstr "_Enregistrer en tant qu'UTF-8"
+
+#: ../meld/filediff.py:1510
 #, python-format
-msgid ""
-"This file '%s' contains a mixture of line endings.\n"
-"\n"
-"Which format would you like to use?"
-msgstr ""
-"Le fichier « %s » présente un mélange de fins de lignes.\n"
-"\n"
-"Quel format voulez-vous utiliser ?"
+msgid "Couldn't encode text as “%s”"
+msgstr "Impossible de coder le texte en « %s »"
 
-#: ../meld/filediff.py:1416
+#: ../meld/filediff.py:1512
 #, python-format
 msgid ""
-"'%s' contains characters not encodable with '%s'\n"
+"File “%s” contains characters that can't be encoded using encoding “%s”.\n"
 "Would you like to save as UTF-8?"
 msgstr ""
-"« %s » contient des caractères qui ne peuvent être codés avec « %s »\n"
+"Le fichier « %s » contient des caractères qui ne peuvent être codés avec le "
+"codage « %s ».\n"
 "Voulez-vous enregistrer en UTF-8 ?"
 
-#: ../meld/filediff.py:1475
+#: ../meld/filediff.py:1549 ../meld/patchdialog.py:136
+#, python-format
+msgid "Could not save file %s."
+msgstr "Impossible d'enregistrer le fichier %s."
+
+#: ../meld/filediff.py:1550 ../meld/patchdialog.py:137
 #, python-format
 msgid ""
-"Reloading will discard changes in:\n"
-"%s\n"
-"\n"
-"You cannot undo this operation."
+"Couldn't save file due to:\n"
+"%s"
 msgstr ""
-"Recharger annulera tous les changements dans :\n"
-"%s\n"
-"\n"
-"Vous ne pouvez pas annuler cette opération."
+"Impossible d'enregistrer le fichier à cause de :\n"
+"%s"
+
+#: ../meld/filediff.py:1897
+msgid "Live comparison updating disabled"
+msgstr "La mise à jour en direct des comparaisons est désactivée"
 
-#: ../meld/filemerge.py:82
+#: ../meld/filediff.py:1898
+msgid ""
+"Live updating of comparisons is disabled when synchronization points are "
+"active. You can still manually refresh the comparison, and live updates will "
+"resume when synchronization points are cleared."
+msgstr ""
+"La mise à jour en direct des comparaisons est désactivée quand les points de "
+"synchronisation sont actifs. Vous pouvez toujours actualiser manuellement la "
+"comparaison, et les mises à jour automatiques reprendront quand les points "
+"de synchronisation seront effacés."
+
+#: ../meld/filemerge.py:37
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Fusion des fichiers"
 
-#: ../meld/meldapp.py:152
+#: ../meld/gutterrendererchunk.py:159
+msgid "Copy _up"
+msgstr "Copier au-dess_us"
+
+#: ../meld/gutterrendererchunk.py:160
+msgid "Copy _down"
+msgstr "Copier au-dess_ous"
+
+#: ../meld/meldapp.py:177
 msgid "wrong number of arguments supplied to --diff"
-msgstr "Nombre de paramètres incorrect pour --diff"
+msgstr "nombre de paramètres incorrect pour --diff"
 
-#: ../meld/meldapp.py:156
+#: ../meld/meldapp.py:182
 msgid "Start with an empty window"
 msgstr "Démarrer avec une fenêtre vide"
 
-#: ../meld/meldapp.py:157 ../meld/meldapp.py:158 ../meld/meldapp.py:160
+#: ../meld/meldapp.py:183 ../meld/meldapp.py:185
 msgid "file"
 msgstr "fichier"
 
-#: ../meld/meldapp.py:157 ../meld/meldapp.py:159 ../meld/meldapp.py:160
-msgid "dir"
-msgstr "répertoire"
+#: ../meld/meldapp.py:183 ../meld/meldapp.py:187
+msgid "folder"
+msgstr "dossier"
 
-#: ../meld/meldapp.py:157
+#: ../meld/meldapp.py:184
 msgid "Start a version control comparison"
-msgstr "Démarrer une comparaison de gestion de versions"
+msgstr "Démarrer une comparaison de gestion de version"
 
-#: ../meld/meldapp.py:158
+#: ../meld/meldapp.py:186
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Démarrer une comparaison de 2 ou 3 fichiers"
 
-#: ../meld/meldapp.py:159
-msgid "Start a 2- or 3-way directory comparison"
-msgstr "Démarrer une comparaison de 2 ou 3 répertoires"
+#: ../meld/meldapp.py:188
+msgid "Start a 2- or 3-way folder comparison"
+msgstr "Démarrer une comparaison de 2 ou 3 dossiers"
 
-#: ../meld/meldapp.py:160
-msgid "Start a comparison between file and dir/file"
-msgstr "Démarrer une comparaison de fichier et de répertoire/fichier"
+#: ../meld/meldapp.py:231
+#, python-format
+msgid "Error: %s\n"
+msgstr "Erreur : %s\n"
 
-#: ../meld/meldapp.py:166
+#: ../meld/meldapp.py:238
 msgid "Meld is a file and directory comparison tool."
-msgstr "Meld est un outil de comparaison de fichiers et de répertoires."
+msgstr "Meld est un outil de comparaison de fichiers et de dossiers."
 
-#: ../meld/meldapp.py:169
+#: ../meld/meldapp.py:242
 msgid "Set label to use instead of file name"
-msgstr "Définit l'étiquette à utiliser au lieu du nom de fichier"
+msgstr "Définir l'étiquette à utiliser au lieu du nom de fichier"
+
+#: ../meld/meldapp.py:245
+msgid "Open a new tab in an already running instance"
+msgstr "Ouvrir un nouvel onglet dans une instance en cours"
 
-#: ../meld/meldapp.py:171
+#: ../meld/meldapp.py:248
 msgid "Automatically compare all differing files on startup"
-msgstr "Compare automatiquement tous les fichiers différents au démarrage"
+msgstr "Comparer automatiquement tous les fichiers différents au démarrage"
 
-#: ../meld/meldapp.py:173
+#: ../meld/meldapp.py:251
 msgid "Ignored for compatibility"
 msgstr "Ignorée pour compatibilité"
 
-#: ../meld/meldapp.py:176
+#: ../meld/meldapp.py:255
 msgid "Set the target file for saving a merge result"
-msgstr "Définit le fichier cible pour l'enregistrement d'un résultat de fusion"
+msgstr "Définir le fichier cible pour l'enregistrement d'un résultat de fusion"
 
-#: ../meld/meldapp.py:179
-msgid "Creates a diff tab for up to 3 supplied files or directories."
-msgstr "Crée un onglet diff pour un maximum de 3 fichiers ou répertoires."
+#: ../meld/meldapp.py:258
+msgid "Automatically merge files"
+msgstr "Fusionner automatiquement les fichiers"
 
-#: ../meld/meldapp.py:182
+#: ../meld/meldapp.py:262
+msgid "Load a saved comparison from a Meld comparison file"
+msgstr ""
+"Charger une comparaison enregistrée à partir d'un fichier de comparaison Meld"
+
+#: ../meld/meldapp.py:266
+msgid "Create a diff tab for the supplied files or folders"
+msgstr "Créer un onglet de comparaison pour les fichiers ou dossiers fournis"
+
+#: ../meld/meldapp.py:286
+#, python-format
+msgid "too many arguments (wanted 0-3, got %d)"
+msgstr "trop de paramètres (0-3 désirés, %d reçus)"
+
+#: ../meld/meldapp.py:289
+msgid "can't auto-merge less than 3 files"
+msgstr "impossible de fusionner automatiquement moins de 3 fichiers"
+
+#: ../meld/meldapp.py:291
+msgid "can't auto-merge directories"
+msgstr "impossible de fusionner automatiquement les dossiers"
+
+#: ../meld/meldapp.py:305
+msgid "Error reading saved comparison file"
+msgstr "Erreur à la lecture du fichier de comparaison enregistré"
+
+#: ../meld/meldapp.py:332
 #, python-format
-msgid "too many arguments (wanted 0-4, got %d)"
-msgstr "trop de paramètres (0-4 désirés, %d reçus)"
+msgid "invalid path or URI \"%s\""
+msgstr "chemin ou URI non valide « %s »"
 
-#: ../meld/meldapp.py:184 ../meld/meldapp.py:188
-msgid "can't compare more than three directories"
-msgstr "impossible de comparer plus de trois répertoires"
+#. TRANSLATORS: This is the label of a new, currently-unnamed file.
+#: ../meld/meldbuffer.py:132
+msgid "<unnamed>"
+msgstr "<sans nom>"
 
-#: ../meld/melddoc.py:56 ../meld/melddoc.py:57
+#: ../meld/melddoc.py:83 ../meld/melddoc.py:84
 msgid "untitled"
 msgstr "sans titre"
 
-#: ../meld/meldwindow.py:125
+#: ../meld/meldwindow.py:49
 msgid "_File"
 msgstr "_Fichier"
 
-#: ../meld/meldwindow.py:126
-msgid "_New..."
-msgstr "_Nouveau..."
+#: ../meld/meldwindow.py:50
+msgid "_New Comparison..."
+msgstr "_Nouvelle comparaison…"
 
-#: ../meld/meldwindow.py:126
+#: ../meld/meldwindow.py:51
 msgid "Start a new comparison"
 msgstr "Lancer une nouvelle comparaison"
 
-#: ../meld/meldwindow.py:127
+#: ../meld/meldwindow.py:54
 msgid "Save the current file"
 msgstr "Enregistrer le fichier actuel"
 
-#: ../meld/meldwindow.py:129
+#: ../meld/meldwindow.py:56
+msgid "Save As..."
+msgstr "Enregistrer sous…"
+
+#: ../meld/meldwindow.py:57
+msgid "Save the current file with a different name"
+msgstr "Enregistrer le fichier en cours sous un nom différent"
+
+#: ../meld/meldwindow.py:60
 msgid "Close the current file"
 msgstr "Fermer le fichier actuel"
 
-#: ../meld/meldwindow.py:130
-msgid "Quit the program"
-msgstr "Quitter le programme"
-
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:63
 msgid "_Edit"
 msgstr "É_dition"
 
-#: ../meld/meldwindow.py:133
+#: ../meld/meldwindow.py:65
 msgid "Undo the last action"
 msgstr "Annuler la dernière action"
 
-#: ../meld/meldwindow.py:134
+#: ../meld/meldwindow.py:68
 msgid "Redo the last undone action"
 msgstr "Rétablir la dernière action annulée"
 
-#: ../meld/meldwindow.py:135
+#: ../meld/meldwindow.py:70
 msgid "Cut the selection"
 msgstr "Couper la sélection"
 
-#: ../meld/meldwindow.py:136
+#: ../meld/meldwindow.py:72
 msgid "Copy the selection"
 msgstr "Copier la sélection"
 
-#: ../meld/meldwindow.py:137
+#: ../meld/meldwindow.py:74
 msgid "Paste the clipboard"
 msgstr "Coller le presse-papiers"
 
-#: ../meld/meldwindow.py:138
+#: ../meld/meldwindow.py:76
+msgid "Find..."
+msgstr "Rechercher…"
+
+#: ../meld/meldwindow.py:76
 msgid "Search for text"
-msgstr "Rechercher du texte"
+msgstr "Rechercher un texte"
 
-#: ../meld/meldwindow.py:139
+#: ../meld/meldwindow.py:78
 msgid "Find Ne_xt"
 msgstr "Rechercher le _suivant"
 
-#: ../meld/meldwindow.py:139
+#: ../meld/meldwindow.py:79
 msgid "Search forwards for the same text"
 msgstr "Recherche le même texte en avant"
 
-#: ../meld/meldwindow.py:140
+#: ../meld/meldwindow.py:81
 msgid "Find _Previous"
 msgstr "Rechercher le _précédent"
 
-#: ../meld/meldwindow.py:140
+#: ../meld/meldwindow.py:82
 msgid "Search backwards for the same text"
 msgstr "Recherche le même texte en arrière"
 
-#: ../meld/meldwindow.py:141
+#: ../meld/meldwindow.py:85
+msgid "_Replace..."
+msgstr "_Remplacer…"
+
+#: ../meld/meldwindow.py:86
 msgid "Find and replace text"
 msgstr "Recherche un texte et le remplace"
 
-#: ../meld/meldwindow.py:142
-msgid "Prefere_nces"
-msgstr "_Préférences"
-
-#: ../meld/meldwindow.py:142
-msgid "Configure the application"
-msgstr "Configurer l'application"
-
-#: ../meld/meldwindow.py:144
+#: ../meld/meldwindow.py:89
 msgid "_Changes"
 msgstr "D_ifférences"
 
-#: ../meld/meldwindow.py:145
-msgid "Next change"
-msgstr "Prochaine différence"
+#: ../meld/meldwindow.py:90
+msgid "Next Change"
+msgstr "Différence suivante"
 
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:91
 msgid "Go to the next change"
-msgstr "Va jusqu'à la prochaine différence"
+msgstr "Aller jusqu'à la différence suivante"
 
-#: ../meld/meldwindow.py:146
-msgid "Previous change"
+#: ../meld/meldwindow.py:93
+msgid "Previous Change"
 msgstr "Différence précédente"
 
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:94
 msgid "Go to the previous change"
-msgstr "Revient à la différence précédente"
+msgstr "Retour à la différence précédente"
 
-#: ../meld/meldwindow.py:147
-msgid "Open externally"
+#: ../meld/meldwindow.py:96
+msgid "Open Externally"
 msgstr "Ouvrir avec"
 
-#: ../meld/meldwindow.py:147
+#: ../meld/meldwindow.py:97
 msgid "Open selected file or directory in the default external application"
 msgstr ""
 "Ouvre le dossier ou le fichier sélectionné dans l'application externe par "
 "défaut"
 
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:101
 msgid "_View"
 msgstr "_Affichage"
 
-#: ../meld/meldwindow.py:150
-msgid "File status"
+#: ../meld/meldwindow.py:102
+msgid "File Status"
 msgstr "État du fichier"
 
-#: ../meld/meldwindow.py:151
-msgid "Version status"
+#: ../meld/meldwindow.py:103
+msgid "Version Status"
 msgstr "État de la version"
 
-#: ../meld/meldwindow.py:152
-msgid "File filters"
-msgstr "Filtres de fichier"
-
-#: ../meld/meldwindow.py:153
+#: ../meld/meldwindow.py:106
 msgid "Stop the current action"
-msgstr "Arrête l'action en cours"
+msgstr "Arrêter l'action en cours"
 
-#: ../meld/meldwindow.py:154
+#: ../meld/meldwindow.py:109
 msgid "Refresh the view"
-msgstr "Actualise l'affichage"
-
-#: ../meld/meldwindow.py:155
-msgid "Reload"
-msgstr "Recharger"
-
-#: ../meld/meldwindow.py:155
-msgid "Reload the comparison"
-msgstr "Recharge la comparaison"
+msgstr "Actualiser l'affichage"
 
-#: ../meld/meldwindow.py:157
+#: ../meld/meldwindow.py:112
 msgid "_Tabs"
 msgstr "_Onglets"
 
-#: ../meld/meldwindow.py:158
+#: ../meld/meldwindow.py:113
 msgid "_Previous Tab"
 msgstr "Onglet _précédent"
 
-#: ../meld/meldwindow.py:158
+#: ../meld/meldwindow.py:114
 msgid "Activate previous tab"
 msgstr "Active l'onglet précédent"
 
-#: ../meld/meldwindow.py:159
+#: ../meld/meldwindow.py:116
 msgid "_Next Tab"
 msgstr "Onglet _suivant"
 
-#: ../meld/meldwindow.py:159
+#: ../meld/meldwindow.py:117
 msgid "Activate next tab"
 msgstr "Active l'onglet suivant"
 
-#: ../meld/meldwindow.py:160
+#: ../meld/meldwindow.py:120
 msgid "Move Tab _Left"
 msgstr "Déplacer l'onglet vers la _gauche"
 
-#: ../meld/meldwindow.py:160
+#: ../meld/meldwindow.py:121
 msgid "Move current tab to left"
 msgstr "Déplace l'onglet actuel vers la gauche"
 
-#: ../meld/meldwindow.py:161
+#: ../meld/meldwindow.py:124
 msgid "Move Tab _Right"
 msgstr "Déplacer l'onglet vers la _droite"
 
-#: ../meld/meldwindow.py:161
+#: ../meld/meldwindow.py:125
 msgid "Move current tab to right"
 msgstr "Déplace l'onglet actuel vers la droite"
 
-#: ../meld/meldwindow.py:163
-msgid "_Help"
-msgstr "Aid_e"
+#: ../meld/meldwindow.py:129
+msgid "Fullscreen"
+msgstr "Plein écran"
 
-#: ../meld/meldwindow.py:164
-msgid "_Contents"
-msgstr "_Sommaire"
+#: ../meld/meldwindow.py:130
+msgid "View the comparison in fullscreen"
+msgstr "Afficher la comparaison en plein écran"
 
-#: ../meld/meldwindow.py:164
-msgid "Open the Meld manual"
-msgstr "Ouvre le manuel de Meld"
+#: ../meld/meldwindow.py:132
+msgid "_Toolbar"
+msgstr "_Barre d'outils"
+
+#: ../meld/meldwindow.py:133
+msgid "Show or hide the toolbar"
+msgstr "Afficher ou masquer la barre d'outils"
 
-#: ../meld/meldwindow.py:165
-msgid "Report _Bug"
-msgstr "Signaler une _anomalie"
+#: ../meld/meldwindow.py:143
+msgid "Open Recent"
+msgstr "Récemment ouverts"
 
-#: ../meld/meldwindow.py:165
-msgid "Report a bug in Meld"
-msgstr "Rapporte une anomalie de Meld"
+#: ../meld/meldwindow.py:144
+msgid "Open recent files"
+msgstr "Ouvrir les fichiers récents"
 
 #: ../meld/meldwindow.py:166
-msgid "About this program"
-msgstr "À propos de ce programme"
+msgid "_Meld"
+msgstr "_Meld"
 
-#: ../meld/meldwindow.py:169
-msgid "Full Screen"
-msgstr "Plein écran"
+#: ../meld/meldwindow.py:167
+msgid "Quit the program"
+msgstr "Quitter le programme"
 
 #: ../meld/meldwindow.py:169
-msgid "View the comparison in full screen"
-msgstr "Afficher la comparaison en plein écran"
+msgid "Prefere_nces"
+msgstr "Préfére_nces"
 
 #: ../meld/meldwindow.py:170
-msgid "_Toolbar"
-msgstr "_Barre d'outils"
+msgid "Configure the application"
+msgstr "Configurer l'application"
 
-#: ../meld/meldwindow.py:170
-msgid "Show or hide the toolbar"
-msgstr "Affiche ou masque la barre d'outils"
+#: ../meld/meldwindow.py:172
+msgid "_Contents"
+msgstr "_Sommaire"
 
-#: ../meld/meldwindow.py:171
-msgid "_Statusbar"
-msgstr "B_arre d'état"
+#: ../meld/meldwindow.py:173
+msgid "Open the Meld manual"
+msgstr "Ouvrir le manuel Meld"
 
-#: ../meld/meldwindow.py:171
-msgid "Show or hide the statusbar"
-msgstr "Affiche ou masque la barre d'état"
+#: ../meld/meldwindow.py:175
+msgid "About this application"
+msgstr "À propos de cette application"
 
-#: ../meld/meldwindow.py:541
+#: ../meld/meldwindow.py:588
 msgid "Switch to this tab"
 msgstr "Basculer vers cet onglet"
 
-#. exit at first non found directory + file
-#: ../meld/meldwindow.py:639
-msgid "Cannot compare a mixture of files and directories.\n"
-msgstr "Impossible de comparer des fichiers avec des répertoires.\n"
+#: ../meld/meldwindow.py:703
+#, python-format
+msgid "Need three files to auto-merge, got: %r"
+msgstr "Trois fichiers sont nécessaires pour une auto-fusion, reçu %r"
+
+#: ../meld/meldwindow.py:717
+msgid "Cannot compare a mixture of files and directories"
+msgstr "Impossible de comparer des fichiers avec des dossiers"
+
+#: ../meld/misc.py:203
+#, python-format
+msgid "Couldn't find colour scheme details for %s-%s; this is a bad install"
+msgstr ""
+"Impossible de trouver les détails du jeu de couleur pour %s-%s ; il s'agit "
+"d'une mauvaise installation"
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:174
+#: ../meld/misc.py:288
 msgid "[None]"
 msgstr "[Aucun]"
 
-#: ../meld/patchdialog.py:122
-msgid "Save Patch As..."
-msgstr "Enregistrer le correctif sous..."
-
-#: ../meld/preferences.py:37
+#: ../meld/preferences.py:33
 msgid "label"
 msgstr "étiquette"
 
-#: ../meld/preferences.py:37
+#: ../meld/preferences.py:33
 msgid "pattern"
 msgstr "motif"
 
-#: ../meld/preferences.py:111
-msgid "Only available if you have gnome-python-desktop installed"
-msgstr "Disponible uniquement si gnome-python-desktop est installé"
+#: ../meld/recent.py:115
+msgid "Version control:"
+msgstr "Gestionnaire de versions :"
 
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:234
-msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
-msgstr "Sauvegardes\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
+#: ../meld/ui/notebooklabel.py:63
+msgid "Close tab"
+msgstr "Fermer l'onglet"
 
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:236
-msgid ""
-"OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
-"Desktop.ini\n"
-msgstr ""
-"Métadonnées spécifiques au système d'exploitation\t0\t.DS_Store ._* ."
-"Spotlight-V100 .Trashes Thumbs.db Desktop.ini\n"
+#: ../meld/ui/vcdialogs.py:50
+msgid "No files will be committed"
+msgstr "Aucun fichier ne sera soumis"
 
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:238
+#. Translators: First %s is replaced by translated "%d unpushed
+#. commits", second %s is replaced by translated "%d branches"
+#: ../meld/vc/git.py:95
 #, python-format
-msgid "Version Control\t1\t%s\n"
-msgstr "Gestionnaire de versions\t1\t%s\n"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:240
-msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
-msgstr "Binaires\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:242
-msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
-msgstr "Média\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:244
-msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
-msgstr "Mots-clés CVS\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:246
-msgid "C++ comment\t0\t//.*\n"
-msgstr "Commentaire C++\t0\t//.*\n"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:248
-msgid "C comment\t0\t/\\*.*?\\*/\n"
-msgstr "Commentaire C\t0\t/\\*.*?\\*/\n"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:250
-msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n"
-msgstr "Tout caractère d'espacement\t0\t[ \\t\\r\\f\\v]*\n"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:252
-msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n"
-msgstr "Caractère d'espacement en début de ligne\t0\t^[ \\t\\r\\f\\v]*\n"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:254
-msgid "Script comment\t0\t#.*"
-msgstr "Commentaire de script\t0\t#.*"
-
-#: ../meld/vcview.py:128
-msgid "Co_mmit"
-msgstr "_Valider"
-
-#: ../meld/vcview.py:128
-msgid "Commit"
-msgstr "Fait un « Commit »"
-
-#: ../meld/vcview.py:129
-msgid "_Update"
-msgstr "Mettre à _jour"
+msgid "%s in %s"
+msgstr "%s dans %s"
 
-#: ../meld/vcview.py:129
-msgid "Update"
-msgstr "Fait un « Update »"
-
-#: ../meld/vcview.py:130
-msgid "Add to VC"
-msgstr "Ajoute au gestionnaire de versions"
-
-#: ../meld/vcview.py:131
-msgid "Add _Binary"
-msgstr "Ajouter _binaire"
-
-#: ../meld/vcview.py:131
-msgid "Add binary to VC"
-msgstr "Ajoute le binaire au gestionnaire de versions"
-
-#: ../meld/vcview.py:132
-msgid "Remove from VC"
-msgstr "Supprime du gestionnaire de versions"
-
-#: ../meld/vcview.py:133
-msgid "_Resolved"
-msgstr "_Résolu"
+#. Translators: These messages cover the case where there is
+#. only one branch, and are not part of another message.
+#: ../meld/vc/git.py:96 ../meld/vc/git.py:103
+#, python-format
+msgid "%d unpushed commit"
+msgid_plural "%d unpushed commits"
+msgstr[0] "%d commit non envoyé"
+msgstr[1] "%d commits non envoyés"
 
-#: ../meld/vcview.py:133
-msgid "Mark as resolved for VC"
-msgstr "Marque comme résolu pour le gestionnaire de versions"
+#: ../meld/vc/git.py:98
+#, python-format
+msgid "%d branch"
+msgid_plural "%d branches"
+msgstr[0] "%d branche"
+msgstr[1] "%d branches"
 
-#: ../meld/vcview.py:134
-msgid "Revert to original"
-msgstr "Revenir à l'original"
+#: ../meld/vc/git.py:352
+#, python-format
+msgid "Mode changed from %s to %s"
+msgstr "Mode changé de %s à %s"
 
-#: ../meld/vcview.py:135
-msgid "Delete locally"
-msgstr "Effacer localement"
+#: ../meld/vc/git.py:360
+msgid "Partially staged"
+msgstr "Partiellement présélectionné"
 
-#: ../meld/vcview.py:139
-msgid "_Flatten"
-msgstr "A_platir"
+#: ../meld/vc/git.py:360
+msgid "Staged"
+msgstr "Présélectionné"
 
-#: ../meld/vcview.py:139
-msgid "Flatten directories"
-msgstr "Aplatir les répertoires"
+#. Translators: This is the displayed name of a version control system
+#. when no version control system is actually found.
+#: ../meld/vc/_null.py:38
+msgid "None"
+msgstr "Aucun"
 
-#: ../meld/vcview.py:140
-msgid "_Modified"
-msgstr "_Modifiés"
+#: ../meld/vc/svn.py:216
+#, python-format
+msgid "Rev %s"
+msgstr "Rév %s"
 
-#: ../meld/vcview.py:141
-msgid "_Normal"
-msgstr "_Normal"
+#: ../meld/vc/_vc.py:52
+msgid "Merged"
+msgstr "Fusionné"
 
-#: ../meld/vcview.py:141
-msgid "Show normal"
-msgstr "Affichage normal"
+#: ../meld/vc/_vc.py:52
+msgid "Base"
+msgstr "Base"
 
-#: ../meld/vcview.py:142
-msgid "Non _VC"
-msgstr "Non _versionné"
+#: ../meld/vc/_vc.py:52
+msgid "Local"
+msgstr "Local"
 
-#: ../meld/vcview.py:142
-msgid "Show unversioned files"
-msgstr "Affiche les fichiers qui ne sont pas versionnés"
+#: ../meld/vc/_vc.py:52
+msgid "Remote"
+msgstr "Distant"
 
-#: ../meld/vcview.py:143
-msgid "Ignored"
-msgstr "Ignoré"
+#: ../meld/vc/_vc.py:68
+msgid "Unversioned"
+msgstr "Non versionné"
 
-#: ../meld/vcview.py:143
-msgid "Show ignored files"
-msgstr "Affiche les fichiers ignorés"
+#: ../meld/vc/_vc.py:71
+msgid "Error"
+msgstr "Erreur"
 
-#: ../meld/vcview.py:186 ../meld/vcview.py:319
-msgid "Location"
-msgstr "Emplacement"
+#: ../meld/vc/_vc.py:73
+msgid "Newly added"
+msgstr "Récemment ajouté"
 
-#: ../meld/vcview.py:187
-msgid "Status"
-msgstr "État"
+#: ../meld/vc/_vc.py:75
+msgid "Renamed"
+msgstr "Renommé"
 
-#: ../meld/vcview.py:188
-msgid "Rev"
-msgstr "Révision"
+#: ../meld/vc/_vc.py:76
+msgid "Conflict"
+msgstr "Conflit"
 
-#: ../meld/vcview.py:189
-msgid "Tag"
-msgstr "Étiquette"
+#: ../meld/vc/_vc.py:77
+msgid "Removed"
+msgstr "Supprimé"
 
-#: ../meld/vcview.py:190
-msgid "Options"
-msgstr "Options"
+#: ../meld/vc/_vc.py:78
+msgid "Missing"
+msgstr "Manquant"
 
-#: ../meld/vcview.py:249
-msgid "Choose one Version Control"
-msgstr "Choisir un système de gestion de versions"
+#: ../meld/vc/_vc.py:79
+msgid "Not present"
+msgstr "Absent"
 
-#: ../meld/vcview.py:250
-msgid "Only one Version Control in this directory"
-msgstr "Un seul système de gestion de versions dans ce répertoire"
+#. Translators: This error message is shown when a version
+#. control binary isn't installed.
+#: ../meld/vcview.py:261
+#, python-format
+msgid "%(name)s (%(cmd)s not installed)"
+msgstr "%(name)s (%(cmd)s  n'est pas installé)"
 
-#. TRANSLATORS: this is an error message when a version control
-#. application isn't installed or can't be found
-#: ../meld/vcview.py:263
+#. Translators: This error message is shown when a version
+#. controlled repository is invalid.
+#: ../meld/vcview.py:265
 #, python-format
-msgid "%s Not Installed"
-msgstr "%s n'est pas installé"
+msgid "%(name)s (Invalid repository)"
+msgstr "%(name)s (le dépôt n'est pas valide)"
 
-#. TRANSLATORS: this is an error message when a version
-#. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:267
-msgid "Invalid Repository"
-msgstr "Dépôt non valide"
+#: ../meld/vcview.py:286
+msgid "No valid version control system found in this folder"
+msgstr "Ce dossier ne contient pas de système de gestion de versions valide"
 
-#: ../meld/vcview.py:276
-#, python-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#: ../meld/vcview.py:288
+msgid "Only one version control system found in this folder"
+msgstr "Un seul système de gestion de versions trouvé dans ce dossier"
+
+#: ../meld/vcview.py:290
+msgid "Choose which version control system to use"
+msgstr "Choisir le gestionnaire de versions à utiliser"
 
-#. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:319
+#. TRANSLATORS: This is the location of the directory being viewed
+#: ../meld/vcview.py:343
 #, python-format
 msgid "%s: %s"
 msgstr "%s : %s"
 
 #: ../meld/vcview.py:363
+#, python-format
+msgid "Scanning %s"
+msgstr "En cours d'analyse de %s"
+
+#: ../meld/vcview.py:402
 msgid "(Empty)"
 msgstr "(vide)"
 
-#: ../meld/vcview.py:401
+#: ../meld/vcview.py:446
 #, python-format
-msgid "[%s] Fetching differences"
-msgstr "[%s] Récupération des différences"
+msgid "%s — local"
+msgstr "%s — local"
 
-#: ../meld/vcview.py:409
+#: ../meld/vcview.py:447
 #, python-format
-msgid "[%s] Applying patch"
-msgstr "[%s] Application du correctif"
+msgid "%s — remote"
+msgstr "%s — distant"
 
-#: ../meld/vcview.py:511
-msgid "Select some files first."
-msgstr "Sélectionnez d'abord des fichiers."
-
-#: ../meld/vcview.py:584
-#, python-format
-msgid ""
-"\n"
-"                    Invoking 'patch' failed.\n"
-"                    \n"
-"                    Maybe you don't have 'GNU patch' installed,\n"
-"                    or you use an untested version of %s.\n"
-"                    \n"
-"                    Please send email bug report to:\n"
-"                    meld-list@gnome.org\n"
-"                    \n"
-"                    Containing the following information:\n"
-"                    \n"
-"                    - meld version: '%s'\n"
-"                    - source control software type: '%s'\n"
-"                    - source control software version: 'X.Y.Z'\n"
-"                    - the output of '%s somefile.txt'\n"
-"                    - patch command: '%s'\n"
-"                    (no need to actually run it, just provide\n"
-"                    the command line) \n"
-"                    \n"
-"                    Replace 'X.Y.Z' by the actual version for the\n"
-"                    source control software you use.\n"
-"                    "
-msgstr ""
-"\n"
-"                    L'appel à « patch » a échoué.\n"
-"                    \n"
-"                    « GNU patch » n'est peut-être pas installé,\n"
-"                    ou vous utilisez une version non testée de %s.\n"
-"            \n"
-"                    Envoyez un rapport d'anomalie à :\n"
-"                    meld-list@gnome.org\n"
-"                    \n"
-"                    Contenant les informations suivantes :\n"
-"                    \n"
-"                    - version de Meld : « %s »\n"
-"                    - type du gestionnaire de versions : « %s »\n"
-"                    - version du gestionnaire de versions : « X.Y.Z »\n"
-"                    - la sortie de « %s somefile.txt »\n"
-"                    - la commande patch : « %s »\n"
-"                    (pas la peine de la lancer, il suffit de fournir\n"
-"                    la ligne de commande) \n"
-"                    \n"
-"                    Remplacez « X.Y.Z » par la version réelle du\n"
-"                    gestionnaire de versions que vous utilisez.\n"
-"                    "
-
-#: ../meld/ui/findbar.py:140
+#: ../meld/vcview.py:455
 #, python-format
-msgid ""
-"Regular expression error\n"
-"'%s'"
-msgstr ""
-"Erreur d'expression régulière\n"
-"« %s »"
+msgid "%s (local, merge, remote)"
+msgstr "%s (local, fusionné, distant)"
 
-#: ../meld/ui/historyentry.py:293
-msgid "_Browse..."
-msgstr "_Parcourir..."
-
-#: ../meld/ui/historyentry.py:301
-msgid "Path"
-msgstr "Chemin"
-
-#: ../meld/ui/historyentry.py:302
-msgid "Path to file"
-msgstr "Chemin vers le fichier"
+#: ../meld/vcview.py:460
+#, python-format
+msgid "%s (remote, merge, local)"
+msgstr "%s (distant, fusionné, local)"
 
-#: ../meld/ui/historyentry.py:303
-msgid "Pop up a file selector to choose a file"
-msgstr "Affiche un sélecteur de fichiers pour choisir un fichier"
+#: ../meld/vcview.py:471
+#, python-format
+msgid "%s — repository"
+msgstr "%s — dépôt"
 
-#: ../meld/ui/historyentry.py:441
-msgid "Select directory"
-msgstr "Sélectionner le répertoire"
+#: ../meld/vcview.py:477
+#, python-format
+msgid "%s (working, repository)"
+msgstr "%s (en travail, dépôt)"
 
-#: ../meld/ui/historyentry.py:445
-msgid "Select file"
-msgstr "Sélectionner le fichier"
+#: ../meld/vcview.py:481
+#, python-format
+msgid "%s (repository, working)"
+msgstr "%s (dépôt, en travail)"
 
-#: ../meld/ui/notebooklabel.py:60
-msgid "Close tab"
-msgstr "Fermer l'onglet"
+#: ../meld/vcview.py:649
+msgid "Remove folder and all its files?"
+msgstr "Supprimer le dossier et tous ses fichiers ?"
 
-#. These are the possible states of files. Be sure to get the colons correct.
-#: ../meld/vc/_vc.py:40
+#: ../meld/vcview.py:651
 msgid ""
-"Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing"
+"This will remove all selected files and folders, and all files within any "
+"selected folders, from version control."
 msgstr ""
-"Ignoré:Non-versionné:::Erreur::Nouvellement ajouté:Modifié:Conflit:Supprimé:"
-"Manquant"
+"Supprime de la gestion de versions tous les fichiers et dossiers "
+"sélectionnés et tous les fichiers qu'ils contiennent."
 
-#: ../meld/vc/cvs.py:163
+#: ../meld/vcview.py:676
 #, python-format
-msgid ""
-"Error converting to a regular expression\n"
-"The pattern was '%s'\n"
-"The error was '%s'"
-msgstr ""
-"Erreur durant la conversion en expression régulière\n"
-"Le motif était « %s »\n"
-"L'erreur était « %s »"
+msgid "Error removing %s"
+msgstr "Erreur lors de la suppression de %s"
+
+#: ../meld/vcview.py:756
+msgid "Clear"
+msgstr "Effacer"
+
+#~ msgid "Default window height"
+#~ msgstr "Hauteur par défaut de la fenêtre"
 
-#~ msgid "_Search for"
-#~ msgstr "_Rechercher"
+#~ msgid "Default window fullscreen state"
+#~ msgstr "État de plein écran par défaut de la fenêtre"

From f5279c36fbb331d502ecf3b53965ecfafcda2d38 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Thu, 27 Oct 2016 05:47:17 +1000
Subject: [PATCH 41/51] filediff: Fix delete action arg signature

---
 meld/filediff.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meld/filediff.py b/meld/filediff.py
index 0bde620c..1f01d370 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -606,7 +606,7 @@ def resync():
         self.scheduler.add_task(resync)
 
     @with_focused_pane
-    def delete_change(self, pane):
+    def delete_change(self, pane, *args):
         chunk = self.linediffer.get_chunk(self.cursor.chunk, pane)
         assert(self.cursor.chunk is not None)
         assert(chunk is not None)

From 4725cba34d11e82e76ed5717ed0885ad2690f67e Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@2xlibre.net>
Date: Mon, 24 Oct 2016 16:33:53 +0200
Subject: [PATCH 42/51] filediff: Prevent AttributeError when pane has no file

---
 meld/filediff.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meld/filediff.py b/meld/filediff.py
index 1f01d370..12188af5 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1609,7 +1609,7 @@ def on_fileentry_file_set(self, entry):
         entries = self.fileentry[:self.num_panes]
         if self.check_save_modified() != Gtk.ResponseType.CANCEL:
             files = [e.get_file() for e in entries]
-            paths = [f.get_path() for f in files]
+            paths = [f.get_path() if f is not None else f for f in files]
             self.set_files(paths)
         else:
             idx = entries.index(entry)

From 269fb7bbb81859dc4f9ace82f2084f45718ef84c Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Tue, 8 Nov 2016 07:35:19 +1000
Subject: [PATCH 43/51] diffmap: Avoid cairo surface creation for negative
 sizes (bgo#773985)

This can occur on initial allocations when we don't have a real
allocation ourselves yet, and the theme includes scroll arrows,
resulting in us trying to create a cairo surface with a negative
height.
---
 meld/diffmap.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meld/diffmap.py b/meld/diffmap.py
index bb44a768..232cf4ac 100644
--- a/meld/diffmap.py
+++ b/meld/diffmap.py
@@ -123,7 +123,7 @@ def do_draw(self, context):
 
         # Hack to work around a cairo bug when calling create_similar
         # https://bugs.freedesktop.org/show_bug.cgi?id=60519
-        if not (width and height):
+        if not (width > 0 and height > 0):
             return
 
         context.translate(0, y_start)

From 4e881ed8b39855c29d6277b121aca34b8e815ee4 Mon Sep 17 00:00:00 2001
From: Vasily Galkin <galkin-vv@ya.ru>
Date: Sun, 13 Nov 2016 03:58:27 +0300
Subject: [PATCH 44/51] Debugging bgo#774235. Make error displaying more robust
 with non-ASCII

Byte strings that are going to be combined with unicode via + or %
operators should be explicitly decoded to unicode. Otherwise python
tries decoding them with ascii-only and raises UnicodeEncodeError on
bytes >= 0x80.
This change fixes this problem for bytes returned from functions:
 -GLib.markup_escape_text
 -*Error.strerror
---
 meld/dirdiff.py     | 17 ++++++++++++-----
 meld/filediff.py    |  2 +-
 meld/patchdialog.py |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index ba4ad2a1..c8945b53 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -730,7 +730,8 @@ def _search_recursively_iter(self, rootpath):
                         s = os.lstat(os.path.join(root, e))
                     # Covers certain unreadable symlink cases; see bgo#585895
                     except OSError as err:
-                        error_string = e + err.strerror
+                        error_string = e + err.strerror.decode(
+                            'utf8', 'replace')
                         self.model.add_error(it, error_string, pane)
                         continue
 
@@ -751,7 +752,8 @@ def _search_recursively_iter(self, rootpath):
                             if err.errno == errno.ENOENT:
                                 error_string = e + ": Dangling symlink"
                             else:
-                                error_string = e + err.strerror
+                                error_string = e + err.strerror.decode(
+                                    'utf8', 'replace')
                             self.model.add_error(it, error_string, pane)
                             differences = True
                     elif stat.S_ISREG(s.st_mode):
@@ -957,12 +959,17 @@ def copy_selected(self, direction):
                     misc.copytree(src, dst)
                     self.recursively_update(path)
             except (OSError, IOError, shutil.Error) as err:
+                if len(err.args) == 1 and isinstance(err.args[0], unicode):
+                    # str() raises on Exception instance with non-ascii unicode
+                    msg = err.args[0].encode('utf8', 'replace')
+                else:
+                    msg = str(err)
                 misc.error_dialog(
                     _("Error copying file"),
                     _("Couldn't copy %s\nto %s.\n\n%s") % (
-                        GLib.markup_escape_text(src),
-                        GLib.markup_escape_text(dst),
-                        GLib.markup_escape_text(str(err)),
+                        GLib.markup_escape_text(src).decode('utf8', 'replace'),
+                        GLib.markup_escape_text(dst).decode('utf8', 'replace'),
+                        GLib.markup_escape_text(msg).decode('utf8', 'replace'),
                     )
                 )
 
diff --git a/meld/filediff.py b/meld/filediff.py
index 12188af5..ab317c5d 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1548,7 +1548,7 @@ def file_saved_cb(self, saver, result, user_data):
             misc.error_dialog(
                 primary=_("Could not save file %s.") % filename,
                 secondary=_("Couldn't save file due to:\n%s") % (
-                    GLib.markup_escape_text(str(err))),
+                    GLib.markup_escape_text(str(err)).decode('utf-8')),
             )
             self.state = melddoc.STATE_SAVING_ERROR
             return
diff --git a/meld/patchdialog.py b/meld/patchdialog.py
index cabaa5f1..25b6e756 100644
--- a/meld/patchdialog.py
+++ b/meld/patchdialog.py
@@ -135,7 +135,7 @@ def file_saved_cb(self, saver, result, *args):
             error_dialog(
                 primary=_("Could not save file %s.") % filename,
                 secondary=_("Couldn't save file due to:\n%s") % (
-                    GLib.markup_escape_text(str(err))),
+                    GLib.markup_escape_text(str(err)).decode('utf-8')),
             )
 
     def run(self):

From 47f9fe6465371f26059c0a87040bfcfd251fb4bf Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sun, 18 Dec 2016 06:16:02 +1000
Subject: [PATCH 45/51] Update NEWS

---
 NEWS | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/NEWS b/NEWS
index cd92414e..768d17c4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,21 @@
 
+2016-12-18 meld 3.16.4
+======================
+
+  Fixes:
+
+   * Make error displaying more robust with non-ASCII locales (Vasily Galkin)
+   * Handle themes with scrollbar steppers better (Kai Willadsen)
+   * Fix a traceback when pane has no file (Claude Paroz)
+   * Fix triggering "Delete Change" actions from menu (Kai Willadsen)
+   * Handle style theme not existing (Patrick Griffis)
+   * Fix unintentional glib requirement bump (Kai Willadsen)
+
+  Translations:
+
+   * Claude Paroz (fr)
+
+
 2016-09-26 meld 3.16.3
 ======================
 

From d1443ae433b28f26d5e8139ae7b01c86dcac9fff Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sun, 18 Dec 2016 06:16:25 +1000
Subject: [PATCH 46/51] Post-release version bump

---
 meld/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meld/conf.py b/meld/conf.py
index f0f924d8..da5eeecb 100644
--- a/meld/conf.py
+++ b/meld/conf.py
@@ -3,7 +3,7 @@
 import sys
 
 __package__ = "meld"
-__version__ = "3.16.4"
+__version__ = "3.16.5"
 
 # START; these paths are clobbered on install by meld.build_helpers
 DATADIR = os.path.join(sys.prefix, "share", "meld")

From e6797e3584f2dd40506e7e13782d5bfd46bdd101 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Fri, 30 Dec 2016 11:22:40 +1000
Subject: [PATCH 47/51] misc: Add error mapping to colour theme lookups
 (bgo#776499)

---
 meld/misc.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meld/misc.py b/meld/misc.py
index ebe78034..514d8921 100644
--- a/meld/misc.py
+++ b/meld/misc.py
@@ -214,6 +214,7 @@ def get_common_theme():
         "delete": lookup("meld:insert", "background"),
         "conflict": lookup("meld:conflict", "background"),
         "replace": lookup("meld:replace", "background"),
+        "error": lookup("meld:error", "background"),
         "current-chunk-highlight": lookup(
             "meld:current-chunk-highlight", "background")
     }
@@ -222,6 +223,7 @@ def get_common_theme():
         "delete": lookup("meld:insert", "line-background"),
         "conflict": lookup("meld:conflict", "line-background"),
         "replace": lookup("meld:replace", "line-background"),
+        "error": lookup("meld:error", "line-background"),
     }
     return fill_colours, line_colours
 

From de050c72a2d2f7914960577dfc806718d26d9682 Mon Sep 17 00:00:00 2001
From: Andika Triwidada <atriwidada@gnome.org>
Date: Fri, 17 Feb 2017 07:13:41 +0000
Subject: [PATCH 48/51] Update Indonesian translation

---
 po/id.po | 147 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 76 insertions(+), 71 deletions(-)

diff --git a/po/id.po b/po/id.po
index cb445cf0..7fd37964 100644
--- a/po/id.po
+++ b/po/id.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: meld meld-3-16\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=meld&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-05-01 10:47+0000\n"
-"PO-Revision-Date: 2016-07-06 13:39+0700\n"
+"POT-Creation-Date: 2016-08-20 21:39+0000\n"
+"PO-Revision-Date: 2017-02-17 14:13+0700\n"
 "Last-Translator: Andika Triwidada <andika@gmail.com>\n"
 "Language-Team: Indonesian <gnome@i15n.org>\n"
 "Language: id\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.8.8\n"
+"X-Generator: Poedit 1.6.10\n"
 
 #: ../bin/meld:144
 msgid "Cannot import: "
@@ -84,6 +84,10 @@ msgstr ""
 "Meld membantu Anda meninjau perubahan kode, memahami patch, dan membuat "
 "konflik merge yang besar sedikit lebih mudah."
 
+#: ../data/meld.appdata.xml.in.h:5
+msgid "The GNOME Project"
+msgstr "Proyek GNOME"
+
 #: ../data/mime/meld.xml.in.h:1
 msgid "Meld comparison description"
 msgstr "Deskripsi perbandingan Meld"
@@ -565,7 +569,7 @@ msgstr "Salin ke kanan"
 msgid "Delete selected"
 msgstr "Hapus yang dipilih"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:860 ../meld/filediff.py:1366
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:860 ../meld/filediff.py:1368
 msgid "Hide"
 msgstr "Sembunyikan"
 
@@ -634,7 +638,7 @@ msgid "_Add"
 msgstr "T_ambah"
 
 #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:649
+#: ../meld/vcview.py:655
 msgid "_Remove"
 msgstr "_Hapus"
 
@@ -857,8 +861,8 @@ msgstr "Bila Anda tak menyimpan, perubahan akan hilang selamanya."
 msgid "Close _without Saving"
 msgstr "Tutup _Tanpa Menyimpan"
 
-#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:942 ../meld/filediff.py:1432
-#: ../meld/filediff.py:1500
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:942 ../meld/filediff.py:1434
+#: ../meld/filediff.py:1502
 msgid "_Cancel"
 msgstr "_Batal"
 
@@ -896,7 +900,7 @@ msgid "Changes made to the following documents will be permanently lost:\n"
 msgstr ""
 "Perubahan yang dibuat ke dokumen-dokumen berikut akan hilang selamanya:\n"
 
-#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:943 ../meld/filediff.py:1433
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:943 ../meld/filediff.py:1435
 msgid "_Replace"
 msgstr "_Timpa"
 
@@ -1589,7 +1593,7 @@ msgstr "Log sebelumnya:"
 msgid "Co_mmit"
 msgstr "Ko_mit"
 
-#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:337
+#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:343
 msgid "Location"
 msgstr "Lokasi"
 
@@ -1684,8 +1688,9 @@ msgstr ""
 msgid "Text filters are in use and may be masking content differences."
 msgstr "Penyaring teks sedang dipakai dan mungkin menutupi perbedaan isi."
 
-#: ../meld/dirdiff.py:862 ../meld/filediff.py:1368 ../meld/filediff.py:1398
-#: ../meld/filediff.py:1400 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122
+#: ../meld/dirdiff.py:862 ../meld/filediff.py:1370 ../meld/filediff.py:1400
+#: ../meld/filediff.py:1402 ../meld/ui/msgarea.py:109
+#: ../meld/ui/msgarea.py:122
 msgid "Hi_de"
 msgstr "Sem_bunyikan"
 
@@ -1779,11 +1784,11 @@ msgstr "OVR"
 msgid "Ln %i, Col %i"
 msgstr "Brs %i, Kol %i"
 
-#: ../meld/filediff.py:774
+#: ../meld/filediff.py:771
 msgid "Comparison results will be inaccurate"
 msgstr "Hasil perbandingan tidak akan akurat"
 
-#: ../meld/filediff.py:776
+#: ../meld/filediff.py:773
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1791,66 +1796,66 @@ msgstr ""
 "Suatu penyaring mengubah cacah baris dalam berkas, yang tidak didukung. "
 "Perbandingan tidak akan akurat."
 
-#: ../meld/filediff.py:834
+#: ../meld/filediff.py:831
 msgid "Mark conflict as resolved?"
 msgstr "Tandai konflik sebagai terselesaikan?"
 
-#: ../meld/filediff.py:836
+#: ../meld/filediff.py:833
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
 "Bila konflik sukses dipecahkan, Anda dapat menandainya sebagai terpecahkan "
 "sekarang."
 
-#: ../meld/filediff.py:838
+#: ../meld/filediff.py:835
 msgid "Cancel"
 msgstr "Batal"
 
-#: ../meld/filediff.py:839
+#: ../meld/filediff.py:836
 msgid "Mark _Resolved"
 msgstr "Tandai Te_rselesaikan"
 
-#: ../meld/filediff.py:1084
+#: ../meld/filediff.py:1086
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Ada masalah saat membuka berkas \"%s\"."
 
-#: ../meld/filediff.py:1092
+#: ../meld/filediff.py:1094
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Berkas %s tampaknya berkas biner."
 
-#: ../meld/filediff.py:1094
+#: ../meld/filediff.py:1096
 msgid "Do you want to open the file using the default application?"
 msgstr "Apakah Anda ingin membuka berkas memakai aplikasi baku?"
 
-#: ../meld/filediff.py:1096
+#: ../meld/filediff.py:1098
 msgid "Open"
 msgstr "Buka"
 
-#: ../meld/filediff.py:1112
+#: ../meld/filediff.py:1114
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Menghitung perbedaan"
 
-#: ../meld/filediff.py:1177
+#: ../meld/filediff.py:1179
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Berkas %s telah berubah pada disk"
 
-#: ../meld/filediff.py:1178
+#: ../meld/filediff.py:1180
 msgid "Do you want to reload the file?"
 msgstr "Apakah Anda ingin memuat ulang berkas?"
 
-#: ../meld/filediff.py:1180
+#: ../meld/filediff.py:1182
 msgid "_Reload"
 msgstr "Muat _Ulang"
 
-#: ../meld/filediff.py:1331
+#: ../meld/filediff.py:1333
 msgid "Files are identical"
 msgstr "Berkas identik"
 
-#: ../meld/filediff.py:1344
+#: ../meld/filediff.py:1346
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1858,11 +1863,11 @@ msgstr ""
 "Penyaring teks sedang dipakai, dan mungkin menutupi perbedaan antara berkas. "
 "Apakah Anda ingin membandingkan berkas-berkas yang tak tersaring?"
 
-#: ../meld/filediff.py:1349
+#: ../meld/filediff.py:1351
 msgid "Files differ in line endings only"
 msgstr "Berkas berbeda hanya pada akhiran baris"
 
-#: ../meld/filediff.py:1351
+#: ../meld/filediff.py:1353
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1871,15 +1876,15 @@ msgstr ""
 "Berkas-berkas identik kecuali perbedaan akhiran baris:\n"
 "%s"
 
-#: ../meld/filediff.py:1371
+#: ../meld/filediff.py:1373
 msgid "Show without filters"
 msgstr "Tampilkan tanpa penyaring"
 
-#: ../meld/filediff.py:1393
+#: ../meld/filediff.py:1395
 msgid "Change highlighting incomplete"
 msgstr "Penyorotan perubahan tak lengkap"
 
-#: ../meld/filediff.py:1394
+#: ../meld/filediff.py:1396
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1888,20 +1893,20 @@ msgstr ""
 "untuk lebih panjanga sehingga menyorot perubahan yang lebih besar, walaupun "
 "ini mungkin lambat."
 
-#: ../meld/filediff.py:1402
+#: ../meld/filediff.py:1404
 msgid "Keep highlighting"
 msgstr "Tetap menyorot"
 
-#: ../meld/filediff.py:1404
+#: ../meld/filediff.py:1406
 msgid "_Keep highlighting"
 msgstr "_Tetap menyorot"
 
-#: ../meld/filediff.py:1436
+#: ../meld/filediff.py:1438
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Timpa berkas “%s”?"
 
-#: ../meld/filediff.py:1438
+#: ../meld/filediff.py:1440
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -1910,45 +1915,45 @@ msgstr ""
 "Sebuah berkas dengan nama ini telah ada dalam \"%s\".\n"
 "Bila Anda menimpa berkas yang ada, isinya akan hilang."
 
-#: ../meld/filediff.py:1455
+#: ../meld/filediff.py:1457
 msgid "Save Left Pane As"
 msgstr "Simpan Panel Kiri Sebagai"
 
-#: ../meld/filediff.py:1457
+#: ../meld/filediff.py:1459
 msgid "Save Middle Pane As"
 msgstr "Simpan Panel Tengah Sebagai"
 
-#: ../meld/filediff.py:1459
+#: ../meld/filediff.py:1461
 msgid "Save Right Pane As"
 msgstr "Simpan Panel Kanan Sebagai"
 
-#: ../meld/filediff.py:1473
+#: ../meld/filediff.py:1475
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Berkas %s telah berubah pada disk sejak dibuka"
 
-#: ../meld/filediff.py:1475
+#: ../meld/filediff.py:1477
 msgid "If you save it, any external changes will be lost."
 msgstr "Bila Anda menyimpannya, perubahan eksternal akan hilang."
 
-#: ../meld/filediff.py:1478
+#: ../meld/filediff.py:1480
 msgid "Save Anyway"
 msgstr "Simpan Saja"
 
-#: ../meld/filediff.py:1479
+#: ../meld/filediff.py:1481
 msgid "Don't Save"
 msgstr "Jangan Simpan"
 
-#: ../meld/filediff.py:1501
+#: ../meld/filediff.py:1503
 msgid "_Save as UTF-8"
 msgstr "_Simpan sebagai UTF-8"
 
-#: ../meld/filediff.py:1504
+#: ../meld/filediff.py:1506
 #, python-format
 msgid "Couldn't encode text as “%s”"
 msgstr "Tak bisa meng-encode teks sebagai \"%s\""
 
-#: ../meld/filediff.py:1506
+#: ../meld/filediff.py:1508
 #, python-format
 msgid ""
 "File “%s” contains characters that can't be encoded using encoding “%s”.\n"
@@ -1957,12 +1962,12 @@ msgstr ""
 "Berkas \"%s\" memuat karakter yang tak bisa dienkode dengan \"%s\".\n"
 "Apakah Anda ingin menyimpan sebagai UTF-8?"
 
-#: ../meld/filediff.py:1543 ../meld/patchdialog.py:125
+#: ../meld/filediff.py:1545 ../meld/patchdialog.py:125
 #, python-format
 msgid "Could not save file %s."
 msgstr "Tak bisa menyimpan berkas %s."
 
-#: ../meld/filediff.py:1544 ../meld/patchdialog.py:126
+#: ../meld/filediff.py:1546 ../meld/patchdialog.py:126
 #, python-format
 msgid ""
 "Couldn't save file due to:\n"
@@ -1971,11 +1976,11 @@ msgstr ""
 "Tidak bisa menyimpan berkas karena:\n"
 "%s"
 
-#: ../meld/filediff.py:1890
+#: ../meld/filediff.py:1892
 msgid "Live comparison updating disabled"
 msgstr "Pemutakhiran perbandingan live dinonaktifkan"
 
-#: ../meld/filediff.py:1891
+#: ../meld/filediff.py:1893
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2332,7 +2337,7 @@ msgstr "Perlu tiga berkas untuk merge otomatis, mendapat: %r"
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Tak bisa membandingkan campuran berkas dan direktori"
 
-#: ../meld/misc.py:202
+#: ../meld/misc.py:203
 #, python-format
 msgid "Couldn't find colour scheme details for %s-%s; this is a bad install"
 msgstr ""
@@ -2340,7 +2345,7 @@ msgstr ""
 "buruk"
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:287
+#: ../meld/misc.py:288
 msgid "[None]"
 msgstr "[Nihil]"
 
@@ -2459,85 +2464,85 @@ msgstr "Tak ada"
 
 #. Translators: This error message is shown when a version
 #. control binary isn't installed.
-#: ../meld/vcview.py:255
+#: ../meld/vcview.py:261
 #, python-format
 msgid "%(name)s (%(cmd)s not installed)"
 msgstr "%(name)s (%(cmd)s tidak terpasang)"
 
 #. Translators: This error message is shown when a version
 #. controlled repository is invalid.
-#: ../meld/vcview.py:259
+#: ../meld/vcview.py:265
 #, python-format
 msgid "%(name)s (Invalid repository)"
 msgstr "%(name)s (Repositori tak valid)"
 
-#: ../meld/vcview.py:280
+#: ../meld/vcview.py:286
 msgid "No valid version control system found in this folder"
 msgstr "Tak ada sistem kendali versi yang valid dalam folder ini"
 
-#: ../meld/vcview.py:282
+#: ../meld/vcview.py:288
 msgid "Only one version control system found in this folder"
 msgstr "Hanya satu sistem kendali versi ditemukan dalam folder ini"
 
-#: ../meld/vcview.py:284
+#: ../meld/vcview.py:290
 msgid "Choose which version control system to use"
 msgstr "Pilih sistem kendali mana yang akan dipakai"
 
 #. TRANSLATORS: This is the location of the directory being viewed
-#: ../meld/vcview.py:337
+#: ../meld/vcview.py:343
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:357
+#: ../meld/vcview.py:363
 #, python-format
 msgid "Scanning %s"
 msgstr "Memindai %s"
 
-#: ../meld/vcview.py:396
+#: ../meld/vcview.py:402
 msgid "(Empty)"
 msgstr "(Kosong)"
 
-#: ../meld/vcview.py:440
+#: ../meld/vcview.py:446
 #, python-format
 msgid "%s — local"
 msgstr "%s — lokal"
 
-#: ../meld/vcview.py:441
+#: ../meld/vcview.py:447
 #, python-format
 msgid "%s — remote"
 msgstr "%s — remote"
 
-#: ../meld/vcview.py:449
+#: ../meld/vcview.py:455
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (lokal, merge, remote)"
 
-#: ../meld/vcview.py:454
+#: ../meld/vcview.py:460
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (remote, merge, lokal)"
 
-#: ../meld/vcview.py:465
+#: ../meld/vcview.py:471
 #, python-format
 msgid "%s — repository"
 msgstr "%s — repositori"
 
-#: ../meld/vcview.py:471
+#: ../meld/vcview.py:477
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (kerja, repositori)"
 
-#: ../meld/vcview.py:475
+#: ../meld/vcview.py:481
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (repositori, kerja)"
 
-#: ../meld/vcview.py:643
+#: ../meld/vcview.py:649
 msgid "Remove folder and all its files?"
 msgstr "Hapus folder dan semua berkasnya?"
 
-#: ../meld/vcview.py:645
+#: ../meld/vcview.py:651
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2545,11 +2550,11 @@ msgstr ""
 "Ini akan menghapus semua berkas dan folder yang dipilih, dan semua berkas di "
 "dalam sebarang folder yang dipilih, dari kendali versi."
 
-#: ../meld/vcview.py:670
+#: ../meld/vcview.py:676
 #, python-format
 msgid "Error removing %s"
 msgstr "Galat saat menghapus %s"
 
-#: ../meld/vcview.py:750
+#: ../meld/vcview.py:756
 msgid "Clear"
 msgstr "Bersihkan"

From 7d7e189a6fde29067d133de2975b5c821d633c36 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Fri, 24 Feb 2017 06:44:23 +1000
Subject: [PATCH 49/51] bin/meld: Redirect glib's new structured logging
 (bgo#779008)

We already tried to redirect logging, but in 2.50 glib added support
for structured logging that inexplicably bypassed all of the API
that was already being used by applications to do logging redirection.
---
 bin/meld | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/bin/meld b/bin/meld
index 1e4c75da..86a3f510 100755
--- a/bin/meld
+++ b/bin/meld
@@ -246,6 +246,9 @@ def setup_logging():
 def setup_glib_logging():
     from gi.repository import GLib
     levels = {
+        GLib.LogLevelFlags.LEVEL_DEBUG: logging.DEBUG,
+        GLib.LogLevelFlags.LEVEL_INFO: logging.INFO,
+        GLib.LogLevelFlags.LEVEL_MESSAGE: logging.INFO,
         GLib.LogLevelFlags.LEVEL_WARNING: logging.WARNING,
         GLib.LogLevelFlags.LEVEL_ERROR: logging.ERROR,
         GLib.LogLevelFlags.LEVEL_CRITICAL: logging.CRITICAL,
@@ -259,8 +262,10 @@ def setup_glib_logging():
     log_domain = "Gtk"
     log = logging.getLogger(log_domain)
 
+    # This logging handler is for "old" glib logging using a simple
+    # syslog-style API.
     def log_adapter(domain, level, message, user_data):
-        log.log(levels[level], message)
+        log.log(levels.get(level, logging.WARNING), message)
 
     try:
         GLib.log_set_handler(log_domain, level_flag, log_adapter, None)
@@ -268,6 +273,21 @@ def setup_glib_logging():
         # Only present in glib 2.46+
         pass
 
+    # This logging handler is for new glib logging using a structured
+    # API. Unfortunately, it was added in such a way that the old
+    # redirection API became a no-op, so we need to hack both of these
+    # handlers to get it to work.
+    def structured_log_adapter(level, fields, field_count, user_data):
+        message = GLib.log_writer_format_fields(level, fields, True)
+        log.log(levels.get(level, logging.WARNING), message)
+        return GLib.LogWriterOutput.HANDLED
+
+    try:
+        GLib.log_set_writer_func(structured_log_adapter, None)
+    except AttributeError:
+        # Only present in glib 2.50+
+        pass
+
 
 def environment_hacks():
     # We manage cwd ourselves for git operations, and GIT_DIR in particular

From 4a8be08c6933513aba66c31b87afd417cd3b7e8f Mon Sep 17 00:00:00 2001
From: Inaki Larranaga Murgoitio <dooteo@zundan.com>
Date: Thu, 16 Mar 2017 13:16:10 +0100
Subject: [PATCH 50/51] Update Basque language

---
 po/eu.po | 2000 +++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 1308 insertions(+), 692 deletions(-)

diff --git a/po/eu.po b/po/eu.po
index d30e0d49..ca2dbf80 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -15,36 +15,47 @@
 # Kristina Salas Sierra <kristina_salas_sierra@hotmail.com>, 2013.
 # Larraitz Uriarte Erkoreka <larraitz.uriarte@gmail.com>, 2013.
 # Josune Zuzuarregui Lizarazu <josunezl@gmail.com>, 2013.
-# Iñaki Larrañaga Murgoitio <dooteo@zundan.com>, 2014.
+# Iñaki Larrañaga Murgoitio <dooteo@zundan.com>, 2014, 2017.
 msgid ""
 msgstr ""
-"Project-Id-Version: meld master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-18 15:06+0200\n"
-"PO-Revision-Date: 2014-05-19 23:22+0200\n"
+"Project-Id-Version: meld meld-3-16\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=meld&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2016-08-20 21:39+0000\n"
+"PO-Revision-Date: 2017-03-15 22:46+0100\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@zundan.com>\n"
-"Language-Team: Basque <librezale@librezale.org>\n"
+"Language-Team: Basque <librezale@librezale.eus>\n"
 "Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.4\n"
+"X-Generator: Lokalize 1.5\n"
 
-#: ../bin/meld:134
+#: ../bin/meld:144
 msgid "Cannot import: "
 msgstr "Ezin da inportatu: "
 
-#: ../bin/meld:137
+#: ../bin/meld:147
 #, c-format
 msgid "Meld requires %s or higher."
 msgstr "Meld-ek %s edo berriagoa behar du."
 
-#: ../bin/meld:141
+#: ../bin/meld:151
 msgid "Meld does not support Python 3."
 msgstr "Meld-ek ez du Python 3 onartzen."
 
-#: ../data/meld.desktop.in.h:1 ../data/ui/meldapp.ui.h:1
+#: ../bin/meld:200
+#, c-format
+msgid ""
+"Couldn't load Meld-specific CSS (%s)\n"
+"%s"
+msgstr ""
+"Ezin izan da Meld-ekiko berezia den CSSa (%s) kargatu\n"
+"%s"
+
+#: ../data/meld.desktop.in.h:1 ../data/meld.appdata.xml.in.h:1
+#: ../data/ui/meldapp.ui.h:1
 msgid "Meld"
 msgstr "Meld"
 
@@ -56,11 +67,16 @@ msgstr "Diferentzia-ikustailea"
 msgid "Meld Diff Viewer"
 msgstr "Meld diferentzia-ikustailea"
 
-#: ../data/meld.desktop.in.h:4
+#: ../data/meld.desktop.in.h:4 ../data/meld.appdata.xml.in.h:2
 msgid "Compare and merge your files"
 msgstr "Konparatu eta konbinatu fitxategiak"
 
-#: ../data/meld.appdata.xml.in.h:1
+#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: ../data/meld.desktop.in.h:6
+msgid "diff;merge;"
+msgstr "diff;merge;batu;desberdintasunak;elkartu;"
+
+#: ../data/meld.appdata.xml.in.h:3
 msgid ""
 "Meld is a visual diff and merge tool targeted at developers. Meld helps you "
 "compare files, directories, and version controlled projects. It provides "
@@ -70,19 +86,21 @@ msgstr ""
 "Meld aplikazioak garatzaileentzako 'diff' eta 'merge' tresna bisuala da. "
 "Meld-ek fitxategiak, direktorioak eta bertsio-kontrola daramaten proiektuak "
 "konparatzen lagunduko dizu. Bai fitxategi bai direktorioen bi eta hiru "
-"elementuen "
-"arteko konparazioa eskaintzen ditu. Bertsio-kontrola daramaten "
+"elementuen arteko konparazioa eskaintzen ditu. Bertsio-kontrola daramaten "
 "hainbat sistema onartzen ditu, Git, Mercurial, Bazaar eta Subversion barne."
 
-#: ../data/meld.appdata.xml.in.h:2
+#: ../data/meld.appdata.xml.in.h:4
 msgid ""
 "Meld helps you review code changes, understand patches, and makes enormous "
 "merge conflicts slightly less painful."
 msgstr ""
 "Meld-ek zure kodearen aldaketak gainbegiratzen, adabakiak ulertzen lagunduko "
 "dizu. Kode handiak batzean gerta daitezkeen gatazkak sortzen dituzte "
-"buruhausteak "
-"leunduz."
+"buruhausteak leunduz."
+
+#: ../data/meld.appdata.xml.in.h:5
+msgid "The GNOME Project"
+msgstr "GNOME proiektua"
 
 #: ../data/mime/meld.xml.in.h:1
 msgid "Meld comparison description"
@@ -93,90 +111,111 @@ msgid "Default window size"
 msgstr "Leihoaren tamaina lehenetsia"
 
 #: ../data/org.gnome.meld.gschema.xml.h:2
+#| msgid "Default window size"
+msgid "Default window state"
+msgstr "Leiho lehenetsiaren egoera"
+
+#: ../data/org.gnome.meld.gschema.xml.h:3
 msgid "Show toolbar"
 msgstr "Erakutsi tresna-barra"
 
-#: ../data/org.gnome.meld.gschema.xml.h:3
+#: ../data/org.gnome.meld.gschema.xml.h:4
 msgid "If true, the window toolbar is visible."
 msgstr "TRUE (egia) bada, leihoaren tresna-barra ikusgai egongo da."
 
-#: ../data/org.gnome.meld.gschema.xml.h:4
+#: ../data/org.gnome.meld.gschema.xml.h:5
 msgid "Show statusbar"
 msgstr "Erakutsi egoera-barra"
 
-#: ../data/org.gnome.meld.gschema.xml.h:5
+#: ../data/org.gnome.meld.gschema.xml.h:6
 msgid "If true, the window statusbar is visible."
 msgstr "TRUE (egia) bada, leihoaren egoera-barra ikusgai egongo da."
 
-#: ../data/org.gnome.meld.gschema.xml.h:6
-msgid "Automatically detected text encodings"
-msgstr "Atzeman automatikoki testu-kodeketak"
-
 #: ../data/org.gnome.meld.gschema.xml.h:7
+#| msgid "Automatically detected text encodings"
+msgid "Additional automatically detected text encodings"
+msgstr "Automatikoki antzemandako testu-kodeketa gehigarriak"
+
+#: ../data/org.gnome.meld.gschema.xml.h:8
 msgid ""
-"These text encodings will be automatically used (in order) to try to decode "
-"loaded text files."
+"Meld will use these text encodings to try to decode loaded text files before "
+"trying any other encodings. In addition to the encodings in this list, UTF-8 "
+"and the current locale-default encoding will always be used; other encodings "
+"may also be tried, depending on the user's locale."
 msgstr ""
-"Testu-kodeketa hauek automatikoki erabiliko dira kargatutako "
-"testu-fitxategiak deskodetzen saiatzeko."
+"Meld-ek testu-kodeketa hauek erabiliko ditu kargatutako testu-fitxategiak "
+"deskodetzean erabiltzeko, beste kodeketa batzuekin saiatu aurretik. Zerrenda "
+"honetako "
+"kodeketez gain, UTF-8 eta uneko lokala lehenetsiaren kodeketa erabiliko da "
+"beti. "
+"Beste kodeketa batzuk ere probatuko dira, erabiltzailearen lokalaren arabera."
 
-#: ../data/org.gnome.meld.gschema.xml.h:8
+#: ../data/org.gnome.meld.gschema.xml.h:9
 msgid "Width of an indentation step"
 msgstr "Koskatzearen urratsaren zabalera"
 
-#: ../data/org.gnome.meld.gschema.xml.h:9
+#: ../data/org.gnome.meld.gschema.xml.h:10
 msgid "The number of spaces to use for a single indent step"
 msgstr "Koskatze bakar batean erabiliko den zuriuneen kopurua"
 
-#: ../data/org.gnome.meld.gschema.xml.h:10
+#: ../data/org.gnome.meld.gschema.xml.h:11
 msgid "Whether to indent using spaces or tabs"
 msgstr "Zuriuneak edo tabulazioak erabiliko diren koskatzean"
 
-#: ../data/org.gnome.meld.gschema.xml.h:11
+#: ../data/org.gnome.meld.gschema.xml.h:12
 msgid "If true, any new indentation will use spaces instead of tabs."
 msgstr ""
-"TRUE (egia) bada, koskatze berri bakoitzean zuriuneak erabiliko "
-"dira tabulazioen ordez."
+"TRUE (egia) bada, koskatze berri bakoitzean zuriuneak erabiliko dira "
+"tabulazioen ordez."
 
-#: ../data/org.gnome.meld.gschema.xml.h:12
+#: ../data/org.gnome.meld.gschema.xml.h:13
 msgid "Show line numbers"
 msgstr "Erakutsi lerro-zenbakiak"
 
-#: ../data/org.gnome.meld.gschema.xml.h:13
+#: ../data/org.gnome.meld.gschema.xml.h:14
 msgid "If true, line numbers will be shown in the gutter of file comparisons."
 msgstr ""
 "TRUE (egia) bada, lerroen zenbakiak erakutsiko dira fitxategien konparazioan."
 
-#: ../data/org.gnome.meld.gschema.xml.h:14
+#: ../data/org.gnome.meld.gschema.xml.h:15
 msgid "Highlight syntax"
 msgstr "Nabarmendu sintaxia"
 
-#: ../data/org.gnome.meld.gschema.xml.h:15
+#: ../data/org.gnome.meld.gschema.xml.h:16
 msgid ""
 "Whether to highlight syntax in comparisons. Because of Meld's own color "
 "highlighting, this is off by default."
 msgstr ""
-"Konparazioetan sintaxia nabarmenduko den edo ez. Meld-en kolore "
-"propioa dela eta, lehenetsi gisa hau desgaituta dago."
+"Konparazioetan sintaxia nabarmenduko den edo ez. Meld-en kolore propioa dela "
+"eta, lehenetsi gisa hau desgaituta dago."
 
-#: ../data/org.gnome.meld.gschema.xml.h:16
+#: ../data/org.gnome.meld.gschema.xml.h:17
+#| msgid "Use s_yntax highlighting"
+msgid "Color scheme to use for syntax highlighting"
+msgstr "Kolore-eskema sintaxia nabarmentzean erabiltzeko"
+
+#: ../data/org.gnome.meld.gschema.xml.h:18
+msgid "Used by GtkSourceView to determine colors for syntax highlighting"
+msgstr "GtkSourceView-ek erabilita sintaxia nabarmentzeko koloreak zehazteko"
+
+#: ../data/org.gnome.meld.gschema.xml.h:19
 msgid "Displayed whitespace"
 msgstr "Bistaratutako zuriuneak"
 
-#: ../data/org.gnome.meld.gschema.xml.h:17
+#: ../data/org.gnome.meld.gschema.xml.h:20
 msgid ""
 "Selector for individual whitespace character types to be shown. Possible "
 "values are 'space', 'tab', 'newline' and 'nbsp'."
 msgstr ""
 "Zuriunea karaktere mota bakoitzaren hautatzailea erakusteko. Balio "
-"erabilgarriak: 'space' (zuriunea), 'tab' (tabulazioa), "
-"'newline' (lerro berria) and 'nbsp' (zuriune zatikaitza)."
+"erabilgarriak: 'space' (zuriunea), 'tab' (tabulazioa), 'newline' (lerro "
+"berria) and 'nbsp' (zuriune zatikaitza)."
 
-#: ../data/org.gnome.meld.gschema.xml.h:18
+#: ../data/org.gnome.meld.gschema.xml.h:21
 msgid "Wrap mode"
 msgstr "Itzulbiratze modua"
 
-#: ../data/org.gnome.meld.gschema.xml.h:19
+#: ../data/org.gnome.meld.gschema.xml.h:22
 msgid ""
 "Lines in file comparisons will be wrapped according to this setting, either "
 "not at all ('none'), at any character ('char') or only at the end of words "
@@ -184,14 +223,13 @@ msgid ""
 msgstr ""
 "Fitxategien konparazioko lerroak itzulbiratu egingo dira ezarpen honen "
 "arabera: 'none' (bat ere ez), 'char' (edozer karaktere) edo 'word' (hitzen "
-"amaieran "
-"soilik)."
+"amaieran soilik)."
 
-#: ../data/org.gnome.meld.gschema.xml.h:20
+#: ../data/org.gnome.meld.gschema.xml.h:23
 msgid "Highlight current line"
 msgstr "Nabarmendu uneko lerroa"
 
-#: ../data/org.gnome.meld.gschema.xml.h:21
+#: ../data/org.gnome.meld.gschema.xml.h:24
 msgid ""
 "If true, the line containing the cursor will be highlighted in file "
 "comparisons."
@@ -199,83 +237,90 @@ msgstr ""
 "TRUE (egia) bada, kurtsorea kokatuta dagoen lerroa nabarmenduko da "
 "fitxategien konparazioan."
 
-#: ../data/org.gnome.meld.gschema.xml.h:22
+#: ../data/org.gnome.meld.gschema.xml.h:25
 msgid "Use the system default monospace font"
 msgstr "Erabili sistemaren zabalera finkoko letra-tipo lehenetsia"
 
-#: ../data/org.gnome.meld.gschema.xml.h:23
+#: ../data/org.gnome.meld.gschema.xml.h:26
+#| msgid ""
+#| "If false, the defined custom font will be used instead of the system "
+#| "monospace font."
 msgid ""
-"If false, the defined custom font will be used instead of the system "
-"monospace font."
+"If false, custom-font will be used instead of the system monospace font."
 msgstr ""
-"FALSE (faltsua) bada, letra-tipo pertsonalizatua erabiliko da "
-"sistemaren zabalera finkoko letra-tipoaren ordez."
+"FALSE (faltsua) bada, letra-tipo pertsonalizatua erabiliko da sistemaren "
+"zabalera finkoko letra-tipoaren ordez."
 
-#: ../data/org.gnome.meld.gschema.xml.h:24
+#: ../data/org.gnome.meld.gschema.xml.h:27
 msgid "Custom font"
 msgstr "Letra-tipo pertsonalizatua"
 
-#: ../data/org.gnome.meld.gschema.xml.h:25
+#: ../data/org.gnome.meld.gschema.xml.h:28
 msgid ""
 "The custom font to use, stored as a string and parsed as a Pango font "
 "description."
 msgstr ""
-"Letra-tipo pertsonalizatua, kate bat bezala gordeta eta "
-"Pango letra-tipoaren azalpen gisa analizatuta."
+"Letra-tipo pertsonalizatua, kate bat bezala gordeta eta Pango letra-tipoaren "
+"azalpen gisa analizatuta."
 
-#: ../data/org.gnome.meld.gschema.xml.h:26
+#: ../data/org.gnome.meld.gschema.xml.h:29
 msgid "Ignore blank lines when comparing files"
 msgstr "Ez ikusi egin lerro hutsei fitxategiak konparatzean"
 
-#: ../data/org.gnome.meld.gschema.xml.h:27
+#: ../data/org.gnome.meld.gschema.xml.h:30
 msgid ""
 "If true, blank lines will be trimmed when highlighting changes between files."
 msgstr ""
-"TRUE (egia) bada, lerro hutsak kendu egingo dira fitxategien arteko aldaketak "
-"nabarmentzean."
+"TRUE (egia) bada, lerro hutsak kendu egingo dira fitxategien arteko "
+"aldaketak nabarmentzean."
 
-#: ../data/org.gnome.meld.gschema.xml.h:28
+#: ../data/org.gnome.meld.gschema.xml.h:31
 msgid "Use the system default editor"
 msgstr "Erabili sistemaren editore lehenetsia"
 
-#: ../data/org.gnome.meld.gschema.xml.h:29
+#: ../data/org.gnome.meld.gschema.xml.h:32
+#| msgid ""
+#| "If false, the defined custom editor will be used instead of the system "
+#| "editor when opening files externally."
 msgid ""
-"If false, the defined custom editor will be used instead of the system "
-"editor when opening files externally."
+"If false, custom-editor-command will be used instead of the system editor "
+"when opening files externally."
 msgstr ""
-"FALSE (faltsua) bada, fitxategiak kanpoko editore pertsonalizatuarekin "
-"irekiko dira sistemaren editorea erabili ordez."
+"FALSE (faltsua) bada, 'custom-editor-command' (editore pertsonalizatuaren "
+"komandoa) "
+"erabiliko da sistemaren editorea erabili ordez, fitxategiak kanpotik "
+"irekitzean."
 
-#: ../data/org.gnome.meld.gschema.xml.h:30
+#: ../data/org.gnome.meld.gschema.xml.h:33
 msgid "The custom editor launch command"
 msgstr "Editore pertsonalizatua abiarazteko komandoa"
 
-#: ../data/org.gnome.meld.gschema.xml.h:31
+#: ../data/org.gnome.meld.gschema.xml.h:34
 msgid ""
 "The command used to launch a custom editor. Some limited templating is "
 "supported here; at the moment '{file}' and '{line}' are recognised tokens."
 msgstr ""
 "Editore pertsonalizatua abiaraztean erabiliko den komandoa. Txantiloi gutxi "
-"batzuk soilik daude onartuta: oraingoz '{file}' eta '{line}' tokenak bakarrik "
-"onartzen dira."
+"batzuk soilik daude onartuta: oraingoz '{file}' eta '{line}' tokenak "
+"bakarrik onartzen dira."
 
-#: ../data/org.gnome.meld.gschema.xml.h:32
+#: ../data/org.gnome.meld.gschema.xml.h:35
 msgid "Columns to display"
 msgstr "Zutabeak bistaratzeko"
 
-#: ../data/org.gnome.meld.gschema.xml.h:33
+#: ../data/org.gnome.meld.gschema.xml.h:36
 msgid ""
 "List of column names in folder comparison and whether they should be "
 "displayed."
 msgstr ""
-"Zutabeen izenen zerrenda karpetak konparatzean eta "
-"hauek bistaratu behar diren edo ez."
+"Zutabeen izenen zerrenda karpetak konparatzean eta hauek bistaratu behar "
+"diren edo ez."
 
-#: ../data/org.gnome.meld.gschema.xml.h:34 ../data/ui/preferences.ui.h:30
+#: ../data/org.gnome.meld.gschema.xml.h:37 ../data/ui/preferences.ui.h:32
 msgid "Ignore symbolic links"
 msgstr "Ez ikusi egin esteka sinbolikoei"
 
-#: ../data/org.gnome.meld.gschema.xml.h:35
+#: ../data/org.gnome.meld.gschema.xml.h:38
 msgid ""
 "If true, folder comparisons do not follow symbolic links when traversing the "
 "folder tree."
@@ -283,28 +328,26 @@ msgstr ""
 "TRUE (egia) bada, karpetak konparatzean ez jarraitu esteka sinbolikorik "
 "karpeten zuhaitza arakatzean."
 
-#: ../data/org.gnome.meld.gschema.xml.h:36
+#: ../data/org.gnome.meld.gschema.xml.h:39
 msgid "Use shallow comparison"
 msgstr "Erabili azaleko konparazioa"
 
-#: ../data/org.gnome.meld.gschema.xml.h:37
+#: ../data/org.gnome.meld.gschema.xml.h:40
 msgid ""
 "If true, folder comparisons compare files based solely on size and mtime, "
 "considering files to be identical if their size and mtime match, and "
 "different otherwise."
 msgstr ""
-"TRUE (egia) bada, karpeten konparazioak fitxategietan oinarritutako "
-"tamaina eta aldatze-datan bakarrik konparatuko dira, fitxategiak berdinak "
-"direla "
+"TRUE (egia) bada, karpeten konparazioak fitxategietan oinarritutako tamaina "
+"eta aldatze-datan bakarrik konparatuko dira, fitxategiak berdinak direla "
 "onartuko du haien tamaina eta aldatze-data bat datozenean, bestela "
-"desberdintzat joko "
-"ditu."
+"desberdintzat joko ditu."
 
-#: ../data/org.gnome.meld.gschema.xml.h:38
+#: ../data/org.gnome.meld.gschema.xml.h:41
 msgid "File timestamp resolution"
 msgstr "Fitxategiaren data-zigiluaren bereizmena"
 
-#: ../data/org.gnome.meld.gschema.xml.h:39
+#: ../data/org.gnome.meld.gschema.xml.h:42
 msgid ""
 "When comparing based on mtime, this is the minimum difference in nanoseconds "
 "between two files before they're considered to have different mtimes. This "
@@ -313,38 +356,52 @@ msgid ""
 msgstr ""
 "Konparazioa aldatze-datan oinarritzean, aldatze-data desberdinak dituztela "
 "onartzeko bi fitxategien arteko gutxieneko desberdintasuna nanosegundotan "
-"neurtzen da "
-"hau. Erabilgarria da denbora-zigiluaren bereizmen desberdinak dituzten "
-"fitxategi-sistemetako fitxategiak konparatzeko."
+"neurtzen da hau. Erabilgarria da denbora-zigiluaren bereizmen desberdinak "
+"dituzten fitxategi-sistemetako fitxategiak konparatzeko."
 
-#: ../data/org.gnome.meld.gschema.xml.h:40
+#: ../data/org.gnome.meld.gschema.xml.h:43 ../data/ui/preferences.ui.h:30
+msgid "Apply text filters during folder comparisons"
+msgstr "Aplikatu testuaren iragazkiak karpetak konparatzean"
+
+#: ../data/org.gnome.meld.gschema.xml.h:44
+msgid ""
+"If true, folder comparisons that compare file contents also apply active "
+"text filters and the blank line trimming option, and ignore newline "
+"differences."
+msgstr ""
+"true (egia) bada, karpeten konparazioak fitxategien edukia konparatzen "
+"dituenak testu-iragazki aktiboak ere aplikatzen ditu, eta lerro hutsak "
+"kentzeko aukera, eta "
+"lerro berrien desberdintasunei ez ikusi egingo die. "
+
+#: ../data/org.gnome.meld.gschema.xml.h:45
 msgid "File status filters"
 msgstr "Fitxategiaren egoeraren iragazkiak"
 
-#: ../data/org.gnome.meld.gschema.xml.h:41
+#: ../data/org.gnome.meld.gschema.xml.h:46
 msgid "List of statuses used to filter visible files in folder comparison."
 msgstr ""
-"Karpeten konparazioan fitxategi ikusgaiak iragazteko "
-"erabiliko den egoeren zerrenda."
+"Karpeten konparazioan fitxategi ikusgaiak iragazteko erabiliko den egoeren "
+"zerrenda."
 
-#: ../data/org.gnome.meld.gschema.xml.h:42
+#: ../data/org.gnome.meld.gschema.xml.h:47
 msgid "Show the version control console output"
 msgstr "Erakutsi bertsio-kontrolaren kontsolaren irteera"
 
-#: ../data/org.gnome.meld.gschema.xml.h:43
+#: ../data/org.gnome.meld.gschema.xml.h:48
 msgid ""
 "If true, a console output section will be shown in version control views, "
 "showing the commands run for version control operations."
 msgstr ""
-"TRUE (egia) bada, kontsolaren irteerako atala erakutsiko da "
-"bertsio-kontrolaren ikuspegian, bertsio-kontrolaren eragiketetan "
-"exekutatutako komandoak erakutsiz."
+"TRUE (egia) bada, kontsolaren irteerako atala erakutsiko da bertsio-"
+"kontrolaren ikuspegian, bertsio-kontrolaren eragiketetan exekutatutako "
+"komandoak erakutsiz."
 
-#: ../data/org.gnome.meld.gschema.xml.h:44
+#: ../data/org.gnome.meld.gschema.xml.h:49
 msgid "Version control pane position"
 msgstr "Bertsio-kontrolaren panelaren posizioa"
 
-#: ../data/org.gnome.meld.gschema.xml.h:45
+#: ../data/org.gnome.meld.gschema.xml.h:50
 msgid ""
 "This is the height of the main version control tree when the console pane is "
 "shown."
@@ -352,109 +409,139 @@ msgstr ""
 "Bertsio-kontrolaren zuhaitz nagusiaren altuera da, kontsolaren panela "
 "erakusten denean."
 
-#: ../data/org.gnome.meld.gschema.xml.h:46
+#: ../data/org.gnome.meld.gschema.xml.h:51
 msgid "Present version comparisons as left-local/right-remote"
 msgstr "Aurkeztu bertsioen konparazioa ezkerra-lokala/eskuina-urrunekoa gisa"
 
-#: ../data/org.gnome.meld.gschema.xml.h:47
+#: ../data/org.gnome.meld.gschema.xml.h:52
 msgid ""
 "If true, version control comparisons will use a left-is-local, right-is-"
 "remote scheme to determine what order to present files in panes. Otherwise, "
 "a left-is-theirs, right-is-mine scheme is used."
 msgstr ""
-"TRUE (egia) bada, bertsio-kontrolen konparazioak ezkerra-lokala, "
-"eskuina-urrunekoa eskema erabiliko du fitxategiak paneletan zer ordenarekin "
-"aurkeztuko diren "
-"zehazteko. Bestela, ezkerra-haiena, eskuina-nirea eskema erabiliko da."
+"TRUE (egia) bada, bertsio-kontrolen konparazioak ezkerra-lokala, eskuina-"
+"urrunekoa eskema erabiliko du fitxategiak paneletan zer ordenarekin "
+"aurkeztuko diren zehazteko. Bestela, ezkerra-haiena, eskuina-nirea eskema "
+"erabiliko da."
 
-#: ../data/org.gnome.meld.gschema.xml.h:48
+#: ../data/org.gnome.meld.gschema.xml.h:53
 msgid "Order for files in three-way version control merge comparisons"
 msgstr "Fitxategien ordena hiruko bertsio-kontrolaren baturen konparazioan"
 
-#: ../data/org.gnome.meld.gschema.xml.h:49
+#: ../data/org.gnome.meld.gschema.xml.h:54
+#| msgid ""
+#| "Choices for file order are remote/merge/local and local/merged/remote. "
+#| "This preference only affects three-way comparisons launched from the "
+#| "version control view, so is used solely for merges/conflict resolution "
+#| "within Meld."
 msgid ""
-"Choices for file order are remote/merge/local and local/merged/remote. This "
+"Choices for file order are remote/merged/local and local/merged/remote. This "
 "preference only affects three-way comparisons launched from the version "
 "control view, so is used solely for merges/conflict resolution within Meld."
 msgstr ""
 "Fitxategiak ordenatzeko aukerak: 'remote/merge/local' eta "
 "'local/merged/remote' dira. Hobespen honek soilik bertsio-kontrolaren "
-"ikuspegitik abiarazitako hiruko konparazioari "
-"eragiten dio, bakarrik batzean/gatazken ebazpenean erabiltzen da Meld-en."
+"ikuspegitik "
+"abiarazitako hiruko konparazioari eragiten dio, bakarrik batzean/gatazken "
+"ebazpenean erabiltzen da Meld-en."
 
-#: ../data/org.gnome.meld.gschema.xml.h:50
+#: ../data/org.gnome.meld.gschema.xml.h:55
 msgid "Show margin in commit message editor"
 msgstr "Erakutsi marjinak egikaritze-mezuen editorean"
 
-#: ../data/org.gnome.meld.gschema.xml.h:51
+#: ../data/org.gnome.meld.gschema.xml.h:56
 msgid ""
 "If true, a guide will be displayed to show what column the margin is at in "
 "the version control commit message editor."
 msgstr ""
-"TRUE (egia) bada, gida bat bistaratuko da bertsio-kontrolaren "
-"egikaritze-mezuaren editorean marjina zer zutabean dagoen erakusteko."
+"TRUE (egia) bada, gida bat bistaratuko da bertsio-kontrolaren egikaritze-"
+"mezuaren editorean marjina zer zutabean dagoen erakusteko."
 
-#: ../data/org.gnome.meld.gschema.xml.h:52
+#: ../data/org.gnome.meld.gschema.xml.h:57
 msgid "Margin column in commit message editor"
 msgstr "Marjinaren zutabea egikaritze-mezuaren editorean"
 
-#: ../data/org.gnome.meld.gschema.xml.h:53
+#: ../data/org.gnome.meld.gschema.xml.h:58
+#| msgid ""
+#| "The column of the margin is at in the version control commit message "
+#| "editor."
 msgid ""
-"The column of the margin is at in the version control commit message editor."
+"The column at which to show the margin in the version control commit message "
+"editor."
 msgstr ""
-"Bertsio-kontrolaren egikaritze-mezuaren editorean marjina zer zutabean dagoen."
+"Bertsio-kontrolaren egikaritze-mezuaren editorean marjina zer zutabean "
+"dagoen."
 
-#: ../data/org.gnome.meld.gschema.xml.h:54
+#: ../data/org.gnome.meld.gschema.xml.h:59
 msgid "Automatically hard-wrap commit messages"
 msgstr "Itzulbiratze gogor automatikoa egikaritze-mezuetan"
 
-#: ../data/org.gnome.meld.gschema.xml.h:55
+#: ../data/org.gnome.meld.gschema.xml.h:60
+#| msgid ""
+#| "If true, the version control commit message editor will hard-wrap (i.e., "
+#| "insert line breaks) at the defined commit margin before commit."
 msgid ""
 "If true, the version control commit message editor will hard-wrap (i.e., "
-"insert line breaks) at the defined commit margin before commit."
+"insert line breaks) at the commit margin before commit."
 msgstr ""
 "TRUE (egia) bada, bertsio-kontrolaren egikaritze-mezuen editoreak "
 "itzulbiratze gogorra (adib. lerro-jauzia txertatzea) landuko du definitutako "
 "egikaritzearen marjinan egikaritu aurretik."
 
-#: ../data/org.gnome.meld.gschema.xml.h:56
+#: ../data/org.gnome.meld.gschema.xml.h:61
 msgid "Version control status filters"
 msgstr "Bertsio-kontrolaren egoeraren iragazkiak"
 
-#: ../data/org.gnome.meld.gschema.xml.h:57
+#: ../data/org.gnome.meld.gschema.xml.h:62
 msgid ""
 "List of statuses used to filter visible files in version control comparison."
 msgstr ""
-"Bertsio-kontrolen konparazioan fitxategi ikusgaiak iragazteko "
-"erabiliko den egoeren zerrenda."
+"Bertsio-kontrolen konparazioan fitxategi ikusgaiak iragazteko erabiliko den "
+"egoeren zerrenda."
 
-#: ../data/org.gnome.meld.gschema.xml.h:58
+#: ../data/org.gnome.meld.gschema.xml.h:63
 msgid "Filename-based filters"
 msgstr "Fitxategi-izenean oinarritutako iragazkiak"
 
-#: ../data/org.gnome.meld.gschema.xml.h:59
+#: ../data/org.gnome.meld.gschema.xml.h:64
 msgid ""
 "List of predefined filename-based filters that, if active, will remove "
 "matching files from a folder comparison."
 msgstr ""
 "Aurredefinitutako fitxategi-izenetan oinarritutako iragazkien zerrenda. "
-"Aktibo dauden iragazkiek bat datozen fitxategiak kenduko dituzte "
-"karpeten konparaziotik."
+"Aktibo dauden iragazkiek bat datozen fitxategiak kenduko dituzte karpeten "
+"konparaziotik."
 
-#: ../data/org.gnome.meld.gschema.xml.h:60
+#: ../data/org.gnome.meld.gschema.xml.h:65
 msgid "Text-based filters"
 msgstr "Testuan oinarritutako iragazkiak"
 
-#: ../data/org.gnome.meld.gschema.xml.h:61
+#: ../data/org.gnome.meld.gschema.xml.h:66
 msgid ""
 "List of predefined text-based regex filters that, if active, will remove "
 "text from being used in a file comparison. The text will still be displayed, "
 "but won't contribute to the comparison itself."
 msgstr ""
-"Aurredefinitutako testuetan oinarritutako iragazkien zerrenda. "
-"Aktibo dauden iragazkiek bat datozen testuak kenduko dituzte "
-"fitxategien konparaziotik. Hala ere, testua bistaratzen jarraituko da, "
-"baina ez dio konparazio berari lagunduko."
+"Aurredefinitutako testuetan oinarritutako iragazkien zerrenda. Aktibo dauden "
+"iragazkiek bat datozen testuak kenduko dituzte fitxategien konparaziotik. "
+"Hala ere, testua bistaratzen jarraituko da, baina ez dio konparazio berari "
+"lagunduko."
+
+#: ../data/styles/meld-base.xml.h:1
+msgid "Meld base scheme"
+msgstr "Meld-en oinarrizko eskema"
+
+#: ../data/styles/meld-base.xml.h:2
+msgid "Base color scheme for Meld highlighting"
+msgstr "Oinarrizko kolore-eskema Meld-en nabarmentzeko"
+
+#: ../data/styles/meld-dark.xml.h:1
+msgid "Meld dark scheme"
+msgstr "Meld-en eskema iluna"
+
+#: ../data/styles/meld-dark.xml.h:2
+msgid "Dark color scheme for Meld highlighting"
+msgstr "Kolore-eskema iluna Meld-en nabarmentzeko"
 
 #: ../data/ui/application.ui.h:1
 msgid "About Meld"
@@ -499,10 +586,14 @@ msgid "_Help"
 msgstr "_Laguntza"
 
 #: ../data/ui/application.ui.h:8
+msgid "Keyboard Shortcuts"
+msgstr "Laster-teklak"
+
+#: ../data/ui/application.ui.h:9
 msgid "_About"
 msgstr "Honi _buruz"
 
-#: ../data/ui/application.ui.h:9
+#: ../data/ui/application.ui.h:10
 msgid "_Quit"
 msgstr "I_rten"
 
@@ -515,7 +606,8 @@ msgid "Compare selected files"
 msgstr "Konparatu hautatutako fitxategiak"
 
 #: ../data/ui/dirdiff.ui.h:3
-msgid "Copy _Left"
+#| msgid "Copy to left"
+msgid "Copy to _Left"
 msgstr "Kopiatu e_zkerrean"
 
 #: ../data/ui/dirdiff.ui.h:4
@@ -523,7 +615,8 @@ msgid "Copy to left"
 msgstr "Ezkerrean kopiatzen du"
 
 #: ../data/ui/dirdiff.ui.h:5
-msgid "Copy _Right"
+#| msgid "Copy to right"
+msgid "Copy to _Right"
 msgstr "Kopiatu e_skuinean"
 
 #: ../data/ui/dirdiff.ui.h:6
@@ -534,7 +627,7 @@ msgstr "Eskuinean kopiatzen du"
 msgid "Delete selected"
 msgstr "Ezabatu hautapena"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1448
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:860 ../meld/filediff.py:1368
 msgid "Hide"
 msgstr "Ezkutatu"
 
@@ -570,7 +663,7 @@ msgstr "Berriak"
 msgid "Show new"
 msgstr "Berriak erakusten ditu"
 
-#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:71
+#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:74
 msgid "Modified"
 msgstr "Aldatuak"
 
@@ -603,7 +696,7 @@ msgid "_Add"
 msgstr "_Gehitu"
 
 #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:735
+#: ../meld/vcview.py:655
 msgid "_Remove"
 msgstr "_Kendu"
 
@@ -624,8 +717,8 @@ msgid "Move _Down"
 msgstr "_Jaitsi"
 
 #. Create icon and filename CellRenderer
-#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:363
-#: ../meld/vcview.py:203
+#: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35
+#: ../meld/dirdiff.py:374
 msgid "Name"
 msgstr "Izena"
 
@@ -642,26 +735,207 @@ msgid "Remove selected filter"
 msgstr "Kendu hautatutako iragazkia"
 
 #: ../data/ui/filediff.ui.h:1
+msgid "Format as Patch..."
+msgstr "Eman formatua adabaki gisa..."
+
+#: ../data/ui/filediff.ui.h:2
+msgid "Create a patch using differences between files"
+msgstr "Adabaki bat sortzen du fitxategien arteko diferentziekin"
+
+#: ../data/ui/filediff.ui.h:3
+msgid "Save A_ll"
+msgstr "Gorde _denak"
+
+#: ../data/ui/filediff.ui.h:4
+msgid "Save all files in the current comparison"
+msgstr "Gorde fitxategi guztiak uneko konparazioan"
+
+#: ../data/ui/filediff.ui.h:5
+msgid "Revert files to their saved versions"
+msgstr "Leheneratu fitxategiak haien gordetako bertsioetara"
+
+#: ../data/ui/filediff.ui.h:6
+msgid "Add Synchronization Point"
+msgstr "Gehitu sinkronizazio-puntua"
+
+#: ../data/ui/filediff.ui.h:7
+#| msgid "Add a manual point for synchronization of changes between files"
+msgid "Add a synchronization point for changes between files"
+msgstr "Gehitu fitxategien arteko aldaketen sinkronizazio-puntua"
+
+#: ../data/ui/filediff.ui.h:8
+msgid "Clear Synchronization Points"
+msgstr "Garbitu sinkronizazio-puntuak"
+
+#: ../data/ui/filediff.ui.h:9
+#| msgid "Add a manual point for synchronization of changes between files"
+msgid "Clear sychronization points for changes between files"
+msgstr "Garbitu fitxategien arteko aldaketen sinkronizazio-puntuak"
+
+#: ../data/ui/filediff.ui.h:10
+msgid "Previous Conflict"
+msgstr "Aurreko gatazka"
+
+#: ../data/ui/filediff.ui.h:11
+msgid "Go to the previous conflict"
+msgstr "Aurreko gatazkara joaten da"
+
+#: ../data/ui/filediff.ui.h:12
+msgid "Next Conflict"
+msgstr "Hurrengo gatazka"
+
+#: ../data/ui/filediff.ui.h:13
+msgid "Go to the next conflict"
+msgstr "Hurrengo gatazkara joaten da"
+
+#: ../data/ui/filediff.ui.h:14
+msgid "Push to Left"
+msgstr "Bidali ezkerrera"
+
+#: ../data/ui/filediff.ui.h:15
+msgid "Push current change to the left"
+msgstr "Uneko aldaketa ezkerrera bidaltzen du"
+
+#: ../data/ui/filediff.ui.h:16
+msgid "Push to Right"
+msgstr "Bidali eskuinera"
+
+#: ../data/ui/filediff.ui.h:17
+msgid "Push current change to the right"
+msgstr "Uneko aldaketa eskuinera bidaltzen du"
+
+#: ../data/ui/filediff.ui.h:18
+msgid "Pull from Left"
+msgstr "Ekarri ezkerretik"
+
+#: ../data/ui/filediff.ui.h:19
+msgid "Pull change from the left"
+msgstr "Ezkerreko aldaketa ekartzen du"
+
+#: ../data/ui/filediff.ui.h:20
+msgid "Pull from Right"
+msgstr "Ekarri eskuinetik"
+
+#: ../data/ui/filediff.ui.h:21
+msgid "Pull change from the right"
+msgstr "Eskuineko aldaketa ekartzen du"
+
+#: ../data/ui/filediff.ui.h:22
+msgid "Copy Above Left"
+msgstr "Kopiatu ezkerrekoaren gainean"
+
+#: ../data/ui/filediff.ui.h:23
+msgid "Copy change above the left chunk"
+msgstr "Aldaketa ezkerreko zatiaren gainean kopiatzen du"
+
+#: ../data/ui/filediff.ui.h:24
+msgid "Copy Below Left"
+msgstr "Kopiatu ezkerrekoaren azpian"
+
+#: ../data/ui/filediff.ui.h:25
+msgid "Copy change below the left chunk"
+msgstr "Aldaketa ezkerreko zatiaren azpian kopiatzen du"
+
+#: ../data/ui/filediff.ui.h:26
+msgid "Copy Above Right"
+msgstr "Kopiatu eskuinekoaren gainean"
+
+#: ../data/ui/filediff.ui.h:27
+msgid "Copy change above the right chunk"
+msgstr "Aldaketa eskuineko zatiaren gainean kopiatzen du"
+
+#: ../data/ui/filediff.ui.h:28
+msgid "Copy Below Right"
+msgstr "Kopiatu eskuinekoaren azpian"
+
+#: ../data/ui/filediff.ui.h:29
+msgid "Copy change below the right chunk"
+msgstr "Aldaketa eskuinekoaren azpian kopiatzen du"
+
+#: ../data/ui/filediff.ui.h:30
+msgid "Delete"
+msgstr "Ezabatu"
+
+#: ../data/ui/filediff.ui.h:31
+msgid "Delete change"
+msgstr "Ezabatu aldaketa"
+
+#: ../data/ui/filediff.ui.h:32
+msgid "Merge All from Left"
+msgstr "Batu guztiak ezkerretik"
+
+#: ../data/ui/filediff.ui.h:33
+msgid "Merge all non-conflicting changes from the left"
+msgstr "Ezkerreko aldaketa ez-gatazkatsu guztiak konbinatzen ditu"
+
+#: ../data/ui/filediff.ui.h:34
+msgid "Merge All from Right"
+msgstr "Batu guztiak eskuinetik"
+
+#: ../data/ui/filediff.ui.h:35
+msgid "Merge all non-conflicting changes from the right"
+msgstr "Eskuineko aldaketa ez-gatazkatsu guztiak konbinatzen ditu"
+
+#: ../data/ui/filediff.ui.h:36
+msgid "Merge All"
+msgstr "Batu guztiak"
+
+#: ../data/ui/filediff.ui.h:37
+msgid "Merge all non-conflicting changes from left and right panes"
+msgstr ""
+"Ezkerreko eta eskuineko paneletako aldaketa ez-gatazkatsu guztiak "
+"konbinatzen ditu"
+
+#: ../data/ui/filediff.ui.h:38
+#| msgid "Previous Change"
+msgid "Previous Pane"
+msgstr "Aurreko panela"
+
+#: ../data/ui/filediff.ui.h:39
+#| msgid "Move keyboard focus to the next document in this comparison"
+msgid "Move keyboard focus to the previous document in this comparison"
+msgstr "Eraman teklatuaren fokua aurreko dokumentura konparaketa honetan"
+
+#: ../data/ui/filediff.ui.h:40
+#| msgid "Next Change"
+msgid "Next Pane"
+msgstr "Hurrengo panela"
+
+#: ../data/ui/filediff.ui.h:41
+msgid "Move keyboard focus to the next document in this comparison"
+msgstr ""
+"Teklatuaren fokua konparaketa honetako hurrengo dokumentura eramaten du"
+
+#: ../data/ui/filediff.ui.h:42
+msgid "Lock Scrolling"
+msgstr "Blokeatu korritzea"
+
+#: ../data/ui/filediff.ui.h:43
+msgid "Lock scrolling of all panes"
+msgstr "Panel guztien korritzea blokeatzen du"
+
+#: ../data/ui/filediff.ui.h:44
 msgid "Save changes to documents before closing?"
 msgstr "Dokumentuetan egindako aldaketak gorde itxi aurretik?"
 
-#: ../data/ui/filediff.ui.h:2
+#: ../data/ui/filediff.ui.h:45
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Aldaketak gordetzen ez badituzu, betiko galduko dira."
 
-#: ../data/ui/filediff.ui.h:3
+#: ../data/ui/filediff.ui.h:46
 msgid "Close _without Saving"
 msgstr "Itxi gorde _gabe"
 
-#: ../data/ui/filediff.ui.h:4
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:942 ../meld/filediff.py:1434
+#: ../meld/filediff.py:1502
 msgid "_Cancel"
 msgstr "_Utzi"
 
-#: ../data/ui/filediff.ui.h:5
+#: ../data/ui/filediff.ui.h:48
 msgid "_Save"
 msgstr "_Gorde"
 
-#: ../data/ui/filediff.ui.h:6
+#: ../data/ui/filediff.ui.h:49
 msgid ""
 "This file can not be written to. You may click here to unlock this file and "
 "make changes anyway, but these changes must be saved to a new file."
@@ -670,27 +944,27 @@ msgstr ""
 "desblokea dezakezu, aldaketak egiteko. Aldaketa horiek, ordea, beste "
 "fitxategi batean gorde behar dira."
 
-#: ../data/ui/filediff.ui.h:7
+#: ../data/ui/filediff.ui.h:50
 msgid "File 3"
 msgstr "3. fitxategia"
 
-#: ../data/ui/filediff.ui.h:8
+#: ../data/ui/filediff.ui.h:51
 msgid "File 2"
 msgstr "2. fitxategia"
 
-#: ../data/ui/filediff.ui.h:9
+#: ../data/ui/filediff.ui.h:52
 msgid "File 1"
 msgstr "1. fitxategia"
 
-#: ../data/ui/filediff.ui.h:10
+#: ../data/ui/filediff.ui.h:53
 msgid "Revert unsaved changes to documents?"
 msgstr "Leheneratu gorde gabeko aldaketak dokumentuetan?"
 
-#: ../data/ui/filediff.ui.h:11
+#: ../data/ui/filediff.ui.h:54
 msgid "Changes made to the following documents will be permanently lost:\n"
 msgstr "Dokumentu hauetan egindako aldaketak betirako galduko dira:\n"
 
-#: ../data/ui/findbar.ui.h:1
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:943 ../meld/filediff.py:1435
 msgid "_Replace"
 msgstr "_Ordeztu"
 
@@ -735,29 +1009,29 @@ msgid "Format as Patch"
 msgstr "Formateatu adabaki gisa"
 
 #: ../data/ui/patch-dialog.ui.h:2
+msgid "Copy to Clipboard"
+msgstr "Kopiatu arbelean"
+
+#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:149
+msgid "Save Patch"
+msgstr "Gorde adabakia"
+
+#: ../data/ui/patch-dialog.ui.h:4
 msgid "Use differences between:"
 msgstr "Erabili hauen arteko diferentziak:"
 
-#: ../data/ui/patch-dialog.ui.h:3
+#: ../data/ui/patch-dialog.ui.h:5
 msgid "Left and middle panes"
 msgstr "Ezkerreko eta erdiko panelak"
 
-#: ../data/ui/patch-dialog.ui.h:4
+#: ../data/ui/patch-dialog.ui.h:6
 msgid "Middle and right panes"
 msgstr "Erdiko eta eskuineko panelak"
 
-#: ../data/ui/patch-dialog.ui.h:5
+#: ../data/ui/patch-dialog.ui.h:7
 msgid "_Reverse patch direction"
 msgstr "_Alderantzikatu adabakiaren norabidea"
 
-#: ../data/ui/patch-dialog.ui.h:6
-msgid "Copy to Clipboard"
-msgstr "Kopiatu arbelean"
-
-#: ../data/ui/patch-dialog.ui.h:7 ../meld/patchdialog.py:119
-msgid "Save Patch"
-msgstr "Gorde adabakia"
-
 #: ../data/ui/preferences.ui.h:1
 msgid "Left is remote, right is local"
 msgstr "Ezkerra urrunekoa da, eskuina lokalekoa"
@@ -843,74 +1117,84 @@ msgid "Use s_yntax highlighting"
 msgstr "Nabarmendu _sintaxia"
 
 #: ../data/ui/preferences.ui.h:22
+#| msgid "Change highlighting incomplete"
+msgid "Syntax highlighting color scheme:"
+msgstr "Sintaxia nabarmentzeko kolore-eskema:"
+
+#: ../data/ui/preferences.ui.h:23
 msgid "External Editor"
 msgstr "Kanpoko editorea"
 
-#: ../data/ui/preferences.ui.h:23
+#: ../data/ui/preferences.ui.h:24
 msgid "Use _default system editor"
 msgstr "Erabili sistema-editore _lehenetsia"
 
-#: ../data/ui/preferences.ui.h:24
+#: ../data/ui/preferences.ui.h:25
 msgid "Edito_r command:"
 msgstr "Edito_rearen komandoa:"
 
-#: ../data/ui/preferences.ui.h:25
+#: ../data/ui/preferences.ui.h:26
 msgid "Editor"
 msgstr "Editorea"
 
-#: ../data/ui/preferences.ui.h:26
+#: ../data/ui/preferences.ui.h:27
 msgid "Shallow Comparison"
 msgstr "Azaleko konparazioa"
 
-#: ../data/ui/preferences.ui.h:27
+#: ../data/ui/preferences.ui.h:28
 msgid "C_ompare files based only on size and timestamp"
 msgstr "_Konparatu fitxategiak tamainan eta data-zigiluan soilik oinarrituta"
 
-#: ../data/ui/preferences.ui.h:28
+#: ../data/ui/preferences.ui.h:29
 msgid "_Timestamp resolution:"
 msgstr "_Data-zigiluaren bereizmena:"
 
-#: ../data/ui/preferences.ui.h:29
+#: ../data/ui/preferences.ui.h:31
 msgid "Symbolic Links"
 msgstr "Esteka sinbolikoak"
 
-#: ../data/ui/preferences.ui.h:31
+#: ../data/ui/preferences.ui.h:33
 msgid "Visible Columns"
 msgstr "Zutabe ikusgaiak"
 
-#: ../data/ui/preferences.ui.h:32
+#: ../data/ui/preferences.ui.h:34
 msgid "Folder Comparisons"
 msgstr "Karpeten konparazioa"
 
-#: ../data/ui/preferences.ui.h:33
+#: ../data/ui/preferences.ui.h:35
 msgid "Version Comparisons"
 msgstr "Bertsioen konparazioa"
 
-#: ../data/ui/preferences.ui.h:34
+#: ../data/ui/preferences.ui.h:36
 msgid "_Order when comparing file revisions:"
 msgstr "_Ordenatu fitxategien gainbegiraketa konparatzean"
 
-#: ../data/ui/preferences.ui.h:35
+#: ../data/ui/preferences.ui.h:37
 msgid "Order when _merging files:"
 msgstr "Ordenatu fitxategiak _batzean:"
 
-#: ../data/ui/preferences.ui.h:36
+#: ../data/ui/preferences.ui.h:38
 msgid "Commit Messages"
 msgstr "Egikaritze-mezuak"
 
-#: ../data/ui/preferences.ui.h:37
+#: ../data/ui/preferences.ui.h:39
 msgid "Show _right margin at:"
 msgstr "Erakutsi e_skuineko marjina hemen:"
 
-#: ../data/ui/preferences.ui.h:38
+#: ../data/ui/preferences.ui.h:40
 msgid "Automatically _break lines at right margin on commit"
 msgstr "_Hautsi lerroak automatikoki eskuineko marjinan egikaritzean"
 
-#: ../data/ui/preferences.ui.h:39
+#: ../data/ui/preferences.ui.h:41
 msgid "Version Control"
 msgstr "Bertsio-kontrola"
 
-#: ../data/ui/preferences.ui.h:40
+#: ../data/ui/preferences.ui.h:42
+#| msgid "Filename-based filters"
+msgid "Filename filters"
+msgstr "Fitxategi-izenen iragazkiak"
+
+#: ../data/ui/preferences.ui.h:43
 msgid ""
 "When performing directory comparisons, you may filter out files and "
 "directories by name. Each pattern is a list of shell style wildcards "
@@ -920,11 +1204,24 @@ msgstr ""
 "direktorioak. Zuriunez bereizia dagoen shell motako komodinen zerrenda bat "
 "da eredu bakoitza."
 
-#: ../data/ui/preferences.ui.h:41 ../meld/meldwindow.py:103
+#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:104
 msgid "File Filters"
 msgstr "Fitxategi-iragazkiak"
 
-#: ../data/ui/preferences.ui.h:42
+#: ../data/ui/preferences.ui.h:45
+msgid "Change trimming"
+msgstr "Aldaketen lerro hutsak kentzea"
+
+#: ../data/ui/preferences.ui.h:46
+msgid "Trim blank line differences from the start and end of changes"
+msgstr "Kendu desberdintasunen lerro hutsak aldaketen hasiera eta amaieretatik"
+
+#: ../data/ui/preferences.ui.h:47
+#| msgid "Text Filters"
+msgid "Text filters"
+msgstr "Testu-iragazkiak"
+
+#: ../data/ui/preferences.ui.h:48
 msgid ""
 "When performing file comparisons, you may ignore certain types of changes. "
 "Each pattern here is a python regular expression which replaces matching "
@@ -938,16 +1235,300 @@ msgstr ""
 "taldeak badauzka, taldeak soilik ordezkatzen dira. Informazio gehiago behar "
 "izanez gero, ikusi erabiltzailearen eskuliburua."
 
-#: ../data/ui/preferences.ui.h:43
-msgid "Ignore changes which insert or delete blank lines"
-msgstr ""
-"Ez ikusi egin lerro zurriak txertatzen edo ezabatzen dituzten aldaketei"
-
-#: ../data/ui/preferences.ui.h:44
+#: ../data/ui/preferences.ui.h:49
 msgid "Text Filters"
 msgstr "Testu-iragazkiak"
 
-#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:583
+#: ../data/ui/shortcuts.ui.h:1
+msgctxt "shortcut window"
+msgid "General"
+msgstr "Orokorra"
+
+#: ../data/ui/shortcuts.ui.h:2
+#| msgid "New comparison"
+msgctxt "shortcut window"
+msgid "New comparison"
+msgstr "Konparazio berria"
+
+#: ../data/ui/shortcuts.ui.h:3
+#| msgid "File comparison"
+msgctxt "shortcut window"
+msgid "Close a comparison"
+msgstr "Itxi konparazioa"
+
+#: ../data/ui/shortcuts.ui.h:4
+#| msgid "About Meld"
+msgctxt "shortcut window"
+msgid "Quit Meld"
+msgstr "Irten Meld-etik"
+
+#: ../data/ui/shortcuts.ui.h:5
+#| msgid "Stop the current action"
+msgctxt "shortcut window"
+msgid "Stop the current action"
+msgstr "Gelditu uneko ekintza"
+
+#: ../data/ui/shortcuts.ui.h:6
+#| msgid "New comparison"
+msgctxt "shortcut window"
+msgid "Refresh comparison"
+msgstr "Freskatu konparazioa"
+
+#: ../data/ui/shortcuts.ui.h:7
+#| msgid "Fullscreen"
+msgctxt "shortcut window"
+msgid "Fullscreen"
+msgstr "Pantaila osoa"
+
+#: ../data/ui/shortcuts.ui.h:8
+#| msgid "_Tabs"
+msgctxt "shortcut window"
+msgid "Tabs"
+msgstr "Fitxak"
+
+#: ../data/ui/shortcuts.ui.h:9
+#| msgid "Go to the previous change"
+msgctxt "shortcut window"
+msgid "Go to previous tab"
+msgstr "Joan aurreko fitxara"
+
+#: ../data/ui/shortcuts.ui.h:10
+#| msgid "Go to the next change"
+msgctxt "shortcut window"
+msgid "Go to next tab"
+msgstr "Joan hurrengo fitxara"
+
+#: ../data/ui/shortcuts.ui.h:11
+#| msgid "Switch to this tab"
+msgctxt "shortcut window"
+msgid "Switch to tab"
+msgstr "Aldatu fitxara"
+
+#: ../data/ui/shortcuts.ui.h:12
+#| msgid "Move Tab _Left"
+msgctxt "shortcut window"
+msgid "Move tab left"
+msgstr "Eraman fitxa ezkerrera"
+
+#: ../data/ui/shortcuts.ui.h:13
+#| msgid "Move Tab _Right"
+msgctxt "shortcut window"
+msgid "Move tab right"
+msgstr "Eraman fitxa eskuinera"
+
+#: ../data/ui/shortcuts.ui.h:14
+#| msgid "_Changes"
+msgctxt "shortcut window"
+msgid "Changes"
+msgstr "Aldaketak"
+
+#: ../data/ui/shortcuts.ui.h:15
+#| msgid "Go to the previous change"
+msgctxt "shortcut window"
+msgid "Go to previous change"
+msgstr "Joan aurreko aldaketara"
+
+#: ../data/ui/shortcuts.ui.h:16
+#| msgid "Go to the next change"
+msgctxt "shortcut window"
+msgid "Go to next change"
+msgstr "Joan hurrengo aldaketara"
+
+#: ../data/ui/shortcuts.ui.h:17
+#| msgid "_Edit"
+msgctxt "shortcut window"
+msgid "Editing"
+msgstr "Edizioa"
+
+#: ../data/ui/shortcuts.ui.h:18
+msgctxt "shortcut window"
+msgid "Undo"
+msgstr "Desegin"
+
+#: ../data/ui/shortcuts.ui.h:19
+msgctxt "shortcut window"
+msgid "Redo"
+msgstr "Berregin"
+
+#: ../data/ui/shortcuts.ui.h:20
+msgctxt "shortcut window"
+msgid "Cut"
+msgstr "Ebaki"
+
+#: ../data/ui/shortcuts.ui.h:21
+#| msgid "Copy _up"
+msgctxt "shortcut window"
+msgid "Copy"
+msgstr "Kopiatu"
+
+#: ../data/ui/shortcuts.ui.h:22
+msgctxt "shortcut window"
+msgid "Paste"
+msgstr "Itsatsi"
+
+#: ../data/ui/shortcuts.ui.h:23
+#| msgid "Find:"
+msgctxt "shortcut window"
+msgid "Find"
+msgstr "Bilatu"
+
+#: ../data/ui/shortcuts.ui.h:24
+#| msgid "Find Ne_xt"
+msgctxt "shortcut window"
+msgid "Find Next"
+msgstr "Bilatu hurrengoa"
+
+#: ../data/ui/shortcuts.ui.h:25
+#| msgid "Find _Previous"
+msgctxt "shortcut window"
+msgid "Find Previous"
+msgstr "Bilatu aurrekoa"
+
+#: ../data/ui/shortcuts.ui.h:26
+#| msgid "_Replace"
+msgctxt "shortcut window"
+msgid "Replace"
+msgstr "Ordeztu"
+
+#: ../data/ui/shortcuts.ui.h:27
+#| msgid "File comparison"
+msgctxt "shortcut window"
+msgid "File comparison"
+msgstr "Fitxategi-konparazioa"
+
+#: ../data/ui/shortcuts.ui.h:28
+#| msgid "Save the current file"
+msgctxt "shortcut window"
+msgid "Save current file"
+msgstr "Gorde uneko fitxategia"
+
+#: ../data/ui/shortcuts.ui.h:29
+#| msgid "Save the current file"
+msgctxt "shortcut window"
+msgid "Save current file to new path"
+msgstr "Gorde uneko fitxategia bide-izen berrian"
+
+#: ../data/ui/shortcuts.ui.h:30
+#| msgid "Save all files in the current comparison"
+msgctxt "shortcut window"
+msgid "Save all files in comparison"
+msgstr "Gorde konparazioko fitxategi guztiak"
+
+#: ../data/ui/shortcuts.ui.h:31
+#| msgid "Previous Conflict"
+msgctxt "shortcut window"
+msgid "Previous conflict"
+msgstr "Aurreko gatazka"
+
+#: ../data/ui/shortcuts.ui.h:32
+#| msgid "Next Conflict"
+msgctxt "shortcut window"
+msgid "Next conflict"
+msgstr "Hurrengo gatazka"
+
+#: ../data/ui/shortcuts.ui.h:33
+#| msgid "Push current change to the left"
+msgctxt "shortcut window"
+msgid "Push change to left"
+msgstr "Bultzatu aldaketa ezkerrera"
+
+#: ../data/ui/shortcuts.ui.h:34
+#| msgid "Push current change to the right"
+msgctxt "shortcut window"
+msgid "Push change to right"
+msgstr "Bultzatu aldaketa eskuinera"
+
+#: ../data/ui/shortcuts.ui.h:35
+#| msgid "Pull change from the left"
+msgctxt "shortcut window"
+msgid "Pull change from left"
+msgstr "Ekarri aldaketa ezkerretik"
+
+#: ../data/ui/shortcuts.ui.h:36
+#| msgid "Pull change from the right"
+msgctxt "shortcut window"
+msgid "Pull change from right"
+msgstr "Ekarri aldaketa eskuinetik"
+
+#: ../data/ui/shortcuts.ui.h:37
+#| msgid "Copy change above the left chunk"
+msgctxt "shortcut window"
+msgid "Copy change above left"
+msgstr "Kopiatu aldaketa goi-ezkerrean"
+
+#: ../data/ui/shortcuts.ui.h:38
+#| msgid "Copy change below the left chunk"
+msgctxt "shortcut window"
+msgid "Copy change below left"
+msgstr "Kopiatu aldaketa azpi-ezkerrean"
+
+#: ../data/ui/shortcuts.ui.h:39
+#| msgid "Copy change above the right chunk"
+msgctxt "shortcut window"
+msgid "Copy change above right"
+msgstr "Kopiatu aldaketa goi-eskuinean"
+
+#: ../data/ui/shortcuts.ui.h:40
+#| msgid "Copy change below the right chunk"
+msgctxt "shortcut window"
+msgid "Copy change below right"
+msgstr "Kopiatu aldaketa azpi-eskuinean"
+
+#: ../data/ui/shortcuts.ui.h:41
+#| msgid "Delete change"
+msgctxt "shortcut window"
+msgid "Delete change"
+msgstr "Ezabatu aldaketa"
+
+#: ../data/ui/shortcuts.ui.h:42
+#| msgid "Directory comparison"
+msgctxt "shortcut window"
+msgid "Previous comparison pane"
+msgstr "Aurreko konparazioaren panela"
+
+#: ../data/ui/shortcuts.ui.h:43
+#| msgid "New comparison"
+msgctxt "shortcut window"
+msgid "Next comparison pane"
+msgstr "Hurrengo konparazioaren panela"
+
+#: ../data/ui/shortcuts.ui.h:44
+#| msgid "Folder Comparisons"
+msgctxt "shortcut window"
+msgid "Folder comparison"
+msgstr "Karpeten konparazioa"
+
+#: ../data/ui/shortcuts.ui.h:45
+#| msgid "Copy to left"
+msgctxt "shortcut window"
+msgid "Copy to left"
+msgstr "Kopiatu ezkerrean"
+
+#: ../data/ui/shortcuts.ui.h:46
+#| msgid "Copy to right"
+msgctxt "shortcut window"
+msgid "Copy to right"
+msgstr "Kopiatu eskuinean"
+
+#: ../data/ui/shortcuts.ui.h:47
+#| msgid "Start a version control comparison"
+msgctxt "shortcut window"
+msgid "Version control comparison"
+msgstr "Bertsio-kontrolen konparazioa"
+
+#: ../data/ui/shortcuts.ui.h:48
+#| msgid "Commit changes to version control"
+msgctxt "shortcut window"
+msgid "Commit to version control"
+msgstr "Egikaritu bertsio-kontrolera"
+
+#: ../data/ui/shortcuts.ui.h:49
+#| msgid "Console output"
+msgctxt "shortcut window"
+msgid "Show/hide console output"
+msgstr "Erakutsi/ezkutatu kontsolaren irteera"
+
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:668
 msgid "New comparison"
 msgstr "Beste konparazio bat"
 
@@ -1095,7 +1676,7 @@ msgstr "Bertsiorik _gabe"
 msgid "Show unversioned files"
 msgstr "Bertsiorik ez duten fitxategiak bistaratzen ditu"
 
-#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:64
+#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:67
 msgid "Ignored"
 msgstr "Ez ikusi eginda"
 
@@ -1123,382 +1704,279 @@ msgstr "Aurreko egunkaria:"
 msgid "Co_mmit"
 msgstr "_Egikaritu"
 
-#: ../data/ui/vcview.ui.h:35
+#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:343
+msgid "Location"
+msgstr "Kokapena"
+
+#: ../data/ui/vcview.ui.h:37
+msgid "Status"
+msgstr "Egoera"
+
+#: ../data/ui/vcview.ui.h:38
+msgid "Extra"
+msgstr "Gehigarria"
+
+#: ../data/ui/vcview.ui.h:39
 msgid "Console output"
 msgstr "Kontsolaren irteera"
 
-#: ../data/ui/vcview.ui.h:36
+#: ../data/ui/vcview.ui.h:40
 msgid "Push local commits to remote?"
 msgstr "Bidali egikaritze lokalak urrunekora?"
 
-#: ../data/ui/vcview.ui.h:37
+#: ../data/ui/vcview.ui.h:41
 msgid "The commits to be pushed are determined by your version control system."
 msgstr ""
 "Bidali beharreko egikaritzeak bertsio-kontrol sistemaren arabera zehaztuta "
 "dago."
 
-#: ../data/ui/vcview.ui.h:38
+#: ../data/ui/vcview.ui.h:42
 msgid "_Push commits"
 msgstr "_Bidali egikariketak"
 
+#: ../meld/const.py:12
+msgid "UNIX (LF)"
+msgstr "UNIX (LF)"
+
+#: ../meld/const.py:13
+msgid "DOS/Windows (CR-LF)"
+msgstr "DOS/Windows (CR-LF)"
+
+#: ../meld/const.py:14
+msgid "Mac OS (CR)"
+msgstr "Mac OS (CR)"
+
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:381
+#: ../meld/dirdiff.py:392 ../meld/preferences.py:82
 msgid "Size"
 msgstr "Tamaina"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:389
+#: ../meld/dirdiff.py:400 ../meld/preferences.py:83
 msgid "Modification time"
 msgstr "Aldatze-ordua"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:397
+#: ../meld/dirdiff.py:408 ../meld/preferences.py:84
 msgid "Permissions"
 msgstr "Baimenak"
 
-#: ../meld/dirdiff.py:543
-#, python-format
-msgid "Hide %s"
-msgstr "Ezkutatu %s"
-
-#: ../meld/dirdiff.py:672 ../meld/dirdiff.py:694
-#, python-format
-msgid "[%s] Scanning %s"
-msgstr "[%s] %s eskaneatzen"
-
-#: ../meld/dirdiff.py:823
-#, python-format
-msgid "[%s] Done"
-msgstr "[%s] Eginda"
-
-#: ../meld/dirdiff.py:830
-msgid "Multiple errors occurred while scanning this folder"
-msgstr "Erroreak gertatu dira karpeta hau eskaneatzean"
-
-#: ../meld/dirdiff.py:831
-msgid "Files with invalid encodings found"
-msgstr "Kodeketa baliogabea duten fitxategiak aurkitu dira"
-
-#. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:833
-msgid "Some files were in an incorrect encoding. The names are something like:"
-msgstr "Fitxategi batzuen kodeketa okerra da. Hauek dira fitxategi-izenak:"
-
-#: ../meld/dirdiff.py:835
-msgid "Files hidden by case insensitive comparison"
-msgstr ""
-"Fitxategiren bat ezkutatu da, konparazioan maiuskulak/minuskulak ez "
-"bereizteagatik"
-
-#. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:837
-msgid ""
-"You are running a case insensitive comparison on a case sensitive "
-"filesystem. The following files in this folder are hidden:"
-msgstr ""
-"Maiuskulak/minuskulak bereizten ez dituen konparazio bat egiten ari zara, "
-"maiuskulak/minuskulak bereizten dituen fitxategi-sistema batean. Karpeta "
-"honetako fitxategi hauek ezkutatu dira:"
-
-#: ../meld/dirdiff.py:848
-#, python-format
-msgid "'%s' hidden by '%s'"
-msgstr "'%s', honek ezkutatua: '%s'"
-
-#: ../meld/dirdiff.py:873 ../meld/filediff.py:1123 ../meld/filediff.py:1274
-#: ../meld/filediff.py:1450 ../meld/filediff.py:1480 ../meld/filediff.py:1482
-msgid "Hi_de"
-msgstr "_Ezkutatu"
-
-#: ../meld/dirdiff.py:904
-#, python-format
-msgid ""
-"'%s' exists.\n"
-"Overwrite?"
-msgstr ""
-"'%s' badago lehendik ere.\n"
-"Gainidatzi?"
-
-#: ../meld/dirdiff.py:912
-msgid "Error copying file"
-msgstr "Errorea fitxategia kopiatzean"
-
-#: ../meld/dirdiff.py:913
-#, python-format
-msgid ""
-"Couldn't copy %s\n"
-"to %s.\n"
-"\n"
-"%s"
-msgstr ""
-"Ezin izan da '%s' kopiatu\n"
-"'%s' gisa.\n"
-"\n"
-"%s"
-
-#: ../meld/dirdiff.py:936
-#, python-format
-msgid "Error deleting %s"
-msgstr "Errorea '%s' ezabatzean"
-
-#: ../meld/filediff.py:243
-msgid "Format as Patch..."
-msgstr "Eman formatua adabaki gisa..."
-
-#: ../meld/filediff.py:244
-msgid "Create a patch using differences between files"
-msgstr "Adabaki bat sortzen du fitxategien arteko diferentziekin"
-
-#: ../meld/filediff.py:246
-msgid "Save A_ll"
-msgstr "Gorde _denak"
-
-#: ../meld/filediff.py:247
-msgid "Save all files in the current comparison"
-msgstr "Gorde fitxategi guztiak uneko konparazioan"
-
-#: ../meld/filediff.py:250
-msgid "Revert files to their saved versions"
-msgstr "Leheneratu fitxategiak haien gordetako bertsioetara"
-
-#: ../meld/filediff.py:252
-msgid "Add Synchronization Point"
-msgstr "Gehitu sinkronizazio-puntua"
-
-#: ../meld/filediff.py:253
-msgid "Add a manual point for synchronization of changes between files"
-msgstr "Gehitu eskuzko puntu bat fitxategien arteko aldaketak sinkronizatzeko"
-
-#: ../meld/filediff.py:256
-msgid "Clear Synchronization Points"
-msgstr "Garbitu sinkronizazio-puntuak"
-
-#: ../meld/filediff.py:257
-msgid "Clear manual change sychronization points"
-msgstr "Garbitu eskuzko aldaketen sinkronizazio-puntuak"
-
-#: ../meld/filediff.py:259
-msgid "Previous Conflict"
-msgstr "Aurreko gatazka"
-
-#: ../meld/filediff.py:260
-msgid "Go to the previous conflict"
-msgstr "Aurreko gatazkara joaten da"
-
-#: ../meld/filediff.py:262
-msgid "Next Conflict"
-msgstr "Hurrengo gatazka"
-
-#: ../meld/filediff.py:263
-msgid "Go to the next conflict"
-msgstr "Hurrengo gatazkara joaten da"
-
-#: ../meld/filediff.py:265
-msgid "Push to Left"
-msgstr "Bidali ezkerrera"
-
-#: ../meld/filediff.py:266
-msgid "Push current change to the left"
-msgstr "Uneko aldaketa ezkerrera bidaltzen du"
-
-#: ../meld/filediff.py:269
-msgid "Push to Right"
-msgstr "Bidali eskuinera"
-
-#: ../meld/filediff.py:270
-msgid "Push current change to the right"
-msgstr "Uneko aldaketa eskuinera bidaltzen du"
-
-#: ../meld/filediff.py:274
-msgid "Pull from Left"
-msgstr "Ekarri ezkerretik"
-
-#: ../meld/filediff.py:275
-msgid "Pull change from the left"
-msgstr "Ezkerreko aldaketa ekartzen du"
-
-#: ../meld/filediff.py:278
-msgid "Pull from Right"
-msgstr "Ekarri eskuinetik"
-
-#: ../meld/filediff.py:279
-msgid "Pull change from the right"
-msgstr "Eskuineko aldaketa ekartzen du"
-
-#: ../meld/filediff.py:281
-msgid "Copy Above Left"
-msgstr "Kopiatu ezkerrekoaren gainean"
+#: ../meld/dirdiff.py:538
+#, python-format
+msgid "Hide %s"
+msgstr "Ezkutatu %s"
 
-#: ../meld/filediff.py:282
-msgid "Copy change above the left chunk"
-msgstr "Aldaketa ezkerreko zatiaren gainean kopiatzen du"
+#: ../meld/dirdiff.py:670 ../meld/dirdiff.py:694
+#, python-format
+msgid "[%s] Scanning %s"
+msgstr "[%s] %s eskaneatzen"
 
-#: ../meld/filediff.py:284
-msgid "Copy Below Left"
-msgstr "Kopiatu ezkerrekoaren azpian"
+#: ../meld/dirdiff.py:827
+#, python-format
+msgid "[%s] Done"
+msgstr "[%s] Eginda"
 
-#: ../meld/filediff.py:285
-msgid "Copy change below the left chunk"
-msgstr "Aldaketa ezkerreko zatiaren azpian kopiatzen du"
+#: ../meld/dirdiff.py:835
+#| msgid "[%s] Fetching differences"
+msgid "Folders have no differences"
+msgstr "Karpetek ez daukate desberdintasunik"
 
-#: ../meld/filediff.py:287
-msgid "Copy Above Right"
-msgstr "Kopiatu eskuinekoaren gainean"
+#: ../meld/dirdiff.py:837
+msgid "Contents of scanned files in folders are identical."
+msgstr "Karpetetako aztertutako fitxategien edukiak berdinak dira."
 
-#: ../meld/filediff.py:288
-msgid "Copy change above the right chunk"
-msgstr "Aldaketa eskuineko zatiaren gainean kopiatzen du"
+#: ../meld/dirdiff.py:839
+msgid ""
+"Scanned files in folders appear identical, but contents have not been "
+"scanned."
+msgstr ""
+"Karpetetako aztertutako fitxategiak berdintsuak dirudite, baina "
+"edukiak ez dira aztertu."
 
-#: ../meld/filediff.py:290
-msgid "Copy Below Right"
-msgstr "Kopiatu eskuinekoaren azpian"
+#: ../meld/dirdiff.py:842
+msgid "File filters are in use, so not all files have been scanned."
+msgstr ""
+"Fitxategien iragazkiak erabiltzen ari dira, ez dira fitxategi guztiak aztertu."
 
-#: ../meld/filediff.py:291
-msgid "Copy change below the right chunk"
-msgstr "Aldaketa eskuinekoaren azpian kopiatzen du"
+#: ../meld/dirdiff.py:844
+#| msgid ""
+#| "Text filters are being used, and may be masking differences between "
+#| "files. Would you like to compare the unfiltered files?"
+msgid "Text filters are in use and may be masking content differences."
+msgstr ""
+"Testu-iragazkiak erabiltzen ari dira fitxategiak, eta baliteke iragazki "
+"horiek diferentziak ezkutatzea."
 
-#: ../meld/filediff.py:293
-msgid "Delete"
-msgstr "Ezabatu"
+#: ../meld/dirdiff.py:862 ../meld/filediff.py:1370 ../meld/filediff.py:1400
+#: ../meld/filediff.py:1402 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122
+msgid "Hi_de"
+msgstr "_Ezkutatu"
 
-#: ../meld/filediff.py:294
-msgid "Delete change"
-msgstr "Ezabatu aldaketa"
+#: ../meld/dirdiff.py:872
+msgid "Multiple errors occurred while scanning this folder"
+msgstr "Erroreak gertatu dira karpeta hau eskaneatzean"
 
-#: ../meld/filediff.py:296
-msgid "Merge All from Left"
-msgstr "Batu guztiak ezkerretik"
+#: ../meld/dirdiff.py:873
+msgid "Files with invalid encodings found"
+msgstr "Kodeketa baliogabea duten fitxategiak aurkitu dira"
 
-#: ../meld/filediff.py:297
-msgid "Merge all non-conflicting changes from the left"
-msgstr "Ezkerreko aldaketa ez-gatazkatsu guztiak konbinatzen ditu"
+#. TRANSLATORS: This is followed by a list of files
+#: ../meld/dirdiff.py:875
+msgid "Some files were in an incorrect encoding. The names are something like:"
+msgstr "Fitxategi batzuen kodeketa okerra da. Hauek dira fitxategi-izenak:"
 
-#: ../meld/filediff.py:299
-msgid "Merge All from Right"
-msgstr "Batu guztiak eskuinetik"
+#: ../meld/dirdiff.py:877
+msgid "Files hidden by case insensitive comparison"
+msgstr ""
+"Fitxategiren bat ezkutatu da, konparazioan maiuskulak/minuskulak ez "
+"bereizteagatik"
 
-#: ../meld/filediff.py:300
-msgid "Merge all non-conflicting changes from the right"
-msgstr "Eskuineko aldaketa ez-gatazkatsu guztiak konbinatzen ditu"
+#. TRANSLATORS: This is followed by a list of files
+#: ../meld/dirdiff.py:879
+msgid ""
+"You are running a case insensitive comparison on a case sensitive "
+"filesystem. The following files in this folder are hidden:"
+msgstr ""
+"Maiuskulak/minuskulak bereizten ez dituen konparazio bat egiten ari zara, "
+"maiuskulak/minuskulak bereizten dituen fitxategi-sistema batean. Karpeta "
+"honetako fitxategi hauek ezkutatu dira:"
 
-#: ../meld/filediff.py:302
-msgid "Merge All"
-msgstr "Batu guztiak"
+#: ../meld/dirdiff.py:890
+#, python-format
+msgid "'%s' hidden by '%s'"
+msgstr "'%s', honek ezkutatua: '%s'"
 
-#: ../meld/filediff.py:303
-msgid "Merge all non-conflicting changes from left and right panes"
+#: ../meld/dirdiff.py:946
+#, python-format
+msgid "Replace folder “%s”?"
+msgstr "Ordeztu “%s” karpeta?"
+
+#: ../meld/dirdiff.py:948
+#, python-format
+msgid ""
+"Another folder with the same name already exists in “%s”.\n"
+"If you replace the existing folder, all files in it will be lost."
 msgstr ""
-"Ezkerreko eta eskuineko paneletako aldaketa ez-gatazkatsu guztiak "
-"konbinatzen ditu"
+"Jadanik badago izen berdineko beste karpeta bat ”%s”(e)n.\n"
+"Dagoen karpeta ordezten baduzu, bere fitxategi guztiak galduko dira."
 
-#: ../meld/filediff.py:307
-msgid "Cycle Through Documents"
-msgstr "Begiztatu dokumentuen artean"
+#: ../meld/dirdiff.py:961
+msgid "Error copying file"
+msgstr "Errorea fitxategia kopiatzean"
 
-#: ../meld/filediff.py:308
-msgid "Move keyboard focus to the next document in this comparison"
+#: ../meld/dirdiff.py:962
+#, python-format
+msgid ""
+"Couldn't copy %s\n"
+"to %s.\n"
+"\n"
+"%s"
 msgstr ""
-"Teklatuaren fokua konparaketa honetako hurrengo dokumentura eramaten du"
+"Ezin izan da '%s' kopiatu\n"
+"'%s' gisa.\n"
+"\n"
+"%s"
 
-#: ../meld/filediff.py:314
-msgid "Lock Scrolling"
-msgstr "Blokeatu korritzea"
+#: ../meld/dirdiff.py:985
+#, python-format
+msgid "Error deleting %s"
+msgstr "Errorea '%s' ezabatzean"
 
-#: ../meld/filediff.py:315
-msgid "Lock scrolling of all panes"
-msgstr "Panel guztien korritzea blokeatzen du"
+#: ../meld/dirdiff.py:1492
+#| msgid "folder"
+msgid "No folder"
+msgstr "Karpetarik ez"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:472
+#: ../meld/filediff.py:357
 msgid "INS"
 msgstr "TXER"
 
-#: ../meld/filediff.py:472
+#: ../meld/filediff.py:357
 msgid "OVR"
 msgstr "GAIN"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:474
+#: ../meld/filediff.py:359
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "%i. err., %i. zut."
 
-#: ../meld/filediff.py:821
-#, python-format
+#: ../meld/filediff.py:771
+msgid "Comparison results will be inaccurate"
+msgstr "Konparazioaren emaitzak ez dira zehatzak izango"
+
+#: ../meld/filediff.py:773
+#| msgid ""
+#| "Filter '%s' changed the number of lines in the file. Comparison will be "
+#| "incorrect. See the user manual for more details."
 msgid ""
-"Filter '%s' changed the number of lines in the file. Comparison will be "
-"incorrect. See the user manual for more details."
+"A filter changed the number of lines in the file, which is unsupported. The "
+"comparison will not be accurate."
 msgstr ""
-"'%s' iragazkiak fitxategiko lerro kopurua aldatu du. Konparazioa okerra "
-"izango da. Informazio gehiago behar izanez gero, ikusi erabiltzailearen "
-"eskuliburua."
+"Iragazki batek fitxategiko lerro kopurua aldatu du, onartu gabe dago ordea. "
+"Konparazioa ez da zehatza izango."
 
-#: ../meld/filediff.py:890
+#: ../meld/filediff.py:831
 msgid "Mark conflict as resolved?"
 msgstr "Markatu gatazka ebatzita bezala?"
 
-#: ../meld/filediff.py:892
+#: ../meld/filediff.py:833
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr "Gatazka ongi ebatzi bada, ebatzita bezala marka dezakezu orain."
 
-#: ../meld/filediff.py:894
+#: ../meld/filediff.py:835
 msgid "Cancel"
 msgstr "Utzi"
 
-#: ../meld/filediff.py:895
+#: ../meld/filediff.py:836
 msgid "Mark _Resolved"
 msgstr "Markatu _ebatzita"
 
-#: ../meld/filediff.py:1111
+#: ../meld/filediff.py:1086
 #, python-format
-msgid "[%s] Set num panes"
-msgstr "[%s] Ezarri panel kopurua"
+msgid "There was a problem opening the file “%s”."
+msgstr "Arazo bat egon da “%s“ fitxategia irekitzean."
 
-#: ../meld/filediff.py:1117
+#: ../meld/filediff.py:1094
 #, python-format
-msgid "[%s] Opening files"
-msgstr "[%s] Fitxategiak irekitzen"
+#| msgid "%s appears to be a binary file."
+msgid "File %s appears to be a binary file."
+msgstr "Badirudi “%s“ fitxategia bitarra dela."
 
-#: ../meld/filediff.py:1140 ../meld/filediff.py:1150 ../meld/filediff.py:1163
-#: ../meld/filediff.py:1169
-msgid "Could not read file"
-msgstr "Ezin izan da fitxategia irakurri"
-
-#: ../meld/filediff.py:1141
-#, python-format
-msgid "[%s] Reading files"
-msgstr "[%s] Fitxategiak irakurtzen"
-
-#: ../meld/filediff.py:1151
-#, python-format
-msgid "%s appears to be a binary file."
-msgstr "Badirudi '%s' fitxategia bitarra dela."
+#: ../meld/filediff.py:1096
+#| msgid "Open selected file or directory in the default external application"
+msgid "Do you want to open the file using the default application?"
+msgstr "Fitxategia aplikazio lehenetsiarekin irekitzea nahi duzu?"
 
-#: ../meld/filediff.py:1164
-#, python-format
-msgid "%s is not in encodings: %s"
-msgstr "%s ez dago kodeketetan: %s"
+#: ../meld/filediff.py:1098
+msgid "Open"
+msgstr "Ireki"
 
-#: ../meld/filediff.py:1202
+#: ../meld/filediff.py:1114
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Diferentziak kalkulatzen"
 
-#: ../meld/filediff.py:1269
+#: ../meld/filediff.py:1179
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "'%s' fitxategia diskoan aldatu da"
 
-#: ../meld/filediff.py:1270
+#: ../meld/filediff.py:1180
 msgid "Do you want to reload the file?"
 msgstr "Fitxategia berriro kargatzea nahi duzu?"
 
-#: ../meld/filediff.py:1273
+#: ../meld/filediff.py:1182
 msgid "_Reload"
 msgstr "_Birkargatu"
 
-#: ../meld/filediff.py:1439
+#: ../meld/filediff.py:1333
+msgid "Files are identical"
+msgstr "Fitxategiak berdinak dira"
+
+#: ../meld/filediff.py:1346
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1507,109 +1985,128 @@ msgstr ""
 "horiek fitxategien arteko diferentziak ezkutatzea. Iragazi gabeko "
 "fitxategiak konparatu nahi dituzu?"
 
-#: ../meld/filediff.py:1445
-msgid "Files are identical"
-msgstr "Fitxategiak berdinak dira"
+#: ../meld/filediff.py:1351
+#| msgid "Files with invalid encodings found"
+msgid "Files differ in line endings only"
+msgstr "Fitxategiak lerroen amaieretan soilik desberdintzen dira"
+
+#: ../meld/filediff.py:1353
+#, python-format
+msgid ""
+"Files are identical except for differing line endings:\n"
+"%s"
+msgstr ""
+"Fitxategiak berdinak dira, soilik lerroen amaieretan desberdintzen dira:\n"
+"%s"
 
-#: ../meld/filediff.py:1453
+#: ../meld/filediff.py:1373
 msgid "Show without filters"
 msgstr "Erakutsi iragazkirik gabe"
 
-#: ../meld/filediff.py:1475
+#: ../meld/filediff.py:1395
 msgid "Change highlighting incomplete"
 msgstr "Aldaketen nabarmentzea osatu gabe"
 
-#: ../meld/filediff.py:1476
+#: ../meld/filediff.py:1396
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
 msgstr ""
-"Aldaketa batzuk ez dira nabarmendu handiegiak direlako. "
-"Derrigor diezaiokezu Meld-i aldaketa handiak nabarmentzeko, nahiz eta "
-"halakoetan motelagoa izan."
+"Aldaketa batzuk ez dira nabarmendu handiegiak direlako. Derrigor diezaiokezu "
+"Meld-i aldaketa handiak nabarmentzeko, nahiz eta halakoetan motelagoa izan."
 
-#: ../meld/filediff.py:1484
+#: ../meld/filediff.py:1404
 msgid "Keep highlighting"
 msgstr "Mantendu nabarmentzea"
 
-#: ../meld/filediff.py:1486
+#: ../meld/filediff.py:1406
 msgid "_Keep highlighting"
 msgstr "_Mantendu nabarmentzea"
 
-#: ../meld/filediff.py:1617
+#: ../meld/filediff.py:1438
 #, python-format
-msgid ""
-"\"%s\" exists!\n"
-"Overwrite?"
-msgstr ""
-"'%s' badago!\n"
-"Gainidatzi?"
+msgid "Replace file “%s”?"
+msgstr "Ordeztu “%s\" fitxategia?"
 
-#: ../meld/filediff.py:1630
+#: ../meld/filediff.py:1440
 #, python-format
 msgid ""
-"Error writing to %s\n"
-"\n"
-"%s."
+"A file with this name already exists in “%s”.\n"
+"If you replace the existing file, its contents will be lost."
 msgstr ""
-"Errorea gertatu da '%s'(e)n idaztean\n"
-"\n"
-"%s."
+"Izen bereko fitxategia badago lehendik ere “%s“.\n"
+"Dagoen fitxategia gainidazten baduzu, bere edukia galduko da."
 
-#: ../meld/filediff.py:1641
+#: ../meld/filediff.py:1457
 msgid "Save Left Pane As"
 msgstr "Gorde ezkerreko panela honela"
 
-#: ../meld/filediff.py:1643
+#: ../meld/filediff.py:1459
 msgid "Save Middle Pane As"
 msgstr "Gorde erdiko panela honela"
 
-#: ../meld/filediff.py:1645
+#: ../meld/filediff.py:1461
 msgid "Save Right Pane As"
 msgstr "Gorde eskuineko panela honela"
 
-#: ../meld/filediff.py:1658
+#: ../meld/filediff.py:1475
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "'%s' fitxategia diskoan aldatu egin da (ireki zenetik)"
 
-#: ../meld/filediff.py:1660
+#: ../meld/filediff.py:1477
 msgid "If you save it, any external changes will be lost."
 msgstr "Gordetzen baduzu, kanpoko edozer aldaketa galdu egingo da."
 
-#: ../meld/filediff.py:1663
+#: ../meld/filediff.py:1480
 msgid "Save Anyway"
 msgstr "Gorde dena den"
 
-#: ../meld/filediff.py:1664
+#: ../meld/filediff.py:1481
 msgid "Don't Save"
 msgstr "Ez gorde"
 
-#: ../meld/filediff.py:1688
+#: ../meld/filediff.py:1503
+msgid "_Save as UTF-8"
+msgstr "_Gorde UTF-8 gisa"
+
+#: ../meld/filediff.py:1506
+#, python-format
+msgid "Couldn't encode text as “%s”"
+msgstr "Ezin izan da testua “%s“ gisa kodetu"
+
+#: ../meld/filediff.py:1508
 #, python-format
+#| msgid ""
+#| "'%s' contains characters not encodable with '%s'\n"
+#| "Would you like to save as UTF-8?"
 msgid ""
-"This file '%s' contains a mixture of line endings.\n"
-"\n"
-"Which format would you like to use?"
+"File “%s” contains characters that can't be encoded using encoding “%s”.\n"
+"Would you like to save as UTF-8?"
 msgstr ""
-"'%s' fitxategiak askotariko lerro-amaierak ditu.\n"
-"\n"
-"Zer formatu erabili nahi duzu?"
+"“%s“ fitxategiko karaktere batzuk ezin dira “%s“(r)ekin kodetu.\n"
+"UTF-8 gisa gorde nahi duzu?"
 
-#: ../meld/filediff.py:1704
+#: ../meld/filediff.py:1545 ../meld/patchdialog.py:125
+#, python-format
+#| msgid "Could not read file"
+msgid "Could not save file %s."
+msgstr "Ezin izan da “%s“ fitxategia gorde."
+
+#: ../meld/filediff.py:1546 ../meld/patchdialog.py:126
 #, python-format
 msgid ""
-"'%s' contains characters not encodable with '%s'\n"
-"Would you like to save as UTF-8?"
+"Couldn't save file due to:\n"
+"%s"
 msgstr ""
-"'%s' fitxategiko karaktere batzuk ezin dira '%s'(r)ekin kodetu.\n"
-"UTF-8 gisa gorde nahi duzu ?"
+"Ezin izan da fitxategia gorde:\n"
+"%s"
 
-#: ../meld/filediff.py:2065
+#: ../meld/filediff.py:1892
 msgid "Live comparison updating disabled"
 msgstr "Konparazioaren zuzeneko eguneraketa desgaituta"
 
-#: ../meld/filediff.py:2066
+#: ../meld/filediff.py:1893
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1617,316 +2114,370 @@ msgid ""
 msgstr ""
 "Konparazioen zuzeneko eguneraketa desgaitu egiten da sinkronizazio-puntuak "
 "aktibo daudenean. Hala ere, konparazioak eskuz freskatu ditzakezu, eta "
-"zuzeneko "
-"eguneraketak jarraitu egingo dute sinkronizazio-puntuak garbitzen direnean."
+"zuzeneko eguneraketak jarraitu egingo dute sinkronizazio-puntuak garbitzen "
+"direnean."
 
-#: ../meld/filemerge.py:48
+#: ../meld/filemerge.py:37
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Fitxategiak konbinatzen"
 
-#: ../meld/gutterrendererchunk.py:90
+#: ../meld/gutterrendererchunk.py:159
 msgid "Copy _up"
 msgstr "Kopiatu _goian"
 
-#: ../meld/gutterrendererchunk.py:91
+#: ../meld/gutterrendererchunk.py:160
 msgid "Copy _down"
 msgstr "Kopiatu _behean"
 
-#: ../meld/meldapp.py:160
+#: ../meld/meldapp.py:177
 msgid "wrong number of arguments supplied to --diff"
 msgstr "--diff: emandako argumentu kopurua okerra da"
 
-#: ../meld/meldapp.py:165
+#: ../meld/meldapp.py:182
 msgid "Start with an empty window"
 msgstr "Hasi leiho huts batekin"
 
-#: ../meld/meldapp.py:166 ../meld/meldapp.py:168
+#: ../meld/meldapp.py:183 ../meld/meldapp.py:185
 msgid "file"
 msgstr "fitxategia"
 
-#: ../meld/meldapp.py:166 ../meld/meldapp.py:170
+#: ../meld/meldapp.py:183 ../meld/meldapp.py:187
 msgid "folder"
 msgstr "karpeta"
 
-#: ../meld/meldapp.py:167
+#: ../meld/meldapp.py:184
 msgid "Start a version control comparison"
 msgstr "Hasi bertsio-kontrolaren konparazioa"
 
-#: ../meld/meldapp.py:169
+#: ../meld/meldapp.py:186
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Hasi bi edo hiru sarrerako fitxategi-konparazioa"
 
-#: ../meld/meldapp.py:171
+#: ../meld/meldapp.py:188
 msgid "Start a 2- or 3-way folder comparison"
 msgstr "Hasi bi edo hiru sarrerako karpeten konparazioa"
 
-#: ../meld/meldapp.py:209
+#: ../meld/meldapp.py:231
+#, python-format
+#| msgid "Error"
+msgid "Error: %s\n"
+msgstr "Errorea: %s\n"
+
+#: ../meld/meldapp.py:238
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld fitxategiak eta direktorioak konparatzeko tresna bat da."
 
-#: ../meld/meldapp.py:213
+#: ../meld/meldapp.py:242
 msgid "Set label to use instead of file name"
 msgstr "Ezarri etiketa bat fitxategi-izenaren ordez erabiltzeko"
 
-#: ../meld/meldapp.py:216
+#: ../meld/meldapp.py:245
 msgid "Open a new tab in an already running instance"
 msgstr "Ireki beste fitxa bat dagoeneko martxan dagoen instantzia batean"
 
-#: ../meld/meldapp.py:219
+#: ../meld/meldapp.py:248
 msgid "Automatically compare all differing files on startup"
 msgstr "Automatikoki konparatu fitxategi desberdin guztiak abioan"
 
-#: ../meld/meldapp.py:222
+#: ../meld/meldapp.py:251
 msgid "Ignored for compatibility"
 msgstr "Ez ikusi egin zaio, bateragarritasuna dela eta"
 
-#: ../meld/meldapp.py:226
+#: ../meld/meldapp.py:255
 msgid "Set the target file for saving a merge result"
 msgstr "Ezarri helburuko fitxategia emaitza konbinatua gordetzeko"
 
-#: ../meld/meldapp.py:229
+#: ../meld/meldapp.py:258
 msgid "Automatically merge files"
 msgstr "Automatikoki konbinatu fitxategiak"
 
-#: ../meld/meldapp.py:233
+#: ../meld/meldapp.py:262
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "Kargatu gordetako konparazioa Meld-en konparazio-fitxategi batetik"
 
-#: ../meld/meldapp.py:237
+#: ../meld/meldapp.py:266
 msgid "Create a diff tab for the supplied files or folders"
 msgstr "Sortu diferentzia-fitxa emandako fitxategi edo karpetentzako"
 
-#: ../meld/meldapp.py:249
+#: ../meld/meldapp.py:286
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "argumentu gehiegi (0-3 ordez, %d jasota)"
 
-#: ../meld/meldapp.py:252
+#: ../meld/meldapp.py:289
 msgid "can't auto-merge less than 3 files"
 msgstr "ezin dira automatikoki konbinatu 3 fitxategi baino gutxiago"
 
-#: ../meld/meldapp.py:254
+#: ../meld/meldapp.py:291
 msgid "can't auto-merge directories"
 msgstr "ezin dira automatikoki konbinatu direktorioak"
 
-#: ../meld/meldapp.py:264
+#: ../meld/meldapp.py:305
 msgid "Error reading saved comparison file"
 msgstr "Errorea gertatu da gordetako konparazio-fitxategia irakurtzean"
 
+#: ../meld/meldapp.py:332
+#, python-format
+msgid "invalid path or URI \"%s\""
+msgstr "“%s“ bide-izen edo URI baliogabea"
+
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:131
+#: ../meld/meldbuffer.py:132
 msgid "<unnamed>"
 msgstr "<izenik gabea>"
 
-#: ../meld/melddoc.py:76 ../meld/melddoc.py:77
+#: ../meld/melddoc.py:83 ../meld/melddoc.py:84
 msgid "untitled"
 msgstr "izengabea"
 
-#: ../meld/meldwindow.py:48
+#: ../meld/meldwindow.py:49
 msgid "_File"
 msgstr "_Fitxategia"
 
-#: ../meld/meldwindow.py:49
+#: ../meld/meldwindow.py:50
 msgid "_New Comparison..."
 msgstr "Konparazio _berria..."
 
-#: ../meld/meldwindow.py:50
+#: ../meld/meldwindow.py:51
 msgid "Start a new comparison"
 msgstr "Konparazio berri bat hasten du"
 
-#: ../meld/meldwindow.py:53
+#: ../meld/meldwindow.py:54
 msgid "Save the current file"
 msgstr "Gorde uneko fitxategia"
 
-#: ../meld/meldwindow.py:55
+#: ../meld/meldwindow.py:56
 msgid "Save As..."
 msgstr "Gorde honela..."
 
-#: ../meld/meldwindow.py:56
+#: ../meld/meldwindow.py:57
 msgid "Save the current file with a different name"
 msgstr "Gorde uneko fitxategia beste izen batekin"
 
-#: ../meld/meldwindow.py:59
+#: ../meld/meldwindow.py:60
 msgid "Close the current file"
 msgstr "Itxi uneko fitxategia"
 
-#: ../meld/meldwindow.py:62
+#: ../meld/meldwindow.py:63
 msgid "_Edit"
 msgstr "_Editatu"
 
-#: ../meld/meldwindow.py:64
+#: ../meld/meldwindow.py:65
 msgid "Undo the last action"
 msgstr "Desegin azken ekintza"
 
-#: ../meld/meldwindow.py:67
+#: ../meld/meldwindow.py:68
 msgid "Redo the last undone action"
 msgstr "Berregin desegindako azken ekintza"
 
-#: ../meld/meldwindow.py:69
+#: ../meld/meldwindow.py:70
 msgid "Cut the selection"
 msgstr "Ebaki hautapena"
 
-#: ../meld/meldwindow.py:71
+#: ../meld/meldwindow.py:72
 msgid "Copy the selection"
 msgstr "Kopiatu hautapena"
 
-#: ../meld/meldwindow.py:73
+#: ../meld/meldwindow.py:74
 msgid "Paste the clipboard"
 msgstr "Itsatsi arbelean"
 
-#: ../meld/meldwindow.py:75
+#: ../meld/meldwindow.py:76
 msgid "Find..."
 msgstr "Bilatu..."
 
-#: ../meld/meldwindow.py:75
+#: ../meld/meldwindow.py:76
 msgid "Search for text"
 msgstr "Bilatu testua"
 
-#: ../meld/meldwindow.py:77
+#: ../meld/meldwindow.py:78
 msgid "Find Ne_xt"
 msgstr "Bilatu _hurrengoa"
 
-#: ../meld/meldwindow.py:78
+#: ../meld/meldwindow.py:79
 msgid "Search forwards for the same text"
 msgstr "Testu bera bilatzen du berriro, aurrerantz"
 
-#: ../meld/meldwindow.py:80
+#: ../meld/meldwindow.py:81
 msgid "Find _Previous"
 msgstr "Bilatu _aurrekoa"
 
-#: ../meld/meldwindow.py:81
+#: ../meld/meldwindow.py:82
 msgid "Search backwards for the same text"
 msgstr "Testu bera bilatzen du berriro, atzerantz"
 
-#: ../meld/meldwindow.py:84
+#: ../meld/meldwindow.py:85
 msgid "_Replace..."
 msgstr "_Ordeztu..."
 
-#: ../meld/meldwindow.py:85
+#: ../meld/meldwindow.py:86
 msgid "Find and replace text"
 msgstr "Bilatu eta ordeztu testua"
 
-#: ../meld/meldwindow.py:88
+#: ../meld/meldwindow.py:89
 msgid "_Changes"
 msgstr "_Aldaketak"
 
-#: ../meld/meldwindow.py:89
+#: ../meld/meldwindow.py:90
 msgid "Next Change"
 msgstr "Hurrengo aldaketa"
 
-#: ../meld/meldwindow.py:90
+#: ../meld/meldwindow.py:91
 msgid "Go to the next change"
 msgstr "Hurrengo aldaketara joaten da"
 
-#: ../meld/meldwindow.py:92
+#: ../meld/meldwindow.py:93
 msgid "Previous Change"
 msgstr "Aurreko aldaketa"
 
-#: ../meld/meldwindow.py:93
+#: ../meld/meldwindow.py:94
 msgid "Go to the previous change"
 msgstr "Aurreko aldaketara joaten da"
 
-#: ../meld/meldwindow.py:95
+#: ../meld/meldwindow.py:96
 msgid "Open Externally"
 msgstr "Ireki kanpotik"
 
-#: ../meld/meldwindow.py:96
+#: ../meld/meldwindow.py:97
 msgid "Open selected file or directory in the default external application"
 msgstr ""
 "Hautatutako fitxategia edo direktorioa irekitzen du kanpoko aplikazio "
 "lehenetsian"
 
-#: ../meld/meldwindow.py:100
+#: ../meld/meldwindow.py:101
 msgid "_View"
 msgstr "_Ikusi"
 
-#: ../meld/meldwindow.py:101
+#: ../meld/meldwindow.py:102
 msgid "File Status"
 msgstr "Fitxategiaren egoera"
 
-#: ../meld/meldwindow.py:102
+#: ../meld/meldwindow.py:103
 msgid "Version Status"
 msgstr "Bertsioaren egoera"
 
-#: ../meld/meldwindow.py:105
+#: ../meld/meldwindow.py:106
 msgid "Stop the current action"
 msgstr "Gelditu uneko ekintza"
 
-#: ../meld/meldwindow.py:108
+#: ../meld/meldwindow.py:109
 msgid "Refresh the view"
 msgstr "Freskatu ikuspegia"
 
-#: ../meld/meldwindow.py:111
+#: ../meld/meldwindow.py:112
 msgid "_Tabs"
 msgstr "_Fitxak"
 
-#: ../meld/meldwindow.py:112
+#: ../meld/meldwindow.py:113
 msgid "_Previous Tab"
 msgstr "_Aurreko fitxa"
 
-#: ../meld/meldwindow.py:113
+#: ../meld/meldwindow.py:114
 msgid "Activate previous tab"
 msgstr "Aurreko fitxa aktibatzen du"
 
-#: ../meld/meldwindow.py:115
+#: ../meld/meldwindow.py:116
 msgid "_Next Tab"
 msgstr "_Hurrengo fitxa"
 
-#: ../meld/meldwindow.py:116
+#: ../meld/meldwindow.py:117
 msgid "Activate next tab"
 msgstr "Hurrengo fitxa aktibatzen du"
 
-#: ../meld/meldwindow.py:119
+#: ../meld/meldwindow.py:120
 msgid "Move Tab _Left"
 msgstr "Eraman fitxa e_zkerrera"
 
-#: ../meld/meldwindow.py:120
+#: ../meld/meldwindow.py:121
 msgid "Move current tab to left"
 msgstr "Uneko fitxa ezkerrera eramaten du"
 
-#: ../meld/meldwindow.py:123
+#: ../meld/meldwindow.py:124
 msgid "Move Tab _Right"
 msgstr "Eraman fitxa e_skuinera"
 
-#: ../meld/meldwindow.py:124
+#: ../meld/meldwindow.py:125
 msgid "Move current tab to right"
 msgstr "Uneko fitxa eskuinera eramaten du"
 
-#: ../meld/meldwindow.py:128
+#: ../meld/meldwindow.py:129
 msgid "Fullscreen"
 msgstr "Pantaila osoa"
 
-#: ../meld/meldwindow.py:129
+#: ../meld/meldwindow.py:130
 msgid "View the comparison in fullscreen"
 msgstr "Ikusi konparazioa pantaila osoan"
 
-#: ../meld/meldwindow.py:131
+#: ../meld/meldwindow.py:132
 msgid "_Toolbar"
 msgstr "_Tresna-barra"
 
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:133
 msgid "Show or hide the toolbar"
 msgstr "Erakutsi edo ezkutatu tresna-barra"
 
-#: ../meld/meldwindow.py:141
+#: ../meld/meldwindow.py:143
 msgid "Open Recent"
 msgstr "Ireki azkenak"
 
-#: ../meld/meldwindow.py:142
+#: ../meld/meldwindow.py:144
 msgid "Open recent files"
 msgstr "Azken erabilitako fitxategiak irekitzen ditu"
 
-#: ../meld/meldwindow.py:506
+#: ../meld/meldwindow.py:166
+#| msgid "Meld"
+msgid "_Meld"
+msgstr "_Meld"
+
+#: ../meld/meldwindow.py:167
+msgid "Quit the program"
+msgstr "Irten programatik"
+
+#: ../meld/meldwindow.py:169
+#| msgid "_Preferences"
+msgid "Prefere_nces"
+msgstr "_Hobespenak"
+
+#: ../meld/meldwindow.py:170
+msgid "Configure the application"
+msgstr "Aplikazioa konfiguratzen du"
+
+#: ../meld/meldwindow.py:172
+msgid "_Contents"
+msgstr "_Edukia"
+
+#: ../meld/meldwindow.py:173
+msgid "Open the Meld manual"
+msgstr "Meld-en eskuliburua irekitzen du"
+
+#: ../meld/meldwindow.py:175
+#| msgid "Configure the application"
+msgid "About this application"
+msgstr "Aplikazio honi buruz"
+
+#: ../meld/meldwindow.py:587
 msgid "Switch to this tab"
 msgstr "Joan fitxa honetara"
 
-#: ../meld/meldwindow.py:629
+#: ../meld/meldwindow.py:702
+#, python-format
+msgid "Need three files to auto-merge, got: %r"
+msgstr "Hiru fitxategi behar dira automatikoki batzeko, hau dauka: %r"
+
+#: ../meld/meldwindow.py:716
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Ezin dira konparatu fitxategiak eta direktorioak nahasian"
 
+#: ../meld/misc.py:203
+#, python-format
+msgid "Couldn't find colour scheme details for %s-%s; this is a bad install"
+msgstr ""
+"Ezin izan da %s-%s(r)en kolore-eskemaren xehetasunak aurkitu. Instalazio "
+"txarra da"
+
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:213
+#: ../meld/misc.py:288
 msgid "[None]"
 msgstr "[Bat ere ez]"
 
@@ -1938,212 +2489,292 @@ msgstr "etiketa"
 msgid "pattern"
 msgstr "eredua"
 
-#: ../meld/recent.py:105
+#: ../meld/recent.py:115
 msgid "Version control:"
 msgstr "Bertsio-kontrola:"
 
-#: ../meld/ui/findbar.py:141
-msgid "Regular expression error"
-msgstr "Adierazpen erregularraren errorea"
-
-#: ../meld/ui/notebooklabel.py:65
+#: ../meld/ui/notebooklabel.py:63
 msgid "Close tab"
 msgstr "Itxi fitxa"
 
-#: ../meld/ui/vcdialogs.py:61
+#: ../meld/ui/vcdialogs.py:50
 msgid "No files will be committed"
 msgstr "Ez da fitxategirik egikarituko"
 
 #. Translators: First %s is replaced by translated "%d unpushed
 #. commits", second %s is replaced by translated "%d branches"
-#: ../meld/vc/git.py:126
+#: ../meld/vc/git.py:95
 #, python-format
 msgid "%s in %s"
 msgstr "%s (%s)"
 
 #. Translators: These messages cover the case where there is
 #. only one branch, and are not part of another message.
-#: ../meld/vc/git.py:127 ../meld/vc/git.py:134
+#: ../meld/vc/git.py:96 ../meld/vc/git.py:103
 #, python-format
 msgid "%d unpushed commit"
 msgid_plural "%d unpushed commits"
 msgstr[0] "Bidali gabeko egikaritze %d"
 msgstr[1] "Bidali gabeko %d egikaritze"
 
-#: ../meld/vc/git.py:129
+#: ../meld/vc/git.py:98
 #, python-format
 msgid "%d branch"
 msgid_plural "%d branches"
 msgstr[0] "adar %d"
 msgstr[1] "%d adar"
 
-#: ../meld/vc/git.py:348
+#: ../meld/vc/git.py:352
 #, python-format
 msgid "Mode changed from %s to %s"
 msgstr "'%s' modua hona aldatuta: %s"
 
-#: ../meld/vc/_vc.py:47
+#: ../meld/vc/git.py:360
+msgid "Partially staged"
+msgstr "Partzialki aurre-hautatuta"
+
+#: ../meld/vc/git.py:360
+msgid "Staged"
+msgstr "Aurre-hautatuta"
+
+#. Translators: This is the displayed name of a version control system
+#. when no version control system is actually found.
+#: ../meld/vc/_null.py:38
+msgid "None"
+msgstr "Bat ere ez"
+
+#: ../meld/vc/svn.py:216
+#, python-format
+msgid "Rev %s"
+msgstr "%s arg."
+
+#: ../meld/vc/_vc.py:52
 msgid "Merged"
 msgstr "Batuta"
 
-#: ../meld/vc/_vc.py:47
+#: ../meld/vc/_vc.py:52
 msgid "Base"
 msgstr "Oinarria"
 
-#: ../meld/vc/_vc.py:47
+#: ../meld/vc/_vc.py:52
 msgid "Local"
 msgstr "Lokala"
 
-#: ../meld/vc/_vc.py:47
+#: ../meld/vc/_vc.py:52
 msgid "Remote"
 msgstr "Urrunekoa"
 
-#: ../meld/vc/_vc.py:65
+#: ../meld/vc/_vc.py:68
 msgid "Unversioned"
 msgstr "Bertsiorik gabekoa"
 
-#: ../meld/vc/_vc.py:68
+#: ../meld/vc/_vc.py:71
 msgid "Error"
 msgstr "Errorea"
 
-#: ../meld/vc/_vc.py:70
+#: ../meld/vc/_vc.py:73
 msgid "Newly added"
 msgstr "Berriki gehituta"
 
-#: ../meld/vc/_vc.py:72
+#: ../meld/vc/_vc.py:75
+#| msgid "<unnamed>"
+msgid "Renamed"
+msgstr "Izenez aldatua"
+
+#: ../meld/vc/_vc.py:76
 msgid "Conflict"
 msgstr "Gatazka"
 
-#: ../meld/vc/_vc.py:73
+#: ../meld/vc/_vc.py:77
 msgid "Removed"
 msgstr "Kenduta"
 
-#: ../meld/vc/_vc.py:74
+#: ../meld/vc/_vc.py:78
 msgid "Missing"
 msgstr "Falta da"
 
-#: ../meld/vc/_vc.py:75
+#: ../meld/vc/_vc.py:79
 msgid "Not present"
 msgstr "Ez dago"
 
-#: ../meld/vcview.py:233 ../meld/vcview.py:413
-msgid "Location"
-msgstr "Kokapena"
-
-#: ../meld/vcview.py:234
-msgid "Status"
-msgstr "Egoera"
-
-#: ../meld/vcview.py:235
-msgid "Revision"
-msgstr "Berrikuspena"
-
-#: ../meld/vcview.py:236
-msgid "Options"
-msgstr "Aukerak"
-
-#. TRANSLATORS: this is an error message when a version control
-#. application isn't installed or can't be found
-#: ../meld/vcview.py:324
+#. Translators: This error message is shown when a version
+#. control binary isn't installed.
+#: ../meld/vcview.py:261
 #, python-format
-msgid "%s not installed"
-msgstr "'%s' ez dago instalatua"
-
-#. TRANSLATORS: this is an error message when a version
-#. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:328
-msgid "Invalid repository"
-msgstr "Baliogabeko biltegia"
+#| msgid "%s not installed"
+msgid "%(name)s (%(cmd)s not installed)"
+msgstr "%(name)s (%(cmd)s ez dago instalatuta)"
 
-#: ../meld/vcview.py:337
+#. Translators: This error message is shown when a version
+#. controlled repository is invalid.
+#: ../meld/vcview.py:265
 #, python-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
-
-#: ../meld/vcview.py:339 ../meld/vcview.py:347
-msgid "None"
-msgstr "Bat ere ez"
+#| msgid "Invalid repository"
+msgid "%(name)s (Invalid repository)"
+msgstr "%(name)s (baliogabeko biltegia)"
 
-#: ../meld/vcview.py:358
+#: ../meld/vcview.py:286
 msgid "No valid version control system found in this folder"
 msgstr "Ez da baliozko bertsio-kontrol sistemarik aurkitu karpeta honetan"
 
-#: ../meld/vcview.py:360
+#: ../meld/vcview.py:288
 msgid "Only one version control system found in this folder"
 msgstr "Bertsio-kontrol bakar bat aurkituta karpeta honetan"
 
-#: ../meld/vcview.py:362
+#: ../meld/vcview.py:290
 msgid "Choose which version control system to use"
 msgstr "Aukeratu zer bertsio-kontrol sistema erabiliko den"
 
-#. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:413
+#. TRANSLATORS: This is the location of the directory being viewed
+#: ../meld/vcview.py:343
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:427 ../meld/vcview.py:435
+#: ../meld/vcview.py:363
 #, python-format
 msgid "Scanning %s"
 msgstr "%s eskaneatzen"
 
-#: ../meld/vcview.py:470
+#: ../meld/vcview.py:402
 msgid "(Empty)"
 msgstr "(hutsik)"
 
-#: ../meld/vcview.py:510
+#: ../meld/vcview.py:446
 #, python-format
 msgid "%s — local"
 msgstr "%s — lokala"
 
-#: ../meld/vcview.py:511
+#: ../meld/vcview.py:447
 #, python-format
 msgid "%s — remote"
 msgstr "%s — urrunekoa"
 
-#: ../meld/vcview.py:519
+#: ../meld/vcview.py:455
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (lokala, batu, urrunekoa)"
 
-#: ../meld/vcview.py:524
+#: ../meld/vcview.py:460
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (urrunekoa, batu, lokala)"
 
-#: ../meld/vcview.py:535
+#: ../meld/vcview.py:471
 #, python-format
 msgid "%s — repository"
 msgstr "%s — biltegia"
 
-#: ../meld/vcview.py:541
+#: ../meld/vcview.py:477
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (lanekoa, biltegia)"
 
-#: ../meld/vcview.py:545
+#: ../meld/vcview.py:481
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (biltegia, lanekoa)"
 
-#: ../meld/vcview.py:729
+#: ../meld/vcview.py:649
 msgid "Remove folder and all its files?"
 msgstr "Kendu karpeta eta bere fitxategi guztiak?"
 
-#: ../meld/vcview.py:731
+#: ../meld/vcview.py:651
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
 msgstr ""
-"Honek hautatutako fitxategi eta karpeta guztiak, baita "
-"hautatutako karpeten barruan dauden fitxategi guztiak ere, "
-"bertsio-kontroletik kenduko ditu."
+"Honek hautatutako fitxategi eta karpeta guztiak, baita hautatutako karpeten "
+"barruan dauden fitxategi guztiak ere, bertsio-kontroletik kenduko ditu."
 
-#: ../meld/vcview.py:765
+#: ../meld/vcview.py:676
 #, python-format
 msgid "Error removing %s"
 msgstr "Errorea %s kentzean"
 
+#: ../meld/vcview.py:756
+msgid "Clear"
+msgstr "Garbitu"
+
+#~ msgid ""
+#~ "These text encodings will be automatically used (in order) to try to "
+#~ "decode loaded text files."
+#~ msgstr ""
+#~ "Testu-kodeketa hauek automatikoki erabiliko dira kargatutako testu-"
+#~ "fitxategiak deskodetzen saiatzeko."
+
+#~ msgid "Copy _Left"
+#~ msgstr "Kopiatu e_zkerrean"
+
+#~ msgid "Copy _Right"
+#~ msgstr "Kopiatu e_skuinean"
+
+#~ msgid "Ignore changes which insert or delete blank lines"
+#~ msgstr ""
+#~ "Ez ikusi egin lerro zurriak txertatzen edo ezabatzen dituzten aldaketei"
+
+#~ msgid ""
+#~ "'%s' exists.\n"
+#~ "Overwrite?"
+#~ msgstr ""
+#~ "'%s' badago lehendik ere.\n"
+#~ "Gainidatzi?"
+
+#~ msgid "Clear manual change sychronization points"
+#~ msgstr "Garbitu eskuzko aldaketen sinkronizazio-puntuak"
+
+#~ msgid "Cycle Through Documents"
+#~ msgstr "Begiztatu dokumentuen artean"
+
+#~ msgid "[%s] Set num panes"
+#~ msgstr "[%s] Ezarri panel kopurua"
+
+#~ msgid "[%s] Opening files"
+#~ msgstr "[%s] Fitxategiak irekitzen"
+
+#~ msgid "[%s] Reading files"
+#~ msgstr "[%s] Fitxategiak irakurtzen"
+
+#~ msgid "%s is not in encodings: %s"
+#~ msgstr "%s ez dago kodeketetan: %s"
+
+#~ msgid ""
+#~ "\"%s\" exists!\n"
+#~ "Overwrite?"
+#~ msgstr ""
+#~ "'%s' badago!\n"
+#~ "Gainidatzi?"
+
+#~ msgid ""
+#~ "Error writing to %s\n"
+#~ "\n"
+#~ "%s."
+#~ msgstr ""
+#~ "Errorea gertatu da '%s'(e)n idaztean\n"
+#~ "\n"
+#~ "%s."
+
+#~ msgid ""
+#~ "This file '%s' contains a mixture of line endings.\n"
+#~ "\n"
+#~ "Which format would you like to use?"
+#~ msgstr ""
+#~ "'%s' fitxategiak askotariko lerro-amaierak ditu.\n"
+#~ "\n"
+#~ "Zer formatu erabili nahi duzu?"
+
+#~ msgid "Regular expression error"
+#~ msgstr "Adierazpen erregularraren errorea"
+
+#~ msgid "Revision"
+#~ msgstr "Berrikuspena"
+
+#~ msgid "Options"
+#~ msgstr "Aukerak"
+
+#~ msgid "%s (%s)"
+#~ msgstr "%s (%s)"
+
 #~ msgid ""
 #~ "Meld is free software: you can redistribute it and/or modify it under the "
 #~ "terms of the GNU General Public License as published by the Free Software "
@@ -2253,21 +2884,9 @@ msgstr "Errorea %s kentzean"
 #~ msgid "D-Bus error; comparisons will open in a new window."
 #~ msgstr "D-Bus errorea; konparazioak beste leiho batean irekiko dira."
 
-#~ msgid "Quit the program"
-#~ msgstr "Irten programatik"
-
-#~ msgid "Configure the application"
-#~ msgstr "Aplikazioa konfiguratzen du"
-
 #~ msgid "Reload the comparison"
 #~ msgstr "Konparazioa birkargatzen du"
 
-#~ msgid "_Contents"
-#~ msgstr "_Edukia"
-
-#~ msgid "Open the Meld manual"
-#~ msgstr "Meld-en eskuliburua irekitzen du"
-
 #~ msgid "Report _Bug"
 #~ msgstr "Akatsaren _berri eman"
 
@@ -2341,9 +2960,6 @@ msgstr "Errorea %s kentzean"
 #~ msgid "Tag"
 #~ msgstr "Etiketa"
 
-#~ msgid "[%s] Fetching differences"
-#~ msgstr "[%s] Diferentziak bilatzen"
-
 #~ msgid "[%s] Applying patch"
 #~ msgstr "[%s] Adabakia aplikatzen"
 

From 628f2bb0b8b4c6da9d200877f65a6935a6759a1c Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sun, 10 Jul 2016 09:44:14 +1000
Subject: [PATCH 51/51] meldbuffer: Don't update recorded disk mtime for
 errors/missing files

Most commonly this is an issue where a file notification event happens
for a deleted file that is then replaced by an external program. In
this case we don't want to invalidate our recorded on-disk mtime
because it's still the last valid time we saw for this file.
---
 meld/meldbuffer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meld/meldbuffer.py b/meld/meldbuffer.py
index 0e7a9356..df83f96d 100644
--- a/meld/meldbuffer.py
+++ b/meld/meldbuffer.py
@@ -167,7 +167,7 @@ def _handle_file_change(self, monitor, f, other_file, event_type):
         mtime = self._query_mtime(f)
         if self._disk_mtime and mtime > self._disk_mtime:
             self.emit('file-changed')
-        self._disk_mtime = mtime
+        self._disk_mtime = mtime or self._disk_mtime
 
     @property
     def gfile(self):