From 667261bbcfe883d1469c4b936e047ffd448bcde9 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sat, 1 Aug 2015 07:23:04 +1000
Subject: [PATCH 01/44] filediff: Fix incorrect signature for merge-all
 callback (bgo#753097)

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

diff --git a/meld/filediff.py b/meld/filediff.py
index 8f866b4e..787c9899 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -640,7 +640,7 @@ def action_pull_all_changes_right(self, *args):
         src, dst = self.get_action_panes(PANE_RIGHT, reverse=True)
         self.pull_all_non_conflicting_changes(src, dst)
 
-    def merge_all_non_conflicting_changes(self):
+    def merge_all_non_conflicting_changes(self, *args):
         dst = 1
         merger = merge.Merger()
         merger.differ = self.linediffer

From d59b0a86fdd87d996e0e5c06a34a9f87744902bb Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sat, 1 Aug 2015 07:32:44 +1000
Subject: [PATCH 02/44] dirdiff: Clear out message areas on refresh
 (bgo#752936)

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

diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 68c98a92..01ac6039 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -652,6 +652,8 @@ def set_locations(self, locations):
         locations = [os.path.abspath(l) if l else '' for l in locations]
         self.current_path = None
         self.model.clear()
+        for m in self.msgarea_mgr:
+            m.clear()
         for pane, loc in enumerate(locations):
             if loc:
                 self.fileentry[pane].set_filename(loc)

From bc024a291d98000d6e8c4ff118896459f880ba30 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Wed, 12 Aug 2015 07:38:27 +1000
Subject: [PATCH 03/44] gschema: Fix regex escaping for SVN keyword filter

Thanks to Stead Kiger for the suggested change.
---
 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 c625b23a..24c6c5cb 100644
--- a/data/org.gnome.meld.gschema.xml
+++ b/data/org.gnome.meld.gschema.xml
@@ -231,7 +231,7 @@
       <key name="text-filters" type="a(sbs)">
           <default>
             [
-              ("CVS/SVN keywords", false, "\$\\w+(:[^\\n$]+)?\$"),
+              ("CVS/SVN keywords", false, "\\$\\w+(:[^\\n$]+)?\\$"),
               ("C++ comment", false, "//.*"),
               ("C comment", false, "/\\*.*?\\*/"),
               ("All whitespace", false, "[ \\t\\r\\f\\v]*"),

From 0f51f387226f5bca8b7bf496eacd07f4af5d601e Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Wed, 12 Aug 2015 11:12:56 +1000
Subject: [PATCH 04/44] filediff: Use locale-based default encodings
 (bgo#752307, bgo#753427)

Taking some inspiration from GtkSourceViewLoader, this patch changes
our list of encodings-to-try when loading files to follow a set
pattern.

While this is a behaviour change, it's basically just adding the
locale-specific charset and UTF-16 to the list to be loaded; it's
unlikely that the latin-1 -> iso-8859-15 is going to do anything but
load more files correctly.

The default list of encodings in our schema is left as ["utf8"], so
that if users add things to this list, there is at least a reasonable
hint that they should add then *after* UTF-8 to preserve sane loading.
---
 meld/filediff.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/meld/filediff.py b/meld/filediff.py
index 787c9899..9ff8e81a 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -16,6 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import codecs
 import copy
 import functools
 import io
@@ -1107,8 +1108,14 @@ def _load_files(self, files, textbuffers):
         self._disconnect_buffer_handlers()
         self.linediffer.clear()
         self.queue_draw()
-        try_codecs = list(settings.get_value('detect-encodings'))
-        try_codecs.append('latin1')
+
+        # Build and uniquify a list of encodings to try out
+        extras = list(settings.get_value('detect-encodings'))
+        builtin = ['utf-8', GLib.get_codeset(), 'utf-16le', 'iso8859-15']
+        allencs = [codecs.lookup(c).name for c in extras + builtin]
+        seen = set()
+        try_codecs = [c for c in allencs if c not in seen and not seen.add(c)]
+
         yield _("[%s] Opening files") % self.label_text
         tasks = []
 

From 06164e0dfcc8e2df81efa5dc40a19494e18307b2 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sat, 22 Aug 2015 08:41:56 +1000
Subject: [PATCH 05/44] dirdiff: Improve float accuracy in timestamp resolution
 (bgo#753753)

The str() call was causing us to truncate nanosecond-accuracy digits,
but was only in place for Python 2.6 compatibility, which isn't a thing
we care about any more.
---
 meld/dirdiff.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 01ac6039..d34c95da 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -71,8 +71,8 @@ def shallow_equal(self, other, time_resolution_ns):
         if abs(self.time - other.time) > 2:
             return False
 
-        dectime1 = Decimal(str(self.time)).scaleb(Decimal(9)).quantize(1)
-        dectime2 = Decimal(str(other.time)).scaleb(Decimal(9)).quantize(1)
+        dectime1 = Decimal(self.time).scaleb(Decimal(9)).quantize(1)
+        dectime2 = Decimal(other.time).scaleb(Decimal(9)).quantize(1)
         mtime1 = dectime1 // time_resolution_ns
         mtime2 = dectime2 // time_resolution_ns
 

From 00ee7c465e353ca4a2a6e0b2f7b7e83aeceac4ba Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sun, 23 Aug 2015 09:51:15 +1000
Subject: [PATCH 06/44] meldapp: Monkey-patch optparse's gettext alias for
 ugettext compat

Meld uses and assumes ugettext for our translations, and this doesn't
interact well with optparse's use of gettext, when it tries to mash
together its bytestring translations with our unicode translations.

While this is an ugly hack, the only other simple option is not using
optparse, which is a longer-term goal but much too invasive for a
quick fix.
---
 meld/meldapp.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meld/meldapp.py b/meld/meldapp.py
index 153783ac..8fd11c99 100644
--- a/meld/meldapp.py
+++ b/meld/meldapp.py
@@ -34,6 +34,12 @@
 
 log = logging.getLogger(__name__)
 
+# Monkeypatching optparse like this is obviously awful, but this is to
+# handle Unicode translated strings within optparse itself that will
+# otherwise crash badly. This just makes optparse use our ugettext
+# import of _, rather than the non-unicode gettext.
+optparse._ = _
+
 
 class MeldApp(Gtk.Application):
 

From 6870d73a6439c6440684285148ab384bea2130a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Dr=C4=85g?= <piotrdrag@gmail.com>
Date: Fri, 4 Sep 2015 00:31:43 +0200
Subject: [PATCH 07/44] Updated Polish translation

---
 po/pl.po | 353 +++++++++++++++++++++++++++----------------------------
 1 file changed, 176 insertions(+), 177 deletions(-)

diff --git a/po/pl.po b/po/pl.po
index ee74128b..a0fb4393 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: 2015-02-15 18:44+0100\n"
-"PO-Revision-Date: 2015-02-15 18:47+0100\n"
+"POT-Creation-Date: 2015-09-04 00:30+0200\n"
+"PO-Revision-Date: 2015-09-04 00:31+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <gnomepl@aviary.pl>\n"
 "Language: pl\n"
@@ -101,7 +101,7 @@ msgstr "Wyświetlanie paska narzędziowego"
 
 #: ../data/org.gnome.meld.gschema.xml.h:4
 msgid "If true, the window toolbar is visible."
-msgstr "Jeśli wynosi \"true\", to pasek narzędziowy okna jest widoczny."
+msgstr "Jeśli wynosi „true”, to pasek narzędziowy okna jest widoczny."
 
 #: ../data/org.gnome.meld.gschema.xml.h:5
 msgid "Show statusbar"
@@ -109,7 +109,7 @@ msgstr "Wyświetlanie paska stanu"
 
 #: ../data/org.gnome.meld.gschema.xml.h:6
 msgid "If true, the window statusbar is visible."
-msgstr "Jeśli wynosi \"true\", to pasek stanu okna jest widoczny."
+msgstr "Jeśli wynosi „true”, to pasek stanu okna jest widoczny."
 
 #: ../data/org.gnome.meld.gschema.xml.h:7
 msgid "Automatically detected text encodings"
@@ -138,7 +138,7 @@ msgstr "Określa, czy wcięcia używają spacji, czy tabulatorów"
 #: ../data/org.gnome.meld.gschema.xml.h:12
 msgid "If true, any new indentation will use spaces instead of tabs."
 msgstr ""
-"Jeśli wynosi \"true\", to każde nowe wcięcie będzie używało spacji zamiast "
+"Jeśli wynosi „true”, to każde nowe wcięcie będzie używało spacji zamiast "
 "tabulatorów."
 
 #: ../data/org.gnome.meld.gschema.xml.h:13
@@ -148,8 +148,7 @@ msgstr "Wyświetlanie numerów wierszy"
 #: ../data/org.gnome.meld.gschema.xml.h:14
 msgid "If true, line numbers will be shown in the gutter of file comparisons."
 msgstr ""
-"Jeśli wynosi \"true\", to numery wierszy będą wyświetlane obok porównań "
-"plików."
+"Jeśli wynosi „true”, to numery wierszy będą wyświetlane obok porównań plików."
 
 #: ../data/org.gnome.meld.gschema.xml.h:15
 msgid "Highlight syntax"
@@ -183,7 +182,7 @@ msgid ""
 "values are 'space', 'tab', 'newline' and 'nbsp'."
 msgstr ""
 "Wybór poszczególnych typów białych znaków do wyświetlania. Możliwe wartości: "
-"\"space\", \"tab\", \"newline\" i \"nbsp\"."
+"„space”, „tab”, „newline” i „nbsp”."
 
 #: ../data/org.gnome.meld.gschema.xml.h:21
 msgid "Wrap mode"
@@ -196,8 +195,8 @@ msgid ""
 "('word')."
 msgstr ""
 "Wiersze w porównaniach plików będą zawijane według tego ustawienia. Możliwe "
-"wartości: \"none\" (brak zawijania), \"char\" (na dowolnym znaku) lub \"word"
-"\" (tylko na końcu wyrazów)."
+"wartości: „none” (brak zawijania), „char” (na dowolnym znaku) lub "
+"„word” (tylko na końcu wyrazów)."
 
 #: ../data/org.gnome.meld.gschema.xml.h:23
 msgid "Highlight current line"
@@ -208,7 +207,7 @@ msgid ""
 "If true, the line containing the cursor will be highlighted in file "
 "comparisons."
 msgstr ""
-"Jeśli wynosi \"true\", to wiersz zawierający kursor będzie wyróżniany w "
+"Jeśli wynosi „true”, to wiersz zawierający kursor będzie wyróżniany w "
 "porównaniach plików."
 
 #: ../data/org.gnome.meld.gschema.xml.h:25
@@ -219,7 +218,7 @@ msgstr "Używanie domyślnej systemowej czcionki o stałej szerokości"
 msgid ""
 "If false, custom-font will be used instead of the system monospace font."
 msgstr ""
-"Jeśli wynosi \"false\", to podana własna czcionka w \"custom-font\" będzie "
+"Jeśli wynosi „false”, to podana własna czcionka w „custom-font” będzie "
 "używana zamiast systemowej czcionki o stałej szerokości."
 
 #: ../data/org.gnome.meld.gschema.xml.h:27
@@ -242,7 +241,7 @@ msgstr "Ignorowanie pustych wierszy podczas porównywania plików"
 msgid ""
 "If true, blank lines will be trimmed when highlighting changes between files."
 msgstr ""
-"Jeśli wynosi \"true\", to puste wiersze będą obcinane podczas wyróżniania "
+"Jeśli wynosi „true”, to puste wiersze będą obcinane podczas wyróżniania "
 "zmian między plikami."
 
 #: ../data/org.gnome.meld.gschema.xml.h:31
@@ -254,7 +253,7 @@ msgid ""
 "If false, custom-editor-command will be used instead of the system editor "
 "when opening files externally."
 msgstr ""
-"Jeśli wynosi \"false\", to podany własny edytor w \"custom-editor-command\" "
+"Jeśli wynosi „false”, to podany własny edytor w „custom-editor-command” "
 "będzie używany zamiast systemowego edytora podczas zewnętrznego otwierania "
 "plików."
 
@@ -268,8 +267,8 @@ msgid ""
 "supported here; at the moment '{file}' and '{line}' are recognised tokens."
 msgstr ""
 "Polecenie używane do uruchamiania własnego edytora. Niektóre ograniczone "
-"szablony są obsługiwane. W tej chwili \"{file}\" i \"{line}\" są "
-"rozpoznawanymi tokenami."
+"szablony są obsługiwane. W tej chwili „{file}” i „{line}” są rozpoznawanymi "
+"tokenami."
 
 #: ../data/org.gnome.meld.gschema.xml.h:35
 msgid "Columns to display"
@@ -291,7 +290,7 @@ msgid ""
 "If true, folder comparisons do not follow symbolic links when traversing the "
 "folder tree."
 msgstr ""
-"Jeśli wynosi \"true\", to porównania katalogów nie będą podążały za "
+"Jeśli wynosi „true”, to porównania katalogów nie będą podążały za "
 "dowiązaniami symbolicznymi podczas przeglądania drzewa katalogów."
 
 #: ../data/org.gnome.meld.gschema.xml.h:39
@@ -304,7 +303,7 @@ msgid ""
 "considering files to be identical if their size and mtime match, and "
 "different otherwise."
 msgstr ""
-"Jeśli wynosi \"true\", to porównania katalogów będą porównywały pliki w "
+"Jeśli wynosi „true”, to porównania katalogów będą porównywały pliki w "
 "oparciu wyłącznie o rozmiar i czas modyfikacji. Pliki o identycznym "
 "rozmiarze i czasie modyfikacji będą uznawane za identyczne."
 
@@ -334,7 +333,7 @@ msgid ""
 "text filters and the blank line trimming option, and ignore newline "
 "differences."
 msgstr ""
-"Jeśli wynosi \"true\", to porównania katalogów, które porównują treść plików "
+"Jeśli wynosi „true”, to porównania katalogów, które porównują treść plików "
 "także zastosowują aktywne filtry tekstowe i opcję usuwania pustych wierszy, "
 "oraz ignorują różnice znaczników nowych wierszy."
 
@@ -357,9 +356,9 @@ msgid ""
 "If true, a console output section will be shown in version control views, "
 "showing the commands run for version control operations."
 msgstr ""
-"Jeśli wynosi \"true\", to sekcja wyjścia konsoli będzie wyświetlana w "
-"widokach kontroli wersji, wyświetlając polecenia wykonywane do działań "
-"kontroli wersji."
+"Jeśli wynosi „true”, to sekcja wyjścia konsoli będzie wyświetlana w widokach "
+"kontroli wersji, wyświetlając polecenia wykonywane do działań kontroli "
+"wersji."
 
 #: ../data/org.gnome.meld.gschema.xml.h:49
 msgid "Version control pane position"
@@ -383,7 +382,7 @@ msgid ""
 "remote scheme to determine what order to present files in panes. Otherwise, "
 "a left-is-theirs, right-is-mine scheme is used."
 msgstr ""
-"Jeśli wynosi \"true\", to porównania kontroli wersji będą używały schematu "
+"Jeśli wynosi „true”, to porównania kontroli wersji będą używały schematu "
 "lewy-jest-lokalny, prawy-jest-zdalny, aby ustalić kolejność wyświetlania "
 "plików w panelach. W przeciwnym wypadku używany będzie schemat lewo-jest-"
 "ich, prawo-jest-moje."
@@ -414,7 +413,7 @@ msgid ""
 "If true, a guide will be displayed to show what column the margin is at in "
 "the version control commit message editor."
 msgstr ""
-"Jeśli wynosi \"true\", to wyświetlana będzie linia oznaczająca kolumnę "
+"Jeśli wynosi „true”, to wyświetlana będzie linia oznaczająca kolumnę "
 "marginesu w edytorze komunikatów zatwierdzeń kontroli wersji."
 
 #: ../data/org.gnome.meld.gschema.xml.h:57
@@ -438,7 +437,7 @@ msgid ""
 "If true, the version control commit message editor will hard-wrap (i.e., "
 "insert line breaks) at the commit margin before commit."
 msgstr ""
-"Jeśli wynosi \"true\", to edytor komunikatów zatwierdzeń kontroli wersji "
+"Jeśli wynosi „true”, to edytor komunikatów zatwierdzeń kontroli wersji "
 "będzie twardo zawijał (tzn. wstawiał łamanie wierszy) na marginesie przed "
 "zatwierdzeniem."
 
@@ -546,7 +545,7 @@ msgstr "Kopiuje element na prawo"
 msgid "Delete selected"
 msgstr "Usuwa zaznaczone"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:876 ../meld/filediff.py:1460
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:881 ../meld/filediff.py:1470
 msgid "Hide"
 msgstr "Ukryj"
 
@@ -613,7 +612,7 @@ msgid "_Add"
 msgstr "_Dodaj"
 
 #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:747
+#: ../meld/vcview.py:762
 msgid "_Remove"
 msgstr "U_suń"
 
@@ -635,7 +634,7 @@ msgstr "Przesuń w _dół"
 
 #. Create icon and filename CellRenderer
 #: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:374
-#: ../meld/vcview.py:203
+#: ../meld/vcview.py:215
 msgid "Name"
 msgstr "Nazwa"
 
@@ -653,15 +652,15 @@ msgstr "Usuwa zaznaczony filtr"
 
 #: ../data/ui/filediff.ui.h:1
 msgid "Format as Patch..."
-msgstr "Utwórz poprawkę..."
+msgstr "Utwórz poprawkę…"
 
 #: ../data/ui/filediff.ui.h:2
 msgid "Create a patch using differences between files"
-msgstr "Tworzy plik poprawki (patch) na podstawie różnic między plikami"
+msgstr "Tworzy plik poprawki („patch”) na podstawie różnic między plikami"
 
 #: ../data/ui/filediff.ui.h:3
 msgid "Save A_ll"
-msgstr "_Zapisz wszystkie"
+msgstr "Z_apisz wszystkie"
 
 #: ../data/ui/filediff.ui.h:4
 msgid "Save all files in the current comparison"
@@ -836,14 +835,14 @@ msgstr ""
 msgid "Close _without Saving"
 msgstr "Zamknij _bez zapisywania"
 
-#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:967 ../meld/filediff.py:1629
-#: ../meld/filediff.py:1713 ../meld/filediff.py:1738
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:972 ../meld/filediff.py:1639
+#: ../meld/filediff.py:1723 ../meld/filediff.py:1748
 msgid "_Cancel"
 msgstr "_Anuluj"
 
 #: ../data/ui/filediff.ui.h:48
 msgid "_Save"
-msgstr "Zapi_sz"
+msgstr "_Zapisz"
 
 #: ../data/ui/filediff.ui.h:49
 msgid ""
@@ -874,7 +873,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:968 ../meld/filediff.py:1630
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:973 ../meld/filediff.py:1640
 msgid "_Replace"
 msgstr "Z_amień"
 
@@ -1088,7 +1087,7 @@ msgstr "Opisy zatwierdzeń"
 
 #: ../data/ui/preferences.ui.h:39
 msgid "Show _right margin at:"
-msgstr "Wyświetlanie p_rawego marginesu w kolumnie:"
+msgstr "P_rawy margines w kolumnie:"
 
 #: ../data/ui/preferences.ui.h:40
 msgid "Automatically _break lines at right margin on commit"
@@ -1205,7 +1204,7 @@ msgstr "P_orównaj"
 
 #: ../data/ui/vcview.ui.h:3
 msgid "Co_mmit..."
-msgstr "_Zatwierdź..."
+msgstr "_Zatwierdź…"
 
 #: ../data/ui/vcview.ui.h:4
 msgid "Commit changes to version control"
@@ -1366,30 +1365,30 @@ msgstr "Czas modyfikacji"
 msgid "Permissions"
 msgstr "Uprawnienia"
 
-#: ../meld/dirdiff.py:558
+#: ../meld/dirdiff.py:561
 #, python-format
 msgid "Hide %s"
 msgstr "Ukryj %s"
 
-#: ../meld/dirdiff.py:688 ../meld/dirdiff.py:710
+#: ../meld/dirdiff.py:693 ../meld/dirdiff.py:715
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Skanowanie %s"
 
-#: ../meld/dirdiff.py:843
+#: ../meld/dirdiff.py:848
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Ukończono"
 
-#: ../meld/dirdiff.py:851
+#: ../meld/dirdiff.py:856
 msgid "Folders have no differences"
 msgstr "Katalogi się nie różnią"
 
-#: ../meld/dirdiff.py:853
+#: ../meld/dirdiff.py:858
 msgid "Contents of scanned files in folders are identical."
 msgstr "Treść zeskanowanych plików w katalogach jest identyczna."
 
-#: ../meld/dirdiff.py:855
+#: ../meld/dirdiff.py:860
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1397,41 +1396,41 @@ msgstr ""
 "Zeskanowane pliki wydają się identyczne, ale treść mogła nie zostać "
 "zeskanowana."
 
-#: ../meld/dirdiff.py:858
+#: ../meld/dirdiff.py:863
 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:860
+#: ../meld/dirdiff.py:865
 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:878 ../meld/dirdiff.py:931 ../meld/filediff.py:1115
-#: ../meld/filediff.py:1267 ../meld/filediff.py:1462 ../meld/filediff.py:1492
-#: ../meld/filediff.py:1494
+#: ../meld/dirdiff.py:883 ../meld/dirdiff.py:936 ../meld/filediff.py:1125
+#: ../meld/filediff.py:1277 ../meld/filediff.py:1472 ../meld/filediff.py:1502
+#: ../meld/filediff.py:1504
 msgid "Hi_de"
 msgstr "_Ukryj"
 
-#: ../meld/dirdiff.py:888
+#: ../meld/dirdiff.py:893
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Wystąpiło wiele błędów podczas skanowania tego katalogu"
 
-#: ../meld/dirdiff.py:889
+#: ../meld/dirdiff.py:894
 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:891
+#: ../meld/dirdiff.py:896
 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:893
+#: ../meld/dirdiff.py:898
 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:895
+#: ../meld/dirdiff.py:900
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1440,31 +1439,31 @@ msgstr ""
 "systemie plików, który rozróżnia wielkość liter. Następujące pliki w tym "
 "katalogu zostały ukryte:"
 
-#: ../meld/dirdiff.py:906
+#: ../meld/dirdiff.py:911
 #, python-format
 msgid "'%s' hidden by '%s'"
-msgstr "\"%s\" ukryty przez \"%s\""
+msgstr "„%s” ukryty przez „%s”"
 
-#: ../meld/dirdiff.py:971
+#: ../meld/dirdiff.py:976
 #, python-format
 msgid "Replace folder “%s”?"
-msgstr "Zastąpić katalog \"%s\"?"
+msgstr "Zastąpić katalog „%s”?"
 
-#: ../meld/dirdiff.py:973
+#: ../meld/dirdiff.py:978
 #, 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 ""
-"Inny katalog o tej samej nazwie już istnieje w \"%s\".\n"
+"Inny katalog o tej samej nazwie już istnieje w „%s”.\n"
 "Zastąpienie istniejącego katalogu spowoduje utratę wszystkich plików w nim "
 "zawartych."
 
-#: ../meld/dirdiff.py:986
+#: ../meld/dirdiff.py:991
 msgid "Error copying file"
 msgstr "Błąd podczas kopiowania pliku"
 
-#: ../meld/dirdiff.py:987
+#: ../meld/dirdiff.py:992
 #, python-format
 msgid ""
 "Couldn't copy %s\n"
@@ -1477,115 +1476,115 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/dirdiff.py:1010
+#: ../meld/dirdiff.py:1015
 #, python-format
 msgid "Error deleting %s"
 msgstr "Błąd podczas usuwania %s"
 
-#: ../meld/dirdiff.py:1515
+#: ../meld/dirdiff.py:1520
 msgid "No folder"
 msgstr "Brak katalogu"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:406
+#: ../meld/filediff.py:410
 msgid "INS"
 msgstr "WST"
 
-#: ../meld/filediff.py:406
+#: ../meld/filediff.py:410
 msgid "OVR"
 msgstr "ZAS"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:408
+#: ../meld/filediff.py:412
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Wrsz %i, kol %i"
 
-#: ../meld/filediff.py:821
+#: ../meld/filediff.py:825
 msgid "Comparison results will be inaccurate"
 msgstr "Wyniki porównania będą niepoprawne"
 
-#: ../meld/filediff.py:823
+#: ../meld/filediff.py:827
 #, python-format
 msgid ""
 "Filter “%s” changed the number of lines in the file, which is unsupported. "
 "The comparison will not be accurate."
 msgstr ""
-"Filtr \"%s\" zmienił liczbę wierszy w pliku, co nie jest obsługiwane. "
+"Filtr „%s” zmienił liczbę wierszy w pliku, co nie jest obsługiwane. "
 "Porównanie będzie niepoprawne."
 
-#: ../meld/filediff.py:894
+#: ../meld/filediff.py:898
 msgid "Mark conflict as resolved?"
 msgstr "Oznaczyć konflikt jako rozwiązany?"
 
-#: ../meld/filediff.py:896
+#: ../meld/filediff.py:900
 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:898
+#: ../meld/filediff.py:902
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: ../meld/filediff.py:899
+#: ../meld/filediff.py:903
 msgid "Mark _Resolved"
 msgstr "Oznacz jako _rozwiązane"
 
-#: ../meld/filediff.py:1102
+#: ../meld/filediff.py:1106
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Ustawianie liczby paneli"
 
-#: ../meld/filediff.py:1109
+#: ../meld/filediff.py:1119
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Otwieranie plików"
 
-#: ../meld/filediff.py:1132 ../meld/filediff.py:1142 ../meld/filediff.py:1155
-#: ../meld/filediff.py:1161
+#: ../meld/filediff.py:1142 ../meld/filediff.py:1152 ../meld/filediff.py:1165
+#: ../meld/filediff.py:1171
 msgid "Could not read file"
 msgstr "Nie można odczytać pliku"
 
-#: ../meld/filediff.py:1133
+#: ../meld/filediff.py:1143
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Odczytywanie plików"
 
-#: ../meld/filediff.py:1143
+#: ../meld/filediff.py:1153
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s wygląda na plik binarny."
 
-#: ../meld/filediff.py:1156
+#: ../meld/filediff.py:1166
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s nie jest zakodowany z użyciem: %s"
 
-#: ../meld/filediff.py:1194
+#: ../meld/filediff.py:1204
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Analizowanie różnic"
 
-#: ../meld/filediff.py:1262
+#: ../meld/filediff.py:1272
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Plik %s został zmieniony na dysku"
 
-#: ../meld/filediff.py:1263
+#: ../meld/filediff.py:1273
 msgid "Do you want to reload the file?"
 msgstr "Ponownie wczytać plik?"
 
-#: ../meld/filediff.py:1266
+#: ../meld/filediff.py:1276
 msgid "_Reload"
 msgstr "_Wczytaj ponownie"
 
-#: ../meld/filediff.py:1425
+#: ../meld/filediff.py:1435
 msgid "Files are identical"
 msgstr "Pliki są identyczne"
 
-#: ../meld/filediff.py:1438
+#: ../meld/filediff.py:1448
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1593,11 +1592,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:1443
+#: ../meld/filediff.py:1453
 msgid "Files differ in line endings only"
 msgstr "Pliki różnią się tylko znacznikami końca wierszy"
 
-#: ../meld/filediff.py:1445
+#: ../meld/filediff.py:1455
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1606,15 +1605,15 @@ msgstr ""
 "Pliki są identyczne, z wyjątkiem różnych znaczników końca wierszy:\n"
 "%s"
 
-#: ../meld/filediff.py:1465
+#: ../meld/filediff.py:1475
 msgid "Show without filters"
 msgstr "Wyświetl bez filtrów"
 
-#: ../meld/filediff.py:1487
+#: ../meld/filediff.py:1497
 msgid "Change highlighting incomplete"
 msgstr "Wyróżnianie zmian jest niepełne"
 
-#: ../meld/filediff.py:1488
+#: ../meld/filediff.py:1498
 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."
@@ -1622,34 +1621,34 @@ 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:1496
+#: ../meld/filediff.py:1506
 msgid "Keep highlighting"
 msgstr "Wyróżniaj dalej"
 
-#: ../meld/filediff.py:1498
+#: ../meld/filediff.py:1508
 msgid "_Keep highlighting"
 msgstr "_Wyróżniaj dalej"
 
-#: ../meld/filediff.py:1633
+#: ../meld/filediff.py:1643
 #, python-format
 msgid "Replace file “%s”?"
-msgstr "Zastąpić plik \"%s\"?"
+msgstr "Zastąpić plik „%s”?"
 
-#: ../meld/filediff.py:1635
+#: ../meld/filediff.py:1645
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
 "If you replace the existing file, its contents will be lost."
 msgstr ""
-"Plik o tej samej nazwie już istnieje w \"%s\".\n"
+"Plik o tej samej nazwie już istnieje w „%s”.\n"
 "Zastąpienie istniejącego pliku spowoduje utratę jego zawartości."
 
-#: ../meld/filediff.py:1653
+#: ../meld/filediff.py:1663
 #, python-format
 msgid "Could not save file %s."
 msgstr "Nie można zapisać pliku %s."
 
-#: ../meld/filediff.py:1654
+#: ../meld/filediff.py:1664
 #, python-format
 msgid ""
 "Couldn't save file due to:\n"
@@ -1658,74 +1657,74 @@ msgstr ""
 "Nie można zapisać pliku z powodu:\n"
 "%s"
 
-#: ../meld/filediff.py:1666
+#: ../meld/filediff.py:1676
 msgid "Save Left Pane As"
 msgstr "Zapis lewego panelu jako"
 
-#: ../meld/filediff.py:1668
+#: ../meld/filediff.py:1678
 msgid "Save Middle Pane As"
 msgstr "Zapis środkowego panelu jako"
 
-#: ../meld/filediff.py:1670
+#: ../meld/filediff.py:1680
 msgid "Save Right Pane As"
 msgstr "Zapis prawego panelu jako"
 
-#: ../meld/filediff.py:1684
+#: ../meld/filediff.py:1694
 #, 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:1686
+#: ../meld/filediff.py:1696
 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:1689
+#: ../meld/filediff.py:1699
 msgid "Save Anyway"
 msgstr "Zapisz mimo to"
 
-#: ../meld/filediff.py:1690
+#: ../meld/filediff.py:1700
 msgid "Don't Save"
 msgstr "Nie zapisuj"
 
-#: ../meld/filediff.py:1716
+#: ../meld/filediff.py:1726
 msgid "Inconsistent line endings found"
 msgstr "Odnaleziono niespójne znaczniki końca wiersza"
 
-#: ../meld/filediff.py:1718
+#: ../meld/filediff.py:1728
 #, python-format
 msgid ""
 "'%s' contains a mixture of line endings. Select the line ending format to "
 "use."
 msgstr ""
-"Plik \"%s\" zawiera różne znaczniki końca wiersza. Proszę wybrać format "
+"Plik „%s” zawiera różne znaczniki końca wiersza. Proszę wybrać format "
 "znaczników końca wiersza, który ma zostać użyty."
 
-#: ../meld/filediff.py:1739
+#: ../meld/filediff.py:1749
 msgid "_Save as UTF-8"
 msgstr "_Zapisz za pomocą UTF-8"
 
-#: ../meld/filediff.py:1742
+#: ../meld/filediff.py:1752
 #, python-format
 msgid "Couldn't encode text as “%s”"
-msgstr "Nie można zakodować tekstu za pomocą \"%s\""
+msgstr "Nie można zakodować tekstu za pomocą „%s”"
 
-#: ../meld/filediff.py:1744
+#: ../meld/filediff.py:1754
 #, python-format
 msgid ""
 "File “%s” contains characters that can't be encoded using encoding “%s”.\n"
 "Would you like to save as UTF-8?"
 msgstr ""
-"Plik \"%s\" zawiera znaki, których nie można zakodować za pomocą kodowania "
-"\"%s\".\n"
+"Plik „%s” zawiera znaki, których nie można zakodować za pomocą kodowania "
+"„%s”.\n"
 "Zapisać za pomocą kodowania UTF-8?"
 
-#: ../meld/filediff.py:2096
+#: ../meld/filediff.py:2106
 msgid "Live comparison updating disabled"
 msgstr "Wyłączono aktualizowanie porównań na żywo"
 
-#: ../meld/filediff.py:2097
+#: ../meld/filediff.py:2107
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1748,100 +1747,100 @@ msgstr "Skopiuj w gó_rę"
 msgid "Copy _down"
 msgstr "Skopiuj w _dół"
 
-#: ../meld/meldapp.py:170
+#: ../meld/meldapp.py:175
 msgid "wrong number of arguments supplied to --diff"
 msgstr "błędna liczba parametrów dla opcji --diff"
 
-#: ../meld/meldapp.py:175
+#: ../meld/meldapp.py:180
 msgid "Start with an empty window"
 msgstr "Rozpoczyna z pustym oknem"
 
-#: ../meld/meldapp.py:176 ../meld/meldapp.py:178
+#: ../meld/meldapp.py:181 ../meld/meldapp.py:183
 msgid "file"
 msgstr "plik"
 
-#: ../meld/meldapp.py:176 ../meld/meldapp.py:180
+#: ../meld/meldapp.py:181 ../meld/meldapp.py:185
 msgid "folder"
 msgstr "katalog"
 
-#: ../meld/meldapp.py:177
+#: ../meld/meldapp.py:182
 msgid "Start a version control comparison"
 msgstr "Rozpoczyna porównanie systemu kontroli wersji"
 
-#: ../meld/meldapp.py:179
+#: ../meld/meldapp.py:184
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Rozpoczyna porównanie 2 lub 3 plików"
 
-#: ../meld/meldapp.py:181
+#: ../meld/meldapp.py:186
 msgid "Start a 2- or 3-way folder comparison"
 msgstr "Rozpoczyna porównanie 2 lub 3 katalogów"
 
-#: ../meld/meldapp.py:224
+#: ../meld/meldapp.py:229
 #, python-format
 msgid "Error: %s\n"
 msgstr "Błąd: %s\n"
 
-#: ../meld/meldapp.py:231
+#: ../meld/meldapp.py:236
 msgid "Meld is a file and directory comparison tool."
 msgstr "Program Meld jest narzędziem do porównywania plików i katalogów."
 
-#: ../meld/meldapp.py:235
+#: ../meld/meldapp.py:240
 msgid "Set label to use instead of file name"
 msgstr "Ustawia etykietę, która ma być użyta zamiast nazwy pliku"
 
-#: ../meld/meldapp.py:238
+#: ../meld/meldapp.py:243
 msgid "Open a new tab in an already running instance"
 msgstr "Otwiera nową kartę w już uruchomionej kopii"
 
-#: ../meld/meldapp.py:241
+#: ../meld/meldapp.py:246
 msgid "Automatically compare all differing files on startup"
 msgstr ""
 "Automatycznie porównuje wszystkie różniące się pliki podczas uruchamiania"
 
-#: ../meld/meldapp.py:244
+#: ../meld/meldapp.py:249
 msgid "Ignored for compatibility"
-msgstr "Ignorowane - dla zachowania zgodności"
+msgstr "Ignorowane — dla zachowania zgodności"
 
-#: ../meld/meldapp.py:248
+#: ../meld/meldapp.py:253
 msgid "Set the target file for saving a merge result"
 msgstr "Ustawia nazwę pliku, w którym zapisany zostanie wynik scalenia"
 
-#: ../meld/meldapp.py:251
+#: ../meld/meldapp.py:256
 msgid "Automatically merge files"
 msgstr "Automatycznie scala pliki"
 
-#: ../meld/meldapp.py:255
+#: ../meld/meldapp.py:260
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "Wczytuje zapisane porównanie z pliku porównania programu Meld"
 
-#: ../meld/meldapp.py:259
+#: ../meld/meldapp.py:264
 msgid "Create a diff tab for the supplied files or folders"
 msgstr "Tworzy kartę różnicy dla podanych plików lub katalogów"
 
-#: ../meld/meldapp.py:279
+#: ../meld/meldapp.py:284
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "za dużo parametrów (powinno być 0-3, jest %d)"
 
-#: ../meld/meldapp.py:282
+#: ../meld/meldapp.py:287
 msgid "can't auto-merge less than 3 files"
 msgstr "nie można automatycznie scalić mniej niż 3 plików"
 
-#: ../meld/meldapp.py:284
+#: ../meld/meldapp.py:289
 msgid "can't auto-merge directories"
 msgstr "nie można automatycznie scalić katalogów"
 
-#: ../meld/meldapp.py:298
+#: ../meld/meldapp.py:303
 msgid "Error reading saved comparison file"
 msgstr "Błąd podczas odczytywania zapisanego pliku porównania"
 
-#: ../meld/meldapp.py:326
+#: ../meld/meldapp.py:330
 #, python-format
 msgid "invalid path or URI \"%s\""
-msgstr "nieprawidłowa ścieżka lub adres URL \"%s\""
+msgstr "nieprawidłowa ścieżka lub adres URL „%s”"
 
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:137
+#: ../meld/meldbuffer.py:138
 msgid "<unnamed>"
 msgstr "<bez nazwy>"
 
@@ -1855,7 +1854,7 @@ msgstr "_Plik"
 
 #: ../meld/meldwindow.py:49
 msgid "_New Comparison..."
-msgstr "_Nowe porównanie..."
+msgstr "_Nowe porównanie…"
 
 #: ../meld/meldwindow.py:50
 msgid "Start a new comparison"
@@ -1867,7 +1866,7 @@ msgstr "Zapisuje bieżący plik"
 
 #: ../meld/meldwindow.py:55
 msgid "Save As..."
-msgstr "Zapisz jako..."
+msgstr "Zapisz jako…"
 
 #: ../meld/meldwindow.py:56
 msgid "Save the current file with a different name"
@@ -1903,7 +1902,7 @@ msgstr "Wklej zawartość schowka"
 
 #: ../meld/meldwindow.py:75
 msgid "Find..."
-msgstr "Wyszukiwanie..."
+msgstr "Wyszukiwanie…"
 
 #: ../meld/meldwindow.py:75
 msgid "Search for text"
@@ -1927,7 +1926,7 @@ msgstr "Szuka wstecz tego samego tekstu"
 
 #: ../meld/meldwindow.py:84
 msgid "_Replace..."
-msgstr "Z_amień..."
+msgstr "Z_amień…"
 
 #: ../meld/meldwindow.py:85
 msgid "Find and replace text"
@@ -2035,11 +2034,11 @@ msgstr "Wyświetla/ukrywa pasek narzędziowy"
 
 #: ../meld/meldwindow.py:141
 msgid "Open Recent"
-msgstr "Otwórz ostatnie"
+msgstr "Otwórz ostatnio używane"
 
 #: ../meld/meldwindow.py:142
 msgid "Open recent files"
-msgstr "Otwiera ostatnie pliki"
+msgstr "Otwiera ostatnio używane pliki"
 
 #: ../meld/meldwindow.py:164
 msgid "_Meld"
@@ -2083,7 +2082,7 @@ msgid "Cannot compare a mixture of files and directories"
 msgstr "Jednoczesne porównanie plików i katalogów nie jest możliwe"
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:178
+#: ../meld/misc.py:203
 msgid "[None]"
 msgstr "[Brak]"
 
@@ -2109,14 +2108,14 @@ msgstr "Żadne pliki nie zostaną zatwierdzone"
 
 #. Translators: First %s is replaced by translated "%d unpushed
 #. commits", second %s is replaced by translated "%d branches"
-#: ../meld/vc/git.py:129
+#: ../meld/vc/git.py:127
 #, python-format
 msgid "%s in %s"
 msgstr "%s w %s"
 
 #. Translators: These messages cover the case where there is
 #. only one branch, and are not part of another message.
-#: ../meld/vc/git.py:130 ../meld/vc/git.py:137
+#: ../meld/vc/git.py:128 ../meld/vc/git.py:135
 #, python-format
 msgid "%d unpushed commit"
 msgid_plural "%d unpushed commits"
@@ -2124,7 +2123,7 @@ msgstr[0] "%d niewysłane zatwierdzenie"
 msgstr[1] "%d niewysłane zatwierdzenia"
 msgstr[2] "%d niewysłanych zatwierdzeń"
 
-#: ../meld/vc/git.py:132
+#: ../meld/vc/git.py:130
 #, python-format
 msgid "%d branch"
 msgid_plural "%d branches"
@@ -2132,7 +2131,7 @@ msgstr[0] "%d gałęzi"
 msgstr[1] "%d gałęziach"
 msgstr[2] "%d gałęziach"
 
-#: ../meld/vc/git.py:360
+#: ../meld/vc/git.py:357
 #, python-format
 msgid "Mode changed from %s to %s"
 msgstr "Zmieniono tryb z %s na %s"
@@ -2185,112 +2184,112 @@ msgstr "Brakujący"
 msgid "Not present"
 msgstr "Nieobecny"
 
-#: ../meld/vcview.py:233 ../meld/vcview.py:417
+#: ../meld/vcview.py:245 ../meld/vcview.py:426
 msgid "Location"
 msgstr "Położenie"
 
-#: ../meld/vcview.py:234
+#: ../meld/vcview.py:246
 msgid "Status"
 msgstr "Stan"
 
-#: ../meld/vcview.py:235
+#: ../meld/vcview.py:247
 msgid "Revision"
 msgstr "Wersja"
 
-#: ../meld/vcview.py:236
+#: ../meld/vcview.py:248
 msgid "Options"
 msgstr "Opcje"
 
 #. TRANSLATORS: this is an error message when a version control
 #. application isn't installed or can't be found
-#: ../meld/vcview.py:324
+#: ../meld/vcview.py:336
 #, python-format
 msgid "%s not installed"
 msgstr "Program %s nie jest zainstalowany"
 
 #. TRANSLATORS: this is an error message when a version
 #. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:328
+#: ../meld/vcview.py:340
 msgid "Invalid repository"
 msgstr "Nieprawidłowe repozytorium"
 
-#: ../meld/vcview.py:337
+#: ../meld/vcview.py:349
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../meld/vcview.py:339 ../meld/vcview.py:347
+#: ../meld/vcview.py:351 ../meld/vcview.py:359
 msgid "None"
 msgstr "Brak"
 
-#: ../meld/vcview.py:358
+#: ../meld/vcview.py:370
 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:360
+#: ../meld/vcview.py:372
 msgid "Only one version control system found in this folder"
 msgstr "W tym katalogu odnaleziono tylko jeden system kontroli wersji"
 
-#: ../meld/vcview.py:362
+#: ../meld/vcview.py:374
 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 the user is diffing
-#: ../meld/vcview.py:417
+#: ../meld/vcview.py:426
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:431 ../meld/vcview.py:439
+#: ../meld/vcview.py:448
 #, python-format
 msgid "Scanning %s"
 msgstr "Skanowanie %s"
 
-#: ../meld/vcview.py:479
+#: ../meld/vcview.py:488
 msgid "(Empty)"
 msgstr "(Pusty)"
 
-#: ../meld/vcview.py:522
+#: ../meld/vcview.py:531
 #, python-format
 msgid "%s — local"
 msgstr "%s — lokalne"
 
-#: ../meld/vcview.py:523
+#: ../meld/vcview.py:532
 #, python-format
 msgid "%s — remote"
 msgstr "%s — zdalne"
 
-#: ../meld/vcview.py:531
+#: ../meld/vcview.py:540
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (lokalne, scalanie, zdalne)"
 
-#: ../meld/vcview.py:536
+#: ../meld/vcview.py:545
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (zdalne, scalanie, lokalne)"
 
-#: ../meld/vcview.py:547
+#: ../meld/vcview.py:556
 #, python-format
 msgid "%s — repository"
 msgstr "%s — repozytorium"
 
-#: ../meld/vcview.py:553
+#: ../meld/vcview.py:562
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (kopia robocza, repozytorium)"
 
-#: ../meld/vcview.py:557
+#: ../meld/vcview.py:566
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (repozytorium, kopia robocza)"
 
-#: ../meld/vcview.py:741
+#: ../meld/vcview.py:756
 msgid "Remove folder and all its files?"
 msgstr "Usunąć katalog i wszystkie zawarte w nim pliki?"
 
-#: ../meld/vcview.py:743
+#: ../meld/vcview.py:758
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2298,7 +2297,7 @@ 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:777
+#: ../meld/vcview.py:792
 #, python-format
 msgid "Error removing %s"
 msgstr "Błąd podczas usuwania %s"

From 85d83ae96f471b0284e881a464361efd8d5c577d Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sat, 19 Sep 2015 07:03:18 +1000
Subject: [PATCH 08/44] help: Fix keyboard shortcut docs

---
 help/C/keyboard-shortcuts.page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/help/C/keyboard-shortcuts.page b/help/C/keyboard-shortcuts.page
index 81209c3f..be43613f 100644
--- a/help/C/keyboard-shortcuts.page
+++ b/help/C/keyboard-shortcuts.page
@@ -87,7 +87,7 @@
       <td><p>Find the next instance of the string.</p></td>
     </tr>
     <tr>
-      <td><p><keyseq><key>Alt</key><key>Up</key></keyseq></p></td>
+      <td><p><keyseq><key>Alt</key><key>Down</key></keyseq></p></td>
       <td><p>Go to the next difference.
              (Also <keyseq><key>Ctrl</key><key>D</key></keyseq>)
       </p></td>

From d5431e997c2df748ec24e57891848ff1d7374162 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Wed, 12 Aug 2015 08:59:05 +1000
Subject: [PATCH 09/44] filediff: Hack around double setting of filechooser
 paths (bgo#755362)

This causes a crash on at least some versions of GTK+, but we kind of
need it (for now at least) to handle --output setting. We should be
able to work around this better, but for now this hack will do the
job.

Also, this bug has already been fixed in GTK+, but only in 3.18 so
it's well above what we're going to require for this release of Meld.
---
 meld/filediff.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meld/filediff.py b/meld/filediff.py
index 9ff8e81a..c132959c 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1045,7 +1045,11 @@ def set_merge_output_file(self, filename):
         if os.path.exists(buf.data.savefile):
             writable = os.access(buf.data.savefile, os.W_OK)
         self.set_buffer_writable(buf, writable)
-        self.fileentry[1].set_filename(buf.data.savefile)
+
+        # FIXME: Hack around bgo#737804; remove after GTK+ 3.18 is required
+        def set_merge_file_entry():
+            self.fileentry[1].set_filename(buf.data.savefile)
+        self.scheduler.add_task(set_merge_file_entry)
         self.recompute_label()
 
     def _set_save_action_sensitivity(self):

From 6c852af67c7bc9c3c9bb25c6b27a9ac106f11b4a Mon Sep 17 00:00:00 2001
From: Pratik Dayama <pratik.dayama63@gmail.com>
Date: Sat, 26 Sep 2015 07:32:28 +1000
Subject: [PATCH 10/44] filediff: Offer to open binary files externally
 (bgo#665154)

If we think we've got a binary file, currently Meld just refuses to
display it. It's somewhat more useful to to offer to open this file in
whatever program we think will be able to view it. This is primarily
for file comparisons started from folder comparisons, though VC
comparisons will also benefit somewhat.
---
 meld/filediff.py | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/meld/filediff.py b/meld/filediff.py
index c132959c..66ef2e4a 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1152,9 +1152,24 @@ def add_dismissable_msg(pane, icon, primary, secondary):
                     if nextbit.find("\x00") != -1:
                         t.buf.delete(*t.buf.get_bounds())
                         filename = GObject.markup_escape_text(t.filename)
-                        add_dismissable_msg(t.pane, Gtk.STOCK_DIALOG_ERROR,
-                            _("Could not read file"),
-                            _("%s appears to be a binary file.") % filename)
+
+                        primary = _("File %s appears to be a binary file.") % filename
+                        secondary = _("Do you want to open the file using the default application?")
+                        msgarea = self.msgarea_mgr[t.pane].new_from_text_and_icon(
+                                        Gtk.STOCK_DIALOG_WARNING, primary, secondary)
+                        msgarea.add_button(_("Open"), Gtk.ResponseType.ACCEPT)
+                        msgarea.add_button(_("Hi_de"), Gtk.ResponseType.CLOSE)
+
+                        def make_binary_callback(pane, filename):
+                            def on_binary_file_open(msgarea, response_id, *args):
+                                self.msgarea_mgr[pane].clear()
+                                if response_id == Gtk.ResponseType.ACCEPT:
+                                    self._open_files([filename])
+                                return on_binary_file_open
+                            return on_binary_file_open
+
+                        msgarea.connect("response", make_binary_callback(t.pane, t.filename))
+                        msgarea.show_all()
                         tasks.remove(t)
                         continue
                 except ValueError as err:

From b9a97fedae88e78fbf9ca715c3f90b5824f5fe51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Dr=C4=85g?= <piotrdrag@gmail.com>
Date: Sat, 26 Sep 2015 20:25:46 +0200
Subject: [PATCH 11/44] Updated Polish translation

---
 po/pl.po | 108 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 57 insertions(+), 51 deletions(-)

diff --git a/po/pl.po b/po/pl.po
index a0fb4393..08db031a 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: 2015-09-04 00:30+0200\n"
-"PO-Revision-Date: 2015-09-04 00:31+0200\n"
+"POT-Creation-Date: 2015-09-26 20:24+0200\n"
+"PO-Revision-Date: 2015-09-26 20:25+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <gnomepl@aviary.pl>\n"
 "Language: pl\n"
@@ -545,7 +545,7 @@ msgstr "Kopiuje element na prawo"
 msgid "Delete selected"
 msgstr "Usuwa zaznaczone"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:881 ../meld/filediff.py:1470
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:881 ../meld/filediff.py:1489
 msgid "Hide"
 msgstr "Ukryj"
 
@@ -633,8 +633,7 @@ msgid "Move _Down"
 msgstr "Przesuń w _dół"
 
 #. Create icon and filename CellRenderer
-#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:374
-#: ../meld/vcview.py:215
+#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:374 ../meld/vcview.py:215
 msgid "Name"
 msgstr "Nazwa"
 
@@ -835,8 +834,8 @@ msgstr ""
 msgid "Close _without Saving"
 msgstr "Zamknij _bez zapisywania"
 
-#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:972 ../meld/filediff.py:1639
-#: ../meld/filediff.py:1723 ../meld/filediff.py:1748
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:972 ../meld/filediff.py:1658
+#: ../meld/filediff.py:1742 ../meld/filediff.py:1767
 msgid "_Cancel"
 msgstr "_Anuluj"
 
@@ -873,7 +872,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:973 ../meld/filediff.py:1640
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:973 ../meld/filediff.py:1659
 msgid "_Replace"
 msgstr "Z_amień"
 
@@ -1405,9 +1404,9 @@ msgstr ""
 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:883 ../meld/dirdiff.py:936 ../meld/filediff.py:1125
-#: ../meld/filediff.py:1277 ../meld/filediff.py:1472 ../meld/filediff.py:1502
-#: ../meld/filediff.py:1504
+#: ../meld/dirdiff.py:883 ../meld/dirdiff.py:936 ../meld/filediff.py:1129
+#: ../meld/filediff.py:1161 ../meld/filediff.py:1296 ../meld/filediff.py:1491
+#: ../meld/filediff.py:1521 ../meld/filediff.py:1523
 msgid "Hi_de"
 msgstr "_Ukryj"
 
@@ -1532,59 +1531,66 @@ msgstr "Anuluj"
 msgid "Mark _Resolved"
 msgstr "Oznacz jako _rozwiązane"
 
-#: ../meld/filediff.py:1106
+#: ../meld/filediff.py:1110
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Ustawianie liczby paneli"
 
-#: ../meld/filediff.py:1119
+#: ../meld/filediff.py:1123
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Otwieranie plików"
 
-#: ../meld/filediff.py:1142 ../meld/filediff.py:1152 ../meld/filediff.py:1165
-#: ../meld/filediff.py:1171
+#: ../meld/filediff.py:1146 ../meld/filediff.py:1184 ../meld/filediff.py:1190
 msgid "Could not read file"
 msgstr "Nie można odczytać pliku"
 
-#: ../meld/filediff.py:1143
+#: ../meld/filediff.py:1147
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Odczytywanie plików"
 
-#: ../meld/filediff.py:1153
+#: ../meld/filediff.py:1156
 #, python-format
-msgid "%s appears to be a binary file."
-msgstr "%s wygląda na plik binarny."
+msgid "File %s appears to be a binary file."
+msgstr "Plik %s wygląda na plik binarny."
 
-#: ../meld/filediff.py:1166
+#: ../meld/filediff.py:1157
+msgid "Do you want to open the file using the default application?"
+msgstr "Otworzyć go w domyślnym programie?"
+
+#: ../meld/filediff.py:1160
+msgid "Open"
+msgstr "Otwórz"
+
+#: ../meld/filediff.py:1185
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s nie jest zakodowany z użyciem: %s"
 
-#: ../meld/filediff.py:1204
+#: ../meld/filediff.py:1223
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Analizowanie różnic"
 
-#: ../meld/filediff.py:1272
+#: ../meld/filediff.py:1291
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Plik %s został zmieniony na dysku"
 
-#: ../meld/filediff.py:1273
+#: ../meld/filediff.py:1292
 msgid "Do you want to reload the file?"
 msgstr "Ponownie wczytać plik?"
 
-#: ../meld/filediff.py:1276
+#: ../meld/filediff.py:1295
 msgid "_Reload"
 msgstr "_Wczytaj ponownie"
 
-#: ../meld/filediff.py:1435
+#: ../meld/filediff.py:1454
 msgid "Files are identical"
 msgstr "Pliki są identyczne"
 
-#: ../meld/filediff.py:1448
+#: ../meld/filediff.py:1467
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1592,11 +1598,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:1453
+#: ../meld/filediff.py:1472
 msgid "Files differ in line endings only"
 msgstr "Pliki różnią się tylko znacznikami końca wierszy"
 
-#: ../meld/filediff.py:1455
+#: ../meld/filediff.py:1474
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1605,15 +1611,15 @@ msgstr ""
 "Pliki są identyczne, z wyjątkiem różnych znaczników końca wierszy:\n"
 "%s"
 
-#: ../meld/filediff.py:1475
+#: ../meld/filediff.py:1494
 msgid "Show without filters"
 msgstr "Wyświetl bez filtrów"
 
-#: ../meld/filediff.py:1497
+#: ../meld/filediff.py:1516
 msgid "Change highlighting incomplete"
 msgstr "Wyróżnianie zmian jest niepełne"
 
-#: ../meld/filediff.py:1498
+#: ../meld/filediff.py:1517
 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."
@@ -1621,20 +1627,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:1506
+#: ../meld/filediff.py:1525
 msgid "Keep highlighting"
 msgstr "Wyróżniaj dalej"
 
-#: ../meld/filediff.py:1508
+#: ../meld/filediff.py:1527
 msgid "_Keep highlighting"
 msgstr "_Wyróżniaj dalej"
 
-#: ../meld/filediff.py:1643
+#: ../meld/filediff.py:1662
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Zastąpić plik „%s”?"
 
-#: ../meld/filediff.py:1645
+#: ../meld/filediff.py:1664
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -1643,12 +1649,12 @@ msgstr ""
 "Plik o tej samej nazwie już istnieje w „%s”.\n"
 "Zastąpienie istniejącego pliku spowoduje utratę jego zawartości."
 
-#: ../meld/filediff.py:1663
+#: ../meld/filediff.py:1682
 #, python-format
 msgid "Could not save file %s."
 msgstr "Nie można zapisać pliku %s."
 
-#: ../meld/filediff.py:1664
+#: ../meld/filediff.py:1683
 #, python-format
 msgid ""
 "Couldn't save file due to:\n"
@@ -1657,42 +1663,42 @@ msgstr ""
 "Nie można zapisać pliku z powodu:\n"
 "%s"
 
-#: ../meld/filediff.py:1676
+#: ../meld/filediff.py:1695
 msgid "Save Left Pane As"
 msgstr "Zapis lewego panelu jako"
 
-#: ../meld/filediff.py:1678
+#: ../meld/filediff.py:1697
 msgid "Save Middle Pane As"
 msgstr "Zapis środkowego panelu jako"
 
-#: ../meld/filediff.py:1680
+#: ../meld/filediff.py:1699
 msgid "Save Right Pane As"
 msgstr "Zapis prawego panelu jako"
 
-#: ../meld/filediff.py:1694
+#: ../meld/filediff.py:1713
 #, 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:1696
+#: ../meld/filediff.py:1715
 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:1699
+#: ../meld/filediff.py:1718
 msgid "Save Anyway"
 msgstr "Zapisz mimo to"
 
-#: ../meld/filediff.py:1700
+#: ../meld/filediff.py:1719
 msgid "Don't Save"
 msgstr "Nie zapisuj"
 
-#: ../meld/filediff.py:1726
+#: ../meld/filediff.py:1745
 msgid "Inconsistent line endings found"
 msgstr "Odnaleziono niespójne znaczniki końca wiersza"
 
-#: ../meld/filediff.py:1728
+#: ../meld/filediff.py:1747
 #, python-format
 msgid ""
 "'%s' contains a mixture of line endings. Select the line ending format to "
@@ -1701,16 +1707,16 @@ msgstr ""
 "Plik „%s” zawiera różne znaczniki końca wiersza. Proszę wybrać format "
 "znaczników końca wiersza, który ma zostać użyty."
 
-#: ../meld/filediff.py:1749
+#: ../meld/filediff.py:1768
 msgid "_Save as UTF-8"
 msgstr "_Zapisz za pomocą UTF-8"
 
-#: ../meld/filediff.py:1752
+#: ../meld/filediff.py:1771
 #, python-format
 msgid "Couldn't encode text as “%s”"
 msgstr "Nie można zakodować tekstu za pomocą „%s”"
 
-#: ../meld/filediff.py:1754
+#: ../meld/filediff.py:1773
 #, python-format
 msgid ""
 "File “%s” contains characters that can't be encoded using encoding “%s”.\n"
@@ -1720,11 +1726,11 @@ msgstr ""
 "„%s”.\n"
 "Zapisać za pomocą kodowania UTF-8?"
 
-#: ../meld/filediff.py:2106
+#: ../meld/filediff.py:2125
 msgid "Live comparison updating disabled"
 msgstr "Wyłączono aktualizowanie porównań na żywo"
 
-#: ../meld/filediff.py:2107
+#: ../meld/filediff.py:2126
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "

From 3595b136f217ab7001ee5febff9877e3603c18cb Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sat, 3 Oct 2015 12:11:05 +1000
Subject: [PATCH 12/44] diffmap: Fix scrollbar-alignment code for new GTK+
 allocation behaviour

There's still a few areas of somewhat-internal hackery here in handling
the scrollbar's style properties and allocations, but this works for
now at least.
---
 meld/diffmap.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meld/diffmap.py b/meld/diffmap.py
index 633c195a..c933d9d7 100644
--- a/meld/diffmap.py
+++ b/meld/diffmap.py
@@ -103,7 +103,8 @@ def on_scrollbar_style_updated(self, scrollbar):
         self.queue_draw()
 
     def on_scrollbar_size_allocate(self, scrollbar, allocation):
-        self._scroll_y = allocation.y
+        translation = scrollbar.translate_coordinates(self, 0, 0)
+        self._scroll_y = translation[1] if translation else 0
         self._scroll_height = allocation.height
         self._width = max(allocation.width, 10)
         self._cached_map = None
@@ -113,7 +114,7 @@ def do_draw(self, context):
         if not self._setup:
             return
         height = self._scroll_height - self._h_offset - 1
-        y_start = self._scroll_y - self.get_allocation().y - self._y_offset + 1
+        y_start = self._scroll_y + self._y_offset + 1
         width = self.get_allocated_width()
         xpad = 2.5
         x0 = xpad

From def9e8777057c414c51b06eda5a41a9ff66f24c8 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Thu, 10 Sep 2015 07:44:29 +1000
Subject: [PATCH 13/44] patchdialog: Hack around difflib not handling unicode
 file labels

---
 meld/patchdialog.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meld/patchdialog.py b/meld/patchdialog.py
index c6c3d8e4..6a1dbbd6 100644
--- a/meld/patchdialog.py
+++ b/meld/patchdialog.py
@@ -87,11 +87,16 @@ def update_patch(self):
         names = [self.filediff.textbuffer[i].data.label for i in range(3)]
         prefix = os.path.commonprefix(names)
         names = [n[prefix.rfind("/") + 1:] for n in names]
+        # difflib doesn't handle getting unicode file labels
+        names = [n.encode('utf8') for n in names]
 
         buf = self.textview.get_buffer()
         text0, text1 = texts[indices[0]], texts[indices[1]]
         name0, name1 = names[indices[0]], names[indices[1]]
-        diff_text = "".join(difflib.unified_diff(text0, text1, name0, name1))
+
+        diff = difflib.unified_diff(text0, text1, name0, name1)
+        unicodeify = lambda x: x.decode('utf8') if isinstance(x, str) else x
+        diff_text = "".join(unicodeify(d) for d in diff)
         buf.set_text(diff_text)
 
     def run(self):

From d931f81458e5ff989b1ecaa04a6f93de9de76ce8 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sun, 4 Oct 2015 06:43:03 +1000
Subject: [PATCH 14/44] patchdialog: Fix copy-to-clipboard for pygobject port

---
 meld/patchdialog.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meld/patchdialog.py b/meld/patchdialog.py
index 6a1dbbd6..171e99b5 100644
--- a/meld/patchdialog.py
+++ b/meld/patchdialog.py
@@ -17,6 +17,7 @@
 import difflib
 import os
 
+from gi.repository import Gdk
 from gi.repository import Gtk
 from gi.repository import GtkSource
 
@@ -113,8 +114,8 @@ def run(self):
 
             # Copy patch to clipboard
             if result == 1:
-                clip = Gtk.clipboard_get()
-                clip.set_text(txt)
+                clip = Gtk.Clipboard.get_default(Gdk.Display.get_default())
+                clip.set_text(txt, -1)
                 clip.store()
                 break
             # Save patch as a file

From e417dcd606039468c3ed3916eb8b16d03ab746a9 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sun, 4 Oct 2015 06:55:00 +1000
Subject: [PATCH 15/44] conf: Missed the 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 dc94012b..b207001b 100644
--- a/meld/conf.py
+++ b/meld/conf.py
@@ -3,7 +3,7 @@
 import sys
 
 __package__ = "meld"
-__version__ = "3.14.0"
+__version__ = "3.14.1"
 
 # START; these paths are clobbered on install by meld.build_helpers
 DATADIR = os.path.join(sys.prefix, "share", "meld")

From 8dadd4002efe6dae01ff6a2a95b41547e16a2ae6 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sun, 4 Oct 2015 07:02:49 +1000
Subject: [PATCH 16/44] Update NEWS

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

diff --git a/NEWS b/NEWS
index 68bf3a36..11cfb28f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,28 @@
+2015-10-04 meld 3.14.1
+======================
+
+  Features:
+
+   * Offer to open binary files externally (Pratik Dayama)
+   * Use locale-based default encodings (Kai Willadsen)
+
+  Fixes:
+
+   * Fix crash with some GTK+ versions when using --output (Kai Willadsen)
+   * Fix merge-all action not working at all (Kai Willadsen)
+   * Fix creating patches with unicode path names (Kai Willadsen)
+   * Fix copy-to-clipboard option in patch dialog (Kai Willadsen)
+   * Fix diffmap alignment for new GTK+ allocation behaviour (Kai Willadsen)
+   * Improve float accuracy in folder comparison timestamp resolution (Kai Willadsen)
+   * Fix default SVN keyword filter to escape $ characters (Kai Willadsen)
+   * Fix display of unicode --help from command line (Kai Willadsen)
+   * Fix keyboard shortcut docs (Kai Willadsen)
+   * Don't incorrectly show identical notification for changed folder comparisons (Kai Willadsen)
+
+  Translations:
+
+   * Piotr Drąg (pl)
+
 
 2015-07-23 meld 3.14.0
 ======================

From bbbf6263496effdbb24ed4e05d920aa91b08f748 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sun, 4 Oct 2015 07:03:07 +1000
Subject: [PATCH 17/44] 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 b207001b..13004efe 100644
--- a/meld/conf.py
+++ b/meld/conf.py
@@ -3,7 +3,7 @@
 import sys
 
 __package__ = "meld"
-__version__ = "3.14.1"
+__version__ = "3.14.2"
 
 # START; these paths are clobbered on install by meld.build_helpers
 DATADIR = os.path.join(sys.prefix, "share", "meld")

From d0bf386c54c8dc1746fdbeffec0a88814b5c0f92 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sun, 4 Oct 2015 09:15:48 +1000
Subject: [PATCH 18/44] vcview: Hack for bad handling of unicode commit
 messages (bgo#755030)

This is a minimal work around for the 3.14 branch; this code is gone in
master.
---
 meld/vcview.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meld/vcview.py b/meld/vcview.py
index 15cf7954..a08c43f1 100644
--- a/meld/vcview.py
+++ b/meld/vcview.py
@@ -660,7 +660,7 @@ def quote(s):
                 return '"%s"' % s if len(s.split()) > 1 else s
             return " ".join(quote(tok) for tok in command)
 
-        msg = shelljoin(command)
+        msg = misc.fallback_decode(shelljoin(command), ['utf-8'], lossy=True)
         yield "[%s] %s" % (self.label_text, msg.replace("\n", "\t"))
         def relpath(pbase, p):
             kill = 0

From 3f8e36ce78b67e5e3c8f1c06febee726499f3a50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20=C4=8Cernock=C3=BD?= <marek@manet.cz>
Date: Sun, 11 Oct 2015 18:44:55 +0200
Subject: [PATCH 19/44] Updated Czech translation

---
 po/cs.po | 276 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 141 insertions(+), 135 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 964e7cd1..280a4d49 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,11 +8,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: meld\n"
+"Project-Id-Version: meld 3.14\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=meld&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-02-16 20:12+0000\n"
-"PO-Revision-Date: 2015-02-16 22:57+0100\n"
+"POT-Creation-Date: 2015-10-11 11:41+0000\n"
+"PO-Revision-Date: 2015-10-11 18:34+0200\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
@@ -534,7 +534,7 @@ msgstr "Kopírovat doprava"
 msgid "Delete selected"
 msgstr "Odstranit vybrané"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:876 ../meld/filediff.py:1460
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:881 ../meld/filediff.py:1489
 msgid "Hide"
 msgstr "Skrýt"
 
@@ -603,7 +603,7 @@ msgid "_Add"
 msgstr "_Přidat"
 
 #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:747
+#: ../meld/vcview.py:762
 msgid "_Remove"
 msgstr "_Odstranit"
 
@@ -624,8 +624,7 @@ msgid "Move _Down"
 msgstr "Přesunout _dolů"
 
 #. Create icon and filename CellRenderer
-#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:374
-#: ../meld/vcview.py:203
+#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:374 ../meld/vcview.py:215
 msgid "Name"
 msgstr "Název"
 
@@ -825,8 +824,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:967 ../meld/filediff.py:1629
-#: ../meld/filediff.py:1713 ../meld/filediff.py:1738
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:972 ../meld/filediff.py:1658
+#: ../meld/filediff.py:1742 ../meld/filediff.py:1767
 msgid "_Cancel"
 msgstr "_Zrušit"
 
@@ -863,7 +862,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:968 ../meld/filediff.py:1630
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:973 ../meld/filediff.py:1659
 msgid "_Replace"
 msgstr "Nahradi_t"
 
@@ -911,7 +910,7 @@ msgstr "Formátovat jako záplatu"
 msgid "Copy to Clipboard"
 msgstr "Kopírovat do schránky"
 
-#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:119
+#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:125
 msgid "Save Patch"
 msgstr "Uložení záplaty"
 
@@ -1355,30 +1354,30 @@ msgstr "Čas změny"
 msgid "Permissions"
 msgstr "Oprávnění"
 
-#: ../meld/dirdiff.py:558
+#: ../meld/dirdiff.py:561
 #, python-format
 msgid "Hide %s"
 msgstr "Skrýt %s"
 
-#: ../meld/dirdiff.py:688 ../meld/dirdiff.py:710
+#: ../meld/dirdiff.py:693 ../meld/dirdiff.py:715
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Prochází se %s"
 
-#: ../meld/dirdiff.py:843
+#: ../meld/dirdiff.py:848
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Hotovo"
 
-#: ../meld/dirdiff.py:851
+#: ../meld/dirdiff.py:856
 msgid "Folders have no differences"
 msgstr "Mezi složkami není žádný rozdíl"
 
-#: ../meld/dirdiff.py:853
+#: ../meld/dirdiff.py:858
 msgid "Contents of scanned files in folders are identical."
 msgstr "Obsah kontrolovaných souborů ve složkách je stejný."
 
-#: ../meld/dirdiff.py:855
+#: ../meld/dirdiff.py:860
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1386,43 +1385,43 @@ msgstr ""
 "Kontrolované soubory ve složkách vypadají stejně, ale nebyl kontrolován "
 "jejich obsah."
 
-#: ../meld/dirdiff.py:858
+#: ../meld/dirdiff.py:863
 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:860
+#: ../meld/dirdiff.py:865
 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:878 ../meld/dirdiff.py:931 ../meld/filediff.py:1115
-#: ../meld/filediff.py:1267 ../meld/filediff.py:1462 ../meld/filediff.py:1492
-#: ../meld/filediff.py:1494
+#: ../meld/dirdiff.py:883 ../meld/dirdiff.py:936 ../meld/filediff.py:1129
+#: ../meld/filediff.py:1161 ../meld/filediff.py:1296 ../meld/filediff.py:1491
+#: ../meld/filediff.py:1521 ../meld/filediff.py:1523
 msgid "Hi_de"
 msgstr "_Skrýt"
 
-#: ../meld/dirdiff.py:888
+#: ../meld/dirdiff.py:893
 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:889
+#: ../meld/dirdiff.py:894
 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:891
+#: ../meld/dirdiff.py:896
 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:893
+#: ../meld/dirdiff.py:898
 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:895
+#: ../meld/dirdiff.py:900
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1430,17 +1429,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:906
+#: ../meld/dirdiff.py:911
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "„%s“ skryto v „%s“"
 
-#: ../meld/dirdiff.py:971
+#: ../meld/dirdiff.py:976
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Nahradit složku „%s“?"
 
-#: ../meld/dirdiff.py:973
+#: ../meld/dirdiff.py:978
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1449,11 +1448,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:986
+#: ../meld/dirdiff.py:991
 msgid "Error copying file"
 msgstr "Chyba při kopírování souboru"
 
-#: ../meld/dirdiff.py:987
+#: ../meld/dirdiff.py:992
 #, python-format
 msgid ""
 "Couldn't copy %s\n"
@@ -1466,35 +1465,35 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/dirdiff.py:1010
+#: ../meld/dirdiff.py:1015
 #, python-format
 msgid "Error deleting %s"
 msgstr "Chyba při mazání %s"
 
-#: ../meld/dirdiff.py:1515
+#: ../meld/dirdiff.py:1520
 msgid "No folder"
 msgstr "Žádná složka"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:406
+#: ../meld/filediff.py:410
 msgid "INS"
 msgstr "VKL"
 
-#: ../meld/filediff.py:406
+#: ../meld/filediff.py:410
 msgid "OVR"
 msgstr "PŘE"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:408
+#: ../meld/filediff.py:412
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Řád %i, sl %i"
 
-#: ../meld/filediff.py:821
+#: ../meld/filediff.py:825
 msgid "Comparison results will be inaccurate"
 msgstr "Výsledky porovnávání budou nepřesné"
 
-#: ../meld/filediff.py:823
+#: ../meld/filediff.py:827
 #, python-format
 msgid ""
 "Filter “%s” changed the number of lines in the file, which is unsupported. "
@@ -1503,76 +1502,83 @@ msgstr ""
 "Filtr „%s“ změnil počet řádků v souboru, což není podporováno. Porovnání "
 "nebude správné."
 
-#: ../meld/filediff.py:894
+#: ../meld/filediff.py:898
 msgid "Mark conflict as resolved?"
 msgstr "Označit konflikt jako vyřešený?"
 
-#: ../meld/filediff.py:896
+#: ../meld/filediff.py:900
 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:898
+#: ../meld/filediff.py:902
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: ../meld/filediff.py:899
+#: ../meld/filediff.py:903
 msgid "Mark _Resolved"
 msgstr "Označi_t za vyřešené"
 
-#: ../meld/filediff.py:1102
+#: ../meld/filediff.py:1110
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Nastaven počet panelů"
 
-#: ../meld/filediff.py:1109
+#: ../meld/filediff.py:1123
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Otevírají se soubory"
 
-#: ../meld/filediff.py:1132 ../meld/filediff.py:1142 ../meld/filediff.py:1155
-#: ../meld/filediff.py:1161
+#: ../meld/filediff.py:1146 ../meld/filediff.py:1184 ../meld/filediff.py:1190
 msgid "Could not read file"
 msgstr "Nelze přečíst soubor"
 
-#: ../meld/filediff.py:1133
+#: ../meld/filediff.py:1147
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Čtou se soubory"
 
-#: ../meld/filediff.py:1143
+#: ../meld/filediff.py:1156
 #, python-format
-msgid "%s appears to be a binary file."
-msgstr "%s je zřejmě binárním souborem."
+msgid "File %s appears to be a binary file."
+msgstr "Soubor %s je zřejmě binární."
 
-#: ../meld/filediff.py:1156
+#: ../meld/filediff.py:1157
+msgid "Do you want to open the file using the default application?"
+msgstr "Chcete soubor otevřít pomocí výchozí aplikace?"
+
+#: ../meld/filediff.py:1160
+msgid "Open"
+msgstr "Otevřít"
+
+#: ../meld/filediff.py:1185
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s není v kódováních: %s"
 
-#: ../meld/filediff.py:1194
+#: ../meld/filediff.py:1223
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Počítají se rozdíly"
 
-#: ../meld/filediff.py:1262
+#: ../meld/filediff.py:1291
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Soubor „%s“ byl změněn na disku."
 
-#: ../meld/filediff.py:1263
+#: ../meld/filediff.py:1292
 msgid "Do you want to reload the file?"
 msgstr "Chcete soubor znovu načíst?"
 
-#: ../meld/filediff.py:1266
+#: ../meld/filediff.py:1295
 msgid "_Reload"
 msgstr "Zno_vu načíst"
 
-#: ../meld/filediff.py:1425
+#: ../meld/filediff.py:1454
 msgid "Files are identical"
 msgstr "Soubory jsou stejné"
 
-#: ../meld/filediff.py:1438
+#: ../meld/filediff.py:1467
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1580,11 +1586,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:1443
+#: ../meld/filediff.py:1472
 msgid "Files differ in line endings only"
 msgstr "Soubory se liší pouze zakončením řádků"
 
-#: ../meld/filediff.py:1445
+#: ../meld/filediff.py:1474
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1593,15 +1599,15 @@ msgstr ""
 "Soubory jsou shodné, vyjma rozdílného zakončení řádků:\n"
 "%s"
 
-#: ../meld/filediff.py:1465
+#: ../meld/filediff.py:1494
 msgid "Show without filters"
 msgstr "Zobrazit bez filtrů"
 
-#: ../meld/filediff.py:1487
+#: ../meld/filediff.py:1516
 msgid "Change highlighting incomplete"
 msgstr "Změnit zvýraznění neúplných"
 
-#: ../meld/filediff.py:1488
+#: ../meld/filediff.py:1517
 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."
@@ -1610,20 +1616,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:1496
+#: ../meld/filediff.py:1525
 msgid "Keep highlighting"
 msgstr "Zachovat zvýrazňování"
 
-#: ../meld/filediff.py:1498
+#: ../meld/filediff.py:1527
 msgid "_Keep highlighting"
 msgstr "Z_achovat zvýrazňování"
 
-#: ../meld/filediff.py:1633
+#: ../meld/filediff.py:1662
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Nahradit soubor „%s“?"
 
-#: ../meld/filediff.py:1635
+#: ../meld/filediff.py:1664
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -1632,12 +1638,12 @@ 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:1653
+#: ../meld/filediff.py:1682
 #, python-format
 msgid "Could not save file %s."
 msgstr "Nelze uložit soubor %s."
 
-#: ../meld/filediff.py:1654
+#: ../meld/filediff.py:1683
 #, python-format
 msgid ""
 "Couldn't save file due to:\n"
@@ -1646,40 +1652,40 @@ msgstr ""
 "Nelze uložit soubor z důvodu:\n"
 "%s"
 
-#: ../meld/filediff.py:1666
+#: ../meld/filediff.py:1695
 msgid "Save Left Pane As"
 msgstr "Uložení levého panelu jako"
 
-#: ../meld/filediff.py:1668
+#: ../meld/filediff.py:1697
 msgid "Save Middle Pane As"
 msgstr "Uložení prostředního panelu jako"
 
-#: ../meld/filediff.py:1670
+#: ../meld/filediff.py:1699
 msgid "Save Right Pane As"
 msgstr "Uložení pravého panelu jako"
 
-#: ../meld/filediff.py:1684
+#: ../meld/filediff.py:1713
 #, 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:1686
+#: ../meld/filediff.py:1715
 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:1689
+#: ../meld/filediff.py:1718
 msgid "Save Anyway"
 msgstr "Přesto uložit"
 
-#: ../meld/filediff.py:1690
+#: ../meld/filediff.py:1719
 msgid "Don't Save"
 msgstr "Neukládat"
 
-#: ../meld/filediff.py:1716
+#: ../meld/filediff.py:1745
 msgid "Inconsistent line endings found"
 msgstr "Nalezeny řádky s nejednotným zakončením"
 
-#: ../meld/filediff.py:1718
+#: ../meld/filediff.py:1747
 #, python-format
 msgid ""
 "'%s' contains a mixture of line endings. Select the line ending format to "
@@ -1688,16 +1694,16 @@ msgstr ""
 "„%s“ obsahuje směsici různých zakončení řádků. Vyberte si, který formát "
 "zakončení chcete použít?"
 
-#: ../meld/filediff.py:1739
+#: ../meld/filediff.py:1768
 msgid "_Save as UTF-8"
 msgstr "_Uložit v UTF-8"
 
-#: ../meld/filediff.py:1742
+#: ../meld/filediff.py:1771
 #, python-format
 msgid "Couldn't encode text as “%s”"
 msgstr "Text nelze zakódovat jako „%s“"
 
-#: ../meld/filediff.py:1744
+#: ../meld/filediff.py:1773
 #, python-format
 msgid ""
 "File “%s” contains characters that can't be encoded using encoding “%s”.\n"
@@ -1706,11 +1712,11 @@ 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:2096
+#: ../meld/filediff.py:2125
 msgid "Live comparison updating disabled"
 msgstr "Živá aktualizace porovnání zakázána"
 
-#: ../meld/filediff.py:2097
+#: ../meld/filediff.py:2126
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1733,99 +1739,99 @@ msgstr "Kopírovat nahor_u"
 msgid "Copy _down"
 msgstr "Kopírovat _dolů"
 
-#: ../meld/meldapp.py:170
+#: ../meld/meldapp.py:175
 msgid "wrong number of arguments supplied to --diff"
 msgstr "poskytnut nesprávný počet argumentů pro --diff"
 
-#: ../meld/meldapp.py:175
+#: ../meld/meldapp.py:180
 msgid "Start with an empty window"
 msgstr "Spustit s prázdným oknem"
 
-#: ../meld/meldapp.py:176 ../meld/meldapp.py:178
+#: ../meld/meldapp.py:181 ../meld/meldapp.py:183
 msgid "file"
 msgstr "soubor"
 
-#: ../meld/meldapp.py:176 ../meld/meldapp.py:180
+#: ../meld/meldapp.py:181 ../meld/meldapp.py:185
 msgid "folder"
 msgstr "složka"
 
-#: ../meld/meldapp.py:177
+#: ../meld/meldapp.py:182
 msgid "Start a version control comparison"
 msgstr "Spustit nové porovnání správy verzí"
 
-#: ../meld/meldapp.py:179
+#: ../meld/meldapp.py:184
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Spustit dvojcestné nebo trojcestné porovnání souborů"
 
-#: ../meld/meldapp.py:181
+#: ../meld/meldapp.py:186
 msgid "Start a 2- or 3-way folder comparison"
 msgstr "Spustit dvojcestné nebo trojcestné porovnání složek"
 
-#: ../meld/meldapp.py:224
+#: ../meld/meldapp.py:229
 #, python-format
 msgid "Error: %s\n"
 msgstr "Chyba: %s\n"
 
-#: ../meld/meldapp.py:231
+#: ../meld/meldapp.py:236
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld je nástroj porovnávající soubory a složky."
 
-#: ../meld/meldapp.py:235
+#: ../meld/meldapp.py:240
 msgid "Set label to use instead of file name"
 msgstr "Nastavit k použití popisek namísto názvu souboru"
 
-#: ../meld/meldapp.py:238
+#: ../meld/meldapp.py:243
 msgid "Open a new tab in an already running instance"
 msgstr "Otevřít novou kartu v již běžící instanci"
 
-#: ../meld/meldapp.py:241
+#: ../meld/meldapp.py:246
 msgid "Automatically compare all differing files on startup"
 msgstr "Automaticky při spuštění porovnat všechny lišící se soubory"
 
-#: ../meld/meldapp.py:244
+#: ../meld/meldapp.py:249
 msgid "Ignored for compatibility"
 msgstr "Ignorováno z důvodu kompatibility"
 
-#: ../meld/meldapp.py:248
+#: ../meld/meldapp.py:253
 msgid "Set the target file for saving a merge result"
 msgstr "Nastavit cílový soubor, do kterého se má uložit výsledek slučování"
 
-#: ../meld/meldapp.py:251
+#: ../meld/meldapp.py:256
 msgid "Automatically merge files"
 msgstr "Automaticky sloučit soubory"
 
-#: ../meld/meldapp.py:255
+#: ../meld/meldapp.py:260
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "Načíst uložené porovnání ze srovnávacího souboru Meld"
 
-#: ../meld/meldapp.py:259
+#: ../meld/meldapp.py:264
 msgid "Create a diff tab for the supplied files or folders"
 msgstr "Vytvořit kartu s rozdílem pro zadané soubory nebo složky"
 
-#: ../meld/meldapp.py:279
+#: ../meld/meldapp.py:284
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "příliš mnoho argumentů (požadováno 0 – 3, obdrženo %d)"
 
-#: ../meld/meldapp.py:282
+#: ../meld/meldapp.py:287
 msgid "can't auto-merge less than 3 files"
 msgstr "nelze automaticky sloučit méně než 3 soubory"
 
-#: ../meld/meldapp.py:284
+#: ../meld/meldapp.py:289
 msgid "can't auto-merge directories"
 msgstr "nelze automaticky sloučit složky"
 
-#: ../meld/meldapp.py:298
+#: ../meld/meldapp.py:303
 msgid "Error reading saved comparison file"
 msgstr "Chyba při čtení uloženého srovnávacího souboru"
 
-#: ../meld/meldapp.py:326
+#: ../meld/meldapp.py:330
 #, python-format
 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:137
+#: ../meld/meldbuffer.py:138
 msgid "<unnamed>"
 msgstr "<bez názvu>"
 
@@ -2067,7 +2073,7 @@ msgid "Cannot compare a mixture of files and directories"
 msgstr "Nelze porovnávat směs souborů a složek"
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:178
+#: ../meld/misc.py:203
 msgid "[None]"
 msgstr "[Žádný]"
 
@@ -2093,14 +2099,14 @@ msgstr "Žádné soubory nebudou zařazeny"
 
 #. Translators: First %s is replaced by translated "%d unpushed
 #. commits", second %s is replaced by translated "%d branches"
-#: ../meld/vc/git.py:129
+#: ../meld/vc/git.py:127
 #, python-format
 msgid "%s in %s"
 msgstr "%s v %s"
 
 #. Translators: These messages cover the case where there is
 #. only one branch, and are not part of another message.
-#: ../meld/vc/git.py:130 ../meld/vc/git.py:137
+#: ../meld/vc/git.py:128 ../meld/vc/git.py:135
 #, python-format
 msgid "%d unpushed commit"
 msgid_plural "%d unpushed commits"
@@ -2108,7 +2114,7 @@ msgstr[0] "%d zařazená neodeslaná"
 msgstr[1] "%d zařazené neodeslané"
 msgstr[2] "%d zařazených neodeslaných"
 
-#: ../meld/vc/git.py:132
+#: ../meld/vc/git.py:130
 #, python-format
 msgid "%d branch"
 msgid_plural "%d branches"
@@ -2116,7 +2122,7 @@ msgstr[0] "%d větvi"
 msgstr[1] "%d větvích"
 msgstr[2] "%d větvích"
 
-#: ../meld/vc/git.py:360
+#: ../meld/vc/git.py:357
 #, python-format
 msgid "Mode changed from %s to %s"
 msgstr "Režim změněn z %s na %s"
@@ -2169,111 +2175,111 @@ msgstr "Schází"
 msgid "Not present"
 msgstr "Není přítomno"
 
-#: ../meld/vcview.py:233 ../meld/vcview.py:417
+#: ../meld/vcview.py:245 ../meld/vcview.py:426
 msgid "Location"
 msgstr "Umístění"
 
-#: ../meld/vcview.py:234
+#: ../meld/vcview.py:246
 msgid "Status"
 msgstr "Stav"
 
-#: ../meld/vcview.py:235
+#: ../meld/vcview.py:247
 msgid "Revision"
 msgstr "Revize"
 
-#: ../meld/vcview.py:236
+#: ../meld/vcview.py:248
 msgid "Options"
 msgstr "Možnosti"
 
 #. TRANSLATORS: this is an error message when a version control
 #. application isn't installed or can't be found
-#: ../meld/vcview.py:324
+#: ../meld/vcview.py:336
 #, python-format
 msgid "%s not installed"
 msgstr "%s není nainstalováno"
 
 #. TRANSLATORS: this is an error message when a version
 #. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:328
+#: ../meld/vcview.py:340
 msgid "Invalid repository"
 msgstr "Neplatné úložiště"
 
-#: ../meld/vcview.py:337
+#: ../meld/vcview.py:349
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../meld/vcview.py:339 ../meld/vcview.py:347
+#: ../meld/vcview.py:351 ../meld/vcview.py:359
 msgid "None"
 msgstr "Žádný"
 
-#: ../meld/vcview.py:358
+#: ../meld/vcview.py:370
 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:360
+#: ../meld/vcview.py:372
 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:362
+#: ../meld/vcview.py:374
 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 the user is diffing
-#: ../meld/vcview.py:417
+#: ../meld/vcview.py:426
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:431 ../meld/vcview.py:439
+#: ../meld/vcview.py:448
 #, python-format
 msgid "Scanning %s"
 msgstr "Prochází se %s"
 
-#: ../meld/vcview.py:479
+#: ../meld/vcview.py:488
 msgid "(Empty)"
 msgstr "(Prázdný)"
 
-#: ../meld/vcview.py:522
+#: ../meld/vcview.py:531
 #, python-format
 msgid "%s — local"
 msgstr "%s — místní"
 
-#: ../meld/vcview.py:523
+#: ../meld/vcview.py:532
 #, python-format
 msgid "%s — remote"
 msgstr "%s — vzdálený"
 
-#: ../meld/vcview.py:531
+#: ../meld/vcview.py:540
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (místní, sloučený, vzdálený)"
 
-#: ../meld/vcview.py:536
+#: ../meld/vcview.py:545
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (vzdálený, sloučený, místní)"
 
-#: ../meld/vcview.py:547
+#: ../meld/vcview.py:556
 #, python-format
 msgid "%s — repository"
 msgstr "%s — repozitář"
 
-#: ../meld/vcview.py:553
+#: ../meld/vcview.py:562
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (pracovní, repozitář)"
 
-#: ../meld/vcview.py:557
+#: ../meld/vcview.py:566
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (repozitář, pracovní)"
 
-#: ../meld/vcview.py:741
+#: ../meld/vcview.py:756
 msgid "Remove folder and all its files?"
 msgstr "Odstranit složku a všechny soubory v ní?"
 
-#: ../meld/vcview.py:743
+#: ../meld/vcview.py:758
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2281,7 +2287,7 @@ 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:777
+#: ../meld/vcview.py:792
 #, python-format
 msgid "Error removing %s"
 msgstr "Chyba při odstraňování %s"

From 7cf5934724b91847d2924a246a9b176b237ffda0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20=C4=8Cernock=C3=BD?= <marek@manet.cz>
Date: Sun, 11 Oct 2015 18:45:01 +0200
Subject: [PATCH 20/44] Updated Czech translation

---
 help/cs/cs.po | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/help/cs/cs.po b/help/cs/cs.po
index 6a24099e..b33bcf53 100644
--- a/help/cs/cs.po
+++ b/help/cs/cs.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: meld master\n"
-"POT-Creation-Date: 2015-07-20 19:42+0000\n"
-"PO-Revision-Date: 2015-07-21 11:57+0200\n"
+"Project-Id-Version: meld 3.14\n"
+"POT-Creation-Date: 2015-10-11 11:41+0000\n"
+"PO-Revision-Date: 2015-10-11 18:42+0200\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
@@ -33,8 +33,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"
 
@@ -709,10 +708,10 @@ msgid ""
 msgstr ""
 "Název příkazu, který provede otevření textových souborů v externím editoru. "
 "Stačí samotný příkaz (např. <cmd>gedit</cmd>), a otevíraný soubor je pak "
-"předán jako poslední argument. Nebo případně můžete do příkazu přidat <code>"
-"{file}</code> a <code>{line}</code>,  které pak <app>Meld</app> nahradí "
-"názvem souboru včetně cesty, respektive číslem aktuálního řádku. (např. "
-"<cmd>gedit {file}:{line}</cmd>)."
+"předán jako poslední argument. Nebo případně můžete do příkazu přidat "
+"<code>{file}</code> a <code>{line}</code>,  které pak <app>Meld</app> "
+"nahradí názvem souboru včetně cesty, respektive číslem aktuálního řádku. "
+"(např. <cmd>gedit {file}:{line}</cmd>)."
 
 #. (itstool) path: terms/title
 #: C/preferences.page:31
@@ -1441,9 +1440,9 @@ msgid "Find the next instance of the string."
 msgstr "Najít následující výskyt řetězce"
 
 #. (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>Up</key></keyseq>"
+#: C/keyboard-shortcuts.page:90
+msgid "<keyseq><key>Alt</key><key>Down</key></keyseq>"
+msgstr "<keyseq><key>Alt</key><key>↓</key></keyseq>"
 
 #. (itstool) path: td/p
 #: C/keyboard-shortcuts.page:91
@@ -1454,6 +1453,11 @@ msgstr ""
 "Přejít na následující rozdíl (také <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>↑</key></keyseq>"
+
 #. (itstool) path: td/p
 #: C/keyboard-shortcuts.page:97
 msgid ""

From cc251e6ae42e1eaa43e56fc6e62ab0b6476d90e0 Mon Sep 17 00:00:00 2001
From: Rafael Fontenelle <rffontenelle@gmail.com>
Date: Tue, 13 Oct 2015 03:39:04 +0000
Subject: [PATCH 21/44] Updated Brazilian Portuguese translation

---
 po/pt_BR.po | 1099 ++++++++++++++++++++++++++++++---------------------
 1 file changed, 651 insertions(+), 448 deletions(-)

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7dc3d655..ceef972a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,5 +1,5 @@
 # Brazilian Portuguese translation of meld.
-# Copyright (C) 2014 Free Software Foundation, Inc.
+# Copyright (C) 2015 Free Software Foundation, Inc.
 # This file is distributed under the same license as the meld package.
 # Raphael Higino <In memoriam>, 2004.
 # Djavan Fagundes <dnoway@gmail.com>, 2008, 2009.
@@ -9,38 +9,47 @@
 # Gabriel Speckhahn <gabspeck@gmail.com>, 2011.
 # Florêncio Neves <florencioneves@gmail.com>, 2012.
 # Enrico Nicoletto <liverig@gmail.com>, 2013.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
+# Rafael Fontenelle <rffontenelle@gmail.com>, 2013, 2014, 2015.
 #
 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: 2014-07-14 21:51+0000\n"
-"PO-Revision-Date: 2014-07-14 22:43-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
+"POT-Creation-Date: 2015-10-12 23:58+0000\n"
+"PO-Revision-Date: 2015-10-13 00:36-0300\n"
+"Last-Translator: Rafael Fontenelle <rffontenelle@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\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.6.5\n"
+"X-Generator: Poedit 1.8.5\n"
 "X-Project-Style: gnome\n"
 
-#: ../bin/meld:134
+#: ../bin/meld:144
 msgid "Cannot import: "
 msgstr "Não foi possível importar: "
 
-#: ../bin/meld:137
+#: ../bin/meld:147
 #, c-format
 msgid "Meld requires %s or higher."
 msgstr "Meld requer %s ou superior."
 
-#: ../bin/meld:141
+#: ../bin/meld:151
 msgid "Meld does not support Python 3."
 msgstr "Meld não tem suporte a Python 3."
 
+#: ../bin/meld:201
+#, c-format
+msgid ""
+"Couldn't load Meld-specific CSS (%s)\n"
+"%s"
+msgstr ""
+"Não foi possível carregar CSS específico do Meld (%s)\n"
+"%s"
+
 #: ../data/meld.desktop.in.h:1 ../data/ui/meldapp.ui.h:1
 msgid "Meld"
 msgstr "Meld"
@@ -87,7 +96,6 @@ msgid "Default window size"
 msgstr "Tamanho padrão da janela"
 
 #: ../data/org.gnome.meld.gschema.xml.h:2
-#| msgid "Default window size"
 msgid "Default window state"
 msgstr "Estado padrão da janela"
 
@@ -159,10 +167,18 @@ msgstr ""
 "próprio do Meld, isso está desativado por padrão."
 
 #: ../data/org.gnome.meld.gschema.xml.h:17
+msgid "Color scheme to use for syntax highlighting"
+msgstr "Esquema de cores a ser usada para realce de sintaxe"
+
+#: ../data/org.gnome.meld.gschema.xml.h:18
+msgid "Used by GtkSourceView to determine colors for syntax highlighting"
+msgstr "Usado pelo GtkSourceView para determinar cores para realce de sintaxe"
+
+#: ../data/org.gnome.meld.gschema.xml.h:19
 msgid "Displayed whitespace"
 msgstr "Espaço em branco exibido"
 
-#: ../data/org.gnome.meld.gschema.xml.h:18
+#: ../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'."
@@ -170,11 +186,11 @@ msgstr ""
 "Seletor para tipos de caracteres de espaço em branco individuais a serem "
 "mostrados. Valores possíveis são \"space\", \"tab\", \"newline\" e \"nbsp\"."
 
-#: ../data/org.gnome.meld.gschema.xml.h:19
+#: ../data/org.gnome.meld.gschema.xml.h:21
 msgid "Wrap mode"
 msgstr "Quebra de linha"
 
-#: ../data/org.gnome.meld.gschema.xml.h:20
+#: ../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,11 +200,11 @@ msgstr ""
 "configuração, seja nenhuma (\"none\"), seja em qualquer caractere (\"char"
 "\"), seja apenas ao final das palavras (\"word\")."
 
-#: ../data/org.gnome.meld.gschema.xml.h:21
+#: ../data/org.gnome.meld.gschema.xml.h:23
 msgid "Highlight current line"
 msgstr "Destacar a linha atual"
 
-#: ../data/org.gnome.meld.gschema.xml.h:22
+#: ../data/org.gnome.meld.gschema.xml.h:24
 msgid ""
 "If true, the line containing the cursor will be highlighted in file "
 "comparisons."
@@ -196,23 +212,22 @@ msgstr ""
 "Se verdadeiro, a linha contendo o cursor será destacada nas comparações de "
 "arquivos."
 
-#: ../data/org.gnome.meld.gschema.xml.h:23
+#: ../data/org.gnome.meld.gschema.xml.h:25
 msgid "Use the system default monospace font"
 msgstr "Usa a fonte mono-espaçada padrão do sistema"
 
-#: ../data/org.gnome.meld.gschema.xml.h:24
+#: ../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 ""
-"Se falso, a fonte personalizada definida será usada ao invés da fonte mono-"
-"espaçada do sistema."
+"Se falso, a fonte personalizada será usada ao invés da fonte monoespaçada do "
+"sistema."
 
-#: ../data/org.gnome.meld.gschema.xml.h:25
+#: ../data/org.gnome.meld.gschema.xml.h:27
 msgid "Custom font"
 msgstr "Fonte personalizada"
 
-#: ../data/org.gnome.meld.gschema.xml.h:26
+#: ../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."
@@ -220,34 +235,34 @@ msgstr ""
 "A fonte personalizada para usar, armazenada como um texto e interpretada "
 "como uma descrição de fonte Pango."
 
-#: ../data/org.gnome.meld.gschema.xml.h:27
+#: ../data/org.gnome.meld.gschema.xml.h:29
 msgid "Ignore blank lines when comparing files"
 msgstr "Ignorar linhas vazias ao comparar arquivos"
 
-#: ../data/org.gnome.meld.gschema.xml.h:28
+#: ../data/org.gnome.meld.gschema.xml.h:30
 msgid ""
 "If true, blank lines will be trimmed when highlighting changes between files."
 msgstr ""
 "Se verdadeiro, linhas vazias serão aparadas ao destacar alterações entre "
 "arquivos."
 
-#: ../data/org.gnome.meld.gschema.xml.h:29
+#: ../data/org.gnome.meld.gschema.xml.h:31
 msgid "Use the system default editor"
 msgstr "Usar o editor padrão do sistema"
 
-#: ../data/org.gnome.meld.gschema.xml.h:30
+#: ../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 ""
-"Se falso, o editor personalizado definido será usado ao invés do editor do "
+"Se falso, o comando de editor personalizado será usado ao invés do editor do "
 "sistema ao abrir arquivos externamente."
 
-#: ../data/org.gnome.meld.gschema.xml.h:31
+#: ../data/org.gnome.meld.gschema.xml.h:33
 msgid "The custom editor launch command"
 msgstr "O comando para iniciar o editor personalizado"
 
-#: ../data/org.gnome.meld.gschema.xml.h:32
+#: ../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."
@@ -256,11 +271,11 @@ msgstr ""
 "limitados têm suporte aqui; no momento \"{file}\" e \"{line}\" são tokens "
 "reconhecidos."
 
-#: ../data/org.gnome.meld.gschema.xml.h:33
+#: ../data/org.gnome.meld.gschema.xml.h:35
 msgid "Columns to display"
 msgstr "Coluna para exibir"
 
-#: ../data/org.gnome.meld.gschema.xml.h:34
+#: ../data/org.gnome.meld.gschema.xml.h:36
 msgid ""
 "List of column names in folder comparison and whether they should be "
 "displayed."
@@ -268,11 +283,11 @@ msgstr ""
 "Lista de nomes de colunas na comparação de diretórios e se eles deveriam ser "
 "exibidos."
 
-#: ../data/org.gnome.meld.gschema.xml.h:35 ../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 "Ignora ligações simbólicas"
 
-#: ../data/org.gnome.meld.gschema.xml.h:36
+#: ../data/org.gnome.meld.gschema.xml.h:38
 msgid ""
 "If true, folder comparisons do not follow symbolic links when traversing the "
 "folder tree."
@@ -280,11 +295,11 @@ msgstr ""
 "Se verdadeiro, comparações de pastas não seguirão ligações simbólicas ao "
 "atravessar a árvore de pastas."
 
-#: ../data/org.gnome.meld.gschema.xml.h:37
+#: ../data/org.gnome.meld.gschema.xml.h:39
 msgid "Use shallow comparison"
 msgstr "Usa comparação superficial"
 
-#: ../data/org.gnome.meld.gschema.xml.h:38
+#: ../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 "
@@ -294,11 +309,11 @@ msgstr ""
 "tamanho e mtime, considerando arquivos como sendo idênticos se seu tamanho e "
 "mtime corresponderem; do contrário, diferentes."
 
-#: ../data/org.gnome.meld.gschema.xml.h:39
+#: ../data/org.gnome.meld.gschema.xml.h:41
 msgid "File timestamp resolution"
 msgstr "Resolução da marca de tempo de arquivo"
 
-#: ../data/org.gnome.meld.gschema.xml.h:40
+#: ../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 "
@@ -310,21 +325,35 @@ msgstr ""
 "mtimes diferentes. Isso é útil quando se está comparando arquivos entre "
 "sistemas de arquivos com diferentes resolução de marca de tempo."
 
-#: ../data/org.gnome.meld.gschema.xml.h:41
+#: ../data/org.gnome.meld.gschema.xml.h:43 ../data/ui/preferences.ui.h:30
+msgid "Apply text filters during folder comparisons"
+msgstr "Aplicar filtros de texto durante comparação de pastas"
+
+#: ../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 ""
+"Se verdadeiro, comparações entre pastas que comparem conteúdos de arquivo "
+"também se aplicarão a filtros de texto ativos e à opção de aparar linhas "
+"vazias, e ignorar diferenças de nova linha."
+
+#: ../data/org.gnome.meld.gschema.xml.h:45
 msgid "File status filters"
 msgstr "Filtros de status de arquivo"
 
-#: ../data/org.gnome.meld.gschema.xml.h:42
+#: ../data/org.gnome.meld.gschema.xml.h:46
 msgid "List of statuses used to filter visible files in folder comparison."
 msgstr ""
 "Lista de status usados para filtrar arquivos visíveis na comparação de "
 "pastas."
 
-#: ../data/org.gnome.meld.gschema.xml.h:43
+#: ../data/org.gnome.meld.gschema.xml.h:47
 msgid "Show the version control console output"
 msgstr "Mostra a saída de console de controle de versão"
 
-#: ../data/org.gnome.meld.gschema.xml.h:44
+#: ../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."
@@ -333,11 +362,11 @@ msgstr ""
 "controle de versão, mostrando os comandos executados para operações de "
 "controle de versão."
 
-#: ../data/org.gnome.meld.gschema.xml.h:45
+#: ../data/org.gnome.meld.gschema.xml.h:49
 msgid "Version control pane position"
 msgstr "Posição do painel de controle de versão"
 
-#: ../data/org.gnome.meld.gschema.xml.h:46
+#: ../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."
@@ -345,11 +374,11 @@ msgstr ""
 "Essa é a altura da árvore principal de controle de versão quando o painel de "
 "console é mostrado."
 
-#: ../data/org.gnome.meld.gschema.xml.h:47
+#: ../data/org.gnome.meld.gschema.xml.h:51
 msgid "Present version comparisons as left-local/right-remote"
 msgstr "Apresenta comparações de versões como esquerda-local/direita-remoto"
 
-#: ../data/org.gnome.meld.gschema.xml.h:48
+#: ../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, "
@@ -360,26 +389,26 @@ msgstr ""
 "apresentados arquivos nos painéis. Do contrário, um esquema esquerda-é-deles "
 "e direita-é-meu é usado."
 
-#: ../data/org.gnome.meld.gschema.xml.h:49
+#: ../data/org.gnome.meld.gschema.xml.h:53
 msgid "Order for files in three-way version control merge comparisons"
 msgstr "Ordena por arquivos em comparações de controle de versão em três-vias"
 
-#: ../data/org.gnome.meld.gschema.xml.h:50
+#: ../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 ""
-"Escolhas por ordem de arquivo estão remota/mesclar/local e local/mesclado/"
-"remoto. Essa preferência afeta somente comparações em três-vias iniciado da "
+"Escolhas por ordem de arquivo são remoto/mesclado/local e local/mesclado/"
+"remoto. Essa preferência afeta somente comparações em três-vias iniciadas da "
 "visão de controle de versão, de forma que seja usado apenas para resolução "
 "de conflitos/mesclagem dentro do Meld."
 
-#: ../data/org.gnome.meld.gschema.xml.h:51
+#: ../data/org.gnome.meld.gschema.xml.h:55
 msgid "Show margin in commit message editor"
 msgstr "Mostrae margem no editor de mensagens de commit"
 
-#: ../data/org.gnome.meld.gschema.xml.h:52
+#: ../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."
@@ -387,45 +416,46 @@ msgstr ""
 "Se verdadeiro, um guia será exibido para mostrar em qual coluna a margem "
 "está no editor de mensagens de commit de controle de versão."
 
-#: ../data/org.gnome.meld.gschema.xml.h:53
+#: ../data/org.gnome.meld.gschema.xml.h:57
 msgid "Margin column in commit message editor"
 msgstr "Coluna margem no editor de mensagens de commit"
 
-#: ../data/org.gnome.meld.gschema.xml.h:54
+#: ../data/org.gnome.meld.gschema.xml.h:58
 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 ""
-"A coluna da margem está no editor de mensagens de commit de controle de "
-"versão."
+"A coluna na qual deve ser mostrada a margem do editor de mensagens de commit "
+"de controle de versão."
 
-#: ../data/org.gnome.meld.gschema.xml.h:55
+#: ../data/org.gnome.meld.gschema.xml.h:59
 msgid "Automatically hard-wrap commit messages"
 msgstr "Inserir quebra de linha automaticamente em mensagens de commit"
 
-#: ../data/org.gnome.meld.gschema.xml.h:56
+#: ../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 ""
 "Se verdadeiro, o editor de mensagens de commit de controle de versão vai "
-"inserir quebra de linha na margem de commit definida antes de fazer o commit."
+"inserir quebra de linha na margem de commit antes de fazer o commit."
 
-#: ../data/org.gnome.meld.gschema.xml.h:57
+#: ../data/org.gnome.meld.gschema.xml.h:61
 msgid "Version control status filters"
 msgstr "Filtros de status de controle de versão"
 
-#: ../data/org.gnome.meld.gschema.xml.h:58
+#: ../data/org.gnome.meld.gschema.xml.h:62
 msgid ""
 "List of statuses used to filter visible files in version control comparison."
 msgstr ""
 "Lista de status usados para filtrar arquivos visíveis me comparação de "
 "controle de versão."
 
-#: ../data/org.gnome.meld.gschema.xml.h:59
+#: ../data/org.gnome.meld.gschema.xml.h:63
 msgid "Filename-based filters"
 msgstr "Filtros baseados em nome de arquivo"
 
-#: ../data/org.gnome.meld.gschema.xml.h:60
+#: ../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."
@@ -433,11 +463,11 @@ msgstr ""
 "Lista de filtros pré-determinados baseados em nome de arquivo que, se ativa, "
 "vai remover arquivos correspondentes de uma comparação de pastas."
 
-#: ../data/org.gnome.meld.gschema.xml.h:61
+#: ../data/org.gnome.meld.gschema.xml.h:65
 msgid "Text-based filters"
 msgstr "Filtros baseados em texto"
 
-#: ../data/org.gnome.meld.gschema.xml.h:62
+#: ../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, "
@@ -501,16 +531,16 @@ msgid "Compare selected files"
 msgstr "Compara os arquivos selecionados"
 
 #: ../data/ui/dirdiff.ui.h:3
-msgid "Copy _Left"
-msgstr "Copiar para a _esquerda"
+msgid "Copy to _Left"
+msgstr "Copia para a _esquerda"
 
 #: ../data/ui/dirdiff.ui.h:4
 msgid "Copy to left"
 msgstr "Copia para a esquerda"
 
 #: ../data/ui/dirdiff.ui.h:5
-msgid "Copy _Right"
-msgstr "Copiar para a _direita"
+msgid "Copy to _Right"
+msgstr "Copia para a _direita"
 
 #: ../data/ui/dirdiff.ui.h:6
 msgid "Copy to right"
@@ -520,7 +550,7 @@ msgstr "Copia para a direita"
 msgid "Delete selected"
 msgstr "Exclui os selecionados"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1448
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:881 ../meld/filediff.py:1489
 msgid "Hide"
 msgstr "Ocultar"
 
@@ -587,7 +617,7 @@ msgid "_Add"
 msgstr "_Adicionar"
 
 #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:747
+#: ../meld/vcview.py:762
 msgid "_Remove"
 msgstr "_Remover"
 
@@ -608,8 +638,7 @@ msgid "Move _Down"
 msgstr "Mover para _baixo"
 
 #. 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 ../meld/dirdiff.py:374 ../meld/vcview.py:215
 msgid "Name"
 msgstr "Nome"
 
@@ -626,26 +655,200 @@ msgid "Remove selected filter"
 msgstr "Remove o filtro selecionado"
 
 #: ../data/ui/filediff.ui.h:1
+msgid "Format as Patch..."
+msgstr "Formatar como patch..."
+
+#: ../data/ui/filediff.ui.h:2
+msgid "Create a patch using differences between files"
+msgstr "Cria um patch usando as diferenças entre os arquivos"
+
+#: ../data/ui/filediff.ui.h:3
+msgid "Save A_ll"
+msgstr "Salvar _todos"
+
+#: ../data/ui/filediff.ui.h:4
+msgid "Save all files in the current comparison"
+msgstr "Salva todos os arquivos na comparação atual"
+
+#: ../data/ui/filediff.ui.h:5
+msgid "Revert files to their saved versions"
+msgstr "Reverte arquivos para suas versões salvas"
+
+#: ../data/ui/filediff.ui.h:6
+msgid "Add Synchronization Point"
+msgstr "Adicionar ponto de sincronização"
+
+#: ../data/ui/filediff.ui.h:7
+msgid "Add a synchronization point for changes between files"
+msgstr "Adiciona um ponto de sincronização das alterações entre arquivos"
+
+#: ../data/ui/filediff.ui.h:8
+msgid "Clear Synchronization Points"
+msgstr "Limpar pontos de sincronização"
+
+#: ../data/ui/filediff.ui.h:9
+msgid "Clear sychronization points for changes between files"
+msgstr "Limpa pontos de sincronização das alterações entre arquivos"
+
+#: ../data/ui/filediff.ui.h:10
+msgid "Previous Conflict"
+msgstr "Conflito anterior"
+
+#: ../data/ui/filediff.ui.h:11
+msgid "Go to the previous conflict"
+msgstr "Vai ao conflito anterior"
+
+#: ../data/ui/filediff.ui.h:12
+msgid "Next Conflict"
+msgstr "Próximo conflito"
+
+#: ../data/ui/filediff.ui.h:13
+msgid "Go to the next conflict"
+msgstr "Vai ao próximo conflito"
+
+#: ../data/ui/filediff.ui.h:14
+msgid "Push to Left"
+msgstr "Levar para a esquerda"
+
+#: ../data/ui/filediff.ui.h:15
+msgid "Push current change to the left"
+msgstr "Leva a alteração atual para a esquerda"
+
+#: ../data/ui/filediff.ui.h:16
+msgid "Push to Right"
+msgstr "Levar para a direita"
+
+#: ../data/ui/filediff.ui.h:17
+msgid "Push current change to the right"
+msgstr "Leva a alteração atual para a direita"
+
+#: ../data/ui/filediff.ui.h:18
+msgid "Pull from Left"
+msgstr "Puxar da esquerda"
+
+#: ../data/ui/filediff.ui.h:19
+msgid "Pull change from the left"
+msgstr "Puxa a alteração da esquerda"
+
+#: ../data/ui/filediff.ui.h:20
+msgid "Pull from Right"
+msgstr "Puxar da direita"
+
+#: ../data/ui/filediff.ui.h:21
+msgid "Pull change from the right"
+msgstr "Puxa a alteração da direita"
+
+#: ../data/ui/filediff.ui.h:22
+msgid "Copy Above Left"
+msgstr "Copiar acima da esquerda"
+
+#: ../data/ui/filediff.ui.h:23
+msgid "Copy change above the left chunk"
+msgstr "Copia a alteração acima do trecho à esquerda"
+
+#: ../data/ui/filediff.ui.h:24
+msgid "Copy Below Left"
+msgstr "Copiar abaixo da esquerda"
+
+#: ../data/ui/filediff.ui.h:25
+msgid "Copy change below the left chunk"
+msgstr "Copia a alteração abaixo do trecho à esquerda"
+
+#: ../data/ui/filediff.ui.h:26
+msgid "Copy Above Right"
+msgstr "Copiar acima da direita"
+
+#: ../data/ui/filediff.ui.h:27
+msgid "Copy change above the right chunk"
+msgstr "Copia a alteração acima do trecho à direita"
+
+#: ../data/ui/filediff.ui.h:28
+msgid "Copy Below Right"
+msgstr "Copiar abaixo da direita"
+
+#: ../data/ui/filediff.ui.h:29
+msgid "Copy change below the right chunk"
+msgstr "Copia a alteração abaixo do trecho à direita"
+
+#: ../data/ui/filediff.ui.h:30
+msgid "Delete"
+msgstr "Excluir"
+
+#: ../data/ui/filediff.ui.h:31
+msgid "Delete change"
+msgstr "Exclui a alteração"
+
+#: ../data/ui/filediff.ui.h:32
+msgid "Merge All from Left"
+msgstr "Mesclar todas da esquerda"
+
+#: ../data/ui/filediff.ui.h:33
+msgid "Merge all non-conflicting changes from the left"
+msgstr "Mescla todas as alterações não conflitantes da esquerda"
+
+#: ../data/ui/filediff.ui.h:34
+msgid "Merge All from Right"
+msgstr "Mesclar todas da direita"
+
+#: ../data/ui/filediff.ui.h:35
+msgid "Merge all non-conflicting changes from the right"
+msgstr "Mescla todas as alterações não conflitantes da direita"
+
+#: ../data/ui/filediff.ui.h:36
+msgid "Merge All"
+msgstr "Mesclar todas"
+
+#: ../data/ui/filediff.ui.h:37
+msgid "Merge all non-conflicting changes from left and right panes"
+msgstr ""
+"Mescla todas as alterações não conflitantes dos painéis esquerdo e direito"
+
+#: ../data/ui/filediff.ui.h:38
+msgid "Previous Pane"
+msgstr "Painel anterior"
+
+#: ../data/ui/filediff.ui.h:39
+msgid "Move keyboard focus to the previous document in this comparison"
+msgstr "Move o foco do teclado ao documento anterior nesta comparação"
+
+#: ../data/ui/filediff.ui.h:40
+msgid "Next Pane"
+msgstr "Próximo painel"
+
+#: ../data/ui/filediff.ui.h:41
+msgid "Move keyboard focus to the next document in this comparison"
+msgstr "Move o foco do teclado ao próximo documento nesta comparação"
+
+#: ../data/ui/filediff.ui.h:42
+msgid "Lock Scrolling"
+msgstr "Bloquear rolagem"
+
+#: ../data/ui/filediff.ui.h:43
+msgid "Lock scrolling of all panes"
+msgstr "Bloqueia a rolagem de todos os painéis"
+
+#: ../data/ui/filediff.ui.h:44
 msgid "Save changes to documents before closing?"
 msgstr "Salvar mudanças em documentos antes de fechar?"
 
-#: ../data/ui/filediff.ui.h:2
+#: ../data/ui/filediff.ui.h:45
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Se você não salvar, as mudanças serão perdidas permanentemente."
 
-#: ../data/ui/filediff.ui.h:3
+#: ../data/ui/filediff.ui.h:46
 msgid "Close _without Saving"
 msgstr "_Fechar sem salvar"
 
-#: ../data/ui/filediff.ui.h:4
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:972 ../meld/filediff.py:1658
+#: ../meld/filediff.py:1742 ../meld/filediff.py:1767
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../data/ui/filediff.ui.h:5
+#: ../data/ui/filediff.ui.h:48
 msgid "_Save"
 msgstr "_Salvar"
 
-#: ../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."
@@ -654,28 +857,28 @@ msgstr ""
 "esse arquivo e fazer as mudanças de qualquer forma, mas elas devem ser "
 "salvas em um novo arquivo."
 
-#: ../data/ui/filediff.ui.h:7
+#: ../data/ui/filediff.ui.h:50
 msgid "File 3"
 msgstr "Arquivo 3"
 
-#: ../data/ui/filediff.ui.h:8
+#: ../data/ui/filediff.ui.h:51
 msgid "File 2"
 msgstr "Arquivo 2"
 
-#: ../data/ui/filediff.ui.h:9
+#: ../data/ui/filediff.ui.h:52
 msgid "File 1"
 msgstr "Arquivo 1"
 
-#: ../data/ui/filediff.ui.h:10
+#: ../data/ui/filediff.ui.h:53
 msgid "Revert unsaved changes to documents?"
 msgstr "Reverter mudanças em documentos?"
 
-#: ../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 ""
 "Mudanças feitas nos seguintes documentos serão perdidas permanentemente:\n"
 
-#: ../data/ui/findbar.ui.h:1
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:973 ../meld/filediff.py:1659
 msgid "_Replace"
 msgstr "_Substituir"
 
@@ -720,29 +923,29 @@ msgid "Format as Patch"
 msgstr "Formatar como patch"
 
 #: ../data/ui/patch-dialog.ui.h:2
+msgid "Copy to Clipboard"
+msgstr "Copiar para a área de transferência"
+
+#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:125
+msgid "Save Patch"
+msgstr "Salvar patch"
+
+#: ../data/ui/patch-dialog.ui.h:4
 msgid "Use differences between:"
 msgstr "Usar as diferenças entre:"
 
-#: ../data/ui/patch-dialog.ui.h:3
+#: ../data/ui/patch-dialog.ui.h:5
 msgid "Left and middle panes"
 msgstr "Painéis esquerdo e central"
 
-#: ../data/ui/patch-dialog.ui.h:4
+#: ../data/ui/patch-dialog.ui.h:6
 msgid "Middle and right panes"
 msgstr "Painéis central e direito"
 
-#: ../data/ui/patch-dialog.ui.h:5
+#: ../data/ui/patch-dialog.ui.h:7
 msgid "_Reverse patch direction"
 msgstr "_Reverter direção do patch"
 
-#: ../data/ui/patch-dialog.ui.h:6
-msgid "Copy to Clipboard"
-msgstr "Copiar para a área de transferência"
-
-#: ../data/ui/patch-dialog.ui.h:7 ../meld/patchdialog.py:119
-msgid "Save Patch"
-msgstr "Salvar patch"
-
 #: ../data/ui/preferences.ui.h:1
 msgid "Left is remote, right is local"
 msgstr "Esquerda é remoto, direita é local"
@@ -828,78 +1031,82 @@ msgid "Use s_yntax highlighting"
 msgstr "Usar de_staque de sintaxe"
 
 #: ../data/ui/preferences.ui.h:22
+msgid "Syntax highlighting color scheme:"
+msgstr "Esquema de cores de realce de sintaxe:"
+
+#: ../data/ui/preferences.ui.h:23
 msgid "External Editor"
 msgstr "Editor externo"
 
-#: ../data/ui/preferences.ui.h:23
+#: ../data/ui/preferences.ui.h:24
 msgid "Use _default system editor"
 msgstr "Usar o e_ditor padrão do sistema"
 
-#: ../data/ui/preferences.ui.h:24
+#: ../data/ui/preferences.ui.h:25
 msgid "Edito_r command:"
 msgstr "Comando do edito_r:"
 
-#: ../data/ui/preferences.ui.h:25
+#: ../data/ui/preferences.ui.h:26
 msgid "Editor"
 msgstr "Editor"
 
-#: ../data/ui/preferences.ui.h:26
+#: ../data/ui/preferences.ui.h:27
 msgid "Shallow Comparison"
 msgstr "Comparação superficial"
 
-#: ../data/ui/preferences.ui.h:27
+#: ../data/ui/preferences.ui.h:28
 msgid "C_ompare files based only on size and timestamp"
 msgstr "C_omparar arquivos baseando-se apenas no tamanho e marca de tempo"
 
-#: ../data/ui/preferences.ui.h:28
+#: ../data/ui/preferences.ui.h:29
 msgid "_Timestamp resolution:"
 msgstr "Resolução da marca de _tempo:"
 
-#: ../data/ui/preferences.ui.h:29
+#: ../data/ui/preferences.ui.h:31
 msgid "Symbolic Links"
 msgstr "Ligações simbólicas"
 
-#: ../data/ui/preferences.ui.h:31
+#: ../data/ui/preferences.ui.h:33
 msgid "Visible Columns"
 msgstr "Colunas visíveis"
 
-#: ../data/ui/preferences.ui.h:32
+#: ../data/ui/preferences.ui.h:34
 msgid "Folder Comparisons"
 msgstr "Comparação de pastas"
 
-#: ../data/ui/preferences.ui.h:33
+#: ../data/ui/preferences.ui.h:35
 msgid "Version Comparisons"
 msgstr "Comparação de versões"
 
-#: ../data/ui/preferences.ui.h:34
+#: ../data/ui/preferences.ui.h:36
 msgid "_Order when comparing file revisions:"
 msgstr "_Ordenar ao comparar revisões de arquivo:"
 
-#: ../data/ui/preferences.ui.h:35
+#: ../data/ui/preferences.ui.h:37
 msgid "Order when _merging files:"
 msgstr "Ordenar ao _mesclar arquivos:"
 
-#: ../data/ui/preferences.ui.h:36
+#: ../data/ui/preferences.ui.h:38
 msgid "Commit Messages"
 msgstr "Mensagens de commit"
 
-#: ../data/ui/preferences.ui.h:37
+#: ../data/ui/preferences.ui.h:39
 msgid "Show _right margin at:"
 msgstr "Mostrar ma_rgem esquerda em:"
 
-#: ../data/ui/preferences.ui.h:38
+#: ../data/ui/preferences.ui.h:40
 msgid "Automatically _break lines at right margin on commit"
 msgstr "Que_brar linhas automaticamente na margem esquerda no commit"
 
-#: ../data/ui/preferences.ui.h:39
+#: ../data/ui/preferences.ui.h:41
 msgid "Version Control"
 msgstr "Controle de versão"
 
-#: ../data/ui/preferences.ui.h:40
+#: ../data/ui/preferences.ui.h:42
 msgid "Filename filters"
 msgstr "Filtros de nome de arquivo"
 
-#: ../data/ui/preferences.ui.h:41
+#: ../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 "
@@ -909,23 +1116,23 @@ msgstr ""
 "arquivos e diretórios por nome. Cada padrão é um lista com caracteres "
 "curingas (* ou ?) separados por espaços."
 
-#: ../data/ui/preferences.ui.h:42 ../meld/meldwindow.py:103
+#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:103
 msgid "File Filters"
 msgstr "Filtros de arquivos"
 
-#: ../data/ui/preferences.ui.h:43
+#: ../data/ui/preferences.ui.h:45
 msgid "Change trimming"
 msgstr "Aparar alterações"
 
-#: ../data/ui/preferences.ui.h:44
+#: ../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"
 
-#: ../data/ui/preferences.ui.h:45
+#: ../data/ui/preferences.ui.h:47
 msgid "Text filters"
 msgstr "Filtros de texto"
 
-#: ../data/ui/preferences.ui.h:46
+#: ../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 "
@@ -939,11 +1146,11 @@ msgstr ""
 "da comparação. Se a expressão contém grupos, somente os grupos são "
 "substituídos. Veja o manual do usuário para maiores detalhes."
 
-#: ../data/ui/preferences.ui.h:47
+#: ../data/ui/preferences.ui.h:49
 msgid "Text Filters"
 msgstr "Filtros de texto"
 
-#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:623
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:625
 msgid "New comparison"
 msgstr "Nova comparação"
 
@@ -1137,57 +1344,103 @@ msgstr ""
 msgid "_Push commits"
 msgstr "En_viar commits (push)"
 
+#: ../meld/const.py:10
+msgid "UNIX (LF)"
+msgstr "UNIX (LF)"
+
+#: ../meld/const.py:11
+msgid "DOS/Windows (CR-LF)"
+msgstr "DOS/Windows (CR-LF)"
+
+#: ../meld/const.py:12
+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 "Tamanho"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:389 ../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:397 ../meld/preferences.py:84
+#: ../meld/dirdiff.py:408 ../meld/preferences.py:84
 msgid "Permissions"
 msgstr "Permissões"
 
-#: ../meld/dirdiff.py:543
+#: ../meld/dirdiff.py:561
 #, python-format
 msgid "Hide %s"
 msgstr "Ocultar %s"
 
-#: ../meld/dirdiff.py:672 ../meld/dirdiff.py:694
+#: ../meld/dirdiff.py:693 ../meld/dirdiff.py:715
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Varrendo %s"
 
-#: ../meld/dirdiff.py:823
+#: ../meld/dirdiff.py:848
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Concluído"
 
-#: ../meld/dirdiff.py:830
+#: ../meld/dirdiff.py:856
+msgid "Folders have no differences"
+msgstr "As pastas têm nenhuma diferença"
+
+#: ../meld/dirdiff.py:858
+msgid "Contents of scanned files in folders are identical."
+msgstr "Conteúdos de arquivos verificados em pastas são idênticos."
+
+#: ../meld/dirdiff.py:860
+msgid ""
+"Scanned files in folders appear identical, but contents have not been "
+"scanned."
+msgstr ""
+"Arquivos verificados em pastas parecem ser idênticos, mas conteúdos não "
+"foram verificados."
+
+#: ../meld/dirdiff.py:863
+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:865
+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:883 ../meld/dirdiff.py:936 ../meld/filediff.py:1129
+#: ../meld/filediff.py:1161 ../meld/filediff.py:1296 ../meld/filediff.py:1491
+#: ../meld/filediff.py:1521 ../meld/filediff.py:1523
+msgid "Hi_de"
+msgstr "Ocu_ltar"
+
+#: ../meld/dirdiff.py:893
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Ocorreram vários erros ao varrer este diretório"
 
-#: ../meld/dirdiff.py:831
+#: ../meld/dirdiff.py:894
 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:833
+#: ../meld/dirdiff.py:896
 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:835
+#: ../meld/dirdiff.py:898
 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:837
+#: ../meld/dirdiff.py:900
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1196,30 +1449,30 @@ msgstr ""
 "minúsculas em um sistema de arquivos que diferencia. Os seguintes arquivos "
 "neste diretório ficam ocultos:"
 
-#: ../meld/dirdiff.py:848
+#: ../meld/dirdiff.py:911
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "\"%s\" ocultado por \"%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 "Ocu_ltar"
+#: ../meld/dirdiff.py:976
+#, python-format
+msgid "Replace folder “%s”?"
+msgstr "Substituir pasta \"%s\"?"
 
-#: ../meld/dirdiff.py:904
+#: ../meld/dirdiff.py:978
 #, 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\" já existe.\n"
-"Sobrescrevê-lo?"
+"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:912
+#: ../meld/dirdiff.py:991
 msgid "Error copying file"
 msgstr "Erro ao copiar arquivo"
 
-#: ../meld/dirdiff.py:913
+#: ../meld/dirdiff.py:992
 #, python-format
 msgid ""
 "Couldn't copy %s\n"
@@ -1232,269 +1485,122 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/dirdiff.py:936
+#: ../meld/dirdiff.py:1015
 #, python-format
 msgid "Error deleting %s"
 msgstr "Erro ao excluir %s"
 
-#: ../meld/filediff.py:243
-msgid "Format as Patch..."
-msgstr "Formatar como patch..."
-
-#: ../meld/filediff.py:244
-msgid "Create a patch using differences between files"
-msgstr "Cria um patch usando as diferenças entre os arquivos"
-
-#: ../meld/filediff.py:246
-msgid "Save A_ll"
-msgstr "Salvar _todos"
-
-#: ../meld/filediff.py:247
-msgid "Save all files in the current comparison"
-msgstr "Salva todos os arquivos na comparação atual"
-
-#: ../meld/filediff.py:250
-msgid "Revert files to their saved versions"
-msgstr "Reverte arquivos para suas versões salvas"
-
-#: ../meld/filediff.py:252
-msgid "Add Synchronization Point"
-msgstr "Adicionar ponto de sincronização"
-
-#: ../meld/filediff.py:253
-msgid "Add a manual point for synchronization of changes between files"
-msgstr ""
-"Adiciona um ponto manual para sincronização de alterações entre arquivos"
-
-#: ../meld/filediff.py:256
-msgid "Clear Synchronization Points"
-msgstr "Limpar pontos de sincronização"
-
-#: ../meld/filediff.py:257
-msgid "Clear manual change sychronization points"
-msgstr "Limpa alterações manuais de pontos de sincronização"
-
-#: ../meld/filediff.py:259
-msgid "Previous Conflict"
-msgstr "Conflito anterior"
-
-#: ../meld/filediff.py:260
-msgid "Go to the previous conflict"
-msgstr "Vai ao conflito anterior"
-
-#: ../meld/filediff.py:262
-msgid "Next Conflict"
-msgstr "Próximo conflito"
-
-#: ../meld/filediff.py:263
-msgid "Go to the next conflict"
-msgstr "Vai ao próximo conflito"
-
-#: ../meld/filediff.py:265
-msgid "Push to Left"
-msgstr "Levar para a esquerda"
-
-#: ../meld/filediff.py:266
-msgid "Push current change to the left"
-msgstr "Leva a alteração atual para a esquerda"
-
-#: ../meld/filediff.py:269
-msgid "Push to Right"
-msgstr "Levar para a direita"
-
-#: ../meld/filediff.py:270
-msgid "Push current change to the right"
-msgstr "Leva a alteração atual para a direita"
-
-#: ../meld/filediff.py:274
-msgid "Pull from Left"
-msgstr "Puxar da esquerda"
-
-#: ../meld/filediff.py:275
-msgid "Pull change from the left"
-msgstr "Puxa a alteração da esquerda"
-
-#: ../meld/filediff.py:278
-msgid "Pull from Right"
-msgstr "Puxar da direita"
-
-#: ../meld/filediff.py:279
-msgid "Pull change from the right"
-msgstr "Puxa a alteração da direita"
-
-#: ../meld/filediff.py:281
-msgid "Copy Above Left"
-msgstr "Copiar acima da esquerda"
-
-#: ../meld/filediff.py:282
-msgid "Copy change above the left chunk"
-msgstr "Copia a alteração acima do trecho à esquerda"
-
-#: ../meld/filediff.py:284
-msgid "Copy Below Left"
-msgstr "Copiar abaixo da esquerda"
-
-#: ../meld/filediff.py:285
-msgid "Copy change below the left chunk"
-msgstr "Copia a alteração abaixo do trecho à esquerda"
-
-#: ../meld/filediff.py:287
-msgid "Copy Above Right"
-msgstr "Copiar acima da direita"
-
-#: ../meld/filediff.py:288
-msgid "Copy change above the right chunk"
-msgstr "Copia a alteração acima do trecho à direita"
-
-#: ../meld/filediff.py:290
-msgid "Copy Below Right"
-msgstr "Copiar abaixo da direita"
-
-#: ../meld/filediff.py:291
-msgid "Copy change below the right chunk"
-msgstr "Copia a alteração abaixo do trecho à direita"
-
-#: ../meld/filediff.py:293
-msgid "Delete"
-msgstr "Excluir"
-
-#: ../meld/filediff.py:294
-msgid "Delete change"
-msgstr "Exclui a alteração"
-
-#: ../meld/filediff.py:296
-msgid "Merge All from Left"
-msgstr "Mesclar todas da esquerda"
-
-#: ../meld/filediff.py:297
-msgid "Merge all non-conflicting changes from the left"
-msgstr "Mescla todas as alterações não conflitantes da esquerda"
-
-#: ../meld/filediff.py:299
-msgid "Merge All from Right"
-msgstr "Mesclar todas da direita"
-
-#: ../meld/filediff.py:300
-msgid "Merge all non-conflicting changes from the right"
-msgstr "Mescla todas as alterações não conflitantes da direita"
-
-#: ../meld/filediff.py:302
-msgid "Merge All"
-msgstr "Mesclar todas"
-
-#: ../meld/filediff.py:303
-msgid "Merge all non-conflicting changes from left and right panes"
-msgstr ""
-"Mescla todas as alterações não conflitantes dos painéis esquerdo e direito"
-
-#: ../meld/filediff.py:307
-msgid "Cycle Through Documents"
-msgstr "Fazer ciclo através dos documentos"
-
-#: ../meld/filediff.py:308
-msgid "Move keyboard focus to the next document in this comparison"
-msgstr "Move o foco do teclado ao próximo documento nesta comparação"
-
-#: ../meld/filediff.py:314
-msgid "Lock Scrolling"
-msgstr "Bloquear rolagem"
-
-#: ../meld/filediff.py:315
-msgid "Lock scrolling of all panes"
-msgstr "Bloqueia a rolagem de todos os painéis"
+#: ../meld/dirdiff.py:1520
+msgid "No folder"
+msgstr "Nenhum pasta"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:472
+#: ../meld/filediff.py:410
 msgid "INS"
 msgstr "INS"
 
-#: ../meld/filediff.py:472
+#: ../meld/filediff.py:410
 msgid "OVR"
 msgstr "SBR"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:474
+#: ../meld/filediff.py:412
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Lin %i, Col %i"
 
-#: ../meld/filediff.py:821
+#: ../meld/filediff.py:825
+msgid "Comparison results will be inaccurate"
+msgstr "Resultados da comparação será imprecisa"
+
+#: ../meld/filediff.py:827
 #, python-format
 msgid ""
-"Filter '%s' changed the number of lines in the file. Comparison will be "
-"incorrect. See the user manual for more details."
+"Filter “%s” 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 arquivo. A comparação ficará "
-"incorreta. Veja o manual do usuário para mais detalhes."
+"O filtro \"%s\" 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:890
+#: ../meld/filediff.py:898
 msgid "Mark conflict as resolved?"
 msgstr "Marcar como resolvido?"
 
-#: ../meld/filediff.py:892
+#: ../meld/filediff.py:900
 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:894
+#: ../meld/filediff.py:902
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../meld/filediff.py:895
+#: ../meld/filediff.py:903
 msgid "Mark _Resolved"
 msgstr "Marcar como _resolvido"
 
-#: ../meld/filediff.py:1111
+#: ../meld/filediff.py:1110
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Definir quantidade de painéis"
 
-#: ../meld/filediff.py:1117
+#: ../meld/filediff.py:1123
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Abrindo arquivos"
 
-#: ../meld/filediff.py:1140 ../meld/filediff.py:1150 ../meld/filediff.py:1163
-#: ../meld/filediff.py:1169
+#: ../meld/filediff.py:1146 ../meld/filediff.py:1184 ../meld/filediff.py:1190
 msgid "Could not read file"
 msgstr "Não foi possível ler o arquivo"
 
-#: ../meld/filediff.py:1141
+#: ../meld/filediff.py:1147
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Lendo arquivos"
 
-#: ../meld/filediff.py:1151
+#: ../meld/filediff.py:1156
 #, python-format
-msgid "%s appears to be a binary file."
-msgstr "%s parece ser um arquivo binário."
+msgid "File %s appears to be a binary file."
+msgstr "O arquivo %s parece ser um arquivo binário."
 
-#: ../meld/filediff.py:1164
+#: ../meld/filediff.py:1157
+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:1160
+msgid "Open"
+msgstr "Abrir"
+
+#: ../meld/filediff.py:1185
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s não está nas codificações: %s"
 
-#: ../meld/filediff.py:1202
+#: ../meld/filediff.py:1223
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Analisando diferenças"
 
-#: ../meld/filediff.py:1269
+#: ../meld/filediff.py:1291
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "O arquivo %s foi alterado em disco"
 
-#: ../meld/filediff.py:1270
+#: ../meld/filediff.py:1292
 msgid "Do you want to reload the file?"
 msgstr "Deseja recarregar o arquivo?"
 
-#: ../meld/filediff.py:1273
+#: ../meld/filediff.py:1295
 msgid "_Reload"
 msgstr "_Recarregar"
 
-#: ../meld/filediff.py:1439
+#: ../meld/filediff.py:1454
+msgid "Files are identical"
+msgstr "Os arquivos são idênticos"
+
+#: ../meld/filediff.py:1467
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1502,19 +1608,28 @@ 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:1445
-msgid "Files are identical"
-msgstr "Os arquivos são idênticos"
+#: ../meld/filediff.py:1472
+msgid "Files differ in line endings only"
+msgstr "Arquivos se diferenciam nos fins de linha apenas"
 
-#: ../meld/filediff.py:1453
+#: ../meld/filediff.py:1474
+#, python-format
+msgid ""
+"Files are identical except for differing line endings:\n"
+"%s"
+msgstr ""
+"Arquivos são idênticos, exceto pela diferença entre fins de linha:\n"
+"%s"
+
+#: ../meld/filediff.py:1494
 msgid "Show without filters"
 msgstr "Mostrar sem filtros"
 
-#: ../meld/filediff.py:1475
+#: ../meld/filediff.py:1516
 msgid "Change highlighting incomplete"
 msgstr "Alteração de destaque incompleta"
 
-#: ../meld/filediff.py:1476
+#: ../meld/filediff.py:1517
 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."
@@ -1523,88 +1638,108 @@ 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:1484
+#: ../meld/filediff.py:1525
 msgid "Keep highlighting"
 msgstr "Mantém destaque"
 
-#: ../meld/filediff.py:1486
+#: ../meld/filediff.py:1527
 msgid "_Keep highlighting"
 msgstr "_Manter destaque"
 
-#: ../meld/filediff.py:1617
+#: ../meld/filediff.py:1662
+#, python-format
+msgid "Replace file “%s”?"
+msgstr "Substituir arquivo \"%s\"?"
+
+#: ../meld/filediff.py:1664
 #, python-format
 msgid ""
-"\"%s\" exists!\n"
-"Overwrite?"
+"A file with this name already exists in “%s”.\n"
+"If you replace the existing file, its contents will be lost."
 msgstr ""
-"\"%s\" já existe!\n"
-"Sobrescrevê-lo?"
+"Um arquivo com esse nome já existe em \"%s\".\n"
+"Se você substituir o arquivo existente, seu conteúdo será perdido."
+
+#: ../meld/filediff.py:1682
+#, python-format
+msgid "Could not save file %s."
+msgstr "Não foi possível salvar o arquivo %s."
 
-#: ../meld/filediff.py:1630
+#: ../meld/filediff.py:1683
 #, python-format
 msgid ""
-"Error writing to %s\n"
-"\n"
-"%s."
+"Couldn't save file due to:\n"
+"%s"
 msgstr ""
-"Erro ao escrever em %s\n"
-"\n"
-"%s."
+"Não foi possível salvar o arquivo pois:\n"
+"%s"
 
-#: ../meld/filediff.py:1641
+#: ../meld/filediff.py:1695
 msgid "Save Left Pane As"
 msgstr "Salvar o painel esquerdo como"
 
-#: ../meld/filediff.py:1643
+#: ../meld/filediff.py:1697
 msgid "Save Middle Pane As"
 msgstr "Salvar o painel do meio como"
 
-#: ../meld/filediff.py:1645
+#: ../meld/filediff.py:1699
 msgid "Save Right Pane As"
 msgstr "Salvar o painel direito como"
 
-#: ../meld/filediff.py:1658
+#: ../meld/filediff.py:1713
 #, 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:1660
+#: ../meld/filediff.py:1715
 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:1663
+#: ../meld/filediff.py:1718
 msgid "Save Anyway"
 msgstr "Salvar mesmo assim"
 
-#: ../meld/filediff.py:1664
+#: ../meld/filediff.py:1719
 msgid "Don't Save"
 msgstr "Não salvar"
 
-#: ../meld/filediff.py:1688
+#: ../meld/filediff.py:1745
+msgid "Inconsistent line endings found"
+msgstr "Fins de linha inconsistentes encontrados"
+
+#: ../meld/filediff.py:1747
 #, python-format
 msgid ""
-"This file '%s' contains a mixture of line endings.\n"
-"\n"
-"Which format would you like to use?"
+"'%s' contains a mixture of line endings. Select the line ending format to "
+"use."
 msgstr ""
-"O arquivo \"%s\" contém uma mistura de fins de linha diferentes.\n"
-"\n"
-"Que formato você gostaria de usar?"
+"\"%s\" contém uma mistura de fins de linha. Selecione o formato de fim de "
+"linha que você gostaria de usar."
+
+#: ../meld/filediff.py:1768
+msgid "_Save as UTF-8"
+msgstr "_Salvar como UTF-8"
 
-#: ../meld/filediff.py:1704
+#: ../meld/filediff.py:1771
+#, python-format
+msgid "Couldn't encode text as “%s”"
+msgstr "Não foi possível codificar o texto como \"%s\""
+
+#: ../meld/filediff.py:1773
 #, 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\" contém caracteres não codificáveis com \"%s\"\n"
+"O arquivo \"%s\" contém caracteres que não pode ser codificado usando "
+"codificação \"%s\"\n"
 "Você gostaria de salvar como UTF-8?"
 
-#: ../meld/filediff.py:2065
+#: ../meld/filediff.py:2125
 msgid "Live comparison updating disabled"
 msgstr "Atualização em tempo real de comparação desabilitada"
 
-#: ../meld/filediff.py:2066
+#: ../meld/filediff.py:2126
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1620,102 +1755,107 @@ msgstr ""
 msgid "[%s] Merging files"
 msgstr "[%s] Mesclando arquivos"
 
-#: ../meld/gutterrendererchunk.py:90
+#: ../meld/gutterrendererchunk.py:93
 msgid "Copy _up"
 msgstr "Copiar para ci_ma"
 
-#: ../meld/gutterrendererchunk.py:91
+#: ../meld/gutterrendererchunk.py:94
 msgid "Copy _down"
 msgstr "Copiar para bai_xo"
 
-#: ../meld/meldapp.py:170
+#: ../meld/meldapp.py:175
 msgid "wrong number of arguments supplied to --diff"
 msgstr "número incorreto de argumentos fornecidos para --diff"
 
-#: ../meld/meldapp.py:175
+#: ../meld/meldapp.py:180
 msgid "Start with an empty window"
 msgstr "Iniciar com a janela vazia"
 
-#: ../meld/meldapp.py:176 ../meld/meldapp.py:178
+#: ../meld/meldapp.py:181 ../meld/meldapp.py:183
 msgid "file"
 msgstr "arquivo"
 
-#: ../meld/meldapp.py:176 ../meld/meldapp.py:180
+#: ../meld/meldapp.py:181 ../meld/meldapp.py:185
 msgid "folder"
 msgstr "pasta"
 
-#: ../meld/meldapp.py:177
+#: ../meld/meldapp.py:182
 msgid "Start a version control comparison"
 msgstr "Inicia uma comparação de controle de versões"
 
-#: ../meld/meldapp.py:179
+#: ../meld/meldapp.py:184
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Inicia uma comparação de arquivo em 2 ou 3 vias"
 
-#: ../meld/meldapp.py:181
+#: ../meld/meldapp.py:186
 msgid "Start a 2- or 3-way folder comparison"
 msgstr "Inicia uma comparação de pasta em 2 ou 3 vias"
 
-#: ../meld/meldapp.py:224
+#: ../meld/meldapp.py:229
 #, python-format
 msgid "Error: %s\n"
 msgstr "Erro: %s\n"
 
-#: ../meld/meldapp.py:231
+#: ../meld/meldapp.py:236
 msgid "Meld is a file and directory comparison tool."
 msgstr "O Meld é uma ferramenta de comparação de arquivos e diretórios."
 
-#: ../meld/meldapp.py:235
+#: ../meld/meldapp.py:240
 msgid "Set label to use instead of file name"
 msgstr "Definir rótulo para usar no lugar do nome do arquivo"
 
-#: ../meld/meldapp.py:238
+#: ../meld/meldapp.py:243
 msgid "Open a new tab in an already running instance"
 msgstr "Abrir em uma nova aba de uma instância existente"
 
-#: ../meld/meldapp.py:241
+#: ../meld/meldapp.py:246
 msgid "Automatically compare all differing files on startup"
 msgstr "Compara automaticamente todos os arquivos diferentes na inicialização"
 
-#: ../meld/meldapp.py:244
+#: ../meld/meldapp.py:249
 msgid "Ignored for compatibility"
 msgstr "Ignorado por questão de compatibilidade"
 
-#: ../meld/meldapp.py:248
+#: ../meld/meldapp.py:253
 msgid "Set the target file for saving a merge result"
 msgstr "Define o arquivo destino para salvar um resultado de mesclagem"
 
-#: ../meld/meldapp.py:251
+#: ../meld/meldapp.py:256
 msgid "Automatically merge files"
 msgstr "Mescla arquivos automaticamente"
 
-#: ../meld/meldapp.py:255
+#: ../meld/meldapp.py:260
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "Carrega uma comparação salva de um arquivo de comparação"
 
-#: ../meld/meldapp.py:259
+#: ../meld/meldapp.py:264
 msgid "Create a diff tab for the supplied files or folders"
 msgstr "Cria uma aba de diff para os arquivos e pastas fornecidos"
 
-#: ../meld/meldapp.py:279
+#: ../meld/meldapp.py:284
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "muitos argumentos (esperava 0-3, obteve %d)"
 
-#: ../meld/meldapp.py:282
+#: ../meld/meldapp.py:287
 msgid "can't auto-merge less than 3 files"
 msgstr "não é possível mesclar automaticamente menos que 3 arquivos"
 
-#: ../meld/meldapp.py:284
+#: ../meld/meldapp.py:289
 msgid "can't auto-merge directories"
 msgstr "não é possível mesclar diretórios automaticamente"
 
-#: ../meld/meldapp.py:298
+#: ../meld/meldapp.py:303
 msgid "Error reading saved comparison file"
 msgstr "Erro ao ler arquivo de comparação salvo"
 
+#: ../meld/meldapp.py:330
+#, python-format
+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:131
+#: ../meld/meldbuffer.py:138
 msgid "<unnamed>"
 msgstr "<sem nome>"
 
@@ -1917,7 +2057,6 @@ msgid "Open recent files"
 msgstr "Abre arquivos recentes"
 
 #: ../meld/meldwindow.py:164
-#| msgid "Meld"
 msgid "_Meld"
 msgstr "_Meld"
 
@@ -1926,7 +2065,6 @@ msgid "Quit the program"
 msgstr "Sai do programa"
 
 #: ../meld/meldwindow.py:167
-#| msgid "_Preferences"
 msgid "Prefere_nces"
 msgstr "Preferê_ncias"
 
@@ -1943,20 +2081,25 @@ msgid "Open the Meld manual"
 msgstr "Abre o manual do Meld"
 
 #: ../meld/meldwindow.py:173
-#| msgid "Configure the application"
 msgid "About this application"
 msgstr "Sobre esse aplicativo"
 
-#: ../meld/meldwindow.py:546
+#: ../meld/meldwindow.py:548
 msgid "Switch to this tab"
 msgstr "Alterna para esta aba"
 
-#: ../meld/meldwindow.py:669
+#: ../meld/meldwindow.py:659
+#, python-format
+msgid "Need three files to auto-merge, got: %r"
+msgstr ""
+"É necessário ter três arquivos para mesclar automaticamente, obtive: %r"
+
+#: ../meld/meldwindow.py:673
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Não foi possível comparar uma mistura de arquivos e diretórios."
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:213
+#: ../meld/misc.py:203
 msgid "[None]"
 msgstr "[Nenhum]"
 
@@ -1972,10 +2115,6 @@ msgstr "padrão"
 msgid "Version control:"
 msgstr "Controle de versão:"
 
-#: ../meld/ui/findbar.py:144
-msgid "Regular expression error"
-msgstr "Erro na expressão regular"
-
 #: ../meld/ui/notebooklabel.py:65
 msgid "Close tab"
 msgstr "Fechar aba"
@@ -1986,28 +2125,28 @@ msgstr "Nenhuma arquivo para submeter (commit)"
 
 #. 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:127
 #, python-format
 msgid "%s in %s"
 msgstr "%s em %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:128 ../meld/vc/git.py:135
 #, python-format
 msgid "%d unpushed commit"
 msgid_plural "%d unpushed commits"
 msgstr[0] "%d commit não enviado (push)"
 msgstr[1] "%d commits não enviados (push)"
 
-#: ../meld/vc/git.py:129
+#: ../meld/vc/git.py:130
 #, python-format
 msgid "%d branch"
 msgid_plural "%d branches"
 msgstr[0] "%d ramo"
 msgstr[1] "%d ramos"
 
-#: ../meld/vc/git.py:348
+#: ../meld/vc/git.py:357
 #, python-format
 msgid "Mode changed from %s to %s"
 msgstr "Modo modificado de %s para %s"
@@ -2060,111 +2199,111 @@ msgstr "Faltando"
 msgid "Not present"
 msgstr "Não presente"
 
-#: ../meld/vcview.py:233 ../meld/vcview.py:417
+#: ../meld/vcview.py:245 ../meld/vcview.py:426
 msgid "Location"
 msgstr "Localização"
 
-#: ../meld/vcview.py:234
+#: ../meld/vcview.py:246
 msgid "Status"
 msgstr "Status"
 
-#: ../meld/vcview.py:235
+#: ../meld/vcview.py:247
 msgid "Revision"
 msgstr "Revisão"
 
-#: ../meld/vcview.py:236
+#: ../meld/vcview.py:248
 msgid "Options"
 msgstr "Opções"
 
 #. TRANSLATORS: this is an error message when a version control
 #. application isn't installed or can't be found
-#: ../meld/vcview.py:324
+#: ../meld/vcview.py:336
 #, python-format
 msgid "%s not installed"
 msgstr "%s não instalado"
 
 #. TRANSLATORS: this is an error message when a version
 #. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:328
+#: ../meld/vcview.py:340
 msgid "Invalid repository"
 msgstr "Repositório inválido"
 
-#: ../meld/vcview.py:337
+#: ../meld/vcview.py:349
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../meld/vcview.py:339 ../meld/vcview.py:347
+#: ../meld/vcview.py:351 ../meld/vcview.py:359
 msgid "None"
 msgstr "Nenhum"
 
-#: ../meld/vcview.py:358
+#: ../meld/vcview.py:370
 msgid "No valid version control system found in this folder"
-msgstr "Nenhuma sistema de controle de versão válido localizado nesta pasta"
+msgstr "Nenhum sistema de controle de versão válido localizado nesta pasta"
 
-#: ../meld/vcview.py:360
+#: ../meld/vcview.py:372
 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:362
+#: ../meld/vcview.py:374
 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 the user is diffing
-#: ../meld/vcview.py:417
+#: ../meld/vcview.py:426
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:431 ../meld/vcview.py:439
+#: ../meld/vcview.py:448
 #, python-format
 msgid "Scanning %s"
 msgstr "Varrendo %s"
 
-#: ../meld/vcview.py:479
+#: ../meld/vcview.py:488
 msgid "(Empty)"
 msgstr "(Vazio)"
 
-#: ../meld/vcview.py:522
+#: ../meld/vcview.py:531
 #, python-format
 msgid "%s — local"
 msgstr "%s — local"
 
-#: ../meld/vcview.py:523
+#: ../meld/vcview.py:532
 #, python-format
 msgid "%s — remote"
 msgstr "%s — remoto"
 
-#: ../meld/vcview.py:531
+#: ../meld/vcview.py:540
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (local, mesclagem, remoto)"
 
-#: ../meld/vcview.py:536
+#: ../meld/vcview.py:545
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (remoto, mesclagem, local)"
 
-#: ../meld/vcview.py:547
+#: ../meld/vcview.py:556
 #, python-format
 msgid "%s — repository"
 msgstr "%s — repositório"
 
-#: ../meld/vcview.py:553
+#: ../meld/vcview.py:562
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (em trabalho, repositório)"
 
-#: ../meld/vcview.py:557
+#: ../meld/vcview.py:566
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (repositório, em trabalho)"
 
-#: ../meld/vcview.py:741
+#: ../meld/vcview.py:756
 msgid "Remove folder and all its files?"
 msgstr "Remover pasta e todos seus arquivos?"
 
-#: ../meld/vcview.py:743
+#: ../meld/vcview.py:758
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2172,11 +2311,81 @@ 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:777
+#: ../meld/vcview.py:792
 #, python-format
 msgid "Error removing %s"
 msgstr "Erro ao remover %s"
 
+#~ msgid "Meld base scheme"
+#~ msgstr "Esquema base do Meld"
+
+#~ msgid "Base color scheme for Meld highlighting"
+#~ msgstr "Esquema de cores base para realce no Meld"
+
+#~ msgid "Meld dark scheme"
+#~ msgstr "Esquema escruto do Meld"
+
+#~ msgid "Dark color scheme for Meld highlighting"
+#~ msgstr "Esquema de cores escuras para realce no Meld"
+
+#~ msgid "Extra"
+#~ msgstr "Extra"
+
+#~ msgid "Couldn't find colour scheme details for %s-%s; this is a bad install"
+#~ msgstr ""
+#~ "Não foi possível localizar detalhes de esquema de cores para %s-%s; esta "
+#~ "é uma instalação ruim"
+
+#~ msgid "Partially staged"
+#~ msgstr "Apresentados (staged) parcialmente"
+
+#~ msgid "Staged"
+#~ msgstr "Apresentados (staged)"
+
+#~ msgid "Rev %s"
+#~ msgstr "Rev %s"
+
+#~ msgid "Clear"
+#~ msgstr "Limpar"
+
+#~ msgid "Copy _Left"
+#~ msgstr "Copiar para a _esquerda"
+
+#~ msgid "Copy _Right"
+#~ msgstr "Copiar para a _direita"
+
+#~ msgid ""
+#~ "'%s' exists.\n"
+#~ "Overwrite?"
+#~ msgstr ""
+#~ "\"%s\" já existe.\n"
+#~ "Sobrescrevê-lo?"
+
+#~ msgid "Clear manual change sychronization points"
+#~ msgstr "Limpa alterações manuais de pontos de sincronização"
+
+#~ msgid "Cycle Through Documents"
+#~ msgstr "Fazer ciclo através dos documentos"
+
+#~ msgid ""
+#~ "\"%s\" exists!\n"
+#~ "Overwrite?"
+#~ msgstr ""
+#~ "\"%s\" já existe!\n"
+#~ "Sobrescrevê-lo?"
+
+#~ msgid ""
+#~ "Error writing to %s\n"
+#~ "\n"
+#~ "%s."
+#~ msgstr ""
+#~ "Erro ao escrever em %s\n"
+#~ "\n"
+#~ "%s."
+
+#~ msgid "Regular expression error"
+#~ msgstr "Erro na expressão regular"
+
 #~ msgid "Ignore changes which insert or delete blank lines"
 #~ msgstr "Ignorar alterações que inserem ou excluem linhas vazias"
 
@@ -2368,9 +2577,6 @@ msgstr "Erro ao remover %s"
 #~ msgid "Tag"
 #~ msgstr "Marca"
 
-#~ msgid "[%s] Fetching differences"
-#~ msgstr "[%s] Buscando diferenças"
-
 #~ msgid "[%s] Applying patch"
 #~ msgstr "[%s] Aplicando patch"
 
@@ -2706,9 +2912,6 @@ msgstr "Erro ao remover %s"
 #~ msgid "Ignore changes that just insert or delete blank lines"
 #~ msgstr "Ignora alterações que apenas inserem ou excluem linhas vazias"
 
-#~ msgid "Save in UTF-8 encoding"
-#~ msgstr "Salvar usando a codificação UTF-8"
-
 #~ msgid "Save in the files original encoding"
 #~ msgstr "Salvar usando a codificação original do arquivo"
 

From 60d0a62d6325c78eded8a27e48ed9d9e698ee4a5 Mon Sep 17 00:00:00 2001
From: Milo Casagrande <milo@ubuntu.com>
Date: Fri, 16 Oct 2015 07:32:11 +0000
Subject: [PATCH 22/44] Updated Italian translation

---
 po/it.po | 1422 ++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 898 insertions(+), 524 deletions(-)

diff --git a/po/it.po b/po/it.po
index 5cea78d4..2871c81f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,8 +8,8 @@ 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: 2014-03-21 23:25+0000\n"
-"PO-Revision-Date: 2014-03-22 10:35+0100\n"
+"POT-Creation-Date: 2015-10-13 11:42+0000\n"
+"PO-Revision-Date: 2015-10-16 09:28+0200\n"
 "Last-Translator: Milo Casagrande <milo@milo.name>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "Language: it\n"
@@ -17,21 +17,30 @@ msgstr ""
 "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.6.4\n"
+"X-Generator: Poedit 1.8.5\n"
 
-#: ../bin/meld:134
+#: ../bin/meld:144
 msgid "Cannot import: "
 msgstr "Impossibile importare: "
 
-#: ../bin/meld:137
+#: ../bin/meld:147
 #, c-format
 msgid "Meld requires %s or higher."
 msgstr "Meld richiede %s o più recente."
 
-#: ../bin/meld:141
+#: ../bin/meld:151
 msgid "Meld does not support Python 3."
 msgstr "Meld non supporta Python 3."
 
+#: ../bin/meld:199
+#, c-format
+msgid ""
+"Couldn't load Meld-specific CSS (%s)\n"
+"%s"
+msgstr ""
+"Impossibile caricare i fogli di stile specifici di Meld (%s)\n"
+"%s"
+
 #: ../data/meld.desktop.in.h:1 ../data/ui/meldapp.ui.h:1
 msgid "Meld"
 msgstr "Meld"
@@ -51,9 +60,9 @@ msgstr "Confronta e unisce file"
 #: ../data/meld.appdata.xml.in.h:1
 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."
+"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 è un visualizzatore grafico di differenze e uno strumento per l'unione "
 "di file. Consente di confrontare file, directory e progetti in un sistema di "
@@ -66,9 +75,8 @@ msgid ""
 "Meld helps you review code changes, understand patches, and makes enormous "
 "merge conflicts slightly less painful."
 msgstr ""
-"Meld aiuta nella revisione delle modifiche al codice, consente di "
-"comprendere le patch e rende più facile l'unione di file in presenza di "
-"conflitti."
+"Meld aiuta nella revisione delle modifiche al codice, consente di comprendere "
+"le patch e rende più facile l'unione di file in presenza di conflitti."
 
 #: ../data/mime/meld.xml.in.h:1
 msgid "Meld comparison description"
@@ -79,26 +87,30 @@ msgid "Default window size"
 msgstr "Dimensione predefinita della finestra"
 
 #: ../data/org.gnome.meld.gschema.xml.h:2
+msgid "Default window state"
+msgstr "Stato predefinito della finestra"
+
+#: ../data/org.gnome.meld.gschema.xml.h:3
 msgid "Show toolbar"
 msgstr "Mostra barra degli strumenti"
 
-#: ../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 "Se VERO, viene visualizzata la barra degli strumenti."
 
-#: ../data/org.gnome.meld.gschema.xml.h:4
+#: ../data/org.gnome.meld.gschema.xml.h:5
 msgid "Show statusbar"
 msgstr "Mostra barra di stato"
 
-#: ../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 "Se VERO, viene visualizzata la barra di stato."
 
-#: ../data/org.gnome.meld.gschema.xml.h:6
+#: ../data/org.gnome.meld.gschema.xml.h:7
 msgid "Automatically detected text encodings"
 msgstr "Codifica automatica del testo"
 
-#: ../data/org.gnome.meld.gschema.xml.h:7
+#: ../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."
@@ -106,35 +118,35 @@ msgstr ""
 "Queste codifiche di testo verranno utilizzate automaticamente, e in ordine, "
 "per decodificare i file di testo caricati."
 
-#: ../data/org.gnome.meld.gschema.xml.h:8
+#: ../data/org.gnome.meld.gschema.xml.h:9
 msgid "Width of an indentation step"
 msgstr "Larghezza di un passa di rientro"
 
-#: ../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 "Il numero di spazi da usare per un singolo passo d'indentazione"
 
-#: ../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 "Indica se usare un rientro di spazi o tabulazioni"
 
-#: ../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 "Se VERO, un nuovo rientro userà spazi invece di tabulazioni."
 
-#: ../data/org.gnome.meld.gschema.xml.h:12
+#: ../data/org.gnome.meld.gschema.xml.h:13
 msgid "Show line numbers"
 msgstr "Mostrare numeri di riga"
 
-#: ../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 "Se VERO, verranno mostrati i numeri di riga nel confronto."
 
-#: ../data/org.gnome.meld.gschema.xml.h:14
+#: ../data/org.gnome.meld.gschema.xml.h:15
 msgid "Highlight syntax"
 msgstr "Evidenzia la sintassi"
 
-#: ../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."
@@ -142,11 +154,21 @@ msgstr ""
 "Indica se evidenziare la sintassi; dato il colore di evidenziazione di Meld, "
 "è disattivato per impostazione predefinita"
 
-#: ../data/org.gnome.meld.gschema.xml.h:16
+#: ../data/org.gnome.meld.gschema.xml.h:17
+msgid "Color scheme to use for syntax highlighting"
+msgstr "Schema di colori da utilizzare per l'evidenziazione della sintassi"
+
+#: ../data/org.gnome.meld.gschema.xml.h:18
+msgid "Used by GtkSourceView to determine colors for syntax highlighting"
+msgstr ""
+"Utilizzato da GtkSourceView per determinare i colori per l'evidenziazione "
+"della sintassi"
+
+#: ../data/org.gnome.meld.gschema.xml.h:19
 msgid "Displayed whitespace"
 msgstr "Spazi bianchi"
 
-#: ../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'."
@@ -154,11 +176,11 @@ msgstr ""
 "Selettore per gli spazi bianchi da visualizzare. I possibili valori sono "
 "\"space\", \"tab\", \"newline\" e \"nbsp\"."
 
-#: ../data/org.gnome.meld.gschema.xml.h:18
+#: ../data/org.gnome.meld.gschema.xml.h:21
 msgid "Wrap mode"
 msgstr "Modalità a capo"
 
-#: ../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 "
@@ -168,35 +190,31 @@ msgstr ""
 "niente (\"none\"), a un qualsiasi carattere (\"char\") o solo alla fine di "
 "una parola (\"word\")."
 
-#: ../data/org.gnome.meld.gschema.xml.h:20
+#: ../data/org.gnome.meld.gschema.xml.h:23
 msgid "Highlight current line"
 msgstr "Evidenzia la riga corrente"
 
-#: ../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."
 msgstr "Se VERO, la riga con il cursore viene evidenziata nel confronto."
 
-#: ../data/org.gnome.meld.gschema.xml.h:22
+#: ../data/org.gnome.meld.gschema.xml.h:25
 msgid "Use the system default monospace font"
 msgstr "Usa il carattere a spaziatura fissa di sistema"
 
-#: ../data/org.gnome.meld.gschema.xml.h:23
-msgid ""
-"If false, the defined custom font will be used instead of the system "
-"monospace font."
+#: ../data/org.gnome.meld.gschema.xml.h:26
+msgid "If false, custom-font will be used instead of the system monospace font."
 msgstr ""
-"Se FALSO, viene usato il carattere indicato al posto di quello di sistema."
+"Se FALSO, viene usato custom-font al posto di quello a spaziatura fissa di "
+"sistema."
 
-#: ../data/org.gnome.meld.gschema.xml.h:24
+#: ../data/org.gnome.meld.gschema.xml.h:27
 msgid "Custom font"
 msgstr "Carattere personalizzato"
 
-#: ../data/org.gnome.meld.gschema.xml.h:25
-#| msgid ""
-#| "The custom font to use, stored as a string and parsed as a Pango font "
-#| "description"
+#: ../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."
@@ -204,46 +222,46 @@ msgstr ""
 "Il carattere personalizzato da usare, salvato come stringa e interpretato "
 "come una descrizione di carattere Pango."
 
-#: ../data/org.gnome.meld.gschema.xml.h:26
+#: ../data/org.gnome.meld.gschema.xml.h:29
 msgid "Ignore blank lines when comparing files"
 msgstr "Ignora le righe vuote nei confronti"
 
-#: ../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 ""
 "Se VERO, le righe vuote non verranno considerate nell'evidenziare le "
 "modifiche tra i file."
 
-#: ../data/org.gnome.meld.gschema.xml.h:28
+#: ../data/org.gnome.meld.gschema.xml.h:31
 msgid "Use the system default editor"
 msgstr "Usa l'editor predefinito di sistema"
 
-#: ../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."
+"If false, custom-editor-command will be used instead of the system editor "
+"when opening files externally."
 msgstr ""
-"Se FALSO, viene usato l'editor indicato al posto di quello di sistema per "
+"Se FALSO, viene usato custom-editor-command al posto di quello di sistema per "
 "aprire i file esternamente."
 
-#: ../data/org.gnome.meld.gschema.xml.h:30
+#: ../data/org.gnome.meld.gschema.xml.h:33
 msgid "The custom editor launch command"
 msgstr "Il comando per lanciare l'editor personalizzato"
 
-#: ../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 ""
-"Il comando usato per lanciare l'editor personalizzato. È supportata una "
-"forma basilare di modelli: \"{file}\" e \"{line}\" sono token riconosciuti."
+"Il comando usato per lanciare l'editor personalizzato. È supportata una forma "
+"basilare di modelli: \"{file}\" e \"{line}\" sono token riconosciuti."
 
-#: ../data/org.gnome.meld.gschema.xml.h:32
+#: ../data/org.gnome.meld.gschema.xml.h:35
 msgid "Columns to display"
 msgstr "Colonne da visualizzare"
 
-#: ../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."
@@ -251,22 +269,21 @@ msgstr ""
 "Elenco di nomi di colonne nel confronto tra directory e se debbano essere "
 "visualizzate."
 
-#: ../data/org.gnome.meld.gschema.xml.h:34 ../data/ui/preferences.ui.h:28
+#: ../data/org.gnome.meld.gschema.xml.h:37 ../data/ui/preferences.ui.h:32
 msgid "Ignore symbolic links"
 msgstr "Ignorare collegamenti simbolici"
 
-#: ../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."
-msgstr ""
-"Se VERO, il confronto tra directory non segue i collegamenti simbolici."
+msgstr "Se VERO, il confronto tra directory non segue i collegamenti simbolici."
 
-#: ../data/org.gnome.meld.gschema.xml.h:36
+#: ../data/org.gnome.meld.gschema.xml.h:39
 msgid "Use shallow comparison"
 msgstr "Usa confronto superficiale"
 
-#: ../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 "
@@ -275,15 +292,15 @@ msgstr ""
 "Se VERO, il confronto tra directory confronta i file solamente su dimensione "
 "e mtime, considerando solo i file con stessa dimensione e mtime come uguali."
 
-#: ../data/org.gnome.meld.gschema.xml.h:38
+#: ../data/org.gnome.meld.gschema.xml.h:41
 msgid "File timestamp resolution"
 msgstr "Risoluzione marcatura temporale del file"
 
-#: ../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 "
-"is useful when comparing files between filesystems with different timestamp "
+"between two files before they're considered to have different mtimes. This is "
+"useful when comparing files between filesystems with different timestamp "
 "resolution."
 msgstr ""
 "Quando il confronto è fatto su mtime, questa è la differenza minima in "
@@ -291,19 +308,32 @@ msgstr ""
 "confronto di file provenienti da file system con risoluzioni temporali "
 "differenti."
 
-#: ../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 "Applicare filtri di testo durante i confronti sulla cartella"
+
+#: ../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 ""
+"Se VERO, i confronti sulla cartella che eseguono confronti sui contenuti dei "
+"file applicano anche i filtri di testo attivi, l'opzione di esclusione delle "
+"righe vuote e ignorano le differenze sugli a capo."
+
+#: ../data/org.gnome.meld.gschema.xml.h:45
 msgid "File status filters"
 msgstr "Filtri sullo stato dei file"
 
-#: ../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 "Elenco di stati usati per filtrare i file nel confronto tra directory."
 
-#: ../data/org.gnome.meld.gschema.xml.h:42
+#: ../data/org.gnome.meld.gschema.xml.h:47
 msgid "Show the version control console output"
 msgstr "Mostra l'output del sistema di controllo della versione"
 
-#: ../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."
@@ -311,11 +341,11 @@ msgstr ""
 "Se VERO, viene mostrato l'output della console nella vista del controllo "
 "della versione, con i comandi eseguiti."
 
-#: ../data/org.gnome.meld.gschema.xml.h:44
+#: ../data/org.gnome.meld.gschema.xml.h:49
 msgid "Version control pane position"
 msgstr "Posizione riquadro controllo versione"
 
-#: ../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."
@@ -323,69 +353,88 @@ msgstr ""
 "Questa è l'altezza dell'albero principale del controllo versione quando il "
 "riquadro della console è mostrato."
 
-#: ../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 "Confronto come sinistra-locale/destra-remoto"
 
-#: ../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."
+"remote scheme to determine what order to present files in panes. Otherwise, a "
+"left-is-theirs, right-is-mine scheme is used."
 msgstr ""
 "Se VERO, il confronto con sistemi di controllo della versione usa uno schema "
 "sinistra-locale destra-remoto per determinare l'ordine con cui mostrare i "
 "file. Altrimenti viene usato lo schema sinistra-altri destra-personale."
 
-#: ../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 ""
+"Ordine dei file nel confronto a tre vie su unione da controllo della versione"
+
+#: ../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 ""
+"Le scelte per l'ordinamento dei file sono remote/merged/local e local/merged/"
+"remote. Questa opzione si applica solamente ai confronti a tre vie eseguiti "
+"dalla visualizzazione del controllo versione: viene quindi utilizzata "
+"solamente nella risoluzione di unioni/conflitti."
+
+#: ../data/org.gnome.meld.gschema.xml.h:55
 msgid "Show margin in commit message editor"
 msgstr "Mostra i margini nell'editor del messaggio di commit"
 
-#: ../data/org.gnome.meld.gschema.xml.h:49
+#: ../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 ""
-"Se VERO, viene visualizzata una guida per mostrare il margine nell'editor "
-"del messaggio di commit."
+"Se VERO, viene visualizzata una guida per mostrare il margine nell'editor del "
+"messaggio di commit."
 
-#: ../data/org.gnome.meld.gschema.xml.h:50
+#: ../data/org.gnome.meld.gschema.xml.h:57
 msgid "Margin column in commit message editor"
 msgstr "Colonna nell'editor del messaggio di commit"
 
-#: ../data/org.gnome.meld.gschema.xml.h:51
+#: ../data/org.gnome.meld.gschema.xml.h:58
 msgid ""
-"The column of the margin is at in the version control commit message editor."
-msgstr "Il margine del messaggio di commit."
+"The column at which to show the margin in the version control commit message "
+"editor."
+msgstr ""
+"La colonna in cui visualizzare il margine dell'editor per il messaggio di "
+"commit del controllo versione."
 
-#: ../data/org.gnome.meld.gschema.xml.h:52
+#: ../data/org.gnome.meld.gschema.xml.h:59
 msgid "Automatically hard-wrap commit messages"
 msgstr "A capo automatico nei messaggi di commit"
 
-#: ../data/org.gnome.meld.gschema.xml.h:53
+#: ../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 ""
-"Se VERO, l'editor del messaggio di commit andrà a capo al margine "
-"predefinito prima di eseguire il commit."
+"Se VERO, l'editor del messaggio di commit andrà a capo automaticamente al "
+"margine predefinito (inserirà a capo) prima di eseguire il commit."
 
-#: ../data/org.gnome.meld.gschema.xml.h:54
+#: ../data/org.gnome.meld.gschema.xml.h:61
 msgid "Version control status filters"
 msgstr "Filtri sullo stato del sistema di controllo della versione"
 
-#: ../data/org.gnome.meld.gschema.xml.h:55
+#: ../data/org.gnome.meld.gschema.xml.h:62
 msgid ""
 "List of statuses used to filter visible files in version control comparison."
 msgstr ""
 "Elenco di stati usati per filtrare i file visualizzati nel confronto per i "
 "sistemi di controllo della versione."
 
-#: ../data/org.gnome.meld.gschema.xml.h:56
+#: ../data/org.gnome.meld.gschema.xml.h:63
 msgid "Filename-based filters"
 msgstr "Filtri sui nomi dei file"
 
-#: ../data/org.gnome.meld.gschema.xml.h:57
+#: ../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."
@@ -393,20 +442,36 @@ msgstr ""
 "Elenco di filtri basati sui nomi dei file che, se attivi, rimuovono i file "
 "dal confronto in un confronto tra directory."
 
-#: ../data/org.gnome.meld.gschema.xml.h:58
+#: ../data/org.gnome.meld.gschema.xml.h:65
 msgid "Text-based filters"
 msgstr "Filtri di testo"
 
-#: ../data/org.gnome.meld.gschema.xml.h:59
+#: ../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."
+"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 ""
 "Elenco di filtri di testo che, se attivi, rimuovono il testo usato per "
 "confrontare i file. Il testo verrà visualizzato, ma non farà parte dal "
 "confronto in sé."
 
+#: ../data/styles/meld-base.xml.h:1
+msgid "Meld base scheme"
+msgstr "Schema base Meld"
+
+#: ../data/styles/meld-base.xml.h:2
+msgid "Base color scheme for Meld highlighting"
+msgstr "Schema di colori base di Meld per l'evidenziazione della sintassi"
+
+#: ../data/styles/meld-dark.xml.h:1
+msgid "Meld dark scheme"
+msgstr "Schema scuro Meld"
+
+#: ../data/styles/meld-dark.xml.h:2
+msgid "Dark color scheme for Meld highlighting"
+msgstr "Schema colori scuro di Meld per l'evidenziazione della sintassi"
+
 #: ../data/ui/application.ui.h:1
 msgid "About Meld"
 msgstr "Informazioni su Meld"
@@ -452,7 +517,7 @@ msgid "Compare selected files"
 msgstr "Confronta i file selezionati"
 
 #: ../data/ui/dirdiff.ui.h:3
-msgid "Copy _Left"
+msgid "Copy to _Left"
 msgstr "Copia a _sinistra"
 
 #: ../data/ui/dirdiff.ui.h:4
@@ -460,7 +525,7 @@ msgid "Copy to left"
 msgstr "Copia a sinistra"
 
 #: ../data/ui/dirdiff.ui.h:5
-msgid "Copy _Right"
+msgid "Copy to _Right"
 msgstr "Copia a _destra"
 
 #: ../data/ui/dirdiff.ui.h:6
@@ -471,7 +536,7 @@ msgstr "Copia a destra"
 msgid "Delete selected"
 msgstr "Elimina selezione"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1411
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:856 ../meld/filediff.py:1422
 msgid "Hide"
 msgstr "Nascondi"
 
@@ -508,7 +573,7 @@ msgstr "Nuovi"
 msgid "Show new"
 msgstr "Mostra nuovi"
 
-#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:71
+#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:73
 msgid "Modified"
 msgstr "Modificati"
 
@@ -541,7 +606,7 @@ msgid "_Add"
 msgstr "A_ggiungi"
 
 #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:673
+#: ../meld/vcview.py:649
 msgid "_Remove"
 msgstr "_Rimuovi"
 
@@ -562,8 +627,8 @@ msgid "Move _Down"
 msgstr "Sposta _giù"
 
 #. Create icon and filename CellRenderer
-#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:355
-#: ../meld/vcview.py:185
+#: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35
+#: ../meld/dirdiff.py:372
 msgid "Name"
 msgstr "Nome"
 
@@ -580,45 +645,236 @@ msgid "Remove selected filter"
 msgstr "Rimuove il filtro selezionato"
 
 #: ../data/ui/filediff.ui.h:1
+msgid "Format as Patch..."
+msgstr "Formatta come patch..."
+
+#: ../data/ui/filediff.ui.h:2
+msgid "Create a patch using differences between files"
+msgstr "Crea una patch utilizzando le differenze tra i file"
+
+#: ../data/ui/filediff.ui.h:3
+msgid "Save A_ll"
+msgstr "Sal_va tutti"
+
+#: ../data/ui/filediff.ui.h:4
+msgid "Save all files in the current comparison"
+msgstr "Salva tutti i file nel confronto attuale"
+
+#: ../data/ui/filediff.ui.h:5
+msgid "Revert files to their saved versions"
+msgstr "Ripristina i file alla loro versione salvata"
+
+#: ../data/ui/filediff.ui.h:6
+msgid "Add Synchronization Point"
+msgstr "Aggiungi punto sincronizzazione"
+
+#: ../data/ui/filediff.ui.h:7
+msgid "Add a synchronization point for changes between files"
+msgstr "Aggiunge un punto di sincronizzazione per le modifiche tra i file"
+
+#: ../data/ui/filediff.ui.h:8
+msgid "Clear Synchronization Points"
+msgstr "Pulisci punti sincronizzazione"
+
+#: ../data/ui/filediff.ui.h:9
+msgid "Clear sychronization points for changes between files"
+msgstr "Azzera tutti i punti di sincronizzazione per le modifiche tra i file"
+
+#: ../data/ui/filediff.ui.h:10
+msgid "Previous Conflict"
+msgstr "Conflitto precedente"
+
+#: ../data/ui/filediff.ui.h:11
+msgid "Go to the previous conflict"
+msgstr "Va al conflitto precedente"
+
+#: ../data/ui/filediff.ui.h:12
+msgid "Next Conflict"
+msgstr "Conflitto successivo"
+
+#: ../data/ui/filediff.ui.h:13
+msgid "Go to the next conflict"
+msgstr "Va al conflitto successivo"
+
+#: ../data/ui/filediff.ui.h:14
+msgid "Push to Left"
+msgstr "Invia a sinistra"
+
+#: ../data/ui/filediff.ui.h:15
+msgid "Push current change to the left"
+msgstr "Invia la modifica corrente a sinistra"
+
+#: ../data/ui/filediff.ui.h:16
+msgid "Push to Right"
+msgstr "Invia a destra"
+
+#: ../data/ui/filediff.ui.h:17
+msgid "Push current change to the right"
+msgstr "Invia la modifica corrente a destra"
+
+#: ../data/ui/filediff.ui.h:18
+msgid "Pull from Left"
+msgstr "Prendi da sinistra"
+
+#: ../data/ui/filediff.ui.h:19
+msgid "Pull change from the left"
+msgstr "Prende la modifica da sinistra"
+
+#: ../data/ui/filediff.ui.h:20
+msgid "Pull from Right"
+msgstr "Prendi da destra"
+
+#: ../data/ui/filediff.ui.h:21
+msgid "Pull change from the right"
+msgstr "Prende la modifica da destra"
+
+#: ../data/ui/filediff.ui.h:22
+msgid "Copy Above Left"
+msgstr "Copia a sinistra sopra"
+
+#: ../data/ui/filediff.ui.h:23
+msgid "Copy change above the left chunk"
+msgstr "Copia la modifica sopra al pezzo a sinistra"
+
+#: ../data/ui/filediff.ui.h:24
+msgid "Copy Below Left"
+msgstr "Copia a sinistra sotto"
+
+#: ../data/ui/filediff.ui.h:25
+msgid "Copy change below the left chunk"
+msgstr "Copia la modifica sotto al pezzo a sinistra"
+
+#: ../data/ui/filediff.ui.h:26
+msgid "Copy Above Right"
+msgstr "Copia a destra sopra"
+
+#: ../data/ui/filediff.ui.h:27
+msgid "Copy change above the right chunk"
+msgstr "Copia la modifica sopra al pezzo a destra"
+
+#: ../data/ui/filediff.ui.h:28
+msgid "Copy Below Right"
+msgstr "Copia a destra sotto"
+
+#: ../data/ui/filediff.ui.h:29
+msgid "Copy change below the right chunk"
+msgstr "Copia la modifica sotto al pezzo a destra"
+
+#: ../data/ui/filediff.ui.h:30
+msgid "Delete"
+msgstr "Elimina"
+
+#: ../data/ui/filediff.ui.h:31
+msgid "Delete change"
+msgstr "Elimina la modifica"
+
+#: ../data/ui/filediff.ui.h:32
+msgid "Merge All from Left"
+msgstr "Unisci tutte da sinistra"
+
+#: ../data/ui/filediff.ui.h:33
+msgid "Merge all non-conflicting changes from the left"
+msgstr "Unisce tutte le modifiche senza conflitti da sinistra"
+
+#: ../data/ui/filediff.ui.h:34
+msgid "Merge All from Right"
+msgstr "Unisci tutte da destra"
+
+#: ../data/ui/filediff.ui.h:35
+msgid "Merge all non-conflicting changes from the right"
+msgstr "Unisce tutte le modifiche senza conflitti da destra"
+
+#: ../data/ui/filediff.ui.h:36
+msgid "Merge All"
+msgstr "Unisci tutte"
+
+#: ../data/ui/filediff.ui.h:37
+msgid "Merge all non-conflicting changes from left and right panes"
+msgstr ""
+"Unisce tutte le modifiche senza conflitti dai riquadri destro e sinistro"
+
+#: ../data/ui/filediff.ui.h:38
+msgid "Previous Pane"
+msgstr "Riquadro precedente"
+
+#: ../data/ui/filediff.ui.h:39
+msgid "Move keyboard focus to the previous document in this comparison"
+msgstr ""
+"Sposta il focus della tastiera al documento precedente in questo confronto"
+
+#: ../data/ui/filediff.ui.h:40
+msgid "Next Pane"
+msgstr "Riquadro successivo"
+
+#: ../data/ui/filediff.ui.h:41
+msgid "Move keyboard focus to the next document in this comparison"
+msgstr ""
+"Sposta il focus della tastiera al documento successivo in questo confronto"
+
+#: ../data/ui/filediff.ui.h:42
+msgid "Lock Scrolling"
+msgstr "Blocca scorrimento"
+
+#: ../data/ui/filediff.ui.h:43
+msgid "Lock scrolling of all panes"
+msgstr "Blocca lo scorrimento di tutti i riquadri"
+
+#: ../data/ui/filediff.ui.h:44
 msgid "Save changes to documents before closing?"
 msgstr "Salvare le modifiche ai documenti prima di chiudere?"
 
-#: ../data/ui/filediff.ui.h:2
+#: ../data/ui/filediff.ui.h:45
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Se non si salva, tutte le modifiche andranno perse per sempre."
 
-#: ../data/ui/filediff.ui.h:3
+#: ../data/ui/filediff.ui.h:46
 msgid "Close _without Saving"
 msgstr "Chiudi senza sal_vare"
 
-#: ../data/ui/filediff.ui.h:4
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:947 ../meld/filediff.py:1488
+#: ../meld/filediff.py:1572 ../meld/filediff.py:1597
 msgid "_Cancel"
 msgstr "A_nnulla"
 
-#: ../data/ui/filediff.ui.h:5
+#: ../data/ui/filediff.ui.h:48
 msgid "_Save"
 msgstr "_Salva"
 
-#: ../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."
 msgstr ""
-"Impossibile scrivere su questo file. È possibile fare clic qui per "
-"sbloccarlo e apportare le modifiche: tali modifiche devono però essere "
-"salvata su un nuovo file."
+"Impossibile scrivere su questo file. È possibile fare clic qui per sbloccarlo "
+"e apportare le modifiche: tali modifiche devono però essere salvata su un "
+"nuovo file."
+
+#: ../data/ui/filediff.ui.h:50
+#| msgid "_File"
+msgid "File 3"
+msgstr "File 3"
+
+#: ../data/ui/filediff.ui.h:51
+#| msgid "_File"
+msgid "File 2"
+msgstr "File 2"
+
+#: ../data/ui/filediff.ui.h:52
+#| msgid "_File"
+msgid "File 1"
+msgstr "File 1"
 
 # (ndt) l'azione annulla effettivamente le modifiche che non sono state salvate.
-#: ../data/ui/filediff.ui.h:7
+#: ../data/ui/filediff.ui.h:53
 msgid "Revert unsaved changes to documents?"
 msgstr "Annullare le modifiche non salvate dei documenti?"
 
-#: ../data/ui/filediff.ui.h:8
+#: ../data/ui/filediff.ui.h:54
 msgid "Changes made to the following documents will be permanently lost:\n"
 msgstr ""
 "Le modifiche apportate ai seguenti documenti andranno perse per sempre:\n"
 
-#: ../data/ui/findbar.ui.h:1
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:948 ../meld/filediff.py:1489
 msgid "_Replace"
 msgstr "Sostit_uisci"
 
@@ -663,29 +919,29 @@ msgid "Format as Patch"
 msgstr "Formatta come patch"
 
 #: ../data/ui/patch-dialog.ui.h:2
+msgid "Copy to Clipboard"
+msgstr "Copia negli appunti"
+
+#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:125
+msgid "Save Patch"
+msgstr "Salva patch"
+
+#: ../data/ui/patch-dialog.ui.h:4
 msgid "Use differences between:"
 msgstr "Usare differenze tra:"
 
-#: ../data/ui/patch-dialog.ui.h:3
+#: ../data/ui/patch-dialog.ui.h:5
 msgid "Left and middle panes"
 msgstr "Riquadri sinistro e centrale"
 
-#: ../data/ui/patch-dialog.ui.h:4
+#: ../data/ui/patch-dialog.ui.h:6
 msgid "Middle and right panes"
 msgstr "Riquadri centrale e destro"
 
-#: ../data/ui/patch-dialog.ui.h:5
+#: ../data/ui/patch-dialog.ui.h:7
 msgid "_Reverse patch direction"
 msgstr "Inve_rti direzione patch"
 
-#: ../data/ui/patch-dialog.ui.h:6
-msgid "Copy to Clipboard"
-msgstr "Copia negli appunti"
-
-#: ../data/ui/patch-dialog.ui.h:7 ../meld/patchdialog.py:119
-msgid "Save Patch"
-msgstr "Salva patch"
-
 #: ../data/ui/preferences.ui.h:1
 msgid "Left is remote, right is local"
 msgstr "Sinistra è remoto, destra è locale"
@@ -695,139 +951,159 @@ msgid "Left is local, right is remote"
 msgstr "Sinistra è locale, destra è remoto"
 
 #: ../data/ui/preferences.ui.h:3
+msgid "Remote, merge, local"
+msgstr "Remoto, unione, locale"
+
+#: ../data/ui/preferences.ui.h:4
+msgid "Local, merge, remote"
+msgstr "Locale, unione, remoto"
+
+#: ../data/ui/preferences.ui.h:5
 msgid "1ns (ext4)"
 msgstr "1ns (ext4)"
 
-#: ../data/ui/preferences.ui.h:4
+#: ../data/ui/preferences.ui.h:6
 msgid "100ns (NTFS)"
 msgstr "100ns (NTFS)"
 
-#: ../data/ui/preferences.ui.h:5
+#: ../data/ui/preferences.ui.h:7
 msgid "1s (ext2/ext3)"
 msgstr "1s (ext2/ext3)"
 
-#: ../data/ui/preferences.ui.h:6
+#: ../data/ui/preferences.ui.h:8
 msgid "2s (VFAT)"
 msgstr "2s (VFAT)"
 
-#: ../data/ui/preferences.ui.h:7
+#: ../data/ui/preferences.ui.h:9
 msgid "Meld Preferences"
 msgstr "Preferenze di Meld"
 
-#: ../data/ui/preferences.ui.h:8
+#: ../data/ui/preferences.ui.h:10
 msgid "Font"
 msgstr "Carattere"
 
-#: ../data/ui/preferences.ui.h:9
+#: ../data/ui/preferences.ui.h:11
 msgid "_Use the system fixed width font"
 msgstr "_Usare il carattere a spaziatura fissa di sistema"
 
-#: ../data/ui/preferences.ui.h:10
+#: ../data/ui/preferences.ui.h:12
 msgid "_Editor font:"
 msgstr "_Carattere dell'editor:"
 
-#: ../data/ui/preferences.ui.h:11
+#: ../data/ui/preferences.ui.h:13
 msgid "Display"
 msgstr "Visualizzazione"
 
-#: ../data/ui/preferences.ui.h:12
+#: ../data/ui/preferences.ui.h:14
 msgid "_Tab width:"
 msgstr "Ampiezza _tabulazione:"
 
-#: ../data/ui/preferences.ui.h:13
+#: ../data/ui/preferences.ui.h:15
 msgid "_Insert spaces instead of tabs"
 msgstr "Inserire _spazi invece di tabulazioni"
 
-#: ../data/ui/preferences.ui.h:14
+#: ../data/ui/preferences.ui.h:16
 msgid "Enable text _wrapping"
 msgstr "_Attivare a capo automatico"
 
-#: ../data/ui/preferences.ui.h:15
+#: ../data/ui/preferences.ui.h:17
 msgid "Do not _split words over two lines"
 msgstr "Non _dividere le parole su due righe"
 
-#: ../data/ui/preferences.ui.h:16
+#: ../data/ui/preferences.ui.h:18
 msgid "Highlight _current line"
 msgstr "Evidenziare la ri_ga corrente"
 
-#: ../data/ui/preferences.ui.h:17
+#: ../data/ui/preferences.ui.h:19
 msgid "Show _line numbers"
 msgstr "Mostrare i _numeri di riga"
 
-#: ../data/ui/preferences.ui.h:18
+#: ../data/ui/preferences.ui.h:20
 msgid "Show w_hitespace"
 msgstr "Mostrare gli spazi _bianchi"
 
-#: ../data/ui/preferences.ui.h:19
+#: ../data/ui/preferences.ui.h:21
 msgid "Use s_yntax highlighting"
 msgstr "Usare _evidenziazione sintassi"
 
-#: ../data/ui/preferences.ui.h:20
+#: ../data/ui/preferences.ui.h:22
+msgid "Syntax highlighting color scheme:"
+msgstr "Schema colore per evidenziazione sintassi:"
+
+#: ../data/ui/preferences.ui.h:23
 msgid "External Editor"
 msgstr "Editor esterno"
 
-#: ../data/ui/preferences.ui.h:21
+#: ../data/ui/preferences.ui.h:24
 msgid "Use _default system editor"
 msgstr "Usare editor _predefinito di sistema"
 
-#: ../data/ui/preferences.ui.h:22
+#: ../data/ui/preferences.ui.h:25
 msgid "Edito_r command:"
 msgstr "Comando dell'edito_r:"
 
-#: ../data/ui/preferences.ui.h:23
+#: ../data/ui/preferences.ui.h:26
 msgid "Editor"
 msgstr "Editor"
 
-#: ../data/ui/preferences.ui.h:24
+#: ../data/ui/preferences.ui.h:27
 msgid "Shallow Comparison"
 msgstr "Confronto superficiale"
 
-#: ../data/ui/preferences.ui.h:25
+#: ../data/ui/preferences.ui.h:28
 msgid "C_ompare files based only on size and timestamp"
 msgstr "Confrontare i file solo su _dimensione e marcatura temporale"
 
-#: ../data/ui/preferences.ui.h:26
+#: ../data/ui/preferences.ui.h:29
 msgid "_Timestamp resolution:"
 msgstr "Risoluzione marcatura _temporale:"
 
-#: ../data/ui/preferences.ui.h:27
+#: ../data/ui/preferences.ui.h:31
 msgid "Symbolic Links"
 msgstr "Collegamenti simbolici"
 
-#: ../data/ui/preferences.ui.h:29
+#: ../data/ui/preferences.ui.h:33
 msgid "Visible Columns"
 msgstr "Colonne visibili"
 
-#: ../data/ui/preferences.ui.h:30
+#: ../data/ui/preferences.ui.h:34
 msgid "Folder Comparisons"
 msgstr "Confronto cartelle"
 
 # (ndt) oppure "Salva e comprimi" ?
-#: ../data/ui/preferences.ui.h:31
+#: ../data/ui/preferences.ui.h:35
 msgid "Version Comparisons"
 msgstr "Confronto versione"
 
-#: ../data/ui/preferences.ui.h:32
-msgid "_When comparing file revisions:"
-msgstr "Quando _vengono confrontate le revisioni dei file:"
+#: ../data/ui/preferences.ui.h:36
+msgid "_Order when comparing file revisions:"
+msgstr "_Ordine nel confrontare revisioni di file:"
 
-#: ../data/ui/preferences.ui.h:33
+#: ../data/ui/preferences.ui.h:37
+msgid "Order when _merging files:"
+msgstr "Ordine nell'_unione dei file:"
+
+#: ../data/ui/preferences.ui.h:38
 msgid "Commit Messages"
 msgstr "Messaggio di commit"
 
-#: ../data/ui/preferences.ui.h:34
+#: ../data/ui/preferences.ui.h:39
 msgid "Show _right margin at:"
 msgstr "Mostrare _il margine destro a:"
 
-#: ../data/ui/preferences.ui.h:35
+#: ../data/ui/preferences.ui.h:40
 msgid "Automatically _break lines at right margin on commit"
 msgstr "Spe_zzare le righe sul margine destro nel commit"
 
-#: ../data/ui/preferences.ui.h:36
+#: ../data/ui/preferences.ui.h:41
 msgid "Version Control"
 msgstr "Controllo della versione"
 
-#: ../data/ui/preferences.ui.h:37
+#: ../data/ui/preferences.ui.h:42
+msgid "Filename filters"
+msgstr "Filtri sui nomi dei file"
+
+#: ../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 "
@@ -837,15 +1113,28 @@ msgstr ""
 "directory per nome. Ogni modello è una lista di nomi che possono contenere "
 "caratteri jolly, analogamente alla shell, separati da spazi."
 
-#: ../data/ui/preferences.ui.h:38 ../meld/meldwindow.py:103
+#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:103
 msgid "File Filters"
 msgstr "Filtri dei file"
 
-#: ../data/ui/preferences.ui.h:39
+#: ../data/ui/preferences.ui.h:45
+msgid "Change trimming"
+msgstr "Modifica eliminazioni"
+
+#: ../data/ui/preferences.ui.h:46
+msgid "Trim blank line differences from the start and end of changes"
+msgstr ""
+"Elimina le differenze sulle righe vuote all'inizio e alla fine delle modifiche"
+
+#: ../data/ui/preferences.ui.h:47
+msgid "Text filters"
+msgstr "Filtri di testo"
+
+#: ../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 "
-"text with the empty string before comparison is performed. If the expression "
+"Each pattern here is a python regular expression which replaces matching text "
+"with the empty string before comparison is performed. If the expression "
 "contains groups, only the groups are replaced. See the user manual for more "
 "details."
 msgstr ""
@@ -855,15 +1144,11 @@ msgstr ""
 "comparazione. Se l'espressione contiene gruppi, solamente i gruppi saranno "
 "sostituiti. Vedere il manuale utente per maggiori dettagli."
 
-#: ../data/ui/preferences.ui.h:40
-msgid "Ignore changes which insert or delete blank lines"
-msgstr "Ignorare modifiche che inseriscono o eliminano righe vuote"
-
-#: ../data/ui/preferences.ui.h:41
+#: ../data/ui/preferences.ui.h:49
 msgid "Text Filters"
 msgstr "Filtri di testo"
 
-#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:581
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:625
 msgid "New comparison"
 msgstr "Nuovo confronto"
 
@@ -1013,7 +1298,7 @@ msgstr "Non _monitorati"
 msgid "Show unversioned files"
 msgstr "Mostra file non monitorati"
 
-#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:64
+#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:66
 msgid "Ignored"
 msgstr "Ignorati"
 
@@ -1041,104 +1326,160 @@ msgstr "Registri precedenti:"
 msgid "Co_mmit"
 msgstr "Co_mmit"
 
-#: ../data/ui/vcview.ui.h:35
+#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:337
+msgid "Location"
+msgstr "Posizione"
+
+#: ../data/ui/vcview.ui.h:37
+msgid "Status"
+msgstr "Stato"
+
+#: ../data/ui/vcview.ui.h:38
+msgid "Extra"
+msgstr "Extra"
+
+#: ../data/ui/vcview.ui.h:39
 msgid "Console output"
 msgstr "Output della console"
 
-#: ../data/ui/vcview.ui.h:36
+#: ../data/ui/vcview.ui.h:40
 msgid "Push local commits to remote?"
 msgstr "Inviare i commit locali in remoto?"
 
-#: ../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 ""
 "I commit da inviare sono determinati dal sistema di controllo della versione."
 
-#: ../data/ui/vcview.ui.h:38
+#: ../data/ui/vcview.ui.h:42
 msgid "_Push commits"
 msgstr "_Push dei commit"
 
+#: ../meld/const.py:10
+msgid "UNIX (LF)"
+msgstr "UNIX (LF)"
+
+#: ../meld/const.py:11
+msgid "DOS/Windows (CR-LF)"
+msgstr "DOS/Windows (CR-LF)"
+
+#: ../meld/const.py:12
+msgid "Mac OS (CR)"
+msgstr "Mac OS (CR)"
+
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:373
+#: ../meld/dirdiff.py:390 ../meld/preferences.py:82
 msgid "Size"
 msgstr "Dimensione"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:381
+#: ../meld/dirdiff.py:398 ../meld/preferences.py:83
 msgid "Modification time"
 msgstr "Data e ora di modifica"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:389
+#: ../meld/dirdiff.py:406 ../meld/preferences.py:84
 msgid "Permissions"
 msgstr "Permessi"
 
-#: ../meld/dirdiff.py:548
+#: ../meld/dirdiff.py:536
 #, python-format
 msgid "Hide %s"
 msgstr "Nascondi %s"
 
-#: ../meld/dirdiff.py:677 ../meld/dirdiff.py:699
+#: ../meld/dirdiff.py:668 ../meld/dirdiff.py:690
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Analisi di %s"
 
-#: ../meld/dirdiff.py:828
+#: ../meld/dirdiff.py:823
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Fatto"
 
+#: ../meld/dirdiff.py:831
+msgid "Folders have no differences"
+msgstr "Le cartelle non presentano alcuna differenza"
+
+#: ../meld/dirdiff.py:833
+msgid "Contents of scanned files in folders are identical."
+msgstr "Il contenuto dei file analizzati nelle cartelle è identico."
+
 #: ../meld/dirdiff.py:835
+msgid ""
+"Scanned files in folders appear identical, but contents have not been scanned."
+msgstr ""
+"I file analizzati nelle cartelle sembrerebbero identici, ma il loro contenuto "
+"non è stato analizzato."
+
+#: ../meld/dirdiff.py:838
+msgid "File filters are in use, so not all files have been scanned."
+msgstr ""
+"Sono in uso dei filtri sui file: non tutti i file sono stati analizzati."
+
+#: ../meld/dirdiff.py:840
+msgid "Text filters are in use and may be masking content differences."
+msgstr ""
+"Sono in uso filtri sul testo e potrebbero nascondere differenze tra i file."
+
+#: ../meld/dirdiff.py:858 ../meld/dirdiff.py:911 ../meld/filediff.py:1062
+#: ../meld/filediff.py:1094 ../meld/filediff.py:1229 ../meld/filediff.py:1424
+#: ../meld/filediff.py:1454 ../meld/filediff.py:1456
+msgid "Hi_de"
+msgstr "Nascon_di"
+
+#: ../meld/dirdiff.py:868
 msgid "Multiple errors occurred while scanning this folder"
 msgstr ""
 "Si sono verificati molteplici errore durante l'analisi di questa cartella"
 
-#: ../meld/dirdiff.py:836
+#: ../meld/dirdiff.py:869
 msgid "Files with invalid encodings found"
 msgstr "Trovati file con codifiche non valide"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:838
+#: ../meld/dirdiff.py:871
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "Alcuni file presentano delle codifiche non corrette. I nomi sono:"
 
-#: ../meld/dirdiff.py:840
+#: ../meld/dirdiff.py:873
 msgid "Files hidden by case insensitive comparison"
 msgstr "File nascosti dal confronto senza distinzione maiuscole/minuscole"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:842
+#: ../meld/dirdiff.py:875
 msgid ""
-"You are running a case insensitive comparison on a case sensitive "
-"filesystem. The following files in this folder are hidden:"
+"You are running a case insensitive comparison on a case sensitive filesystem. "
+"The following files in this folder are hidden:"
 msgstr ""
 "Confronto eseguito senza distinzione tra maiuscole/minuscole su un file "
 "system che applica tale distinzione. Alcuni file sono nascosti:"
 
-#: ../meld/dirdiff.py:853
+#: ../meld/dirdiff.py:886
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "«%s» è nascosto da «%s»"
 
-#: ../meld/dirdiff.py:878 ../meld/filediff.py:1104 ../meld/filediff.py:1242
-#: ../meld/filediff.py:1413 ../meld/filediff.py:1443 ../meld/filediff.py:1445
-msgid "Hi_de"
-msgstr "Nascon_di"
+#: ../meld/dirdiff.py:951
+#, python-format
+msgid "Replace folder “%s”?"
+msgstr "Sostituire la cartella «%s»?"
 
-#: ../meld/dirdiff.py:909
+#: ../meld/dirdiff.py:953
 #, 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» esiste già.\n"
-"Sovrascrivere?"
+"Esiste già una cartella con lo stesso nome in «%s».\n"
+"Sostituendo la cartella esistente, tutti i file in essa contenuti saranno "
+"persi."
 
-#: ../meld/dirdiff.py:917
+#: ../meld/dirdiff.py:966
 msgid "Error copying file"
 msgstr "Errore nel copiare il file"
 
-#: ../meld/dirdiff.py:918
+#: ../meld/dirdiff.py:967
 #, python-format
 msgid ""
 "Couldn't copy %s\n"
@@ -1151,250 +1492,121 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:941
+#: ../meld/dirdiff.py:990
 #, python-format
 msgid "Error deleting %s"
 msgstr "Errore nell'eliminare %s"
 
-#: ../meld/filediff.py:231
-msgid "Format as Patch..."
-msgstr "Formatta come patch..."
-
-#: ../meld/filediff.py:232
-msgid "Create a patch using differences between files"
-msgstr "Crea una patch utilizzando le differenze tra i file"
-
-#: ../meld/filediff.py:234
-msgid "Save A_ll"
-msgstr "Sal_va tutti"
-
-#: ../meld/filediff.py:235
-msgid "Save all files in the current comparison"
-msgstr "Salva tutti i file nel confronto attuale"
-
-#: ../meld/filediff.py:238
-msgid "Revert files to their saved versions"
-msgstr "Ripristina i file alla loro versione salvata"
-
-#: ../meld/filediff.py:240
-msgid "Add Synchronization Point"
-msgstr "Aggiungi punto sincronizzazione"
-
-#: ../meld/filediff.py:241
-msgid "Add a manual point for synchronization of changes between files"
-msgstr "Aggiunge un punto manuale per sincronizzare le modifiche tra i file"
-
-#: ../meld/filediff.py:244
-msgid "Clear Synchronization Points"
-msgstr "Pulisci punti sincronizzazione"
-
-#: ../meld/filediff.py:245
-msgid "Clear manual change sychronization points"
-msgstr "Pulisce i punti manuali di sincronizzazione delle modifiche"
-
-#: ../meld/filediff.py:247
-msgid "Previous Conflict"
-msgstr "Conflitto precedente"
-
-#: ../meld/filediff.py:248
-msgid "Go to the previous conflict"
-msgstr "Va al conflitto precedente"
-
-#: ../meld/filediff.py:250
-msgid "Next Conflict"
-msgstr "Conflitto successivo"
-
-#: ../meld/filediff.py:251
-msgid "Go to the next conflict"
-msgstr "Va al conflitto successivo"
-
-#: ../meld/filediff.py:253
-msgid "Push to Left"
-msgstr "Invia a sinistra"
-
-#: ../meld/filediff.py:254
-msgid "Push current change to the left"
-msgstr "Invia la modifica corrente a sinistra"
-
-#: ../meld/filediff.py:257
-msgid "Push to Right"
-msgstr "Invia a destra"
-
-#: ../meld/filediff.py:258
-msgid "Push current change to the right"
-msgstr "Invia la modifica corrente a destra"
-
-#: ../meld/filediff.py:262
-msgid "Pull from Left"
-msgstr "Prendi da sinistra"
-
-#: ../meld/filediff.py:263
-msgid "Pull change from the left"
-msgstr "Prende la modifica da sinistra"
-
-#: ../meld/filediff.py:266
-msgid "Pull from Right"
-msgstr "Prendi da destra"
-
-#: ../meld/filediff.py:267
-msgid "Pull change from the right"
-msgstr "Prende la modifica da destra"
-
-#: ../meld/filediff.py:269
-msgid "Copy Above Left"
-msgstr "Copia a sinistra sopra"
-
-#: ../meld/filediff.py:270
-msgid "Copy change above the left chunk"
-msgstr "Copia la modifica sopra al pezzo a sinistra"
-
-#: ../meld/filediff.py:272
-msgid "Copy Below Left"
-msgstr "Copia a sinistra sotto"
-
-#: ../meld/filediff.py:273
-msgid "Copy change below the left chunk"
-msgstr "Copia la modifica sotto al pezzo a sinistra"
-
-#: ../meld/filediff.py:275
-msgid "Copy Above Right"
-msgstr "Copia a destra sopra"
-
-#: ../meld/filediff.py:276
-msgid "Copy change above the right chunk"
-msgstr "Copia la modifica sopra al pezzo a destra"
-
-#: ../meld/filediff.py:278
-msgid "Copy Below Right"
-msgstr "Copia a destra sotto"
-
-#: ../meld/filediff.py:279
-msgid "Copy change below the right chunk"
-msgstr "Copia la modifica sotto al pezzo a destra"
-
-#: ../meld/filediff.py:281
-msgid "Delete"
-msgstr "Elimina"
-
-#: ../meld/filediff.py:282
-msgid "Delete change"
-msgstr "Elimina la modifica"
-
-#: ../meld/filediff.py:284
-msgid "Merge All from Left"
-msgstr "Unisci tutte da sinistra"
-
-#: ../meld/filediff.py:285
-msgid "Merge all non-conflicting changes from the left"
-msgstr "Unisce tutte le modifiche senza conflitti da sinistra"
-
-#: ../meld/filediff.py:287
-msgid "Merge All from Right"
-msgstr "Unisci tutte da destra"
-
-#: ../meld/filediff.py:288
-msgid "Merge all non-conflicting changes from the right"
-msgstr "Unisce tutte le modifiche senza conflitti da destra"
-
-#: ../meld/filediff.py:290
-msgid "Merge All"
-msgstr "Unisci tutte"
-
-#: ../meld/filediff.py:291
-msgid "Merge all non-conflicting changes from left and right panes"
-msgstr ""
-"Unisce tutte le modifiche senza conflitti dai riquadri destro e sinistro"
-
-#: ../meld/filediff.py:295
-msgid "Cycle Through Documents"
-msgstr "Passa tra i documenti"
-
-#: ../meld/filediff.py:296
-msgid "Move keyboard focus to the next document in this comparison"
-msgstr ""
-"Sposta il focus della tastiera al documento successivo in questo confronto"
-
-#: ../meld/filediff.py:302
-msgid "Lock Scrolling"
-msgstr "Blocca scorrimento"
-
-#: ../meld/filediff.py:303
-msgid "Lock scrolling of all panes"
-msgstr "Blocca lo scorrimento di tutti i riquadri"
+#: ../meld/dirdiff.py:1495
+msgid "No folder"
+msgstr "Nessuna cartella"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:490
+#: ../meld/filediff.py:368
 msgid "INS"
 msgstr "INS"
 
-#: ../meld/filediff.py:490
+#: ../meld/filediff.py:368
 msgid "OVR"
 msgstr "SSC"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:492
+#: ../meld/filediff.py:370
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Rg %i, Col %d"
 
-#: ../meld/filediff.py:829
+#: ../meld/filediff.py:783
+msgid "Comparison results will be inaccurate"
+msgstr "I risultati del confronto non saranno precisi"
+
+#: ../meld/filediff.py:785
 #, python-format
 msgid ""
-"Filter '%s' changed the number of lines in the file. Comparison will be "
-"incorrect. See the user manual for more details."
+"Filter “%s” changed the number of lines in the file, which is unsupported. "
+"The comparison will not be accurate."
+msgstr ""
+"Il filtro «%s» ha modificato il numero di righe nel file: ciò non è "
+"supportato. Il confronto non sarà corretto."
+
+#: ../meld/filediff.py:842
+msgid "Mark conflict as resolved?"
+msgstr "Marcare il conflitto come risolto?"
+
+#: ../meld/filediff.py:844
+msgid ""
+"If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
-"Il filtro «%s» ha modificato il numero di righe nel file: il confronto non "
-"sarà corretto. Consultare il manuale per maggiori informazioni."
+"Se il conflitto è stato risolto con successo, è possibile indicarlo ora."
+
+#: ../meld/filediff.py:846
+msgid "Cancel"
+msgstr "Annulla"
 
-#: ../meld/filediff.py:1092
+#: ../meld/filediff.py:847
+msgid "Mark _Resolved"
+msgstr "Marca _risolto"
+
+#: ../meld/filediff.py:1049
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Impostazione del numero dei pannelli"
 
-#: ../meld/filediff.py:1098
+#: ../meld/filediff.py:1056
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Apertura dei file"
 
-#: ../meld/filediff.py:1121 ../meld/filediff.py:1131 ../meld/filediff.py:1144
-#: ../meld/filediff.py:1150
+#: ../meld/filediff.py:1079 ../meld/filediff.py:1117 ../meld/filediff.py:1123
 msgid "Could not read file"
 msgstr "Impossibile leggere il file"
 
-#: ../meld/filediff.py:1122
+#: ../meld/filediff.py:1080
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Lettura dei file"
 
-#: ../meld/filediff.py:1132
+#: ../meld/filediff.py:1089
 #, python-format
-msgid "%s appears to be a binary file."
-msgstr "«%s» sembra essere un file binario."
+msgid "File %s appears to be a binary file."
+msgstr "Il file «%s» sembra essere un file binario."
+
+#: ../meld/filediff.py:1090
+msgid "Do you want to open the file using the default application?"
+msgstr "Aprire il file utilizzando l'applicazione predefinita?"
+
+#: ../meld/filediff.py:1093
+msgid "Open"
+msgstr "Apri"
 
-#: ../meld/filediff.py:1145
+#: ../meld/filediff.py:1118
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s non è presente nelle codifiche: %s"
 
-#: ../meld/filediff.py:1180
+#: ../meld/filediff.py:1156
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Calcolo delle differenze"
 
-#: ../meld/filediff.py:1237
+#: ../meld/filediff.py:1224
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Il file «%s» è stato modificato"
 
-#: ../meld/filediff.py:1238
+#: ../meld/filediff.py:1225
 msgid "Do you want to reload the file?"
 msgstr "Ricaricare il file?"
 
-#: ../meld/filediff.py:1241
+#: ../meld/filediff.py:1228
 msgid "_Reload"
 msgstr "_Ricarica"
 
-#: ../meld/filediff.py:1402
+#: ../meld/filediff.py:1387
+msgid "Files are identical"
+msgstr "I file sono identici"
+
+#: ../meld/filediff.py:1400
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1402,110 +1614,138 @@ msgstr ""
 "Sono in uso filtri sul testo e potrebbero nascondere differenze tra i file. "
 "Confrontare i file senza i filtri?"
 
-#: ../meld/filediff.py:1408
-msgid "Files are identical"
-msgstr "I file sono identici"
+#: ../meld/filediff.py:1405
+msgid "Files differ in line endings only"
+msgstr "I file differiscono solo nelle terminazioni di riga"
+
+#: ../meld/filediff.py:1407
+#, python-format
+msgid ""
+"Files are identical except for differing line endings:\n"
+"%s"
+msgstr ""
+"I file sono identici, ma differiscono sono nelle terminazioni di riga:\n"
+"%s"
 
-#: ../meld/filediff.py:1416
+#: ../meld/filediff.py:1427
 msgid "Show without filters"
 msgstr "Mostra senza filtri"
 
-#: ../meld/filediff.py:1438
+#: ../meld/filediff.py:1449
 msgid "Change highlighting incomplete"
 msgstr "Evidenziazione modifica incompleta"
 
 # (ndt) un po’ libera…
-#: ../meld/filediff.py:1439
+#: ../meld/filediff.py:1450
 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 ""
-"Alcune modifiche non sono state evidenziate poiché troppo grandi. È "
-"possibile fare in modo che anche le modifiche di grandi dimensioni vengano "
-"evidenziate, ma potrebbe rallentare il programma."
+"Alcune modifiche non sono state evidenziate poiché troppo grandi. È possibile "
+"fare in modo che anche le modifiche di grandi dimensioni vengano evidenziate, "
+"ma potrebbe rallentare il programma."
 
-#: ../meld/filediff.py:1447
+#: ../meld/filediff.py:1458
 msgid "Keep highlighting"
 msgstr "Continua a evidenziare"
 
-#: ../meld/filediff.py:1449
+#: ../meld/filediff.py:1460
 msgid "_Keep highlighting"
 msgstr "Continua _evidenziazione"
 
-#: ../meld/filediff.py:1580
+#: ../meld/filediff.py:1492
+#, python-format
+msgid "Replace file “%s”?"
+msgstr "Sostituire il file «%s»?"
+
+#: ../meld/filediff.py:1494
 #, python-format
 msgid ""
-"\"%s\" exists!\n"
-"Overwrite?"
+"A file with this name already exists in “%s”.\n"
+"If you replace the existing file, its contents will be lost."
 msgstr ""
-"«%s» esiste già.\n"
-"Sovrascrivere?"
+"Un file con lo stesso nome esiste già in «%s».\n"
+"Sostituendo il file esistente, tutto il suo contenuto sarà perso."
+
+#: ../meld/filediff.py:1512
+#, python-format
+msgid "Could not save file %s."
+msgstr "Impossibile salvare il file %s."
 
-#: ../meld/filediff.py:1593
+#: ../meld/filediff.py:1513
 #, python-format
 msgid ""
-"Error writing to %s\n"
-"\n"
-"%s."
+"Couldn't save file due to:\n"
+"%s"
 msgstr ""
-"Errore nello scrivere su %s\n"
-"\n"
-"%s."
+"Impossibile salvare il file a causa di:\n"
+"%s"
 
-#: ../meld/filediff.py:1604
+#: ../meld/filediff.py:1525
 msgid "Save Left Pane As"
 msgstr "Salva riquadro sinistro come"
 
-#: ../meld/filediff.py:1606
+#: ../meld/filediff.py:1527
 msgid "Save Middle Pane As"
 msgstr "Salva riquadro centrale come"
 
-#: ../meld/filediff.py:1608
+#: ../meld/filediff.py:1529
 msgid "Save Right Pane As"
 msgstr "Salva riquadro destro come"
 
-#: ../meld/filediff.py:1619
+#: ../meld/filediff.py:1543
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Il file «%s» è stato modificato"
 
-#: ../meld/filediff.py:1621
+#: ../meld/filediff.py:1545
 msgid "If you save it, any external changes will be lost."
 msgstr "Salvare il file può comportare la perdita delle modifiche esterne."
 
-#: ../meld/filediff.py:1624
+#: ../meld/filediff.py:1548
 msgid "Save Anyway"
 msgstr "Salva comunque"
 
-#: ../meld/filediff.py:1625
+#: ../meld/filediff.py:1549
 msgid "Don't Save"
 msgstr "Non salvare"
 
-#: ../meld/filediff.py:1649
+#: ../meld/filediff.py:1575
+msgid "Inconsistent line endings found"
+msgstr "Trovate terminazioni di riga inconsistenti"
+
+#: ../meld/filediff.py:1577
 #, python-format
 msgid ""
-"This file '%s' contains a mixture of line endings.\n"
-"\n"
-"Which format would you like to use?"
+"'%s' contains a mixture of line endings. Select the line ending format to use."
 msgstr ""
-"Il file «%s» contiene terminatori di riga differenti.\n"
-"\n"
-"Quale formato utilizzare?"
+"«%s» contiene un misto di terminazioni di riga. Selezionare il formato da "
+"utilizzare."
+
+#: ../meld/filediff.py:1598
+msgid "_Save as UTF-8"
+msgstr "_Salva come UTF-8"
+
+#: ../meld/filediff.py:1601
+#, python-format
+msgid "Couldn't encode text as “%s”"
+msgstr "Impossibile codificare il testo come «%s»"
 
-#: ../meld/filediff.py:1665
+#: ../meld/filediff.py:1603
 #, 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» contiene caratteri non codificabili con «%s»\n"
-"Salvare in UTF-8?"
+"Il file «%s» contiene caratteri che non possono essere codificati con con "
+"«%s»\n"
+"Salvarlo usando UTF-8?"
 
-#: ../meld/filediff.py:2024
+#: ../meld/filediff.py:1955
 msgid "Live comparison updating disabled"
 msgstr "Aggiornamento automatico dei confronti disabilitato"
 
-#: ../meld/filediff.py:2025
+#: ../meld/filediff.py:1956
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1521,102 +1761,111 @@ msgstr ""
 msgid "[%s] Merging files"
 msgstr "[%s] Unione dei file"
 
-#: ../meld/gutterrendererchunk.py:91
+#: ../meld/gutterrendererchunk.py:148
 msgid "Copy _up"
 msgstr "Copia _su"
 
-#: ../meld/gutterrendererchunk.py:92
+#: ../meld/gutterrendererchunk.py:149
 msgid "Copy _down"
 msgstr "Copia _giù"
 
-#: ../meld/meldapp.py:160
+#: ../meld/meldapp.py:175
 msgid "wrong number of arguments supplied to --diff"
 msgstr "numero errato di argomenti forniti per --diff"
 
-#: ../meld/meldapp.py:165
+#: ../meld/meldapp.py:180
 msgid "Start with an empty window"
 msgstr "Parte con una finestra vuota"
 
-#: ../meld/meldapp.py:166 ../meld/meldapp.py:168
+#: ../meld/meldapp.py:181 ../meld/meldapp.py:183
 msgid "file"
 msgstr "file"
 
-#: ../meld/meldapp.py:166 ../meld/meldapp.py:170
+#: ../meld/meldapp.py:181 ../meld/meldapp.py:185
 msgid "folder"
 msgstr "cartella"
 
-#: ../meld/meldapp.py:167
+#: ../meld/meldapp.py:182
 msgid "Start a version control comparison"
 msgstr "Inizia una comparazione da controllo di versione"
 
-#: ../meld/meldapp.py:169
+#: ../meld/meldapp.py:184
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Inizia una comparazione file a 2 o 3 vie"
 
-#: ../meld/meldapp.py:171
-#| msgid "Start a 2- or 3-way file comparison"
+#: ../meld/meldapp.py:186
 msgid "Start a 2- or 3-way folder comparison"
 msgstr "Inizia una comparazione cartella a 2 o 3 vie"
 
-#: ../meld/meldapp.py:209
+#: ../meld/meldapp.py:229
+#, python-format
+msgid "Error: %s\n"
+msgstr "Errore: %s\n"
+
+#: ../meld/meldapp.py:236
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld è uno strumento per confrontare file e directory."
 
-#: ../meld/meldapp.py:213
+#: ../meld/meldapp.py:240
 msgid "Set label to use instead of file name"
 msgstr "Imposta l'etichetta da utilizzare al posto del nome del file"
 
-#: ../meld/meldapp.py:216
+#: ../meld/meldapp.py:243
 msgid "Open a new tab in an already running instance"
 msgstr "Apre una nuova scheda in un'istanza già in esecuzione"
 
-#: ../meld/meldapp.py:219
+#: ../meld/meldapp.py:246
 msgid "Automatically compare all differing files on startup"
 msgstr "Confronta automaticamente all'avvio tutti i file diversi"
 
-#: ../meld/meldapp.py:222
+#: ../meld/meldapp.py:249
 msgid "Ignored for compatibility"
 msgstr "Ignorato per compatibilità"
 
-#: ../meld/meldapp.py:226
+#: ../meld/meldapp.py:253
 msgid "Set the target file for saving a merge result"
 msgstr "Imposta il file destinazione per salvare il risultato dell'unione"
 
-#: ../meld/meldapp.py:229
+#: ../meld/meldapp.py:256
 msgid "Automatically merge files"
 msgstr "Unisce automaticamente i file"
 
-#: ../meld/meldapp.py:233
+#: ../meld/meldapp.py:260
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "Carica un confronto salvato da un file Meld"
 
-#: ../meld/meldapp.py:237
+#: ../meld/meldapp.py:264
 msgid "Create a diff tab for the supplied files or folders"
 msgstr "Crea una scheda con le differenze per i file o le cartelle forniti"
 
-#: ../meld/meldapp.py:249
+#: ../meld/meldapp.py:284
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "troppi argomenti (ne servono da 0 a 3, forniti %d)"
 
-#: ../meld/meldapp.py:252
+#: ../meld/meldapp.py:287
 msgid "can't auto-merge less than 3 files"
 msgstr "impossibile eseguire l'unione automatica con meno di 3 file"
 
-#: ../meld/meldapp.py:254
+#: ../meld/meldapp.py:289
 msgid "can't auto-merge directories"
 msgstr "impossibile eseguire l'unione automatica di directory"
 
-#: ../meld/meldapp.py:264
+#: ../meld/meldapp.py:303
 msgid "Error reading saved comparison file"
 msgstr "Errore nel leggere il file di confronto salvato"
 
+#: ../meld/meldapp.py:330
+#, python-format
+msgid "invalid path or URI \"%s\""
+msgstr "percorso o URI «%s» non valido"
+
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:125
+#: ../meld/meldbuffer.py:138
 msgid "<unnamed>"
 msgstr "<senza nome>"
 
-#: ../meld/melddoc.py:76 ../meld/melddoc.py:77
+#: ../meld/melddoc.py:78 ../meld/melddoc.py:79
 msgid "untitled"
 msgstr "senza nome"
 
@@ -1814,16 +2063,56 @@ msgstr "Apri recenti"
 msgid "Open recent files"
 msgstr "Apre i file recenti"
 
-#: ../meld/meldwindow.py:504
+#: ../meld/meldwindow.py:164
+msgid "_Meld"
+msgstr "_Meld"
+
+#: ../meld/meldwindow.py:165
+msgid "Quit the program"
+msgstr "Esce dal programma"
+
+#: ../meld/meldwindow.py:167
+msgid "Prefere_nces"
+msgstr "Preferen_ze"
+
+#: ../meld/meldwindow.py:168
+msgid "Configure the application"
+msgstr "Configura l'applicazione"
+
+#: ../meld/meldwindow.py:170
+msgid "_Contents"
+msgstr "_Sommario"
+
+#: ../meld/meldwindow.py:171
+msgid "Open the Meld manual"
+msgstr "Apre il manuale di Meld"
+
+#: ../meld/meldwindow.py:173
+msgid "About this application"
+msgstr "Informazioni sull'applicazione"
+
+#: ../meld/meldwindow.py:548
 msgid "Switch to this tab"
 msgstr "Passa a questa scheda"
 
-#: ../meld/meldwindow.py:625
+#: ../meld/meldwindow.py:659
+#, python-format
+msgid "Need three files to auto-merge, got: %r"
+msgstr "Sono necessari tre file per un'unione automatica, ottenuti: %r"
+
+#: ../meld/meldwindow.py:673
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Non è possibile confrontare sia file che directory"
 
+#: ../meld/misc.py:168
+#, python-format
+msgid "Couldn't find colour scheme details for %s-%s; this is a bad install"
+msgstr ""
+"Impossibile trovare i dettagli dello schema colori per %s-%s: installazione "
+"danneggiata"
+
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:179
+#: ../meld/misc.py:255
 msgid "[None]"
 msgstr "[Nessuno]"
 
@@ -1835,165 +2124,196 @@ msgstr "etichetta"
 msgid "pattern"
 msgstr "modello"
 
-#: ../meld/recent.py:104
+#: ../meld/recent.py:114
 msgid "Version control:"
 msgstr "Controllo della versione:"
 
-#: ../meld/ui/findbar.py:141
-msgid "Regular expression error"
-msgstr "Errore nell'espressione regolare"
-
 #: ../meld/ui/notebooklabel.py:65
 msgid "Close tab"
 msgstr "Chiudi scheda"
 
-#: ../meld/ui/vcdialogs.py:61
+#: ../meld/ui/vcdialogs.py:50
 msgid "No files will be committed"
 msgstr "Non verrà eseguito il commit di alcun file"
 
 #. 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 su %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 commit non inviato"
 msgstr[1] "%d commit non inviati"
 
-#: ../meld/vc/git.py:129
+#: ../meld/vc/git.py:98
 #, python-format
 msgid "%d branch"
 msgid_plural "%d branches"
 msgstr[0] "%d ramo"
 msgstr[1] "%d rami"
 
-#: ../meld/vc/git.py:341
+#: ../meld/vc/git.py:350
 #, python-format
 msgid "Mode changed from %s to %s"
 msgstr "Modalità cambiata da %s a %s"
 
-#: ../meld/vc/_vc.py:47
+#: ../meld/vc/git.py:358
+msgid "Partially staged"
+msgstr "Indicizzato parzialmente"
+
+#: ../meld/vc/git.py:358
+msgid "Staged"
+msgstr "Indicizzato"
+
+#. 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 "Nessuno"
+
+#: ../meld/vc/svn.py:216
+#, python-format
+msgid "Rev %s"
+msgstr "Rev %s"
+
+#: ../meld/vc/_vc.py:51
 msgid "Merged"
 msgstr "Unito"
 
-#: ../meld/vc/_vc.py:47
+#: ../meld/vc/_vc.py:51
 msgid "Base"
 msgstr "Base"
 
-#: ../meld/vc/_vc.py:47
+#: ../meld/vc/_vc.py:51
 msgid "Local"
 msgstr "Locale"
 
-#: ../meld/vc/_vc.py:47
+#: ../meld/vc/_vc.py:51
 msgid "Remote"
 msgstr "Remoto"
 
-#: ../meld/vc/_vc.py:65
+#: ../meld/vc/_vc.py:67
 msgid "Unversioned"
 msgstr "Non monitorato"
 
-#: ../meld/vc/_vc.py:68
+#: ../meld/vc/_vc.py:70
 msgid "Error"
 msgstr "Errore"
 
-#: ../meld/vc/_vc.py:70
+#: ../meld/vc/_vc.py:72
 msgid "Newly added"
 msgstr "Aggiunto di recente"
 
-#: ../meld/vc/_vc.py:72
+#: ../meld/vc/_vc.py:74
+msgid "Renamed"
+msgstr "Rinominato"
+
+#: ../meld/vc/_vc.py:75
 msgid "Conflict"
 msgstr "Conflitto"
 
-#: ../meld/vc/_vc.py:73
+#: ../meld/vc/_vc.py:76
 msgid "Removed"
 msgstr "Rimosso"
 
-#: ../meld/vc/_vc.py:74
+#: ../meld/vc/_vc.py:77
 msgid "Missing"
 msgstr "Mancante"
 
-#: ../meld/vc/_vc.py:75
+#: ../meld/vc/_vc.py:78
 msgid "Not present"
 msgstr "Non presente"
 
-#: ../meld/vcview.py:215 ../meld/vcview.py:387
-msgid "Location"
-msgstr "Posizione"
-
-#: ../meld/vcview.py:216
-msgid "Status"
-msgstr "Stato"
-
-#: ../meld/vcview.py:217
-msgid "Revision"
-msgstr "Revisione"
-
-#: ../meld/vcview.py:218
-msgid "Options"
-msgstr "Opzioni"
-
-#. TRANSLATORS: this is an error message when a version control
-#. application isn't installed or can't be found
-#: ../meld/vcview.py:298
+#. 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 non è installato"
-
-#. TRANSLATORS: this is an error message when a version
-#. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:302
-msgid "Invalid repository"
-msgstr "Repository non valido"
+msgid "%(name)s (%(cmd)s not installed)"
+msgstr "%(name)s (%(cmd)s non installato)"
 
-#: ../meld/vcview.py:311
+#. 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)"
-
-#: ../meld/vcview.py:313 ../meld/vcview.py:321
-msgid "None"
-msgstr "Nessuno"
+msgid "%(name)s (Invalid repository)"
+msgstr "%(name)s (repository non valido)"
 
-#: ../meld/vcview.py:332
+#: ../meld/vcview.py:280
 msgid "No valid version control system found in this folder"
 msgstr ""
 "Nessun sistema di controllo della versione valido trovato in questa cartella"
 
-#: ../meld/vcview.py:334
+#: ../meld/vcview.py:282
 msgid "Only one version control system found in this folder"
 msgstr "Solo un sistema di controllo della versione trovato in questa cartella"
 
-#: ../meld/vcview.py:336
+#: ../meld/vcview.py:284
 msgid "Choose which version control system to use"
 msgstr "Scegliere il sistema di controllo della versione da usare"
 
-#. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:387
+#. 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:401 ../meld/vcview.py:409
+#: ../meld/vcview.py:357
 #, python-format
 msgid "Scanning %s"
 msgstr "Analisi di %s"
 
-#: ../meld/vcview.py:443
+#: ../meld/vcview.py:396
 msgid "(Empty)"
 msgstr "(vuoto)"
 
-#: ../meld/vcview.py:667
+#: ../meld/vcview.py:440
+#, python-format
+msgid "%s — local"
+msgstr "%s — locale"
+
+#: ../meld/vcview.py:441
+#, python-format
+msgid "%s — remote"
+msgstr "%s — remoto"
+
+#: ../meld/vcview.py:449
+#, python-format
+msgid "%s (local, merge, remote)"
+msgstr "%s (locale, unione, remoto)"
+
+#: ../meld/vcview.py:454
+#, python-format
+msgid "%s (remote, merge, local)"
+msgstr "%s (remoto, unione, locale)"
+
+#: ../meld/vcview.py:465
+#, python-format
+#| msgid "Invalid repository"
+msgid "%s — repository"
+msgstr "%s — repository"
+
+#: ../meld/vcview.py:471
+#, python-format
+msgid "%s (working, repository)"
+msgstr "%s (in uso, repository)"
+
+#: ../meld/vcview.py:475
+#, python-format
+msgid "%s (repository, working)"
+msgstr "%s (repository, in uso)"
+
+#: ../meld/vcview.py:643
 msgid "Remove folder and all its files?"
 msgstr "Rimuovere la cartella e tutti i suoi file?"
 
-#: ../meld/vcview.py:669
+#: ../meld/vcview.py:645
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2001,11 +2321,65 @@ msgstr ""
 "Verranno rimossi dal controllo di versione tutti i file selezionati, le "
 "cartelle selezionate e tutti i file al loro interno."
 
-#: ../meld/vcview.py:703
+#: ../meld/vcview.py:670
 #, python-format
 msgid "Error removing %s"
 msgstr "Errore nel rimuovere %s"
 
+#: ../meld/vcview.py:750
+msgid "Clear"
+msgstr "Azzera"
+
+#~ msgid "Copy _Left"
+#~ msgstr "Copia a _sinistra"
+
+#~ msgid "Copy _Right"
+#~ msgstr "Copia a _destra"
+
+#~ msgid "Ignore changes which insert or delete blank lines"
+#~ msgstr "Ignorare modifiche che inseriscono o eliminano righe vuote"
+
+#~ msgid ""
+#~ "'%s' exists.\n"
+#~ "Overwrite?"
+#~ msgstr ""
+#~ "«%s» esiste già.\n"
+#~ "Sovrascrivere?"
+
+#~ msgid "Clear manual change sychronization points"
+#~ msgstr "Pulisce i punti manuali di sincronizzazione delle modifiche"
+
+#~ msgid "Cycle Through Documents"
+#~ msgstr "Passa tra i documenti"
+
+#~ msgid ""
+#~ "\"%s\" exists!\n"
+#~ "Overwrite?"
+#~ msgstr ""
+#~ "«%s» esiste già.\n"
+#~ "Sovrascrivere?"
+
+#~ msgid ""
+#~ "Error writing to %s\n"
+#~ "\n"
+#~ "%s."
+#~ msgstr ""
+#~ "Errore nello scrivere su %s\n"
+#~ "\n"
+#~ "%s."
+
+#~ msgid "Regular expression error"
+#~ msgstr "Errore nell'espressione regolare"
+
+#~ msgid "Revision"
+#~ msgstr "Revisione"
+
+#~ msgid "Options"
+#~ msgstr "Opzioni"
+
+#~ msgid "%s (%s)"
+#~ msgstr "%s (%s)"
+
 #~ msgid "dir"
 #~ msgstr "dir"
 

From c4b955cf6af5d7e44f79eabd26212bc55f64022d Mon Sep 17 00:00:00 2001
From: Pedro Albuquerque <palbuquerque73@gmail.com>
Date: Sun, 25 Oct 2015 06:33:05 +0000
Subject: [PATCH 23/44] Updated Portuguese translation

---
 po/pt.po | 281 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 142 insertions(+), 139 deletions(-)

diff --git a/po/pt.po b/po/pt.po
index 02c22a69..3331dfc4 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,22 +2,23 @@
 # Copyright (C) 2003 meld
 # 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.
 #
 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-04-13 10:29+0000\n"
-"PO-Revision-Date: 2015-04-13 18:05+0100\n"
+"POT-Creation-Date: 2015-08-12 22:48+0000\n"
+"PO-Revision-Date: 2015-10-25 06:15+0000\n"
 "Last-Translator: Pedro Albuquerque <palbuquerque73@gmail.com>\n"
-"Language-Team: Pedro Albuquerque <palbuquerque73@gmail.com>\n"
+"Language-Team: Português <palbuquerque73@gmail.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: Poedit 1.5.4\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Gtranslator 2.91.6\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\\n\n"
 
 #: ../bin/meld:144
 msgid "Cannot import: "
@@ -469,7 +470,7 @@ msgstr ""
 
 #: ../data/ui/application.ui.h:1
 msgid "About Meld"
-msgstr "Acerca do Meld"
+msgstr "Sobre do Meld"
 
 #: ../data/ui/application.ui.h:2
 msgid ""
@@ -485,7 +486,9 @@ msgstr "Página Web"
 
 #: ../data/ui/application.ui.h:5
 msgid "translator-credits"
-msgstr "agradecimentos tradutores"
+msgstr ""
+"Pedro Albuquerque <palbuquerque73@gmail.com>\n"
+"Tiago S. <almosthumane@portugalmail.pt>"
 
 #: ../data/ui/application.ui.h:6
 msgid "_Preferences"
@@ -497,7 +500,7 @@ msgstr "Aj_Uda"
 
 #: ../data/ui/application.ui.h:8
 msgid "_About"
-msgstr "_Acerca"
+msgstr "_Sobre"
 
 #: ../data/ui/application.ui.h:9
 msgid "_Quit"
@@ -531,7 +534,7 @@ msgstr "Copiar para a direita"
 msgid "Delete selected"
 msgstr "Apagar selecção"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:876 ../meld/filediff.py:1460
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:881 ../meld/filediff.py:1470
 msgid "Hide"
 msgstr "Ocultar %s"
 
@@ -600,7 +603,7 @@ msgid "_Add"
 msgstr "_Adicionar"
 
 #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:753
+#: ../meld/vcview.py:762
 msgid "_Remove"
 msgstr "_Remover"
 
@@ -622,7 +625,7 @@ msgstr "Mover para _Baixo"
 
 #. Create icon and filename CellRenderer
 #: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:374
-#: ../meld/vcview.py:203
+#: ../meld/vcview.py:215
 msgid "Name"
 msgstr "Nome"
 
@@ -824,8 +827,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:967 ../meld/filediff.py:1629
-#: ../meld/filediff.py:1713 ../meld/filediff.py:1738
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:972 ../meld/filediff.py:1639
+#: ../meld/filediff.py:1723 ../meld/filediff.py:1748
 msgid "_Cancel"
 msgstr "_Cancelar"
 
@@ -863,7 +866,7 @@ msgstr ""
 "Alterações feitas aos seguintes documentos serão irremediavelmente "
 "perdidas:\n"
 
-#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:968 ../meld/filediff.py:1630
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:973 ../meld/filediff.py:1640
 msgid "_Replace"
 msgstr "Substitui_R"
 
@@ -889,7 +892,7 @@ msgstr "Substituir _Por"
 
 #: ../data/ui/findbar.ui.h:7
 msgid "_Match case"
-msgstr "_Coincidir Capitalização"
+msgstr "_Comparar maiúsculas"
 
 #: ../data/ui/findbar.ui.h:8
 msgid "Who_le word"
@@ -897,7 +900,7 @@ 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"
@@ -1356,30 +1359,30 @@ msgstr "Hora de modificação"
 msgid "Permissions"
 msgstr "Permissões"
 
-#: ../meld/dirdiff.py:558
+#: ../meld/dirdiff.py:561
 #, python-format
 msgid "Hide %s"
 msgstr "Esconder %s"
 
-#: ../meld/dirdiff.py:688 ../meld/dirdiff.py:710
+#: ../meld/dirdiff.py:693 ../meld/dirdiff.py:715
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] A analizar %s"
 
-#: ../meld/dirdiff.py:843
+#: ../meld/dirdiff.py:848
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Terminado"
 
-#: ../meld/dirdiff.py:851
+#: ../meld/dirdiff.py:856
 msgid "Folders have no differences"
 msgstr "As pastas não têm diferenças"
 
-#: ../meld/dirdiff.py:853
+#: ../meld/dirdiff.py:858
 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:855
+#: ../meld/dirdiff.py:860
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1387,44 +1390,44 @@ msgstr ""
 "Os ficheiros pesquisados nas pastas parecem idênticos, mas os conteúdos não "
 "foram pesquisados."
 
-#: ../meld/dirdiff.py:858
+#: ../meld/dirdiff.py:863
 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:860
+#: ../meld/dirdiff.py:865
 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:878 ../meld/dirdiff.py:931 ../meld/filediff.py:1115
-#: ../meld/filediff.py:1267 ../meld/filediff.py:1462 ../meld/filediff.py:1492
-#: ../meld/filediff.py:1494
+#: ../meld/dirdiff.py:883 ../meld/dirdiff.py:936 ../meld/filediff.py:1125
+#: ../meld/filediff.py:1277 ../meld/filediff.py:1472 ../meld/filediff.py:1502
+#: ../meld/filediff.py:1504
 msgid "Hi_de"
 msgstr "_Ocultar"
 
-#: ../meld/dirdiff.py:888
+#: ../meld/dirdiff.py:893
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Ocorreram múltiplos erros ao pesquisar esta pasta"
 
-#: ../meld/dirdiff.py:889
+#: ../meld/dirdiff.py:894
 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:891
+#: ../meld/dirdiff.py:896
 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:893
+#: ../meld/dirdiff.py:898
 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:895
+#: ../meld/dirdiff.py:900
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1433,17 +1436,17 @@ msgstr ""
 "ficheiros sensível a maiúsculas. Os seguintes ficheiros nesta pasta estão "
 "ocultos:"
 
-#: ../meld/dirdiff.py:906
+#: ../meld/dirdiff.py:911
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "'%s' escondido por '%s'"
 
-#: ../meld/dirdiff.py:971
+#: ../meld/dirdiff.py:976
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Substituir pasta “%s”?"
 
-#: ../meld/dirdiff.py:973
+#: ../meld/dirdiff.py:978
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1453,11 +1456,11 @@ msgstr ""
 "Se substituir a pasta existente, todos os ficheiros nela contidos serão "
 "perdidos."
 
-#: ../meld/dirdiff.py:986
+#: ../meld/dirdiff.py:991
 msgid "Error copying file"
 msgstr "Erro ao copiar o ficheiro"
 
-#: ../meld/dirdiff.py:987
+#: ../meld/dirdiff.py:992
 #, python-format
 msgid ""
 "Couldn't copy %s\n"
@@ -1470,35 +1473,35 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:1010
+#: ../meld/dirdiff.py:1015
 #, python-format
 msgid "Error deleting %s"
 msgstr "Erro ao eliminar %s"
 
-#: ../meld/dirdiff.py:1515
+#: ../meld/dirdiff.py:1520
 msgid "No folder"
 msgstr "Sem pasta"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:406
+#: ../meld/filediff.py:410
 msgid "INS"
 msgstr "INS"
 
-#: ../meld/filediff.py:406
+#: ../meld/filediff.py:410
 msgid "OVR"
 msgstr "SUBS"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:408
+#: ../meld/filediff.py:412
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Lin %i, Col %i"
 
-#: ../meld/filediff.py:821
+#: ../meld/filediff.py:825
 msgid "Comparison results will be inaccurate"
 msgstr "Os resultados da comparação serão imprecisos"
 
-#: ../meld/filediff.py:823
+#: ../meld/filediff.py:827
 #, python-format
 msgid ""
 "Filter “%s” changed the number of lines in the file, which is unsupported. "
@@ -1507,77 +1510,77 @@ msgstr ""
 "O filtro \"%s\" alterou o número de linhas no ficheiro, o que não é "
 "suportado. A comparação será imprecisa."
 
-#: ../meld/filediff.py:894
+#: ../meld/filediff.py:898
 msgid "Mark conflict as resolved?"
 msgstr "Marcar conflito como resolvido?"
 
-#: ../meld/filediff.py:896
+#: ../meld/filediff.py:900
 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:898
+#: ../meld/filediff.py:902
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../meld/filediff.py:899
+#: ../meld/filediff.py:903
 msgid "Mark _Resolved"
 msgstr "Marcar _Resolvido"
 
-#: ../meld/filediff.py:1102
+#: ../meld/filediff.py:1106
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Definir número de paineis"
 
-#: ../meld/filediff.py:1109
+#: ../meld/filediff.py:1119
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] A abrir ficheiros"
 
-#: ../meld/filediff.py:1132 ../meld/filediff.py:1142 ../meld/filediff.py:1155
-#: ../meld/filediff.py:1161
+#: ../meld/filediff.py:1142 ../meld/filediff.py:1152 ../meld/filediff.py:1165
+#: ../meld/filediff.py:1171
 msgid "Could not read file"
 msgstr "Impossível ler o ficheiro"
 
-#: ../meld/filediff.py:1133
+#: ../meld/filediff.py:1143
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] A ler ficheiros"
 
-#: ../meld/filediff.py:1143
+#: ../meld/filediff.py:1153
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s parece ser um ficheiro binário."
 
-#: ../meld/filediff.py:1156
+#: ../meld/filediff.py:1166
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s não está nas codificações: %s"
 
-#: ../meld/filediff.py:1194
+#: ../meld/filediff.py:1204
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] A calcular diferenças"
 
-#: ../meld/filediff.py:1262
+#: ../meld/filediff.py:1272
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "O ficheiro %s foi alterado no disco"
 
-#: ../meld/filediff.py:1263
+#: ../meld/filediff.py:1273
 msgid "Do you want to reload the file?"
 msgstr "Quer recarregar o ficheiro?"
 
-#: ../meld/filediff.py:1266
+#: ../meld/filediff.py:1276
 msgid "_Reload"
 msgstr "_Recarregar"
 
-#: ../meld/filediff.py:1425
+#: ../meld/filediff.py:1435
 msgid "Files are identical"
 msgstr "Os ficheiros são idênticos"
 
-#: ../meld/filediff.py:1438
+#: ../meld/filediff.py:1448
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1585,11 +1588,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:1443
+#: ../meld/filediff.py:1453
 msgid "Files differ in line endings only"
 msgstr "Os ficheiros só diferem nos fins de linha"
 
-#: ../meld/filediff.py:1445
+#: ../meld/filediff.py:1455
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1598,15 +1601,15 @@ msgstr ""
 "Os ficheiros são idênticos, exceto por diferentes fins de linha:\n"
 "%s"
 
-#: ../meld/filediff.py:1465
+#: ../meld/filediff.py:1475
 msgid "Show without filters"
 msgstr "Mostrar sem filtros"
 
-#: ../meld/filediff.py:1487
+#: ../meld/filediff.py:1497
 msgid "Change highlighting incomplete"
 msgstr "Alterar realce incompleto"
 
-#: ../meld/filediff.py:1488
+#: ../meld/filediff.py:1498
 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."
@@ -1615,20 +1618,20 @@ msgstr ""
 "forçar o Meld para demorar mais a realçar alterações grandes, mas pode ser "
 "lento."
 
-#: ../meld/filediff.py:1496
+#: ../meld/filediff.py:1506
 msgid "Keep highlighting"
 msgstr "Manter realce"
 
-#: ../meld/filediff.py:1498
+#: ../meld/filediff.py:1508
 msgid "_Keep highlighting"
 msgstr "_Manter realce"
 
-#: ../meld/filediff.py:1633
+#: ../meld/filediff.py:1643
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Substituir ficheiro “%s”?"
 
-#: ../meld/filediff.py:1635
+#: ../meld/filediff.py:1645
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -1637,12 +1640,12 @@ 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:1653
+#: ../meld/filediff.py:1663
 #, python-format
 msgid "Could not save file %s."
 msgstr "Impossível gravar o ficheiro %s."
 
-#: ../meld/filediff.py:1654
+#: ../meld/filediff.py:1664
 #, python-format
 msgid ""
 "Couldn't save file due to:\n"
@@ -1651,40 +1654,40 @@ msgstr ""
 "Impossível gravar o ficheiro porque:\n"
 "%s"
 
-#: ../meld/filediff.py:1666
+#: ../meld/filediff.py:1676
 msgid "Save Left Pane As"
 msgstr "Gravar painel esquerdo como"
 
-#: ../meld/filediff.py:1668
+#: ../meld/filediff.py:1678
 msgid "Save Middle Pane As"
 msgstr "Gravar painel central como"
 
-#: ../meld/filediff.py:1670
+#: ../meld/filediff.py:1680
 msgid "Save Right Pane As"
 msgstr "Gravar painel direito como"
 
-#: ../meld/filediff.py:1684
+#: ../meld/filediff.py:1694
 #, 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:1686
+#: ../meld/filediff.py:1696
 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:1689
+#: ../meld/filediff.py:1699
 msgid "Save Anyway"
 msgstr "Gravar mesmo assim"
 
-#: ../meld/filediff.py:1690
+#: ../meld/filediff.py:1700
 msgid "Don't Save"
 msgstr "Não gravar"
 
-#: ../meld/filediff.py:1716
+#: ../meld/filediff.py:1726
 msgid "Inconsistent line endings found"
 msgstr "Encontrados fins de linha inconsistentes"
 
-#: ../meld/filediff.py:1718
+#: ../meld/filediff.py:1728
 #, python-format
 msgid ""
 "'%s' contains a mixture of line endings. Select the line ending format to "
@@ -1693,16 +1696,16 @@ msgstr ""
 "'%s' contém uma mistura de fins de linha. Selecione o formato de fim de "
 "linha a usar."
 
-#: ../meld/filediff.py:1739
+#: ../meld/filediff.py:1749
 msgid "_Save as UTF-8"
 msgstr "Gravar como UTF-8"
 
-#: ../meld/filediff.py:1742
+#: ../meld/filediff.py:1752
 #, python-format
 msgid "Couldn't encode text as “%s”"
 msgstr "Impossível codificar texto como \"%s\""
 
-#: ../meld/filediff.py:1744
+#: ../meld/filediff.py:1754
 #, python-format
 msgid ""
 "File “%s” contains characters that can't be encoded using encoding “%s”.\n"
@@ -1712,11 +1715,11 @@ msgstr ""
 "\".\n"
 "Quer gravar como UTF-8?"
 
-#: ../meld/filediff.py:2096
+#: ../meld/filediff.py:2106
 msgid "Live comparison updating disabled"
 msgstr "Atualização ao vivo da comparação desativada"
 
-#: ../meld/filediff.py:2097
+#: ../meld/filediff.py:2107
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1739,99 +1742,99 @@ msgstr "Copiar a_Cima"
 msgid "Copy _down"
 msgstr "Copiar a_Baixo"
 
-#: ../meld/meldapp.py:170
+#: ../meld/meldapp.py:169
 msgid "wrong number of arguments supplied to --diff"
 msgstr "número errado de argumentos fornecidos a --diff"
 
-#: ../meld/meldapp.py:175
+#: ../meld/meldapp.py:174
 msgid "Start with an empty window"
 msgstr "Começar com uma janela vazia"
 
-#: ../meld/meldapp.py:176 ../meld/meldapp.py:178
+#: ../meld/meldapp.py:175 ../meld/meldapp.py:177
 msgid "file"
 msgstr "ficheiro"
 
-#: ../meld/meldapp.py:176 ../meld/meldapp.py:180
+#: ../meld/meldapp.py:175 ../meld/meldapp.py:179
 msgid "folder"
 msgstr "pasta"
 
-#: ../meld/meldapp.py:177
+#: ../meld/meldapp.py:176
 msgid "Start a version control comparison"
 msgstr "Começar uma comparação de controlo de versão"
 
-#: ../meld/meldapp.py:179
+#: ../meld/meldapp.py:178
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Começar uma comparação de ficheiros de duas ou três vias"
 
-#: ../meld/meldapp.py:181
+#: ../meld/meldapp.py:180
 msgid "Start a 2- or 3-way folder comparison"
 msgstr "Começar uma comparação de pastas de duas ou três vias"
 
-#: ../meld/meldapp.py:224
+#: ../meld/meldapp.py:223
 #, python-format
 msgid "Error: %s\n"
 msgstr "Erro: %s\n"
 
-#: ../meld/meldapp.py:231
+#: ../meld/meldapp.py:230
 msgid "Meld is a file and directory comparison tool."
 msgstr "O Meld é uma ferramenta de comparação de ficheiros e pastas."
 
-#: ../meld/meldapp.py:235
+#: ../meld/meldapp.py:234
 msgid "Set label to use instead of file name"
 msgstr "Definir rótulo a usar em vez do nome de ficheiro"
 
-#: ../meld/meldapp.py:238
+#: ../meld/meldapp.py:237
 msgid "Open a new tab in an already running instance"
 msgstr "Abrir novo separador numa instância já em execução"
 
-#: ../meld/meldapp.py:241
+#: ../meld/meldapp.py:240
 msgid "Automatically compare all differing files on startup"
 msgstr "Comparar automaticamente todos os ficheiros diferentes no arranque"
 
-#: ../meld/meldapp.py:244
+#: ../meld/meldapp.py:243
 msgid "Ignored for compatibility"
 msgstr "Ignorado para compatibilidade"
 
-#: ../meld/meldapp.py:248
+#: ../meld/meldapp.py:247
 msgid "Set the target file for saving a merge result"
 msgstr "Definir ficheiro destino para gravar o resultado de uma união"
 
-#: ../meld/meldapp.py:251
+#: ../meld/meldapp.py:250
 msgid "Automatically merge files"
 msgstr "Unir ficheiros automaticamente"
 
-#: ../meld/meldapp.py:255
+#: ../meld/meldapp.py:254
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "Carregar uma comparação gravada de um ficheiro do Meld"
 
-#: ../meld/meldapp.py:259
+#: ../meld/meldapp.py:258
 msgid "Create a diff tab for the supplied files or folders"
 msgstr "Criar um separador Diff para os ficheiros/pastas selecionados"
 
-#: ../meld/meldapp.py:279
+#: ../meld/meldapp.py:278
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "demasiados argumentos (desejados 0-3, obtidos %d)"
 
-#: ../meld/meldapp.py:282
+#: ../meld/meldapp.py:281
 msgid "can't auto-merge less than 3 files"
 msgstr "impossível unir automaticamente menos de 3 ficheiros"
 
-#: ../meld/meldapp.py:284
+#: ../meld/meldapp.py:283
 msgid "can't auto-merge directories"
 msgstr "impossível unir automaticamente pastas"
 
-#: ../meld/meldapp.py:298
+#: ../meld/meldapp.py:297
 msgid "Error reading saved comparison file"
 msgstr "Erro ao ler ficheiro de comparação gravado"
 
-#: ../meld/meldapp.py:326
+#: ../meld/meldapp.py:324
 #, python-format
 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:137
+#: ../meld/meldbuffer.py:138
 msgid "<unnamed>"
 msgstr "<sem título>"
 
@@ -2073,7 +2076,7 @@ msgid "Cannot compare a mixture of files and directories"
 msgstr "Impossível comparar uma mistura de ficheiros e pastas"
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:178
+#: ../meld/misc.py:203
 msgid "[None]"
 msgstr "[Nenhum]"
 
@@ -2099,28 +2102,28 @@ msgstr "Não serão submetidos nenhuns ficheiros"
 
 #. Translators: First %s is replaced by translated "%d unpushed
 #. commits", second %s is replaced by translated "%d branches"
-#: ../meld/vc/git.py:129
+#: ../meld/vc/git.py:127
 #, python-format
 msgid "%s in %s"
 msgstr "%s commits não submetidos em  %s ramos"
 
 #. Translators: These messages cover the case where there is
 #. only one branch, and are not part of another message.
-#: ../meld/vc/git.py:130 ../meld/vc/git.py:137
+#: ../meld/vc/git.py:128 ../meld/vc/git.py:135
 #, python-format
 msgid "%d unpushed commit"
 msgid_plural "%d unpushed commits"
 msgstr[0] "%d commit não empurrado"
 msgstr[1] "%d commits não empurrados"
 
-#: ../meld/vc/git.py:132
+#: ../meld/vc/git.py:130
 #, python-format
 msgid "%d branch"
 msgid_plural "%d branches"
 msgstr[0] "%d ramo"
 msgstr[1] "%d ramos"
 
-#: ../meld/vc/git.py:360
+#: ../meld/vc/git.py:357
 #, python-format
 msgid "Mode changed from %s to %s"
 msgstr "Modo alterado de %s para %s"
@@ -2173,111 +2176,111 @@ msgstr "Em falta"
 msgid "Not present"
 msgstr "Não presentes"
 
-#: ../meld/vcview.py:233 ../meld/vcview.py:417
+#: ../meld/vcview.py:245 ../meld/vcview.py:426
 msgid "Location"
 msgstr "Localização"
 
-#: ../meld/vcview.py:234
+#: ../meld/vcview.py:246
 msgid "Status"
 msgstr "Estado"
 
-#: ../meld/vcview.py:235
+#: ../meld/vcview.py:247
 msgid "Revision"
 msgstr "Revisão"
 
-#: ../meld/vcview.py:236
+#: ../meld/vcview.py:248
 msgid "Options"
 msgstr "Opções"
 
 #. TRANSLATORS: this is an error message when a version control
 #. application isn't installed or can't be found
-#: ../meld/vcview.py:324
+#: ../meld/vcview.py:336
 #, python-format
 msgid "%s not installed"
 msgstr "%s não instalado"
 
 #. TRANSLATORS: this is an error message when a version
 #. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:328
+#: ../meld/vcview.py:340
 msgid "Invalid repository"
 msgstr "Repositório inválido"
 
-#: ../meld/vcview.py:337
+#: ../meld/vcview.py:349
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../meld/vcview.py:339 ../meld/vcview.py:347
+#: ../meld/vcview.py:351 ../meld/vcview.py:359
 msgid "None"
 msgstr "Nenhum"
 
-#: ../meld/vcview.py:358
+#: ../meld/vcview.py:370
 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:360
+#: ../meld/vcview.py:372
 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:362
+#: ../meld/vcview.py:374
 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 the user is diffing
-#: ../meld/vcview.py:417
+#: ../meld/vcview.py:426
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:431 ../meld/vcview.py:439
+#: ../meld/vcview.py:448
 #, python-format
 msgid "Scanning %s"
 msgstr "A analisar %s"
 
-#: ../meld/vcview.py:479
+#: ../meld/vcview.py:488
 msgid "(Empty)"
 msgstr "(Vazio)"
 
-#: ../meld/vcview.py:522
+#: ../meld/vcview.py:531
 #, python-format
 msgid "%s — local"
 msgstr "%s — local"
 
-#: ../meld/vcview.py:523
+#: ../meld/vcview.py:532
 #, python-format
 msgid "%s — remote"
 msgstr "%s — remoto"
 
-#: ../meld/vcview.py:531
+#: ../meld/vcview.py:540
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (local, unir, remoto)"
 
-#: ../meld/vcview.py:536
+#: ../meld/vcview.py:545
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (remoto, unir, local)"
 
-#: ../meld/vcview.py:547
+#: ../meld/vcview.py:556
 #, python-format
 msgid "%s — repository"
 msgstr "%s — repositório"
 
-#: ../meld/vcview.py:553
+#: ../meld/vcview.py:562
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (trabalho, repositório)"
 
-#: ../meld/vcview.py:557
+#: ../meld/vcview.py:566
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (repositório, trabalho)"
 
-#: ../meld/vcview.py:747
+#: ../meld/vcview.py:756
 msgid "Remove folder and all its files?"
 msgstr "Remover pasta e todos os ficheiros?"
 
-#: ../meld/vcview.py:749
+#: ../meld/vcview.py:758
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2285,7 +2288,7 @@ 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:783
+#: ../meld/vcview.py:792
 #, python-format
 msgid "Error removing %s"
 msgstr "Erro ao remover %s"
@@ -2559,7 +2562,7 @@ msgstr "Erro ao remover %s"
 #~ msgstr "Ignorar capitalização das entradas"
 
 #~ msgid "Case"
-#~ msgstr "Capitalização"
+#~ msgstr "Maiúsculas"
 
 #~ msgid "Two way file"
 #~ msgstr "Ficheiro em duas vistas"

From 4b09520fe7737159aaa6090cab33fdce9a27932c Mon Sep 17 00:00:00 2001
From: Pedro Albuquerque <palbuquerque73@gmail.com>
Date: Sun, 25 Oct 2015 06:38:32 +0000
Subject: [PATCH 24/44] Updated Portuguese translation

---
 po/pt.po | 155 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 82 insertions(+), 73 deletions(-)

diff --git a/po/pt.po b/po/pt.po
index 3331dfc4..a6552e68 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,8 +9,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: 2015-08-12 22:48+0000\n"
-"PO-Revision-Date: 2015-10-25 06:15+0000\n"
+"POT-Creation-Date: 2015-10-25 06:34+0000\n"
+"PO-Revision-Date: 2015-10-25 06:37+0000\n"
 "Last-Translator: Pedro Albuquerque <palbuquerque73@gmail.com>\n"
 "Language-Team: Português <palbuquerque73@gmail.com>\n"
 "Language: pt\n"
@@ -470,7 +470,7 @@ msgstr ""
 
 #: ../data/ui/application.ui.h:1
 msgid "About Meld"
-msgstr "Sobre do Meld"
+msgstr "Sobre o Meld"
 
 #: ../data/ui/application.ui.h:2
 msgid ""
@@ -534,7 +534,7 @@ msgstr "Copiar para a direita"
 msgid "Delete selected"
 msgstr "Apagar selecção"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:881 ../meld/filediff.py:1470
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:881 ../meld/filediff.py:1489
 msgid "Hide"
 msgstr "Ocultar %s"
 
@@ -827,8 +827,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:972 ../meld/filediff.py:1639
-#: ../meld/filediff.py:1723 ../meld/filediff.py:1748
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:972 ../meld/filediff.py:1658
+#: ../meld/filediff.py:1742 ../meld/filediff.py:1767
 msgid "_Cancel"
 msgstr "_Cancelar"
 
@@ -866,7 +866,7 @@ msgstr ""
 "Alterações feitas aos seguintes documentos serão irremediavelmente "
 "perdidas:\n"
 
-#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:973 ../meld/filediff.py:1640
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:973 ../meld/filediff.py:1659
 msgid "_Replace"
 msgstr "Substitui_R"
 
@@ -914,7 +914,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:119
+#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:125
 msgid "Save Patch"
 msgstr "Gravar patch"
 
@@ -1402,9 +1402,9 @@ msgstr ""
 "Os filtros de texto estão em uso e podem estar a mascarar diferenças de "
 "conteúdo."
 
-#: ../meld/dirdiff.py:883 ../meld/dirdiff.py:936 ../meld/filediff.py:1125
-#: ../meld/filediff.py:1277 ../meld/filediff.py:1472 ../meld/filediff.py:1502
-#: ../meld/filediff.py:1504
+#: ../meld/dirdiff.py:883 ../meld/dirdiff.py:936 ../meld/filediff.py:1129
+#: ../meld/filediff.py:1161 ../meld/filediff.py:1296 ../meld/filediff.py:1491
+#: ../meld/filediff.py:1521 ../meld/filediff.py:1523
 msgid "Hi_de"
 msgstr "_Ocultar"
 
@@ -1528,59 +1528,68 @@ msgstr "Cancelar"
 msgid "Mark _Resolved"
 msgstr "Marcar _Resolvido"
 
-#: ../meld/filediff.py:1106
+#: ../meld/filediff.py:1110
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Definir número de paineis"
 
-#: ../meld/filediff.py:1119
+#: ../meld/filediff.py:1123
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] A abrir ficheiros"
 
-#: ../meld/filediff.py:1142 ../meld/filediff.py:1152 ../meld/filediff.py:1165
-#: ../meld/filediff.py:1171
+#: ../meld/filediff.py:1146 ../meld/filediff.py:1184 ../meld/filediff.py:1190
 msgid "Could not read file"
 msgstr "Impossível ler o ficheiro"
 
-#: ../meld/filediff.py:1143
+#: ../meld/filediff.py:1147
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] A ler ficheiros"
 
-#: ../meld/filediff.py:1153
+#: ../meld/filediff.py:1156
 #, python-format
-msgid "%s appears to be a binary file."
-msgstr "%s parece ser um ficheiro binário."
+#| msgid "%s appears to be a binary file."
+msgid "File %s appears to be a binary file."
+msgstr "O ficheiro %s parece ser um ficheiro binário."
 
-#: ../meld/filediff.py:1166
+#: ../meld/filediff.py:1157
+#| msgid "Open selected file or directory in the default external application"
+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:1160
+msgid "Open"
+msgstr "Abrir"
+
+#: ../meld/filediff.py:1185
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s não está nas codificações: %s"
 
-#: ../meld/filediff.py:1204
+#: ../meld/filediff.py:1223
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] A calcular diferenças"
 
-#: ../meld/filediff.py:1272
+#: ../meld/filediff.py:1291
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "O ficheiro %s foi alterado no disco"
 
-#: ../meld/filediff.py:1273
+#: ../meld/filediff.py:1292
 msgid "Do you want to reload the file?"
 msgstr "Quer recarregar o ficheiro?"
 
-#: ../meld/filediff.py:1276
+#: ../meld/filediff.py:1295
 msgid "_Reload"
 msgstr "_Recarregar"
 
-#: ../meld/filediff.py:1435
+#: ../meld/filediff.py:1454
 msgid "Files are identical"
 msgstr "Os ficheiros são idênticos"
 
-#: ../meld/filediff.py:1448
+#: ../meld/filediff.py:1467
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1588,11 +1597,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:1453
+#: ../meld/filediff.py:1472
 msgid "Files differ in line endings only"
 msgstr "Os ficheiros só diferem nos fins de linha"
 
-#: ../meld/filediff.py:1455
+#: ../meld/filediff.py:1474
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1601,15 +1610,15 @@ msgstr ""
 "Os ficheiros são idênticos, exceto por diferentes fins de linha:\n"
 "%s"
 
-#: ../meld/filediff.py:1475
+#: ../meld/filediff.py:1494
 msgid "Show without filters"
 msgstr "Mostrar sem filtros"
 
-#: ../meld/filediff.py:1497
+#: ../meld/filediff.py:1516
 msgid "Change highlighting incomplete"
 msgstr "Alterar realce incompleto"
 
-#: ../meld/filediff.py:1498
+#: ../meld/filediff.py:1517
 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."
@@ -1618,20 +1627,20 @@ msgstr ""
 "forçar o Meld para demorar mais a realçar alterações grandes, mas pode ser "
 "lento."
 
-#: ../meld/filediff.py:1506
+#: ../meld/filediff.py:1525
 msgid "Keep highlighting"
 msgstr "Manter realce"
 
-#: ../meld/filediff.py:1508
+#: ../meld/filediff.py:1527
 msgid "_Keep highlighting"
 msgstr "_Manter realce"
 
-#: ../meld/filediff.py:1643
+#: ../meld/filediff.py:1662
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Substituir ficheiro “%s”?"
 
-#: ../meld/filediff.py:1645
+#: ../meld/filediff.py:1664
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -1640,12 +1649,12 @@ 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:1663
+#: ../meld/filediff.py:1682
 #, python-format
 msgid "Could not save file %s."
 msgstr "Impossível gravar o ficheiro %s."
 
-#: ../meld/filediff.py:1664
+#: ../meld/filediff.py:1683
 #, python-format
 msgid ""
 "Couldn't save file due to:\n"
@@ -1654,40 +1663,40 @@ msgstr ""
 "Impossível gravar o ficheiro porque:\n"
 "%s"
 
-#: ../meld/filediff.py:1676
+#: ../meld/filediff.py:1695
 msgid "Save Left Pane As"
 msgstr "Gravar painel esquerdo como"
 
-#: ../meld/filediff.py:1678
+#: ../meld/filediff.py:1697
 msgid "Save Middle Pane As"
 msgstr "Gravar painel central como"
 
-#: ../meld/filediff.py:1680
+#: ../meld/filediff.py:1699
 msgid "Save Right Pane As"
 msgstr "Gravar painel direito como"
 
-#: ../meld/filediff.py:1694
+#: ../meld/filediff.py:1713
 #, 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:1696
+#: ../meld/filediff.py:1715
 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:1699
+#: ../meld/filediff.py:1718
 msgid "Save Anyway"
 msgstr "Gravar mesmo assim"
 
-#: ../meld/filediff.py:1700
+#: ../meld/filediff.py:1719
 msgid "Don't Save"
 msgstr "Não gravar"
 
-#: ../meld/filediff.py:1726
+#: ../meld/filediff.py:1745
 msgid "Inconsistent line endings found"
 msgstr "Encontrados fins de linha inconsistentes"
 
-#: ../meld/filediff.py:1728
+#: ../meld/filediff.py:1747
 #, python-format
 msgid ""
 "'%s' contains a mixture of line endings. Select the line ending format to "
@@ -1696,16 +1705,16 @@ msgstr ""
 "'%s' contém uma mistura de fins de linha. Selecione o formato de fim de "
 "linha a usar."
 
-#: ../meld/filediff.py:1749
+#: ../meld/filediff.py:1768
 msgid "_Save as UTF-8"
 msgstr "Gravar como UTF-8"
 
-#: ../meld/filediff.py:1752
+#: ../meld/filediff.py:1771
 #, python-format
 msgid "Couldn't encode text as “%s”"
 msgstr "Impossível codificar texto como \"%s\""
 
-#: ../meld/filediff.py:1754
+#: ../meld/filediff.py:1773
 #, python-format
 msgid ""
 "File “%s” contains characters that can't be encoded using encoding “%s”.\n"
@@ -1715,11 +1724,11 @@ msgstr ""
 "\".\n"
 "Quer gravar como UTF-8?"
 
-#: ../meld/filediff.py:2106
+#: ../meld/filediff.py:2125
 msgid "Live comparison updating disabled"
 msgstr "Atualização ao vivo da comparação desativada"
 
-#: ../meld/filediff.py:2107
+#: ../meld/filediff.py:2126
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1742,93 +1751,93 @@ msgstr "Copiar a_Cima"
 msgid "Copy _down"
 msgstr "Copiar a_Baixo"
 
-#: ../meld/meldapp.py:169
+#: ../meld/meldapp.py:175
 msgid "wrong number of arguments supplied to --diff"
 msgstr "número errado de argumentos fornecidos a --diff"
 
-#: ../meld/meldapp.py:174
+#: ../meld/meldapp.py:180
 msgid "Start with an empty window"
 msgstr "Começar com uma janela vazia"
 
-#: ../meld/meldapp.py:175 ../meld/meldapp.py:177
+#: ../meld/meldapp.py:181 ../meld/meldapp.py:183
 msgid "file"
 msgstr "ficheiro"
 
-#: ../meld/meldapp.py:175 ../meld/meldapp.py:179
+#: ../meld/meldapp.py:181 ../meld/meldapp.py:185
 msgid "folder"
 msgstr "pasta"
 
-#: ../meld/meldapp.py:176
+#: ../meld/meldapp.py:182
 msgid "Start a version control comparison"
 msgstr "Começar uma comparação de controlo de versão"
 
-#: ../meld/meldapp.py:178
+#: ../meld/meldapp.py:184
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Começar uma comparação de ficheiros de duas ou três vias"
 
-#: ../meld/meldapp.py:180
+#: ../meld/meldapp.py:186
 msgid "Start a 2- or 3-way folder comparison"
 msgstr "Começar uma comparação de pastas de duas ou três vias"
 
-#: ../meld/meldapp.py:223
+#: ../meld/meldapp.py:229
 #, python-format
 msgid "Error: %s\n"
 msgstr "Erro: %s\n"
 
-#: ../meld/meldapp.py:230
+#: ../meld/meldapp.py:236
 msgid "Meld is a file and directory comparison tool."
 msgstr "O Meld é uma ferramenta de comparação de ficheiros e pastas."
 
-#: ../meld/meldapp.py:234
+#: ../meld/meldapp.py:240
 msgid "Set label to use instead of file name"
 msgstr "Definir rótulo a usar em vez do nome de ficheiro"
 
-#: ../meld/meldapp.py:237
+#: ../meld/meldapp.py:243
 msgid "Open a new tab in an already running instance"
 msgstr "Abrir novo separador numa instância já em execução"
 
-#: ../meld/meldapp.py:240
+#: ../meld/meldapp.py:246
 msgid "Automatically compare all differing files on startup"
 msgstr "Comparar automaticamente todos os ficheiros diferentes no arranque"
 
-#: ../meld/meldapp.py:243
+#: ../meld/meldapp.py:249
 msgid "Ignored for compatibility"
 msgstr "Ignorado para compatibilidade"
 
-#: ../meld/meldapp.py:247
+#: ../meld/meldapp.py:253
 msgid "Set the target file for saving a merge result"
 msgstr "Definir ficheiro destino para gravar o resultado de uma união"
 
-#: ../meld/meldapp.py:250
+#: ../meld/meldapp.py:256
 msgid "Automatically merge files"
 msgstr "Unir ficheiros automaticamente"
 
-#: ../meld/meldapp.py:254
+#: ../meld/meldapp.py:260
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "Carregar uma comparação gravada de um ficheiro do Meld"
 
-#: ../meld/meldapp.py:258
+#: ../meld/meldapp.py:264
 msgid "Create a diff tab for the supplied files or folders"
 msgstr "Criar um separador Diff para os ficheiros/pastas selecionados"
 
-#: ../meld/meldapp.py:278
+#: ../meld/meldapp.py:284
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "demasiados argumentos (desejados 0-3, obtidos %d)"
 
-#: ../meld/meldapp.py:281
+#: ../meld/meldapp.py:287
 msgid "can't auto-merge less than 3 files"
 msgstr "impossível unir automaticamente menos de 3 ficheiros"
 
-#: ../meld/meldapp.py:283
+#: ../meld/meldapp.py:289
 msgid "can't auto-merge directories"
 msgstr "impossível unir automaticamente pastas"
 
-#: ../meld/meldapp.py:297
+#: ../meld/meldapp.py:303
 msgid "Error reading saved comparison file"
 msgstr "Erro ao ler ficheiro de comparação gravado"
 
-#: ../meld/meldapp.py:324
+#: ../meld/meldapp.py:330
 #, python-format
 msgid "invalid path or URI \"%s\""
 msgstr "Caminho ou URI inválido \"%s\""

From 5a83630b47c9e7b163db5c16513d1375365d08b8 Mon Sep 17 00:00:00 2001
From: Anders Jonsson <anders.jonsson@norsjovallen.se>
Date: Mon, 26 Oct 2015 17:34:45 +0000
Subject: [PATCH 25/44] Updated Swedish translation

---
 po/sv.po | 214 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 110 insertions(+), 104 deletions(-)

diff --git a/po/sv.po b/po/sv.po
index 2d090240..caa19c28 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,16 +9,16 @@ 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: 2015-06-29 10:37+0000\n"
-"PO-Revision-Date: 2015-06-28 20:15+0100\n"
-"Last-Translator: Josef Andersson <josef.andersson@fripost.org>\n"
+"POT-Creation-Date: 2015-10-26 13:19+0000\n"
+"PO-Revision-Date: 2015-10-26 18:33+0100\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: Virtaal 0.7.1\n"
+"X-Generator: Poedit 1.8.5\n"
 "X-Project-Style: gnome\n"
 
 #: ../bin/meld:144
@@ -535,7 +535,7 @@ msgstr "Kopiera till höger"
 msgid "Delete selected"
 msgstr "Ta bort markerade"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:879 ../meld/filediff.py:1463
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:881 ../meld/filediff.py:1489
 msgid "Hide"
 msgstr "Dölj"
 
@@ -624,8 +624,7 @@ msgid "Move _Down"
 msgstr "Flytta _nedåt"
 
 #. Create icon and filename CellRenderer
-#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:374
-#: ../meld/vcview.py:215
+#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:374 ../meld/vcview.py:215
 msgid "Name"
 msgstr "Namn"
 
@@ -826,8 +825,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:970 ../meld/filediff.py:1632
-#: ../meld/filediff.py:1716 ../meld/filediff.py:1741
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:972 ../meld/filediff.py:1658
+#: ../meld/filediff.py:1742 ../meld/filediff.py:1767
 msgid "_Cancel"
 msgstr "_Avbryt"
 
@@ -864,7 +863,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:971 ../meld/filediff.py:1633
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:973 ../meld/filediff.py:1659
 msgid "_Replace"
 msgstr "_Ersätt"
 
@@ -912,7 +911,7 @@ msgstr "Formatera som programfix"
 msgid "Copy to Clipboard"
 msgstr "Kopiera till Urklipp"
 
-#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:119
+#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:125
 msgid "Save Patch"
 msgstr "Spara programfix"
 
@@ -1360,64 +1359,64 @@ msgstr "Rättigheter"
 msgid "Hide %s"
 msgstr "Dölj %s"
 
-#: ../meld/dirdiff.py:691 ../meld/dirdiff.py:713
+#: ../meld/dirdiff.py:693 ../meld/dirdiff.py:715
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Söker igenom %s"
 
-#: ../meld/dirdiff.py:846
+#: ../meld/dirdiff.py:848
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Klar"
 
-#: ../meld/dirdiff.py:854
+#: ../meld/dirdiff.py:856
 msgid "Folders have no differences"
 msgstr "Mapparna skiljer sig inte åt"
 
-#: ../meld/dirdiff.py:856
+#: ../meld/dirdiff.py:858
 msgid "Contents of scanned files in folders are identical."
 msgstr "Innehållet i mapparnas avsökta filer är identiskt."
 
-#: ../meld/dirdiff.py:858
+#: ../meld/dirdiff.py:860
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
 msgstr ""
 "Mapparnas avsökta filer verkar identiska, men innehållet har inte genomsökts."
 
-#: ../meld/dirdiff.py:861
+#: ../meld/dirdiff.py:863
 msgid "File filters are in use, so not all files have been scanned."
 msgstr "Filfilter används, och därför har inte alla filer genomsökts."
 
-#: ../meld/dirdiff.py:863
+#: ../meld/dirdiff.py:865
 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:881 ../meld/dirdiff.py:934 ../meld/filediff.py:1118
-#: ../meld/filediff.py:1270 ../meld/filediff.py:1465 ../meld/filediff.py:1495
-#: ../meld/filediff.py:1497
+#: ../meld/dirdiff.py:883 ../meld/dirdiff.py:936 ../meld/filediff.py:1129
+#: ../meld/filediff.py:1161 ../meld/filediff.py:1296 ../meld/filediff.py:1491
+#: ../meld/filediff.py:1521 ../meld/filediff.py:1523
 msgid "Hi_de"
 msgstr "_Dölj"
 
-#: ../meld/dirdiff.py:891
+#: ../meld/dirdiff.py:893
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Flera fel inträffade vid avsökning av denna mapp"
 
-#: ../meld/dirdiff.py:892
+#: ../meld/dirdiff.py:894
 msgid "Files with invalid encodings found"
 msgstr "Filer med ogiltiga teckenkodningar hittades"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:894
+#: ../meld/dirdiff.py:896
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "En del filer hade en felaktig kodning. Namnen är ungefär:"
 
-#: ../meld/dirdiff.py:896
+#: ../meld/dirdiff.py:898
 msgid "Files hidden by case insensitive comparison"
 msgstr "Filer dolda av skiftlägeskänslig jämförelse"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:898
+#: ../meld/dirdiff.py:900
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1425,17 +1424,17 @@ msgstr ""
 "Du gör en skiftlägesokänslig jämförelse på ett skiftlägeskänsligt filsystem. "
 "En del filer syns inte:"
 
-#: ../meld/dirdiff.py:909
+#: ../meld/dirdiff.py:911
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "”%s” dolda av ”%s”"
 
-#: ../meld/dirdiff.py:974
+#: ../meld/dirdiff.py:976
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Ersätt mappen ”%s”?"
 
-#: ../meld/dirdiff.py:976
+#: ../meld/dirdiff.py:978
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1444,11 +1443,11 @@ msgstr ""
 "En annan mapp med samma namn existerar redan i ”%s”.\n"
 "Om du ersätter befintlig mapp kommer alla filer att förloras."
 
-#: ../meld/dirdiff.py:989
+#: ../meld/dirdiff.py:991
 msgid "Error copying file"
 msgstr "Fel vid filkopiering"
 
-#: ../meld/dirdiff.py:990
+#: ../meld/dirdiff.py:992
 #, python-format
 msgid ""
 "Couldn't copy %s\n"
@@ -1461,35 +1460,35 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/dirdiff.py:1013
+#: ../meld/dirdiff.py:1015
 #, python-format
 msgid "Error deleting %s"
 msgstr "Fel vid borttagning av %s"
 
-#: ../meld/dirdiff.py:1518
+#: ../meld/dirdiff.py:1520
 msgid "No folder"
 msgstr "Ingen mapp"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:409
+#: ../meld/filediff.py:410
 msgid "INS"
 msgstr "INF"
 
-#: ../meld/filediff.py:409
+#: ../meld/filediff.py:410
 msgid "OVR"
 msgstr "ÖVR"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:411
+#: ../meld/filediff.py:412
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Rad %i, kolumn %i"
 
-#: ../meld/filediff.py:824
+#: ../meld/filediff.py:825
 msgid "Comparison results will be inaccurate"
 msgstr "Jämförelseresultat kommer att bli osäkra"
 
-#: ../meld/filediff.py:826
+#: ../meld/filediff.py:827
 #, python-format
 msgid ""
 "Filter “%s” changed the number of lines in the file, which is unsupported. "
@@ -1498,76 +1497,83 @@ msgstr ""
 "Filtret ”%s” ändrade antalet rader i filen vilket inte stöds. Jämförelsen "
 "kommer att vara osäker."
 
-#: ../meld/filediff.py:897
+#: ../meld/filediff.py:898
 msgid "Mark conflict as resolved?"
 msgstr "Markera konflikten som löst?"
 
-#: ../meld/filediff.py:899
+#: ../meld/filediff.py:900
 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:901
+#: ../meld/filediff.py:902
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../meld/filediff.py:902
+#: ../meld/filediff.py:903
 msgid "Mark _Resolved"
 msgstr "Markera som _löst"
 
-#: ../meld/filediff.py:1105
+#: ../meld/filediff.py:1110
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Ställ in numrerade paneler"
 
-#: ../meld/filediff.py:1112
+#: ../meld/filediff.py:1123
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Öppnar filer"
 
-#: ../meld/filediff.py:1135 ../meld/filediff.py:1145 ../meld/filediff.py:1158
-#: ../meld/filediff.py:1164
+#: ../meld/filediff.py:1146 ../meld/filediff.py:1184 ../meld/filediff.py:1190
 msgid "Could not read file"
 msgstr "Kunde inte läsa filen"
 
-#: ../meld/filediff.py:1136
+#: ../meld/filediff.py:1147
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Läser filer"
 
-#: ../meld/filediff.py:1146
+#: ../meld/filediff.py:1156
 #, python-format
-msgid "%s appears to be a binary file."
-msgstr "%s verkar vara en binärfil."
+msgid "File %s appears to be a binary file."
+msgstr "Filen %s verkar vara en binärfil."
+
+#: ../meld/filediff.py:1157
+msgid "Do you want to open the file using the default application?"
+msgstr "Vill du öppna filen med standardprogrammet?"
 
-#: ../meld/filediff.py:1159
+#: ../meld/filediff.py:1160
+msgid "Open"
+msgstr "Öppna"
+
+#: ../meld/filediff.py:1185
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s finns inte i teckenkodningar: %s"
 
-#: ../meld/filediff.py:1197
+#: ../meld/filediff.py:1223
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Beräknar skillnader"
 
-#: ../meld/filediff.py:1265
+#: ../meld/filediff.py:1291
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Filen %s har ändrats på disk"
 
-#: ../meld/filediff.py:1266
+#: ../meld/filediff.py:1292
 msgid "Do you want to reload the file?"
 msgstr "Vill du läsa om filen?"
 
-#: ../meld/filediff.py:1269
+#: ../meld/filediff.py:1295
 msgid "_Reload"
 msgstr "_Läs om"
 
-#: ../meld/filediff.py:1428
+#: ../meld/filediff.py:1454
 msgid "Files are identical"
 msgstr "Filerna är identiska"
 
-#: ../meld/filediff.py:1441
+#: ../meld/filediff.py:1467
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1575,11 +1581,11 @@ msgstr ""
 "Textfilter används och kan dölja skillnader mellan filer. Vill du jämföra de "
 "ofiltrerade filerna?"
 
-#: ../meld/filediff.py:1446
+#: ../meld/filediff.py:1472
 msgid "Files differ in line endings only"
 msgstr "Filer skiljer sig endast vad gäller radslut"
 
-#: ../meld/filediff.py:1448
+#: ../meld/filediff.py:1474
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1588,15 +1594,15 @@ msgstr ""
 "Filerna är identiska förutom radavsluten:\n"
 "%s"
 
-#: ../meld/filediff.py:1468
+#: ../meld/filediff.py:1494
 msgid "Show without filters"
 msgstr "Visa utan filer"
 
-#: ../meld/filediff.py:1490
+#: ../meld/filediff.py:1516
 msgid "Change highlighting incomplete"
 msgstr "Ändra markering av ofärdiga"
 
-#: ../meld/filediff.py:1491
+#: ../meld/filediff.py:1517
 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."
@@ -1605,20 +1611,20 @@ msgstr ""
 "Meld till att längre tid på sig att markera större ändringar, men det kan "
 "bli långsamt."
 
-#: ../meld/filediff.py:1499
+#: ../meld/filediff.py:1525
 msgid "Keep highlighting"
 msgstr "Använd markering"
 
-#: ../meld/filediff.py:1501
+#: ../meld/filediff.py:1527
 msgid "_Keep highlighting"
 msgstr "_Använd markering"
 
-#: ../meld/filediff.py:1636
+#: ../meld/filediff.py:1662
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Ersätt filen ”%s”?"
 
-#: ../meld/filediff.py:1638
+#: ../meld/filediff.py:1664
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -1627,12 +1633,12 @@ 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:1656
+#: ../meld/filediff.py:1682
 #, python-format
 msgid "Could not save file %s."
 msgstr "Kunde inte spara filen %s."
 
-#: ../meld/filediff.py:1657
+#: ../meld/filediff.py:1683
 #, python-format
 msgid ""
 "Couldn't save file due to:\n"
@@ -1641,40 +1647,40 @@ msgstr ""
 "Kunde in spara fil beroende på:\n"
 "%s"
 
-#: ../meld/filediff.py:1669
+#: ../meld/filediff.py:1695
 msgid "Save Left Pane As"
 msgstr "Spara vänsterpanel som"
 
-#: ../meld/filediff.py:1671
+#: ../meld/filediff.py:1697
 msgid "Save Middle Pane As"
 msgstr "Spara mittenpanel som"
 
-#: ../meld/filediff.py:1673
+#: ../meld/filediff.py:1699
 msgid "Save Right Pane As"
 msgstr "Spara högerpanel som"
 
-#: ../meld/filediff.py:1687
+#: ../meld/filediff.py:1713
 #, 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:1689
+#: ../meld/filediff.py:1715
 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:1692
+#: ../meld/filediff.py:1718
 msgid "Save Anyway"
 msgstr "Spara ändå"
 
-#: ../meld/filediff.py:1693
+#: ../meld/filediff.py:1719
 msgid "Don't Save"
 msgstr "Spara inte"
 
-#: ../meld/filediff.py:1719
+#: ../meld/filediff.py:1745
 msgid "Inconsistent line endings found"
 msgstr "Inkonsekventa radavslut funna"
 
-#: ../meld/filediff.py:1721
+#: ../meld/filediff.py:1747
 #, python-format
 msgid ""
 "'%s' contains a mixture of line endings. Select the line ending format to "
@@ -1683,16 +1689,16 @@ msgstr ""
 "Filen ”%s” innehåller olika typer av radslut. Välj radaslutsformat att "
 "använda."
 
-#: ../meld/filediff.py:1742
+#: ../meld/filediff.py:1768
 msgid "_Save as UTF-8"
 msgstr "_Spara som UTF-8"
 
-#: ../meld/filediff.py:1745
+#: ../meld/filediff.py:1771
 #, python-format
 msgid "Couldn't encode text as “%s”"
 msgstr "Kunde inte koda text som ”%s”"
 
-#: ../meld/filediff.py:1747
+#: ../meld/filediff.py:1773
 #, python-format
 msgid ""
 "File “%s” contains characters that can't be encoded using encoding “%s”.\n"
@@ -1701,11 +1707,11 @@ msgstr ""
 "Filen ”%s” innehåller tecken som inte kan kodas med kodningen ”%s”\n"
 "Vill du spara som UTF-8?"
 
-#: ../meld/filediff.py:2099
+#: ../meld/filediff.py:2125
 msgid "Live comparison updating disabled"
 msgstr "Inaktivera realtidsuppdateringar av jämförelser"
 
-#: ../meld/filediff.py:2100
+#: ../meld/filediff.py:2126
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1729,93 +1735,93 @@ msgstr "Kopiera _upp"
 msgid "Copy _down"
 msgstr "Kopiera _ned"
 
-#: ../meld/meldapp.py:169
+#: ../meld/meldapp.py:175
 msgid "wrong number of arguments supplied to --diff"
 msgstr "felaktigt antal argument angavs för --diff"
 
-#: ../meld/meldapp.py:174
+#: ../meld/meldapp.py:180
 msgid "Start with an empty window"
 msgstr "Starta med ett tomt fönster"
 
-#: ../meld/meldapp.py:175 ../meld/meldapp.py:177
+#: ../meld/meldapp.py:181 ../meld/meldapp.py:183
 msgid "file"
 msgstr "fil"
 
-#: ../meld/meldapp.py:175 ../meld/meldapp.py:179
+#: ../meld/meldapp.py:181 ../meld/meldapp.py:185
 msgid "folder"
 msgstr "mapp"
 
-#: ../meld/meldapp.py:176
+#: ../meld/meldapp.py:182
 msgid "Start a version control comparison"
 msgstr "Starta en versionshanterad jämförelse"
 
-#: ../meld/meldapp.py:178
+#: ../meld/meldapp.py:184
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Starta med en två- eller trevägs filjämförelse"
 
-#: ../meld/meldapp.py:180
+#: ../meld/meldapp.py:186
 msgid "Start a 2- or 3-way folder comparison"
 msgstr "Starta med en två- eller trevägs mappjämförelse"
 
-#: ../meld/meldapp.py:223
+#: ../meld/meldapp.py:229
 #, python-format
 msgid "Error: %s\n"
 msgstr "Fel: %s\n"
 
-#: ../meld/meldapp.py:230
+#: ../meld/meldapp.py:236
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld är ett verktyg för att jämföra filer och kataloger."
 
-#: ../meld/meldapp.py:234
+#: ../meld/meldapp.py:240
 msgid "Set label to use instead of file name"
 msgstr "Sätt etikett att använda istället för filnamn"
 
-#: ../meld/meldapp.py:237
+#: ../meld/meldapp.py:243
 msgid "Open a new tab in an already running instance"
 msgstr "Öppna en ny flik i en redan körande instans"
 
-#: ../meld/meldapp.py:240
+#: ../meld/meldapp.py:246
 msgid "Automatically compare all differing files on startup"
 msgstr "Jämför automatiskt alla filer som skiljer sig vid uppstart"
 
-#: ../meld/meldapp.py:243
+#: ../meld/meldapp.py:249
 msgid "Ignored for compatibility"
 msgstr "Ignorerad för kompatibilitet"
 
-#: ../meld/meldapp.py:247
+#: ../meld/meldapp.py:253
 msgid "Set the target file for saving a merge result"
 msgstr "Ställ in målfilen för att spara sammanfogat resultat"
 
-#: ../meld/meldapp.py:250
+#: ../meld/meldapp.py:256
 msgid "Automatically merge files"
 msgstr "Sammanfoga automatiskt filer"
 
-#: ../meld/meldapp.py:254
+#: ../meld/meldapp.py:260
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "Läs in en sparad jämförelse från en Meld jämförelsefil"
 
-#: ../meld/meldapp.py:258
+#: ../meld/meldapp.py:264
 msgid "Create a diff tab for the supplied files or folders"
 msgstr "Skapar en diff-tabell för angivna filer eller mappar"
 
-#: ../meld/meldapp.py:278
+#: ../meld/meldapp.py:284
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "för många argument (ville ha 0-3, fick %d)"
 
-#: ../meld/meldapp.py:281
+#: ../meld/meldapp.py:287
 msgid "can't auto-merge less than 3 files"
 msgstr "kan inte auto-sammanfoga mindre är tre filer"
 
-#: ../meld/meldapp.py:283
+#: ../meld/meldapp.py:289
 msgid "can't auto-merge directories"
 msgstr "kan inte auto-sammanfoga kataloger"
 
-#: ../meld/meldapp.py:297
+#: ../meld/meldapp.py:303
 msgid "Error reading saved comparison file"
 msgstr "Fel vid läsning av den sparade konfigurationsfilen"
 
-#: ../meld/meldapp.py:324
+#: ../meld/meldapp.py:330
 #, python-format
 msgid "invalid path or URI \"%s\""
 msgstr "ogiltig sökväg eller URI ”%s”"

From d824eb674c4e1360422ac6eb12c89e80c2e796de Mon Sep 17 00:00:00 2001
From: Josef Andersson <josef.andersson@fripost.org>
Date: Sat, 7 Nov 2015 23:24:14 +0100
Subject: [PATCH 26/44] Add Swedish help

---
 help/sv/sv.po | 1847 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 1847 insertions(+)
 create mode 100644 help/sv/sv.po

diff --git a/help/sv/sv.po b/help/sv/sv.po
new file mode 100644
index 00000000..8a9b5491
--- /dev/null
+++ b/help/sv/sv.po
@@ -0,0 +1,1847 @@
+# Swedish translation for meld help.
+# Copyright © 2015 meld's COPYRIGHT HOLDER
+# This file is distributed under the same license as the meld package.
+# Josef Andersson <josef.andersson@fripost.org>, 2015.
+msgid ""
+msgstr ""
+"Project-Id-Version: meld master\n"
+"POT-Creation-Date: 2015-11-06 01:24+0000\n"
+"PO-Revision-Date: 2015-11-06 12:38+0100\n"
+"Last-Translator: Josef Andersson <josef.andersson@fripost.org>\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.6\n"
+
+#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
+msgctxt "_"
+msgid "translator-credits"
+msgstr "Josef Andersson <josef.andersson@fripost.org>, 2015"
+
+#. (itstool) path: info/title
+#: C/vc-supported.page:5
+msgctxt "sort"
+msgid "3"
+msgstr "3"
+
+#. (itstool) path: credit/name
+#: C/vc-supported.page:10 C/file-filters.page:10 C/text-filters.page:11
+#: 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
+msgid "Kai Willadsen"
+msgstr "Kai Willadsen"
+
+#. (itstool) path: credit/years
+#: C/vc-supported.page:12 C/file-filters.page:12 C/text-filters.page:13
+#: C/resolving-conflicts.page:12 C/file-changes.page:12 C/file-mode.page:13
+#: C/flattened-view.page:12 C/index.page:10 C/vc-mode.page:12
+#: C/keyboard-shortcuts.page:12 C/introduction.page:12 C/folder-mode.page:12
+#: C/missing-functionality.page:12 C/command-line.page:12
+msgid "2012"
+msgstr "2012"
+
+#. (itstool) path: page/title
+#: C/vc-supported.page:15
+msgid "Supported version control systems"
+msgstr "Versionshanteringssystem som stöds"
+
+#. (itstool) path: page/p
+#: C/vc-supported.page:17
+msgid "<app>Meld</app> supports a wide range of version control systems:"
+msgstr "<app>Meld</app> stöder ett brett urval av versionshanteringssystem:"
+
+#. (itstool) path: item/p
+#: C/vc-supported.page:22
+msgid "Arch"
+msgstr "Arch"
+
+#. (itstool) path: item/p
+#: C/vc-supported.page:23
+msgid "Bazaar"
+msgstr "Bazaar"
+
+#. (itstool) path: item/p
+#: C/vc-supported.page:24
+msgid "Codeville"
+msgstr "Codeville"
+
+#. (itstool) path: item/p
+#: C/vc-supported.page:25
+msgid "CVS"
+msgstr "CVS"
+
+#. (itstool) path: item/p
+#: C/vc-supported.page:26
+msgid "Fossil"
+msgstr "Fossil"
+
+#. (itstool) path: item/p
+#: C/vc-supported.page:27
+msgid "Git"
+msgstr "Git"
+
+#. (itstool) path: item/p
+#: C/vc-supported.page:28
+msgid "Mercurial"
+msgstr "Mercurial"
+
+#. (itstool) path: item/p
+#: C/vc-supported.page:29
+msgid "Monotone"
+msgstr "Monotone"
+
+#. (itstool) path: item/p
+#: C/vc-supported.page:30
+msgid "RCS"
+msgstr "RCS"
+
+#. (itstool) path: item/p
+#: C/vc-supported.page:31
+msgid "SVK"
+msgstr "SVK"
+
+#. (itstool) path: item/p
+#: C/vc-supported.page:32
+msgid "SVN"
+msgstr "SVN"
+
+#. (itstool) path: page/p
+#: C/vc-supported.page:35
+msgid ""
+"Less common version control systems or unusual configurations may not be "
+"properly tested; please report any version control support bugs to <link "
+"href=\"https://bugzilla.gnome.org/\">GNOME bugzilla</link>."
+msgstr ""
+"Mindre vanliga versionshanteringssystem eller ovanliga konfigurationer är "
+"inte lika vältestade; rapportera fel till <link href=\"https://bugzilla."
+"gnome.org/\">GNOME bugzilla</link>."
+
+#. (itstool) path: info/title
+#: C/file-filters.page:5 C/text-filters.page:5 C/resolving-conflicts.page:5
+#: C/file-changes.page:5 C/flattened-view.page:5 C/keyboard-shortcuts.page:5
+#: C/command-line.page:5
+msgctxt "sort"
+msgid "2"
+msgstr "2"
+
+#. (itstool) path: page/title
+#: C/file-filters.page:15
+msgid "Filtering out files"
+msgstr "Filtrera filer"
+
+#. (itstool) path: page/p
+#: C/file-filters.page:17
+msgid ""
+"When you compare folders, you may want to be able to ignore some files. For "
+"example, you may wish to only see files that are present and different in "
+"both folders, ignoring those that are the same or only exist in one folder. "
+"Alternatively, you might want to ignore all the files in your <file>.git</"
+"file> directory, or ignore all images."
+msgstr ""
+"När du jämför mappar kanske du vill ignorera en del filer. Till exempel "
+"kanske du bara vill se filer som finns i båda mapparna och skiljer sig åt. "
+"Alternativt kanske du vill ignorera alla filerna i din <file>.git</file>-"
+"katalog eller ignorera alla bilder."
+
+#. (itstool) path: page/p
+#: C/file-filters.page:25
+msgid ""
+"<app>Meld</app> has several different ways of controlling which files and "
+"what kind of differences you see. You can filter based on <link xref=\"#file-"
+"state-filter\">differences between a file across folders</link> or <link "
+"xref=\"#file-name-filter\">file and folder names</link>. You can also tell "
+"<app>Meld</app> to treat filenames as being <link xref=\"#file-case-filter"
+"\">case insensitive</link>. Finally, you can use <link xref=\"text-filters"
+"\">text filters</link> to change what both folder and file comparisons see."
+msgstr ""
+"<app>Meld</app> har flera olika sätt att kontrollera vilka filer och "
+"skillnader du kan se. Du kan filtrera baserat på <link xref=\"#file-state-"
+"filter\">skillnader på en fil över mappar</link> eller <link xref=\"#file-"
+"name-filter\">fil- och mappnamn</link>. Du kan också beordra <app>Meld</app> "
+"att hantera filnamn som <link xref=\"#file-case-filter\">icke-"
+"skiftlägeskänsliga</link>. Slutligen kan du använda <link xref=\"text-filters"
+"\">textfilter</link> för att ändra vad både mapp- och filjämförelser ser."
+
+#. (itstool) path: note/p
+#: C/file-filters.page:37
+msgid ""
+"Any <link xref=\"text-filters\">text filters</link> you've defined "
+"<em>automatically apply</em> when comparing folders. Files that are "
+"identical after all of the text filters are applied are not highlighted as "
+"being different, but are shown in italics."
+msgstr ""
+"En del <link xref=\"text-filters\">textfilter</link> du definierat "
+"<em>verkställs automatiskt</em> vid mappjämförelse. Filer som är identiska "
+"efter att alla textfilter verkställts markeras inte som olika, men visas i "
+"kursiv stil."
+
+#. (itstool) path: section/title
+#: C/file-filters.page:48
+msgid "File differences filtering"
+msgstr "Filskillnadsfiltrering"
+
+#. (itstool) path: section/p
+#: C/file-filters.page:50
+msgid ""
+"In a folder comparison, each line contains a single file or folder that is "
+"present in at least one of the folders being compared. Each of these lines "
+"is classified as being either <em>Modified</em>, <em>New</em> or <em>Same</"
+"em>:"
+msgstr ""
+"Vid en mappjämförelse innehåller varje rad en enskild fil eller mapp som "
+"existerar i minst en av mapparna som jämförs. Var och en av dessa rader är "
+"klassificerade som antingen <em>Ändrad</em>, <em>Ny</em> eller <em>Samma</"
+"em>:"
+
+#. (itstool) path: item/title
+#. (itstool) path: td/p
+#: C/file-filters.page:58 C/vc-mode.page:107 C/folder-mode.page:148
+msgid "Modified"
+msgstr "Ändrad"
+
+#. (itstool) path: item/p
+#: C/file-filters.page:59
+msgid "The file exists in multiple folders, but the files are different"
+msgstr "Filen existerar i flera mappar, men filerna har skillnader"
+
+#. (itstool) path: item/title
+#. (itstool) path: td/p
+#: C/file-filters.page:62 C/vc-mode.page:121 C/folder-mode.page:162
+msgid "New"
+msgstr "Ny"
+
+#. (itstool) path: item/p
+#: C/file-filters.page:63
+msgid "The file exists in one folder but not in the others"
+msgstr "Filen existerar i en mapp men inte i andra"
+
+#. (itstool) path: item/title
+#. (itstool) path: td/p
+#: C/file-filters.page:66 C/vc-mode.page:93 C/folder-mode.page:118
+msgid "Same"
+msgstr "Samma"
+
+#. (itstool) path: item/p
+#: C/file-filters.page:67
+msgid "The file exists in all folders, and is the same everywhere"
+msgstr "Filen existerar i alla mappar, och är densamma överallt"
+
+#. (itstool) path: section/p
+#: C/file-filters.page:70
+msgid ""
+"You can change which types of differences you see in your current comparison "
+"by using the <gui style=\"button\">Same</gui>, <gui style=\"button\">New</"
+"gui> and <gui style=\"button\">Modified</gui> buttons on the toolbar or the "
+"<guiseq><gui style=\"menu\">View</gui><gui style=\"menuitem\">File Status</"
+"gui></guiseq> menu."
+msgstr ""
+"Du kan ändra de typer av skillnader du kan se i nuvarande jämförelse genom "
+"att använda knapparna <gui style=\"button\">Samma</gui>, <gui style=\"button"
+"\">Nya</gui> och <gui style=\"button\">Ändrade</gui> på verktygsfältet eller "
+"menyn <guiseq><gui style=\"menu\">Visa</gui><gui style=\"menuitem"
+"\">Filstatus</gui></guiseq>."
+
+#. (itstool) path: note/p
+#: C/file-filters.page:80
+msgid ""
+"Currently, you can only filter files based on their state; folders can't be "
+"filtered in this way. For example, you can't tell <app>Meld</app> to ignore "
+"all folders that contain only new files. A folder containing only \"New\" "
+"files would show up as empty, but still present."
+msgstr ""
+"För närvarande kan du bara filtrera filer baserat på dessa tillstånd; mappar "
+"kan inte filtreras på detta sätt. Till exempel kan du inte beordra "
+"<app>Meld</app> att ignorera alla mappar som innehåller endast nya filer. En "
+"mapp innehållandes endast ”Nya” filer skulle bara visas som tom, men ändå "
+"finnas med."
+
+#. (itstool) path: section/title
+#: C/file-filters.page:94
+msgid "Filename filtering"
+msgstr "Filnamnsfiltrering"
+
+#. (itstool) path: section/p
+#: C/file-filters.page:96
+msgid ""
+"<app>Meld</app> comes with a useful set of filename filters that let you "
+"ignore uninteresting files and folders like common backup files and the "
+"metadata folders of version control systems. Each filename filter can be "
+"separately activated or deactivated from the <gui style=\"button\">Filters</"
+"gui> button on the toolbar or the <guiseq><gui style=\"menu\">View</gui><gui "
+"style=\"menuitem\">File Filters</gui></guiseq> menu."
+msgstr ""
+"<app>Meld</app> kommer med en användbar samling filnamnsfilter som låter dig "
+"ignorera ointressanta filer och mappar som vanliga säkerhetskopior och "
+"metadatamapparna för versionshanteringssystem. Varje filnamnsfilter kan "
+"aktiveras eller inaktiveras enskilt från knappen <gui style=\"button"
+"\">Filter</gui> i verktygsfältet eller menyn <guiseq><gui style=\"menu"
+"\">Visa</gui><gui style=\"menuitem\">Filfilter</gui></guiseq>."
+
+#. (itstool) path: section/p
+#: C/file-filters.page:106
+msgid ""
+"You can add, remove or change filename filters from the <gui style=\"tab"
+"\">File Filters</gui> section of the <gui>Preferences</gui> dialog. Filename "
+"filters specify patterns of filenames that will <em>not</em> be looked at "
+"when performing a folder comparison. Any file that matches an active filter "
+"won't even show up in the tree comparison. Filename filters match both files "
+"and folders; if a folder matches a filter, it and all of its contents are "
+"ignored."
+msgstr ""
+"Du kan lägga till, ta bort eller ändra filnamnsfilter från avsnittet<gui "
+"style=\"tab\">Filfilter</gui> i dialogen <gui>Inställningar</gui>. "
+"Filnamnsfilter specificerar mönster av filnamn som <em>inte</em> kommer att "
+"behandlas vid en mappjämförelse. Filer som matchar ett aktivt filnamnsfilter "
+"kommer inte ens att visas i trädjämförelsen. Filnamnsfilter matchar både "
+"filer och mappar; om en mapp matchar ett filter kommer den och dess innehåll "
+"att ignoreras."
+
+#. (itstool) path: section/p
+#: C/file-filters.page:116
+msgid ""
+"Filename filters match according to shell glob patterns. For example, "
+"<code>*.jpg</code> will match all filenames ending in <code>.jpg</code>. The "
+"following table lists all of the shell glob characters that <app>Meld</app> "
+"recognises."
+msgstr ""
+"Filnamnsfilter matchar utefter skal-glob-mönster. Till exempel matchar "
+"<code>*.jpg</code> alla filnamn som slutar på <code>.jpg</code>. Följande "
+"tabell listar alla skal-glob-tecken som <app>Meld</app> känner igen."
+
+#. (itstool) path: table/title
+#: C/file-filters.page:124
+msgid "Shell glob patterns"
+msgstr "Skal-glob-mönster"
+
+#. (itstool) path: td/p
+#: C/file-filters.page:128
+msgid "Wildcard"
+msgstr "Jokertecken"
+
+#. (itstool) path: td/p
+#: C/file-filters.page:128
+msgid "Matches"
+msgstr "Matchar"
+
+#. (itstool) path: td/p
+#: C/file-filters.page:134
+msgid "<code>*</code>"
+msgstr "<code>*</code>"
+
+#. (itstool) path: td/p
+#: C/file-filters.page:135
+msgid "anything (i.e., zero or more characters)"
+msgstr "vad som helst (d.v.s. inget eller flera tecken)"
+
+#. (itstool) path: td/p
+#: C/file-filters.page:138
+msgid "<code>?</code>"
+msgstr "<code>?</code>"
+
+#. (itstool) path: td/p
+#: C/file-filters.page:139
+msgid "exactly one character"
+msgstr "precis ett tecken"
+
+#. (itstool) path: td/p
+#: C/file-filters.page:142
+msgid "<code>[abc]</code>"
+msgstr "<code>[abc]</code>"
+
+#. (itstool) path: td/p
+#: C/file-filters.page:143
+msgid "any one of the listed characters"
+msgstr "vilken som helst av de listade tecknen"
+
+#. (itstool) path: td/p
+#: C/file-filters.page:146
+msgid "<code>[!abc]</code>"
+msgstr "<code>[!abc]</code>"
+
+#. (itstool) path: td/p
+#: C/file-filters.page:147
+msgid "anything <em>except</em> one of the listed characters"
+msgstr "vad som helst <em>utom</em> de listade tecknen"
+
+#. (itstool) path: td/p
+#: C/file-filters.page:150
+msgid "<code>{cat,dog}</code>"
+msgstr "<code>{katt,hund}</code>"
+
+#. (itstool) path: td/p
+#: C/file-filters.page:151
+msgid "either \"cat\" or \"dog\""
+msgstr "antingen ”katt” eller ”hund”"
+
+#. (itstool) path: note/p
+#: C/file-filters.page:157
+msgid ""
+"Changing a filter's <gui>Active</gui> setting in the <gui>Preferences</gui> "
+"dialog changes whether that filter is active <em>by default</em>."
+msgstr ""
+"Att ändra ett filters <gui>Aktiv</gui>-inställning i dialogen "
+"<gui>Inställningar</gui> ändrar huruvida det filtret är aktivt <em>som "
+"standard</em>."
+
+#. (itstool) path: note/p
+#: C/file-filters.page:163
+msgid ""
+"Activating a filter from the menu or the toolbar turns the filter on or off "
+"for <em>this comparison only</em>."
+msgstr ""
+"Att aktivera ett filter från menyn eller verktygsfältet slår av eller på "
+"filtret för <em>endast denna jämförelse</em>."
+
+#. (itstool) path: section/title
+#: C/file-filters.page:174
+msgid "Case insensitive filenames"
+msgstr "Ej skiftlägeskänsliga filnamn"
+
+#. (itstool) path: section/p
+#: C/file-filters.page:176
+msgid ""
+"Files are compared across directories according to their name. This "
+"comparison is case sensitive by default; that is, the files <file>README</"
+"file>, <file>readme</file> and <file>ReadMe</file> would all be seen as "
+"different files."
+msgstr ""
+"Filer jämförs över kataloger efter deras namn. Denna jämförelse är "
+"skiftlägeskänslig som standard; exempelvis skulle filerna <file>README</"
+"file>, <file>readme</file> och <file>ReadMe</file> ses som olika."
+
+#. (itstool) path: section/p
+#: C/file-filters.page:183
+msgid ""
+"When comparing folders on some filesystems (e.g., HFS+ or FAT) you may wish "
+"to make <app>Meld</app> treat filenames as case insensitive. You can do this "
+"by selecting <guiseq><gui style=\"menu\">View</gui><gui style=\"menuitem"
+"\">Ignore filename case</gui></guiseq> from the menus."
+msgstr ""
+"När jämförelse av mappar sker på vissa filsystem (t.ex. HFS+ eller FAT) kan "
+"du vilja be <app>Meld</app> hantera filnamn som icke skiftlägeskänsliga. Du "
+"kan göra detta genom att välja <guiseq><gui style=\"menu\">Visa</gui><gui "
+"style=\"menuitem\">Ignorera skiftlägeskänslighet för filnamn</gui></guiseq> "
+"i menyerna."
+
+#. (itstool) path: page/title
+#: C/text-filters.page:17
+msgid "Filtering out text"
+msgstr "Filtrera ut text"
+
+#. (itstool) path: page/p
+#: C/text-filters.page:19
+msgid ""
+"When comparing several files, you may have sections of text where "
+"differences aren't really important. For example, you may want to focus on "
+"changed sections of code, and ignore any changes in comment lines. With text "
+"filters you can tell <app>Meld</app> to ignore text that matches a pattern "
+"(i.e., a regular expression) when showing differences between files."
+msgstr ""
+"Vid jämförelse av flera filer kan du ha textavsnitt där skillnader inte är "
+"viktiga. Till exempel kanske du vill fokusera på ändrade avsnitt i kod, och "
+"ignorera ändringar i kommentarsrader. Med textfilter kan du säga åt "
+"<app>Meld</app> att ignorera text som matchar ett visst mönster (d.v.s. ett "
+"reguljärt uttryck) när skillnader mellan filer visas."
+
+#. (itstool) path: note/p
+#: C/text-filters.page:28
+msgid ""
+"Text filters don't just affect file comparisons, but also folder "
+"comparisons. Check the <link xref=\"file-filters\">file filtering notes</"
+"link> for more details."
+msgstr ""
+"Textfilter påverkar inte bara filjämförelser, men också mappjämförelser. Se "
+"<link xref=\"file-filters\">anteckningar om filfiltrering</link> för fler "
+"detaljer."
+
+#. (itstool) path: section/title
+#: C/text-filters.page:37
+msgid "Adding and using text filters"
+msgstr "Lägga till och använda textfilter"
+
+#. (itstool) path: section/p
+#: C/text-filters.page:39
+msgid ""
+"You can turn text filters on or off from the the <gui>Text Filters</gui> tab "
+"in <gui>Preferences</gui> dialog. <app>Meld</app> comes with a few simple "
+"filters that you might find useful, but you can add your own as well."
+msgstr ""
+"Du kan slå på eller av textfilter från fliken <gui>Textfilter</gui> i "
+"dialogen <gui>Inställningar</gui>. <app>Meld</app> kommer med några enkla "
+"filter du kanske finner användbara, men du kan lägga till dina egna också."
+
+#. (itstool) path: section/p
+#: C/text-filters.page:45
+msgid ""
+"In <app>Meld</app>, text filters are regular expressions that are matched "
+"against the text of files you're comparing. Any text that is matched is "
+"ignored during the comparison; you'll still see this text in the comparison "
+"view, but it won't be taken into account when finding differences. Text "
+"filters are applied in order, so it's possible for the first filter to "
+"remove text that now makes the second filter match, and so on."
+msgstr ""
+"I <app>Meld</app> är textfilter reguljära uttryck som matchas mot texten i "
+"de filer du jämför. Matchad text ignoreras vid jämförelsen; du kommer "
+"fortfarande att se texten i jämförelsevyn, men den kommer inte att tas med "
+"när skillnader ska hittas. Textfilter verkställs i ordning, så det är "
+"möjligt för det första filtret att ta bort text som gör att det andra "
+"filtret nu matchar och så vidare."
+
+#. (itstool) path: note/p
+#: C/text-filters.page:55
+msgid ""
+"If you're not familiar with regular expressions, you might want to check out "
+"the Python <link href=\"http://docs.python.org/howto/regex.html\">Regular "
+"Expression HOWTO</link>."
+msgstr ""
+"Om du inte är bekväm med reguljära uttryck kan du behöva kolla upp Pythons "
+"<link href=\"http://docs.python.org/howto/regex.html\">Regular Expression "
+"HOWTO</link>."
+
+#. (itstool) path: section/title
+#: C/text-filters.page:67
+msgid "Getting text filters right"
+msgstr "Skriva korrekta textfilter"
+
+#. (itstool) path: section/p
+#: C/text-filters.page:69
+msgid ""
+"It's easy to get text filtering wrong, and Meld's support for filtering "
+"isn't complete. In particular, a text filter can't change the number of "
+"lines in a file. For example, if we had the built-in <gui>Script comment</"
+"gui> filter enabled, and compared the following files:"
+msgstr ""
+"Det är lätt att få textfilter felaktiga, och Melds stöd för filtrering är "
+"inte fullständigt. Specifikt så kan ett textfilter inte ändra antalet rader "
+"i en fil. Till exempel, om vi hade det inbyggda <gui>Skriptkommentar</gui>-"
+"filtret aktiverat och jämförde följande filer:"
+
+#. (itstool) path: listing/title
+#: C/text-filters.page:80
+msgid "<file>comment1.txt</file>"
+msgstr "<file>kommentar1.txt</file>"
+
+#. (itstool) path: listing/code
+#: C/text-filters.page:81
+#, no-wrap
+msgid ""
+"\n"
+"a\n"
+"b#comment\n"
+"c\n"
+"d"
+msgstr ""
+"\n"
+"a\n"
+"b#kommentar\n"
+"c\n"
+"d"
+
+#. (itstool) path: listing/title
+#: C/text-filters.page:90
+msgid "<file>comment2.txt</file>"
+msgstr "<file>kommentar2.txt</file>"
+
+#. (itstool) path: listing/code
+#: C/text-filters.page:91
+#, no-wrap
+msgid ""
+"\n"
+"a\n"
+"b\n"
+"c\n"
+"#comment"
+msgstr ""
+"\n"
+"a\n"
+"b\n"
+"c\n"
+"#kommentar"
+
+#. (itstool) path: section/p
+#: C/text-filters.page:101
+msgid ""
+"then the lines starting with <code>b</code> would be shown as identical (the "
+"comment is stripped out) but the <code>d</code> line would be shown as "
+"different to the comment line on the right. This happens because the "
+"<code>#comment</code> is removed from the right-hand side, but the line "
+"itself can not be removed; <app>Meld</app> will show the <code>d</code> line "
+"as being different to what it sees as a blank line on the other side."
+msgstr ""
+"kommer sedan raderna som börjar med <code>b</code>att visas som identiska "
+"(kommentaren är borttagen) men raden <code>d</code> kommer att visas som att "
+"den skiljer sig åt mot kommentarsraden till höger. Det beror på att "
+"<code>#kommentar</code> tas bort från den högra sidan, men att själva raden "
+"inte kan tas bort; <app>Meld</app> kommer att visa raden <code>d</code> som "
+"annorlunda mot vad det ser som en tom rad på andra sidan."
+
+#. (itstool) path: section/title
+#: C/text-filters.page:114
+msgid "Blank lines and filters"
+msgstr "Tomma rader och filter"
+
+#. (itstool) path: section/p
+#: C/text-filters.page:116
+msgid ""
+"The <gui>Ignore changes which insert or delete blank lines</gui> preference "
+"in the <gui>Text Filters</gui> tab requires special explanation. If this "
+"special filter is enabled, then any change consisting only of blank lines is "
+"completely ignored. This may occur because there was an actual whitespace "
+"change in the text, but it may also arise if your active text filters have "
+"removed all of the other content from a change, leaving only blank lines."
+msgstr ""
+"Inställningen <gui>Ignorera ändringar som infogar eller tar bort tomma "
+"rader</gui> i fliken <gui>Textfilter</gui> kräver en särskild förklaring. Om "
+"detta specialfilter är aktiverat kommer varje ändring bestående av tomma "
+"rader att helt ignoreras. Det kan också inträffa eftersom det var en faktisk "
+"blanktecken-ändring i texten, men kan också uppstå om dina aktiva textfilter "
+"har tagit bort allt det andra innehållet från en ändring och bara lämnar "
+"kvar tomma rader."
+
+#. (itstool) path: section/p
+#: C/text-filters.page:125
+msgid ""
+"You can use this option to get around some of the <link xref=\"#text-filter-"
+"problems\">problems and limitations</link> resulting from filters not being "
+"able to remove whole lines, but it can also be useful in and of itself."
+msgstr ""
+"Du kan använda detta alternativ till att komma runt några av <link xref="
+"\"#text-filter-problems\">problemen och begränsningarna</link> som beror på "
+"att filter inte kan ta bort hela rader, men det kan också vara användbart i "
+"sig självt."
+
+#. (itstool) path: page/title
+#: C/resolving-conflicts.page:15
+msgid "Resolving merge conflicts"
+msgstr "Att lösa konflikter vid sammanfogning"
+
+#. (itstool) path: page/p
+#: C/resolving-conflicts.page:17
+msgid ""
+"One of the best uses of <app>Meld</app> is to resolve conflicts that occur "
+"while merging different branches."
+msgstr ""
+"Ett av det bästa användningsområdena för <app>Meld</app> är att lösa "
+"konflikter som uppstår när olika grenar sammanfogas."
+
+#. (itstool) path: page/p
+#: C/resolving-conflicts.page:22
+msgid ""
+"For example, when using <app>Git</app>, <cmd>git mergetool</cmd> will start "
+"a 'merge helper'; <app>Meld</app> is one such helper. If you want to make "
+"<app>git mergetool</app> use <app>Meld</app> by default, you can add"
+msgstr ""
+"Till exempel, vid användning av <app>Git</app> kommer <cmd>git mergetool</"
+"cmd> att starta en ”merge helper”; <app>Meld</app> är en sådan hjälp. Om du "
+"vill göra så att <app>git mergetool</app> använder <app>Meld</app> som "
+"standard kan du lägga till"
+
+#. (itstool) path: page/code
+#: C/resolving-conflicts.page:27
+#, no-wrap
+msgid ""
+"\n"
+"[merge]\n"
+"    tool = meld\n"
+msgstr ""
+"\n"
+"[merge]\n"
+"    tool = meld\n"
+
+#. (itstool) path: page/p
+#: C/resolving-conflicts.page:31
+msgid ""
+"to <file>.git/gitconfig</file>. See the <app>git mergetool</app> manual for "
+"details."
+msgstr ""
+"till <file>.git/gitconfig</file>. Se handboken <app>git mergetool</app> för "
+"detaljer."
+
+#. (itstool) path: info/title
+#: C/preferences.page:5 C/file-mode.page:5 C/introduction.page:5
+#: C/folder-mode.page:5 C/missing-functionality.page:5
+msgctxt "sort"
+msgid "1"
+msgstr "1"
+
+#. (itstool) path: credit/years
+#: C/preferences.page:12
+msgid "2013"
+msgstr "2013"
+
+#. (itstool) path: page/title
+#: C/preferences.page:15
+msgid "Meld's preferences"
+msgstr "Melds inställningar"
+
+#. (itstool) path: terms/title
+#: C/preferences.page:18
+msgid "Editor preferences"
+msgstr "Redigerarinställningar"
+
+#. (itstool) path: item/title
+#: C/preferences.page:20
+msgid "Editor command"
+msgstr "Redigerarkommando"
+
+#. (itstool) path: item/p
+#: C/preferences.page:21
+msgid ""
+"The name of the command to run to open text files in an external editor. "
+"This may be just the command (e.g., <cmd>gedit</cmd>) in which case the file "
+"to be opened will be passed as the last argument. Alternatively, you can add "
+"<code>{file}</code> and <code>{line}</code> elements to the command, in "
+"which case <app>Meld</app> will substitute the file path and current line "
+"number respectively (e.g., <cmd>gedit {file}:{line}</cmd>)."
+msgstr ""
+"Namnet på kommandot att köra för att öppna textfiler i en extern redigerare. "
+"Det kan vara bara kommandot (t.ex. <cmd>gedit</cmd>) i vilket fall filen att "
+"öppna kommer att skickas som sista argumentet. Alternativt kan du lägga till "
+"<code>{file}</code> och <code>{line}</code>-element till kommandot i vilket "
+"fall <app>Meld</app> kommer att ersätta filsökvägen och aktuellt radnummer "
+"(t.ex. <cmd>gedit {file}:{line}</cmd>)."
+
+#. (itstool) path: terms/title
+#: C/preferences.page:31
+msgid "Folder Comparison preferences"
+msgstr "Inställningar för mappjämförelse"
+
+#. (itstool) path: item/title
+#: C/preferences.page:33
+msgid "Apply text filters during folder comparisons"
+msgstr "Att verkställa textfilter vid mappjämförelser"
+
+#. (itstool) path: item/p
+#: C/preferences.page:34
+msgid ""
+"When comparing files in folder comparison mode, text filters and other text "
+"manipulation options can be applied to the contents of files. If this option "
+"is enabled, all currently enabled text filters will be applied, the blank "
+"line trimming option will be applied as appropriate, and differences in line "
+"endings will be ignored."
+msgstr ""
+"Under jämförelse av filer i läget mappjämförelse kan textfilter och andra "
+"textmanipulationsalternativ tillämpas på innehållet i filerna. Om detta "
+"alternativ är aktiverat kommer alla aktiverade textfilter att tillämpas, "
+"alternativet för trimning av tomma rader kommer att tillämpas som önskat och "
+"skillnader i radslut kommer att ignoreras."
+
+#. (itstool) path: item/p
+#: C/preferences.page:40
+msgid ""
+"Enabling this option means that <app>Meld</app> must fully read all non-"
+"binary files into memory during the folder comparison. With large text "
+"files, this can be slow and may cause memory issues."
+msgstr ""
+"Aktivering av detta alternativ innebär att <app>Meld</app> måste läsa in "
+"alla icke-binära filer till minnet vid mappjämförelsen. Med större textfiler "
+"kan detta gå långsamt och medföra minnesproblem."
+
+#. (itstool) path: item/p
+#: C/preferences.page:44
+msgid ""
+"This option only has an effect if \"Compare files based only on size and "
+"timestamp\" is not enabled."
+msgstr ""
+"Detta alternativ har endast effekt om ”Jämför filer enbart baserat på "
+"storlek och tidsstämpel” inte är aktiverad."
+
+#. (itstool) path: page/title
+#: C/file-changes.page:16
+msgid "Dealing with changes"
+msgstr "Hantera ändringar"
+
+#. (itstool) path: page/p
+#: C/file-changes.page:18
+msgid ""
+"<app>Meld</app> deals with differences between files as a list of <em>change "
+"blocks</em> or more simply <em>changes</em>. Each change is a group of lines "
+"which correspond between files. Since these changes are what you're usually "
+"interested in, <app>Meld</app> gives you specific tools to navigate between "
+"these changes and to edit them. You can find these tools in the <gui style="
+"\"menu\">Changes</gui> menu."
+msgstr ""
+"<app>Meld</app> hanterar skillnader mellan filer som en lista av "
+"<em>ändringsblock</em> eller enklare, <em>ändringar</em>. Varje ändring är "
+"en grupp rader som motsvaras mellan filer. Eftersom dessa ändringar är vad "
+"du vanligtvis är intresserad av, ger dig <app>Meld</app> specifika verktyg "
+"för att navigera mellan ändringarna och redigera dem. Du kan hitta dessa "
+"verktyg i menyn <gui style=\"menu\">Ändringar</gui>."
+
+#. (itstool) path: section/title
+#: C/file-changes.page:30
+msgid "Navigating between changes"
+msgstr "Navigera mellan ändringar"
+
+#. (itstool) path: section/p
+#: C/file-changes.page:32
+msgid ""
+"You can navigate between changes with the <guiseq><gui style=\"menu"
+"\">Changes</gui><gui style=\"menuitem\">Previous change</gui></guiseq> and "
+"<guiseq><gui style=\"menu\">Changes</gui><gui style=\"menuitem\">Next "
+"change</gui></guiseq> menu items. You can also use your mouse's scroll wheel "
+"to move between changes, by scrolling on the central change bar."
+msgstr ""
+"Du kan navigera mellan ändringar med menyobjekten <guiseq><gui style=\"menu"
+"\">Ändringar</gui><gui style=\"menuitem\">Föregående ändring</gui></guiseq> "
+"och <guiseq><gui style=\"menu\">Ändringar</gui><gui style=\"menuitem\">Nästa "
+"ändring</gui></guiseq>. Du kan också använda din mus rullhjul för flytta "
+"mellan ändringar genom att rulla på ändringsraden i mitten."
+
+#. (itstool) path: section/title
+#: C/file-changes.page:46
+msgid "Changing changes"
+msgstr "Ändra ändringar"
+
+#. (itstool) path: section/p
+#: C/file-changes.page:48
+msgid ""
+"In addition to directly editing text files, <app>Meld</app> gives you tools "
+"to move, copy or delete individual differences between files. The bar "
+"between two files not only shows you what parts of the two files correspond, "
+"but also lets you selectively merge or delete differing changes by clicking "
+"the arrow or cross icons next to the start of each change."
+msgstr ""
+"Förutom att direkt redigera textfiler ger dig <app>Meld</app> verktyg för "
+"att flytta, kopiera eller ta bort individuella skillnader mellan filer. "
+"Raden mellan två filer visar inte bara vilka delar av de två filerna som "
+"motsvaras utan låter dig också selektivt välja att sammanfoga eller ta bort "
+"olika ändringar genom att klicka på pilen eller kryssikonen intill början på "
+"varje ändring."
+
+#. (itstool) path: section/p
+#: C/file-changes.page:52
+msgid ""
+"The default action is <em>replace</em>. This action replaces the contents of "
+"the corresponding change with the current change."
+msgstr ""
+"Standardåtgärden är <em>ersätt</em>. Denna åtgärd ersätter innehållet för "
+"motsvarande ändring med den aktuella ändringen."
+
+#. (itstool) path: section/p
+#: C/file-changes.page:59
+msgid ""
+"Hold down the <key>Shift</key> key to change the current action to "
+"<em>delete</em>. This action deletes the current change."
+msgstr ""
+"Håll ner tangenten <key>Skift</key> för att ändra aktuell åtgärd till <em>ta "
+"bort</em>. Denna åtgärd tar bort aktuell ändring."
+
+#. (itstool) path: section/p
+#: C/file-changes.page:62
+msgid ""
+"Hold down the <key>Ctrl</key> key to change the current action to "
+"<em>insert</em>. This action inserts the current change above or below (as "
+"selected) the corresponding change."
+msgstr ""
+"Håll ner tangenten <key>Ctrl</key> för att ändra den aktuella åtgärden till "
+"<em>infoga</em>. Denna åtgärd infogar den aktuella ändringen ovan eller "
+"under (beroende på val) motsvarande ändring."
+
+#. (itstool) path: page/title
+#: C/file-mode.page:17
+msgid "Getting started comparing files"
+msgstr "Att komma igång med att jämföra filer"
+
+#. (itstool) path: page/p
+#: C/file-mode.page:19
+msgid ""
+"<app>Meld</app> lets you compare two or three text files side-by-side. You "
+"can start a new file comparison by selecting the <guiseq><gui style=\"menu"
+"\">File</gui><gui style=\"menuitem\">New...</gui></guiseq> menu item."
+msgstr ""
+"<app>Meld</app> låter dig jämföra två eller tre textfiler sida-vid-sida. Du "
+"kan starta en ny filjämförelse genom att välj menyobjektet <guiseq><gui "
+"style=\"menu\">Arkiv</gui><gui style=\"menuitem\">Ny...</gui></guiseq>."
+
+#. (itstool) path: page/p
+#: C/file-mode.page:26
+msgid ""
+"Once you've selected your files, <app>Meld</app> will show them side-by-"
+"side. Differences between the files will be highlighted to make individual "
+"changes easier to see. Editing the files will cause the comparison to update "
+"on-the-fly. For details on navigating between individual changes, and on how "
+"to use change-based editing, see <link xref=\"file-changes\"/>."
+msgstr ""
+"När du väl har markerat dina filer kommer <app>Meld</app> att visa dem sida-"
+"vid-sida. Skillnader mellan filerna kommer att markeras för att göra "
+"individuella ändringar enklare att se. Att redigera filer kommer att få "
+"jämförelsen att uppdatera direkt. För detaljer om navigering mellan "
+"individuella ändringar och hur man använder ändrings-baserad redigering, se "
+"<link xref=\"file-changes\"/>."
+
+#. (itstool) path: section/title
+#: C/file-mode.page:35
+msgid "<app>Meld</app>'s file comparisons"
+msgstr "<app>Meld</app>s filjämförelser"
+
+#. (itstool) path: section/p
+#: C/file-mode.page:37
+msgid ""
+"There are several different parts to a file comparison. The most important "
+"parts are the editors where your files appear. In addition to these editors, "
+"the areas around and between your files give you a visual overview and "
+"actions to help you handle changes between the files."
+msgstr ""
+"Det finns flera olika delar vid en filjämförelse. De viktigaste delarna är "
+"redigerarna där dina filer visas. Förutom dessa redigerare ger områdena "
+"kring och mellan dina filer en visuell överblick samt åtgärder för att "
+"hjälpa dig att hantera ändringar mellan filerna."
+
+#. (itstool) path: section/p
+#: C/file-mode.page:43
+msgid ""
+"On the left and right-hand sides of the window, there are two small vertical "
+"bars showing various coloured blocks. These bars are designed to give you an "
+"overview of all of the differences between your two files. Each coloured "
+"block represents a section that is inserted, deleted, changed or in conflict "
+"between your files, depending on the block's colour used."
+msgstr ""
+"På den vänstra och den högra sidan av fönstret finns två vertikala rullister "
+"som visar olika färgade block. Dessa rullister är designade för att ge dig "
+"en överblick av alla skillnader mellan dina två filer. Varje färgat block "
+"representerar ett avsnitt som är infogat, borttaget, ändrat eller i konflikt "
+"mellan dina filer beroende på färgen blocket använder."
+
+#. (itstool) path: section/p
+#: C/file-mode.page:50
+msgid ""
+"In between each pair of files is a segment that shows how the changed "
+"sections between your files correspond to each other. You can click on the "
+"arrows in a segment to replace sections in one file with sections from the "
+"other. You can also delete, copy or merge changes. For details on what you "
+"can do with individual change segments, see <link xref=\"file-changes#change-"
+"actions\"/>."
+msgstr ""
+"Mellan varje par av filer finns ett segment som visar hur de ändrade "
+"avsnitten mellan dina filer motsvaras av varandra. Du kan klicka på pilarna "
+"i ett avsnitt för att ersätta avsnitt i en fil med avsnitt från det andra. "
+"Du kan också ta bort, kopiera eller sammanfoga ändringar. För detaljer om "
+"vad du kan göra med individuella ändringssegment, se <link xref=\"file-"
+"changes#change-actions\"/>."
+
+#. (itstool) path: section/title
+#: C/file-mode.page:62
+msgid "Saving your changes"
+msgstr "Spara dina ändringar"
+
+#. (itstool) path: section/p
+#: C/file-mode.page:64
+msgid ""
+"Once you've finished editing your files, you need to save each file you've "
+"changed."
+msgstr ""
+"När du väl har slutat redigera dina filer behöver du spara varje fil du har "
+"ändrat."
+
+#. (itstool) path: section/p
+#: C/file-mode.page:68
+msgid ""
+"You can tell whether your files have been saved since they last changed by "
+"the save icon that appears next to the file name above each file. Also, the "
+"notebook label will show an asterisk (<code>*</code>) after any file that "
+"hasn't been saved."
+msgstr ""
+"Du kan avgöra huruvida dina filer har ändrats sedan senaste ändringen genom "
+"spara-ikonen som visas intill filnamnet ovanför varje fil. Anteckningsfliken "
+"kommer också att visa en asterisk (<code>*</code>) efter varje fil som inte "
+"har sparats."
+
+#. (itstool) path: section/p
+#: C/file-mode.page:74
+msgid ""
+"You can save the current file by selecting the <guiseq><gui style=\"menu"
+"\">File</gui><gui style=\"menuitem\">Save</gui></guiseq> menu item, or using "
+"the <keyseq><key>Ctrl</key><key>S</key></keyseq> keyboard shortcut."
+msgstr ""
+"Du kan spara aktuell fil genom att välja menyobjektet <guiseq><gui style="
+"\"menu\">Arkiv</gui><gui style=\"menuitem\">Spara</gui></guiseq> eller genom "
+"att använda tangentbordsgenvägen <keyseq><key>Ctrl</key><key>S</key></"
+"keyseq>."
+
+#. (itstool) path: note/p
+#: C/file-mode.page:81
+msgid ""
+"Saving only saves the <em>currently focussed</em> file, which is the file "
+"containing the cursor. If you can't tell which file is focussed, you can "
+"click on the file to focus it before saving."
+msgstr ""
+"Att spara sparar endast den <em>fokuserade</em> filen, vilket är filen som "
+"innehåller markören. Om du inte kan avgöra vilken fil som är fokuserad så "
+"kan du klicka på filen för att fokusera den innan du sparar."
+
+#. (itstool) path: page/title
+#: C/flattened-view.page:15
+msgid "Flattened view"
+msgstr "Utplattad vy"
+
+#. (itstool) path: page/p
+#: C/flattened-view.page:17
+msgid ""
+"When viewing large folders, you may be interested in only a few files among "
+"the thousands in the folder itself. For this reason, <app>Meld</app> "
+"includes a <em>flattened view</em> of a folder; only files that have not "
+"been filtered out (e.g., by <link xref=\"vc-mode#vc-state-filtering\"/>) are "
+"shown, and the folder hierarchy is stripped away, with file paths shown in "
+"the <em>Location</em> column."
+msgstr ""
+"När du visar stora mappar kanske du bara är intresserad av ett fåtal filer "
+"av tusentals i själva mappen. Därför innehåller <app>Meld</app> en <em>platt "
+"vy</em> för en mapp; endast filer som inte har filtrerats bort (t.ex. av "
+"<link xref=\"vc-mode#vc-state-filtering\"/>) visas, och mapphierarkin är "
+"borttagen, med filsökvägar visade i kolumnen <em>Plats</em>."
+
+#. (itstool) path: page/p
+#: C/flattened-view.page:27
+msgid ""
+"You can turn this flattened view on or off by unchecking the <guiseq><gui "
+"style=\"menu\">View</gui><gui style=\"menuitem\">Flatten</gui></guiseq> menu "
+"item, or by clicking the corresponding <gui style=\"button\">Flatten</gui> "
+"button on the toolbar."
+msgstr ""
+"Du kan aktivera och inaktivera den platta vyn genom att kryssa menyobjektet "
+"<guiseq><gui style=\"menu\">Visa</gui><gui style=\"menuitem\">Platta till</"
+"gui></guiseq> eller genom att klicka i motsvarande knapp <gui style=\"button"
+"\">Platta till</gui> i verktygsfältet."
+
+#. (itstool) path: page/title
+#: C/index.page:14
+msgid "Meld Help"
+msgstr "Meld hjälp"
+
+#. (itstool) path: section/title
+#: C/index.page:17
+msgid "Introduction"
+msgstr "Introduktion"
+
+#. (itstool) path: section/title
+#: C/index.page:21
+msgid "Comparing Files"
+msgstr "Jämföra filer"
+
+#. (itstool) path: section/title
+#: C/index.page:25
+msgid "Comparing Folders"
+msgstr "Jämföra mappar"
+
+#. (itstool) path: section/title
+#: C/index.page:29
+msgid "Using Meld with Version Control"
+msgstr "Använda Meld med versionshantering"
+
+#. (itstool) path: section/title
+#: C/index.page:33
+msgid "Advanced Usage"
+msgstr "Avancerad användning"
+
+#. (itstool) path: info/title
+#: C/vc-mode.page:5
+msgctxt "sort"
+msgid "0"
+msgstr "0"
+
+#. (itstool) path: page/title
+#: C/vc-mode.page:16
+msgid "Viewing version-controlled files"
+msgstr "Visa versionshanterade filer"
+
+#. (itstool) path: page/p
+#: C/vc-mode.page:18
+msgid ""
+"<app>Meld</app> integrates with <link xref=\"vc-supported\">many version "
+"control systems</link> to let you review local changes and perform simple "
+"version control tasks. You can start a new version control comparison by "
+"selecting the <guiseq><gui style=\"menu\">File</gui><gui style=\"menuitem"
+"\">New...</gui></guiseq> menu item, and clicking on the <gui style=\"tab"
+"\">Version Control</gui> tab."
+msgstr ""
+"<app>Meld</app> integrerar med <link xref=\"vc-supported\">många "
+"versionshanteringssystem</link> för att kunna låta dig se över lokala "
+"ändringar och utföra enkla versionshanteringsuppgifter. Du kan börja en ny "
+"versionshanteringsjämförelse genom att välja menyobjektet <guiseq><gui style="
+"\"menu\">Arkiv</gui><gui style=\"menuitem\">Ny...</gui></guiseq> och klicka "
+"på fliken <gui style=\"tab\">Versionshantering</gui> tab."
+
+#. (itstool) path: section/title
+#: C/vc-mode.page:30
+msgid "Version control comparisons"
+msgstr "Versionshanteringsjämförelse"
+
+#. (itstool) path: section/p
+#: C/vc-mode.page:32
+msgid ""
+"Version control comparisons show the differences between the contents of "
+"your folder and the current repository version. Each file in your local copy "
+"has a <link xref=\"#vc-state\">state</link> that indicates how it differs "
+"from the repository copy."
+msgstr ""
+"Versionshanteringsjämförelse visar skillnaderna mellan innehållet i din mapp "
+"och nuvarande förrådsstatus. Varje fil i din lokala kopia har ett <link xref="
+"\"#vc-state\">tillstånd</link> som indikerar hur den skiljer sig från "
+"förrådskopian."
+
+#. (itstool) path: section/p
+#: C/vc-mode.page:46
+msgid ""
+"If you want to look at a particular file's differences, you can select it "
+"and press <key>Enter</key>, or double-click the file to start a <link xref="
+"\"file-mode\">file comparison</link>. You can also interact with your "
+"version control system using the <gui style=\"menu\">Changes</gui> menu."
+msgstr ""
+"Om du vill se på en speciell fils skillnader kan du markera den och trycka "
+"<key>Retur</key> eller dubbelklicka filen för att starta en <link xref="
+"\"file-mode\">filjämförelse</link>. Du kan också interagera med ditt "
+"versionshanteringssystem genom användarmenyn <gui style=\"menu\">Ändringar</"
+"gui>."
+
+#. (itstool) path: section/title
+#. (itstool) path: table/title
+#: C/vc-mode.page:56 C/vc-mode.page:81
+msgid "Version control states"
+msgstr "Versionshanteringstillstånd"
+
+#. (itstool) path: section/p
+#: C/vc-mode.page:58
+msgid ""
+"Each file or folder in a version control comparison has a <em>state</em>, "
+"obtained from the version control system itself. <app>Meld</app> maps these "
+"different states into a standard set of very similar concepts. As such, "
+"<app>Meld</app> might use slightly different names for states than your "
+"version control system does. The possible states are:"
+msgstr ""
+"Varje fil eller mapp i ett versionshanteringsjämförelse har ett "
+"<em>tillstånd</em> hämtat från versionshanteringssystemet själv. <app>Meld</"
+"app> mappar dessa tillstånd till en standardsamling av liknande koncept. "
+"<app>Meld</app> kan därför använda något annorlunda namn för tillstånd än "
+"ditt versionshanteringssystem gör. Möjliga tillstånd är:"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:85 C/folder-mode.page:110
+msgid "State"
+msgstr "Tillstånd"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:86 C/folder-mode.page:111
+msgid "Appearance"
+msgstr "Utseende"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:87 C/folder-mode.page:112
+msgid "Meaning"
+msgstr "Betyder"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:95 C/folder-mode.page:120
+msgid "Normal font"
+msgstr "Normalt teckensnitt"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:101
+msgid "The file/folder is the same as the repository version."
+msgstr "Filen/mappen är densamma som förrådsversionen."
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:109
+msgid "Red and bold"
+msgstr "Röd och fet"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:115
+msgid "This file is different to the repository version."
+msgstr "Filen skiljer sig mot förrådsversionen."
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:123 C/folder-mode.page:164
+msgid "Green and bold"
+msgstr "Grön och fet"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:129
+msgid ""
+"This file/folder is new, and is scheduled to be added to the repository."
+msgstr "Filen/mappen är ny och är schemalagd att läggas till i förrådet."
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:136
+msgid "Removed"
+msgstr "Borttagen"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:138
+msgid "Red bold text with a line through the middle"
+msgstr "Röd fet genomstruken text"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:144
+msgid ""
+"This file/folder existed, but is scheduled to be removed from the repository."
+msgstr ""
+"Filen/mappen existerade, men är schemalagd till att tas bort från förrådet."
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:151
+msgid "Conflict"
+msgstr "Konflikt"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:153
+msgid "Bright red bold text"
+msgstr "Ljust röd fet text"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:159
+msgid ""
+"When trying to merge with the repository, the differences between the local "
+"file and the repository could not be resolved, and the file is now in "
+"conflict with the repository contents"
+msgstr ""
+"Då sammanfogning med förrådet skulle ske kunde inte skillnaderna mellan den "
+"lokala filen och förrådet lösas och filen är nu i konflikt med "
+"förrådsinnehållet"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:167 C/folder-mode.page:176
+msgid "Missing"
+msgstr "Saknad"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:169
+msgid "Blue bold text with a line through the middle"
+msgstr "Blå fet genomstruken text"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:175
+msgid "This file/folder should be present, but isn't."
+msgstr "Denna fil/mapp ska finnas, men finns inte."
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:181
+msgid "Ignored"
+msgstr "Ignorerad"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:183 C/vc-mode.page:199
+msgid "Greyed out text"
+msgstr "Utgråad text"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:189
+msgid ""
+"This file/folder has been explicitly ignored (e.g., by an entry in <file>."
+"gitignore</file>) and is not being tracked by version control."
+msgstr ""
+"Denna fil/mapp har explicit ignorerats (t.ex. genom att finnas i <file>."
+"gitignore</file>) och spåras inte av versionshantering."
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:197
+msgid "Unversioned"
+msgstr "Oversionerad"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:205
+msgid ""
+"This file is not in the version control system; it is only in the local copy."
+msgstr ""
+"Denna fil finns inte i versionshanteringssystemet; den finns endast i den "
+"lokala kopian."
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:212 C/folder-mode.page:191
+msgid "Error"
+msgstr "Fel"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:214 C/folder-mode.page:193
+msgid "Bright red with a yellow background and bold"
+msgstr "Ljust röd med en gul bakgrund och fet"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:220
+msgid "The version control system has reported a problem with this file."
+msgstr ""
+"Versionshanteringssystemet har rapporterat att denna fil har ett problem."
+
+#. (itstool) path: section/title
+#: C/vc-mode.page:230
+msgid "Version control state filtering"
+msgstr "Filtrering av versionshanteringstillstånd"
+
+#. (itstool) path: section/p
+#: C/vc-mode.page:232
+msgid ""
+"Most often, you will only want to see files that are identified as being in "
+"some way different; this is the default setting in <app>Meld</app>. You can "
+"change which file states you see by using the <guiseq><gui style=\"menu"
+"\">View</gui><gui style=\"menuitem\">Version Status</gui></guiseq> menu, or "
+"by clicking the corresponding <gui style=\"button\">Modified</gui>, <gui "
+"style=\"button\">Normal</gui>, <gui style=\"button\">Unversioned</gui> and "
+"<gui style=\"button\">Ignored</gui> buttons on the toolbar."
+msgstr ""
+"Oftast vill du endast se filer som identifieras som annorlunda på något "
+"sätt; det är standardinställningen i <app>Meld</app>. Du kan ändra vilka "
+"filtillstånd du er genom att använda menyn <guiseq><gui style=\"menu\">Vy</"
+"gui><gui style=\"menuitem\">Versionstillstånd</gui></guiseq> eller genom att "
+"klicka motsvarande knapparna <gui style=\"button\">Ändrade</gui>, <gui style="
+"\"button\">Normala</gui>, <gui style=\"button\">Oversionerad</gui> och <gui "
+"style=\"button\">Ignorerade</gui> i verktygsfältet."
+
+#. (itstool) path: page/title
+#: C/keyboard-shortcuts.page:15
+msgid "Keyboard shortcuts"
+msgstr "Tangentbordsgenvägar"
+
+#. (itstool) path: table/title
+#: C/keyboard-shortcuts.page:18
+msgid "Shortcuts for working with files and comparisons"
+msgstr "Genvägar för att arbeta med filer och jämförelser"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:22 C/keyboard-shortcuts.page:56
+#: C/keyboard-shortcuts.page:109 C/keyboard-shortcuts.page:131
+msgid "Shortcut"
+msgstr "Genväg"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:22 C/keyboard-shortcuts.page:56
+#: C/keyboard-shortcuts.page:109 C/keyboard-shortcuts.page:131
+msgid "Description"
+msgstr "Beskrivning"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:29
+msgid "<keyseq><key>Ctrl</key><key>N</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>N</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:30
+msgid "Start a new comparison."
+msgstr "Påbörja en ny jämförelse."
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:33
+msgid "<keyseq><key>Ctrl</key><key>S</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>S</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:34
+msgid "Save the current document to disk."
+msgstr "Spara aktuellt dokument till disk."
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:37
+msgid "<keyseq><key>Ctrl</key><key>Shift</key><key>S</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>Skift</key><key>S</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:38
+msgid "Save the current document with a new filename."
+msgstr "Spara det aktuella dokumentet med ett nytt filnamn."
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:41
+msgid "<keyseq><key>Ctrl</key><key>W</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>W</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:42
+msgid "Close the current comparison."
+msgstr "Stäng aktuell jämförelse."
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:45
+msgid "<keyseq><key>Ctrl</key><key>Q</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>Q</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:46
+msgid "Quit <app>Meld</app>."
+msgstr "Avsluta <app>Meld</app>."
+
+#. (itstool) path: table/title
+#: C/keyboard-shortcuts.page:52
+msgid "Shortcuts for editing documents"
+msgstr "Genvägar för att redigera dokument"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:62
+msgid "<keyseq><key>Ctrl</key><key>Z</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>Z</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:63
+msgid "Undo the last action."
+msgstr "Ångra den senaste åtgärden."
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:66
+msgid "<keyseq><key>Ctrl</key><key>Shift</key><key>Z</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>Skift</key><key>Z</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:67
+msgid "Redo the last undone action."
+msgstr "Gör om den senast ångrade åtgärden."
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:70
+msgid "<keyseq><key>Ctrl</key><key>X</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>X</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:71
+msgid "Cut the selected text or region and place it on the clipboard."
+msgstr "Klipp ut markerad text eller området och placera den i Urklipp."
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:74
+msgid "<keyseq><key>Ctrl</key><key>C</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>C</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:75
+msgid "Copy the selected text or region onto the clipboard."
+msgstr "Kopiera den markerade texten eller området till Urklipp."
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:78
+msgid "<keyseq><key>Ctrl</key><key>V</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>V</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:79
+msgid "Paste the contents of the clipboard."
+msgstr "Klistra in innehållet i Urklipp."
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:82
+msgid "<keyseq><key>Ctrl</key><key>F</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>F</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:83
+msgid "Find a string."
+msgstr "Hitta en sträng."
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:86
+msgid "<keyseq><key>Ctrl</key><key>G</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>G</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:87
+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
+msgid "<keyseq><key>Alt</key><key>Down</key></keyseq>"
+msgstr "<keyseq><key>Alt</key><key>Ner</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:91
+msgid ""
+"Go to the next difference. (Also <keyseq><key>Ctrl</key><key>D</key></"
+"keyseq>)"
+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 ""
+"Go to the previous difference. (Also <keyseq><key>Ctrl</key><key>E</key></"
+"keyseq>)"
+msgstr ""
+"Gå till föregående skillnad. (också <keyseq><key>Ctrl</key><key>E</key></"
+"keyseq>)"
+
+#. (itstool) path: table/title
+#: C/keyboard-shortcuts.page:105
+msgid "Shortcuts for view settings"
+msgstr "Genvägar för visa-inställningar"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:115
+msgid "<keyseq><key>Escape</key></keyseq>"
+msgstr "<keyseq><key>Escape</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:116
+msgid "Stop the current comparison."
+msgstr "Avsluta pågående jämförelse."
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:119
+msgid "<keyseq><key>Ctrl</key><key>R</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>R</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:120
+msgid "Refresh the current comparison."
+msgstr "Uppdatera pågående jämförelse."
+
+#. (itstool) path: table/title
+#: C/keyboard-shortcuts.page:127
+msgid "Shortcuts for help"
+msgstr "Genvägar för hjälp"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:137
+msgid "<keyseq><key>F1</key></keyseq>"
+msgstr "<keyseq><key>F1</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:138
+msgid "Open <app>Meld</app>'s user manual."
+msgstr "Öppna <app>Meld</app>s användarhandbok."
+
+#. (itstool) path: page/title
+#: C/introduction.page:15
+msgid "What is Meld?"
+msgstr "Vad är Meld?"
+
+#. (itstool) path: page/p
+#: C/introduction.page:16
+msgid ""
+"<app>Meld</app> is a tool for comparing files and directories, and for "
+"resolving differences between them. It is also useful for comparing changes "
+"captured by version control systems."
+msgstr ""
+"<app>Meld</app> är ett verktyg för att jämföra filer och kataloger, och för "
+"att lösa skillnader mellan dem. Den är också användbar för att jämföra "
+"ändringar registrerade i versionshanteringssystem."
+
+#. (itstool) path: page/p
+#: C/introduction.page:22
+msgid ""
+"<app>Meld</app> shows differences between two or three files (or two or "
+"three directories) and allows you to move content between them, or edit the "
+"files manually. <app>Meld</app>'s focus is on helping developers compare and "
+"merge source files, and get a visual overview of changes in their favourite "
+"version control system."
+msgstr ""
+"<app>Meld</app> visar skillnader mellan två eller tre filer (eller två eller "
+"tre kataloger) och låter dig flytta innehåll mellan dem, eller redigera "
+"filerna manuellt. <app>Meld</app>s fokus ligger på att hjälpa utvecklare "
+"jämföra och sammanfoga källfiler, och att ge en visuell överblick av "
+"ändringar i deras favorit-versionshanteringssystem."
+
+#. (itstool) path: page/title
+#: C/folder-mode.page:16
+msgid "Getting started comparing folders"
+msgstr "Kom igång med att jämföra mappar"
+
+#. (itstool) path: page/p
+#: C/folder-mode.page:18
+msgid ""
+"<app>Meld</app> lets you compare two or three folders side-by-side. You can "
+"start a new folder comparison by selecting the <guiseq><gui style=\"menu"
+"\">File</gui><gui style=\"menuitem\">New...</gui></guiseq> menu item, and "
+"clicking on the <gui style=\"tab\">Directory Comparison</gui> tab."
+msgstr ""
+"<app>Meld</app> låter dig jämföra två eller tre mappar sida-vid-sida. Du kan "
+"starta en ny mappjämförelse genom att markera menyobjektet <guiseq><gui "
+"style=\"menu\">Arkiv</gui><gui style=\"menuitem\">Ny...</gui></guiseq> och "
+"klicka på fliken <gui style=\"tab\">Katalogjämförelse</gui>."
+
+#. (itstool) path: page/p
+#: C/folder-mode.page:26
+msgid ""
+"Your selected folders will be shown as side-by-side trees, with differences "
+"between files in each folder highlighted. You can copy or delete files from "
+"either folder, or compare individual text files in more detail."
+msgstr ""
+"Dina valda mappar kommer att visas som sida-vid-sida-träd, med skillnader "
+"mellan filer i olika mappar markerade. Du kan kopiera eller ta bort filer "
+"antingen från var mapp, eller jämföra enskilda textfiler i mer detalj."
+
+#. (itstool) path: section/title
+#: C/folder-mode.page:36
+msgid "The folder comparison view"
+msgstr "Vyn för mappjämförelse"
+
+#. (itstool) path: section/p
+#: C/folder-mode.page:38
+msgid ""
+"The main parts of a folder comparison are the trees showing the folders "
+"you're comparing. You can easily <link xref=\"#folder-navigation\">move "
+"around</link> these comparisons to find changes that you're interested in. "
+"When you select a file or folder, more detailed information is given in the "
+"status bar at the bottom of the window. Pressing <key>Enter</key> on a "
+"selected file, or double-clicking any file in the tree will open a side-by-"
+"side <link xref=\"file-mode\">file comparison</link> of the files in a new "
+"tab, but this will only work properly if they're text files!"
+msgstr ""
+"Huvuddelarna vid en mappjämförelse är träden som visar mapparna du jämför. "
+"Du kan enkelt <link xref=\"#folder-navigation\">navigera runt i</link> dessa "
+"jämförelser för att hitta skillnader du är intresserad av. När du markerar "
+"en fil eller mapp ges mer detaljerad information i statusraden i nedre delen "
+"av fönstret. Att trycka <key>Retur</key> på en markerad fil eller att "
+"dubbelklicka en fil i trädet öppnar en sida-vid-sida <link xref=\"file-mode"
+"\">filjämförelse</link> över filerna i en ny flik, men det kommer bara att "
+"fungera korrekt om de är textfiler!"
+
+#. (itstool) path: section/p
+#: C/folder-mode.page:50
+msgid ""
+"There are bars on the left and right-hand sides of the window that show you "
+"a simple coloured summary of the comparison results. Each file or folder in "
+"the comparison corresponds to a small section of these bars, though "
+"<app>Meld</app> doesn't show <em>Same</em> files so that it's easier to see "
+"any actually important differences. You can click anywhere on this bar to "
+"jump straight to that place in the comparison."
+msgstr ""
+"Det finns paneler till vänster och höger om fönstret som visar en enkel "
+"färgad summering av jämförelseresultaten. Varje fil eller mapp i jämförelsen "
+"motsvaras av ett litet avsnitt i dessa paneler, men <app>Meld</app> visar "
+"inte <em>Samma</em> filer så det är enkelt att se viktiga skillnader. Du kan "
+"klicka varsomhelst på denna panel för att hoppa direkt till det stället i "
+"jämförelsen."
+
+#. (itstool) path: section/title
+#: C/folder-mode.page:63
+msgid "Navigating folder comparisons"
+msgstr "Navigera mappjämförelser"
+
+#. (itstool) path: section/p
+#: C/folder-mode.page:65
+msgid ""
+"You can jump between changed files (that is, any files/folders that are "
+"<em>not</em> classified as being identical) with the <guiseq><gui style="
+"\"menu\">Changes</gui><gui style=\"menuitem\">Previous change</gui></guiseq> "
+"and <guiseq><gui style=\"menu\">Changes</gui><gui style=\"menuitem\">Next "
+"change</gui></guiseq> menu items, or using the corresponding buttons on the "
+"toolbar."
+msgstr ""
+"Du kan hoppa mellan ändrade filer (det vill säga filer/mappar som <em>inte</"
+"em> är klassificerade som identiska) med menyobjektet <guiseq><gui style="
+"\"menu\">Ändringar</gui><gui style=\"menuitem\">Föregående ändring</gui></"
+"guiseq> och <guiseq><gui style=\"menu\">Ändringar</gui><gui style=\"menuitem"
+"\">Nästa ändring</gui></guiseq> eller genom att använda motsvarande knappar "
+"på verktygsfältet."
+
+#. (itstool) path: section/p
+#: C/folder-mode.page:73
+msgid ""
+"You can use the <key>Left</key> and <key>Right</key> arrow keys to move "
+"between the folders you're comparing. This is useful so that you can select "
+"an individual file for copying or deletion."
+msgstr ""
+"Du kan använda piltangenterna <key>Vänster</key> och <key>Höger</key> för "
+"att flytta mellan filerna du jämför. Det är användbart för att markera en "
+"individuell fil för kopiering eller borttagning."
+
+#. (itstool) path: section/title
+#: C/folder-mode.page:83
+msgid "States in folder comparisons"
+msgstr "Tillstånd i mappjämförelser"
+
+#. (itstool) path: section/p
+#: C/folder-mode.page:85
+msgid ""
+"Each file or folder in a tree has its own <em>state</em>, telling you how it "
+"differed from its corresponding files/folders. The possible states are:"
+msgstr ""
+"Varje fil eller mapp i ett träd har sitt eget <em>tillstånd</em>, som "
+"berättar hur mycket den skiljer sig från motsvarande filer/mappar. Möjliga "
+"tillstånd är:"
+
+#. (itstool) path: table/title
+#: C/folder-mode.page:106
+msgid "Folder comparison states"
+msgstr "Tillstånd för mappjämförelser"
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:126
+msgid "The file/folder is the same across all compared folders."
+msgstr "Filen/mappen är densamma över alla jämförda mappar."
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:132
+msgid "Same when filtered"
+msgstr "Samma när filtrerad"
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:134
+msgid "Italics"
+msgstr "Kursiva"
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:140
+msgid ""
+"These files are different across folders, but once <link xref=\"text-filters"
+"\">text filters</link> are applied, these files become identical."
+msgstr ""
+"Dessa filer är olika över mappar, men så fort <link xref=\"text-filters"
+"\">textfilter</link> verkställs blir dessa filer identiska."
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:150
+msgid "Blue and bold"
+msgstr "Blå och fet"
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:156
+msgid "These files differ between the folders being compared."
+msgstr "Dessa filer skiljer mellan mapparna som jämförs."
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:170
+msgid "This file/folder exists in this folder, but not in the others."
+msgstr "Denna fil/mapp existerar i denna mapp, men inte i de andra."
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:178
+msgid "Greyed out text with a line through the middle"
+msgstr "Utgråad genomstruken text"
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:184
+msgid ""
+"This file/folder doesn't exist in this folder, but does in one of the others."
+msgstr ""
+"Denna fil/mapp existerar inte i denna mapp, men finns i en av de andra."
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:199
+msgid ""
+"When comparing this file, an error occurred. The most common error causes "
+"are file permissions (i.e., <app>Meld</app> was not allowed to open the "
+"file) and filename encoding errors."
+msgstr ""
+"Vid jämförelse av denna fil uppstod ett fel. Den vanligaste felorsaken är "
+"filrättigheter (d.v.s. <app>Meld</app> tilläts inte öppna filen) och "
+"kodningsproblem med filnamn."
+
+#. (itstool) path: section/p
+#: C/folder-mode.page:217
+msgid ""
+"You can filter out files based on these states, for example, to show only "
+"files that have been <em>Modified</em>. You can read more about this in "
+"<link xref=\"file-filters#file-state-filter\"/>."
+msgstr ""
+"Du kan filtrera bort filer baserat på dessa tillstånd, till exempel, för att "
+"endast visa filer som har <em>Ändrats</em>. Du kan läsa mer om detta i <link "
+"xref=\"file-filters#file-state-filter\"/>."
+
+#. (itstool) path: section/p
+#: C/folder-mode.page:223
+msgid ""
+"Finally, the most recently modified file/folder has an emblem attached to it."
+msgstr ""
+"Slutligen, den senast ändrade filen/mappen har ett emblem fäst vid sig."
+
+#. (itstool) path: page/title
+#: C/missing-functionality.page:15
+msgid "Things that <app>Meld</app> doesn't do"
+msgstr "Saker <app>Meld</app> inte gör"
+
+#. (itstool) path: page/p
+#: C/missing-functionality.page:17
+msgid ""
+"Have you ever spent half an hour poking around an application trying to find "
+"out how to do something, thinking that <em>surely</em> there must be an "
+"option for this?"
+msgstr ""
+"Har du någonsin spenderat en halvtimme grävandes runt i ett program, "
+"letandes efter hur du gör någonting, och tänkt att det <em>säkerligen</em> "
+"måste finnas ett alternativ för det här?"
+
+#. (itstool) path: page/p
+#: C/missing-functionality.page:23
+msgid ""
+"This section lists a few of the common things that <app>Meld</app> "
+"<em>doesn't</em> do, either as a deliberate choice, or because we just "
+"haven't had time."
+msgstr ""
+"Det här avsnittet listar några saker som <app>Meld</app><em>inte</em> gör, "
+"antingen med avsikt, eller för att vi inte hade tid."
+
+#. (itstool) path: section/title
+#: C/missing-functionality.page:30
+msgid "Aligning changes by adding lines"
+msgstr "Justera ändringar genom att lägga till rader"
+
+#. (itstool) path: section/p
+#: C/missing-functionality.page:31
+msgid ""
+"When <app>Meld</app> shows differences between files, it shows both files as "
+"they would appear in a normal text editor. It does <em>not</em> insert "
+"additional lines so that the left and right sides of a particular change are "
+"the same size. There is no option to do this."
+msgstr ""
+"När <app>Meld</app> visar skillnader mellan filer visar det båda filer som "
+"de normalt skulle visas i en textredigerare. Det infogar <em>inte</em> "
+"ytterligare rader så att vänstra och högra sidan för en specifik ändring är "
+"av samma storlek. Det finns inget alternativ för detta."
+
+#. (itstool) path: page/title
+#: C/command-line.page:15
+msgid "Command line usage"
+msgstr "Kommandoradsanvändning"
+
+#. (itstool) path: page/p
+#: C/command-line.page:17
+msgid ""
+"If you start <app>Meld</app> from the command line, you can tell it what to "
+"do when it starts."
+msgstr ""
+"Om du startar <app>Meld</app> från kommandoraden kan du berätta hur det ska "
+"bete sig vid uppstart."
+
+#. (itstool) path: page/p
+#: C/command-line.page:20
+msgid ""
+"For a two- or three-way <link xref=\"file-mode\">file comparison</link>, "
+"start <app>Meld</app> with <cmd>meld <var>file1</var> <var>file2</var></cmd> "
+"or <cmd>meld <var>file1</var> <var>file2</var> <var>file3</var></cmd> "
+"respectively."
+msgstr ""
+"För en två- eller trevägs<link xref=\"file-mode\">filjämförelse</link>, "
+"starta <app>Meld</app> med <cmd>meld <var>fil1</var> <var>fil2</var></cmd> "
+"eller <cmd>meld <var>fil1</var> <var>fil2</var> <var>fil3</var></cmd>."
+
+#. (itstool) path: page/p
+#: C/command-line.page:26
+msgid ""
+"For a two- or three-way <link xref=\"folder-mode\">directory comparison</"
+"link>, start <app>Meld</app> with <cmd>meld <var>dir1</var> <var>dir2</var></"
+"cmd> or <cmd>meld <var>dir1</var> <var>dir2</var> <var>dir3</var></cmd>."
+msgstr ""
+"För en två- eller trevägs <link xref=\"folder-mode\">mappjämförelse</link>, "
+"starta <app>Meld</app> med <cmd>meld <var>kat1</var> <var>kat2</var></cmd> "
+"eller <cmd>meld <var>kat1</var> <var>kat2</var> <var>kat3</var></cmd>."
+
+#. (itstool) path: page/p
+#: C/command-line.page:31
+msgid ""
+"You can start a <link xref=\"vc-mode\">version control</link> comparison by "
+"just giving a single argument; if that file or directory is managed by a "
+"<link xref=\"vc-supported\">recognized version control system</link>, it "
+"will start a version control comparison on that argument. For example, "
+"<cmd>meld .</cmd> would start a version control view of the current "
+"directory."
+msgstr ""
+"Du kan starta en <link xref=\"vc-mode\">versionshantering</link>sjämförelse "
+"genom att endast ange ett argument; om filen eller katalogen hanteras av ett "
+"<link xref=\"vc-supported\">versionshanteringssystem</link>, kommer det att "
+"starta en versionshanteringsjämförelse med det argumentet. Till exempel, "
+"<cmd>meld .</cmd> skulle starta en versionskontroll av aktuell katalog."
+
+#. (itstool) path: note/p
+#: C/command-line.page:40
+msgid "Run <cmd>meld --help</cmd> for a list of all command line options."
+msgstr "Kör <cmd>meld --help</cmd> för en lista över alla kommandoradsflaggor."
+
+#~ msgid "Non VC"
+#~ msgstr "Ej VH"

From 5b8be467433988fd63b24f2a263c6c0d1f0a79ca Mon Sep 17 00:00:00 2001
From: Zain <zainengineer@gmail.com>
Date: Sun, 8 Nov 2015 12:32:48 +1030
Subject: [PATCH 27/44] Fix: bgo #753358 stderr errors when Alt-F4 is used

Problem:
  When meld is launched from console, usecase is git difftool,
  After closing App using Alt+F4 console displays multiple error messages
  Error Messages look like
  (meld:18521): Gtk-CRITICAL **: gtk_container_foreach: assertion 'GTK_IS_CONTAINER (container)' failed

Cause:
  closing window triggers do_window_removed
  Unlike when Quit is choosen from Menu, self.quit() is never called
  Gtk complains and adds error messages on STDERR

Solution:
  When do_window_removed is called check if there are any active windows
  If there is no active window, call self.quit()
---
 meld/meldapp.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meld/meldapp.py b/meld/meldapp.py
index 8fd11c99..b0e5308c 100644
--- a/meld/meldapp.py
+++ b/meld/meldapp.py
@@ -98,6 +98,8 @@ def done(tab, status):
     def do_window_removed(self, widget):
         widget.meldwindow = None
         Gtk.Application.do_window_removed(self, widget)
+        if not len(self.get_windows()):
+            self.quit()
 
     # We can't override do_local_command_line because it has no introspection
     # annotations: https://bugzilla.gnome.org/show_bug.cgi?id=687912

From 28e1e7191556e05103ea44ad5dd49bf6a6bbef33 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sat, 5 Dec 2015 09:22:48 +1000
Subject: [PATCH 28/44] Add appropriate kudos markers to appdata

As requested by upstream, we're adding all manually-assigned kudos that
apply to Meld. Unless the list of manually-specified kudos changes,
this list is unlikely to change, since we have no reason to use some of
the other kudo integration markers (e.g., notifications).
---
 data/meld.appdata.xml.in | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/data/meld.appdata.xml.in b/data/meld.appdata.xml.in
index 13494eef..2fbd5b5d 100644
--- a/data/meld.appdata.xml.in
+++ b/data/meld.appdata.xml.in
@@ -16,6 +16,13 @@
   merge conflicts slightly less painful.
   </_p>
  </description>
+ <kudos>
+  <kudo>AppMenu</kudo>
+  <kudo>HiDpiIcon</kudo>
+  <kudo>HighContrast</kudo>
+  <kudo>ModernToolkit</kudo>
+  <kudo>UserDocs</kudo>
+ </kudos>
  <screenshots>
   <screenshot type="default" width="992" height="759">http://meldmerge.org/images/meld-filediff-full.png</screenshot>
   <screenshot width="655" height="532">http://meldmerge.org/images/meld-dircomp-full.png</screenshot>

From eee0870ed5757609136ec1670a16d0df8aa7cd9f Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Thu, 10 Dec 2015 05:52:03 +1000
Subject: [PATCH 29/44] Update NEWS

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

diff --git a/NEWS b/NEWS
index 11cfb28f..ce8f4376 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,23 @@
+
+2015-12-10 meld 3.14.2
+======================
+
+  Fixes:
+
+   * Fix some GTK+ assertions on window close (Zain)
+   * Fix commit error with unicode commit messages (Kai Willadsen)
+   * Add manual appdata kudos markers (Kai Willadsen)
+
+  Translations:
+
+   * Anders Jonsson (sv)
+   * Josef Andersson (sv)
+   * Marek Černocký (cs)
+   * Milo Casagrande (it)
+   * Pedro Albuquerque (pt)
+   * Rafael Fontenelle (pt_BR)
+
+
 2015-10-04 meld 3.14.1
 ======================
 

From 733af61fab7030113da50cf098f357311888afb4 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Thu, 10 Dec 2015 05:52:31 +1000
Subject: [PATCH 30/44] 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 13004efe..dfff950f 100644
--- a/meld/conf.py
+++ b/meld/conf.py
@@ -3,7 +3,7 @@
 import sys
 
 __package__ = "meld"
-__version__ = "3.14.2"
+__version__ = "3.14.3"
 
 # START; these paths are clobbered on install by meld.build_helpers
 DATADIR = os.path.join(sys.prefix, "share", "meld")

From 7c3a06132f34c5d585c6bcd97800c95754e0cddd 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 31/44] 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 36c509f0..a3786712 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 5abcb795014558df4ff04eb6d8f2ef999209799a Mon Sep 17 00:00:00 2001
From: Bernd Homuth <dev@hmt.im>
Date: Tue, 22 Dec 2015 16:44:02 +0000
Subject: [PATCH 32/44] Updated German translation

---
 po/de.po | 285 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 148 insertions(+), 137 deletions(-)

diff --git a/po/de.po b/po/de.po
index cd0332d5..f82e09dd 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,22 +7,23 @@
 # Mario Blättermann <mario.blaettermann@gmail.com>, 2009-2012.
 # Holger Wansing <linux@wansing-online.de>, 2010.
 # Benjamin Steinwender <b@stbe.at>, 2014.
+# Bernd Homuth <dev@hmt.im>, 2015.
 #
 msgid ""
 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: 2015-02-24 11:04+0000\n"
-"PO-Revision-Date: 2015-02-24 21:02+0100\n"
-"Last-Translator: Benjamin Steinwender <b@stbe.at>\n"
-"Language-Team: German <gnome-de@gnome.org>\n"
+"POT-Creation-Date: 2015-12-22 13:31+0000\n"
+"PO-Revision-Date: 2015-12-22 17:42+0100\n"
+"Last-Translator: Bernd Homuth <dev@hmt.im>\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.7.1\n"
+"X-Generator: Gtranslator 2.91.7\n"
 "X-Poedit-Bookmarks: -1,351,-1,-1,-1,-1,-1,-1,-1,-1\n"
 
 #: ../bin/meld:144
@@ -510,7 +511,8 @@ msgstr ""
 "Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Holger Wansing <linux@wansing-online.de>\n"
 "Benjamin Steinwender <b@stbe.at>\n"
-"Christian Kirbach <christian.kirbach@gmail.com>"
+"Christian Kirbach <christian.kirbach@gmail.com>\n"
+"Bernd Homuth <dev@hmt.im>"
 
 #: ../data/ui/application.ui.h:6
 msgid "_Preferences"
@@ -556,7 +558,7 @@ msgstr "Nach rechts kopieren"
 msgid "Delete selected"
 msgstr "Markierte löschen"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:876 ../meld/filediff.py:1460
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:881 ../meld/filediff.py:1489
 msgid "Hide"
 msgstr "Verbergen"
 
@@ -625,7 +627,7 @@ msgid "_Add"
 msgstr "_Hinzufügen"
 
 #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:747
+#: ../meld/vcview.py:762
 msgid "_Remove"
 msgstr "_Löschen"
 
@@ -647,7 +649,7 @@ msgstr "Hin_unter schieben"
 
 #. Create icon and filename CellRenderer
 #: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:374
-#: ../meld/vcview.py:203
+#: ../meld/vcview.py:215
 msgid "Name"
 msgstr "Name"
 
@@ -848,8 +850,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:967 ../meld/filediff.py:1629
-#: ../meld/filediff.py:1713 ../meld/filediff.py:1738
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:972 ../meld/filediff.py:1658
+#: ../meld/filediff.py:1742 ../meld/filediff.py:1767
 msgid "_Cancel"
 msgstr "A_bbrechen"
 
@@ -886,7 +888,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:968 ../meld/filediff.py:1630
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:973 ../meld/filediff.py:1659
 msgid "_Replace"
 msgstr "E_rsetzen"
 
@@ -934,7 +936,7 @@ msgstr "Als Patch formatieren"
 msgid "Copy to Clipboard"
 msgstr "In die Zwischenablage kopieren"
 
-#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:119
+#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:125
 msgid "Save Patch"
 msgstr "Patch speichern"
 
@@ -1380,30 +1382,30 @@ msgstr "Änderungszeit"
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: ../meld/dirdiff.py:558
+#: ../meld/dirdiff.py:561
 #, python-format
 msgid "Hide %s"
 msgstr "%s verbergen"
 
-#: ../meld/dirdiff.py:688 ../meld/dirdiff.py:710
+#: ../meld/dirdiff.py:693 ../meld/dirdiff.py:715
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] %s wird durchsucht"
 
-#: ../meld/dirdiff.py:843
+#: ../meld/dirdiff.py:848
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Fertig"
 
-#: ../meld/dirdiff.py:851
+#: ../meld/dirdiff.py:856
 msgid "Folders have no differences"
 msgstr "Keine Unterschiede zwischen Ordnern"
 
-#: ../meld/dirdiff.py:853
+#: ../meld/dirdiff.py:858
 msgid "Contents of scanned files in folders are identical."
 msgstr "Inhalte der untersuchten Dateien in den Ordnern sind identisch."
 
-#: ../meld/dirdiff.py:855
+#: ../meld/dirdiff.py:860
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1411,44 +1413,44 @@ msgstr ""
 "Untersuchte Dateien in den Ordner scheinen identisch zu sein, jedoch wurden "
 "die Dateiinhalte nicht geprüft."
 
-#: ../meld/dirdiff.py:858
+#: ../meld/dirdiff.py:863
 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:860
+#: ../meld/dirdiff.py:865
 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:878 ../meld/dirdiff.py:931 ../meld/filediff.py:1115
-#: ../meld/filediff.py:1267 ../meld/filediff.py:1462 ../meld/filediff.py:1492
-#: ../meld/filediff.py:1494
+#: ../meld/dirdiff.py:883 ../meld/dirdiff.py:936 ../meld/filediff.py:1129
+#: ../meld/filediff.py:1161 ../meld/filediff.py:1296 ../meld/filediff.py:1491
+#: ../meld/filediff.py:1521 ../meld/filediff.py:1523
 msgid "Hi_de"
 msgstr "Ver_bergen"
 
-#: ../meld/dirdiff.py:888
+#: ../meld/dirdiff.py:893
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Beim Einlesen dieses Ordners traten mehrere Fehler auf"
 
-#: ../meld/dirdiff.py:889
+#: ../meld/dirdiff.py:894
 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:891
+#: ../meld/dirdiff.py:896
 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:893
+#: ../meld/dirdiff.py:898
 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:895
+#: ../meld/dirdiff.py:900
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1457,17 +1459,17 @@ msgstr ""
 "auf einem Dateisystem durch, welches zwischen Groß- und Kleinschreibung "
 "unterscheidet. Die folgenden Dateien in diesem Ordner sind nicht sichtbar:"
 
-#: ../meld/dirdiff.py:906
+#: ../meld/dirdiff.py:911
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "»%s« verborgen durch »%s«"
 
-#: ../meld/dirdiff.py:971
+#: ../meld/dirdiff.py:976
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Ordner »%s« ersetzen?"
 
-#: ../meld/dirdiff.py:973
+#: ../meld/dirdiff.py:978
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1476,11 +1478,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:986
+#: ../meld/dirdiff.py:991
 msgid "Error copying file"
 msgstr "Fehler beim Kopieren der Datei"
 
-#: ../meld/dirdiff.py:987
+#: ../meld/dirdiff.py:992
 #, python-format
 msgid ""
 "Couldn't copy %s\n"
@@ -1493,35 +1495,35 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/dirdiff.py:1010
+#: ../meld/dirdiff.py:1015
 #, python-format
 msgid "Error deleting %s"
 msgstr "Fehler beim Löschen von »%s«"
 
-#: ../meld/dirdiff.py:1515
+#: ../meld/dirdiff.py:1520
 msgid "No folder"
 msgstr "Kein Ordner"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:406
+#: ../meld/filediff.py:410
 msgid "INS"
 msgstr "EINF"
 
-#: ../meld/filediff.py:406
+#: ../meld/filediff.py:410
 msgid "OVR"
 msgstr "ÜBR"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:408
+#: ../meld/filediff.py:412
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Zeile %i, Spalte %i"
 
-#: ../meld/filediff.py:821
+#: ../meld/filediff.py:825
 msgid "Comparison results will be inaccurate"
 msgstr "Ergebnisse werden ungenau sein"
 
-#: ../meld/filediff.py:823
+#: ../meld/filediff.py:827
 #, python-format
 msgid ""
 "Filter “%s” changed the number of lines in the file, which is unsupported. "
@@ -1531,78 +1533,87 @@ msgstr ""
 "nicht unterstützt, deshalb wird ein Vergleich keine korrekten Ergebnisse "
 "liefern."
 
-#: ../meld/filediff.py:894
+#: ../meld/filediff.py:898
 msgid "Mark conflict as resolved?"
 msgstr "Konflikt als _gelöst markieren?"
 
-#: ../meld/filediff.py:896
+#: ../meld/filediff.py:900
 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:898
+#: ../meld/filediff.py:902
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../meld/filediff.py:899
+#: ../meld/filediff.py:903
 msgid "Mark _Resolved"
 msgstr "Als _gelöst markieren"
 
-#: ../meld/filediff.py:1102
+#: ../meld/filediff.py:1110
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Setzen der Spaltenanzahl"
 
-#: ../meld/filediff.py:1109
+#: ../meld/filediff.py:1123
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Dateien werden geöffnet"
 
-#: ../meld/filediff.py:1132 ../meld/filediff.py:1142 ../meld/filediff.py:1155
-#: ../meld/filediff.py:1161
+#: ../meld/filediff.py:1146 ../meld/filediff.py:1184 ../meld/filediff.py:1190
 msgid "Could not read file"
 msgstr "Datei konnte nicht gelesen werden"
 
-#: ../meld/filediff.py:1133
+#: ../meld/filediff.py:1147
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Dateien werden gelesen"
 
-#: ../meld/filediff.py:1143
+#: ../meld/filediff.py:1156
 #, python-format
-msgid "%s appears to be a binary file."
-msgstr "%s scheint eine Binärdatei zu sein."
+#| msgid "%s appears to be a binary file."
+msgid "File %s appears to be a binary file."
+msgstr "Datei %s scheint eine Binärdatei zu sein."
 
-#: ../meld/filediff.py:1156
+#: ../meld/filediff.py:1157
+#| msgid "Open selected file or directory in the default external application"
+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:1160
+msgid "Open"
+msgstr "Öffnen"
+
+#: ../meld/filediff.py:1185
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s ist nicht in Kodierungen enthalten: %s"
 
-#: ../meld/filediff.py:1194
+#: ../meld/filediff.py:1223
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Unterschiede werden berechnet"
 
-#: ../meld/filediff.py:1262
+#: ../meld/filediff.py:1291
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Die Datei %s wurde auf dem Datenträger geändert"
 
-#: ../meld/filediff.py:1263
+#: ../meld/filediff.py:1292
 msgid "Do you want to reload the file?"
 msgstr "Möchten Sie die Datei neu laden?"
 
-#: ../meld/filediff.py:1266
+#: ../meld/filediff.py:1295
 msgid "_Reload"
 msgstr "_Neu laden"
 
-#: ../meld/filediff.py:1425
+#: ../meld/filediff.py:1454
 msgid "Files are identical"
 msgstr "Dateien sind identisch"
 
-#: ../meld/filediff.py:1438
+#: ../meld/filediff.py:1467
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1610,11 +1621,11 @@ msgstr ""
 "Textfilter werden verwendet, welche Unterschiede zwischen Dateien maskieren "
 "könnten. Wollen Sie die ungefilterten Dateien vergleichen?"
 
-#: ../meld/filediff.py:1443
+#: ../meld/filediff.py:1472
 msgid "Files differ in line endings only"
 msgstr "Dateien unterscheiden sich nur in den Zeilenendungen"
 
-#: ../meld/filediff.py:1445
+#: ../meld/filediff.py:1474
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1623,15 +1634,15 @@ msgstr ""
 "Dateien sind identisch, abgesehen von unterschiedlichen Zeilenenden:\n"
 "%s"
 
-#: ../meld/filediff.py:1465
+#: ../meld/filediff.py:1494
 msgid "Show without filters"
 msgstr "Ungefiltert anzeigen"
 
-#: ../meld/filediff.py:1487
+#: ../meld/filediff.py:1516
 msgid "Change highlighting incomplete"
 msgstr "Änderungsmarkierung unvollständig"
 
-#: ../meld/filediff.py:1488
+#: ../meld/filediff.py:1517
 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."
@@ -1640,20 +1651,20 @@ msgstr ""
 "Sie können Meld zur Hervorhebung längerer Änderungen zwingen, was jedoch "
 "langsam sein könnte."
 
-#: ../meld/filediff.py:1496
+#: ../meld/filediff.py:1525
 msgid "Keep highlighting"
 msgstr "Hervorhebung fortführen"
 
-#: ../meld/filediff.py:1498
+#: ../meld/filediff.py:1527
 msgid "_Keep highlighting"
 msgstr "Hervorhebung _fortführen"
 
-#: ../meld/filediff.py:1633
+#: ../meld/filediff.py:1662
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Datei »%s« ersetzen?"
 
-#: ../meld/filediff.py:1635
+#: ../meld/filediff.py:1664
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -1662,12 +1673,12 @@ msgstr ""
 "Eine Datei mit diesem Namen existiert bereits in »%s«.\n"
 "Wenn Sie die vorhandene Datei ersetzen, geht dessen Inhalt verloren."
 
-#: ../meld/filediff.py:1653
+#: ../meld/filediff.py:1682
 #, python-format
 msgid "Could not save file %s."
 msgstr "Datei %s konnte nicht gespeichert werden."
 
-#: ../meld/filediff.py:1654
+#: ../meld/filediff.py:1683
 #, python-format
 msgid ""
 "Couldn't save file due to:\n"
@@ -1676,41 +1687,41 @@ msgstr ""
 "Datei konnte nicht gespeichert werden:\n"
 "%s"
 
-#: ../meld/filediff.py:1666
+#: ../meld/filediff.py:1695
 msgid "Save Left Pane As"
 msgstr "Linke Ansicht speichern unter"
 
-#: ../meld/filediff.py:1668
+#: ../meld/filediff.py:1697
 msgid "Save Middle Pane As"
 msgstr "Mittlere Ansicht speichern unter"
 
-#: ../meld/filediff.py:1670
+#: ../meld/filediff.py:1699
 msgid "Save Right Pane As"
 msgstr "Rechte Ansicht speichern unter"
 
-#: ../meld/filediff.py:1684
+#: ../meld/filediff.py:1713
 #, 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:1686
+#: ../meld/filediff.py:1715
 msgid "If you save it, any external changes will be lost."
 msgstr "Wenn Sie speichern, gehen externe Änderungen verloren."
 
-#: ../meld/filediff.py:1689
+#: ../meld/filediff.py:1718
 msgid "Save Anyway"
 msgstr "Dennoch speichern"
 
-#: ../meld/filediff.py:1690
+#: ../meld/filediff.py:1719
 msgid "Don't Save"
 msgstr "Nicht Speichern"
 
-#: ../meld/filediff.py:1716
+#: ../meld/filediff.py:1745
 msgid "Inconsistent line endings found"
 msgstr "Inkonsistente Zeilenendungen gefunden"
 
-#: ../meld/filediff.py:1718
+#: ../meld/filediff.py:1747
 #, python-format
 msgid ""
 "'%s' contains a mixture of line endings. Select the line ending format to "
@@ -1719,16 +1730,16 @@ msgstr ""
 "Die Datei »%s« beinhaltet eine Mischung aus Zeilenendungen. Wählen Sie das "
 "gewünschte Format für die Zeilenendung."
 
-#: ../meld/filediff.py:1739
+#: ../meld/filediff.py:1768
 msgid "_Save as UTF-8"
 msgstr "Als UTF-8 _speichern"
 
-#: ../meld/filediff.py:1742
+#: ../meld/filediff.py:1771
 #, python-format
 msgid "Couldn't encode text as “%s”"
 msgstr "Text konnte nicht als »%s« kodiert werden."
 
-#: ../meld/filediff.py:1744
+#: ../meld/filediff.py:1773
 #, python-format
 msgid ""
 "File “%s” contains characters that can't be encoded using encoding “%s”.\n"
@@ -1737,11 +1748,11 @@ 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:2096
+#: ../meld/filediff.py:2125
 msgid "Live comparison updating disabled"
 msgstr "Direkte Vergleichsaktualisierung deaktiviert"
 
-#: ../meld/filediff.py:2097
+#: ../meld/filediff.py:2126
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1765,101 +1776,101 @@ msgstr "Nach _oben kopieren"
 msgid "Copy _down"
 msgstr "Nach _unten kopieren"
 
-#: ../meld/meldapp.py:170
+#: ../meld/meldapp.py:177
 msgid "wrong number of arguments supplied to --diff"
 msgstr "Falsche Anzahl an Argumenten für --diff."
 
-#: ../meld/meldapp.py:175
+#: ../meld/meldapp.py:182
 msgid "Start with an empty window"
 msgstr "Beim Start kein Fenster öffnen"
 
-#: ../meld/meldapp.py:176 ../meld/meldapp.py:178
+#: ../meld/meldapp.py:183 ../meld/meldapp.py:185
 msgid "file"
 msgstr "Datei"
 
-#: ../meld/meldapp.py:176 ../meld/meldapp.py:180
+#: ../meld/meldapp.py:183 ../meld/meldapp.py:187
 msgid "folder"
 msgstr "Ordner"
 
-#: ../meld/meldapp.py:177
+#: ../meld/meldapp.py:184
 msgid "Start a version control comparison"
 msgstr "Versionskontrollvergleich starten"
 
-#: ../meld/meldapp.py:179
+#: ../meld/meldapp.py:186
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Im Zwei- oder Dreiwegevergleich starten"
 
-#: ../meld/meldapp.py:181
+#: ../meld/meldapp.py:188
 msgid "Start a 2- or 3-way folder comparison"
 msgstr "Einen Zwei- oder Dreiwegevergleich starten"
 
-#: ../meld/meldapp.py:224
+#: ../meld/meldapp.py:231
 #, python-format
 msgid "Error: %s\n"
 msgstr "Fehler: %s\n"
 
-#: ../meld/meldapp.py:231
+#: ../meld/meldapp.py:238
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld ist ein Werkzeug zum Vergleichen von Dateien und Ordnern."
 
-#: ../meld/meldapp.py:235
+#: ../meld/meldapp.py:242
 msgid "Set label to use instead of file name"
 msgstr "Zu verwendende Bezeichnung anstelle Dateinamen angeben"
 
-#: ../meld/meldapp.py:238
+#: ../meld/meldapp.py:245
 msgid "Open a new tab in an already running instance"
 msgstr "Einen neuen Reiter in einer bereits laufenden Instanz öffnen"
 
-#: ../meld/meldapp.py:241
+#: ../meld/meldapp.py:248
 msgid "Automatically compare all differing files on startup"
 msgstr "Automatisch alle sich unterscheidenden Dateien beim Start vergleichen"
 
-#: ../meld/meldapp.py:244
+#: ../meld/meldapp.py:251
 msgid "Ignored for compatibility"
 msgstr "Aus Kompatibilitätsgründen ignoriert"
 
-#: ../meld/meldapp.py:248
+#: ../meld/meldapp.py:255
 msgid "Set the target file for saving a merge result"
 msgstr "Zieldatei zum Speichern einer Zusammenführung festlegen"
 
-#: ../meld/meldapp.py:251
+#: ../meld/meldapp.py:258
 msgid "Automatically merge files"
 msgstr "Dateien automatisch zusammenführen"
 
-#: ../meld/meldapp.py:255
+#: ../meld/meldapp.py:262
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "Einen abgespeicherten Vergleich aus einer Meld-Vergleichsdatei laden"
 
-#: ../meld/meldapp.py:259
+#: ../meld/meldapp.py:266
 msgid "Create a diff tab for the supplied files or folders"
 msgstr "Erzeugt einen Differenz-Reiter für die angegebenen Dateien oder Ordner"
 
-#: ../meld/meldapp.py:279
+#: ../meld/meldapp.py:286
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "zu viele Argumente (0-3 erforderlich, %d erhalten)"
 
-#: ../meld/meldapp.py:282
+#: ../meld/meldapp.py:289
 msgid "can't auto-merge less than 3 files"
 msgstr ""
 "kann nicht mit weniger als 3 Dateien eine automatische Zusammenführung "
 "durchführen"
 
-#: ../meld/meldapp.py:284
+#: ../meld/meldapp.py:291
 msgid "can't auto-merge directories"
 msgstr "kann Ordner nicht automatisch zusammenführen"
 
-#: ../meld/meldapp.py:298
+#: ../meld/meldapp.py:305
 msgid "Error reading saved comparison file"
 msgstr "Fehler beim Lesen der gespeicherten Vergleichsdatei"
 
-#: ../meld/meldapp.py:326
+#: ../meld/meldapp.py:332
 #, python-format
 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:137
+#: ../meld/meldbuffer.py:138
 msgid "<unnamed>"
 msgstr "<unbenannt>"
 
@@ -2102,7 +2113,7 @@ msgid "Cannot compare a mixture of files and directories"
 msgstr "Es kann keine Mischung aus Dateien und Ordnern verglichen werden"
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:178
+#: ../meld/misc.py:203
 msgid "[None]"
 msgstr "[Nichts]"
 
@@ -2128,28 +2139,28 @@ msgstr "Keine Dateien zum Einspielen"
 
 #. Translators: First %s is replaced by translated "%d unpushed
 #. commits", second %s is replaced by translated "%d branches"
-#: ../meld/vc/git.py:129
+#: ../meld/vc/git.py:127
 #, python-format
 msgid "%s in %s"
 msgstr "%s in %s"
 
 #. Translators: These messages cover the case where there is
 #. only one branch, and are not part of another message.
-#: ../meld/vc/git.py:130 ../meld/vc/git.py:137
+#: ../meld/vc/git.py:128 ../meld/vc/git.py:135
 #, python-format
 msgid "%d unpushed commit"
 msgid_plural "%d unpushed commits"
 msgstr[0] "%d nicht geschobene Einbringung"
 msgstr[1] "%d nicht geschobene Einbringungen"
 
-#: ../meld/vc/git.py:132
+#: ../meld/vc/git.py:130
 #, python-format
 msgid "%d branch"
 msgid_plural "%d branches"
 msgstr[0] "%d Zweig"
 msgstr[1] "%d Zweige"
 
-#: ../meld/vc/git.py:360
+#: ../meld/vc/git.py:357
 #, python-format
 msgid "Mode changed from %s to %s"
 msgstr "Modus wechselte von %s zu %s"
@@ -2202,111 +2213,111 @@ msgstr "Fehlend"
 msgid "Not present"
 msgstr "Nicht vorhanden"
 
-#: ../meld/vcview.py:233 ../meld/vcview.py:417
+#: ../meld/vcview.py:245 ../meld/vcview.py:426
 msgid "Location"
 msgstr "Ort"
 
-#: ../meld/vcview.py:234
+#: ../meld/vcview.py:246
 msgid "Status"
 msgstr "Status"
 
-#: ../meld/vcview.py:235
+#: ../meld/vcview.py:247
 msgid "Revision"
 msgstr "Revision"
 
-#: ../meld/vcview.py:236
+#: ../meld/vcview.py:248
 msgid "Options"
 msgstr "Optionen"
 
 #. TRANSLATORS: this is an error message when a version control
 #. application isn't installed or can't be found
-#: ../meld/vcview.py:324
+#: ../meld/vcview.py:336
 #, python-format
 msgid "%s not installed"
 msgstr "%s ist nicht installiert"
 
 #. TRANSLATORS: this is an error message when a version
 #. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:328
+#: ../meld/vcview.py:340
 msgid "Invalid repository"
 msgstr "Ungültiger Softwarebestand"
 
-#: ../meld/vcview.py:337
+#: ../meld/vcview.py:349
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../meld/vcview.py:339 ../meld/vcview.py:347
+#: ../meld/vcview.py:351 ../meld/vcview.py:359
 msgid "None"
 msgstr "Nichts"
 
-#: ../meld/vcview.py:358
+#: ../meld/vcview.py:370
 msgid "No valid version control system found in this folder"
 msgstr "Kein gültiges Versionskontrollsystem in diesem Verzeichnis gefunden"
 
-#: ../meld/vcview.py:360
+#: ../meld/vcview.py:372
 msgid "Only one version control system found in this folder"
 msgstr "Nur eine Versionskontrolle in diesem Ordner gefunden"
 
-#: ../meld/vcview.py:362
+#: ../meld/vcview.py:374
 msgid "Choose which version control system to use"
 msgstr "Wählen Sie die zu verwendende Versionskontrolle"
 
 #. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:417
+#: ../meld/vcview.py:426
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:431 ../meld/vcview.py:439
+#: ../meld/vcview.py:448
 #, python-format
 msgid "Scanning %s"
 msgstr "%s wird durchsucht"
 
-#: ../meld/vcview.py:479
+#: ../meld/vcview.py:488
 msgid "(Empty)"
 msgstr "(Leer)"
 
-#: ../meld/vcview.py:522
+#: ../meld/vcview.py:531
 #, python-format
 msgid "%s — local"
 msgstr "%s — lokal"
 
-#: ../meld/vcview.py:523
+#: ../meld/vcview.py:532
 #, python-format
 msgid "%s — remote"
 msgstr "%s — entfernt"
 
-#: ../meld/vcview.py:531
+#: ../meld/vcview.py:540
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (lokal, zusammengeführt, entfernt)"
 
-#: ../meld/vcview.py:536
+#: ../meld/vcview.py:545
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (entfernt, zusammengeführt, lokal)"
 
-#: ../meld/vcview.py:547
+#: ../meld/vcview.py:556
 #, python-format
 msgid "%s — repository"
 msgstr "%s — Softwarebestand"
 
-#: ../meld/vcview.py:553
+#: ../meld/vcview.py:562
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (Arbeitskopie, Softwarebestand)"
 
-#: ../meld/vcview.py:557
+#: ../meld/vcview.py:566
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (Softwarebestand, Arbeitskopie)"
 
-#: ../meld/vcview.py:741
+#: ../meld/vcview.py:756
 msgid "Remove folder and all its files?"
 msgstr "Den Ordner und alle Dateien entfernen?"
 
-#: ../meld/vcview.py:743
+#: ../meld/vcview.py:758
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2314,7 +2325,7 @@ msgstr ""
 "Dadurch werden alle gewählten Dateien, Ordner und deren Inhalte aus der "
 "Versionskontrolle entfernt."
 
-#: ../meld/vcview.py:777
+#: ../meld/vcview.py:792
 #, python-format
 msgid "Error removing %s"
 msgstr "Fehler beim Entfernen von %s"

From e7f7f377b10e0ce60fd3233c2d627f56e07ed177 Mon Sep 17 00:00:00 2001
From: Benjamin Steinwender <b@stbe.at>
Date: Fri, 1 Jan 2016 18:48:23 +0000
Subject: [PATCH 33/44] Updated German translation

---
 help/de/de.po | 109 ++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 80 insertions(+), 29 deletions(-)

diff --git a/help/de/de.po b/help/de/de.po
index 1f9d5ea6..a44fd2c5 100644
--- a/help/de/de.po
+++ b/help/de/de.po
@@ -8,16 +8,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: meld meld-3-12\n"
-"POT-Creation-Date: 2015-01-23 10:52+0000\n"
-"PO-Revision-Date: 2015-01-23 23:33+0100\n"
-"Last-Translator: Christian Kirbach <christian.kirbach@gmail.com>\n"
+"POT-Creation-Date: 2015-12-27 01:30+0000\n"
+"PO-Revision-Date: 2015-12-27 09:35+0100\n"
+"Last-Translator: Benjamin Steinwender <b@stbe.at>\n"
 "Language-Team: German <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.5.4\n"
+"X-Generator: Poedit 1.8.6\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -38,8 +38,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"
 
@@ -199,7 +198,7 @@ msgstr ""
 msgid ""
 "In a folder comparison, each line contains a single file or folder that is "
 "present in at least one of the folders being compared. Each of these lines "
-"is classified as being either <em>Modifed</em>, <em>New</em> or <em>Same</"
+"is classified as being either <em>Modified</em>, <em>New</em> or <em>Same</"
 "em>:"
 msgstr ""
 
@@ -439,7 +438,7 @@ msgstr ""
 msgid ""
 "In <app>Meld</app>, text filters are regular expressions that are matched "
 "against the text of files you're comparing. Any text that is matched is "
-"ignored during the comparsion; you'll still see this text in the comparison "
+"ignored during the comparison; you'll still see this text in the comparison "
 "view, but it won't be taken into account when finding differences. Text "
 "filters are applied in order, so it's possible for the first filter to "
 "remove text that now makes the second filter match, and so on."
@@ -482,6 +481,11 @@ msgid ""
 "c\n"
 "d"
 msgstr ""
+"\n"
+"a\n"
+"b#Kommentar\n"
+"c\n"
+"d"
 
 #. (itstool) path: listing/title
 #: C/text-filters.page:90
@@ -498,6 +502,11 @@ msgid ""
 "c\n"
 "#comment"
 msgstr ""
+"\n"
+"a\n"
+"b\n"
+"c\n"
+"#Kommentar"
 
 #. (itstool) path: section/p
 #: C/text-filters.page:101
@@ -537,7 +546,7 @@ msgstr ""
 #. (itstool) path: page/title
 #: C/resolving-conflicts.page:15
 msgid "Resolving merge conflicts"
-msgstr ""
+msgstr "Konflikte beim Zusammenführen lösen"
 
 #. (itstool) path: page/p
 #: C/resolving-conflicts.page:17
@@ -611,6 +620,41 @@ msgid ""
 "number respectively (e.g., <cmd>gedit {file}:{line}</cmd>)."
 msgstr ""
 
+#. (itstool) path: terms/title
+#: C/preferences.page:31
+msgid "Folder Comparison preferences"
+msgstr "Ordnervergleich-Einstellungen"
+
+#. (itstool) path: item/title
+#: C/preferences.page:33
+msgid "Apply text filters during folder comparisons"
+msgstr "Textfilter während eines Ordnervergleichs anwenden"
+
+#. (itstool) path: item/p
+#: C/preferences.page:34
+msgid ""
+"When comparing files in folder comparison mode, text filters and other text "
+"manipulation options can be applied to the contents of files. If this option "
+"is enabled, all currently enabled text filters will be applied, the blank "
+"line trimming option will be applied as appropriate, and differences in line "
+"endings will be ignored."
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/preferences.page:40
+msgid ""
+"Enabling this option means that <app>Meld</app> must fully read all non-"
+"binary files into memory during the folder comparison. With large text "
+"files, this can be slow and may cause memory issues."
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/preferences.page:44
+msgid ""
+"This option only has an effect if \"Compare files based only on size and "
+"timestamp\" is not enabled."
+msgstr ""
+
 #. (itstool) path: page/title
 #: C/file-changes.page:16
 msgid "Dealing with changes"
@@ -786,7 +830,7 @@ msgid ""
 "the thousands in the folder itself. For this reason, <app>Meld</app> "
 "includes a <em>flattened view</em> of a folder; only files that have not "
 "been filtered out (e.g., by <link xref=\"vc-mode#vc-state-filtering\"/>) are "
-"shown, and the folder heirarchy is stripped away, with file paths shown in "
+"shown, and the folder hierarchy is stripped away, with file paths shown in "
 "the <em>Location</em> column."
 msgstr ""
 
@@ -917,7 +961,7 @@ msgstr ""
 "Die Datei/der Ordner ist identisch mit der Version aus dem Softwarebestand."
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:109 C/folder-mode.page:150
+#: C/vc-mode.page:109
 msgid "Red and bold"
 msgstr "Rot und fett"
 
@@ -1015,8 +1059,8 @@ msgstr ""
 
 #. (itstool) path: td/p
 #: C/vc-mode.page:197
-msgid "Non VC"
-msgstr "Nicht unter VK"
+msgid "Unversioned"
+msgstr "Nicht versioniert"
 
 #. (itstool) path: td/p
 #: C/vc-mode.page:205
@@ -1053,8 +1097,8 @@ msgid ""
 "change which file states you see by using the <guiseq><gui style=\"menu"
 "\">View</gui><gui style=\"menuitem\">Version Status</gui></guiseq> menu, or "
 "by clicking the corresponding <gui style=\"button\">Modified</gui>, <gui "
-"style=\"button\">Normal</gui>, <gui style=\"button\">Non VC</gui> and <gui "
-"style=\"button\">Ignored</gui> buttons on the toolbar."
+"style=\"button\">Normal</gui>, <gui style=\"button\">Unversioned</gui> and "
+"<gui style=\"button\">Ignored</gui> buttons on the toolbar."
 msgstr ""
 
 #. (itstool) path: page/title
@@ -1209,9 +1253,9 @@ msgid "Find the next instance of the string."
 msgstr "Das nächste Vorkommen der Zeichenkette suchen."
 
 #. (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>↑</key></keyseq>"
+#: C/keyboard-shortcuts.page:90
+msgid "<keyseq><key>Alt</key><key>Down</key></keyseq>"
+msgstr "<keyseq><key>Alt</key><key>↓</key></keyseq>"
 
 #. (itstool) path: td/p
 #: C/keyboard-shortcuts.page:91
@@ -1222,6 +1266,11 @@ msgstr ""
 "Zum nächsten Unterschied springen. (Auch <keyseq><key>Strg</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>↑</key></keyseq>"
+
 #. (itstool) path: td/p
 #: C/keyboard-shortcuts.page:97
 msgid ""
@@ -1350,10 +1399,8 @@ msgstr ""
 
 #. (itstool) path: section/title
 #: C/folder-mode.page:63
-#, fuzzy
-#| msgid "Folder Comparison"
 msgid "Navigating folder comparisons"
-msgstr "Ordnervergleich"
+msgstr "Navigieren im Ordnervergleich"
 
 #. (itstool) path: section/p
 #: C/folder-mode.page:65
@@ -1376,10 +1423,8 @@ msgstr ""
 
 #. (itstool) path: section/title
 #: C/folder-mode.page:83
-#, fuzzy
-#| msgid "Start a new comparison."
 msgid "States in folder comparisons"
-msgstr "Startet einen neuen Vergleich."
+msgstr "Zustände im Ordnervergleich"
 
 #. (itstool) path: section/p
 #: C/folder-mode.page:85
@@ -1390,10 +1435,8 @@ msgstr ""
 
 #. (itstool) path: table/title
 #: C/folder-mode.page:106
-#, fuzzy
-#| msgid "Folder Comparison"
 msgid "Folder comparison states"
-msgstr "Ordnervergleich"
+msgstr "Ordnervergleichszustände"
 
 #. (itstool) path: td/p
 #: C/folder-mode.page:126
@@ -1417,6 +1460,11 @@ msgid ""
 "\">text filters</link> are applied, these files become identical."
 msgstr ""
 
+#. (itstool) path: td/p
+#: C/folder-mode.page:150
+msgid "Blue and bold"
+msgstr "Blau und fett"
+
 #. (itstool) path: td/p
 #: C/folder-mode.page:156
 msgid "These files differ between the folders being compared."
@@ -1454,8 +1502,8 @@ msgstr ""
 #: C/folder-mode.page:217
 msgid ""
 "You can filter out files based on these states, for example, to show only "
-"files that have are <em>Modified</em>. You can read more about this in <link "
-"xref=\"file-filters#file-state-filter\"/>."
+"files that have been <em>Modified</em>. You can read more about this in "
+"<link xref=\"file-filters#file-state-filter\"/>."
 msgstr ""
 
 #. (itstool) path: section/p
@@ -1569,3 +1617,6 @@ msgid "Run <cmd>meld --help</cmd> for a list of all command line options."
 msgstr ""
 "Um eine vollständige Liste von Optionen zu erhalten, rufen Sie <cmd>meld --"
 "help</cmd> auf."
+
+#~ msgid "Non VC"
+#~ msgstr "Nicht unter VK"

From 75ac53e659d2b084d3f1f1cf833cd79a119e6310 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sat, 5 Dec 2015 09:47:57 +1000
Subject: [PATCH 34/44] meld.desktop.in: Add translatable keywords for desktop
 file searching

---
 data/meld.desktop.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/data/meld.desktop.in b/data/meld.desktop.in
index 5b7d39f7..d0afc762 100644
--- a/data/meld.desktop.in
+++ b/data/meld.desktop.in
@@ -3,6 +3,8 @@ _Name=Meld
 _GenericName=Diff Viewer
 _X-GNOME-FullName=Meld Diff Viewer
 _Comment=Compare and merge your files
+# TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+_Keywords=diff;merge;
 Exec=meld %F
 Terminal=false
 Type=Application

From 26abcc407e777debe4e675d90bbcec5f5a2dd91d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Dr=C4=85g?= <piotrdrag@gmail.com>
Date: Sat, 16 Jan 2016 16:24:37 +0100
Subject: [PATCH 35/44] Updated Polish translation

---
 po/pl.po | 63 ++++++++++++++++++++++++++++++--------------------------
 1 file changed, 34 insertions(+), 29 deletions(-)

diff --git a/po/pl.po b/po/pl.po
index 08db031a..814abd4a 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,14 +5,14 @@
 # gnomepl@aviary.pl
 # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 # Marcin Floryan <mfloryan@mm.waw.pl>, 2011.
-# Piotr Drąg <piotrdrag@gmail.com>, 2011-2015.
-# Aviary.pl <gnomepl@aviary.pl>, 2011-2015.
+# Piotr Drąg <piotrdrag@gmail.com>, 2011-2016.
+# Aviary.pl <gnomepl@aviary.pl>, 2011-2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-26 20:24+0200\n"
-"PO-Revision-Date: 2015-09-26 20:25+0200\n"
+"POT-Creation-Date: 2016-01-16 16:22+0100\n"
+"PO-Revision-Date: 2016-01-16 16:23+0100\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <gnomepl@aviary.pl>\n"
 "Language: pl\n"
@@ -62,6 +62,11 @@ msgstr "Przeglądarka różnic Meld"
 msgid "Compare and merge your files"
 msgstr "Porównywanie i scalanie plików"
 
+#. 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 "różnica;diff;merge;scalanie;łączenie;połącz;porównaj;łata;łatka;patch;"
+
 #: ../data/meld.appdata.xml.in.h:1
 msgid ""
 "Meld is a visual diff and merge tool targeted at developers. Meld helps you "
@@ -498,8 +503,8 @@ msgstr "Witryna"
 msgid "translator-credits"
 msgstr ""
 "Marcin Floryan <mfloryan@mm.waw.pl>, 2011\n"
-"Piotr Drąg <piotrdrag@gmail.com>, 2011-2015\n"
-"Aviary.pl <gnomepl@aviary.pl>, 2011-2015"
+"Piotr Drąg <piotrdrag@gmail.com>, 2011-2016\n"
+"Aviary.pl <gnomepl@aviary.pl>, 2011-2016"
 
 #: ../data/ui/application.ui.h:6
 msgid "_Preferences"
@@ -920,7 +925,7 @@ msgstr "Sformatowanie jako poprawka"
 msgid "Copy to Clipboard"
 msgstr "Skopiuj do schowka"
 
-#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:119
+#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:125
 msgid "Save Patch"
 msgstr "Zapisz poprawkę"
 
@@ -1753,94 +1758,94 @@ msgstr "Skopiuj w gó_rę"
 msgid "Copy _down"
 msgstr "Skopiuj w _dół"
 
-#: ../meld/meldapp.py:175
+#: ../meld/meldapp.py:177
 msgid "wrong number of arguments supplied to --diff"
 msgstr "błędna liczba parametrów dla opcji --diff"
 
-#: ../meld/meldapp.py:180
+#: ../meld/meldapp.py:182
 msgid "Start with an empty window"
 msgstr "Rozpoczyna z pustym oknem"
 
-#: ../meld/meldapp.py:181 ../meld/meldapp.py:183
+#: ../meld/meldapp.py:183 ../meld/meldapp.py:185
 msgid "file"
 msgstr "plik"
 
-#: ../meld/meldapp.py:181 ../meld/meldapp.py:185
+#: ../meld/meldapp.py:183 ../meld/meldapp.py:187
 msgid "folder"
 msgstr "katalog"
 
-#: ../meld/meldapp.py:182
+#: ../meld/meldapp.py:184
 msgid "Start a version control comparison"
 msgstr "Rozpoczyna porównanie systemu kontroli wersji"
 
-#: ../meld/meldapp.py:184
+#: ../meld/meldapp.py:186
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Rozpoczyna porównanie 2 lub 3 plików"
 
-#: ../meld/meldapp.py:186
+#: ../meld/meldapp.py:188
 msgid "Start a 2- or 3-way folder comparison"
 msgstr "Rozpoczyna porównanie 2 lub 3 katalogów"
 
-#: ../meld/meldapp.py:229
+#: ../meld/meldapp.py:231
 #, python-format
 msgid "Error: %s\n"
 msgstr "Błąd: %s\n"
 
-#: ../meld/meldapp.py:236
+#: ../meld/meldapp.py:238
 msgid "Meld is a file and directory comparison tool."
 msgstr "Program Meld jest narzędziem do porównywania plików i katalogów."
 
-#: ../meld/meldapp.py:240
+#: ../meld/meldapp.py:242
 msgid "Set label to use instead of file name"
 msgstr "Ustawia etykietę, która ma być użyta zamiast nazwy pliku"
 
-#: ../meld/meldapp.py:243
+#: ../meld/meldapp.py:245
 msgid "Open a new tab in an already running instance"
 msgstr "Otwiera nową kartę w już uruchomionej kopii"
 
-#: ../meld/meldapp.py:246
+#: ../meld/meldapp.py:248
 msgid "Automatically compare all differing files on startup"
 msgstr ""
 "Automatycznie porównuje wszystkie różniące się pliki podczas uruchamiania"
 
-#: ../meld/meldapp.py:249
+#: ../meld/meldapp.py:251
 msgid "Ignored for compatibility"
 msgstr "Ignorowane — dla zachowania zgodności"
 
-#: ../meld/meldapp.py:253
+#: ../meld/meldapp.py:255
 msgid "Set the target file for saving a merge result"
 msgstr "Ustawia nazwę pliku, w którym zapisany zostanie wynik scalenia"
 
-#: ../meld/meldapp.py:256
+#: ../meld/meldapp.py:258
 msgid "Automatically merge files"
 msgstr "Automatycznie scala pliki"
 
-#: ../meld/meldapp.py:260
+#: ../meld/meldapp.py:262
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "Wczytuje zapisane porównanie z pliku porównania programu Meld"
 
-#: ../meld/meldapp.py:264
+#: ../meld/meldapp.py:266
 msgid "Create a diff tab for the supplied files or folders"
 msgstr "Tworzy kartę różnicy dla podanych plików lub katalogów"
 
-#: ../meld/meldapp.py:284
+#: ../meld/meldapp.py:286
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "za dużo parametrów (powinno być 0-3, jest %d)"
 
-#: ../meld/meldapp.py:287
+#: ../meld/meldapp.py:289
 msgid "can't auto-merge less than 3 files"
 msgstr "nie można automatycznie scalić mniej niż 3 plików"
 
-#: ../meld/meldapp.py:289
+#: ../meld/meldapp.py:291
 msgid "can't auto-merge directories"
 msgstr "nie można automatycznie scalić katalogów"
 
-#: ../meld/meldapp.py:303
+#: ../meld/meldapp.py:305
 msgid "Error reading saved comparison file"
 msgstr "Błąd podczas odczytywania zapisanego pliku porównania"
 
-#: ../meld/meldapp.py:330
+#: ../meld/meldapp.py:332
 #, python-format
 msgid "invalid path or URI \"%s\""
 msgstr "nieprawidłowa ścieżka lub adres URL „%s”"

From e0e2af71b438efc45b5dc064779805f2e5feff08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mario=20Bl=C3=A4ttermann?= <mario.blaettermann@gmail.com>
Date: Sun, 17 Jan 2016 20:20:22 +0100
Subject: [PATCH 36/44] Updated German translation

---
 po/de.po | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/po/de.po b/po/de.po
index f82e09dd..74d35d3b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,7 +4,7 @@
 # Hendrik Brandt <eru@gmx.li>, 2004.
 # Frank Arnold <frank@scirocco-5v-turbo.de>, 2005.
 # Hendrik Richter <hendrikr@gnome.org>, 2006.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2009-2012.
+# Mario Blättermann <mario.blaettermann@gmail.com>, 2009-2012, 2016.
 # Holger Wansing <linux@wansing-online.de>, 2010.
 # Benjamin Steinwender <b@stbe.at>, 2014.
 # Bernd Homuth <dev@hmt.im>, 2015.
@@ -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: 2015-12-22 13:31+0000\n"
-"PO-Revision-Date: 2015-12-22 17:42+0100\n"
-"Last-Translator: Bernd Homuth <dev@hmt.im>\n"
+"POT-Creation-Date: 2016-01-17 13:32+0000\n"
+"PO-Revision-Date: 2016-01-17 20:18+0100\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: Gtranslator 2.91.7\n"
+"X-Generator: Poedit 1.8.6\n"
 "X-Poedit-Bookmarks: -1,351,-1,-1,-1,-1,-1,-1,-1,-1\n"
 
 #: ../bin/meld:144
@@ -64,6 +64,11 @@ msgstr "Meld Diff-Betrachter"
 msgid "Compare and merge your files"
 msgstr "Vergleichen und Zusammenführen von Dateien"
 
+#. 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;zusammenführen;"
+
 #: ../data/meld.appdata.xml.in.h:1
 msgid ""
 "Meld is a visual diff and merge tool targeted at developers. Meld helps you "
@@ -648,8 +653,7 @@ msgid "Move _Down"
 msgstr "Hin_unter schieben"
 
 #. Create icon and filename CellRenderer
-#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:374
-#: ../meld/vcview.py:215
+#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:374 ../meld/vcview.py:215
 msgid "Name"
 msgstr "Name"
 
@@ -1573,12 +1577,10 @@ msgstr "[%s] Dateien werden gelesen"
 
 #: ../meld/filediff.py:1156
 #, python-format
-#| msgid "%s appears to be a binary file."
 msgid "File %s appears to be a binary file."
 msgstr "Datei %s scheint eine Binärdatei zu sein."
 
 #: ../meld/filediff.py:1157
-#| msgid "Open selected file or directory in the default external application"
 msgid "Do you want to open the file using the default application?"
 msgstr "Gewählte Datei in der vorgegebenen externen Anwendung öffnen?"
 

From 0a625d865c7ead30c9f111ef36a71340c43d23e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20=C4=8Cernock=C3=BD?= <marek@manet.cz>
Date: Sun, 31 Jan 2016 17:53:01 +0100
Subject: [PATCH 37/44] Udated Czech translation

---
 po/cs.po | 59 +++++++++++++++++++++++++++++++-------------------------
 1 file changed, 33 insertions(+), 26 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 280a4d49..520d6c0c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -4,15 +4,15 @@
 #
 # Miloslav Trmac <mitr@volny.cz>, 2003, 2004, 2005.
 # Petr Kovar <pknbe@volny.cz>, 2008, 2009, 2010, 2011.
-# Marek Černocký <marek@manet.cz>, 2011, 2012, 2013, 2014, 2015.
+# Marek Černocký <marek@manet.cz>, 2011, 2012, 2013, 2014, 2015, 2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: meld 3.14\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=meld&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-10-11 11:41+0000\n"
-"PO-Revision-Date: 2015-10-11 18:34+0200\n"
+"POT-Creation-Date: 2016-01-31 13:31+0000\n"
+"PO-Revision-Date: 2016-01-31 17:51+0100\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
 
 #: ../bin/meld:144
 msgid "Cannot import: "
@@ -60,6 +60,13 @@ msgstr "Prohlížeč rozdílů Meld"
 msgid "Compare and merge your files"
 msgstr "Porovnává a slučuje soubory"
 
+#. 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 ""
+"rozdíl;odlišnosti;diff;porovnání;porovnávání;srovnání;srovnávání;slučování;"
+"sloučení;"
+
 #: ../data/meld.appdata.xml.in.h:1
 msgid ""
 "Meld is a visual diff and merge tool targeted at developers. Meld helps you "
@@ -1739,93 +1746,93 @@ msgstr "Kopírovat nahor_u"
 msgid "Copy _down"
 msgstr "Kopírovat _dolů"
 
-#: ../meld/meldapp.py:175
+#: ../meld/meldapp.py:177
 msgid "wrong number of arguments supplied to --diff"
 msgstr "poskytnut nesprávný počet argumentů pro --diff"
 
-#: ../meld/meldapp.py:180
+#: ../meld/meldapp.py:182
 msgid "Start with an empty window"
 msgstr "Spustit s prázdným oknem"
 
-#: ../meld/meldapp.py:181 ../meld/meldapp.py:183
+#: ../meld/meldapp.py:183 ../meld/meldapp.py:185
 msgid "file"
 msgstr "soubor"
 
-#: ../meld/meldapp.py:181 ../meld/meldapp.py:185
+#: ../meld/meldapp.py:183 ../meld/meldapp.py:187
 msgid "folder"
 msgstr "složka"
 
-#: ../meld/meldapp.py:182
+#: ../meld/meldapp.py:184
 msgid "Start a version control comparison"
 msgstr "Spustit nové porovnání správy verzí"
 
-#: ../meld/meldapp.py:184
+#: ../meld/meldapp.py:186
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Spustit dvojcestné nebo trojcestné porovnání souborů"
 
-#: ../meld/meldapp.py:186
+#: ../meld/meldapp.py:188
 msgid "Start a 2- or 3-way folder comparison"
 msgstr "Spustit dvojcestné nebo trojcestné porovnání složek"
 
-#: ../meld/meldapp.py:229
+#: ../meld/meldapp.py:231
 #, python-format
 msgid "Error: %s\n"
 msgstr "Chyba: %s\n"
 
-#: ../meld/meldapp.py:236
+#: ../meld/meldapp.py:238
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld je nástroj porovnávající soubory a složky."
 
-#: ../meld/meldapp.py:240
+#: ../meld/meldapp.py:242
 msgid "Set label to use instead of file name"
 msgstr "Nastavit k použití popisek namísto názvu souboru"
 
-#: ../meld/meldapp.py:243
+#: ../meld/meldapp.py:245
 msgid "Open a new tab in an already running instance"
 msgstr "Otevřít novou kartu v již běžící instanci"
 
-#: ../meld/meldapp.py:246
+#: ../meld/meldapp.py:248
 msgid "Automatically compare all differing files on startup"
 msgstr "Automaticky při spuštění porovnat všechny lišící se soubory"
 
-#: ../meld/meldapp.py:249
+#: ../meld/meldapp.py:251
 msgid "Ignored for compatibility"
 msgstr "Ignorováno z důvodu kompatibility"
 
-#: ../meld/meldapp.py:253
+#: ../meld/meldapp.py:255
 msgid "Set the target file for saving a merge result"
 msgstr "Nastavit cílový soubor, do kterého se má uložit výsledek slučování"
 
-#: ../meld/meldapp.py:256
+#: ../meld/meldapp.py:258
 msgid "Automatically merge files"
 msgstr "Automaticky sloučit soubory"
 
-#: ../meld/meldapp.py:260
+#: ../meld/meldapp.py:262
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "Načíst uložené porovnání ze srovnávacího souboru Meld"
 
-#: ../meld/meldapp.py:264
+#: ../meld/meldapp.py:266
 msgid "Create a diff tab for the supplied files or folders"
 msgstr "Vytvořit kartu s rozdílem pro zadané soubory nebo složky"
 
-#: ../meld/meldapp.py:284
+#: ../meld/meldapp.py:286
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "příliš mnoho argumentů (požadováno 0 – 3, obdrženo %d)"
 
-#: ../meld/meldapp.py:287
+#: ../meld/meldapp.py:289
 msgid "can't auto-merge less than 3 files"
 msgstr "nelze automaticky sloučit méně než 3 soubory"
 
-#: ../meld/meldapp.py:289
+#: ../meld/meldapp.py:291
 msgid "can't auto-merge directories"
 msgstr "nelze automaticky sloučit složky"
 
-#: ../meld/meldapp.py:303
+#: ../meld/meldapp.py:305
 msgid "Error reading saved comparison file"
 msgstr "Chyba při čtení uloženého srovnávacího souboru"
 
-#: ../meld/meldapp.py:330
+#: ../meld/meldapp.py:332
 #, python-format
 msgid "invalid path or URI \"%s\""
 msgstr "neplatná cesta nebo adresa URI „%s“"

From 1d9d1d78d85d832cb2a1a5797043cb6df3be8730 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mario=20Bl=C3=A4ttermann?= <mario.blaettermann@gmail.com>
Date: Tue, 9 Feb 2016 09:33:23 +0100
Subject: [PATCH 38/44] Updated German doc translation

---
 help/de/de.po | 368 ++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 327 insertions(+), 41 deletions(-)

diff --git a/help/de/de.po b/help/de/de.po
index a44fd2c5..b3085ee9 100644
--- a/help/de/de.po
+++ b/help/de/de.po
@@ -1,16 +1,16 @@
-# German translation for meld.
+# German translation for the meld user manual.
 # Copyright (C) 2015 meld's COPYRIGHT HOLDER
 # This file is distributed under the same license as the meld package.
-# Mario Blättermann <mariobl@gnome.org>, 2009.
+# Mario Blättermann <mario.blaettermann@gmail.com>, 2009, 2016.
 # Benjamin Steinwender <b@stbe.at>, 2014-2015.
-# Christian Kirbach <Christian.Kirbach@gmail.com>, 2015.
+# Christian Kirbach <Christian.Kirbach@gmail.com>, 2015-2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: meld meld-3-12\n"
-"POT-Creation-Date: 2015-12-27 01:30+0000\n"
-"PO-Revision-Date: 2015-12-27 09:35+0100\n"
-"Last-Translator: Benjamin Steinwender <b@stbe.at>\n"
+"Project-Id-Version: meld meld-3-14\n"
+"POT-Creation-Date: 2016-02-08 13:28+0000\n"
+"PO-Revision-Date: 2016-02-08 23:12+0100\n"
+"Last-Translator: Christian Kirbach <christian.kirbach@gmail.com>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -23,9 +23,9 @@ msgstr ""
 msgctxt "_"
 msgid "translator-credits"
 msgstr ""
-"Mario Blättermann <mariobl@gnome.org>, 2009\n"
+"Mario Blättermann <mario.blaettermann@gmail.com>, 2009, 2016\n"
 "Benjamin Steinwender <b@stbe.at>, 2014-2015\n"
-"Christian Kirbach <christian.kirbach@gmail.com>, 2014"
+"Christian Kirbach <christian.kirbach@gmail.com>, 2014, 2016"
 
 #. (itstool) path: info/title
 #: C/vc-supported.page:5
@@ -125,7 +125,7 @@ msgid ""
 "href=\"https://bugzilla.gnome.org/\">GNOME bugzilla</link>."
 msgstr ""
 "Weniger gebräuchliche Versionskontrollsysteme oder unübliche Einstellungen "
-"sind eventuelle nicht ausgiebig getestet. Bitte berichten Sie Fehler in der "
+"sind eventuell nicht ausgiebig getestet. Bitte melden Sie Fehler in der "
 "Unterstützung der Versionskontrollsysteme im <link href=\"https://bugzilla."
 "gnome.org/\"> Bugzilla-Fehlererfassungssystem von GNOME </link>."
 
@@ -140,7 +140,7 @@ msgstr "2"
 #. (itstool) path: page/title
 #: C/file-filters.page:15
 msgid "Filtering out files"
-msgstr ""
+msgstr "Dateien filtern"
 
 #. (itstool) path: page/p
 #: C/file-filters.page:17
@@ -159,7 +159,6 @@ msgstr ""
 
 #. (itstool) path: page/p
 #: C/file-filters.page:25
-#, fuzzy
 msgid ""
 "<app>Meld</app> has several different ways of controlling which files and "
 "what kind of differences you see. You can filter based on <link xref=\"#file-"
@@ -174,8 +173,8 @@ msgstr ""
 "können Filter basierend auf <link xref=\"#file-state-filter\">Unterschiede "
 "einer Datei in verschiedenen Ordnern</link> oder <link xref=\"#file-name-"
 "filter\">Datei- und Ordnernamen</link> anwenden. Sie können <app>Meld</app> "
-"auch befehlen, bei Dateinamen die <link xref=\"#file-case-filter\">Groß-/"
-"Kleinschreibung zu ignorieren</link>. Zuletzt können Sie <link xref=\"text-"
+"auch anweisen, bei Dateinamen die <link xref=\"#file-case-filter\">Groß-/"
+"Kleinschreibung zu ignorieren</link>. Außerdem können Sie <link xref=\"text-"
 "filters\">Text-Filter</link> verwenden, um festzulegen welche Ordner und "
 "Dateien der Vergleich sieht."
 
@@ -187,11 +186,15 @@ msgid ""
 "identical after all of the text filters are applied are not highlighted as "
 "being different, but are shown in italics."
 msgstr ""
+"Alle definierten <link xref=\"text-filters\">Textfilter</link> werden beim "
+"Ordnervergleich <em>automatisch angewendet</em>. Dateien, die nach der "
+"Anwendung aller Textfilter noch immer identisch sind, werden nicht "
+"hervorgehoben, sondern in Kursivschrift angezeigt."
 
 #. (itstool) path: section/title
 #: C/file-filters.page:48
 msgid "File differences filtering"
-msgstr ""
+msgstr "Filtern von Dateiunterschieden"
 
 #. (itstool) path: section/p
 #: C/file-filters.page:50
@@ -201,6 +204,10 @@ msgid ""
 "is classified as being either <em>Modified</em>, <em>New</em> or <em>Same</"
 "em>:"
 msgstr ""
+"Im Ordnervergleich enthält jede Zeile eine einzelne Datei oder einen "
+"einzelnen Ordner, die oder der in mindestens einem der zu vergleichenden "
+"Ordner enthalten ist. Jede dieser Zeilen wird entweder als <em>Geändert</"
+"em>, <em>Neu</em> oder <em>Identisch</em> klassifiziert:"
 
 #. (itstool) path: item/title
 #. (itstool) path: td/p
@@ -246,6 +253,11 @@ msgid ""
 "<guiseq><gui style=\"menu\">View</gui><gui style=\"menuitem\">File Status</"
 "gui></guiseq> menu."
 msgstr ""
+"Mit den Werkzeugleistenknöpfen <gui style=\"button\">Identisch</gui>, <gui "
+"style=\"button\">Neu</gui> und <gui style=\"button\">Geändert</gui> oder "
+"über das Menü <guiseq><gui style=\"menu\">Ansicht</gui><gui style=\"menuitem"
+"\">Dateistatus</gui></guiseq> können Sie ändern, welche Arten von "
+"Unterschieden im aktuellen Vergleich angezeigt werden sollen."
 
 #. (itstool) path: note/p
 #: C/file-filters.page:80
@@ -255,6 +267,11 @@ msgid ""
 "all folders that contain only new files. A folder containing only \"New\" "
 "files would show up as empty, but still present."
 msgstr ""
+"Derzeit können Sie nur Dateien anhand des Status filtern, für Ordner ist das "
+"nicht möglich. Beispielsweise können Sie <app>Meld</app> nicht anweisen, "
+"alle Ordner zu ignorieren, die nur neue Dateien enthalten. Ein Ordner, der "
+"nur »neue« Dateien enthält, würde als leerer Ordner angezeigt, ist aber noch "
+"vorhanden."
 
 #. (itstool) path: section/title
 #: C/file-filters.page:94
@@ -271,6 +288,13 @@ msgid ""
 "gui> button on the toolbar or the <guiseq><gui style=\"menu\">View</gui><gui "
 "style=\"menuitem\">File Filters</gui></guiseq> menu."
 msgstr ""
+"<app>Meld</app> bietet eine Reihe von nützlichen Filtern für Dateinamen, mit "
+"denen Sie uninteressante Dateien und Ordner ausblenden können, zum Beispiel "
+"Sicherungsdateien und die Metadaten-Ordner in Versionskontrollsystemen. "
+"Jeder Dateinamen-Filter kann über den <gui style=\"button\">Filter</gui>-"
+"Knopf in der Werkzeugleiste oder im Menü <guiseq><gui style=\"menu"
+"\">Ansicht</gui><gui style=\"menuitem\">Dateifilter</gui></guiseq> separat "
+"aktiviert oder deaktiviert werden."
 
 #. (itstool) path: section/p
 #: C/file-filters.page:106
@@ -283,6 +307,14 @@ msgid ""
 "and folders; if a folder matches a filter, it and all of its contents are "
 "ignored."
 msgstr ""
+"Im Abschnitt <gui style=\"tab\">Dateifilter</gui> des Dialogs "
+"<gui>Einstellungen</gui> können Sie Filter für Dateinamen hinzufügen, "
+"entfernen oder ändern. Dateinamensfilter geben Muster für Dateinamen vor, "
+"nach denen bei einem Ordnervergleich <em>nicht</em> gesucht werden soll. "
+"Jede Datei, auf die ein aktiver Filter passt, wird im Baumvergleich nicht "
+"angezeigt. Dateinamensfilter werden sowohl auf Dateien als auch auf Ordner "
+"angewendet. Wenn ein Ordner auf einen Filter passt, wird er und sein Inhalt "
+"ignoriert."
 
 #. (itstool) path: section/p
 #: C/file-filters.page:116
@@ -292,11 +324,15 @@ msgid ""
 "following table lists all of the shell glob characters that <app>Meld</app> "
 "recognises."
 msgstr ""
+"Dateinamen werden anhand von Shell-Platzhaltern gefiltert. Beispielsweise "
+"berücksichtigt <code>*.jpg</code> alle Dateinamen mit der Endung <code>.jpg</"
+"code>. In der folgenden Tabelle sind alle Platzhalterzeichen aufgelistet, "
+"die <app>Meld</app> erkennt."
 
 #. (itstool) path: table/title
 #: C/file-filters.page:124
 msgid "Shell glob patterns"
-msgstr ""
+msgstr "Shell-Platzhalter"
 
 #. (itstool) path: td/p
 #: C/file-filters.page:128
@@ -364,6 +400,9 @@ msgid ""
 "Changing a filter's <gui>Active</gui> setting in the <gui>Preferences</gui> "
 "dialog changes whether that filter is active <em>by default</em>."
 msgstr ""
+"Wenn Sie für einen Filter die Einstellung <gui>Aktiv</gui> im Dialog "
+"<gui>Einstellungen</gui> ändern, dann wird dieser <em>standardmäßig</em> "
+"aktiviert."
 
 #. (itstool) path: note/p
 #: C/file-filters.page:163
@@ -371,6 +410,8 @@ msgid ""
 "Activating a filter from the menu or the toolbar turns the filter on or off "
 "for <em>this comparison only</em>."
 msgstr ""
+"Die Aktivierung eines Filters über das Menü oder die Werkzeugleiste schaltet "
+"den Filter <em>nur für diesen Vergleich</em> ein oder aus."
 
 #. (itstool) path: section/title
 #: C/file-filters.page:174
@@ -385,6 +426,10 @@ msgid ""
 "file>, <file>readme</file> and <file>ReadMe</file> would all be seen as "
 "different files."
 msgstr ""
+"Bei Ordnervergleichen werden Dateien anhand deren Namen verglichen. Dabei "
+"wird in der Voreinstellung Groß- oder Kleinschreibung beachtet. Das "
+"bedeutet, dass <file>README</file>, <file>readme</file> und <file>ReadMe</"
+"file> als unterschiedliche Dateien angesehen werden."
 
 #. (itstool) path: section/p
 #: C/file-filters.page:183
@@ -394,13 +439,16 @@ msgid ""
 "by selecting <guiseq><gui style=\"menu\">View</gui><gui style=\"menuitem"
 "\">Ignore filename case</gui></guiseq> from the menus."
 msgstr ""
+"Bei Ordnervergleichen auf bestimmten Dateisystemen (zum Beispiel HFS+ oder "
+"FAT) kann es sinnvoll sein, wenn <app>Meld</app> bei Dateinamen die Groß- "
+"oder Kleinschreibung nicht beachtet. Wählen Sie hierzu <guiseq><gui style="
+"\"menu\">Ansicht</gui><gui style=\"menuitem\">Groß-/Kleinschreibung in "
+"Dateinamen ignorieren</gui></guiseq>."
 
 #. (itstool) path: page/title
 #: C/text-filters.page:17
-#, fuzzy
-#| msgid "Filtering"
 msgid "Filtering out text"
-msgstr "Filterung"
+msgstr "Filterung von Text"
 
 #. (itstool) path: page/p
 #: C/text-filters.page:19
@@ -411,6 +459,13 @@ msgid ""
 "filters you can tell <app>Meld</app> to ignore text that matches a pattern "
 "(i.e., a regular expression) when showing differences between files."
 msgstr ""
+"Beim Vergleichen mehrerer Dateien gibt es Textabschnitte, in denen "
+"Unterschiede nicht wirklich von Bedeutung sind. Beispielsweise wollen Sie "
+"sich auf Änderungen in Code-Abschnitten konzentrieren, aber Änderungen in "
+"Kommentarzeilen außer Acht lassen. Mit Textfiltern können Sie <app>Meld</"
+"app> anweisen, bei der Anzeige der Unterschiede zwischen Dateien Text zu "
+"ignorieren, der einem Muster entspricht (zum Beispiel einem regulären "
+"Ausdruck)."
 
 #. (itstool) path: note/p
 #: C/text-filters.page:28
@@ -419,11 +474,14 @@ msgid ""
 "comparisons. Check the <link xref=\"file-filters\">file filtering notes</"
 "link> for more details."
 msgstr ""
+"Textfilter wirken sich nicht nur auf Dateivergleiche, sondern auch auf "
+"Ordnervergleiche aus. Details hierzu finden Sie in den <link xref=\"file-"
+"filters\">Hinweisen zur Dateifilterung</link>."
 
 #. (itstool) path: section/title
 #: C/text-filters.page:37
 msgid "Adding and using text filters"
-msgstr ""
+msgstr "Hinzufügen und Verwenden von Textfiltern"
 
 #. (itstool) path: section/p
 #: C/text-filters.page:39
@@ -432,6 +490,10 @@ msgid ""
 "in <gui>Preferences</gui> dialog. <app>Meld</app> comes with a few simple "
 "filters that you might find useful, but you can add your own as well."
 msgstr ""
+"Textfilter lassen sich im Reiter <gui>Textfilter</gui> im Dialog "
+"<gui>Einstellungen</gui> ein- oder ausschalten. <app>Meld</app> bietet "
+"einige simple Filter, die Sie nützlich finden könnten, aber Sie können auch "
+"eigene Filter hinzufügen."
 
 #. (itstool) path: section/p
 #: C/text-filters.page:45
@@ -443,6 +505,13 @@ msgid ""
 "filters are applied in order, so it's possible for the first filter to "
 "remove text that now makes the second filter match, and so on."
 msgstr ""
+"In <app>Meld</app> sind Textfilter reguläre Ausdrücke, die auf den Text der "
+"zu vergleichenden Dateien angewendet werden. Jeder passende Text wird "
+"während des Vergleichs ignoriert. Sie sehen ihn immer noch in der "
+"Vergleichsansicht, aber er wird nicht zum Finden von Unterschieden "
+"herangezogen. Textfilter werden der Reihe nach angewendet, daher ist es "
+"möglich, dass der erste Filter Text entfernt, der vom zweiten Filter als "
+"Treffer angesehen wird usw."
 
 #. (itstool) path: note/p
 #: C/text-filters.page:55
@@ -451,11 +520,14 @@ msgid ""
 "the Python <link href=\"http://docs.python.org/howto/regex.html\">Regular "
 "Expression HOWTO</link>."
 msgstr ""
+"Wenn Sie mit regulären Ausdrücken nicht vertraut sind, sollten Sie sich das "
+"<link href=\"http://docs.python.org/howto/regex.html\">Python Regular "
+"Expression HOWTO</link> anschauen."
 
 #. (itstool) path: section/title
 #: C/text-filters.page:67
 msgid "Getting text filters right"
-msgstr ""
+msgstr "Richtige Filterung von Text"
 
 #. (itstool) path: section/p
 #: C/text-filters.page:69
@@ -465,6 +537,10 @@ msgid ""
 "lines in a file. For example, if we had the built-in <gui>Script comment</"
 "gui> filter enabled, and compared the following files:"
 msgstr ""
+"Es ist leicht, Text falsch zu filtern, und die Filterunterstützung in Meld "
+"ist unvollständig. Insbesondere kann ein Textfilter die Zeilenanzahl in "
+"einer Datei nicht ändern. Nehmen wir an, der eingebaute <gui>Script comment</"
+"gui>-Filter ist aktiviert, und wir vergleichen die folgenden Dateien:"
 
 #. (itstool) path: listing/title
 #: C/text-filters.page:80
@@ -518,11 +594,18 @@ msgid ""
 "itself can not be removed; <app>Meld</app> will show the <code>d</code> line "
 "as being different to what it sees as a blank line on the other side."
 msgstr ""
+"Dann würden die mit <code>b</code> beginnenden Zeilen als identisch "
+"aufgefasst (der Kommentar wird herausgefiltert), aber die mit <code>d</code> "
+"beginnende Zeile wird als Unterschied zur Kommentarzeile rechts angezeigt. "
+"Das passiert, weil <code>#comment</code> rechts entfernt wird, aber die "
+"Zeile selbst nicht entfernt werden kann. <app>Meld</app> zeigt die <code>d</"
+"code>-Zeile als Unterschied zu dem an, was auf der rechten Seite sieht, "
+"nämlich einer leeren Zeile."
 
 #. (itstool) path: section/title
 #: C/text-filters.page:114
 msgid "Blank lines and filters"
-msgstr ""
+msgstr "Leerzeilen und Filter"
 
 #. (itstool) path: section/p
 #: C/text-filters.page:116
@@ -534,6 +617,13 @@ msgid ""
 "change in the text, but it may also arise if your active text filters have "
 "removed all of the other content from a change, leaving only blank lines."
 msgstr ""
+"Die Option <gui>Ignorieren von Änderungen, durch die Leerzeichen hinzugefügt "
+"oder entfernt werden</gui> im Reiter <gui>Textfilter</gui> bedarf weiterer "
+"Erklärung. Wenn dieser spezielle Filter aktiviert ist, dann wird jede "
+"Änderung vollständig ignoriert, die nur aus Leerzeilen besteht. Das kann "
+"vorkommen, wenn im Text tatsächlich Leerzeichen geändert wurden, oder wenn "
+"Ihr aktiver Textfilter alle anderen Änderungen aus Ihrem Text entfernt und "
+"dabei nur Leerzeilen hinterlassen hat."
 
 #. (itstool) path: section/p
 #: C/text-filters.page:125
@@ -542,6 +632,9 @@ msgid ""
 "problems\">problems and limitations</link> resulting from filters not being "
 "able to remove whole lines, but it can also be useful in and of itself."
 msgstr ""
+"Sie können mit dieser Option einige der <link xref=\"#text-filter-problems"
+"\">Probleme und Einschränkungen</link> von Textfiltern umgehen, bei denen "
+"Filter ganze Zeilen nicht entfernen können."
 
 #. (itstool) path: page/title
 #: C/resolving-conflicts.page:15
@@ -554,6 +647,8 @@ msgid ""
 "One of the best uses of <app>Meld</app> is to resolve conflicts that occur "
 "while merging different branches."
 msgstr ""
+"Einer der besten Anwendungsfälle von <app>Meld</app> ist die Auflösung von "
+"Konflikten, die beim Zusammenführen verschiedener Zweige entstehen."
 
 #. (itstool) path: page/p
 #: C/resolving-conflicts.page:22
@@ -562,6 +657,10 @@ msgid ""
 "a 'merge helper'; <app>Meld</app> is one such helper. If you want to make "
 "<app>git mergetool</app> use <app>Meld</app> by default, you can add"
 msgstr ""
+"Wenn Sie beispielsweise <app>Git</app> verwenden, dann startet <cmd>git "
+"mergetool</cmd> einen sogenannten »merge helper«. <app>Meld</app> ist ein "
+"solches Hilfsprogramm. Wenn Sie wollen, dass <app>git mergetool</app> "
+"standardmäßig <app>Meld</app> verwendet, können Sie "
 
 #. (itstool) path: page/code
 #: C/resolving-conflicts.page:27
@@ -581,6 +680,8 @@ msgid ""
 "to <file>.git/gitconfig</file>. See the <app>git mergetool</app> manual for "
 "details."
 msgstr ""
+"zur Datei <file>.git/gitconfig</file> hinzufügen. In der Handbuchseite zu "
+"<app>git mergetool</app> finden Sie Details dazu."
 
 #. (itstool) path: info/title
 #: C/preferences.page:5 C/file-mode.page:5 C/introduction.page:5
@@ -597,17 +698,17 @@ msgstr "2013"
 #. (itstool) path: page/title
 #: C/preferences.page:15
 msgid "Meld's preferences"
-msgstr ""
+msgstr "Einstellungen von Meld"
 
 #. (itstool) path: terms/title
 #: C/preferences.page:18
 msgid "Editor preferences"
-msgstr ""
+msgstr "Editor-Einstellungen"
 
 #. (itstool) path: item/title
 #: C/preferences.page:20
 msgid "Editor command"
-msgstr ""
+msgstr "Editor-Befehl"
 
 #. (itstool) path: item/p
 #: C/preferences.page:21
@@ -619,6 +720,13 @@ msgid ""
 "which case <app>Meld</app> will substitute the file path and current line "
 "number respectively (e.g., <cmd>gedit {file}:{line}</cmd>)."
 msgstr ""
+"Dies ist der Name des Befehls, der zum Öffnen von Textdateien in einem "
+"externen Editor verwendet wird. Es kann einfach ein Befehl sein (zum "
+"Beispiel <cmd>gedit</cmd>), wobei in diesem Fall die Datei als letztes "
+"Argument übergeben wird. Alternativ können Sie zum Befehl <code>{file}</"
+"code>- und <code>{line}</code>-Elemente hinzufügen. Dann ersetzt <app>Meld</"
+"app> den Dateipfad beziehungsweise die aktuelle Zeilennummer (zum Beispiel "
+"<cmd>gedit {file}:{line}</cmd>)."
 
 #. (itstool) path: terms/title
 #: C/preferences.page:31
@@ -639,6 +747,11 @@ msgid ""
 "line trimming option will be applied as appropriate, and differences in line "
 "endings will be ignored."
 msgstr ""
+"Beim Vergleichen von Dateien im Ordnervergleich-Modus können Textfilter und "
+"andere Optionen zur Textmanipulation auf die Inhalte von Dateien angewendet "
+"werden. Wenn diese Option aktiviert ist, werden alle aktuell aktivierten "
+"Textfilter angewendet, die Option zum Entfernen von Leerzeilen bei Bedarf "
+"angewendet und alle Unterschiede in Zeilenenden ignoriert."
 
 #. (itstool) path: item/p
 #: C/preferences.page:40
@@ -647,6 +760,10 @@ msgid ""
 "binary files into memory during the folder comparison. With large text "
 "files, this can be slow and may cause memory issues."
 msgstr ""
+"Aktivieren dieser Option bedeutet, dass <app>Meld</app> alle nicht-binären "
+"Dateien während des Ordnervergleichs vollständig in den Speicher einlesen "
+"muss. Bei großen Textdateien kann dies Geschwindigkeitseinbußen und "
+"Speicherprobleme verursachen."
 
 #. (itstool) path: item/p
 #: C/preferences.page:44
@@ -654,11 +771,13 @@ msgid ""
 "This option only has an effect if \"Compare files based only on size and "
 "timestamp\" is not enabled."
 msgstr ""
+"Diese Option ist nur wirksam, wenn <gui>Dateien nur anhand Größe und "
+"Änderungszeit vergleichen</gui> nicht aktiviert ist."
 
 #. (itstool) path: page/title
 #: C/file-changes.page:16
 msgid "Dealing with changes"
-msgstr ""
+msgstr "Umgang mit Änderungen"
 
 #. (itstool) path: page/p
 #: C/file-changes.page:18
@@ -670,11 +789,18 @@ msgid ""
 "these changes and to edit them. You can find these tools in the <gui style="
 "\"menu\">Changes</gui> menu."
 msgstr ""
+"<app>Meld</app> behandelt Dateiunterschiede als Liste von "
+"<em>Änderungsblöcken</em> oder einfach <em>Änderungen</em>. Jede dieser "
+"Änderungen ist eine Zeilengruppe, die innerhalb der Dateien korrespondiert. "
+"Da genau diese Änderungen normalerweise für Sie von Bedeutung sind, stellt "
+"Ihnen <app>Meld</app> spezifische Werkzeuge zur Verfügung, um zwischen "
+"diesen Änderungen zu navigieren und sie zu bearbeiten. Sie finden diese "
+"Werkzeuge im Menü <gui style=\"menu\">Änderungen</gui>."
 
 #. (itstool) path: section/title
 #: C/file-changes.page:30
 msgid "Navigating between changes"
-msgstr ""
+msgstr "Navigieren zwischen Änderungen"
 
 #. (itstool) path: section/p
 #: C/file-changes.page:32
@@ -685,11 +811,17 @@ msgid ""
 "change</gui></guiseq> menu items. You can also use your mouse's scroll wheel "
 "to move between changes, by scrolling on the central change bar."
 msgstr ""
+"Über die Menüeinträge guiseq><gui style=\"menu\">Änderungen</gui><gui style="
+"\"menuitem\">Vorherige Änderung</gui></guiseq> und <guiseq><gui style=\"menu"
+"\">Änderungen</gui><gui style=\"menuitem\">Nächste Änderung</gui></guiseq> "
+"können Sie zwischen den Änderungen navigieren. Auch mit dem Mausrad können "
+"Sie zwischen den Änderungen wechseln, wenn sich der Zeiger über der "
+"mittleren Leiste befindet."
 
 #. (itstool) path: section/title
 #: C/file-changes.page:46
 msgid "Changing changes"
-msgstr ""
+msgstr "Bearbeiten von Änderungen"
 
 #. (itstool) path: section/p
 #: C/file-changes.page:48
@@ -700,6 +832,13 @@ msgid ""
 "but also lets you selectively merge or delete differing changes by clicking "
 "the arrow or cross icons next to the start of each change."
 msgstr ""
+"Neben der direkten Bearbeitung von Textdateien bietet <app>Meld</app> auch "
+"Werkzeuge zum Verschieben, Kopieren oder Löschen individueller Unterschiede "
+"zwischen Dateien. Die Leiste zwischen zwei Dateien zeigt nicht nur an, "
+"welche Teile der beiden Dateien miteinander korrespondieren, sondern "
+"ermöglicht auch das selektive Zusammenführen oder Löschen sich "
+"unterscheidender Änderungen, indem Sie auf die Pfeil- oder Kreuzsymbole "
+"neben dem Beginn jeder Änderung klicken."
 
 #. (itstool) path: section/p
 #: C/file-changes.page:52
@@ -707,6 +846,8 @@ msgid ""
 "The default action is <em>replace</em>. This action replaces the contents of "
 "the corresponding change with the current change."
 msgstr ""
+"Die vorgegebene Aktion ist <em>Ersetzen</em>. Damit wird der Inhalt der "
+"korrespondierenden Änderung durch die aktuelle Änderung ersetzt."
 
 #. (itstool) path: section/p
 #: C/file-changes.page:59
@@ -714,6 +855,8 @@ msgid ""
 "Hold down the <key>Shift</key> key to change the current action to "
 "<em>delete</em>. This action deletes the current change."
 msgstr ""
+"Halten Sie die <key>Umschalttaste</key> gedrückt, wird die Änderung nicht "
+"ersetzt, sondern <em>gelöscht</em>."
 
 #. (itstool) path: section/p
 #: C/file-changes.page:62
@@ -722,11 +865,15 @@ msgid ""
 "<em>insert</em>. This action inserts the current change above or below (as "
 "selected) the corresponding change."
 msgstr ""
+"Halten Sie die <key>Strg</key>-Taste gedrückt, wird die Änderung nicht "
+"ersetzt, sondern <em>eingefügt</em>. Dadurch wird die aktuelle Änderung "
+"oberhalb oder unterhalb der korrespondierenden Änderung eingefügt (je nach "
+"Auswahl)."
 
 #. (itstool) path: page/title
 #: C/file-mode.page:17
 msgid "Getting started comparing files"
-msgstr ""
+msgstr "Erste Schritte beim Vergleichen von Dateien"
 
 #. (itstool) path: page/p
 #: C/file-mode.page:19
@@ -735,6 +882,9 @@ msgid ""
 "can start a new file comparison by selecting the <guiseq><gui style=\"menu"
 "\">File</gui><gui style=\"menuitem\">New...</gui></guiseq> menu item."
 msgstr ""
+"Mit <app>Meld</app> können Sie zwei oder drei Textdateien nebeneinander "
+"vergleichen. Einen neuen Dateivergleich starten Sie im Menü mit <guiseq><gui "
+"style=\"menu\">Datei</gui><gui style=\"menuitem\">Neu …</gui></guiseq>."
 
 #. (itstool) path: page/p
 #: C/file-mode.page:26
@@ -745,11 +895,17 @@ msgid ""
 "on-the-fly. For details on navigating between individual changes, and on how "
 "to use change-based editing, see <link xref=\"file-changes\"/>."
 msgstr ""
+"Nach dem Auswählen der Dateien zeigt <app>Meld</app> diese nebeneinander an. "
+"Unterschiede zwischen den Dateien werden hervorgehoben, um einzelne "
+"Änderungen besser sichtbar zu machen. Wenn Sie die Dateien bearbeiten, "
+"werden diese in der Vergleichsansicht unmittelbar aktualisiert. Details zum "
+"Navigieren zwischen den einzelnen Änderungen und zur änderungsbasierten "
+"Bearbeitung finden Sie in <link xref=\"file-changes\"/>."
 
 #. (itstool) path: section/title
 #: C/file-mode.page:35
 msgid "<app>Meld</app>'s file comparisons"
-msgstr ""
+msgstr "Dateivergleiche in <app>Meld</app>"
 
 #. (itstool) path: section/p
 #: C/file-mode.page:37
@@ -759,6 +915,11 @@ msgid ""
 "the areas around and between your files give you a visual overview and "
 "actions to help you handle changes between the files."
 msgstr ""
+"Ein Dateivergleich hat mehrere verschiedene Teile. Die wichtigsten Teile "
+"sind die Editoren, in denen Ihre Dateien angezeigt werden. Neben diesen "
+"Editoren vermitteln Ihnen die Bereiche um die und zwischen den Dateien einen "
+"visuellen Überblick und stellen Aktionen bereit, die Ihnen dabei helfen, die "
+"Änderungen zwischen den Dateien zu behandeln."
 
 #. (itstool) path: section/p
 #: C/file-mode.page:43
@@ -769,6 +930,12 @@ msgid ""
 "block represents a section that is inserted, deleted, changed or in conflict "
 "between your files, depending on the block's colour used."
 msgstr ""
+"An der rechten und linken Seite des Fensters finden Sie zwei senkrechte "
+"Leisten, die verschiedenfarbige Blöcke anzeigen. Über diese Leisten erhalten "
+"Sie einen Überblick über die Unterschiede zwischen den zwei Dateien. Jeder "
+"Block bezeichnet anhand seiner Farbe einen Abschnitt, der eingefügt, "
+"gelöscht oder geändert wurde oder anderweitig einen Konflikt zwischen den "
+"Dateien darstellt."
 
 #. (itstool) path: section/p
 #: C/file-mode.page:50
@@ -780,11 +947,17 @@ msgid ""
 "can do with individual change segments, see <link xref=\"file-changes#change-"
 "actions\"/>."
 msgstr ""
+"Zwischen jedem Dateipaar befindet sich eine Leiste, in der angezeigt wird, "
+"wie die geänderten Teile Ihrer Dateien miteinander korrespondieren. Klicken "
+"Sie auf die Pfeile in einem Segment, um die Abschnitte einer Datei gegen die "
+"der anderen Datei auszutauschen. Sie können Änderungen auch löschen, "
+"kopieren oder zusammenführen. Weitere Informationen hierzu finden Sie in "
+"<link xref=\"file-changes#change-actions\"/>."
 
 #. (itstool) path: section/title
 #: C/file-mode.page:62
 msgid "Saving your changes"
-msgstr ""
+msgstr "Speichern der Änderungen"
 
 #. (itstool) path: section/p
 #: C/file-mode.page:64
@@ -792,6 +965,8 @@ msgid ""
 "Once you've finished editing your files, you need to save each file you've "
 "changed."
 msgstr ""
+"Wenn Sie mit dem Bearbeiten der Dateien fertig sind, müssen Sie die von "
+"Ihnen geänderten Dateien speichern."
 
 #. (itstool) path: section/p
 #: C/file-mode.page:68
@@ -801,6 +976,10 @@ msgid ""
 "notebook label will show an asterisk (<code>*</code>) after any file that "
 "hasn't been saved."
 msgstr ""
+"Sie können anhand des Speichern-Symbols neben dem Dateinamen erkennen, ob "
+"Ihre Dateien seit der letzten Änderung gespeichert wurden. Die "
+"Reiterbeschriftung zeigt außerdem einen Asterisk (<code>*</code>) nach jeder "
+"Datei an, die noch nicht gespeichert wurde."
 
 #. (itstool) path: section/p
 #: C/file-mode.page:74
@@ -809,6 +988,9 @@ msgid ""
 "\">File</gui><gui style=\"menuitem\">Save</gui></guiseq> menu item, or using "
 "the <keyseq><key>Ctrl</key><key>S</key></keyseq> keyboard shortcut."
 msgstr ""
+"Die aktuelle Datei speichern Sie im Menü mit <guiseq><gui style=\"menu"
+"\">Datei</gui><gui style=\"menuitem\">Speichern</gui></guiseq> oder durch "
+"Drücken von <keyseq><key>Strg</key><key>S</key></keyseq>."
 
 #. (itstool) path: note/p
 #: C/file-mode.page:81
@@ -817,11 +999,15 @@ msgid ""
 "containing the cursor. If you can't tell which file is focussed, you can "
 "click on the file to focus it before saving."
 msgstr ""
+"Es wird nur die <em>aktuell fokussierte</em> Datei gespeichert, also die "
+"Datei mit der Eingabemarke. Wenn Sie nicht erkennen können, welche Datei "
+"fokussiert ist, klicken Sie auf die gewünschte Datei, bevor Sie sie "
+"speichern."
 
 #. (itstool) path: page/title
 #: C/flattened-view.page:15
 msgid "Flattened view"
-msgstr ""
+msgstr "Eingeklappte Ansicht"
 
 #. (itstool) path: page/p
 #: C/flattened-view.page:17
@@ -833,6 +1019,13 @@ msgid ""
 "shown, and the folder hierarchy is stripped away, with file paths shown in "
 "the <em>Location</em> column."
 msgstr ""
+"Beim Betrachten großer Ordner kommt es oft vor, dass unter vielleicht "
+"Tausenden von Dateien nur wenige für Sie wirklich von Bedeutung sind. Aus "
+"diesem Grund ist in <app>Meld</app> eine <em>eingeklappte Ansicht</em> eines "
+"Ordners möglich. Es werden dann nur Dateien angezeigt, die nicht gefiltert "
+"wurden (zum Beispiel durch <link xref=\"vc-mode#vc-state-filtering\"/>) und "
+"die Ordnerhierarchie wird ausgeblendet und die Dateipfade in der Spalte "
+"<em>Ort</em> angezeigt."
 
 #. (itstool) path: page/p
 #: C/flattened-view.page:27
@@ -842,6 +1035,10 @@ msgid ""
 "item, or by clicking the corresponding <gui style=\"button\">Flatten</gui> "
 "button on the toolbar."
 msgstr ""
+"Über das Menü <guiseq><gui style=\"menu\">Ansicht</gui><gui style=\"menuitem"
+"\">Einklappen</gui></guiseq> oder durch Anklicken des entsprechenden <gui "
+"style=\"button\">Einklappen</gui>-Knopfs in der Werkzeugleiste kann die "
+"eingeklappte Ansicht ein- oder ausgeschaltet werden."
 
 #. (itstool) path: page/title
 #: C/index.page:14
@@ -894,6 +1091,12 @@ msgid ""
 "\">New...</gui></guiseq> menu item, and clicking on the <gui style=\"tab"
 "\">Version Control</gui> tab."
 msgstr ""
+"<app>Meld</app> arbeitet mit zahlreichen <link xref=\"vc-supported"
+"\">Versionskontrollsystemen</link> zusammen. Sie können lokale Änderungen "
+"betrachten und einfache Verwaltungsaufgaben ausführen. Einen neuen "
+"Versionskontrollvergleich starten Sie über <guiseq><gui style=\"menu"
+"\">Datei</gui><gui style=\"menuitem\">Neu …</gui></guiseq> und klicken auf "
+"den Reiter <gui style=\"tab\">Versionskontrolle</gui>."
 
 #. (itstool) path: section/title
 #: C/vc-mode.page:30
@@ -908,6 +1111,11 @@ msgid ""
 "has a <link xref=\"#vc-state\">state</link> that indicates how it differs "
 "from the repository copy."
 msgstr ""
+"Versionskontroll-Vergleiche zeigen die Unterschiede zwischen den Inhalt "
+"Ihres Ordners und der aktuellen Version im Softwarebestand (Repository). "
+"Jede Datei in Ihrer lokalen Kopie hat einen <link xref=\"#vc-Status\">state</"
+"link>, der besagt, wie sie sich von der Version im Softwarebestand "
+"unterscheidet."
 
 #. (itstool) path: section/p
 #: C/vc-mode.page:46
@@ -917,12 +1125,18 @@ msgid ""
 "\"file-mode\">file comparison</link>. You can also interact with your "
 "version control system using the <gui style=\"menu\">Changes</gui> menu."
 msgstr ""
+"Wenn Sie die Unterschiede nur für eine bestimmte Datei betrachten wollen, "
+"wählen Sie sie aus und drücken Sie die <key>Eingabtaste</key> oder klicken "
+"Sie doppelt auf eine Datei, um einen <link xref=\"file-mode"
+"\">Dateivergleich</link> zu starten. Über das Menü <gui style=\"menu"
+"\">Änderungen</gui> können Sie auch mit Ihrem Versionskontrollsystem "
+"interagieren."
 
 #. (itstool) path: section/title
 #. (itstool) path: table/title
 #: C/vc-mode.page:56 C/vc-mode.page:81
 msgid "Version control states"
-msgstr ""
+msgstr "Status in Versionskontrollsystemen"
 
 #. (itstool) path: section/p
 #: C/vc-mode.page:58
@@ -933,11 +1147,17 @@ msgid ""
 "<app>Meld</app> might use slightly different names for states than your "
 "version control system does. The possible states are:"
 msgstr ""
+"Jede Datei und jeder Ordner in einem Versionskontrollvergleich hat einen "
+"<em>Status</em>, der vom Versionskontrollsystem selbst definiert wird. "
+"<app>Meld</app> bildet diese verschiedenen Zustände auf einen Standardsatz "
+"sehr einfacher Konzepte ab. Als solches kann <app>Meld</app> etwas andere "
+"Bezeichnungen für die Zustände verwenden als die eigentliche "
+"Versionskontrolle. Mögliche Status sind:"
 
 #. (itstool) path: td/p
 #: C/vc-mode.page:85 C/folder-mode.page:110
 msgid "State"
-msgstr "Zustand"
+msgstr "Status"
 
 #. (itstool) path: td/p
 #: C/vc-mode.page:86 C/folder-mode.page:111
@@ -1087,7 +1307,7 @@ msgstr "Das Versionskontrollsystem hat ein Problem zu dieser Datei gemeldet."
 #. (itstool) path: section/title
 #: C/vc-mode.page:230
 msgid "Version control state filtering"
-msgstr ""
+msgstr "Filterung des Versionskontroll-Status"
 
 #. (itstool) path: section/p
 #: C/vc-mode.page:232
@@ -1100,6 +1320,14 @@ msgid ""
 "style=\"button\">Normal</gui>, <gui style=\"button\">Unversioned</gui> and "
 "<gui style=\"button\">Ignored</gui> buttons on the toolbar."
 msgstr ""
+"Meist werden Sie nur die Dateien sehen wollen, die als unterschiedlich "
+"erkannt wurden. Dies ist die Voreinstellung in <app>Meld</app>. Sie können "
+"ändern, welche Dateistatus Sie sehen wollen. Verwenden Sie hierzu das Menü "
+"<guiseq><gui style=\"menu\">Ansicht</gui><gui style=\"menuitem"
+"\">Versionsstatus</gui></guiseq> oder klicken Sie doppelt auf einen der "
+"Knöpfe <gui style=\"button\">Geändert</gui>, <gui style=\"button\">Normal</"
+"gui>, <gui style=\"button\">Nicht versioniert</gui> und <gui style=\"button"
+"\">Ignoriert</gui> in der Werkzeugleiste."
 
 #. (itstool) path: page/title
 #: C/keyboard-shortcuts.page:15
@@ -1345,6 +1573,12 @@ msgid ""
 "merge source files, and get a visual overview of changes in their favourite "
 "version control system."
 msgstr ""
+"<app>Meld</app> zeigt Unterschiede zwischen zwei oder drei Dateien (oder "
+"zwei oder drei Ordnern) an und ermöglicht Ihnen, Inhalte zwischen ihnen zu "
+"verschieben oder auch die Dateien manuell zu bearbeiten. Der Schwerpunkt von "
+"<app>Meld</app> ist Hilfe für Entwickler beim Vergleichen und Zusammenführen "
+"von Quelldateien und eine visuelle Übersicht über die Änderungen in Ihrem "
+"bevorzugten Versionskontrollsystem zu erhalten."
 
 #. (itstool) path: page/title
 #: C/folder-mode.page:16
@@ -1359,6 +1593,10 @@ msgid ""
 "\">File</gui><gui style=\"menuitem\">New...</gui></guiseq> menu item, and "
 "clicking on the <gui style=\"tab\">Directory Comparison</gui> tab."
 msgstr ""
+"Mit <app>Meld</app> können Sie zwei oder drei Ordner nebeneinander "
+"vergleichen. Wählen Sie <guiseq><gui style=\"menu\">Datei</gui><gui style="
+"\"menuitem\">Neu …</gui></guiseq> und klicken auf den Reiter <gui style=\"tab"
+"\">Ordnervergleich</gui>, um einen neuen Ordnervergleich zu starten."
 
 #. (itstool) path: page/p
 #: C/folder-mode.page:26
@@ -1367,6 +1605,10 @@ msgid ""
 "between files in each folder highlighted. You can copy or delete files from "
 "either folder, or compare individual text files in more detail."
 msgstr ""
+"Ihre gewählten Ordner werden als nebeneinander liegende Baumansichten "
+"dargestellt, wobei die Unterschiede zwischen Dateien in jedem Ordner "
+"hervorgehoben werden. Sie aus jedem Ordner Dateien kopieren oder löschen "
+"oder einzelne Textdateien detaillierter vergleichen."
 
 #. (itstool) path: section/title
 #: C/folder-mode.page:36
@@ -1385,6 +1627,16 @@ msgid ""
 "side <link xref=\"file-mode\">file comparison</link> of the files in a new "
 "tab, but this will only work properly if they're text files!"
 msgstr ""
+"Die Hauptteile eines Ordnervergleichs sind die Baumansichten, die die Ordner "
+"anzeigen, die Sie vergleichen. Sie können leicht durch diese Vergleiche "
+"<link xref=\"#folder-navigation\">navigieren</link>, um Änderungen zu "
+"finden, die für Sie von Interesse sind. Wenn Sie eine Datei oder einen "
+"Ordner auswählen, werden detailliertere Informationen in der Statusleiste am "
+"unteren Rand des Fensters angezeigt. Durch Drücken der <key>Eingabetaste</"
+"key> auf einer gewählten Datei oder durch Doppelklick auf eine beliebige "
+"Datei in der Baumansicht wird ein <link xref=\"file-mode\">Dateivergleich</"
+"link> in einem neuen Reiter geöffnet. Das funktioniert allerdings nur dann, "
+"wenn es sich dabei um Textdateien handelt!"
 
 #. (itstool) path: section/p
 #: C/folder-mode.page:50
@@ -1396,6 +1648,13 @@ msgid ""
 "any actually important differences. You can click anywhere on this bar to "
 "jump straight to that place in the comparison."
 msgstr ""
+"In den Leisten an der rechten und linken Seite des Fensters wird eine "
+"einfache farbige Übersicht der Vergleichsergebnisse angezeigt. Jede Datei "
+"oder jeder Ordner im Vergleich entspricht einem kleinen Bereich dieser "
+"Leisten. <app>Meld</app> zeigt keine <em>identischen</em> Dateien an, so "
+"dass die tatsächlich wichtigen Unterschiede leichter zu erkennen sind. "
+"Klicken Sie auf eine beliebige Stelle in dieser Leiste, um direkt zum "
+"entsprechenden Ort im Vergleich zu springen."
 
 #. (itstool) path: section/title
 #: C/folder-mode.page:63
@@ -1412,6 +1671,13 @@ msgid ""
 "change</gui></guiseq> menu items, or using the corresponding buttons on the "
 "toolbar."
 msgstr ""
+"Sie können zwischen geänderten Dateien springen (das heißt, Dateien oder "
+"Ordner, die <em>nicht</em> als identisch angesehen werden), indem Sie "
+"<guiseq><gui style=\"menu\">Änderungen</gui><gui style=\"menuitem"
+"\">Vorherige Änderung</gui></guiseq> und <guiseq><gui style=\"menu"
+"\">Änderungen</gui><gui style=\"menuitem\">Nächste Änderung</gui></guiseq> "
+"im Menü wählen oder die entsprechenden Knöpfe in der Werkzeugleiste "
+"anklicken."
 
 #. (itstool) path: section/p
 #: C/folder-mode.page:73
@@ -1420,6 +1686,9 @@ msgid ""
 "between the folders you're comparing. This is useful so that you can select "
 "an individual file for copying or deletion."
 msgstr ""
+"Mit den Pfeiltasten <key>Links</key> und <key>Rechts</key> können Sie "
+"zwischen den verglichenen Ordnern wechseln. So können Sie eine bestimmte "
+"Datei zum Kopieren oder Löschen auswählen."
 
 #. (itstool) path: section/title
 #: C/folder-mode.page:83
@@ -1432,6 +1701,9 @@ msgid ""
 "Each file or folder in a tree has its own <em>state</em>, telling you how it "
 "differed from its corresponding files/folders. The possible states are:"
 msgstr ""
+"Jede Datei oder Ordner in einem Baum hat einen <em>Status</em>, der darüber "
+"Auskunft gibt, wie sie sich von den korrespondierenden Dateien oder Ordnern "
+"unterscheidet. Mögliche Status sind:"
 
 #. (itstool) path: table/title
 #: C/folder-mode.page:106
@@ -1459,6 +1731,9 @@ msgid ""
 "These files are different across folders, but once <link xref=\"text-filters"
 "\">text filters</link> are applied, these files become identical."
 msgstr ""
+"Diese Dateien sind auf die Ordner bezogen unterschiedlich, aber sobald <link "
+"xref=\"text-filters\">Textfilter</link> eingesetzt werden, sind sie "
+"identisch."
 
 #. (itstool) path: td/p
 #: C/folder-mode.page:150
@@ -1468,7 +1743,7 @@ msgstr "Blau und fett"
 #. (itstool) path: td/p
 #: C/folder-mode.page:156
 msgid "These files differ between the folders being compared."
-msgstr ""
+msgstr "Diese Dateien unterscheiden sich zwischen den verglichenen Ordnern."
 
 #. (itstool) path: td/p
 #: C/folder-mode.page:170
@@ -1497,6 +1772,10 @@ msgid ""
 "are file permissions (i.e., <app>Meld</app> was not allowed to open the "
 "file) and filename encoding errors."
 msgstr ""
+"Beim Vergleichen dieser Datei ist ein Fehler aufgetreten. Die häufigsten "
+"Fehlerursachen sind Zugriffsprobleme (<app>Meld</app> hat nicht die "
+"erforderlichen Rechte zum Öffnen der Datei) oder Probleme mit der Kodierung "
+"des Dateinamens."
 
 #. (itstool) path: section/p
 #: C/folder-mode.page:217
@@ -1505,12 +1784,17 @@ msgid ""
 "files that have been <em>Modified</em>. You can read more about this in "
 "<link xref=\"file-filters#file-state-filter\"/>."
 msgstr ""
+"Sie können Dateien anhand deren Status filtern, um beispielsweise nur "
+"Dateien anzuzeigen, die <em>Geändert</em> wurden. Weitere Informationen dazu "
+"finden Sie in <link xref=\"file-filters#file-state-filter\"/>."
 
 #. (itstool) path: section/p
 #: C/folder-mode.page:223
 msgid ""
 "Finally, the most recently modified file/folder has an emblem attached to it."
 msgstr ""
+"Außerdem wird die zuletzt geänderte Datei oder der zuletzt geänderte Ordner "
+"mit einem Emblem versehen."
 
 #. (itstool) path: page/title
 #: C/missing-functionality.page:15
@@ -1524,6 +1808,9 @@ msgid ""
 "out how to do something, thinking that <em>surely</em> there must be an "
 "option for this?"
 msgstr ""
+"Haben Sie jemals eine halbe Stunde damit verschwendet, in einer Anwendung "
+"herauszufinden, wie etwas funktioniert, wobei Sie <em>sicher</em> waren, "
+"dass es eine Option dafür geben <em>muss</em>?"
 
 #. (itstool) path: page/p
 #: C/missing-functionality.page:23
@@ -1533,12 +1820,13 @@ msgid ""
 "haven't had time."
 msgstr ""
 "Dieser Abschnitt zählt ein paar der Dinge auf, die <app>Meld</app>, entweder "
-"aus gründlicher Wahl oder weil wir keine Zeit hatten, <em>nicht macht</em>"
+"aus handfesten Gründen oder weil wir einfach keine Zeit hatten, <em>nicht "
+"macht</em>."
 
 #. (itstool) path: section/title
 #: C/missing-functionality.page:30
 msgid "Aligning changes by adding lines"
-msgstr "Änderungen durch hinzufügen von Zeilen aneinander ausrichten"
+msgstr "Änderungen durch Hinzufügen von Zeilen aneinander ausrichten"
 
 #. (itstool) path: section/p
 #: C/missing-functionality.page:31
@@ -1548,7 +1836,7 @@ msgid ""
 "additional lines so that the left and right sides of a particular change are "
 "the same size. There is no option to do this."
 msgstr ""
-"Bei der Anzeige von Unterschieden, zeigt <app>Meld</app> die Dateien so an, "
+"Bei der Anzeige von Unterschieden zeigt <app>Meld</app> die Dateien so an, "
 "wie sie in einem normalem Textbearbeitungsprogramm erscheinen. <app>Meld</"
 "app> fügt <em>keine</em> zusätzlichen Zeilen ein, so dass die linke und die "
 "rechte Seite einer bestimmten Änderung die selbe Größe haben. Es gibt dafür "
@@ -1618,5 +1906,3 @@ msgstr ""
 "Um eine vollständige Liste von Optionen zu erhalten, rufen Sie <cmd>meld --"
 "help</cmd> auf."
 
-#~ msgid "Non VC"
-#~ msgstr "Nicht unter VK"

From 486aa1cff548fe171e70b9d51095d4048014d1cd Mon Sep 17 00:00:00 2001
From: Rafael Fontenelle <rffontenelle@gmail.com>
Date: Fri, 12 Feb 2016 18:14:18 +0000
Subject: [PATCH 39/44] Updated Brazilian Portuguese translation

---
 po/pt_BR.po | 55 +++++++++++++++++++++++++++++------------------------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/po/pt_BR.po b/po/pt_BR.po
index ceef972a..2a45c93a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -16,8 +16,8 @@ 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: 2015-10-12 23:58+0000\n"
-"PO-Revision-Date: 2015-10-13 00:36-0300\n"
+"POT-Creation-Date: 2016-02-12 13:32+0000\n"
+"PO-Revision-Date: 2016-02-12 16:13-0200\n"
 "Last-Translator: Rafael Fontenelle <rffontenelle@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
@@ -25,7 +25,7 @@ msgstr ""
 "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.5\n"
+"X-Generator: Poedit 1.8.6\n"
 "X-Project-Style: gnome\n"
 
 #: ../bin/meld:144
@@ -66,6 +66,11 @@ msgstr "Visualizador de diff Meld"
 msgid "Compare and merge your files"
 msgstr "Compare e mescle seus arquivos"
 
+#. 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 "comparar;diferença;diff;mesclar;mesclagem;merge;"
+
 #: ../data/meld.appdata.xml.in.h:1
 msgid ""
 "Meld is a visual diff and merge tool targeted at developers. Meld helps you "
@@ -1763,93 +1768,93 @@ msgstr "Copiar para ci_ma"
 msgid "Copy _down"
 msgstr "Copiar para bai_xo"
 
-#: ../meld/meldapp.py:175
+#: ../meld/meldapp.py:177
 msgid "wrong number of arguments supplied to --diff"
 msgstr "número incorreto de argumentos fornecidos para --diff"
 
-#: ../meld/meldapp.py:180
+#: ../meld/meldapp.py:182
 msgid "Start with an empty window"
 msgstr "Iniciar com a janela vazia"
 
-#: ../meld/meldapp.py:181 ../meld/meldapp.py:183
+#: ../meld/meldapp.py:183 ../meld/meldapp.py:185
 msgid "file"
 msgstr "arquivo"
 
-#: ../meld/meldapp.py:181 ../meld/meldapp.py:185
+#: ../meld/meldapp.py:183 ../meld/meldapp.py:187
 msgid "folder"
 msgstr "pasta"
 
-#: ../meld/meldapp.py:182
+#: ../meld/meldapp.py:184
 msgid "Start a version control comparison"
 msgstr "Inicia uma comparação de controle de versões"
 
-#: ../meld/meldapp.py:184
+#: ../meld/meldapp.py:186
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Inicia uma comparação de arquivo em 2 ou 3 vias"
 
-#: ../meld/meldapp.py:186
+#: ../meld/meldapp.py:188
 msgid "Start a 2- or 3-way folder comparison"
 msgstr "Inicia uma comparação de pasta em 2 ou 3 vias"
 
-#: ../meld/meldapp.py:229
+#: ../meld/meldapp.py:231
 #, python-format
 msgid "Error: %s\n"
 msgstr "Erro: %s\n"
 
-#: ../meld/meldapp.py:236
+#: ../meld/meldapp.py:238
 msgid "Meld is a file and directory comparison tool."
 msgstr "O Meld é uma ferramenta de comparação de arquivos e diretórios."
 
-#: ../meld/meldapp.py:240
+#: ../meld/meldapp.py:242
 msgid "Set label to use instead of file name"
 msgstr "Definir rótulo para usar no lugar do nome do arquivo"
 
-#: ../meld/meldapp.py:243
+#: ../meld/meldapp.py:245
 msgid "Open a new tab in an already running instance"
 msgstr "Abrir em uma nova aba de uma instância existente"
 
-#: ../meld/meldapp.py:246
+#: ../meld/meldapp.py:248
 msgid "Automatically compare all differing files on startup"
 msgstr "Compara automaticamente todos os arquivos diferentes na inicialização"
 
-#: ../meld/meldapp.py:249
+#: ../meld/meldapp.py:251
 msgid "Ignored for compatibility"
 msgstr "Ignorado por questão de compatibilidade"
 
-#: ../meld/meldapp.py:253
+#: ../meld/meldapp.py:255
 msgid "Set the target file for saving a merge result"
 msgstr "Define o arquivo destino para salvar um resultado de mesclagem"
 
-#: ../meld/meldapp.py:256
+#: ../meld/meldapp.py:258
 msgid "Automatically merge files"
 msgstr "Mescla arquivos automaticamente"
 
-#: ../meld/meldapp.py:260
+#: ../meld/meldapp.py:262
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "Carrega uma comparação salva de um arquivo de comparação"
 
-#: ../meld/meldapp.py:264
+#: ../meld/meldapp.py:266
 msgid "Create a diff tab for the supplied files or folders"
 msgstr "Cria uma aba de diff para os arquivos e pastas fornecidos"
 
-#: ../meld/meldapp.py:284
+#: ../meld/meldapp.py:286
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "muitos argumentos (esperava 0-3, obteve %d)"
 
-#: ../meld/meldapp.py:287
+#: ../meld/meldapp.py:289
 msgid "can't auto-merge less than 3 files"
 msgstr "não é possível mesclar automaticamente menos que 3 arquivos"
 
-#: ../meld/meldapp.py:289
+#: ../meld/meldapp.py:291
 msgid "can't auto-merge directories"
 msgstr "não é possível mesclar diretórios automaticamente"
 
-#: ../meld/meldapp.py:303
+#: ../meld/meldapp.py:305
 msgid "Error reading saved comparison file"
 msgstr "Erro ao ler arquivo de comparação salvo"
 
-#: ../meld/meldapp.py:330
+#: ../meld/meldapp.py:332
 #, python-format
 msgid "invalid path or URI \"%s\""
 msgstr "caminho inválido ou URI \"%s\""

From 686c70695111acea78893fde5eed701847b96fd1 Mon Sep 17 00:00:00 2001
From: Anders Jonsson <anders.jonsson@norsjovallen.se>
Date: Tue, 16 Feb 2016 17:09:38 +0000
Subject: [PATCH 40/44] Updated Swedish translation

---
 po/sv.po | 55 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/po/sv.po b/po/sv.po
index caa19c28..a0b31729 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,8 +9,8 @@ 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: 2015-10-26 13:19+0000\n"
-"PO-Revision-Date: 2015-10-26 18:33+0100\n"
+"POT-Creation-Date: 2016-02-16 13:30+0000\n"
+"PO-Revision-Date: 2016-02-16 18:08+0100\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -18,7 +18,7 @@ msgstr ""
 "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.5\n"
+"X-Generator: Poedit 1.8.7\n"
 "X-Project-Style: gnome\n"
 
 #: ../bin/meld:144
@@ -59,6 +59,11 @@ msgstr "Meld diffvisare"
 msgid "Compare and merge your files"
 msgstr "Jämför och sammanfoga dina filer"
 
+#. 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;sammanfogning;"
+
 #: ../data/meld.appdata.xml.in.h:1
 msgid ""
 "Meld is a visual diff and merge tool targeted at developers. Meld helps you "
@@ -1735,93 +1740,93 @@ msgstr "Kopiera _upp"
 msgid "Copy _down"
 msgstr "Kopiera _ned"
 
-#: ../meld/meldapp.py:175
+#: ../meld/meldapp.py:177
 msgid "wrong number of arguments supplied to --diff"
 msgstr "felaktigt antal argument angavs för --diff"
 
-#: ../meld/meldapp.py:180
+#: ../meld/meldapp.py:182
 msgid "Start with an empty window"
 msgstr "Starta med ett tomt fönster"
 
-#: ../meld/meldapp.py:181 ../meld/meldapp.py:183
+#: ../meld/meldapp.py:183 ../meld/meldapp.py:185
 msgid "file"
 msgstr "fil"
 
-#: ../meld/meldapp.py:181 ../meld/meldapp.py:185
+#: ../meld/meldapp.py:183 ../meld/meldapp.py:187
 msgid "folder"
 msgstr "mapp"
 
-#: ../meld/meldapp.py:182
+#: ../meld/meldapp.py:184
 msgid "Start a version control comparison"
 msgstr "Starta en versionshanterad jämförelse"
 
-#: ../meld/meldapp.py:184
+#: ../meld/meldapp.py:186
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Starta med en två- eller trevägs filjämförelse"
 
-#: ../meld/meldapp.py:186
+#: ../meld/meldapp.py:188
 msgid "Start a 2- or 3-way folder comparison"
 msgstr "Starta med en två- eller trevägs mappjämförelse"
 
-#: ../meld/meldapp.py:229
+#: ../meld/meldapp.py:231
 #, python-format
 msgid "Error: %s\n"
 msgstr "Fel: %s\n"
 
-#: ../meld/meldapp.py:236
+#: ../meld/meldapp.py:238
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld är ett verktyg för att jämföra filer och kataloger."
 
-#: ../meld/meldapp.py:240
+#: ../meld/meldapp.py:242
 msgid "Set label to use instead of file name"
 msgstr "Sätt etikett att använda istället för filnamn"
 
-#: ../meld/meldapp.py:243
+#: ../meld/meldapp.py:245
 msgid "Open a new tab in an already running instance"
 msgstr "Öppna en ny flik i en redan körande instans"
 
-#: ../meld/meldapp.py:246
+#: ../meld/meldapp.py:248
 msgid "Automatically compare all differing files on startup"
 msgstr "Jämför automatiskt alla filer som skiljer sig vid uppstart"
 
-#: ../meld/meldapp.py:249
+#: ../meld/meldapp.py:251
 msgid "Ignored for compatibility"
 msgstr "Ignorerad för kompatibilitet"
 
-#: ../meld/meldapp.py:253
+#: ../meld/meldapp.py:255
 msgid "Set the target file for saving a merge result"
 msgstr "Ställ in målfilen för att spara sammanfogat resultat"
 
-#: ../meld/meldapp.py:256
+#: ../meld/meldapp.py:258
 msgid "Automatically merge files"
 msgstr "Sammanfoga automatiskt filer"
 
-#: ../meld/meldapp.py:260
+#: ../meld/meldapp.py:262
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "Läs in en sparad jämförelse från en Meld jämförelsefil"
 
-#: ../meld/meldapp.py:264
+#: ../meld/meldapp.py:266
 msgid "Create a diff tab for the supplied files or folders"
 msgstr "Skapar en diff-tabell för angivna filer eller mappar"
 
-#: ../meld/meldapp.py:284
+#: ../meld/meldapp.py:286
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "för många argument (ville ha 0-3, fick %d)"
 
-#: ../meld/meldapp.py:287
+#: ../meld/meldapp.py:289
 msgid "can't auto-merge less than 3 files"
 msgstr "kan inte auto-sammanfoga mindre är tre filer"
 
-#: ../meld/meldapp.py:289
+#: ../meld/meldapp.py:291
 msgid "can't auto-merge directories"
 msgstr "kan inte auto-sammanfoga kataloger"
 
-#: ../meld/meldapp.py:303
+#: ../meld/meldapp.py:305
 msgid "Error reading saved comparison file"
 msgstr "Fel vid läsning av den sparade konfigurationsfilen"
 
-#: ../meld/meldapp.py:330
+#: ../meld/meldapp.py:332
 #, python-format
 msgid "invalid path or URI \"%s\""
 msgstr "ogiltig sökväg eller URI ”%s”"

From bcc139bc0e72fc991dc9213d7ccb661b8cd0f721 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sat, 7 Nov 2015 07:22:55 +1000
Subject: [PATCH 41/44] ui.historyentry: Don't use SafeConfigParser's
 interpolation (bgo#757659)

SafeConfigParser and ConfigParser both support magical interpolation
syntax that we don't use. Better yet, these classes will happily write
out values that they can't read back in, and traceback when you try.

Specifically, in this case a commit message containing "%PARAM1%" broke
the parsers because they considered this to be an invalid interpolation
string, but only errored the *next* time you tried to change the config
file.

This commit just moves us to using RawConfigParser because we don't
want the magical behaviour.
---
 meld/ui/historyentry.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meld/ui/historyentry.py b/meld/ui/historyentry.py
index 49ee6996..5cf6587c 100644
--- a/meld/ui/historyentry.py
+++ b/meld/ui/historyentry.py
@@ -88,7 +88,7 @@ def __init__(self, **kwargs):
             os.makedirs(pref_dir)
 
         self.history_file = os.path.join(pref_dir, "history.ini")
-        self.config = configparser.SafeConfigParser()
+        self.config = configparser.RawConfigParser()
         if os.path.exists(self.history_file):
             self.config.read(self.history_file)
 

From 5cbe09040b3448222f519781fe4a3158439c7db6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20=C3=9Ar?= <urbalazs@gmail.com>
Date: Tue, 8 Mar 2016 07:32:52 +0000
Subject: [PATCH 42/44] Updated Hungarian translation

---
 po/hu.po | 353 +++++++++++++++++++++++++++----------------------------
 1 file changed, 171 insertions(+), 182 deletions(-)

diff --git a/po/hu.po b/po/hu.po
index 82ef927b..ffe46161 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,24 +1,25 @@
 # Hungarian translation of Meld.
+# Copyright (C) 2005-2016 Free Software Foundation, Inc.
 # This file is distributed under the same license as the Meld package.
-# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013. Free Software Foundation, Inc.
 #
 # CSÉCSY László <boobaa at ajrg dot hu>, 2005.
 # Gabor Kelemen <kelemeng at gnome dot hu>, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013, 2014, 2015.
+# Balázs Úr <urbalazs at gmail dot com>, 2016.
 msgid ""
 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: 2015-05-08 22:31+0000\n"
-"PO-Revision-Date: 2015-05-31 23:53+0200\n"
-"Last-Translator: Gabor Kelemen <kelemeng at ubuntu dot com>\n"
+"POT-Creation-Date: 2016-03-08 01:31+0000\n"
+"PO-Revision-Date: 2016-03-08 08:31+0100\n"
+"Last-Translator: Balázs Úr <urbalazs@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"
+"X-Generator: Lokalize 1.2\n"
 
 #: ../bin/meld:144
 msgid "Cannot import: "
@@ -58,6 +59,11 @@ msgstr "Meld eltérésmegjelenítő"
 msgid "Compare and merge your files"
 msgstr "Fájlok összehasonlítása és összefésülése"
 
+#. 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;különbség;patch;folt;"
+
 #: ../data/meld.appdata.xml.in.h:1
 msgid ""
 "Meld is a visual diff and merge tool targeted at developers. Meld helps you "
@@ -159,7 +165,6 @@ msgstr ""
 "miatt ez alapesetben ki van kapcsolva."
 
 #: ../data/org.gnome.meld.gschema.xml.h:17
-#| msgid "Use s_yntax highlighting"
 msgid "Color scheme to use for syntax highlighting"
 msgstr "Szintaxiskiemeléshez használandó színséma"
 
@@ -191,9 +196,9 @@ msgid ""
 "not at all ('none'), at any character ('char') or only at the end of words "
 "('word')."
 msgstr ""
-"A fájl-összehasonlításban a sorok ezen beállításnak megfelelően fognak törni. "
-"Lehetséges értékek: „none” (ne törjön), „char” (bármely karakter) vagy „word” "
-"(csak szavak végén)."
+"A fájl-összehasonlításban a sorok ezen beállításnak megfelelően fognak "
+"törni. Lehetséges értékek: „none” (ne törjön), „char” (bármely karakter) "
+"vagy „word” (csak szavak végén)."
 
 #: ../data/org.gnome.meld.gschema.xml.h:23
 msgid "Highlight current line"
@@ -327,8 +332,8 @@ msgid ""
 "differences."
 msgstr ""
 "A fájltartalmat összehasonlító mappa-összehasonlítások aktív szövegszűrőket "
-"is alkalmaznak, valamint levágják az üres sorokat, és mellőzik az "
-"üreshely-különbségeket."
+"is alkalmaznak, valamint levágják az üres sorokat, és mellőzik az üreshely-"
+"különbségeket."
 
 #: ../data/org.gnome.meld.gschema.xml.h:45
 msgid "File status filters"
@@ -379,7 +384,8 @@ msgstr ""
 #: ../data/org.gnome.meld.gschema.xml.h:53
 msgid "Order for files in three-way version control merge comparisons"
 msgstr ""
-"Fájlok sorrendje a háromutas verziókövetési összefésülési összehasonlításokban"
+"Fájlok sorrendje a háromutas verziókövetési összefésülési "
+"összehasonlításokban"
 
 #: ../data/org.gnome.meld.gschema.xml.h:54
 msgid ""
@@ -387,10 +393,10 @@ msgid ""
 "preference only affects three-way comparisons launched from the version "
 "control view, so is used solely for merges/conflict resolution within Meld."
 msgstr ""
-"A lehetséges fájlsorrendek a távoli/összefésült/helyi és "
-"helyi/összefésült/távoli. Ez a beállítás csak a verziókövető nézetből "
-"indított háromutas összehasonlításokat befolyásolja, így csak a Melden belüli "
-"összefésülésekhez/ütközésfeloldásokhoz kerül felhasználásra."
+"A lehetséges fájlsorrendek a távoli/összefésült/helyi és helyi/összefésült/"
+"távoli. Ez a beállítás csak a verziókövető nézetből indított háromutas "
+"összehasonlításokat befolyásolja, így csak a Melden belüli összefésülésekhez/"
+"ütközésfeloldásokhoz kerül felhasználásra."
 
 #: ../data/org.gnome.meld.gschema.xml.h:55
 msgid "Show margin in commit message editor"
@@ -413,8 +419,8 @@ msgid ""
 "The column at which to show the margin in the version control commit message "
 "editor."
 msgstr ""
-"A margó megjelenítése ebben az oszlopban a verziókövető "
-"kommitüzenet-szerkesztőjében."
+"A margó megjelenítése ebben az oszlopban a verziókövető kommitüzenet-"
+"szerkesztőjében."
 
 #: ../data/org.gnome.meld.gschema.xml.h:59
 msgid "Automatically hard-wrap commit messages"
@@ -436,8 +442,7 @@ msgid ""
 "List of statuses used to filter visible files in version control comparison."
 msgstr ""
 "A verziókövetési összehasonlításban látható fájlok szűrésére használt "
-"állapotok "
-"listája."
+"állapotok listája."
 
 #: ../data/org.gnome.meld.gschema.xml.h:63
 msgid "Filename-based filters"
@@ -531,7 +536,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:876 ../meld/filediff.py:1460
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:881 ../meld/filediff.py:1489
 msgid "Hide"
 msgstr "Elrejtés"
 
@@ -600,7 +605,7 @@ msgid "_Add"
 msgstr "Hozzá_adás"
 
 #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:753
+#: ../meld/vcview.py:762
 msgid "_Remove"
 msgstr "_Eltávolítás"
 
@@ -621,8 +626,7 @@ msgid "Move _Down"
 msgstr "Mozgatás _le"
 
 #. Create icon and filename CellRenderer
-#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:374
-#: ../meld/vcview.py:203
+#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:374 ../meld/vcview.py:215
 msgid "Name"
 msgstr "Név"
 
@@ -663,7 +667,6 @@ msgid "Add Synchronization Point"
 msgstr "Szinkronizálási pont hozzáadása"
 
 #: ../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 "Szinkronizálási pont hozzáadása a fájlok közti változásokhoz"
 
@@ -672,7 +675,6 @@ msgid "Clear Synchronization Points"
 msgstr "Szinkronizálási pontok törlése"
 
 #: ../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 "Szinkronizálási pontok törlése a fájlok közti változásokhoz"
 
@@ -789,17 +791,14 @@ msgid "Merge all non-conflicting changes from left and right panes"
 msgstr "Minden nem ütköző változás egyesítése a bal és jobb ablaktábláról"
 
 #: ../data/ui/filediff.ui.h:38
-#| msgid "Previous Change"
 msgid "Previous Pane"
 msgstr "Előző ablaktábla"
 
 #: ../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 "Billentyűzetfókusz átvitele az összehasonlítás előző dokumentumára"
 
 #: ../data/ui/filediff.ui.h:40
-#| msgid "Next Change"
 msgid "Next Pane"
 msgstr "Következő ablaktábla"
 
@@ -827,8 +826,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:967 ../meld/filediff.py:1629
-#: ../meld/filediff.py:1713 ../meld/filediff.py:1738
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:972 ../meld/filediff.py:1658
+#: ../meld/filediff.py:1742 ../meld/filediff.py:1767
 msgid "_Cancel"
 msgstr "Mé_gse"
 
@@ -864,7 +863,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:968 ../meld/filediff.py:1630
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:973 ../meld/filediff.py:1659
 msgid "_Replace"
 msgstr "_Csere"
 
@@ -912,7 +911,7 @@ msgstr "Formázás foltként"
 msgid "Copy to Clipboard"
 msgstr "Másolás vágólapra"
 
-#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:119
+#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:125
 msgid "Save Patch"
 msgstr "Folt mentése"
 
@@ -1017,7 +1016,6 @@ msgid "Use s_yntax highlighting"
 msgstr "S_zintaxiskiemelés használata"
 
 #: ../data/ui/preferences.ui.h:22
-#| msgid "Change highlighting incomplete"
 msgid "Syntax highlighting color scheme:"
 msgstr "Szintaxiskiemelés színsémája:"
 
@@ -1075,7 +1073,7 @@ msgstr "Sorrend _fájlok összefésülésekor:"
 
 #: ../data/ui/preferences.ui.h:38
 msgid "Commit Messages"
-msgstr "Véglegesítési üzenetek"
+msgstr "Kommit üzenetek"
 
 #: ../data/ui/preferences.ui.h:39
 msgid "Show _right margin at:"
@@ -1083,7 +1081,7 @@ msgstr "_Jobb margó megjelenítése:"
 
 #: ../data/ui/preferences.ui.h:40
 msgid "Automatically _break lines at right margin on commit"
-msgstr "Sorok a_utomatikus tördelése a jobb margónál véglegesítéskor"
+msgstr "Sorok a_utomatikus tördelése a jobb margónál kommitkor"
 
 #: ../data/ui/preferences.ui.h:41
 msgid "Version Control"
@@ -1195,11 +1193,11 @@ msgstr "Össze_hasonlítás"
 
 #: ../data/ui/vcview.ui.h:3
 msgid "Co_mmit..."
-msgstr "_Véglegesítés…"
+msgstr "_Kommit…"
 
 #: ../data/ui/vcview.ui.h:4
 msgid "Commit changes to version control"
-msgstr "Változtatások véglegesítése verziókövetőbe"
+msgstr "Változtatások kommitolása verziókövetőbe"
 
 #: ../data/ui/vcview.ui.h:5
 msgid "_Update"
@@ -1295,11 +1293,11 @@ msgstr "Figyelmen kívül hagyott fájlok megjelenítése"
 
 #: ../data/ui/vcview.ui.h:30
 msgid "Commit"
-msgstr "Véglegesítés"
+msgstr "Kommit"
 
 #: ../data/ui/vcview.ui.h:31
 msgid "Commit Files"
-msgstr "Fájlok véglegesítése"
+msgstr "Fájlok kommitolása"
 
 #: ../data/ui/vcview.ui.h:32
 msgid "Log Message"
@@ -1311,7 +1309,7 @@ msgstr "Előző naplók:"
 
 #: ../data/ui/vcview.ui.h:34
 msgid "Co_mmit"
-msgstr "_Véglegesítés"
+msgstr "_Kommit"
 
 #: ../data/ui/vcview.ui.h:35
 msgid "Console output"
@@ -1356,31 +1354,30 @@ msgstr "Módosítási idő"
 msgid "Permissions"
 msgstr "Jogosultságok"
 
-#: ../meld/dirdiff.py:558
+#: ../meld/dirdiff.py:561
 #, python-format
 msgid "Hide %s"
 msgstr "%s elrejtése"
 
-#: ../meld/dirdiff.py:688 ../meld/dirdiff.py:710
+#: ../meld/dirdiff.py:693 ../meld/dirdiff.py:715
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] %s beolvasása"
 
-#: ../meld/dirdiff.py:843
+#: ../meld/dirdiff.py:848
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Kész"
 
-#: ../meld/dirdiff.py:851
-#| msgid "[%s] Fetching differences"
+#: ../meld/dirdiff.py:856
 msgid "Folders have no differences"
 msgstr "A mappák közt nincs eltérés"
 
-#: ../meld/dirdiff.py:853
+#: ../meld/dirdiff.py:858
 msgid "Contents of scanned files in folders are identical."
 msgstr "A mappákban vizsgált fájlok tartalma azonos."
 
-#: ../meld/dirdiff.py:855
+#: ../meld/dirdiff.py:860
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1388,46 +1385,43 @@ msgstr ""
 "A mappákban vizsgált fájlok azonosnak tűnnek, de a tartalom nem lett "
 "vizsgálva."
 
-#: ../meld/dirdiff.py:858
+#: ../meld/dirdiff.py:863
 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:860
-#| msgid ""
-#| "Text filters are being used, and may be masking differences between "
-#| "files. Would you like to compare the unfiltered files?"
+#: ../meld/dirdiff.py:865
 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:878 ../meld/dirdiff.py:931 ../meld/filediff.py:1115
-#: ../meld/filediff.py:1267 ../meld/filediff.py:1462 ../meld/filediff.py:1492
-#: ../meld/filediff.py:1494
+#: ../meld/dirdiff.py:883 ../meld/dirdiff.py:936 ../meld/filediff.py:1129
+#: ../meld/filediff.py:1161 ../meld/filediff.py:1296 ../meld/filediff.py:1491
+#: ../meld/filediff.py:1521 ../meld/filediff.py:1523
 msgid "Hi_de"
 msgstr "_Elrejtés"
 
-#: ../meld/dirdiff.py:888
+#: ../meld/dirdiff.py:893
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Több hiba történt a mappa vizsgálatakor"
 
-#: ../meld/dirdiff.py:889
+#: ../meld/dirdiff.py:894
 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:891
+#: ../meld/dirdiff.py:896
 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:893
+#: ../meld/dirdiff.py:898
 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:895
+#: ../meld/dirdiff.py:900
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1435,17 +1429,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:906
+#: ../meld/dirdiff.py:911
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "„%s” rejtve „%s” által"
 
-#: ../meld/dirdiff.py:971
+#: ../meld/dirdiff.py:976
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Cseréli ezt a mappát: „%s”?"
 
-#: ../meld/dirdiff.py:973
+#: ../meld/dirdiff.py:978
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1454,11 +1448,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:986
+#: ../meld/dirdiff.py:991
 msgid "Error copying file"
 msgstr "Hiba a fájl másolásakor"
 
-#: ../meld/dirdiff.py:987
+#: ../meld/dirdiff.py:992
 #, python-format
 msgid ""
 "Couldn't copy %s\n"
@@ -1471,40 +1465,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/dirdiff.py:1010
+#: ../meld/dirdiff.py:1015
 #, python-format
 msgid "Error deleting %s"
 msgstr "Hiba %s törlésekor"
 
-#: ../meld/dirdiff.py:1515
-#| msgid "folder"
+#: ../meld/dirdiff.py:1520
 msgid "No folder"
 msgstr "Nincs mappa"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:406
+#: ../meld/filediff.py:410
 msgid "INS"
 msgstr "BESZ"
 
-#: ../meld/filediff.py:406
+#: ../meld/filediff.py:410
 msgid "OVR"
 msgstr "ÁTÍR"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:408
+#: ../meld/filediff.py:412
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "%i. sor, %i. oszlop"
 
-#: ../meld/filediff.py:821
+#: ../meld/filediff.py:825
 msgid "Comparison results will be inaccurate"
 msgstr "Az összehasonlítás eredményei pontatlanok lesznek"
 
-#: ../meld/filediff.py:823
+#: ../meld/filediff.py:827
 #, python-format
-#| 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, which is unsupported. "
 "The comparison will not be accurate."
@@ -1512,77 +1502,86 @@ msgstr ""
 "Egy szűrő („%s”) megváltoztatta a fájl sorainak számát, ami nem támogatott. "
 "Az összehasonlítás pontatlan lesz."
 
-#: ../meld/filediff.py:894
+#: ../meld/filediff.py:898
 msgid "Mark conflict as resolved?"
 msgstr "Megjelöli az ütközést feloldottként?"
 
-#: ../meld/filediff.py:896
+#: ../meld/filediff.py:900
 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:898
+#: ../meld/filediff.py:902
 msgid "Cancel"
 msgstr "Mégse"
 
-#: ../meld/filediff.py:899
+#: ../meld/filediff.py:903
 msgid "Mark _Resolved"
 msgstr "Megjelölés _feloldottként"
 
-#: ../meld/filediff.py:1102
+#: ../meld/filediff.py:1110
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Panelek számának beállítása"
 
-#: ../meld/filediff.py:1109
+#: ../meld/filediff.py:1123
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Fájlok megnyitása"
 
-#: ../meld/filediff.py:1132 ../meld/filediff.py:1142 ../meld/filediff.py:1155
-#: ../meld/filediff.py:1161
+#: ../meld/filediff.py:1146 ../meld/filediff.py:1184 ../meld/filediff.py:1190
 msgid "Could not read file"
 msgstr "A fájl nem olvasható"
 
-#: ../meld/filediff.py:1133
+#: ../meld/filediff.py:1147
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Fájlok olvasása"
 
-#: ../meld/filediff.py:1143
+#: ../meld/filediff.py:1156
 #, python-format
-msgid "%s appears to be a binary file."
+#| msgid "%s appears to be a binary file."
+msgid "File %s appears to be a binary file."
 msgstr "%s bináris fájlnak tűnik."
 
-#: ../meld/filediff.py:1156
+#: ../meld/filediff.py:1157
+#| msgid "Open selected file or directory in the default external application"
+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:1160
+msgid "Open"
+msgstr "Megnyitás"
+
+#: ../meld/filediff.py:1185
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s nincs a kódolások között: %s"
 
-#: ../meld/filediff.py:1194
+#: ../meld/filediff.py:1223
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Eltérések számítása"
 
-#: ../meld/filediff.py:1262
+#: ../meld/filediff.py:1291
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "%s fájl megváltozott a lemezen"
 
-#: ../meld/filediff.py:1263
+#: ../meld/filediff.py:1292
 msgid "Do you want to reload the file?"
 msgstr "Újratölti a fájlt?"
 
-#: ../meld/filediff.py:1266
+#: ../meld/filediff.py:1295
 msgid "_Reload"
 msgstr "Új_ratöltés"
 
-#: ../meld/filediff.py:1425
+#: ../meld/filediff.py:1454
 msgid "Files are identical"
 msgstr "A fájlok azonosak"
 
-#: ../meld/filediff.py:1438
+#: ../meld/filediff.py:1467
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1590,12 +1589,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:1443
-#| msgid "Files with invalid encodings found"
+#: ../meld/filediff.py:1472
 msgid "Files differ in line endings only"
 msgstr "A fájlok csak a sorvégekben térnek el"
 
-#: ../meld/filediff.py:1445
+#: ../meld/filediff.py:1474
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1604,15 +1602,15 @@ msgstr ""
 "A fájlok azonosak a sorvégjelektől eltekintve:\n"
 "%s"
 
-#: ../meld/filediff.py:1465
+#: ../meld/filediff.py:1494
 msgid "Show without filters"
 msgstr "Megjelenítés szűrők nélkül"
 
-#: ../meld/filediff.py:1487
+#: ../meld/filediff.py:1516
 msgid "Change highlighting incomplete"
 msgstr "Részleges kiemelés módosítása"
 
-#: ../meld/filediff.py:1488
+#: ../meld/filediff.py:1517
 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."
@@ -1620,20 +1618,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:1496
+#: ../meld/filediff.py:1525
 msgid "Keep highlighting"
 msgstr "Kiemelés továbbra is"
 
-#: ../meld/filediff.py:1498
+#: ../meld/filediff.py:1527
 msgid "_Keep highlighting"
 msgstr "_Kiemelés továbbra is"
 
-#: ../meld/filediff.py:1633
+#: ../meld/filediff.py:1662
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Cseréli a fájlt: „%s”?"
 
-#: ../meld/filediff.py:1635
+#: ../meld/filediff.py:1664
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -1642,13 +1640,12 @@ 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:1653
+#: ../meld/filediff.py:1682
 #, python-format
-#| msgid "Could not read file"
 msgid "Could not save file %s."
 msgstr "A fájl (%s) nem menthető."
 
-#: ../meld/filediff.py:1654
+#: ../meld/filediff.py:1683
 #, python-format
 msgid ""
 "Couldn't save file due to:\n"
@@ -1657,46 +1654,41 @@ msgstr ""
 "A fájl nem menthető. Ok:\n"
 "%s"
 
-#: ../meld/filediff.py:1666
+#: ../meld/filediff.py:1695
 msgid "Save Left Pane As"
 msgstr "Bal ablaktábla mentése másként"
 
-#: ../meld/filediff.py:1668
+#: ../meld/filediff.py:1697
 msgid "Save Middle Pane As"
 msgstr "Középső ablaktábla mentése másként"
 
-#: ../meld/filediff.py:1670
+#: ../meld/filediff.py:1699
 msgid "Save Right Pane As"
 msgstr "Jobb ablaktábla mentése másként"
 
-#: ../meld/filediff.py:1684
+#: ../meld/filediff.py:1713
 #, 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:1686
+#: ../meld/filediff.py:1715
 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:1689
+#: ../meld/filediff.py:1718
 msgid "Save Anyway"
 msgstr "Mentés mindenképp"
 
-#: ../meld/filediff.py:1690
+#: ../meld/filediff.py:1719
 msgid "Don't Save"
 msgstr "Ne mentse"
 
-#: ../meld/filediff.py:1716
-#| msgid "Files with invalid encodings found"
+#: ../meld/filediff.py:1745
 msgid "Inconsistent line endings found"
 msgstr "Inkonzisztens fájlvégjelek találhatók"
 
-#: ../meld/filediff.py:1718
+#: ../meld/filediff.py:1747
 #, python-format
-#| msgid ""
-#| "This file '%s' contains a mixture of line endings.\n"
-#| "\n"
-#| "Which format would you like to use?"
 msgid ""
 "'%s' contains a mixture of line endings. Select the line ending format to "
 "use."
@@ -1704,20 +1696,17 @@ msgstr ""
 "„%s” fájl különböző sorvégjeleket tartalmaz. Válassza ki, melyik formátumot "
 "szeretné használni."
 
-#: ../meld/filediff.py:1739
+#: ../meld/filediff.py:1768
 msgid "_Save as UTF-8"
 msgstr "Mentés _UTF-8-ként"
 
-#: ../meld/filediff.py:1742
+#: ../meld/filediff.py:1771
 #, python-format
 msgid "Couldn't encode text as “%s”"
 msgstr "Nem kódolható a szöveg mint „%s”"
 
-#: ../meld/filediff.py:1744
+#: ../meld/filediff.py:1773
 #, python-format
-#| msgid ""
-#| "'%s' contains characters not encodable with '%s'\n"
-#| "Would you like to save as UTF-8?"
 msgid ""
 "File “%s” contains characters that can't be encoded using encoding “%s”.\n"
 "Would you like to save as UTF-8?"
@@ -1725,11 +1714,11 @@ msgstr ""
 "„%s” a(z) „%s” használatával kódolhatatlan karaktereket tartalmaz.\n"
 "Szeretné UTF-8 kódolással menteni?"
 
-#: ../meld/filediff.py:2096
+#: ../meld/filediff.py:2125
 msgid "Live comparison updating disabled"
 msgstr "Az élő összehasonlítás-frissítés kikapcsolva"
 
-#: ../meld/filediff.py:2097
+#: ../meld/filediff.py:2126
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1752,99 +1741,99 @@ msgstr "Másolás _fel"
 msgid "Copy _down"
 msgstr "Másolás _le"
 
-#: ../meld/meldapp.py:170
+#: ../meld/meldapp.py:177
 msgid "wrong number of arguments supplied to --diff"
 msgstr "Hibás számú argumentum a --diff kapcsolóhoz"
 
-#: ../meld/meldapp.py:175
+#: ../meld/meldapp.py:182
 msgid "Start with an empty window"
 msgstr "Indítás üres ablakkal"
 
-#: ../meld/meldapp.py:176 ../meld/meldapp.py:178
+#: ../meld/meldapp.py:183 ../meld/meldapp.py:185
 msgid "file"
 msgstr "fájl"
 
-#: ../meld/meldapp.py:176 ../meld/meldapp.py:180
+#: ../meld/meldapp.py:183 ../meld/meldapp.py:187
 msgid "folder"
 msgstr "mappa"
 
-#: ../meld/meldapp.py:177
+#: ../meld/meldapp.py:184
 msgid "Start a version control comparison"
 msgstr "Verziókövető-összehasonlítás indítása"
 
-#: ../meld/meldapp.py:179
+#: ../meld/meldapp.py:186
 msgid "Start a 2- or 3-way file comparison"
 msgstr "2 vagy 3 utas fájl-összehasonlítás indítása"
 
-#: ../meld/meldapp.py:181
+#: ../meld/meldapp.py:188
 msgid "Start a 2- or 3-way folder comparison"
 msgstr "2 vagy 3 utas mappa-összehasonlítás indítása"
 
-#: ../meld/meldapp.py:224
+#: ../meld/meldapp.py:231
 #, python-format
 msgid "Error: %s\n"
 msgstr "Hiba: %s\n"
 
-#: ../meld/meldapp.py:231
+#: ../meld/meldapp.py:238
 msgid "Meld is a file and directory comparison tool."
 msgstr "A Meld egy fájl- és könyvtár-összehasonlító eszköz."
 
-#: ../meld/meldapp.py:235
+#: ../meld/meldapp.py:242
 msgid "Set label to use instead of file name"
 msgstr "A fájlnevek helyett használandó címke beállítása"
 
-#: ../meld/meldapp.py:238
+#: ../meld/meldapp.py:245
 msgid "Open a new tab in an already running instance"
 msgstr "Új lap megnyitása már futó példányban"
 
-#: ../meld/meldapp.py:241
+#: ../meld/meldapp.py:248
 msgid "Automatically compare all differing files on startup"
 msgstr "Minden eltérő fájl automatikus összehasonlítása indításkor"
 
-#: ../meld/meldapp.py:244
+#: ../meld/meldapp.py:251
 msgid "Ignored for compatibility"
 msgstr "Mellőzve a kompatibilitás érdekében"
 
-#: ../meld/meldapp.py:248
+#: ../meld/meldapp.py:255
 msgid "Set the target file for saving a merge result"
 msgstr "Célfájl beállítása összefésülés eredményének mentéséhez"
 
-#: ../meld/meldapp.py:251
+#: ../meld/meldapp.py:258
 msgid "Automatically merge files"
 msgstr "Fájlok automatikus összefésülése"
 
-#: ../meld/meldapp.py:255
+#: ../meld/meldapp.py:262
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "Mentett összehasonlítás betöltése Meld összehasonlítás-fájlból"
 
-#: ../meld/meldapp.py:259
+#: ../meld/meldapp.py:266
 msgid "Create a diff tab for the supplied files or folders"
 msgstr "Különbséglap létrehozása a megadott fájlokhoz vagy mappákhoz"
 
-#: ../meld/meldapp.py:279
+#: ../meld/meldapp.py:286
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "túl sok argumentum (0-3 helyett %d)"
 
-#: ../meld/meldapp.py:282
+#: ../meld/meldapp.py:289
 msgid "can't auto-merge less than 3 files"
 msgstr "nem lehet 3-nál kevesebb fájlt automatikusan összefésülni"
 
-#: ../meld/meldapp.py:284
+#: ../meld/meldapp.py:291
 msgid "can't auto-merge directories"
 msgstr "könyvtárak nem fésülhetők össze automatikusan"
 
-#: ../meld/meldapp.py:298
+#: ../meld/meldapp.py:305
 msgid "Error reading saved comparison file"
 msgstr "Hiba az elmentett összehasonlítás-fájl olvasása közben"
 
-#: ../meld/meldapp.py:326
+#: ../meld/meldapp.py:332
 #, python-format
 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:137
+#: ../meld/meldbuffer.py:138
 msgid "<unnamed>"
 msgstr "<névtelen>"
 
@@ -2087,7 +2076,7 @@ msgid "Cannot compare a mixture of files and directories"
 msgstr "Fájlok és könyvtárak keveréke nem hasonlítható össze."
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:178
+#: ../meld/misc.py:203
 msgid "[None]"
 msgstr "[Semmi]"
 
@@ -2113,28 +2102,28 @@ msgstr "Nem lesznek fájlok kommitolva"
 
 #. Translators: First %s is replaced by translated "%d unpushed
 #. commits", second %s is replaced by translated "%d branches"
-#: ../meld/vc/git.py:129
+#: ../meld/vc/git.py:127
 #, 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:130 ../meld/vc/git.py:137
+#: ../meld/vc/git.py:128 ../meld/vc/git.py:135
 #, python-format
 msgid "%d unpushed commit"
 msgid_plural "%d unpushed commits"
 msgstr[0] "%d nem továbbított kommit"
 msgstr[1] "%d nem továbbított kommit"
 
-#: ../meld/vc/git.py:132
+#: ../meld/vc/git.py:130
 #, python-format
 msgid "%d branch"
 msgid_plural "%d branches"
 msgstr[0] "%d ágban"
 msgstr[1] "%d ágban"
 
-#: ../meld/vc/git.py:360
+#: ../meld/vc/git.py:357
 #, python-format
 msgid "Mode changed from %s to %s"
 msgstr "Mód megváltoztatva: %s -> %s"
@@ -2187,111 +2176,111 @@ msgstr "Hiányzó"
 msgid "Not present"
 msgstr "Nincs jelen"
 
-#: ../meld/vcview.py:233 ../meld/vcview.py:417
+#: ../meld/vcview.py:245 ../meld/vcview.py:426
 msgid "Location"
 msgstr "Hely"
 
-#: ../meld/vcview.py:234
+#: ../meld/vcview.py:246
 msgid "Status"
 msgstr "Állapot"
 
-#: ../meld/vcview.py:235
+#: ../meld/vcview.py:247
 msgid "Revision"
 msgstr "Revízió"
 
-#: ../meld/vcview.py:236
+#: ../meld/vcview.py:248
 msgid "Options"
 msgstr "Beállítások"
 
 #. TRANSLATORS: this is an error message when a version control
 #. application isn't installed or can't be found
-#: ../meld/vcview.py:324
+#: ../meld/vcview.py:336
 #, python-format
 msgid "%s not installed"
 msgstr "A(z) %s nincs telepítve"
 
 #. TRANSLATORS: this is an error message when a version
 #. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:328
+#: ../meld/vcview.py:340
 msgid "Invalid repository"
 msgstr "Érvénytelen tároló"
 
-#: ../meld/vcview.py:337
+#: ../meld/vcview.py:349
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../meld/vcview.py:339 ../meld/vcview.py:347
+#: ../meld/vcview.py:351 ../meld/vcview.py:359
 msgid "None"
 msgstr "Nincs"
 
-#: ../meld/vcview.py:358
+#: ../meld/vcview.py:370
 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:360
+#: ../meld/vcview.py:372
 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:362
+#: ../meld/vcview.py:374
 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 the user is diffing
-#: ../meld/vcview.py:417
+#: ../meld/vcview.py:426
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:431 ../meld/vcview.py:439
+#: ../meld/vcview.py:448
 #, python-format
 msgid "Scanning %s"
 msgstr "%s vizsgálata"
 
-#: ../meld/vcview.py:479
+#: ../meld/vcview.py:488
 msgid "(Empty)"
 msgstr "(Üres)"
 
-#: ../meld/vcview.py:522
+#: ../meld/vcview.py:531
 #, python-format
 msgid "%s — local"
 msgstr "%s – helyi"
 
-#: ../meld/vcview.py:523
+#: ../meld/vcview.py:532
 #, python-format
 msgid "%s — remote"
 msgstr "%s – távoli"
 
-#: ../meld/vcview.py:531
+#: ../meld/vcview.py:540
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (helyi, összefésült, távoli)"
 
-#: ../meld/vcview.py:536
+#: ../meld/vcview.py:545
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (távoli, összefésült, helyi)"
 
-#: ../meld/vcview.py:547
+#: ../meld/vcview.py:556
 #, python-format
 msgid "%s — repository"
 msgstr "%s – tároló"
 
-#: ../meld/vcview.py:553
+#: ../meld/vcview.py:562
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (munka, tároló)"
 
-#: ../meld/vcview.py:557
+#: ../meld/vcview.py:566
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (tároló, munka)"
 
-#: ../meld/vcview.py:747
+#: ../meld/vcview.py:756
 msgid "Remove folder and all its files?"
 msgstr "Eltávolítja a mappát és benne minden fájlt?"
 
-#: ../meld/vcview.py:749
+#: ../meld/vcview.py:758
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2299,7 +2288,7 @@ 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:783
+#: ../meld/vcview.py:792
 #, python-format
 msgid "Error removing %s"
 msgstr "Hiba %s eltávolításakor"

From 9e40a70cfedcc725f301f0095f997e6b210960a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Valmary?= <cvalmary@yahoo.fr>
Date: Thu, 17 Mar 2016 21:37:24 +0000
Subject: [PATCH 43/44] Updated Occitan translation

---
 po/oc.po | 3309 +++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 2534 insertions(+), 775 deletions(-)

diff --git a/po/oc.po b/po/oc.po
index 28bf9986..a2e46d14 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -1,1165 +1,2924 @@
-# Translation of oc.po to Occitan
 # Occitan translation of Meld.
-# Copyright (C) 2003-2007 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
 # This file is distributed under the same license as the meld package.
-#
-# Yannig Marchegay (Kokoyaya) <yannig@marchegay.org>, 2006-2008
+# Cédric Valmary (totenoc.eu) <cvalmary@yahoo.fr>, 2016.
 msgid ""
 msgstr ""
-"Project-Id-Version: oc\n"
-"Report-Msgid-Bugs-To: Stephen Kennedy <stevek@gnome.org>\n"
-"POT-Creation-Date: 2008-06-09 15:21+0200\n"
-"PO-Revision-Date: 2008-06-11 13:40+0200\n"
-"Last-Translator: Yannig Marchegay (Kokoyaya) <yannig@marchegay.org>\n"
-"Language-Team: Occitan <ubuntu-l10n-oci@lists.ubuntu.com>\n"
-"Language: oc\n"
+"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: 2016-03-07 21:45+0000\n"
+"PO-Revision-Date: 2016-03-17 22:33+0100\n"
+"Last-Translator: Cédric Valmary (totenoc.eu) <cvalmary@yahoo.fr>\n"
+"Language-Team: Tot En Òc\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);"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Poedit 1.8.4\n"
+"X-Project-Style: gnome\n"
 
-#: ../dirdiff.py:252 ../dirdiff.py:267
-#, python-format
-msgid "Error converting pattern '%s' to regular expression"
-msgstr ""
+#: ../bin/meld:144
+msgid "Cannot import: "
+msgstr "Impossible d'importar : "
 
-#: ../dirdiff.py:283
-#, python-format
-msgid "Hide %s"
-msgstr "Amagar %s"
+#: ../bin/meld:147
+#, c-format
+msgid "Meld requires %s or higher."
+msgstr "Meld necessita %s o superior."
 
-#: ../dirdiff.py:364 ../dirdiff.py:374 ../vcview.py:213 ../vcview.py:241
-#, python-format
-msgid "[%s] Scanning %s"
+#: ../bin/meld:151
+msgid "Meld does not support Python 3."
 msgstr ""
 
-#: ../dirdiff.py:407
-#, python-format
-msgid "'%s' hidden by '%s'"
-msgstr "'%s' amagat per '%s'"
-
-#: ../dirdiff.py:413
-#, python-format
+#: ../bin/meld:200
+#, c-format
 msgid ""
-"You are running a case insensitive comparison on a case sensitive "
-"filesystem. Some files are not visible:\n"
+"Couldn't load Meld-specific CSS (%s)\n"
 "%s"
 msgstr ""
 
-#: ../dirdiff.py:487
-#, python-format
-msgid "[%s] Done"
-msgstr ""
+#: ../data/meld.desktop.in.h:1 ../data/meld.appdata.xml.in.h:1
+#: ../data/ui/meldapp.ui.h:1
+msgid "Meld"
+msgstr "Meld"
 
-#: ../dirdiff.py:533
-#, python-format
-msgid ""
-"'%s' exists.\n"
-"Overwrite?"
-msgstr ""
-"'%s' existís.\n"
-"Lo volètz remplaçar ?"
+#: ../data/meld.desktop.in.h:2
+msgid "Diff Viewer"
+msgstr "Visionador de diferéncias"
 
-#: ../dirdiff.py:540
-#, python-format
-msgid ""
-"Error copying '%s' to '%s'\n"
-"\n"
-"%s."
+#: ../data/meld.desktop.in.h:3
+msgid "Meld Diff Viewer"
+msgstr "Visionador de diferéncias Meld"
+
+#: ../data/meld.desktop.in.h:4 ../data/meld.appdata.xml.in.h:2
+msgid "Compare and merge your files"
+msgstr "Comparar e fusionar de fichièrs"
+
+#. 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 ""
-"Error al moment de copiar '%s' dins '%s'\n"
-"\n"
-"%s."
 
-#: ../dirdiff.py:558 ../vcview.py:405
-#, python-format
+#: ../data/meld.appdata.xml.in.h:3
 msgid ""
-"'%s' is a directory.\n"
-"Remove recusively?"
+"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 ""
 
-#: ../dirdiff.py:565 ../vcview.py:410
-#, python-format
+#: ../data/meld.appdata.xml.in.h:4
 msgid ""
-"Error removing %s\n"
-"\n"
-"%s."
+"Meld helps you review code changes, understand patches, and makes enormous merge "
+"conflicts slightly less painful."
 msgstr ""
-"Error al moment de suprimir %s\n"
-"%s."
-
-#: ../dirdiff.py:576
-#, python-format
-msgid "%i second"
-msgid_plural "%i seconds"
-msgstr[0] "%i segonda"
-msgstr[1] "%i segondas"
 
-#: ../dirdiff.py:577
-#, python-format
-msgid "%i minute"
-msgid_plural "%i minutes"
-msgstr[0] "%i minuta"
-msgstr[1] "%i minutas"
+#: ../data/mime/meld.xml.in.h:1
+#| msgid "Folder comparisons"
+msgid "Meld comparison description"
+msgstr ""
 
-#: ../dirdiff.py:578
-#, python-format
-msgid "%i hour"
-msgid_plural "%i hours"
-msgstr[0] "%i ora"
-msgstr[1] "%i oras"
+#: ../data/org.gnome.meld.gschema.xml.h:1
+msgid "Default window size"
+msgstr "Talha de fenèstra per defaut"
 
-#: ../dirdiff.py:579
-#, python-format
-msgid "%i day"
-msgid_plural "%i days"
-msgstr[0] "%i jorn"
-msgstr[1] "%i jorns"
+#: ../data/org.gnome.meld.gschema.xml.h:2
+msgid "Default window state"
+msgstr ""
 
-#: ../dirdiff.py:580
-#, python-format
-msgid "%i week"
-msgid_plural "%i weeks"
-msgstr[0] "%i setmana"
-msgstr[1] "%i setmanas"
+#: ../data/org.gnome.meld.gschema.xml.h:3
+#| msgid "Show or hide the toolbar"
+msgid "Show toolbar"
+msgstr "Aficha la barra d'aisinas"
 
-# python-format
-#: ../dirdiff.py:581
-#, python-format
-msgid "%i month"
-msgid_plural "%i months"
-msgstr[0] "%i mes"
-msgstr[1] "%i meses"
+#: ../data/org.gnome.meld.gschema.xml.h:4
+msgid "If true, the window toolbar is visible."
+msgstr ""
 
-#: ../dirdiff.py:582
-#, python-format
-msgid "%i year"
-msgid_plural "%i years"
-msgstr[0] "%i an"
-msgstr[1] "%i ans"
+#: ../data/org.gnome.meld.gschema.xml.h:5
+#| msgid "_Statusbar"
+msgid "Show statusbar"
+msgstr "Afichar la barra d'estat"
 
-#. Abbreviation for insert,overwrite so that it will fit in the status bar
-#: ../filediff.py:201
-msgid "INS,OVR"
+#: ../data/org.gnome.meld.gschema.xml.h:6
+msgid "If true, the window statusbar is visible."
 msgstr ""
 
-#. Abbreviation for line, column so that it will fit in the status bar
-#: ../filediff.py:203
-#, python-format
-msgid "Ln %i, Col %i"
-msgstr "Lin %i, col %i"
-
-#: ../filediff.py:261
-#, python-format
-msgid ""
-"Regular expression '%s' changed the number of lines in the file. Comparison "
-"will be incorrect. See the user manual for more details."
+#: ../data/org.gnome.meld.gschema.xml.h:7
+msgid "Additional automatically detected text encodings"
 msgstr ""
 
-#: ../filediff.py:504
-#, python-format
+#: ../data/org.gnome.meld.gschema.xml.h:8
 msgid ""
-"Regular expression error\n"
-"'%s'"
+"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 ""
 
-#: ../filediff.py:516
-#, python-format
-msgid "The regular expression '%s' was not found."
+#: ../data/org.gnome.meld.gschema.xml.h:9
+msgid "Width of an indentation step"
 msgstr ""
 
-#: ../filediff.py:518
-#, python-format
-msgid "The text '%s' was not found."
+#: ../data/org.gnome.meld.gschema.xml.h:10
+msgid "The number of spaces to use for a single indent step"
 msgstr ""
 
-#: ../filediff.py:571
-#, python-format
-msgid "[%s] Set num panes"
+#: ../data/org.gnome.meld.gschema.xml.h:11
+msgid "Whether to indent using spaces or tabs"
 msgstr ""
 
-#: ../filediff.py:578
-#, python-format
-msgid "[%s] Opening files"
+#: ../data/org.gnome.meld.gschema.xml.h:12
+msgid "If true, any new indentation will use spaces instead of tabs."
 msgstr ""
 
-#: ../filediff.py:595 ../filediff.py:609 ../filediff.py:625 ../filediff.py:632
-#, python-format
-msgid "Could not read from '%s'"
-msgstr ""
+#: ../data/org.gnome.meld.gschema.xml.h:13
+#| msgid "Show _line numbers"
+msgid "Show line numbers"
+msgstr "Afichar los numèros de _linhas"
 
-#: ../filediff.py:596 ../filediff.py:633
-msgid "The error was:"
+#: ../data/org.gnome.meld.gschema.xml.h:14
+msgid "If true, line numbers will be shown in the gutter of file comparisons."
 msgstr ""
 
-#: ../filediff.py:601
-#, python-format
-msgid "[%s] Reading files"
+#: ../data/org.gnome.meld.gschema.xml.h:15
+msgid "Highlight syntax"
 msgstr ""
 
-#: ../filediff.py:610
+#: ../data/org.gnome.meld.gschema.xml.h:16
 msgid ""
-"It contains ascii nulls.\n"
-"Perhaps it is a binary file."
+"Whether to highlight syntax in comparisons. Because of Meld's own color "
+"highlighting, this is off by default."
 msgstr ""
 
-#: ../filediff.py:626
-#, python-format
-msgid "I tried encodings %s."
+#: ../data/org.gnome.meld.gschema.xml.h:17
+#| msgid "Use s_yntax highlighting"
+msgid "Color scheme to use for syntax highlighting"
 msgstr ""
 
-#: ../filediff.py:655
-#, python-format
-msgid "[%s] Computing differences"
+#: ../data/org.gnome.meld.gschema.xml.h:18
+msgid "Used by GtkSourceView to determine colors for syntax highlighting"
 msgstr ""
 
-#: ../filediff.py:760
-#, python-format
-msgid ""
-"\"%s\" exists!\n"
-"Overwrite?"
+#: ../data/org.gnome.meld.gschema.xml.h:19
+#| msgid "Show w_hitespace"
+msgid "Displayed whitespace"
 msgstr ""
-"\"%s\" existís !\n"
-"Lo volètz remplaçar ?"
 
-#: ../filediff.py:773
-#, python-format
+#: ../data/org.gnome.meld.gschema.xml.h:20
 msgid ""
-"Error writing to %s\n"
-"\n"
-"%s."
-msgstr ""
-"Error al moment d'escriure dins %s\n"
-"\n"
-"%s."
-
-#: ../filediff.py:782
-#, python-format
-msgid "Choose a name for buffer %i."
+"Selector for individual whitespace character types to be shown. Possible values are "
+"'space', 'tab', 'newline' and 'nbsp'."
 msgstr ""
 
-#: ../filediff.py:795
-#, python-format
-msgid ""
-"This file '%s' contains a mixture of line endings.\n"
-"\n"
-"Which format would you like to use?"
+#: ../data/org.gnome.meld.gschema.xml.h:21
+#| msgid "Wrapped"
+msgid "Wrap mode"
 msgstr ""
 
-#: ../filediff.py:811
-#, python-format
+#: ../data/org.gnome.meld.gschema.xml.h:22
 msgid ""
-"'%s' contains characters not encodable with '%s'\n"
-"Would you like to save as UTF-8?"
+"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 ""
 
-#. save as
-#: ../filediff.py:862
-msgid "Save patch as..."
+#: ../data/org.gnome.meld.gschema.xml.h:23
+msgid "Highlight current line"
 msgstr ""
 
-#: ../filediff.py:916
-#, python-format
+#: ../data/org.gnome.meld.gschema.xml.h:24
 msgid ""
-"Reloading will discard changes in:\n"
-"%s\n"
-"\n"
-"You cannot undo this operation."
+"If true, the line containing the cursor will be highlighted in file comparisons."
 msgstr ""
 
-#: ../glade2/dirdiff.glade.h:1
-msgid "Case"
+#: ../data/org.gnome.meld.gschema.xml.h:25
+#| msgid "_Use the system fixed width font"
+msgid "Use the system default monospace font"
 msgstr ""
 
-#: ../glade2/dirdiff.glade.h:2
-msgid "Compare"
-msgstr "Comparar"
-
-#: ../glade2/dirdiff.glade.h:3 ../glade2/vcview.glade.h:6
-msgid "Compare selected"
+#: ../data/org.gnome.meld.gschema.xml.h:26
+msgid "If false, custom-font will be used instead of the system monospace font."
 msgstr ""
 
-#: ../glade2/dirdiff.glade.h:4
-msgid "Copy To Left"
+#: ../data/org.gnome.meld.gschema.xml.h:27
+msgid "Custom font"
 msgstr ""
 
-#: ../glade2/dirdiff.glade.h:5
-msgid "Copy To Right"
+#: ../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 ""
 
-#: ../glade2/dirdiff.glade.h:6
-msgid "Delete selected"
+#: ../data/org.gnome.meld.gschema.xml.h:29
+msgid "Ignore blank lines when comparing files"
 msgstr ""
 
-#: ../glade2/dirdiff.glade.h:7 ../glade2/filediff.glade.h:7
-msgid "Edit"
-msgstr "Edicion"
+#: ../data/org.gnome.meld.gschema.xml.h:30
+msgid "If true, blank lines will be trimmed when highlighting changes between files."
+msgstr ""
 
-#: ../glade2/dirdiff.glade.h:8
-msgid "Hide selected"
+#: ../data/org.gnome.meld.gschema.xml.h:31
+#| msgid "Use _default system editor"
+msgid "Use the system default editor"
 msgstr ""
 
-#: ../glade2/dirdiff.glade.h:9
-msgid "Hide..."
-msgstr "Amagar..."
+#: ../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 ""
 
-#: ../glade2/dirdiff.glade.h:10
-msgid "Ignore case of entries"
+#: ../data/org.gnome.meld.gschema.xml.h:33
+msgid "The custom editor launch command"
 msgstr ""
 
-#: ../glade2/dirdiff.glade.h:11
-msgid "Left"
-msgstr "Esquèrra"
+#: ../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 ""
 
-#: ../glade2/dirdiff.glade.h:12
-msgid "Modified"
-msgstr "Modificat"
+#: ../data/org.gnome.meld.gschema.xml.h:35
+msgid "Columns to display"
+msgstr ""
 
-#: ../glade2/dirdiff.glade.h:13 ../glade2/meldapp.glade.h:50
-msgid "New"
-msgstr "Novèl"
+#: ../data/org.gnome.meld.gschema.xml.h:36
+msgid "List of column names in folder comparison and whether they should be displayed."
+msgstr ""
 
-#: ../glade2/dirdiff.glade.h:14
-msgid "Right"
-msgstr "Drecha"
+#: ../data/org.gnome.meld.gschema.xml.h:37 ../data/ui/preferences.ui.h:32
+msgid "Ignore symbolic links"
+msgstr "Ignorar los ligams simbolics"
 
-#: ../glade2/dirdiff.glade.h:15
-msgid "Same"
+#: ../data/org.gnome.meld.gschema.xml.h:38
+msgid ""
+"If true, folder comparisons do not follow symbolic links when traversing the folder "
+"tree."
 msgstr ""
 
-#: ../glade2/dirdiff.glade.h:16
-msgid "Show identical"
+#: ../data/org.gnome.meld.gschema.xml.h:39
+#| msgid "Shallow comparison"
+msgid "Use shallow comparison"
 msgstr ""
 
-#: ../glade2/dirdiff.glade.h:17 ../glade2/vcview.glade.h:20
-msgid "Show modified"
+#: ../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 ""
 
-#: ../glade2/dirdiff.glade.h:18
-msgid "Show new"
+#: ../data/org.gnome.meld.gschema.xml.h:41
+#| msgid "_Timestamp resolution:"
+msgid "File timestamp resolution"
 msgstr ""
 
-#: ../glade2/dirdiff.glade.h:19 ../glade2/meldapp.glade.h:89
-#: ../glade2/vcview.glade.h:28
-msgid "_Compare"
-msgstr "_Comparar"
+#: ../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 ""
 
-#: ../glade2/dirdiff.glade.h:20
-msgid "_Delete Selected"
+#: ../data/org.gnome.meld.gschema.xml.h:43 ../data/ui/preferences.ui.h:30
+msgid "Apply text filters during folder comparisons"
 msgstr ""
 
-#: ../glade2/filediff.glade.h:1
+#: ../data/org.gnome.meld.gschema.xml.h:44
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Some files have been modified.\n"
-"Which ones would you like to save?</span>"
+"If true, folder comparisons that compare file contents also apply active text "
+"filters and the blank line trimming option, and ignòra newline differences."
 msgstr ""
 
-#: ../glade2/filediff.glade.h:3
-msgid "Copy All To _Left"
+#: ../data/org.gnome.meld.gschema.xml.h:45
+#| msgid "File filters"
+msgid "File status filters"
 msgstr ""
 
-#: ../glade2/filediff.glade.h:4
-msgid "Copy All To _Right"
+#: ../data/org.gnome.meld.gschema.xml.h:46
+msgid "List of statuses used to filter visible files in folder comparison."
 msgstr ""
 
-#: ../glade2/filediff.glade.h:5
-msgid "Copy to Clipboard"
+#: ../data/org.gnome.meld.gschema.xml.h:47
+#| msgid "Start a version control comparison"
+msgid "Show the version control console output"
 msgstr ""
 
-#: ../glade2/filediff.glade.h:6
-msgid "Create Patch"
+#: ../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 ""
 
-#: ../glade2/filediff.glade.h:8
-msgid "Find"
-msgstr "Recercar"
-
-#: ../glade2/filediff.glade.h:9
-msgid "Match _entire word only"
+#: ../data/org.gnome.meld.gschema.xml.h:49
+#| msgid "Version control view"
+msgid "Version control pane position"
 msgstr ""
 
-#: ../glade2/filediff.glade.h:10
-msgid "Regular e_xpression"
+#: ../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 ""
 
-#: ../glade2/filediff.glade.h:11
-msgid "Save modified files?"
+#: ../data/org.gnome.meld.gschema.xml.h:51
+msgid "Present version comparisons as left-local/right-remote"
 msgstr ""
 
-#: ../glade2/filediff.glade.h:12
-msgid "Search for:"
-msgstr "Recercar :"
-
-#: ../glade2/filediff.glade.h:13
-msgid "_Match case"
+#: ../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 ""
 
-#: ../glade2/filediff.glade.h:14
-msgid "_Wrap around"
+#: ../data/org.gnome.meld.gschema.xml.h:53
+#| msgid "Start a version control comparison"
+msgid "Order for files in three-way version control merge comparisons"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:1
-msgid "(gnome-default-editor)"
+#: ../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 ""
 
-#: ../glade2/meldapp.glade.h:2
-msgid "<b>Drawing Style</b>"
+#: ../data/org.gnome.meld.gschema.xml.h:55
+msgid "Show margin in commit message editor"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:3
-msgid "<b>Edit Menu</b>"
+#: ../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 ""
 
-#: ../glade2/meldapp.glade.h:4
-msgid "<b>Font</b>"
-msgstr "<b>Poliça</b>"
-
-#: ../glade2/meldapp.glade.h:5
-msgid "<b>Global options</b>"
-msgstr "<b>Opcions globalas</b>"
-
-#: ../glade2/meldapp.glade.h:6
-msgid "<b>Loading</b>"
-msgstr "<b>Cargament</b>"
-
-#: ../glade2/meldapp.glade.h:7
-msgid "<b>Misc</b>"
+#: ../data/org.gnome.meld.gschema.xml.h:57
+msgid "Margin column in commit message editor"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:8
-msgid "<b>Saving</b>"
-msgstr "<b>Enregistrament</b>"
-
-#: ../glade2/meldapp.glade.h:9
-msgid "<b>Toolbar Appearance</b>"
+#: ../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 ""
 
-#: ../glade2/meldapp.glade.h:10
-msgid "<b>Update Options</b>"
-msgstr "<b>Opcions de mesa a jorn</b>"
+#: ../data/org.gnome.meld.gschema.xml.h:59
+msgid "Automatically hard-wrap commit messages"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:11
-msgid "<b>Whitespace</b>"
+#: ../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 ""
 
-#: ../glade2/meldapp.glade.h:12
-msgid "<span weight=\"bold\" size=\"x-large\">CVS</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">CVS</span>"
+#: ../data/org.gnome.meld.gschema.xml.h:61
+#| msgid "Version control view"
+msgid "Version control status filters"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:13
-msgid "<span weight=\"bold\" size=\"x-large\">Compare</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Comparar</span>"
+#: ../data/org.gnome.meld.gschema.xml.h:62
+msgid "List of statuses used to filter visible files in version control comparison."
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:14
-msgid "<span weight=\"bold\" size=\"x-large\">Display</span>"
+#: ../data/org.gnome.meld.gschema.xml.h:63
+#| msgid "File filters"
+msgid "Filename-based filters"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:15
-msgid "<span weight=\"bold\" size=\"x-large\">Editor</span>"
+#: ../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 ""
 
-#: ../glade2/meldapp.glade.h:16
-msgid "<span weight=\"bold\" size=\"x-large\">Encoding</span>"
+#: ../data/org.gnome.meld.gschema.xml.h:65
+#| msgid "Text Filters"
+msgid "Text-based filters"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:17
-msgid "<span weight=\"bold\" size=\"x-large\">File Filters</span>"
+#: ../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 ""
 
-#: ../glade2/meldapp.glade.h:18
-msgid "<span weight=\"bold\" size=\"x-large\">Text Filters</span>"
+#: ../data/styles/meld-base.xml.h:1
+msgid "Meld base scheme"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:19
-msgid "Automatically supply missing newline at end of file"
+#: ../data/styles/meld-base.xml.h:2
+msgid "Base color scheme for Meld highlighting"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:20
-msgid "CVS"
-msgstr "CVS"
+#: ../data/styles/meld-dark.xml.h:1
+msgid "Meld dark scheme"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:21
-msgid "CVS binary"
+#: ../data/styles/meld-dark.xml.h:2
+msgid "Dark color scheme for Meld highlighting"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:22
-msgid "Choose Files"
-msgstr "Causissètz de fichièrs"
+#: ../data/ui/application.ui.h:1
+msgid "About Meld"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:23
+#: ../data/ui/application.ui.h:2
+#| msgid ""
+#| "Copyright &#xA9; 2002-2009 Stephen Kennedy\n"
+#| "Copyright &#xA9; 2009-2012 Kai Willadsen"
 msgid ""
-"Choose how the central bar of the diff viewer is drawn. You may wish to "
-"choose a simpler mode if you find scrolling is slow."
+"Copyright © 2002-2009 Stephen Kennedy\n"
+"Copyright © 2009-2013 Kai Willadsen"
 msgstr ""
+"Copyright © 2002-2009 Stephen Kennedy\n"
+"Copyright © 2009-2013 Kai Willadsen"
 
-#: ../glade2/meldapp.glade.h:24
-msgid "Copyright (C) 2002-2006 Stephen Kennedy"
-msgstr "Copyright (C) 2002-2006 Stephen Kennedy"
+#: ../data/ui/application.ui.h:4
+msgid "Website"
+msgstr "Site internet"
 
-#: ../glade2/meldapp.glade.h:25
-msgid "Create missing directories (-d)"
-msgstr ""
+#: ../data/ui/application.ui.h:5
+msgid "translator-credits"
+msgstr "Cédric Valmary (totenoc.eu) <cvalmary@yahoo.fr>"
 
-#: ../glade2/meldapp.glade.h:26
-msgid "Curved: Filled Curves"
-msgstr ""
+#: ../data/ui/application.ui.h:6
+#| msgid "Prefere_nces"
+msgid "_Preferences"
+msgstr "_Preferéncias"
 
-#: ../glade2/meldapp.glade.h:27
-msgid "Custom command"
-msgstr "Comanda personalizada"
+#: ../data/ui/application.ui.h:7
+msgid "_Help"
+msgstr "A_juda"
 
-#: ../glade2/meldapp.glade.h:28
-msgid "Directory"
-msgstr "Repertòri"
+#: ../data/ui/application.ui.h:8
+msgid "Keyboard Shortcuts"
+msgstr "Acorchis de clavièr"
 
-#: ../glade2/meldapp.glade.h:29
-msgid "Display"
-msgstr "Visualizar"
+#: ../data/ui/application.ui.h:9
+msgid "_About"
+msgstr "_A prepaus"
 
-#: ../glade2/meldapp.glade.h:30
-msgid "Down"
-msgstr ""
+#: ../data/ui/application.ui.h:10
+msgid "_Quit"
+msgstr "_Quitar"
 
-#: ../glade2/meldapp.glade.h:31
-msgid "Edit files with:"
-msgstr ""
+#: ../data/ui/dirdiff.ui.h:1 ../data/ui/vcview.ui.h:1
+msgid "_Compare"
+msgstr "_Comparar"
 
-#: ../glade2/meldapp.glade.h:32
-msgid "Editor"
-msgstr "Editor"
+#: ../data/ui/dirdiff.ui.h:2 ../data/ui/vcview.ui.h:2
+#| msgid "Compare selected"
+msgid "Compare selected files"
+msgstr "Comparar los fichièrs seleccionats"
 
-#: ../glade2/meldapp.glade.h:33
-msgid "Encoding"
-msgstr ""
+#: ../data/ui/dirdiff.ui.h:3
+#| msgid "Copy to left"
+msgid "Copy to _Left"
+msgstr "Còpia cap a es_quèrra"
 
-# "<span weight=\"bold\" size=\"larger\">Des fichiers ont été modifiés.\n"
-# "Lesquels souhaitez vous sauvegarder ?</span>"
-#: ../glade2/meldapp.glade.h:34
-msgid "File Filters"
-msgstr ""
+#: ../data/ui/dirdiff.ui.h:4
+msgid "Copy to left"
+msgstr "Còpia cap a esquèrra"
 
-#: ../glade2/meldapp.glade.h:35
-msgid "Find Ne_xt"
-msgstr ""
+#: ../data/ui/dirdiff.ui.h:5
+#| msgid "Copy to right"
+msgid "Copy to _Right"
+msgstr "Còpia cap a _drecha"
 
-#: ../glade2/meldapp.glade.h:36
-msgid "Gnome Default"
-msgstr ""
+#: ../data/ui/dirdiff.ui.h:6
+msgid "Copy to right"
+msgstr "Còpia cap a drecha"
 
-#: ../glade2/meldapp.glade.h:37
-msgid "Gnome default editor"
-msgstr ""
+#: ../data/ui/dirdiff.ui.h:7
+msgid "Delete selected"
+msgstr "Escafar la seleccion"
 
-#: ../glade2/meldapp.glade.h:38
-msgid "Icons Only"
-msgstr "Sonque icònas"
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1381
+msgid "Hide"
+msgstr "Amagar"
 
-#: ../glade2/meldapp.glade.h:39
-msgid "Ignore .cvsrc (-f)"
-msgstr "Ignorar .cvsrc (-f)"
+#: ../data/ui/dirdiff.ui.h:9
+msgid "Hide selected"
+msgstr "Amagar la seleccion"
 
-#: ../glade2/meldapp.glade.h:40
-msgid "Ignore changes in amount of white space"
-msgstr ""
+#: ../data/ui/dirdiff.ui.h:10
+#| msgid "Ignore filename case"
+msgid "Ignore Filename Case"
+msgstr "Ignorar la cassa del nom de fichièr"
 
-#: ../glade2/meldapp.glade.h:41
+#: ../data/ui/dirdiff.ui.h:11
 msgid ""
-"Ignore changes in case; consider upper and lower-case letters equivalent"
+"Consider differently-cased filenames that are otherwise-identical to be the same"
 msgstr ""
+"Considerar que de noms de fichièrs amb una cassa diferenta pòdon èsser identics "
+"malgrat tot"
 
-#: ../glade2/meldapp.glade.h:42
-msgid "Ignore changes that just insert or delete blank lines"
-msgstr ""
+#: ../data/ui/dirdiff.ui.h:12
+msgid "Same"
+msgstr "Identics"
 
-#: ../glade2/meldapp.glade.h:43
-msgid "Ignore changes which insert or delete blank lines"
-msgstr ""
+#: ../data/ui/dirdiff.ui.h:13
+msgid "Show identical"
+msgstr "Afichar los fichièrs identiques"
 
-#: ../glade2/meldapp.glade.h:44
-msgid "Ignore symbolic links"
-msgstr ""
+#: ../data/ui/dirdiff.ui.h:14
+msgid "New"
+msgstr "Novèls"
 
-#: ../glade2/meldapp.glade.h:45
-msgid "Internal editor"
-msgstr ""
+#: ../data/ui/dirdiff.ui.h:15
+msgid "Show new"
+msgstr "Afichar los novèls fichièrs"
 
-#: ../glade2/meldapp.glade.h:46
-msgid "Line Wrapping "
-msgstr ""
+#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:74
+msgid "Modified"
+msgstr "Modificats"
 
-#: ../glade2/meldapp.glade.h:47
-msgid "Mailing _List"
-msgstr ""
+#: ../data/ui/dirdiff.ui.h:17
+msgid "Show modified"
+msgstr "Afichar los fichièrs modificats"
 
-#: ../glade2/meldapp.glade.h:48
-msgid "Meld"
-msgstr ""
+#: ../data/ui/dirdiff.ui.h:18
+msgid "Filters"
+msgstr "Filtres"
 
-#: ../glade2/meldapp.glade.h:49
-msgid "Mine"
-msgstr ""
+#: ../data/ui/dirdiff.ui.h:19
+msgid "Set active filters"
+msgstr "Definir los filtres actius"
 
-#: ../glade2/meldapp.glade.h:51
-msgid "Original"
-msgstr "Original"
+#: ../data/ui/EditableList.ui.h:1
+msgid "Editable List"
+msgstr "Lista modificabla"
 
-#: ../glade2/meldapp.glade.h:52
-msgid "Other"
-msgstr "Autre"
+#: ../data/ui/EditableList.ui.h:2
+msgid "Active"
+msgstr "Actiu"
 
-#: ../glade2/meldapp.glade.h:53
-msgid "Preferences : Meld"
-msgstr "Preferéncias : Meld"
+#: ../data/ui/EditableList.ui.h:3
+#| msgid "Column name"
+msgid "Column Name"
+msgstr "Nom de colomna"
 
-#: ../glade2/meldapp.glade.h:54
-msgid "Prune empty directories (-P)"
-msgstr ""
+#: ../data/ui/EditableList.ui.h:4 ../data/ui/vcview.ui.h:9
+msgid "_Add"
+msgstr "_Apondre"
 
-#: ../glade2/meldapp.glade.h:55
-msgid "Quiet mode (-q)"
-msgstr ""
+#: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11 ../meld/vcview.py:649
+msgid "_Remove"
+msgstr "_Suprimir"
 
-#: ../glade2/meldapp.glade.h:56
-msgid "Redo"
-msgstr "Tornar far"
+#: ../data/ui/EditableList.ui.h:6
+msgid "Move item up"
+msgstr "Fa montar l'element"
 
-#: ../glade2/meldapp.glade.h:57
-msgid "Refresh"
-msgstr "Actualizar"
+#: ../data/ui/EditableList.ui.h:7
+msgid "Move _Up"
+msgstr "_Montar"
 
-#: ../glade2/meldapp.glade.h:58
-msgid "Reload"
-msgstr "Tornar cargar"
+#: ../data/ui/EditableList.ui.h:8
+msgid "Move item down"
+msgstr "Fait davalar l'element"
 
-#: ../glade2/meldapp.glade.h:59
-msgid "Report _Bug"
-msgstr ""
+#: ../data/ui/EditableList.ui.h:9
+msgid "Move _Down"
+msgstr "_Davalar"
+
+#. Create icon and filename CellRenderer
+#: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35 ../meld/dirdiff.py:372
+msgid "Name"
+msgstr "Nom"
+
+#: ../data/ui/EditableList.ui.h:11
+msgid "Pattern"
+msgstr "Motiu"
 
-#: ../glade2/meldapp.glade.h:60
-msgid "Save"
-msgstr "Enregistrar"
+#: ../data/ui/EditableList.ui.h:12
+msgid "Add new filter"
+msgstr "Apondre un novèl filtre"
 
-#: ../glade2/meldapp.glade.h:61
-msgid "Save _As"
-msgstr "Enregistrar _coma"
+#: ../data/ui/EditableList.ui.h:13
+msgid "Remove selected filter"
+msgstr "Montar lo filtre seleccionat"
 
-#: ../glade2/meldapp.glade.h:62
-msgid "Save in UTF-8 encoding"
-msgstr ""
+#: ../data/ui/filediff.ui.h:1
+#| msgid "Format as patch..."
+msgid "Format as Patch..."
+msgstr "Metre jos la forma de correctiu..."
 
-#: ../glade2/meldapp.glade.h:63
-msgid "Save in the files original encoding"
-msgstr ""
+#: ../data/ui/filediff.ui.h:2
+msgid "Create a patch using differences between files"
+msgstr "Crèa un correctiu (patch) en utilizant las diferéncias entre los fichièrs"
 
-#: ../glade2/meldapp.glade.h:64
-msgid "Show line numbers"
+#: ../data/ui/filediff.ui.h:3
+msgid "Save A_ll"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:65
-msgid "Simple: Lines only"
+#: ../data/ui/filediff.ui.h:4
+#| msgid "Start a version control comparison"
+msgid "Save all files in the current comparison"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:66
-msgid "Solid: Filled Quadilaterals"
+#: ../data/ui/filediff.ui.h:5
+msgid "Revert files to their saved versions"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:67
-msgid "Stop"
+#: ../data/ui/filediff.ui.h:6
+msgid "Add Synchronization Point"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:68
-msgid "Tab width"
+#: ../data/ui/filediff.ui.h:7
+msgid "Add a synchronization point for changes between files"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:69
-msgid "Text Beside Icons"
+#: ../data/ui/filediff.ui.h:8
+msgid "Clear Synchronization Points"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:70
-msgid "Text Filters"
+#: ../data/ui/filediff.ui.h:9
+msgid "Clear sychronization points for changes between files"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:71
-msgid "Text Only"
-msgstr "Sonque tèxt"
+#: ../data/ui/filediff.ui.h:10
+#| msgid "Previous conflict"
+msgid "Previous Conflict"
+msgstr "Conflicte precedent"
 
-#: ../glade2/meldapp.glade.h:72
-msgid "Text Under Icons"
-msgstr ""
+#: ../data/ui/filediff.ui.h:11
+msgid "Go to the previous conflict"
+msgstr "Tòrna al conflicte precedent"
 
-#: ../glade2/meldapp.glade.h:73
-msgid "Three way directory"
-msgstr ""
+#: ../data/ui/filediff.ui.h:12
+#| msgid "Next conflict"
+msgid "Next Conflict"
+msgstr "Conflicte seguent"
 
-#: ../glade2/meldapp.glade.h:74
-msgid "Three way file"
-msgstr ""
+#: ../data/ui/filediff.ui.h:13
+msgid "Go to the next conflict"
+msgstr "Va al conflicte seguent"
 
-#: ../glade2/meldapp.glade.h:75
-msgid "Two way directory"
-msgstr ""
+#: ../data/ui/filediff.ui.h:14
+#| msgid "Push to left"
+msgid "Push to Left"
+msgstr "Mandar a esquèrra"
 
-#: ../glade2/meldapp.glade.h:76
-msgid "Two way file"
-msgstr ""
+#: ../data/ui/filediff.ui.h:15
+msgid "Push current change to the left"
+msgstr "Manda la modificacion actuala cap a esquèrra"
 
-#: ../glade2/meldapp.glade.h:77
-msgid "Undo"
-msgstr "Anullar"
+#: ../data/ui/filediff.ui.h:16
+#| msgid "Push to right"
+msgid "Push to Right"
+msgstr "Mandar a drecha"
 
-#: ../glade2/meldapp.glade.h:78
-msgid "Up"
-msgstr "Aval"
+#: ../data/ui/filediff.ui.h:17
+msgid "Push current change to the right"
+msgstr "Manda la modificacion actuala cap a drecha"
 
-#: ../glade2/meldapp.glade.h:79
-msgid "Use Compression (-z)"
-msgstr ""
+#: ../data/ui/filediff.ui.h:18
+#| msgid "Pull from left"
+msgid "Pull from Left"
+msgstr "Recuperar d'esquèrra"
 
-#: ../glade2/meldapp.glade.h:80
-msgid "Use GNOME monospace font"
-msgstr ""
+#: ../data/ui/filediff.ui.h:19
+msgid "Pull change from the left"
+msgstr "Recupèra la modificacion d'esquèrra"
 
-#: ../glade2/meldapp.glade.h:81
-msgid "Use custom font"
-msgstr ""
+#: ../data/ui/filediff.ui.h:20
+#| msgid "Pull from right"
+msgid "Pull from Right"
+msgstr "Recuperar de drecha"
 
-#: ../glade2/meldapp.glade.h:82
-msgid "Use syntax highlighting"
-msgstr ""
+#: ../data/ui/filediff.ui.h:21
+msgid "Pull change from the right"
+msgstr "Recupèra la modificacion de drecha"
 
-#: ../glade2/meldapp.glade.h:83
-msgid "Version control view"
-msgstr ""
+#: ../data/ui/filediff.ui.h:22
+#| msgid "Copy above left"
+msgid "Copy Above Left"
+msgstr "Copiar en dessús d'esquèrra"
 
-#: ../glade2/meldapp.glade.h:84
-msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
-msgstr ""
+#: ../data/ui/filediff.ui.h:23
+msgid "Copy change above the left chunk"
+msgstr "Còpia la modificacion en dessús del segment d'esquèrra"
 
-#: ../glade2/meldapp.glade.h:85
-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 ""
+#: ../data/ui/filediff.ui.h:24
+#| msgid "Copy below left"
+msgid "Copy Below Left"
+msgstr "Copiar en dejós d'esquèrra"
 
-#: ../glade2/meldapp.glade.h:86
-msgid ""
-"When performing file comparisons, you may ignore certain types of changes. "
-"Each pattern here is a python regular expression which replaces matching "
-"text with the empty string before comparison is performed. If the expression "
-"contains groups, only the groups are replaced. See the user manual for more "
-"details."
-msgstr ""
+#: ../data/ui/filediff.ui.h:25
+msgid "Copy change below the left chunk"
+msgstr "Còpia la modificacion en dejós del segment d'esquèrra"
 
-#: ../glade2/meldapp.glade.h:87
-msgid "Whitespace is significant"
-msgstr ""
+#: ../data/ui/filediff.ui.h:26
+#| msgid "Copy above right"
+msgid "Copy Above Right"
+msgstr "Copiar en dessús de la drecha"
 
-#: ../glade2/meldapp.glade.h:88
-msgid "Yes"
-msgstr "Òc"
+#: ../data/ui/filediff.ui.h:27
+msgid "Copy change above the right chunk"
+msgstr "Còpia la modificacion en dessús del segment de drecha"
 
-#: ../glade2/meldapp.glade.h:90
-msgid "_Contents"
-msgstr "_Ensenhador"
+#: ../data/ui/filediff.ui.h:28
+#| msgid "Copy below right"
+msgid "Copy Below Right"
+msgstr "Copiar en dejós de drecha"
 
-#: ../glade2/meldapp.glade.h:91
-msgid "_Directory Comparison"
-msgstr ""
+#: ../data/ui/filediff.ui.h:29
+msgid "Copy change below the right chunk"
+msgstr "Còpia la modificacion en dejós del segment de drecha"
 
-#: ../glade2/meldapp.glade.h:92
-msgid "_Down"
-msgstr ""
+#: ../data/ui/filediff.ui.h:30
+msgid "Delete"
+msgstr "Suprimir"
 
-#: ../glade2/meldapp.glade.h:93 ../glade2/vcview.glade.h:29
-msgid "_Edit"
-msgstr "_Edicion"
+#: ../data/ui/filediff.ui.h:31
+msgid "Delete change"
+msgstr "Suprimir las modificacions"
 
-#: ../glade2/meldapp.glade.h:94
-msgid "_File"
-msgstr "_Fichièr"
+#: ../data/ui/filediff.ui.h:32
+#| msgid "Merge all changes from left"
+msgid "Merge All from Left"
+msgstr "Fusiona totas las modificacions d'esquèrra"
 
-#: ../glade2/meldapp.glade.h:95
-msgid "_File Comparison"
+#: ../data/ui/filediff.ui.h:33
+msgid "Merge all pas conflicting changes from the left"
+msgstr "Fusiona totas las modificacions pas conflictualas d'esquèrra"
+
+#: ../data/ui/filediff.ui.h:34
+#| msgid "Merge all changes from right"
+msgid "Merge All from Right"
+msgstr "Fusiona totas las modificacions de drecha"
+
+#: ../data/ui/filediff.ui.h:35
+msgid "Merge all pas conflicting changes from the right"
+msgstr "Fusiona totas las modificacions pas conflictualas de drecha"
+
+#: ../data/ui/filediff.ui.h:36
+msgid "Merge All"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:96
-msgid "_Help"
+#: ../data/ui/filediff.ui.h:37
+msgid "Merge all pas conflicting changes from left and right panes"
 msgstr ""
+"Fusiona totas las modificacions pas conflictualas dels panèls d'esquèrra et de drecha"
 
-#: ../glade2/meldapp.glade.h:97
-msgid "_Logo"
+#: ../data/ui/filediff.ui.h:38
+#| msgid "Previous change"
+msgid "Previous Pane"
 msgstr ""
 
-#: ../glade2/meldapp.glade.h:98
-msgid "_New..."
-msgstr "_Novèl..."
+#: ../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 "Desplaçar lo focus clavièr cap al document seguent dins aquesta comparason"
+
+#: ../data/ui/filediff.ui.h:40
+#| msgid "Next change"
+msgid "Next Pane"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:41
+msgid "Move keyboard focus to the next document in this comparison"
+msgstr "Desplaçar lo focus clavièr cap al document seguent dins aquesta comparason"
+
+#: ../data/ui/filediff.ui.h:42
+#| msgid "Lock scrolling"
+msgid "Lock Scrolling"
+msgstr "Verrolhar lo desfilament"
 
-#: ../glade2/meldapp.glade.h:99
+#: ../data/ui/filediff.ui.h:43
+msgid "Lock scrolling of all panes"
+msgstr "Verrouille lo desfilament de totes los panèls"
+
+#: ../data/ui/filediff.ui.h:44
+msgid "Save changes to documents before closing?"
+msgstr "Enregistrar las modificacions abans de fermer ?"
+
+#: ../data/ui/filediff.ui.h:45
+msgid "If you don't save, changes will be permanently lost."
+msgstr "Se enregistratz pas, las modificacions seràn definitivament perdudas."
+
+#: ../data/ui/filediff.ui.h:46
+#| msgid "Close _without saving"
+msgid "Close _without Saving"
+msgstr "Tampar _sens enregistrar"
+
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1447
+#: ../meld/filediff.py:1515
+msgid "_Cancel"
+msgstr "_Anullar"
+
+#: ../data/ui/filediff.ui.h:48
 msgid "_Save"
 msgstr "_Enregistrar"
 
-#: ../glade2/meldapp.glade.h:100
-msgid "_Stop"
+#: ../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 ""
+"Aqueste fichièr es pas accessible en escritura. En clicant aicí, podètz efectuar "
+"malgrat tot de modificacions, a condicion de las enregistrar dins un novèl fichièr."
 
-#: ../glade2/meldapp.glade.h:101
-msgid "_Three Way Compare"
-msgstr ""
+#: ../data/ui/filediff.ui.h:50
+#| msgid "_File"
+msgid "File 3"
+msgstr "Fichièr 3"
 
-#: ../glade2/meldapp.glade.h:102
-msgid "_Up"
-msgstr "_Aval"
+#: ../data/ui/filediff.ui.h:51
+#| msgid "_File"
+msgid "File 2"
+msgstr "Fichièr 2"
 
-#: ../glade2/meldapp.glade.h:103
-msgid "_Version Control Browser"
-msgstr ""
+#: ../data/ui/filediff.ui.h:52
+#| msgid "_File"
+msgid "File 1"
+msgstr "Fichièr 1"
 
-#: ../glade2/meldapp.glade.h:104
-msgid "_View"
+#: ../data/ui/filediff.ui.h:53
+#| msgid "Save changes to documents before closing?"
+msgid "Revert unsaved changes to documents?"
 msgstr ""
 
-#: ../glade2/vcview.glade.h:1
-msgid "Add _Binary"
+#: ../data/ui/filediff.ui.h:54
+msgid "Changes made to the following documents will be permanently lost:\n"
 msgstr ""
 
-#: ../glade2/vcview.glade.h:2
-msgid "Add to VC"
-msgstr ""
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1448
+msgid "_Replace"
+msgstr "_Remplaçar"
 
-#: ../glade2/vcview.glade.h:3
-msgid "Commit"
-msgstr ""
+#: ../data/ui/findbar.ui.h:2
+msgid "Replace _All"
+msgstr "Remplaçar _tot"
 
-#: ../glade2/vcview.glade.h:4
-msgid "Commit Files"
-msgstr ""
+#: ../data/ui/findbar.ui.h:3
+msgid "_Previous"
+msgstr "_Precedent"
 
-#: ../glade2/vcview.glade.h:5
-msgid "Compare Options"
-msgstr "Comparar las opcions"
+#: ../data/ui/findbar.ui.h:4
+msgid "_Next"
+msgstr "_Seguent"
 
-#: ../glade2/vcview.glade.h:7
-msgid "Date"
-msgstr "Data"
+#: ../data/ui/findbar.ui.h:5
+msgid "Find:"
+msgstr "Recercar :"
 
-#: ../glade2/vcview.glade.h:8
-msgid "Delete locally"
-msgstr "Suprimir en local"
+#: ../data/ui/findbar.ui.h:6
+msgid "Replace _with:"
+msgstr "Remplaçar _par :"
 
-#: ../glade2/vcview.glade.h:9
-msgid "Flatten directories"
-msgstr ""
+#: ../data/ui/findbar.ui.h:7
+#| msgid "_Match Case"
+msgid "_Match case"
+msgstr "Res_pectar la cassa"
 
-#: ../glade2/vcview.glade.h:10
-msgid "Ignored"
-msgstr "Ignorat"
+#: ../data/ui/findbar.ui.h:8
+msgid "Who_le word"
+msgstr "_Mots entièrs"
 
-#: ../glade2/vcview.glade.h:11
-msgid "Local copy against other remote revision"
-msgstr ""
+#: ../data/ui/findbar.ui.h:9
+#| msgid "Regular E_xpression"
+msgid "Regular e_xpression"
+msgstr "E_xpression regulara"
 
-#: ../glade2/vcview.glade.h:12
-msgid "Local copy against same remote revision"
-msgstr ""
+#: ../data/ui/findbar.ui.h:10
+msgid "Wrapped"
+msgstr "Mots coupés"
 
-#: ../glade2/vcview.glade.h:13
-msgid "Log Message"
-msgstr ""
+#: ../data/ui/patch-dialog.ui.h:1
+#| msgid "Format as patch..."
+msgid "Format as Patch"
+msgstr "Metre jos la forma de correctiu..."
 
-#: ../glade2/vcview.glade.h:14
-msgid "Non _VC"
-msgstr ""
+#: ../data/ui/patch-dialog.ui.h:2
+msgid "Copy to Clipboard"
+msgstr "Copiar cap al quichapapièrs"
 
-#: ../glade2/vcview.glade.h:15
-msgid "Previous Logs"
-msgstr ""
+#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:149
+#| msgid "Save Patch As..."
+msgid "Save Patch"
+msgstr "Enregistrar lo correctiu"
 
-#: ../glade2/vcview.glade.h:16
-msgid "Remove _Locally"
-msgstr ""
+#: ../data/ui/patch-dialog.ui.h:4
+msgid "Use differences between:"
+msgstr "Utilizar las diferéncias entre :"
 
-#: ../glade2/vcview.glade.h:17
-msgid "Remove from VC"
-msgstr ""
+#: ../data/ui/patch-dialog.ui.h:5
+msgid "Left and middle panes"
+msgstr "Panèls d'esquèrra e del mitan"
 
-#: ../glade2/vcview.glade.h:18
-msgid "Revert to original"
-msgstr ""
+#: ../data/ui/patch-dialog.ui.h:6
+msgid "Middle and right panes"
+msgstr "Panèls del mitan e de drecha"
 
-#: ../glade2/vcview.glade.h:19
-msgid "Show ignored files"
-msgstr ""
+#: ../data/ui/patch-dialog.ui.h:7
+msgid "_Reverse patch direction"
+msgstr "Inve_rsar la direccion del correctiu"
 
-#: ../glade2/vcview.glade.h:21
-msgid "Show normal"
+#: ../data/ui/preferences.ui.h:1
+msgid "Left is remote, right is local"
 msgstr ""
 
-#: ../glade2/vcview.glade.h:22
-msgid "Show unversioned files"
+#: ../data/ui/preferences.ui.h:2
+msgid "Left is local, right is remote"
 msgstr ""
 
-#: ../glade2/vcview.glade.h:23 ../vcview.py:173
-msgid "Tag"
+#: ../data/ui/preferences.ui.h:3
+msgid "Remote, merge, local"
 msgstr ""
 
-#: ../glade2/vcview.glade.h:24
-msgid "Update"
-msgstr "Actualizar"
+#: ../data/ui/preferences.ui.h:4
+msgid "Local, merge, remote"
+msgstr ""
 
-#: ../glade2/vcview.glade.h:25
-msgid "VC Log"
+#: ../data/ui/preferences.ui.h:5
+msgid "1ns (ext4)"
 msgstr ""
 
-#: ../glade2/vcview.glade.h:26
-msgid "_Add"
-msgstr "_Apondre"
+#: ../data/ui/preferences.ui.h:6
+msgid "100ns (NTFS)"
+msgstr ""
 
-#: ../glade2/vcview.glade.h:27
-msgid "_Commit"
+#: ../data/ui/preferences.ui.h:7
+msgid "1s (ext2/ext3)"
 msgstr ""
 
-#: ../glade2/vcview.glade.h:30
-msgid "_Flatten"
+#: ../data/ui/preferences.ui.h:8
+msgid "2s (VFAT)"
 msgstr ""
 
-#: ../glade2/vcview.glade.h:31
-msgid "_Modified"
-msgstr "_Modificat"
+#: ../data/ui/preferences.ui.h:9
+msgid "Meld Preferences"
+msgstr "Preferéncias de Meld"
 
-#: ../glade2/vcview.glade.h:32
+#: ../data/ui/preferences.ui.h:10
+msgid "Font"
+msgstr "Poliça"
+
+#: ../data/ui/preferences.ui.h:11
+msgid "_Use the system fixed width font"
+msgstr "_Utilizar la poliça de chassa fixa del sistèma"
+
+#: ../data/ui/preferences.ui.h:12
+msgid "_Editor font:"
+msgstr "_Poliça de l'editor :"
+
+#: ../data/ui/preferences.ui.h:13
+msgid "Display"
+msgstr "Afichatge"
+
+#: ../data/ui/preferences.ui.h:14
+msgid "_Tab width:"
+msgstr "Largor de las _tabulacions :"
+
+#: ../data/ui/preferences.ui.h:15
+msgid "_Insert spaces instead of tabs"
+msgstr "Inserir d'_espacis al luòc de las tabulacions"
+
+#: ../data/ui/preferences.ui.h:16
+msgid "Enable text _wrapping"
+msgstr "Acti_ver los sauts de linha automatiques"
+
+#: ../data/ui/preferences.ui.h:17
+msgid "Do not _split words over two lines"
+msgstr "_Talhar los mots pels sauts de linha"
+
+#: ../data/ui/preferences.ui.h:18
+msgid "Highlight _current line"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:19
+msgid "Show _line numbers"
+msgstr "Afichar los numèros de _linhas"
+
+#: ../data/ui/preferences.ui.h:20
+msgid "Show w_hitespace"
+msgstr "Afic_har los espacis"
+
+#: ../data/ui/preferences.ui.h:21
+msgid "Use s_yntax highlighting"
+msgstr "Utilizar la _coloracion sintaxica"
+
+#: ../data/ui/preferences.ui.h:22
+#| msgid "Use s_yntax highlighting"
+msgid "Syntax highlighting color scheme:"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:23
+#| msgid "External editor"
+msgid "External Editor"
+msgstr "Editor extèrne"
+
+#: ../data/ui/preferences.ui.h:24
+msgid "Use _default system editor"
+msgstr "Utilizar l'editor per _defaut del sistèma"
+
+#: ../data/ui/preferences.ui.h:25
+msgid "Edito_r command:"
+msgstr "Comanda de l'edito_r :"
+
+#: ../data/ui/preferences.ui.h:26
+msgid "Editor"
+msgstr "Editor"
+
+#: ../data/ui/preferences.ui.h:27
+#| msgid "Shallow comparison"
+msgid "Shallow Comparison"
+msgstr "Comparason superficiala"
+
+#: ../data/ui/preferences.ui.h:28
+msgid "C_ompare files based only on size and timestamp"
+msgstr "C_omparar solament los fichièrs per talha e date"
+
+#: ../data/ui/preferences.ui.h:29
+msgid "_Timestamp resolution:"
+msgstr "Espandida de _temps :"
+
+#: ../data/ui/preferences.ui.h:31
+#| msgid "Symbolic links"
+msgid "Symbolic Links"
+msgstr "Ligams simbolics"
+
+#: ../data/ui/preferences.ui.h:33
+#| msgid "Visible columns"
+msgid "Visible Columns"
+msgstr "Colomnas visiblas"
+
+#: ../data/ui/preferences.ui.h:34
+#| msgid "Folder comparisons"
+msgid "Folder Comparisons"
+msgstr "Comparason dels dorsièrs"
+
+#: ../data/ui/preferences.ui.h:35
+#| msgid "Folder comparisons"
+msgid "Version Comparisons"
+msgstr "Comparason de las versions"
+
+#: ../data/ui/preferences.ui.h:36
+msgid "_Order when comparing file revisions:"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:37
+msgid "Order when _merging files:"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:38
+#| msgid "Log Message"
+msgid "Commit Messages"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:39
+msgid "Show _right margin at:"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:40
+msgid "Automatically _break lines at right margin on commit"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:41
+#| msgid "Version Control\t1\t%s\n"
+msgid "Version Control"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:42
+#| msgid "File filters"
+msgid "Filename filters"
+msgstr "Filtres dels noms de fichièrs"
+
+#: ../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 ""
+"Al moment de la comparason de repertòris, podètz amagar de fichièrs e de dorsièrs en "
+"foncion de lor nom. Cada motiu es una lista de jokers de tipe shell separats per "
+"d'espacis."
+
+#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:104
+msgid "File Filters"
+msgstr "Filtres de fichièrs"
+
+#: ../data/ui/preferences.ui.h:45
+msgid "Change trimming"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:46
+msgid "Trim blank line differences from the start and end of changes"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:47
+#| msgid "Text Filters"
+msgid "Text filters"
+msgstr "Filtres de tèxte"
+
+#: ../data/ui/preferences.ui.h:48
+msgid ""
+"When performing file comparisons, you may ignòra certain types of changes. Each "
+"pattern here is a python regular expression which replaces matching text with the "
+"empty string before comparison is performed. If the expression contains groups, only "
+"the groups are replaced. See the user manual for more details."
+msgstr ""
+"Al moment de la comparason de fichièrs, podètz ignorar certans types de "
+"modificacions. Cada motiu çaijós es una expression régulière Python que remplaça lo "
+"tèxte correspondent per una cadena voida abans la comparason. Se l'expression conten "
+"de gropes, sols los gropes son remplaçats. Consultatz lo manual d'utilizacion per "
+"mai de detalhs."
+
+#: ../data/ui/preferences.ui.h:49
+msgid "Text Filters"
+msgstr "Filtres de tèxte"
+
+#: ../data/ui/shortcuts.ui.h:1
+msgctxt "shortcut window"
+msgid "General"
+msgstr "General"
+
+#: ../data/ui/shortcuts.ui.h:2
+#| msgid "New comparison"
+msgctxt "shortcut window"
+msgid "New comparison"
+msgstr "Novèla comparason"
+
+#: ../data/ui/shortcuts.ui.h:3
+#| msgid "File comparison"
+msgctxt "shortcut window"
+msgid "Close a comparison"
+msgstr "Tampar una comparason"
+
+#: ../data/ui/shortcuts.ui.h:4
+#| msgid "Meld"
+msgctxt "shortcut window"
+msgid "Quit Meld"
+msgstr "Quitar Meld"
+
+#: ../data/ui/shortcuts.ui.h:5
+#| msgid "Stop the current action"
+msgctxt "shortcut window"
+msgid "Stop the current action"
+msgstr "Arrèsta l'accion en cors"
+
+#: ../data/ui/shortcuts.ui.h:6
+#| msgid "New comparison"
+msgctxt "shortcut window"
+msgid "Refresh comparison"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:7
+#| msgid "Full Screen"
+msgctxt "shortcut window"
+msgid "Fullscreen"
+msgstr "Ecran complet"
+
+#: ../data/ui/shortcuts.ui.h:8
+#| msgid "_Tabs"
+msgctxt "shortcut window"
+msgid "Tabs"
+msgstr "Onglets"
+
+#: ../data/ui/shortcuts.ui.h:9
+#| msgid "Go to the previous change"
+msgctxt "shortcut window"
+msgid "Go to previous tab"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:10
+#| msgid "Go to the next change"
+msgctxt "shortcut window"
+msgid "Go to next tab"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:11
+#| msgid "Switch to this tab"
+msgctxt "shortcut window"
+msgid "Switch to tab"
+msgstr "Bascular cap a aqueste onglet"
+
+#: ../data/ui/shortcuts.ui.h:12
+#| msgid "Move Tab _Left"
+msgctxt "shortcut window"
+msgid "Move tab left"
+msgstr "Desplaçar l'onglet cap a _esquèrra"
+
+#: ../data/ui/shortcuts.ui.h:13
+#| msgid "Move Tab _Right"
+msgctxt "shortcut window"
+msgid "Move tab right"
+msgstr "Desplaçar l'onglet cap a _drecha"
+
+#: ../data/ui/shortcuts.ui.h:14
+#| msgid "_Changes"
+msgctxt "shortcut window"
+msgid "Changes"
+msgstr "Diferéncias"
+
+#: ../data/ui/shortcuts.ui.h:15
+#| msgid "Go to the previous change"
+msgctxt "shortcut window"
+msgid "Go to previous change"
+msgstr "Tòrna a la diferéncia precedenta"
+
+#: ../data/ui/shortcuts.ui.h:16
+#| msgid "Go to the next change"
+msgctxt "shortcut window"
+msgid "Go to next change"
+msgstr "Va fins a la diferéncia venenta"
+
+#: ../data/ui/shortcuts.ui.h:17
+#| msgid "_Edit"
+msgctxt "shortcut window"
+msgid "Editing"
+msgstr "Edicion"
+
+#: ../data/ui/shortcuts.ui.h:18
+msgctxt "shortcut window"
+msgid "Undo"
+msgstr "Anullar"
+
+#: ../data/ui/shortcuts.ui.h:19
+msgctxt "shortcut window"
+msgid "Redo"
+msgstr "Refar"
+
+#: ../data/ui/shortcuts.ui.h:20
+msgctxt "shortcut window"
+msgid "Cut"
+msgstr "Talhar"
+
+#: ../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 "Pegar"
+
+#: ../data/ui/shortcuts.ui.h:23
+#| msgid "Find:"
+msgctxt "shortcut window"
+msgid "Find"
+msgstr "Recercar"
+
+#: ../data/ui/shortcuts.ui.h:24
+#| msgid "Find Ne_xt"
+msgctxt "shortcut window"
+msgid "Find Next"
+msgstr "Recercar lo _seguent"
+
+#: ../data/ui/shortcuts.ui.h:25
+#| msgid "Find _Previous"
+msgctxt "shortcut window"
+msgid "Find Previous"
+msgstr "Recercar lo _precedent"
+
+#: ../data/ui/shortcuts.ui.h:26
+#| msgid "_Replace"
+msgctxt "shortcut window"
+msgid "Replace"
+msgstr "Remplaçar"
+
+#: ../data/ui/shortcuts.ui.h:27
+#| msgid "File comparison"
+msgctxt "shortcut window"
+msgid "File comparison"
+msgstr "Comparason de fichièrs"
+
+#: ../data/ui/shortcuts.ui.h:28
+#| msgid "Save the current file"
+msgctxt "shortcut window"
+msgid "Save current file"
+msgstr "Enregistrar lo fichièr actual"
+
+#: ../data/ui/shortcuts.ui.h:29
+#| msgid "Save the current file"
+msgctxt "shortcut window"
+msgid "Save current file to new path"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:30
+#| msgid "Start a new comparison"
+msgctxt "shortcut window"
+msgid "Save all files in comparison"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:31
+#| msgid "Previous conflict"
+msgctxt "shortcut window"
+msgid "Previous conflict"
+msgstr "Conflicte precedent"
+
+#: ../data/ui/shortcuts.ui.h:32
+#| msgid "Next conflict"
+msgctxt "shortcut window"
+msgid "Next conflict"
+msgstr "Conflicte seguent"
+
+#: ../data/ui/shortcuts.ui.h:33
+#| msgid "Push to left"
+msgctxt "shortcut window"
+msgid "Push change to left"
+msgstr "Mandar a esquèrra"
+
+#: ../data/ui/shortcuts.ui.h:34
+#| msgid "Push to right"
+msgctxt "shortcut window"
+msgid "Push change to right"
+msgstr "Mandar a drecha"
+
+#: ../data/ui/shortcuts.ui.h:35
+#| msgid "Pull change from the left"
+msgctxt "shortcut window"
+msgid "Pull change from left"
+msgstr "Recupèra la modificacion d'esquèrra"
+
+#: ../data/ui/shortcuts.ui.h:36
+#| msgid "Pull change from the right"
+msgctxt "shortcut window"
+msgid "Pull change from right"
+msgstr "Recupèra la modificacion de drecha"
+
+#: ../data/ui/shortcuts.ui.h:37
+#| msgid "Copy change above the left chunk"
+msgctxt "shortcut window"
+msgid "Copy change above left"
+msgstr "Còpia la modificacion en dessús del segment d'esquèrra"
+
+#: ../data/ui/shortcuts.ui.h:38
+#| msgid "Copy change below the left chunk"
+msgctxt "shortcut window"
+msgid "Copy change below left"
+msgstr "Còpia la modificacion en dejós del segment d'esquèrra"
+
+#: ../data/ui/shortcuts.ui.h:39
+#| msgid "Copy change above the right chunk"
+msgctxt "shortcut window"
+msgid "Copy change above right"
+msgstr "Còpia la modificacion en dessús del segment de drecha"
+
+#: ../data/ui/shortcuts.ui.h:40
+#| msgid "Copy change below the right chunk"
+msgctxt "shortcut window"
+msgid "Copy change below right"
+msgstr "Còpia la modificacion en dejós del segment de drecha"
+
+#: ../data/ui/shortcuts.ui.h:41
+#| msgid "Delete change"
+msgctxt "shortcut window"
+msgid "Delete change"
+msgstr "Suprimir las modificacions"
+
+#: ../data/ui/shortcuts.ui.h:42
+#| msgid "Previous change"
+msgctxt "shortcut window"
+msgid "Previous comparison pane"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:43
+#| msgid "New comparison"
+msgctxt "shortcut window"
+msgid "Next comparison pane"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:44
+#| msgid "Folder comparisons"
+msgctxt "shortcut window"
+msgid "Folder comparison"
+msgstr "Comparason dels dorsièrs"
+
+#: ../data/ui/shortcuts.ui.h:45
+#| msgid "Copy to left"
+msgctxt "shortcut window"
+msgid "Copy to left"
+msgstr "Còpia cap a esquèrra"
+
+#: ../data/ui/shortcuts.ui.h:46
+#| msgid "Copy to right"
+msgctxt "shortcut window"
+msgid "Copy to right"
+msgstr "Còpia cap a drecha"
+
+#: ../data/ui/shortcuts.ui.h:47
+#| msgid "Start a version control comparison"
+msgctxt "shortcut window"
+msgid "Version control comparison"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:48
+#| msgid "Choose one Version Control"
+msgctxt "shortcut window"
+msgid "Commit to version control"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:49
+msgctxt "shortcut window"
+msgid "Show/hide console output"
+msgstr ""
+
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:668
+msgid "New comparison"
+msgstr "Novèla comparason"
+
+#: ../data/ui/tab-placeholder.ui.h:2
+msgid "File comparison"
+msgstr "Comparason de fichièrs"
+
+#: ../data/ui/tab-placeholder.ui.h:3
+msgid "Directory comparison"
+msgstr "Comparason de dorsièrs"
+
+#: ../data/ui/tab-placeholder.ui.h:4
+msgid "Version control view"
+msgstr "Afichatge del gestionari de version"
+
+#: ../data/ui/tab-placeholder.ui.h:5
+msgid "_3-way comparison"
+msgstr "Comparason en _3 voies"
+
+#: ../data/ui/tab-placeholder.ui.h:6
+msgid "Select Third File"
+msgstr "Seleccionar lo tresen fichièr"
+
+#: ../data/ui/tab-placeholder.ui.h:7
+msgid "Select Second File"
+msgstr "Seleccionar lo segond fichièr"
+
+#: ../data/ui/tab-placeholder.ui.h:8
+msgid "Select First File"
+msgstr "Seleccionar lo primièr fichièr"
+
+#: ../data/ui/tab-placeholder.ui.h:9
+msgid "Select First Folder"
+msgstr "Seleccionar lo primièr dorsièr"
+
+#: ../data/ui/tab-placeholder.ui.h:10
+msgid "Select Second Folder"
+msgstr "Seleccionar lo segond dorsièr"
+
+#: ../data/ui/tab-placeholder.ui.h:11
+msgid "Select Third Folder"
+msgstr "Seleccionar lo tresen dorsièr"
+
+#: ../data/ui/tab-placeholder.ui.h:12
+msgid "Select A Version-Controlled Folder"
+msgstr "Seleccionar un dorsièr amb lo gestionari de versions"
+
+#: ../data/ui/tab-placeholder.ui.h:13
+msgid "_Blank comparison"
+msgstr "Comparason a _blanc"
+
+#: ../data/ui/tab-placeholder.ui.h:14
+msgid "C_ompare"
+msgstr "C_omparar"
+
+#: ../data/ui/vcview.ui.h:3
+#| msgid "Co_mmit"
+msgid "Co_mmit..."
+msgstr "_Validar..."
+
+#: ../data/ui/vcview.ui.h:4
+#| msgid "Choose one Version Control"
+msgid "Commit changes to version control"
+msgstr "Causir un sistèma de gestion de versions"
+
+#: ../data/ui/vcview.ui.h:5
+msgid "_Update"
+msgstr "Metre a _jorn"
+
+#: ../data/ui/vcview.ui.h:6
+msgid "Update working copy from version control"
+msgstr ""
+
+#: ../data/ui/vcview.ui.h:7
+msgid "_Push"
+msgstr ""
+
+#: ../data/ui/vcview.ui.h:8
+#| msgid "Push current change to the left"
+msgid "Push local changes to remote"
+msgstr "Manda la modificacion actuala cap a esquèrra"
+
+#: ../data/ui/vcview.ui.h:10
+#| msgid "Version control view"
+msgid "Add to version control"
+msgstr "Afichatge del gestionari de version"
+
+#: ../data/ui/vcview.ui.h:12
+#| msgid "Choose one Version Control"
+msgid "Remove from version control"
+msgstr ""
+
+#: ../data/ui/vcview.ui.h:13
+#| msgid "Mark as resolved for VC"
+msgid "Mar_k as Resolved"
+msgstr "Marca coma resolgut"
+
+#: ../data/ui/vcview.ui.h:14
+#| msgid "Mark as resolved for VC"
+msgid "Mark as resolved in version control"
+msgstr "Marca coma resolgut pel gestionari de versions"
+
+#: ../data/ui/vcview.ui.h:15
+msgid "Re_vert"
+msgstr "To_rnar a l'original"
+
+#: ../data/ui/vcview.ui.h:16
+#| msgid "Revert to original"
+msgid "Revert working copy to original state"
+msgstr ""
+
+#: ../data/ui/vcview.ui.h:17
+msgid "Delete from working copy"
+msgstr ""
+
+#: ../data/ui/vcview.ui.h:18
+msgid "Console"
+msgstr "Consòla"
+
+#: ../data/ui/vcview.ui.h:19
+msgid "Show or hide the version control console output pane"
+msgstr ""
+
+#: ../data/ui/vcview.ui.h:20
+msgid "_Flatten"
+msgstr "A_platir"
+
+#: ../data/ui/vcview.ui.h:21
+msgid "Flatten directories"
+msgstr "Aplatir los repertòris"
+
+#: ../data/ui/vcview.ui.h:22
+msgid "_Modified"
+msgstr "_Modificats"
+
+#: ../data/ui/vcview.ui.h:23
+#| msgid "Show modified"
+msgid "Show modified files"
+msgstr "Afichar los fichièrs modificats"
+
+#: ../data/ui/vcview.ui.h:24
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../glade2/vcview.glade.h:33
-msgid "_Remove"
-msgstr "_Suprimir"
+#: ../data/ui/vcview.ui.h:25
+#| msgid "Show ignored files"
+msgid "Show normal files"
+msgstr "Aficha los fichièrs ignorats"
 
-#: ../glade2/vcview.glade.h:34
-msgid "_Update"
-msgstr "_Metre a jorn"
+#: ../data/ui/vcview.ui.h:26
+msgid "Un_versioned"
+msgstr ""
 
-#: ../meld:60 ../meld:70 ../meld:80
-#, c-format
-msgid "Meld requires %s or higher."
+#: ../data/ui/vcview.ui.h:27
+msgid "Show unversioned files"
+msgstr "Aficha los fichièrs qui son pas versionats"
+
+#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:67
+msgid "Ignored"
+msgstr "Ignorat"
+
+#: ../data/ui/vcview.ui.h:29
+msgid "Show ignored files"
+msgstr "Aficha los fichièrs ignorats"
+
+#: ../data/ui/vcview.ui.h:30
+msgid "Commit"
+msgstr "Fa un « Commit »"
+
+#: ../data/ui/vcview.ui.h:31
+msgid "Commit Files"
+msgstr "Validar los fichièrs"
+
+#: ../data/ui/vcview.ui.h:32
+msgid "Log Message"
+msgstr "Messatge del jornal"
+
+#: ../data/ui/vcview.ui.h:33
+#| msgid "Previous Logs"
+msgid "Previous logs:"
+msgstr "Jornals precedents :"
+
+#: ../data/ui/vcview.ui.h:34
+msgid "Co_mmit"
+msgstr "_Validar"
+
+#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:337
+msgid "Location"
+msgstr "Emplaçament"
+
+#: ../data/ui/vcview.ui.h:37
+msgid "Status"
+msgstr "Estat"
+
+#: ../data/ui/vcview.ui.h:38
+msgid "Extra"
+msgstr "Extra"
+
+#: ../data/ui/vcview.ui.h:39
+msgid "Console output"
+msgstr ""
+
+#: ../data/ui/vcview.ui.h:40
+msgid "Push local commits to remote?"
+msgstr ""
+
+#: ../data/ui/vcview.ui.h:41
+msgid "The commits to be pushed are determined by your version control system."
+msgstr ""
+
+#: ../data/ui/vcview.ui.h:42
+#| msgid "Push to right"
+msgid "_Push commits"
+msgstr ""
+
+#: ../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:390 ../meld/preferences.py:82
+msgid "Size"
+msgstr "Talha"
+
+#. Create date-time CellRenderer
+#: ../meld/dirdiff.py:398 ../meld/preferences.py:83
+msgid "Modificacion time"
+msgstr "Data de modificacion"
+
+#. Create permissions CellRenderer
+#: ../meld/dirdiff.py:406 ../meld/preferences.py:84
+msgid "Permissions"
+msgstr "Permissions"
+
+#: ../meld/dirdiff.py:536
+#, python-format
+msgid "Hide %s"
+msgstr "Amagar %s"
+
+#: ../meld/dirdiff.py:668 ../meld/dirdiff.py:692
+#, python-format
+msgid "[%s] Scanning %s"
+msgstr "[%s] Analisi de %s en cors"
+
+#: ../meld/dirdiff.py:825
+#, python-format
+msgid "[%s] Done"
+msgstr "[%s] Acabat"
+
+#: ../meld/dirdiff.py:833
+#| msgid "[%s] Fetching differences"
+msgid "Folders have no differences"
+msgstr ""
+
+#: ../meld/dirdiff.py:835
+msgid "Contents of scanned files in folders are identical."
+msgstr ""
+
+#: ../meld/dirdiff.py:837
+msgid "Scanned files in folders appear identical, but contents have not been scanned."
 msgstr ""
 
-#: ../meld:81
+#: ../meld/dirdiff.py:840
+msgid "File filters are in use, so not all files have been scanned."
+msgstr ""
+
+#: ../meld/dirdiff.py:842
+#| 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 ""
+
+#: ../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
+msgid "Hi_de"
+msgstr "Ama_gar"
+
+#: ../meld/dirdiff.py:870
+msgid "Multiple errors occurred while scanning this folder"
+msgstr "Mantuna error se son produchas al moment de l'analisi d'aqueste dorsièr"
+
+#: ../meld/dirdiff.py:871
+msgid "Files with invalid encodings found"
+msgstr "L'encodatge de caractèrs de certans fichièrs es pas valide"
+
+#. TRANSLATORS: This is followed by a list of files
+#: ../meld/dirdiff.py:873
+msgid "Some files were in an incorrect encoding. The names are something like:"
+msgstr ""
+"L'encodatge de caractèrs de certans fichièrs es pas correct. Los noms ressemblent a :"
+
+#: ../meld/dirdiff.py:875
+msgid "Files hidden by case insensitive comparison"
+msgstr "Fichièrs amagats en rason d'una comparason insensibla a la cassa"
+
+#. TRANSLATORS: This is followed by a list of files
+#: ../meld/dirdiff.py:877
 msgid ""
-"Due to incompatible API changes some functions may not operate as expected."
+"You are running a case insensitive comparison on a case sensitive filesystem. The "
+"following files in this folder are hidden:"
 msgstr ""
+"Efectuatz una comparason insensibla a la cassa sus un sistèma de fichièrs sensibles "
+"a la cassa. Los fichièrs seguents d'aqueste dorsièr son amagats :"
+
+#: ../meld/dirdiff.py:888
+#, python-format
+msgid "'%s' hidden by '%s'"
+msgstr "« %s » es amagat per « %s »"
 
-#: ../meld.desktop.in.h:1
-msgid "Compare and merge your files."
+#: ../meld/dirdiff.py:944
+#, python-format
+msgid "Replace folder “%s”?"
 msgstr ""
 
-#: ../meld.desktop.in.h:2
-msgid "Meld Diff Viewer"
+#: ../meld/dirdiff.py:946
+#, 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 ""
 
-#: ../meldapp.py:147
-msgid "label"
-msgstr "etiqueta"
+#: ../meld/dirdiff.py:959
+#| msgid "Error reading saved comparison file"
+msgid "Error copying file"
+msgstr ""
 
-#: ../meldapp.py:148
-msgid "pattern"
+#: ../meld/dirdiff.py:960
+#, python-format
+#| msgid ""
+#| "Error copying '%s' to '%s'\n"
+#| "\n"
+#| "%s."
+msgid ""
+"Couldn't copy %s\n"
+"to %s.\n"
+"\n"
+"%s"
 msgstr ""
 
-#. file filters
-#. text filters
-#: ../meldapp.py:249 ../meldapp.py:254 ../vcview.py:153
-msgid "Name"
-msgstr "Nom"
+#: ../meld/dirdiff.py:983
+#, python-format
+#| msgid ""
+#| "Error removing %s\n"
+#| "\n"
+#| "%s."
+msgid "Error deleting %s"
+msgstr "Error al moment de la supression de %s"
+
+#: ../meld/dirdiff.py:1488
+msgid "No folder"
+msgstr "Pas de dorsièr"
+
+#. Abbreviations for insert and overwrite that fit in the status bar
+#: ../meld/filediff.py:359
+msgid "INS"
+msgstr "INS"
+
+#: ../meld/filediff.py:359
+msgid "OVR"
+msgstr "ÉCR"
 
-#: ../meldapp.py:249 ../meldapp.py:254
-msgid "Active"
-msgstr "Actiu"
+#. Abbreviation for line, column so that it will fit in the status bar
+#: ../meld/filediff.py:361
+#, python-format
+msgid "Ln %i, Col %i"
+msgstr "Ln %i, Col %i"
 
-#: ../meldapp.py:249
-msgid "Pattern"
-msgstr "Motiu"
+#: ../meld/filediff.py:794
+msgid "Comparison results will be inaccurate"
+msgstr ""
+
+#: ../meld/filediff.py:796
+#| msgid ""
+#| "Filter '%s' changed the number of lines in the file. Comparison will be "
+#| "incorrect. See the user manual for more details."
+msgid ""
+"A filter changed the number of lines in the file, which is unsupported. The "
+"comparison will not be accurate."
+msgstr ""
+
+#: ../meld/filediff.py:854
+#| msgid "Mark as resolved for VC"
+msgid "Mark conflict as resolved?"
+msgstr ""
+
+#: ../meld/filediff.py:856
+msgid "If the conflict was resolved successfully, you may mark it as resolved now."
+msgstr ""
+
+#: ../meld/filediff.py:858
+#| msgid "_Cancel"
+msgid "Cancel"
+msgstr "Anullar"
+
+#: ../meld/filediff.py:859
+#| msgid "_Resolved"
+msgid "Mark _Resolved"
+msgstr "Marca coma _resolgut"
+
+#: ../meld/filediff.py:1099
+#, python-format
+msgid "There was a problem opening the file “%s”."
+msgstr ""
+
+#: ../meld/filediff.py:1107
+#, python-format
+#| msgid "%s appears to be a binary file."
+msgid "File %s appears to be a binary file."
+msgstr "Sembla que lo fichièr %s es un fichièr binari."
+
+#: ../meld/filediff.py:1109
+#| msgid "Open selected file or directory in the default external application"
+msgid "Do you want to open the file using the default application?"
+msgstr ""
+
+#: ../meld/filediff.py:1111
+msgid "Open"
+msgstr ""
+
+#: ../meld/filediff.py:1127
+#, python-format
+msgid "[%s] Computing differences"
+msgstr "[%s] Calcul de las diferéncias"
+
+#: ../meld/filediff.py:1192
+#, python-format
+msgid "File %s has changed on disk"
+msgstr ""
 
-#: ../meldapp.py:254
-msgid "Regex"
+#: ../meld/filediff.py:1193
+#| msgid "Could not read file"
+msgid "Do you want to reload the file?"
 msgstr ""
 
-#: ../meldapp.py:296
+#: ../meld/filediff.py:1195
+#| msgid "Reload"
+msgid "_Reload"
+msgstr "_Recargar"
+
+#: ../meld/filediff.py:1346
+msgid "Files are identical"
+msgstr "Los fichièrs son identiques"
+
+#: ../meld/filediff.py:1359
 msgid ""
-"Line numbers are only available if you have gnome-python-desktop installed."
+"Text filters are being used, and may be masking differences between files. Would you "
+"like to compare the unfiltered files?"
 msgstr ""
+"Los filtres de tèxte son actualament utilizats e es possible qu'amaguen de "
+"diferéncias entre los fichièrs. Volètz comparar los fichièrs pas filtrats ?"
 
-#: ../meldapp.py:300
+#: ../meld/filediff.py:1364
+#| msgid "Files with invalid encodings found"
+msgid "Files differ in line endings only"
+msgstr ""
+
+#: ../meld/filediff.py:1366
+#, python-format
 msgid ""
-"Syntax highlighting is only available if you have gnome-python-desktop "
-"installed."
+"Files are identical except for differing line endings:\n"
+"%s"
 msgstr ""
 
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:444
-msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
+#: ../meld/filediff.py:1386
+msgid "Show without filters"
+msgstr "Afichar sens los filtres"
+
+#: ../meld/filediff.py:1408
+msgid "Change highlighting incomplete"
 msgstr ""
 
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:446
+#: ../meld/filediff.py:1409
 msgid ""
-"Version Control\t1\tCVS .svn MT [{]arch[}] .arch-ids .arch-inventory RCS\n"
+"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 ""
 
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:448
-msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
+#: ../meld/filediff.py:1417
+#| msgid "Use s_yntax highlighting"
+msgid "Keep highlighting"
+msgstr "Utilizar la coloracion sintaxica"
+
+#: ../meld/filediff.py:1419
+#| msgid "Use s_yntax highlighting"
+msgid "_Keep highlighting"
+msgstr "Utilizar la _coloracion sintaxica"
+
+#: ../meld/filediff.py:1451
+#, python-format
+msgid "Replace file “%s”?"
 msgstr ""
 
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:450
-msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
+#: ../meld/filediff.py:1453
+#, python-format
+msgid ""
+"A file with this name already exists in “%s”.\n"
+"If you replace the existing file, its contents will be lost."
 msgstr ""
 
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:452
-msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
+#: ../meld/filediff.py:1470
+#| msgid "Save Patch As..."
+msgid "Save Left Pane As"
+msgstr "Enregistrar lo correctiu jos"
+
+#: ../meld/filediff.py:1472
+#| msgid "Left and middle panes"
+msgid "Save Middle Pane As"
 msgstr ""
 
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:454
-msgid "C++ comment\t0\t//.*\n"
+#: ../meld/filediff.py:1474
+msgid "Save Right Pane As"
 msgstr ""
 
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:456
-msgid "C comment\t0\t/\\*.*?\\*/\n"
+#: ../meld/filediff.py:1488
+#, python-format
+msgid "File %s has changed on disk since it was opened"
 msgstr ""
 
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:458
-msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n"
+#: ../meld/filediff.py:1490
+#| msgid "If you don't save, changes will be permanently lost."
+msgid "If you save it, any external changes will be lost."
+msgstr "Se enregistratz pas, las modificacions seràn definitivament perdudas."
+
+#: ../meld/filediff.py:1493
+msgid "Save Anyway"
 msgstr ""
 
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:460
-msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n"
+#: ../meld/filediff.py:1494
+msgid "Don't Save"
 msgstr ""
 
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:462
-msgid "Script comment\t0\t#.*"
+#: ../meld/filediff.py:1516
+msgid "_Save as UTF-8"
 msgstr ""
 
-#: ../meldapp.py:781
-msgid "Cannot compare a mixture of files and directories.\n"
+#: ../meld/filediff.py:1519
+#, python-format
+msgid "Couldn't encode text as “%s”"
 msgstr ""
 
-#. ###############################################################################
-#.
-#. usage
-#.
-#. ###############################################################################
-#: ../meldapp.py:829
+#: ../meld/filediff.py:1521
 #, python-format
+#| msgid ""
+#| "'%s' contains characters not encodable with '%s'\n"
+#| "Would you like to save as UTF-8?"
 msgid ""
-"Meld %s\n"
-"Written by Stephen Kennedy <stevek@gnome.org>"
+"File “%s” contains characters that can't be encoded using encoding “%s”.\n"
+"Would you like to save as UTF-8?"
 msgstr ""
+"« %s » conten de caractèrs que pòdon èsser encodats amb « %s »\n"
+"Volètz enregistrar en UTF-8 ?"
 
-#: ../meldapp.py:858
-msgid "Set label to use instead of file name"
+#: ../meld/filediff.py:1558 ../meld/patchdialog.py:125
+#, python-format
+#| msgid "Could not read file"
+msgid "Could not save file %s."
 msgstr ""
 
-#: ../meldapp.py:859 ../meldapp.py:860 ../meldapp.py:861 ../meldapp.py:862
-msgid "Ignored for compatibility"
+#: ../meld/filediff.py:1559 ../meld/patchdialog.py:126
+#, python-format
+msgid ""
+"Couldn't save file due to:\n"
+"%s"
+msgstr ""
+
+#: ../meld/filediff.py:1905
+msgid "Live comparison updating disabled"
 msgstr ""
 
-#: ../meldapp.py:888
+#: ../meld/filediff.py:1906
+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 ""
+
+#: ../meld/filemerge.py:37
+#, python-format
+msgid "[%s] Merging files"
+msgstr "[%s] Fusion dels fichièrs"
+
+#: ../meld/gutterrendererchunk.py:159
+#| msgid "Copy _Left"
+msgid "Copy _up"
+msgstr "Copiar a_mont"
+
+#: ../meld/gutterrendererchunk.py:160
+#| msgid "Copy _Left"
+msgid "Copy _down"
+msgstr "Copiar a_val"
+
+#: ../meld/meldapp.py:177
+msgid "wrong number of arguments supplied to --diff"
+msgstr "Nombre de paramètres incorrect per --diff"
+
+#: ../meld/meldapp.py:182
+msgid "Start with an empty window"
+msgstr "Aviar amb una fenèstra voida"
+
+#: ../meld/meldapp.py:183 ../meld/meldapp.py:185
+msgid "file"
+msgstr "fichièr"
+
+#: ../meld/meldapp.py:183 ../meld/meldapp.py:187
+msgid "folder"
+msgstr "dorsièr"
+
+#: ../meld/meldapp.py:184
+msgid "Start a version control comparison"
+msgstr "Aviar una comparason amb lo gestionari de versions"
+
+#: ../meld/meldapp.py:186
+msgid "Start a 2- or 3-way file comparison"
+msgstr "Aviar una comparason de 2 o 3 fichièrs"
+
+#: ../meld/meldapp.py:188
+#| msgid "Start a 2- or 3-way file comparison"
+msgid "Start a 2- or 3-way folder comparison"
+msgstr "Aviar una comparason de 2 o 3 dorsièrs"
+
+#: ../meld/meldapp.py:231
+#, python-format
+msgid "Error: %s\n"
+msgstr "Error: %s\n"
+
+#: ../meld/meldapp.py:238
+msgid "Meld is a file and directory comparison tool."
+msgstr "Meld es una aisina de comparason de fichièrs e de repertòris."
+
+#: ../meld/meldapp.py:242
+msgid "Set label to use instead of file name"
+msgstr "Definís l'etiqueta a utilizar al luòc del nom de fichièr"
+
+#: ../meld/meldapp.py:245
+msgid "Open a new tab in an already running instance"
+msgstr "Dobrís un novèl onglet dins una session ja en cors"
+
+#: ../meld/meldapp.py:248
+msgid "Automatically compare all differing files on startup"
+msgstr "Compare automaticament totes los fichièrs diferents al démarrage"
+
+#: ../meld/meldapp.py:251
+msgid "Ignored for compatibility"
+msgstr "Ignorada per compatibilitat"
+
+#: ../meld/meldapp.py:255
+msgid "Set the target file for saving a merge result"
+msgstr "Definís lo fichièr cibla per l'enregistrament d'un resultat de fusion"
+
+#: ../meld/meldapp.py:258
+msgid "Automatically merge files"
+msgstr "Fusiona automaticament los fichièrs"
+
+#: ../meld/meldapp.py:262
+msgid "Load a saved comparison from a Meld comparison file"
+msgstr "Charge una comparason enregistrada dins un fichièr Meld"
+
+#: ../meld/meldapp.py:266
+msgid "Create a diff tab for the supplied files or folders"
+msgstr "Crèa un onglet diff pels fichièrs o repertòris provesits"
+
+#: ../meld/meldapp.py:286
 #, python-format
-msgid "Wrong number of arguments (Got %i)"
+msgid "too many arguments (wanted 0-3, got %d)"
+msgstr "tròp de paramètres (0 a 3 autorizats, %d reçus)"
+
+#: ../meld/meldapp.py:289
+msgid "can't auto-merge less than 3 files"
+msgstr "impossible de fusionar automaticament mens de 3 fichièrs"
+
+#: ../meld/meldapp.py:291
+msgid "can't auto-merge directories"
+msgstr "impossible de fusionar automaticament los repertòris"
+
+#: ../meld/meldapp.py:305
+msgid "Error reading saved comparison file"
+msgstr "Error de lectura del fichièr de comparason enregistrat"
+
+#: ../meld/meldapp.py:332
+#, python-format
+msgid "invalid path or URI \"%s\""
 msgstr ""
 
-#: ../melddoc.py:45
+#. TRANSLATORS: This is the label of a new, currently-unnamed file.
+#: ../meld/meldbuffer.py:127
+msgid "<unnamed>"
+msgstr "<sensnom>"
+
+#: ../meld/melddoc.py:83 ../meld/melddoc.py:84
 msgid "untitled"
 msgstr "sens títol"
 
+#: ../meld/meldwindow.py:49
+msgid "_File"
+msgstr "_Fichièr"
+
+#: ../meld/meldwindow.py:50
+#| msgid "_New comparison"
+msgid "_New Comparison..."
+msgstr "_Novèla Comparason..."
+
+#: ../meld/meldwindow.py:51
+msgid "Start a new comparison"
+msgstr "Aviar una novèla comparason"
+
+#: ../meld/meldwindow.py:54
+msgid "Save the current file"
+msgstr "Enregistrar lo fichièr actual"
+
+#: ../meld/meldwindow.py:56
+#| msgid "Save Patch As..."
+msgid "Save As..."
+msgstr "Enregistrar jos..."
+
+#: ../meld/meldwindow.py:57
+#| msgid "Save the current file"
+msgid "Save the current file with a different name"
+msgstr "Enregistrar lo fichièr actual amb un nom diferent"
+
+#: ../meld/meldwindow.py:60
+msgid "Close the current file"
+msgstr "Tampar lo fichièr actual"
+
+#: ../meld/meldwindow.py:63
+msgid "_Edit"
+msgstr "E_dicion"
+
+#: ../meld/meldwindow.py:65
+msgid "Undo the last action"
+msgstr "Anullar la darrièra accion"
+
+#: ../meld/meldwindow.py:68
+msgid "Redo the last undone action"
+msgstr "Restablir la darrièra accion anullada"
+
+#: ../meld/meldwindow.py:70
+msgid "Cut the selection"
+msgstr "Talhar la seleccion"
+
+#: ../meld/meldwindow.py:72
+msgid "Copy the selection"
+msgstr "Copiar la seleccion"
+
+#: ../meld/meldwindow.py:74
+msgid "Paste the clipboard"
+msgstr "Pegar lo quichapapièrs"
+
+#: ../meld/meldwindow.py:76
+#| msgid "Find:"
+msgid "Find..."
+msgstr "Recercar..."
+
+#: ../meld/meldwindow.py:76
+msgid "Search for text"
+msgstr "Recercar de tèxte"
+
+#: ../meld/meldwindow.py:78
+msgid "Find Ne_xt"
+msgstr "Recercar lo _seguent"
+
+#: ../meld/meldwindow.py:79
+msgid "Search forwards for the same text"
+msgstr "Recèrca lo meteis tèxte en avant"
+
+#: ../meld/meldwindow.py:81
+msgid "Find _Previous"
+msgstr "Recercar lo _precedent"
+
+#: ../meld/meldwindow.py:82
+msgid "Search backwards for the same text"
+msgstr "Recèrca lo meteis tèxte en arrièr"
+
+#: ../meld/meldwindow.py:85
+#| msgid "_Replace"
+msgid "_Replace..."
+msgstr "_Remplaçar..."
+
+#: ../meld/meldwindow.py:86
+msgid "Find and replace text"
+msgstr "Recèrca un texte e lo remplaça"
+
+#: ../meld/meldwindow.py:89
+msgid "_Changes"
+msgstr "D_iférencias"
+
+#: ../meld/meldwindow.py:90
+#| msgid "Next change"
+msgid "Next Change"
+msgstr "Cambiament seguent"
+
+#: ../meld/meldwindow.py:91
+msgid "Go to the next change"
+msgstr "Va fins al cambiament venent"
+
+#: ../meld/meldwindow.py:93
+#| msgid "Previous change"
+msgid "Previous Change"
+msgstr "Cambiament precedent"
+
+#: ../meld/meldwindow.py:94
+msgid "Go to the previous change"
+msgstr "Tòrna al cambiament precedent"
+
+#: ../meld/meldwindow.py:96
+#| msgid "Open externally"
+msgid "Open Externally"
+msgstr ""
+
+#: ../meld/meldwindow.py:97
+msgid "Open selected file or directory in the default external application"
+msgstr ""
+"Dobrís lo dorsièr o lo fichièr seleccionat dins l'aplicacion extèrna per defaut"
+
+#: ../meld/meldwindow.py:101
+msgid "_View"
+msgstr "_Afichatge"
+
+#: ../meld/meldwindow.py:102
+#| msgid "File status"
+msgid "File Status"
+msgstr "Estat del fichièr"
+
+#: ../meld/meldwindow.py:103
+#| msgid "Version status"
+msgid "Version Status"
+msgstr "Estat de la version"
+
+#: ../meld/meldwindow.py:106
+msgid "Stop the current action"
+msgstr "Arrèsta l'accion en cors"
+
+#: ../meld/meldwindow.py:109
+msgid "Refresh the view"
+msgstr "Actualise l'afichatge"
+
+#: ../meld/meldwindow.py:112
+msgid "_Tabs"
+msgstr "_Onglets"
+
+#: ../meld/meldwindow.py:113
+msgid "_Previous Tab"
+msgstr "Onglet _precedent"
+
+#: ../meld/meldwindow.py:114
+msgid "Activate previous tab"
+msgstr "Activa l'onglet precedent"
+
+#: ../meld/meldwindow.py:116
+msgid "_Next Tab"
+msgstr "Onglet _seguent"
+
+#: ../meld/meldwindow.py:117
+msgid "Activate next tab"
+msgstr "Activa l'onglet seguent"
+
+#: ../meld/meldwindow.py:120
+msgid "Move Tab _Left"
+msgstr "Desplaçar l'onglet cap a _esquèrra"
+
+#: ../meld/meldwindow.py:121
+msgid "Move current tab to left"
+msgstr "Desplaça l'onglet actual cap a esquèrra"
+
+#: ../meld/meldwindow.py:124
+msgid "Move Tab _Right"
+msgstr "Desplaçar l'onglet cap a _drecha"
+
+#: ../meld/meldwindow.py:125
+msgid "Move current tab to right"
+msgstr "Desplaça l'onglet actual cap a drecha"
+
+#: ../meld/meldwindow.py:129
+#| msgid "Full Screen"
+msgid "Fullscreen"
+msgstr "Ecran complet"
+
+#: ../meld/meldwindow.py:130
+#| msgid "View the comparison in full screen"
+msgid "View the comparison in fullscreen"
+msgstr "Afichar la comparason en ecran complet"
+
+#: ../meld/meldwindow.py:132
+msgid "_Toolbar"
+msgstr "_Barra d'aisinas"
+
+#: ../meld/meldwindow.py:133
+msgid "Show or hide the toolbar"
+msgstr "Aficha o amaga la barra d'aisinas"
+
+#: ../meld/meldwindow.py:143
+msgid "Open Recent"
+msgstr "Dobrir recentament utilizat"
+
+#: ../meld/meldwindow.py:144
+msgid "Open recent files"
+msgstr "Dobrís los fichièrs recentament utilizats"
+
+#: ../meld/meldwindow.py:166
+#| msgid "Meld"
+msgid "_Meld"
+msgstr "_Meld"
+
+#: ../meld/meldwindow.py:167
+msgid "Quit the program"
+msgstr "Quitar lo programa"
+
+#: ../meld/meldwindow.py:169
+msgid "Prefere_nces"
+msgstr "_Preferéncias"
+
+#: ../meld/meldwindow.py:170
+msgid "Configura the application"
+msgstr "Configurar l'aplicacion"
+
+#: ../meld/meldwindow.py:172
+msgid "_Contents"
+msgstr "_Ensenhador"
+
+#: ../meld/meldwindow.py:173
+msgid "Open the Meld manual"
+msgstr "Dobrís lo manual de Meld"
+
+#: ../meld/meldwindow.py:175
+#| msgid "Configura the application"
+msgid "About this application"
+msgstr "A prepaus d'aquesta aplicacion"
+
+#: ../meld/meldwindow.py:587
+msgid "Switch to this tab"
+msgstr "Bascular cap a aqueste onglet"
+
+#: ../meld/meldwindow.py:702
+#, python-format
+msgid "Need three files to auto-merge, got: %r"
+msgstr ""
+
+#: ../meld/meldwindow.py:716
+#| msgid "Cannot compare a mixture of files and directories.\n"
+msgid "Cannot compare a mixture of files and directories"
+msgstr "Impossible de comparar de fichièrs amb de repertòris."
+
+#: ../meld/misc.py:179
+#, python-format
+msgid "Couldn't find colour scheme details for %s-%s; this is a bad install"
+msgstr ""
+
 #. no common path. empty names get changed to "[None]"
-#: ../misc.py:118
+#: ../meld/misc.py:264
 msgid "[None]"
 msgstr "[Pas cap]"
 
-#: ../vcview.py:170
-msgid "Location"
+#: ../meld/preferences.py:33
+msgid "label"
+msgstr "etiqueta"
+
+#: ../meld/preferences.py:33
+msgid "pattern"
+msgstr "motiu"
+
+#: ../meld/recent.py:115
+#| msgid "Version control view"
+msgid "Version control:"
+msgstr ""
+
+#: ../meld/ui/notebooklabel.py:63
+msgid "Close tab"
+msgstr "Tampar l'onglet"
+
+#: ../meld/ui/vcdialogs.py:50
+msgid "No files will be committed"
+msgstr ""
+
+#. 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 "%s in %s"
+msgstr ""
+
+#. 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] ""
+msgstr[1] ""
+
+#: ../meld/vc/git.py:98
+#, python-format
+msgid "%d branch"
+msgid_plural "%d branches"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../meld/vc/git.py:352
+#, python-format
+msgid "Mode changed from %s to %s"
+msgstr "Mòde %s modificat en %s"
+
+#: ../meld/vc/git.py:360
+msgid "Partially staged"
+msgstr ""
+
+#: ../meld/vc/git.py:360
+msgid "Staged"
+msgstr ""
+
+#. 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]"
+msgid "None"
+msgstr "Pas cap"
+
+#: ../meld/vc/svn.py:216
+#, python-format
+msgid "Rev %s"
+msgstr ""
+
+#: ../meld/vc/_vc.py:52
+msgid "Merged"
+msgstr "Fusionat"
+
+#: ../meld/vc/_vc.py:52
+msgid "Base"
+msgstr "Basa"
+
+#: ../meld/vc/_vc.py:52
+#| msgid "Location"
+msgid "Local"
 msgstr "Emplaçament"
 
-#: ../vcview.py:171
-msgid "Status"
-msgstr "Estatut"
+#: ../meld/vc/_vc.py:52
+#| msgid "_Remove"
+msgid "Remote"
+msgstr "Suprimir"
+
+#: ../meld/vc/_vc.py:68
+#| msgid "Show unversioned files"
+msgid "Unversioned"
+msgstr "Pas versionats"
+
+#: ../meld/vc/_vc.py:71
+msgid "Error"
+msgstr "Error"
+
+#: ../meld/vc/_vc.py:73
+msgid "Newly added"
+msgstr "Apondut recentament"
+
+#: ../meld/vc/_vc.py:75
+#| msgid "<unnamed>"
+msgid "Renamed"
+msgstr "Renomenat"
+
+#: ../meld/vc/_vc.py:76
+#| msgid "Next conflict"
+msgid "Conflict"
+msgstr "Conflicte"
+
+#: ../meld/vc/_vc.py:77
+#| msgid "_Remove"
+msgid "Removed"
+msgstr "Suprimit"
+
+#: ../meld/vc/_vc.py:78
+msgid "Missing"
+msgstr "Mancant"
+
+#: ../meld/vc/_vc.py:79
+msgid "Not present"
+msgstr "Pas present"
+
+#. Translators: This error message is shown when a version
+#. control binary isn't installed.
+#: ../meld/vcview.py:255
+#, python-format
+msgid "%(name)s (%(cmd)s not installed)"
+msgstr ""
 
-#: ../vcview.py:172
-msgid "Rev"
+#. Translators: This error message is shown when a version
+#. controlled repository is invalid.
+#: ../meld/vcview.py:259
+#, python-format
+#| msgid "Invalid Repository"
+msgid "%(name)s (Invalid repository)"
 msgstr ""
 
-#: ../vcview.py:174
-msgid "Options"
-msgstr "Opcions"
+#: ../meld/vcview.py:280
+msgid "No valid version control system found in this folder"
+msgstr ""
 
-#: ../vcview.py:257
+#: ../meld/vcview.py:282
+#| msgid "Only one Version Control in this directory"
+msgid "Only one version control system found in this folder"
+msgstr "Un sol sistèma de gestion de versions dins aqueste repertòri"
+
+#: ../meld/vcview.py:284
+#| msgid "Choose one Version Control"
+msgid "Choose which version control system to use"
+msgstr "Causir un sistèma de gestion de versions"
+
+#. 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:357
+#, python-format
+#| msgid "[%s] Scanning %s"
+msgid "Scanning %s"
+msgstr "Analisi de %s en cors"
+
+#: ../meld/vcview.py:396
 msgid "(Empty)"
-msgstr "(Void)"
+msgstr "(void)"
 
-#: ../vcview.py:294
+#: ../meld/vcview.py:440
 #, python-format
-msgid "[%s] Fetching differences"
-msgstr ""
+msgid "%s — local"
+msgstr "%s — local"
 
-#: ../vcview.py:301
+#: ../meld/vcview.py:441
 #, python-format
-msgid "[%s] Applying patch"
+msgid "%s — remote"
 msgstr ""
 
-#: ../vcview.py:305
-msgid "No differences found."
+#: ../meld/vcview.py:449
+#, python-format
+msgid "%s (local, merge, remote)"
 msgstr ""
 
-#: ../vcview.py:382
-msgid "Select some files first."
+#: ../meld/vcview.py:454
+#, python-format
+msgid "%s (remote, merge, local)"
 msgstr ""
 
-#: ../vcview.py:446
-msgid "Invoking patch failed, you need GNU patch."
+#: ../meld/vcview.py:465
+#, python-format
+msgid "%s — repository"
 msgstr ""
 
-#. These are the possible states of files. Be sure to get the colons correct.
-#: ../vc/_vc.py:39
-msgid ""
-"Ignored:Unversioned:::Error::Newly added:Modified:<b>Conflict</b>:Removed:"
-"Missing"
+#: ../meld/vcview.py:471
+#, python-format
+msgid "%s (working, repository)"
 msgstr ""
 
-#: ../vc/cvs.py:153
+#: ../meld/vcview.py:475
 #, python-format
+msgid "%s (repository, working)"
+msgstr ""
+
+#: ../meld/vcview.py:643
+msgid "Remove folder and all its files?"
+msgstr ""
+
+#: ../meld/vcview.py:645
 msgid ""
-"Error converting to a regular expression\n"
-"The pattern was '%s'\n"
-"The error was '%s'"
+"This will remove all selected files and folders, and all files within any selected "
+"folders, from version control."
 msgstr ""
 
-#~ msgid "CVS Directory"
-#~ msgstr "Repertòri CVS"
+#: ../meld/vcview.py:670
+#, python-format
+#| msgid ""
+#| "Error removing %s\n"
+#| "\n"
+#| "%s."
+msgid "Error removing %s"
+msgstr "Error al moment de la supression de %s"
+
+#: ../meld/vcview.py:750
+msgid "Clear"
+msgstr "Escafar"
+
+#~ 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 Foundation, "
+#~ "either version 2 of the License, or (at your option) any later version.\n"
+#~ "\n"
+#~ "Meld is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; "
+#~ "without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.  See the GNU General Public License for more details. \n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along with this "
+#~ "program.  If not, see <http://www.gnu.org/licenses/>."
+#~ msgstr ""
+#~ "Aqueste programa es un logicial liure ; podètz lo redistribuir e/o lo modificar "
+#~ "al títol des clauses de la Licéncia Publica Generala GNU, telle que publiée per "
+#~ "la Free Software Foundation ; siá la version 2 de la Licéncia, o (à votre "
+#~ "discrétion) una version ulteriora quelconque.\n"
+#~ "Aqueste programa es distribuit dins l'espoir qu'il serà utile, mas SANS AUCUNE "
+#~ "GARANTIE ; sens même una garantie implicite de COMMERCIABILITÉ o DE CONFORMITÉ A "
+#~ "UNE UTILISATION PARTICULIÈRE. Voir la Licéncia Publica Generala GNU per mai de "
+#~ "detalhs. \n"
+#~ "\n"
+#~ "Vous devriez aver reçu un exemplaire de la Licéncia Publica Generala GNU amb "
+#~ "aqueste programa ; se ce es pas lo cas, écrivez a la Free Software Foundation "
+#~ "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+
+#~ msgid "Create Patch"
+#~ msgstr "Crear un correctiu"
+
+#~ msgid "Create a patch"
+#~ msgstr "Crear un correctiu"
+
+#~ msgid "Ignore changes which insert or delete blank lines"
+#~ msgstr ""
+#~ "Ignorar las modificacions que concernisson l'insercion o l'escafament de linhas "
+#~ "vides."
+
+#~ msgid "Loading"
+#~ msgstr "Cargament"
+
+#~ msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
+#~ msgstr ""
+#~ "Al moment del cargament, essayer ces encodatges dins l'òrdre (ex : utf-8, iso8859)"
+
+#~ msgid "Encoding"
+#~ msgstr "Encodatge dels caractèrs"
+
+#~ msgid "VC Log"
+#~ msgstr "Jornal del gestionari de versions"
+
+#~ msgid "Copy _Right"
+#~ msgstr "Copiar a _drecha"
+
+#~ msgid ""
+#~ "'%s' exists.\n"
+#~ "Overwrite?"
+#~ msgstr ""
+#~ "« %s » existís ja.\n"
+#~ "L'espotir ?"
+
+#~ msgid ""
+#~ "'%s' is a directory.\n"
+#~ "Remove recursively?"
+#~ msgstr ""
+#~ "« %s » es un repertòri.\n"
+#~ "Suprimir recursivament ?"
+
+#~ msgid "%i second"
+#~ msgid_plural "%i seconds"
+#~ msgstr[0] "%i segonda"
+#~ msgstr[1] "%i segondas"
+
+#~ msgid "%i minute"
+#~ msgid_plural "%i minutes"
+#~ msgstr[0] "%i minuta"
+#~ msgstr[1] "%i minutas"
+
+#~ msgid "%i hour"
+#~ msgid_plural "%i hours"
+#~ msgstr[0] "%i ora"
+#~ msgstr[1] "%i oras"
+
+#~ msgid "%i day"
+#~ msgid_plural "%i days"
+#~ msgstr[0] "%i jorn"
+#~ msgstr[1] "%i jorns"
+
+#~ msgid "%i week"
+#~ msgid_plural "%i weeks"
+#~ msgstr[0] "%i setmana"
+#~ msgstr[1] "%i setmanas"
+
+#~ msgid "%i month"
+#~ msgid_plural "%i months"
+#~ msgstr[0] "%i mes"
+#~ msgstr[1] "%i meses"
+
+#~ msgid "%i year"
+#~ msgid_plural "%i years"
+#~ msgstr[0] "%i annada"
+#~ msgstr[1] "%i annadas"
+
+#~ msgid "Merge all pas conflicting"
+#~ msgstr "Fusiona totas las modificacions pas conflictualas"
+
+#~ msgid "Cycle through documents"
+#~ msgstr "Percórrer cycliquement los documents"
+
+#~ msgid "[%s] Set num panes"
+#~ msgstr "[%s] Régler lo nombre de volets"
+
+#~ msgid "[%s] Opening files"
+#~ msgstr "[%s] Dobertura dels fichièrs"
+
+#~ msgid "[%s] Reading files"
+#~ msgstr "[%s] Lectura dels fichièrs"
+
+#~ msgid "%s is not in encodings: %s"
+#~ msgstr "%s es pas dins un dels encodatges : %s"
+
+#~ msgid ""
+#~ "\"%s\" exists!\n"
+#~ "Overwrite?"
+#~ msgstr ""
+#~ "« %s » existís ja !\n"
+#~ "Espotir ?"
+
+#~ msgid ""
+#~ "Error writing to %s\n"
+#~ "\n"
+#~ "%s."
+#~ msgstr ""
+#~ "Error al moment de l'escritura de %s\n"
+#~ "\n"
+#~ "%s."
+
+#~ msgid "Choose a name for buffer %i."
+#~ msgstr "Causissètz un nom per lo tampon %i."
+
+#~ msgid ""
+#~ "This file '%s' contains a mixture of line endings.\n"
+#~ "\n"
+#~ "Which format would you like to use?"
+#~ msgstr ""
+#~ "Lo fichièr « %s » presenta una mescla de fins de linhas.\n"
+#~ "\n"
+#~ "Quin format volètz utilizar ?"
+
+#~ msgid "Save changes to documents before reloading?"
+#~ msgstr "Enregistrar las modificacions abans de recargar ?"
+
+#~ msgid "dir"
+#~ msgstr "repertòri"
+
+#~ msgid "Start a 2- or 3-way directory comparison"
+#~ msgstr "Aviar una comparason de 2 o 3 repertòris"
+
+#~ msgid "Start a comparison between file and dir/file"
+#~ msgstr "Aviar una comparason entre fichièr e repertòri/fichièr"
+
+#~ msgid "D-Bus error; comparisons will open in a new window."
+#~ msgstr "Error D-Bus ; las comparasons se dobriràn dins una novèla fenèstra."
+
+#~ msgid "Reload the comparison"
+#~ msgstr "Recarga la comparason"
+
+#~ msgid "Report _Bug"
+#~ msgstr "Senhalar una _anomalia"
+
+#~ msgid "Report a bug in Meld"
+#~ msgstr "Rapporte una anomalia de Meld"
+
+#~ msgid "About this program"
+#~ msgstr "A prepaus d'aqueste programa"
+
+#~ msgid "Show or hide the statusbar"
+#~ msgstr "Aficha o amaga la barra d'estat"
+
+#~ msgid "Only available if you have gnome-python-desktop installed"
+#~ msgstr "Disponible unicament se gnome-python-desktop es installat"
+
+#~ msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
+#~ msgstr "Salvaments\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
+
+#~ msgid ""
+#~ "OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db Desktop."
+#~ "ini\n"
+#~ msgstr ""
+#~ "Metadonadas spécifiques al sistèma operatiu\t0\t.DS_Store ._* .Spotlight-V100 ."
+#~ "Trashes Thumbs.db Desktop.ini\n"
+
+#~ msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n"
+#~ msgstr "Binaires\t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n"
+
+#~ msgid "Media\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
+#~ msgstr "Mèdia\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
+
+#~ msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
+#~ msgstr "Mots-clés CVS\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
+
+#~ msgid "C++ comment\t0\t//.*\n"
+#~ msgstr "Comentari C++\t0\t//.*\n"
+
+#~ msgid "C comment\t0\t/\\*.*?\\*/\n"
+#~ msgstr "Comentari C\t0\t/\\*.*?\\*/\n"
+
+#~ msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n"
+#~ msgstr "Tot caractèr d'espaçament\t0\t[ \\t\\r\\f\\v]*\n"
+
+#~ msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n"
+#~ msgstr "Caractèr d'espaçament en començament de linha\t0\t^[ \\t\\r\\f\\v]*\n"
+
+#~ msgid "Script comment\t0\t#.*"
+#~ msgstr "Comentari de script\t0\t#.*"
+
+#~ msgid "Update"
+#~ msgstr "Fa un « Update »"
+
+#~ msgid "Add to VC"
+#~ msgstr "Apond al gestionari de versions"
+
+#~ msgid "Remove from VC"
+#~ msgstr "Supprime del gestionari de versions"
+
+#~ msgid "Delete locally"
+#~ msgstr "Escafar localement"
+
+#~ msgid "Show normal"
+#~ msgstr "Afichatge normal"
+
+#~ msgid "Non _VC"
+#~ msgstr "Non _versionat"
+
+#~ msgid "Rev"
+#~ msgstr "Révision"
+
+#~ msgid "Tag"
+#~ msgstr "Etiqueta"
+
+#~ msgid "Options"
+#~ msgstr "Opcions"
+
+#~ msgid "%s Not Installed"
+#~ msgstr "%s es pas installat"
+
+#~ msgid "%s (%s)"
+#~ msgstr "%s (%s)"
+
+#~ msgid "[%s] Applying patch"
+#~ msgstr "[%s] Application del correctiu"
+
+#~ msgid "Patch tool not found"
+#~ msgstr "Aisina de correctiu non trobat"
+
+#~ msgid ""
+#~ "Meld needs the <i>patch</i> tool to be installed to perform comparisons in %s "
+#~ "repositories. Please install <i>patch</i> and try again."
+#~ msgstr ""
+#~ "Meld necessita l'installacion de l'aisina <i>patch</i> per far des comparasons "
+#~ "dins los repertòris %s. Installatz <i>patch</i> e réessayer."
+
+#~ msgid "Error fetching original comparison file"
+#~ msgstr "Error de recuperacion del fichièr de comparason original"
+
+#~ msgid ""
+#~ "Meld couldn't obtain the original version of your comparison file. If you are "
+#~ "using the most recent version of Meld, please report a bug, including as many "
+#~ "details as possible."
+#~ msgstr ""
+#~ "Meld n'a pas trobat lo fichièr de comparason de votre version originala. Se vous "
+#~ "utilizatz ja la darrièra version de Meld, veuillez dobrir un rapòrt de bug en y "
+#~ "incluant lo mai possible de detalhs."
+
+#~ msgid "Report a bug"
+#~ msgstr "Senhalar una anomalia"
+
+#~ msgid ""
+#~ "Regular expression error\n"
+#~ "'%s'"
+#~ msgstr ""
+#~ "Error d'expression régulière\n"
+#~ "« %s »"
+
+#~ msgid "_Browse..."
+#~ msgstr "_Percórrer..."
 
-#~ msgid "My Directory"
-#~ msgstr "Mon repertòri"
+#~ msgid "Path"
+#~ msgstr "Camin"
 
-#~ msgid "Original File"
-#~ msgstr "Fichièr original"
+#~ msgid "Path to file"
+#~ msgstr "Camin cap al fichièr"
 
-#~ msgid "Other Directory"
-#~ msgstr "Autre repertòri"
+#~ msgid "Pop up a file selector to choose a file"
+#~ msgstr "Aficha un selector de fichièrs per causir un fichièr"
 
-#~ msgid "Other File"
-#~ msgstr "Autre fichièr"
+#~ msgid "Select directory"
+#~ msgstr "Seleccionar lo repertòri"
 
-#~ msgid "_Character"
-#~ msgstr "_Caractèr"
+#~ msgid "Select file"
+#~ msgstr "Seleccionar lo fichièr"
 
-#~ msgid "_None"
-#~ msgstr "_Pas cap"
+#~ msgid ""
+#~ "Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing:Not "
+#~ "present"
+#~ msgstr ""
+#~ "Ignorat:Pas versionat:::Error::Novèlament apondut:Modificat:Conflicte:Suprimit:"
+#~ "Mancant:Absent"
 
-#~ msgid "_Word"
-#~ msgstr "_Mot"
+#~ msgid ""
+#~ "Error converting to a regular expression\n"
+#~ "The pattern was '%s'\n"
+#~ "The error was '%s'"
+#~ msgstr ""
+#~ "Error pendent la conversion en expression régulière\n"
+#~ "Lo motiu èra « %s »\n"
+#~ "L'error èra « %s »"

From 74cc0900d1bd8131292dcec32f88bc7918732635 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: Sat, 26 Mar 2016 21:45:31 +0100
Subject: [PATCH 44/44] Updated Serbian translation

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

diff --git a/po/sr.po b/po/sr.po
index 7b9482c1..71b2b49d 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,15 +1,17 @@
 # Serbian translation of meld
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2014.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2016.
 # This file is distributed under the same license as the meld package.
-# Maintainer: Данило Шеган <dsegan@gmx.net>
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011—2014.
+#
+# Translators: 
+# Данило Шеган <dsegan@gmx.net>
+# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011—2016.
 msgid ""
 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: 2014-12-27 10:52+0000\n"
-"PO-Revision-Date: 2014-12-27 15:53+0200\n"
+"POT-Creation-Date: 2016-03-26 01:54+0000\n"
+"PO-Revision-Date: 2016-03-26 21:41+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
 "Language: sr\n"
@@ -20,20 +22,20 @@ msgstr ""
 "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
-#: ../bin/meld:138
+#: ../bin/meld:144
 msgid "Cannot import: "
 msgstr "Не могу да увезем: "
 
-#: ../bin/meld:141
+#: ../bin/meld:147
 #, c-format
 msgid "Meld requires %s or higher."
 msgstr "Мелд захтева %s или новији."
 
-#: ../bin/meld:145
+#: ../bin/meld:151
 msgid "Meld does not support Python 3."
 msgstr "Мелд не подржава Питона 3."
 
-#: ../bin/meld:194
+#: ../bin/meld:201
 #, c-format
 msgid ""
 "Couldn't load Meld-specific CSS (%s)\n"
@@ -58,6 +60,11 @@ msgstr "Прегледач разлика Мелд"
 msgid "Compare and merge your files"
 msgstr "Упоређујте и спајајте ваше датотеке"
 
+#. 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 "разлика;стопи;"
+
 #: ../data/meld.appdata.xml.in.h:1
 msgid ""
 "Meld is a visual diff and merge tool targeted at developers. Meld helps you "
@@ -116,7 +123,7 @@ msgid ""
 "These text encodings will be automatically used (in order) to try to decode "
 "loaded text files."
 msgstr ""
-"Ова кодирања текста ће бити самостално коришћења (по реду) при покушају "
+"Ова кодирања текста биће аутоматски коришћења (по реду) при покушају "
 "декодирања учитаних текстуалних датотека."
 
 #: ../data/org.gnome.meld.gschema.xml.h:9
@@ -143,7 +150,7 @@ msgstr "Приказује бројеве редова"
 #: ../data/org.gnome.meld.gschema.xml.h:14
 msgid "If true, line numbers will be shown in the gutter of file comparisons."
 msgstr ""
-"Ако је изабрано, бројеви редова ће бити приказани у жлебу поређења датотека."
+"Ако је изабрано, бројеви редова биће приказани у жлебу поређења датотека."
 
 #: ../data/org.gnome.meld.gschema.xml.h:15
 msgid "Highlight syntax"
@@ -188,9 +195,9 @@ msgid ""
 "not at all ('none'), at any character ('char') or only at the end of words "
 "('word')."
 msgstr ""
-"Редови при поређењу датотека ће бити преломљени у складу са овим "
-"подешавањем, без преламања — „none“, на било ком знаку — „char“, или само на "
-"крају речи — „word“."
+"Редови при поређењу датотека биће преломљени у складу са овим подешавањем, "
+"без преламања — „none“, на било ком знаку — „char“, или само на крају речи — "
+"„word“."
 
 #: ../data/org.gnome.meld.gschema.xml.h:23
 msgid "Highlight current line"
@@ -201,20 +208,21 @@ msgid ""
 "If true, the line containing the cursor will be highlighted in file "
 "comparisons."
 msgstr ""
-"Ако је изабрано, ред који садржи курзор ће бити истакнут при поређењу "
-"датотека."
+"Ако је изабрано, ред који садржи курзор биће истакнут при поређењу датотека."
 
 #: ../data/org.gnome.meld.gschema.xml.h:25
 msgid "Use the system default monospace font"
 msgstr "Користи системски словни лик сталне ширине"
 
 #: ../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 ""
-"Ако није изабрано, задати произвољни словни лик ће бити коришћен уместо "
-"системског словног лика сталне ширине."
+"Ако није изабрано, произвољни словни лик биће коришћен уместо системског "
+"словног лика сталне ширине."
 
 #: ../data/org.gnome.meld.gschema.xml.h:27
 msgid "Custom font"
@@ -236,19 +244,22 @@ msgstr "Занемарује празне редове при поређењу 
 msgid ""
 "If true, blank lines will be trimmed when highlighting changes between files."
 msgstr ""
-"Ако је изабрано, празни редови ће бити скраћени када се истицање промени "
-"међу датотекама."
+"Ако је изабрано, празни редови биће скраћени када се истицање промени међу "
+"датотекама."
 
 #: ../data/org.gnome.meld.gschema.xml.h:31
 msgid "Use the system default editor"
 msgstr "Користи основни уређивач система"
 
 #: ../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 ""
-"Ако није изабрано, задати произвољни уређивач ће бити коришћен уместо "
+"Ако није изабрано, произвољна наредба уређивача биће коришћена уместо "
 "системског уређивача приликом отварања датотека споља."
 
 #: ../data/org.gnome.meld.gschema.xml.h:33
@@ -271,9 +282,9 @@ msgstr "Ступци за приказивање"
 msgid ""
 "List of column names in folder comparison and whether they should be "
 "displayed."
-msgstr "Списак назива стубаца при поређењу фасцикли и да ли ће бити приказани."
+msgstr "Списак назива стубаца при поређењу фасцикли и да ли биће приказани."
 
-#: ../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 "Занемари симболичке везе"
 
@@ -313,34 +324,48 @@ msgstr ""
 "Приликом поређења на основу м_времена, ово је најмања разлика у "
 "наносекундама између две датотеке пре него што се одлучи да имају различита "
 "м_времена. Ово је корисно приликом поређења датотека између система датотека "
-"са различитом резолцијом временске ознаке."
+"са различитом резолуцијом временске ознаке."
 
-#: ../data/org.gnome.meld.gschema.xml.h:43
-msgid "File status filters"
-msgstr "Пропусници стања датотека"
+#: ../data/org.gnome.meld.gschema.xml.h:43 ../data/ui/preferences.ui.h:30
+msgid "Apply text filters during folder comparisons"
+msgstr "Примени филтере текста за време поређења фасцикли"
 
 #: ../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 ""
+"Ако је изабрано, поређење фасцикли које упоређује садржаје датотека такође "
+"примењује активне филтере текста и опцију скраћивања празног реда, и "
+"занемарује разлике нових редова."
+
+#: ../data/org.gnome.meld.gschema.xml.h:45
+msgid "File status filters"
+msgstr "Филтери стања датотека"
+
+#: ../data/org.gnome.meld.gschema.xml.h:46
 msgid "List of statuses used to filter visible files in folder comparison."
 msgstr ""
 "Списак стања коришћених за издвајање видљивих датотека при поређењу фасцикли."
 
-#: ../data/org.gnome.meld.gschema.xml.h:45
+#: ../data/org.gnome.meld.gschema.xml.h:47
 msgid "Show the version control console output"
 msgstr "Приказује излаз конзоле управљања издањем"
 
-#: ../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."
 msgstr ""
-"Ако је изабрано, одељак излаза конзоле ће бити приказан у прегледима "
-"управљања издањем, приказујући покренуте наредбе за радње управљања издањем."
+"Ако је изабрано, одељак излаза конзоле биће приказан у прегледима управљања "
+"издањем, приказујући покренуте наредбе за радње управљања издањем."
 
-#: ../data/org.gnome.meld.gschema.xml.h:47
+#: ../data/org.gnome.meld.gschema.xml.h:49
 msgid "Version control pane position"
 msgstr "Положај површи управљања издањима"
 
-#: ../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."
@@ -348,11 +373,11 @@ msgstr ""
 "Ово је висина главног стабла управљања издањем када је приказана површ "
 "конзоле."
 
-#: ../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 "Представља поређења издања као месно-лево/удаљено-десно"
 
-#: ../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, "
@@ -362,14 +387,19 @@ msgstr ""
 "месно, десно-је-удаљено“ да одреде којим редом ће представити датотеке у "
 "окнима. У супротном, користи се шема „лево-је-њихово, десно-је-моје“."
 
-#: ../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 ""
 "Редослед датотека за поређење стапања управљања издањем за три елемента"
 
-#: ../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 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 ""
@@ -378,11 +408,11 @@ msgstr ""
 "прегледа управљања издањем, стога се користи једино за решавање спајања/"
 "сукоба у Мелду."
 
-#: ../data/org.gnome.meld.gschema.xml.h:53
+#: ../data/org.gnome.meld.gschema.xml.h:55
 msgid "Show margin in commit message editor"
 msgstr "Приказује ивицу у уређивачу поруке предаје"
 
-#: ../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."
@@ -390,65 +420,68 @@ msgstr ""
 "Ако је изабрано, биће приказана вођица да покаже од ког ступца се ивица "
 "налази у уређивачу поруке предаје управљања издањем."
 
-#: ../data/org.gnome.meld.gschema.xml.h:55
+#: ../data/org.gnome.meld.gschema.xml.h:57
 msgid "Margin column in commit message editor"
 msgstr "Стубац ивице у уређивачу поруке предаје"
 
-#: ../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."
 msgstr ""
 "Стубац на коме приказати ивицу у уређивачу поруке предаје управљања издањем."
 
-#: ../data/org.gnome.meld.gschema.xml.h:57
+#: ../data/org.gnome.meld.gschema.xml.h:59
 msgid "Automatically hard-wrap commit messages"
 msgstr "Самостално силно-прелама поруке предаје"
 
-#: ../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."
 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 ""
 "Ако је изабрано, уређивач поруке предаје управљања издањем ће силно-"
-"преломити (тј. уметнути преломе редова) на задатој ивици предаје пре предаје."
+"преломити (тј. уметнути преломе редова) на ивици предаје пре предаје."
 
-#: ../data/org.gnome.meld.gschema.xml.h:59
+#: ../data/org.gnome.meld.gschema.xml.h:61
 msgid "Version control status filters"
-msgstr "Пропусници стања управљања издањем"
+msgstr "Филтери стања управљања издањем"
 
-#: ../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 ""
 "Списак стања коришћених за издвајање видљивих датотека при поређењу "
 "управљања издањем."
 
-#: ../data/org.gnome.meld.gschema.xml.h:61
+#: ../data/org.gnome.meld.gschema.xml.h:63
 msgid "Filename-based filters"
-msgstr "Пропусници засновани на називу датотеке"
+msgstr "Филтери засновани на називу датотеке"
 
-#: ../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."
 msgstr ""
-"Списак унапред одређених пропусника заснованих на називу датотеке који ће, "
-"ако је радно, уклонити поклопљене датотеке из поређења фасцикли."
+"Списак унапред одређених филтера заснованих на називу датотеке који ће, ако "
+"је радно, уклонити поклопљене датотеке из поређења фасцикли."
 
-#: ../data/org.gnome.meld.gschema.xml.h:63
+#: ../data/org.gnome.meld.gschema.xml.h:65
 msgid "Text-based filters"
-msgstr "Пропусници засновани на тексту"
+msgstr "Филтери засновани на тексту"
 
-#: ../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, "
 "but won't contribute to the comparison itself."
 msgstr ""
-"Списак унапред одређених пропусника регуларног израза заснованих на тексту "
-"који ће, ако је радно, уклонити текст из употребе при поређењу датотека. "
-"Текст ће још увек бити приказан, али неће допринети поређењу."
+"Списак унапред одређених филтера регуларног израза заснованих на тексту који "
+"ће, ако је радно, уклонити текст из употребе при поређењу датотека. Текст ће "
+"још увек бити приказан, али неће допринети поређењу."
 
 #: ../data/ui/application.ui.h:1
 msgid "About Meld"
@@ -518,7 +551,7 @@ msgstr "Умножите десно"
 msgid "Delete selected"
 msgstr "Обриши изабрано"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1429
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:881 ../meld/filediff.py:1489
 msgid "Hide"
 msgstr "Сакриј"
 
@@ -564,11 +597,11 @@ msgstr "Прикажи измењене"
 
 #: ../data/ui/dirdiff.ui.h:18
 msgid "Filters"
-msgstr "Пропусници"
+msgstr "Филтери"
 
 #: ../data/ui/dirdiff.ui.h:19
 msgid "Set active filters"
-msgstr "Подесите активне пропуснике"
+msgstr "Подесите активне филтере"
 
 #: ../data/ui/EditableList.ui.h:1
 msgid "Editable List"
@@ -587,7 +620,7 @@ msgid "_Add"
 msgstr "_Додај"
 
 #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:747
+#: ../meld/vcview.py:762
 msgid "_Remove"
 msgstr "_Уклони"
 
@@ -608,8 +641,7 @@ msgid "Move _Down"
 msgstr "Премести _доле"
 
 #. 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 ../meld/dirdiff.py:374 ../meld/vcview.py:215
 msgid "Name"
 msgstr "Назив"
 
@@ -619,11 +651,11 @@ msgstr "Образац"
 
 #: ../data/ui/EditableList.ui.h:12
 msgid "Add new filter"
-msgstr "Додајте нови пропусник"
+msgstr "Додајте нови филтер"
 
 #: ../data/ui/EditableList.ui.h:13
 msgid "Remove selected filter"
-msgstr "Уклоните изабрани пропусник"
+msgstr "Уклоните изабрани филтер"
 
 #: ../data/ui/filediff.ui.h:1
 msgid "Format as Patch..."
@@ -650,16 +682,18 @@ msgid "Add Synchronization Point"
 msgstr "Додај тачку усклађивања"
 
 #: ../data/ui/filediff.ui.h:7
-msgid "Add a manual point for synchronization of changes between files"
-msgstr "Додајте тачку за усклађивање измена између датотека"
+#| msgid "Add a manual point for synchronization of changes between files"
+msgid "Add a synchronization point for changes between files"
+msgstr "Додајте тачку усклађивања за измене између датотека"
 
 #: ../data/ui/filediff.ui.h:8
 msgid "Clear Synchronization Points"
 msgstr "Очисти тачке усклађивања"
 
 #: ../data/ui/filediff.ui.h:9
-msgid "Clear manual change sychronization points"
-msgstr "Очистите тачке усклађивања измена"
+#| msgid "Add a manual point for synchronization of changes between files"
+msgid "Clear sychronization points for changes between files"
+msgstr "Очистите тачку усклађивања за измене између датотека"
 
 #: ../data/ui/filediff.ui.h:10
 msgid "Previous Conflict"
@@ -774,17 +808,14 @@ msgid "Merge all non-conflicting changes from left and right panes"
 msgstr "Обједините све несукобљавајуће измене с леве и десне површи"
 
 #: ../data/ui/filediff.ui.h:38
-#| msgid "Previous Change"
 msgid "Previous Pane"
 msgstr "Претходно окно"
 
 #: ../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 "Преместите фокус тастатуре на претходни документ у овом поређењу"
 
 #: ../data/ui/filediff.ui.h:40
-#| msgid "Next Change"
 msgid "Next Pane"
 msgstr "Следеће окно"
 
@@ -812,7 +843,8 @@ msgstr "Ако не сачувате, измене ће бити трајно и
 msgid "Close _without Saving"
 msgstr "Затвори _без чувања"
 
-#: ../data/ui/filediff.ui.h:47
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:972 ../meld/filediff.py:1658
+#: ../meld/filediff.py:1742 ../meld/filediff.py:1767
 msgid "_Cancel"
 msgstr "_Откажи"
 
@@ -847,9 +879,9 @@ msgstr "Да повратим несачуване измене у докуме
 
 #: ../data/ui/filediff.ui.h:54
 msgid "Changes made to the following documents will be permanently lost:\n"
-msgstr "Измене начињене над следећим документима ће бити трајно изгубљене:\n"
+msgstr "Измене начињене над следећим документима биће трајно изгубљене:\n"
 
-#: ../data/ui/findbar.ui.h:1
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:973 ../meld/filediff.py:1659
 msgid "_Replace"
 msgstr "_Замени"
 
@@ -897,7 +929,7 @@ msgstr "Обликуј као исправку"
 msgid "Copy to Clipboard"
 msgstr "Умножи у оставу"
 
-#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:119
+#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:125
 msgid "Save Patch"
 msgstr "Сачувај исправку"
 
@@ -1033,51 +1065,51 @@ msgstr "Уп_ореди датотеке само на основу величи
 msgid "_Timestamp resolution:"
 msgstr "_Резолуција временске ознаке:"
 
-#: ../data/ui/preferences.ui.h:30
+#: ../data/ui/preferences.ui.h:31
 msgid "Symbolic Links"
 msgstr "Симболичке везе"
 
-#: ../data/ui/preferences.ui.h:32
+#: ../data/ui/preferences.ui.h:33
 msgid "Visible Columns"
 msgstr "Приказане колоне"
 
-#: ../data/ui/preferences.ui.h:33
+#: ../data/ui/preferences.ui.h:34
 msgid "Folder Comparisons"
 msgstr "Поређење фасцикли"
 
-#: ../data/ui/preferences.ui.h:34
+#: ../data/ui/preferences.ui.h:35
 msgid "Version Comparisons"
 msgstr "Поређење издања"
 
-#: ../data/ui/preferences.ui.h:35
+#: ../data/ui/preferences.ui.h:36
 msgid "_Order when comparing file revisions:"
 msgstr "_Редослед при поређењу прегледа датотеке:"
 
-#: ../data/ui/preferences.ui.h:36
+#: ../data/ui/preferences.ui.h:37
 msgid "Order when _merging files:"
 msgstr "Редослед при _спајању датотека:"
 
-#: ../data/ui/preferences.ui.h:37
+#: ../data/ui/preferences.ui.h:38
 msgid "Commit Messages"
 msgstr "Поруке предаје"
 
-#: ../data/ui/preferences.ui.h:38
+#: ../data/ui/preferences.ui.h:39
 msgid "Show _right margin at:"
 msgstr "Прикажи _десну маргину на:"
 
-#: ../data/ui/preferences.ui.h:39
+#: ../data/ui/preferences.ui.h:40
 msgid "Automatically _break lines at right margin on commit"
 msgstr "Сам _преламај редове на десној маргини при предаји"
 
-#: ../data/ui/preferences.ui.h:40
+#: ../data/ui/preferences.ui.h:41
 msgid "Version Control"
 msgstr "Управљање издањем"
 
-#: ../data/ui/preferences.ui.h:41
+#: ../data/ui/preferences.ui.h:42
 msgid "Filename filters"
-msgstr "Пропусници назива датотека"
+msgstr "Филтери назива датотека"
 
-#: ../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 "
@@ -1087,23 +1119,23 @@ msgstr ""
 "према називу. Сваки образац је списак џокера у стилу конзоле раздвојених "
 "размаком."
 
-#: ../data/ui/preferences.ui.h:43 ../meld/meldwindow.py:103
+#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:103
 msgid "File Filters"
-msgstr "Пропусници датотека"
+msgstr "Филтери датотека"
 
-#: ../data/ui/preferences.ui.h:44
+#: ../data/ui/preferences.ui.h:45
 msgid "Change trimming"
 msgstr "Скраћивање измене"
 
-#: ../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 "Скраћује разлике празних редова од почетка и краја измена"
 
-#: ../data/ui/preferences.ui.h:46
+#: ../data/ui/preferences.ui.h:47
 msgid "Text filters"
-msgstr "Пропусници текста"
+msgstr "Филтери текста"
 
-#: ../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 "
@@ -1116,11 +1148,11 @@ msgstr ""
 "празним нискама пре извршавања поређења. Ако израз садржи групе, само групе "
 "бивају замењене. За више детаља погледајте упутство за кориснике."
 
-#: ../data/ui/preferences.ui.h:48
+#: ../data/ui/preferences.ui.h:49
 msgid "Text Filters"
-msgstr "Пропусници текста"
+msgstr "Филтери текста"
 
-#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:623
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:625
 msgid "New comparison"
 msgstr "Ново поређење"
 
@@ -1313,55 +1345,100 @@ msgstr ""
 msgid "_Push commits"
 msgstr "_Погурај предаје"
 
+#: ../meld/const.py:10
+msgid "UNIX (LF)"
+msgstr "УНИКС (LF)"
+
+#: ../meld/const.py:11
+msgid "DOS/Windows (CR-LF)"
+msgstr "ДОС/Виндоуз (CR-LF)"
+
+#: ../meld/const.py:12
+msgid "Mac OS (CR)"
+msgstr "Мек ОС (CR)"
+
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:381 ../meld/preferences.py:82
+#: ../meld/dirdiff.py:392 ../meld/preferences.py:82
 msgid "Size"
 msgstr "Величина"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:389 ../meld/preferences.py:83
+#: ../meld/dirdiff.py:400 ../meld/preferences.py:83
 msgid "Modification time"
 msgstr "Време измене"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:397 ../meld/preferences.py:84
+#: ../meld/dirdiff.py:408 ../meld/preferences.py:84
 msgid "Permissions"
 msgstr "Овлашћења"
 
-#: ../meld/dirdiff.py:543
+#: ../meld/dirdiff.py:561
 #, python-format
 msgid "Hide %s"
 msgstr "Сакриј „%s“"
 
-#: ../meld/dirdiff.py:672 ../meld/dirdiff.py:694
+#: ../meld/dirdiff.py:693 ../meld/dirdiff.py:715
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] прегледам „%s“"
 
-#: ../meld/dirdiff.py:823
+#: ../meld/dirdiff.py:848
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Готово"
 
-#: ../meld/dirdiff.py:830
+#: ../meld/dirdiff.py:856
+msgid "Folders have no differences"
+msgstr "Фасцикле се не разликују"
+
+#: ../meld/dirdiff.py:858
+msgid "Contents of scanned files in folders are identical."
+msgstr "Садржаји прегледаних датотека у фасциклама су истоветни."
+
+#: ../meld/dirdiff.py:860
+msgid ""
+"Scanned files in folders appear identical, but contents have not been "
+"scanned."
+msgstr ""
+"Прегледане датотеке у фасциклама изгледа да су исте, али њихов садржај није "
+"прегледан."
+
+#: ../meld/dirdiff.py:863
+msgid "File filters are in use, so not all files have been scanned."
+msgstr "У употреби су филтери датотека, тако да нису све датотеке прегледане."
+
+#: ../meld/dirdiff.py:865
+#| 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 "У употреби су филтери текста и могу замаскирати разлике садржаја."
+
+#: ../meld/dirdiff.py:883 ../meld/dirdiff.py:936 ../meld/filediff.py:1129
+#: ../meld/filediff.py:1161 ../meld/filediff.py:1296 ../meld/filediff.py:1491
+#: ../meld/filediff.py:1521 ../meld/filediff.py:1523
+msgid "Hi_de"
+msgstr "_Сакриј"
+
+#: ../meld/dirdiff.py:893
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Дошло је до више грешака за време претраживања ове фасцикле"
 
-#: ../meld/dirdiff.py:831
+#: ../meld/dirdiff.py:894
 msgid "Files with invalid encodings found"
 msgstr "Пронађене су датотеке са неисправним кодирањем"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:833
+#: ../meld/dirdiff.py:896
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "Неке датотеке бејаху у неисправном кодирању. Називи су нешто као:"
 
-#: ../meld/dirdiff.py:835
+#: ../meld/dirdiff.py:898
 msgid "Files hidden by case insensitive comparison"
 msgstr "Датотеке скривене поређењем неосетљивим на величину слова"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:837
+#: ../meld/dirdiff.py:900
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1369,30 +1446,30 @@ msgstr ""
 "Покренули сте поређење независно од величине слова на систему датотека где "
 "је она битна. Неке датотеке нису видљиве:"
 
-#: ../meld/dirdiff.py:848
+#: ../meld/dirdiff.py:911
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "„%s“ сакривено од стране „%s“"
 
-#: ../meld/dirdiff.py:873 ../meld/filediff.py:1103 ../meld/filediff.py:1255
-#: ../meld/filediff.py:1431 ../meld/filediff.py:1461 ../meld/filediff.py:1463
-msgid "Hi_de"
-msgstr "_Сакриј"
+#: ../meld/dirdiff.py:976
+#, python-format
+msgid "Replace folder “%s”?"
+msgstr "Да заменим фасциклу „%s“?"
 
-#: ../meld/dirdiff.py:904
+#: ../meld/dirdiff.py:978
 #, 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“ постоји.\n"
-"Да преснимим?"
+"Већ постоји једна фасцикла са истим називом у „%s“.\n"
+"Ако замените постојећу фасциклу, све датотеке у њој биће изгубљене."
 
-#: ../meld/dirdiff.py:912
+#: ../meld/dirdiff.py:991
 msgid "Error copying file"
 msgstr "Грешка умножавања датотеке"
 
-#: ../meld/dirdiff.py:913
+#: ../meld/dirdiff.py:992
 #, python-format
 msgid ""
 "Couldn't copy %s\n"
@@ -1405,121 +1482,156 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/dirdiff.py:936
+#: ../meld/dirdiff.py:1015
 #, python-format
 msgid "Error deleting %s"
 msgstr "Грешка брисања „%s“"
 
+#: ../meld/dirdiff.py:1520
+#| msgid "folder"
+msgid "No folder"
+msgstr "Нема фасцикле"
+
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:399
+#: ../meld/filediff.py:410
 msgid "INS"
 msgstr "УМЕТ"
 
-#: ../meld/filediff.py:399
+#: ../meld/filediff.py:410
 msgid "OVR"
 msgstr "ПРЕП"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:401
+#: ../meld/filediff.py:412
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Ред %i, место %i"
 
-#: ../meld/filediff.py:813
+#: ../meld/filediff.py:825
+msgid "Comparison results will be inaccurate"
+msgstr "Резултат поређења неће бити тачан"
+
+#: ../meld/filediff.py:827
 #, python-format
+#| 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."
+"Filter “%s” changed the number of lines in the file, which is unsupported. "
+"The comparison will not be accurate."
 msgstr ""
-"Пропусник „%s“ је изменио број редова у датотеци. Поређење неће бити тачно. "
-"За више детаља погледајте приручник за кориснике."
+"Филтер „%s“ је изменио број редова у датотеци, што није подржано. Поређење "
+"неће бити тачно."
 
-#: ../meld/filediff.py:882
+#: ../meld/filediff.py:898
 msgid "Mark conflict as resolved?"
 msgstr "Да означим сукоб решеним?"
 
-#: ../meld/filediff.py:884
+#: ../meld/filediff.py:900
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr "Ако је сукоб успешно решен, сада га можете означити решеним."
 
-#: ../meld/filediff.py:886
+#: ../meld/filediff.py:902
 msgid "Cancel"
 msgstr "Откажи"
 
-#: ../meld/filediff.py:887
+#: ../meld/filediff.py:903
 msgid "Mark _Resolved"
 msgstr "Означи _решеним"
 
-#: ../meld/filediff.py:1090
+#: ../meld/filediff.py:1110
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "Постављам број површи [%s]"
 
-#: ../meld/filediff.py:1097
+#: ../meld/filediff.py:1123
 #, python-format
 msgid "[%s] Opening files"
 msgstr "Отварам датотеке [%s]"
 
-#: ../meld/filediff.py:1120 ../meld/filediff.py:1130 ../meld/filediff.py:1143
-#: ../meld/filediff.py:1149
+#: ../meld/filediff.py:1146 ../meld/filediff.py:1184 ../meld/filediff.py:1190
 msgid "Could not read file"
 msgstr "Не могу да прочитам датотеку"
 
-#: ../meld/filediff.py:1121
+#: ../meld/filediff.py:1147
 #, python-format
 msgid "[%s] Reading files"
 msgstr "Читам датотеке [%s]"
 
-#: ../meld/filediff.py:1131
+#: ../meld/filediff.py:1156
 #, python-format
-msgid "%s appears to be a binary file."
-msgstr "„%s“ изгледа да је извршна датотека."
+#| msgid "%s appears to be a binary file."
+msgid "File %s appears to be a binary file."
+msgstr "Датотека „%s“ изгледа да је извршна датотека."
+
+#: ../meld/filediff.py:1157
+#| msgid "Open selected file or directory in the default external application"
+msgid "Do you want to open the file using the default application?"
+msgstr "Да ли желите да отворите датотеку користећи подразумевани програм?"
+
+#: ../meld/filediff.py:1160
+msgid "Open"
+msgstr "Отвори"
 
-#: ../meld/filediff.py:1144
+#: ../meld/filediff.py:1185
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "„%s“ није у кодирањима: „%s“"
 
-#: ../meld/filediff.py:1182
+#: ../meld/filediff.py:1223
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "Срачунавам разлике [%s]"
 
-#: ../meld/filediff.py:1250
+#: ../meld/filediff.py:1291
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Датотека „%s“ је измењена на диску"
 
-#: ../meld/filediff.py:1251
+#: ../meld/filediff.py:1292
 msgid "Do you want to reload the file?"
 msgstr "Да ли желите поново да учитате датотеку?"
 
-#: ../meld/filediff.py:1254
+#: ../meld/filediff.py:1295
 msgid "_Reload"
 msgstr "_Учитај поново"
 
-#: ../meld/filediff.py:1420
+#: ../meld/filediff.py:1454
+msgid "Files are identical"
+msgstr "Датотеке су истоветне"
+
+#: ../meld/filediff.py:1467
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
 msgstr ""
-"Коришћени су пропусници текста, а могу постојати и замаскиране разлике "
-"између датотека. Да ли желите да поредите неиздвојене датотеке?"
+"Коришћени су филтери текста, а могу постојати и замаскиране разлике између "
+"датотека. Да ли желите да поредите неиздвојене датотеке?"
 
-#: ../meld/filediff.py:1426
-msgid "Files are identical"
-msgstr "Датотеке су истоветне"
+#: ../meld/filediff.py:1472
+#| msgid "Files with invalid encodings found"
+msgid "Files differ in line endings only"
+msgstr "Датотеке се разликују само по завршецима редова"
+
+#: ../meld/filediff.py:1474
+#, python-format
+msgid ""
+"Files are identical except for differing line endings:\n"
+"%s"
+msgstr ""
+"Датотеке су истоветне осим по другачијим завршецима редова:\n"
+"%s"
 
-#: ../meld/filediff.py:1434
+#: ../meld/filediff.py:1494
 msgid "Show without filters"
-msgstr "Приказује без пропусника"
+msgstr "Приказује без филтера"
 
-#: ../meld/filediff.py:1456
+#: ../meld/filediff.py:1516
 msgid "Change highlighting incomplete"
 msgstr "Истицање измена није довршено"
 
-#: ../meld/filediff.py:1457
+#: ../meld/filediff.py:1517
 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."
@@ -1527,88 +1639,117 @@ msgstr ""
 "Неке измене нису истакнуте зато што су превелике. Можете да приморате Мелд "
 "да продужи са истицањем већих измена, иако то може бити споро."
 
-#: ../meld/filediff.py:1465
+#: ../meld/filediff.py:1525
 msgid "Keep highlighting"
 msgstr "Задржите истицање"
 
-#: ../meld/filediff.py:1467
+#: ../meld/filediff.py:1527
 msgid "_Keep highlighting"
 msgstr "_Задржи истицање"
 
-#: ../meld/filediff.py:1596
+#: ../meld/filediff.py:1662
+#, python-format
+msgid "Replace file “%s”?"
+msgstr "Да заменим датотеку „%s“?"
+
+#: ../meld/filediff.py:1664
 #, python-format
 msgid ""
-"\"%s\" exists!\n"
-"Overwrite?"
+"A file with this name already exists in “%s”.\n"
+"If you replace the existing file, its contents will be lost."
 msgstr ""
-"„%s“ постоји!\n"
-"Да преснимим?"
+"Већ постоји датотека са овим називом у „%s“.\n"
+"Ако замените постојећу датотеку, њен садржај биће изгубљен."
 
-#: ../meld/filediff.py:1609
+#: ../meld/filediff.py:1682
+#, python-format
+#| msgid "Could not read file"
+msgid "Could not save file %s."
+msgstr "Не могу да сачувам датотеку „%s“."
+
+#: ../meld/filediff.py:1683
 #, python-format
 msgid ""
-"Error writing to %s\n"
-"\n"
-"%s."
+"Couldn't save file due to:\n"
+"%s"
 msgstr ""
-"Грешка писања у „%s“\n"
-"\n"
-"%s."
+"Не могу да сачувам датотеку због:\n"
+"%s"
 
-#: ../meld/filediff.py:1620
+#: ../meld/filediff.py:1695
 msgid "Save Left Pane As"
 msgstr "Сачувај леву површ као"
 
-#: ../meld/filediff.py:1622
+#: ../meld/filediff.py:1697
 msgid "Save Middle Pane As"
 msgstr "Сачувај средњу површ као"
 
-#: ../meld/filediff.py:1624
+#: ../meld/filediff.py:1699
 msgid "Save Right Pane As"
 msgstr "Сачувај десну површ као"
 
-#: ../meld/filediff.py:1637
+#: ../meld/filediff.py:1713
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Датотека „%s“ је измењена на диску након отварања"
 
-#: ../meld/filediff.py:1639
+#: ../meld/filediff.py:1715
 msgid "If you save it, any external changes will be lost."
-msgstr "Ако је сачувате, све спољне измене ће бити изгубљене."
+msgstr "Ако је сачувате, све спољне измене биће изгубљене."
 
-#: ../meld/filediff.py:1642
+#: ../meld/filediff.py:1718
 msgid "Save Anyway"
 msgstr "Ипак сачувај"
 
-#: ../meld/filediff.py:1643
+#: ../meld/filediff.py:1719
 msgid "Don't Save"
 msgstr "Немој чувати"
 
-#: ../meld/filediff.py:1667
+#: ../meld/filediff.py:1745
+#| msgid "Files with invalid encodings found"
+msgid "Inconsistent line endings found"
+msgstr "Пронађох недоследне завршетке редова"
+
+#: ../meld/filediff.py:1747
 #, python-format
+#| msgid ""
+#| "This file '%s' contains a mixture of line endings.\n"
+#| "\n"
+#| "Which format would you like to use?"
 msgid ""
-"This file '%s' contains a mixture of line endings.\n"
-"\n"
-"Which format would you like to use?"
+"'%s' contains a mixture of line endings. Select the line ending format to "
+"use."
 msgstr ""
-"Датотека „%s“ садржи мешавину завршетака реда.\n"
-"\n"
-"Који облик желите да користите?"
+"„%s“ садржи мешавину завршетака редова. Изаберите запис завршетка реда који "
+"желите да користите."
 
-#: ../meld/filediff.py:1683
+#: ../meld/filediff.py:1768
+msgid "_Save as UTF-8"
+msgstr "_Сачувај као УТФ-8"
+
+#: ../meld/filediff.py:1771
+#, python-format
+msgid "Couldn't encode text as “%s”"
+msgstr "Не могу да кодирам текст као „%s“"
+
+#: ../meld/filediff.py:1773
 #, python-format
+#| msgid ""
+#| "'%s' contains characters not encodable with '%s'\n"
+#| "Would you like to save as UTF-8?"
 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“ садржи знакове који се не могу кодирати уз „%s“\n"
+"Датотека „%s“ садржи знакове који се не могу кодирати употребом кодирања „%s“"
+"\n"
 "Да ли желите да сачувате као УТФ-8?"
 
-#: ../meld/filediff.py:2023
+#: ../meld/filediff.py:2125
 msgid "Live comparison updating disabled"
 msgstr "Искључено је живо ажурирање поређења"
 
-#: ../meld/filediff.py:2024
+#: ../meld/filediff.py:2126
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1623,103 +1764,108 @@ msgstr ""
 msgid "[%s] Merging files"
 msgstr "Обједињујем датотеке [%s]"
 
-#: ../meld/gutterrendererchunk.py:90
+#: ../meld/gutterrendererchunk.py:93
 msgid "Copy _up"
 msgstr "Умножи _горе"
 
-#: ../meld/gutterrendererchunk.py:91
+#: ../meld/gutterrendererchunk.py:94
 msgid "Copy _down"
 msgstr "Умножи _доле"
 
-#: ../meld/meldapp.py:170
+#: ../meld/meldapp.py:177
 msgid "wrong number of arguments supplied to --diff"
 msgstr "погрешан број аргумената придодат уз „--diff“"
 
-#: ../meld/meldapp.py:175
+#: ../meld/meldapp.py:182
 msgid "Start with an empty window"
 msgstr "Отвара један празан прозор"
 
 # bug: string composition is bad i18n, and will make l10n hard
-#: ../meld/meldapp.py:176 ../meld/meldapp.py:178
+#: ../meld/meldapp.py:183 ../meld/meldapp.py:185
 msgid "file"
 msgstr "датотека"
 
-#: ../meld/meldapp.py:176 ../meld/meldapp.py:180
+#: ../meld/meldapp.py:183 ../meld/meldapp.py:187
 msgid "folder"
 msgstr "фасцикла"
 
-#: ../meld/meldapp.py:177
+#: ../meld/meldapp.py:184
 msgid "Start a version control comparison"
 msgstr "Покреће поређење контроле верзије"
 
-#: ../meld/meldapp.py:179
+#: ../meld/meldapp.py:186
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Покреће поређење 2 или 3 датотеке"
 
-#: ../meld/meldapp.py:181
+#: ../meld/meldapp.py:188
 msgid "Start a 2- or 3-way folder comparison"
 msgstr "Покреће поређење 2 или 3 фасцикле"
 
-#: ../meld/meldapp.py:224
+#: ../meld/meldapp.py:231
 #, python-format
 msgid "Error: %s\n"
 msgstr "Грешка: %s\n"
 
-#: ../meld/meldapp.py:231
+#: ../meld/meldapp.py:238
 msgid "Meld is a file and directory comparison tool."
 msgstr "Мелд је алат за поређење датотека и фасцикли."
 
-#: ../meld/meldapp.py:235
+#: ../meld/meldapp.py:242
 msgid "Set label to use instead of file name"
 msgstr "Подешава ознаку за коришћење уместо назива датотеке"
 
-#: ../meld/meldapp.py:238
+#: ../meld/meldapp.py:245
 msgid "Open a new tab in an already running instance"
 msgstr "Отвара нови језичак у једном већ отвореном примерку"
 
-#: ../meld/meldapp.py:241
+#: ../meld/meldapp.py:248
 msgid "Automatically compare all differing files on startup"
 msgstr "Самостално пореди све разликујуће датотеке приликом покретања"
 
-#: ../meld/meldapp.py:244
+#: ../meld/meldapp.py:251
 msgid "Ignored for compatibility"
 msgstr "Занемарено због сагласности"
 
-#: ../meld/meldapp.py:248
+#: ../meld/meldapp.py:255
 msgid "Set the target file for saving a merge result"
 msgstr "Подешава циљну датотеку за чување резултата стапања"
 
-#: ../meld/meldapp.py:251
+#: ../meld/meldapp.py:258
 msgid "Automatically merge files"
 msgstr "Самостално стапа датотеке"
 
-#: ../meld/meldapp.py:255
+#: ../meld/meldapp.py:262
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "Учитава сачувано поређење из Мелдове датотеке поређења"
 
-#: ../meld/meldapp.py:259
+#: ../meld/meldapp.py:266
 msgid "Create a diff tab for the supplied files or folders"
 msgstr "Прави језичак разлика придодате датотеке или фасцикле"
 
-#: ../meld/meldapp.py:279
+#: ../meld/meldapp.py:286
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "превише аргумената (тражено је 0-3, добих %d)"
 
-#: ../meld/meldapp.py:282
+#: ../meld/meldapp.py:289
 msgid "can't auto-merge less than 3 files"
 msgstr "не могу самостално да стопим мање од 3 датотеке"
 
-#: ../meld/meldapp.py:284
+#: ../meld/meldapp.py:291
 msgid "can't auto-merge directories"
 msgstr "не могу самостално да стопим директоријуме"
 
-#: ../meld/meldapp.py:298
+#: ../meld/meldapp.py:305
 msgid "Error reading saved comparison file"
 msgstr "Грешка читања сачуване датотеке поређења"
 
+#: ../meld/meldapp.py:332
+#, python-format
+msgid "invalid path or URI \"%s\""
+msgstr "неисправна путања „%s“"
+
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:137
+#: ../meld/meldbuffer.py:138
 msgid "<unnamed>"
 msgstr "<неименован>"
 
@@ -1947,21 +2093,21 @@ msgstr "Отворите упутство Мелда"
 msgid "About this application"
 msgstr "О овом програму"
 
-#: ../meld/meldwindow.py:546
+#: ../meld/meldwindow.py:548
 msgid "Switch to this tab"
 msgstr "Пребаците се на овај језичак"
 
-#: ../meld/meldwindow.py:657
+#: ../meld/meldwindow.py:659
 #, python-format
 msgid "Need three files to auto-merge, got: %r"
 msgstr "Потребне су три датотеке за само-спајање, добих: %r"
 
-#: ../meld/meldwindow.py:671
+#: ../meld/meldwindow.py:673
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Не могу да поредим мешавину датотека и фасцикли"
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:218
+#: ../meld/misc.py:203
 msgid "[None]"
 msgstr "[ништа]"
 
@@ -1987,14 +2133,14 @@ msgstr "Ниједна датотека неће бити уграђена"
 
 #. Translators: First %s is replaced by translated "%d unpushed
 #. commits", second %s is replaced by translated "%d branches"
-#: ../meld/vc/git.py:129
+#: ../meld/vc/git.py:127
 #, 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:130 ../meld/vc/git.py:137
+#: ../meld/vc/git.py:128 ../meld/vc/git.py:135
 #, python-format
 msgid "%d unpushed commit"
 msgid_plural "%d unpushed commits"
@@ -2003,7 +2149,7 @@ msgstr[1] "%d непогуране предаје"
 msgstr[2] "%d непогураних предаја"
 msgstr[3] "%d непогурана предаја"
 
-#: ../meld/vc/git.py:132
+#: ../meld/vc/git.py:130
 #, python-format
 msgid "%d branch"
 msgid_plural "%d branches"
@@ -2012,7 +2158,7 @@ msgstr[1] "%d гране"
 msgstr[2] "%d грана"
 msgstr[3] "%d грани"
 
-#: ../meld/vc/git.py:360
+#: ../meld/vc/git.py:357
 #, python-format
 msgid "Mode changed from %s to %s"
 msgstr "Режим је измењен из „%s“ у „%s“"
@@ -2065,111 +2211,111 @@ msgstr "Недостаје"
 msgid "Not present"
 msgstr "Није присутно"
 
-#: ../meld/vcview.py:233 ../meld/vcview.py:417
+#: ../meld/vcview.py:245 ../meld/vcview.py:426
 msgid "Location"
 msgstr "Путања"
 
-#: ../meld/vcview.py:234
+#: ../meld/vcview.py:246
 msgid "Status"
 msgstr "Стање"
 
-#: ../meld/vcview.py:235
+#: ../meld/vcview.py:247
 msgid "Revision"
 msgstr "Преглед"
 
-#: ../meld/vcview.py:236
+#: ../meld/vcview.py:248
 msgid "Options"
 msgstr "Опције"
 
 #. TRANSLATORS: this is an error message when a version control
 #. application isn't installed or can't be found
-#: ../meld/vcview.py:324
+#: ../meld/vcview.py:336
 #, python-format
 msgid "%s not installed"
 msgstr "„%s“ није инсталиран"
 
 #. TRANSLATORS: this is an error message when a version
 #. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:328
+#: ../meld/vcview.py:340
 msgid "Invalid repository"
 msgstr "Неисправна ризница"
 
-#: ../meld/vcview.py:337
+#: ../meld/vcview.py:349
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../meld/vcview.py:339 ../meld/vcview.py:347
+#: ../meld/vcview.py:351 ../meld/vcview.py:359
 msgid "None"
 msgstr "Ништа"
 
-#: ../meld/vcview.py:358
+#: ../meld/vcview.py:370
 msgid "No valid version control system found in this folder"
 msgstr "У овој фасцикли није пронађен исправан систем управљања издањем"
 
-#: ../meld/vcview.py:360
+#: ../meld/vcview.py:372
 msgid "Only one version control system found in this folder"
 msgstr "У овој фасцикли је пронађен само један систем управљања издањем"
 
-#: ../meld/vcview.py:362
+#: ../meld/vcview.py:374
 msgid "Choose which version control system to use"
-msgstr "Изаберите који систем управљања издањем ће бити коришћен"
+msgstr "Изаберите систем управљања издањем за коришћење"
 
 #. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:417
+#: ../meld/vcview.py:426
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:431 ../meld/vcview.py:439
+#: ../meld/vcview.py:448
 #, python-format
 msgid "Scanning %s"
 msgstr "Прегледам „%s“"
 
-#: ../meld/vcview.py:479
+#: ../meld/vcview.py:488
 msgid "(Empty)"
 msgstr "(Празно)"
 
-#: ../meld/vcview.py:522
+#: ../meld/vcview.py:531
 #, python-format
 msgid "%s — local"
 msgstr "%s — месна"
 
-#: ../meld/vcview.py:523
+#: ../meld/vcview.py:532
 #, python-format
 msgid "%s — remote"
 msgstr "%s — удаљена"
 
-#: ../meld/vcview.py:531
+#: ../meld/vcview.py:540
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (месна, спојена, удаљена)"
 
-#: ../meld/vcview.py:536
+#: ../meld/vcview.py:545
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (удаљена, спојена, месна)"
 
-#: ../meld/vcview.py:547
+#: ../meld/vcview.py:556
 #, python-format
 msgid "%s — repository"
 msgstr "%s — ризница"
 
-#: ../meld/vcview.py:553
+#: ../meld/vcview.py:562
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (радна, ризница)"
 
-#: ../meld/vcview.py:557
+#: ../meld/vcview.py:566
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (ризница, радна)"
 
-#: ../meld/vcview.py:741
+#: ../meld/vcview.py:756
 msgid "Remove folder and all its files?"
 msgstr "Да уклоним фасциклу и све њене датотеке?"
 
-#: ../meld/vcview.py:743
+#: ../meld/vcview.py:758
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2177,11 +2323,37 @@ msgstr ""
 "Ово ће уклонити све изабране датотеке и фасцикле, и све датотеке унутар свих "
 "изабраних фасцикли, из управљања издањем."
 
-#: ../meld/vcview.py:777
+#: ../meld/vcview.py:792
 #, python-format
 msgid "Error removing %s"
 msgstr "Грешка при уклањању „%s“"
 
+#~ msgid "Clear manual change sychronization points"
+#~ msgstr "Очистите тачке усклађивања измена"
+
+#~ msgid ""
+#~ "'%s' exists.\n"
+#~ "Overwrite?"
+#~ msgstr ""
+#~ "„%s“ постоји.\n"
+#~ "Да преснимим?"
+
+#~ msgid ""
+#~ "\"%s\" exists!\n"
+#~ "Overwrite?"
+#~ msgstr ""
+#~ "„%s“ постоји!\n"
+#~ "Да преснимим?"
+
+#~ msgid ""
+#~ "Error writing to %s\n"
+#~ "\n"
+#~ "%s."
+#~ msgstr ""
+#~ "Грешка писања у „%s“\n"
+#~ "\n"
+#~ "%s."
+
 #~ msgid "Cycle Through Documents"
 #~ msgstr "Кружи кроз документе"
 
diff --git a/po/sr@latin.po b/po/sr@latin.po
index d41f14ba..1e0faaa9 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -1,15 +1,17 @@
 # Serbian translation of meld
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2014.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2016.
 # This file is distributed under the same license as the meld package.
-# Maintainer: Danilo Šegan <dsegan@gmx.net>
-# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2011—2014.
+#
+# Translators: 
+# Danilo Šegan <dsegan@gmx.net>
+# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2011—2016.
 msgid ""
 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: 2014-12-27 10:52+0000\n"
-"PO-Revision-Date: 2014-12-27 15:53+0200\n"
+"POT-Creation-Date: 2016-03-26 01:54+0000\n"
+"PO-Revision-Date: 2016-03-26 21:41+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
 "Language: sr\n"
@@ -20,20 +22,20 @@ msgstr ""
 "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
-#: ../bin/meld:138
+#: ../bin/meld:144
 msgid "Cannot import: "
 msgstr "Ne mogu da uvezem: "
 
-#: ../bin/meld:141
+#: ../bin/meld:147
 #, c-format
 msgid "Meld requires %s or higher."
 msgstr "Meld zahteva %s ili noviji."
 
-#: ../bin/meld:145
+#: ../bin/meld:151
 msgid "Meld does not support Python 3."
 msgstr "Meld ne podržava Pitona 3."
 
-#: ../bin/meld:194
+#: ../bin/meld:201
 #, c-format
 msgid ""
 "Couldn't load Meld-specific CSS (%s)\n"
@@ -58,6 +60,11 @@ msgstr "Pregledač razlika Meld"
 msgid "Compare and merge your files"
 msgstr "Upoređujte i spajajte vaše datoteke"
 
+#. 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 "razlika;stopi;"
+
 #: ../data/meld.appdata.xml.in.h:1
 msgid ""
 "Meld is a visual diff and merge tool targeted at developers. Meld helps you "
@@ -116,7 +123,7 @@ msgid ""
 "These text encodings will be automatically used (in order) to try to decode "
 "loaded text files."
 msgstr ""
-"Ova kodiranja teksta će biti samostalno korišćenja (po redu) pri pokušaju "
+"Ova kodiranja teksta biće automatski korišćenja (po redu) pri pokušaju "
 "dekodiranja učitanih tekstualnih datoteka."
 
 #: ../data/org.gnome.meld.gschema.xml.h:9
@@ -143,7 +150,7 @@ msgstr "Prikazuje brojeve redova"
 #: ../data/org.gnome.meld.gschema.xml.h:14
 msgid "If true, line numbers will be shown in the gutter of file comparisons."
 msgstr ""
-"Ako je izabrano, brojevi redova će biti prikazani u žlebu poređenja datoteka."
+"Ako je izabrano, brojevi redova biće prikazani u žlebu poređenja datoteka."
 
 #: ../data/org.gnome.meld.gschema.xml.h:15
 msgid "Highlight syntax"
@@ -188,9 +195,9 @@ msgid ""
 "not at all ('none'), at any character ('char') or only at the end of words "
 "('word')."
 msgstr ""
-"Redovi pri poređenju datoteka će biti prelomljeni u skladu sa ovim "
-"podešavanjem, bez prelamanja — „none“, na bilo kom znaku — „char“, ili samo na "
-"kraju reči — „word“."
+"Redovi pri poređenju datoteka biće prelomljeni u skladu sa ovim podešavanjem, "
+"bez prelamanja — „none“, na bilo kom znaku — „char“, ili samo na kraju reči — "
+"„word“."
 
 #: ../data/org.gnome.meld.gschema.xml.h:23
 msgid "Highlight current line"
@@ -201,20 +208,21 @@ msgid ""
 "If true, the line containing the cursor will be highlighted in file "
 "comparisons."
 msgstr ""
-"Ako je izabrano, red koji sadrži kurzor će biti istaknut pri poređenju "
-"datoteka."
+"Ako je izabrano, red koji sadrži kurzor biće istaknut pri poređenju datoteka."
 
 #: ../data/org.gnome.meld.gschema.xml.h:25
 msgid "Use the system default monospace font"
 msgstr "Koristi sistemski slovni lik stalne širine"
 
 #: ../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 ""
-"Ako nije izabrano, zadati proizvoljni slovni lik će biti korišćen umesto "
-"sistemskog slovnog lika stalne širine."
+"Ako nije izabrano, proizvoljni slovni lik biće korišćen umesto sistemskog "
+"slovnog lika stalne širine."
 
 #: ../data/org.gnome.meld.gschema.xml.h:27
 msgid "Custom font"
@@ -236,19 +244,22 @@ msgstr "Zanemaruje prazne redove pri poređenju datoteka"
 msgid ""
 "If true, blank lines will be trimmed when highlighting changes between files."
 msgstr ""
-"Ako je izabrano, prazni redovi će biti skraćeni kada se isticanje promeni "
-"među datotekama."
+"Ako je izabrano, prazni redovi biće skraćeni kada se isticanje promeni među "
+"datotekama."
 
 #: ../data/org.gnome.meld.gschema.xml.h:31
 msgid "Use the system default editor"
 msgstr "Koristi osnovni uređivač sistema"
 
 #: ../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 ""
-"Ako nije izabrano, zadati proizvoljni uređivač će biti korišćen umesto "
+"Ako nije izabrano, proizvoljna naredba uređivača biće korišćena umesto "
 "sistemskog uređivača prilikom otvaranja datoteka spolja."
 
 #: ../data/org.gnome.meld.gschema.xml.h:33
@@ -271,9 +282,9 @@ msgstr "Stupci za prikazivanje"
 msgid ""
 "List of column names in folder comparison and whether they should be "
 "displayed."
-msgstr "Spisak naziva stubaca pri poređenju fascikli i da li će biti prikazani."
+msgstr "Spisak naziva stubaca pri poređenju fascikli i da li biće prikazani."
 
-#: ../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 "Zanemari simboličke veze"
 
@@ -313,34 +324,48 @@ msgstr ""
 "Prilikom poređenja na osnovu m_vremena, ovo je najmanja razlika u "
 "nanosekundama između dve datoteke pre nego što se odluči da imaju različita "
 "m_vremena. Ovo je korisno prilikom poređenja datoteka između sistema datoteka "
-"sa različitom rezolcijom vremenske oznake."
+"sa različitom rezolucijom vremenske oznake."
 
-#: ../data/org.gnome.meld.gschema.xml.h:43
-msgid "File status filters"
-msgstr "Propusnici stanja datoteka"
+#: ../data/org.gnome.meld.gschema.xml.h:43 ../data/ui/preferences.ui.h:30
+msgid "Apply text filters during folder comparisons"
+msgstr "Primeni filtere teksta za vreme poređenja fascikli"
 
 #: ../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 ""
+"Ako je izabrano, poređenje fascikli koje upoređuje sadržaje datoteka takođe "
+"primenjuje aktivne filtere teksta i opciju skraćivanja praznog reda, i "
+"zanemaruje razlike novih redova."
+
+#: ../data/org.gnome.meld.gschema.xml.h:45
+msgid "File status filters"
+msgstr "Filteri stanja datoteka"
+
+#: ../data/org.gnome.meld.gschema.xml.h:46
 msgid "List of statuses used to filter visible files in folder comparison."
 msgstr ""
 "Spisak stanja korišćenih za izdvajanje vidljivih datoteka pri poređenju fascikli."
 
-#: ../data/org.gnome.meld.gschema.xml.h:45
+#: ../data/org.gnome.meld.gschema.xml.h:47
 msgid "Show the version control console output"
 msgstr "Prikazuje izlaz konzole upravljanja izdanjem"
 
-#: ../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."
 msgstr ""
-"Ako je izabrano, odeljak izlaza konzole će biti prikazan u pregledima "
-"upravljanja izdanjem, prikazujući pokrenute naredbe za radnje upravljanja izdanjem."
+"Ako je izabrano, odeljak izlaza konzole biće prikazan u pregledima upravljanja "
+"izdanjem, prikazujući pokrenute naredbe za radnje upravljanja izdanjem."
 
-#: ../data/org.gnome.meld.gschema.xml.h:47
+#: ../data/org.gnome.meld.gschema.xml.h:49
 msgid "Version control pane position"
 msgstr "Položaj površi upravljanja izdanjima"
 
-#: ../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."
@@ -348,11 +373,11 @@ msgstr ""
 "Ovo je visina glavnog stabla upravljanja izdanjem kada je prikazana površ "
 "konzole."
 
-#: ../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 "Predstavlja poređenja izdanja kao mesno-levo/udaljeno-desno"
 
-#: ../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, "
@@ -362,14 +387,19 @@ msgstr ""
 "mesno, desno-je-udaljeno“ da odrede kojim redom će predstaviti datoteke u "
 "oknima. U suprotnom, koristi se šema „levo-je-njihovo, desno-je-moje“."
 
-#: ../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 ""
 "Redosled datoteka za poređenje stapanja upravljanja izdanjem za tri elementa"
 
-#: ../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 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 ""
@@ -378,11 +408,11 @@ msgstr ""
 "pregleda upravljanja izdanjem, stoga se koristi jedino za rešavanje spajanja/"
 "sukoba u Meldu."
 
-#: ../data/org.gnome.meld.gschema.xml.h:53
+#: ../data/org.gnome.meld.gschema.xml.h:55
 msgid "Show margin in commit message editor"
 msgstr "Prikazuje ivicu u uređivaču poruke predaje"
 
-#: ../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."
@@ -390,65 +420,68 @@ msgstr ""
 "Ako je izabrano, biće prikazana vođica da pokaže od kog stupca se ivica "
 "nalazi u uređivaču poruke predaje upravljanja izdanjem."
 
-#: ../data/org.gnome.meld.gschema.xml.h:55
+#: ../data/org.gnome.meld.gschema.xml.h:57
 msgid "Margin column in commit message editor"
 msgstr "Stubac ivice u uređivaču poruke predaje"
 
-#: ../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."
 msgstr ""
 "Stubac na kome prikazati ivicu u uređivaču poruke predaje upravljanja izdanjem."
 
-#: ../data/org.gnome.meld.gschema.xml.h:57
+#: ../data/org.gnome.meld.gschema.xml.h:59
 msgid "Automatically hard-wrap commit messages"
 msgstr "Samostalno silno-prelama poruke predaje"
 
-#: ../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."
 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 ""
 "Ako je izabrano, uređivač poruke predaje upravljanja izdanjem će silno-"
-"prelomiti (tj. umetnuti prelome redova) na zadatoj ivici predaje pre predaje."
+"prelomiti (tj. umetnuti prelome redova) na ivici predaje pre predaje."
 
-#: ../data/org.gnome.meld.gschema.xml.h:59
+#: ../data/org.gnome.meld.gschema.xml.h:61
 msgid "Version control status filters"
-msgstr "Propusnici stanja upravljanja izdanjem"
+msgstr "Filteri stanja upravljanja izdanjem"
 
-#: ../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 ""
 "Spisak stanja korišćenih za izdvajanje vidljivih datoteka pri poređenju "
 "upravljanja izdanjem."
 
-#: ../data/org.gnome.meld.gschema.xml.h:61
+#: ../data/org.gnome.meld.gschema.xml.h:63
 msgid "Filename-based filters"
-msgstr "Propusnici zasnovani na nazivu datoteke"
+msgstr "Filteri zasnovani na nazivu datoteke"
 
-#: ../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."
 msgstr ""
-"Spisak unapred određenih propusnika zasnovanih na nazivu datoteke koji će, "
-"ako je radno, ukloniti poklopljene datoteke iz poređenja fascikli."
+"Spisak unapred određenih filtera zasnovanih na nazivu datoteke koji će, ako "
+"je radno, ukloniti poklopljene datoteke iz poređenja fascikli."
 
-#: ../data/org.gnome.meld.gschema.xml.h:63
+#: ../data/org.gnome.meld.gschema.xml.h:65
 msgid "Text-based filters"
-msgstr "Propusnici zasnovani na tekstu"
+msgstr "Filteri zasnovani na tekstu"
 
-#: ../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, "
 "but won't contribute to the comparison itself."
 msgstr ""
-"Spisak unapred određenih propusnika regularnog izraza zasnovanih na tekstu "
-"koji će, ako je radno, ukloniti tekst iz upotrebe pri poređenju datoteka. "
-"Tekst će još uvek biti prikazan, ali neće doprineti poređenju."
+"Spisak unapred određenih filtera regularnog izraza zasnovanih na tekstu koji "
+"će, ako je radno, ukloniti tekst iz upotrebe pri poređenju datoteka. Tekst će "
+"još uvek biti prikazan, ali neće doprineti poređenju."
 
 #: ../data/ui/application.ui.h:1
 msgid "About Meld"
@@ -518,7 +551,7 @@ msgstr "Umnožite desno"
 msgid "Delete selected"
 msgstr "Obriši izabrano"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1429
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:881 ../meld/filediff.py:1489
 msgid "Hide"
 msgstr "Sakrij"
 
@@ -564,11 +597,11 @@ msgstr "Prikaži izmenjene"
 
 #: ../data/ui/dirdiff.ui.h:18
 msgid "Filters"
-msgstr "Propusnici"
+msgstr "Filteri"
 
 #: ../data/ui/dirdiff.ui.h:19
 msgid "Set active filters"
-msgstr "Podesite aktivne propusnike"
+msgstr "Podesite aktivne filtere"
 
 #: ../data/ui/EditableList.ui.h:1
 msgid "Editable List"
@@ -587,7 +620,7 @@ msgid "_Add"
 msgstr "_Dodaj"
 
 #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:747
+#: ../meld/vcview.py:762
 msgid "_Remove"
 msgstr "_Ukloni"
 
@@ -608,8 +641,7 @@ msgid "Move _Down"
 msgstr "Premesti _dole"
 
 #. 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 ../meld/dirdiff.py:374 ../meld/vcview.py:215
 msgid "Name"
 msgstr "Naziv"
 
@@ -619,11 +651,11 @@ msgstr "Obrazac"
 
 #: ../data/ui/EditableList.ui.h:12
 msgid "Add new filter"
-msgstr "Dodajte novi propusnik"
+msgstr "Dodajte novi filter"
 
 #: ../data/ui/EditableList.ui.h:13
 msgid "Remove selected filter"
-msgstr "Uklonite izabrani propusnik"
+msgstr "Uklonite izabrani filter"
 
 #: ../data/ui/filediff.ui.h:1
 msgid "Format as Patch..."
@@ -650,16 +682,18 @@ msgid "Add Synchronization Point"
 msgstr "Dodaj tačku usklađivanja"
 
 #: ../data/ui/filediff.ui.h:7
-msgid "Add a manual point for synchronization of changes between files"
-msgstr "Dodajte tačku za usklađivanje izmena između datoteka"
+#| msgid "Add a manual point for synchronization of changes between files"
+msgid "Add a synchronization point for changes between files"
+msgstr "Dodajte tačku usklađivanja za izmene između datoteka"
 
 #: ../data/ui/filediff.ui.h:8
 msgid "Clear Synchronization Points"
 msgstr "Očisti tačke usklađivanja"
 
 #: ../data/ui/filediff.ui.h:9
-msgid "Clear manual change sychronization points"
-msgstr "Očistite tačke usklađivanja izmena"
+#| msgid "Add a manual point for synchronization of changes between files"
+msgid "Clear sychronization points for changes between files"
+msgstr "Očistite tačku usklađivanja za izmene između datoteka"
 
 #: ../data/ui/filediff.ui.h:10
 msgid "Previous Conflict"
@@ -774,17 +808,14 @@ msgid "Merge all non-conflicting changes from left and right panes"
 msgstr "Objedinite sve nesukobljavajuće izmene s leve i desne površi"
 
 #: ../data/ui/filediff.ui.h:38
-#| msgid "Previous Change"
 msgid "Previous Pane"
 msgstr "Prethodno okno"
 
 #: ../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 "Premestite fokus tastature na prethodni dokument u ovom poređenju"
 
 #: ../data/ui/filediff.ui.h:40
-#| msgid "Next Change"
 msgid "Next Pane"
 msgstr "Sledeće okno"
 
@@ -812,7 +843,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
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:972 ../meld/filediff.py:1658
+#: ../meld/filediff.py:1742 ../meld/filediff.py:1767
 msgid "_Cancel"
 msgstr "_Otkaži"
 
@@ -847,9 +879,9 @@ msgstr "Da povratim nesačuvane izmene u dokumentima?"
 
 #: ../data/ui/filediff.ui.h:54
 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"
+msgstr "Izmene načinjene nad sledećim dokumentima biće trajno izgubljene:\n"
 
-#: ../data/ui/findbar.ui.h:1
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:973 ../meld/filediff.py:1659
 msgid "_Replace"
 msgstr "_Zameni"
 
@@ -897,7 +929,7 @@ msgstr "Oblikuj kao ispravku"
 msgid "Copy to Clipboard"
 msgstr "Umnoži u ostavu"
 
-#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:119
+#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:125
 msgid "Save Patch"
 msgstr "Sačuvaj ispravku"
 
@@ -1033,51 +1065,51 @@ msgstr "Up_oredi datoteke samo na osnovu veličine i vremenske oznake"
 msgid "_Timestamp resolution:"
 msgstr "_Rezolucija vremenske oznake:"
 
-#: ../data/ui/preferences.ui.h:30
+#: ../data/ui/preferences.ui.h:31
 msgid "Symbolic Links"
 msgstr "Simboličke veze"
 
-#: ../data/ui/preferences.ui.h:32
+#: ../data/ui/preferences.ui.h:33
 msgid "Visible Columns"
 msgstr "Prikazane kolone"
 
-#: ../data/ui/preferences.ui.h:33
+#: ../data/ui/preferences.ui.h:34
 msgid "Folder Comparisons"
 msgstr "Poređenje fascikli"
 
-#: ../data/ui/preferences.ui.h:34
+#: ../data/ui/preferences.ui.h:35
 msgid "Version Comparisons"
 msgstr "Poređenje izdanja"
 
-#: ../data/ui/preferences.ui.h:35
+#: ../data/ui/preferences.ui.h:36
 msgid "_Order when comparing file revisions:"
 msgstr "_Redosled pri poređenju pregleda datoteke:"
 
-#: ../data/ui/preferences.ui.h:36
+#: ../data/ui/preferences.ui.h:37
 msgid "Order when _merging files:"
 msgstr "Redosled pri _spajanju datoteka:"
 
-#: ../data/ui/preferences.ui.h:37
+#: ../data/ui/preferences.ui.h:38
 msgid "Commit Messages"
 msgstr "Poruke predaje"
 
-#: ../data/ui/preferences.ui.h:38
+#: ../data/ui/preferences.ui.h:39
 msgid "Show _right margin at:"
 msgstr "Prikaži _desnu marginu na:"
 
-#: ../data/ui/preferences.ui.h:39
+#: ../data/ui/preferences.ui.h:40
 msgid "Automatically _break lines at right margin on commit"
 msgstr "Sam _prelamaj redove na desnoj margini pri predaji"
 
-#: ../data/ui/preferences.ui.h:40
+#: ../data/ui/preferences.ui.h:41
 msgid "Version Control"
 msgstr "Upravljanje izdanjem"
 
-#: ../data/ui/preferences.ui.h:41
+#: ../data/ui/preferences.ui.h:42
 msgid "Filename filters"
-msgstr "Propusnici naziva datoteka"
+msgstr "Filteri naziva datoteka"
 
-#: ../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 "
@@ -1087,23 +1119,23 @@ msgstr ""
 "prema nazivu. Svaki obrazac je spisak džokera u stilu konzole razdvojenih "
 "razmakom."
 
-#: ../data/ui/preferences.ui.h:43 ../meld/meldwindow.py:103
+#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:103
 msgid "File Filters"
-msgstr "Propusnici datoteka"
+msgstr "Filteri datoteka"
 
-#: ../data/ui/preferences.ui.h:44
+#: ../data/ui/preferences.ui.h:45
 msgid "Change trimming"
 msgstr "Skraćivanje izmene"
 
-#: ../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 "Skraćuje razlike praznih redova od početka i kraja izmena"
 
-#: ../data/ui/preferences.ui.h:46
+#: ../data/ui/preferences.ui.h:47
 msgid "Text filters"
-msgstr "Propusnici teksta"
+msgstr "Filteri teksta"
 
-#: ../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 "
@@ -1116,11 +1148,11 @@ msgstr ""
 "praznim niskama pre izvršavanja poređenja. Ako izraz sadrži grupe, samo grupe "
 "bivaju zamenjene. Za više detalja pogledajte uputstvo za korisnike."
 
-#: ../data/ui/preferences.ui.h:48
+#: ../data/ui/preferences.ui.h:49
 msgid "Text Filters"
-msgstr "Propusnici teksta"
+msgstr "Filteri teksta"
 
-#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:623
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:625
 msgid "New comparison"
 msgstr "Novo poređenje"
 
@@ -1313,55 +1345,100 @@ msgstr ""
 msgid "_Push commits"
 msgstr "_Poguraj predaje"
 
+#: ../meld/const.py:10
+msgid "UNIX (LF)"
+msgstr "UNIKS (LF)"
+
+#: ../meld/const.py:11
+msgid "DOS/Windows (CR-LF)"
+msgstr "DOS/Vindouz (CR-LF)"
+
+#: ../meld/const.py:12
+msgid "Mac OS (CR)"
+msgstr "Mek 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 "Veličina"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:389 ../meld/preferences.py:83
+#: ../meld/dirdiff.py:400 ../meld/preferences.py:83
 msgid "Modification time"
 msgstr "Vreme izmene"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:397 ../meld/preferences.py:84
+#: ../meld/dirdiff.py:408 ../meld/preferences.py:84
 msgid "Permissions"
 msgstr "Ovlašćenja"
 
-#: ../meld/dirdiff.py:543
+#: ../meld/dirdiff.py:561
 #, python-format
 msgid "Hide %s"
 msgstr "Sakrij „%s“"
 
-#: ../meld/dirdiff.py:672 ../meld/dirdiff.py:694
+#: ../meld/dirdiff.py:693 ../meld/dirdiff.py:715
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] pregledam „%s“"
 
-#: ../meld/dirdiff.py:823
+#: ../meld/dirdiff.py:848
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Gotovo"
 
-#: ../meld/dirdiff.py:830
+#: ../meld/dirdiff.py:856
+msgid "Folders have no differences"
+msgstr "Fascikle se ne razlikuju"
+
+#: ../meld/dirdiff.py:858
+msgid "Contents of scanned files in folders are identical."
+msgstr "Sadržaji pregledanih datoteka u fasciklama su istovetni."
+
+#: ../meld/dirdiff.py:860
+msgid ""
+"Scanned files in folders appear identical, but contents have not been "
+"scanned."
+msgstr ""
+"Pregledane datoteke u fasciklama izgleda da su iste, ali njihov sadržaj nije "
+"pregledan."
+
+#: ../meld/dirdiff.py:863
+msgid "File filters are in use, so not all files have been scanned."
+msgstr "U upotrebi su filteri datoteka, tako da nisu sve datoteke pregledane."
+
+#: ../meld/dirdiff.py:865
+#| 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 "U upotrebi su filteri teksta i mogu zamaskirati razlike sadržaja."
+
+#: ../meld/dirdiff.py:883 ../meld/dirdiff.py:936 ../meld/filediff.py:1129
+#: ../meld/filediff.py:1161 ../meld/filediff.py:1296 ../meld/filediff.py:1491
+#: ../meld/filediff.py:1521 ../meld/filediff.py:1523
+msgid "Hi_de"
+msgstr "_Sakrij"
+
+#: ../meld/dirdiff.py:893
 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:831
+#: ../meld/dirdiff.py:894
 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:833
+#: ../meld/dirdiff.py:896
 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:835
+#: ../meld/dirdiff.py:898
 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:837
+#: ../meld/dirdiff.py:900
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1369,30 +1446,30 @@ msgstr ""
 "Pokrenuli ste poređenje nezavisno od veličine slova na sistemu datoteka gde "
 "je ona bitna. Neke datoteke nisu vidljive:"
 
-#: ../meld/dirdiff.py:848
+#: ../meld/dirdiff.py:911
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "„%s“ sakriveno od strane „%s“"
 
-#: ../meld/dirdiff.py:873 ../meld/filediff.py:1103 ../meld/filediff.py:1255
-#: ../meld/filediff.py:1431 ../meld/filediff.py:1461 ../meld/filediff.py:1463
-msgid "Hi_de"
-msgstr "_Sakrij"
+#: ../meld/dirdiff.py:976
+#, python-format
+msgid "Replace folder “%s”?"
+msgstr "Da zamenim fasciklu „%s“?"
 
-#: ../meld/dirdiff.py:904
+#: ../meld/dirdiff.py:978
 #, 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“ postoji.\n"
-"Da presnimim?"
+"Već postoji jedna fascikla sa istim nazivom u „%s“.\n"
+"Ako zamenite postojeću fasciklu, sve datoteke u njoj biće izgubljene."
 
-#: ../meld/dirdiff.py:912
+#: ../meld/dirdiff.py:991
 msgid "Error copying file"
 msgstr "Greška umnožavanja datoteke"
 
-#: ../meld/dirdiff.py:913
+#: ../meld/dirdiff.py:992
 #, python-format
 msgid ""
 "Couldn't copy %s\n"
@@ -1405,121 +1482,156 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/dirdiff.py:936
+#: ../meld/dirdiff.py:1015
 #, python-format
 msgid "Error deleting %s"
 msgstr "Greška brisanja „%s“"
 
+#: ../meld/dirdiff.py:1520
+#| msgid "folder"
+msgid "No folder"
+msgstr "Nema fascikle"
+
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:399
+#: ../meld/filediff.py:410
 msgid "INS"
 msgstr "UMET"
 
-#: ../meld/filediff.py:399
+#: ../meld/filediff.py:410
 msgid "OVR"
 msgstr "PREP"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:401
+#: ../meld/filediff.py:412
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Red %i, mesto %i"
 
-#: ../meld/filediff.py:813
+#: ../meld/filediff.py:825
+msgid "Comparison results will be inaccurate"
+msgstr "Rezultat poređenja neće biti tačan"
+
+#: ../meld/filediff.py:827
 #, python-format
+#| 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."
+"Filter “%s” changed the number of lines in the file, which is unsupported. "
+"The comparison will not be accurate."
 msgstr ""
-"Propusnik „%s“ je izmenio broj redova u datoteci. Poređenje neće biti tačno. "
-"Za više detalja pogledajte priručnik za korisnike."
+"Filter „%s“ je izmenio broj redova u datoteci, što nije podržano. Poređenje "
+"neće biti tačno."
 
-#: ../meld/filediff.py:882
+#: ../meld/filediff.py:898
 msgid "Mark conflict as resolved?"
 msgstr "Da označim sukob rešenim?"
 
-#: ../meld/filediff.py:884
+#: ../meld/filediff.py:900
 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:886
+#: ../meld/filediff.py:902
 msgid "Cancel"
 msgstr "Otkaži"
 
-#: ../meld/filediff.py:887
+#: ../meld/filediff.py:903
 msgid "Mark _Resolved"
 msgstr "Označi _rešenim"
 
-#: ../meld/filediff.py:1090
+#: ../meld/filediff.py:1110
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "Postavljam broj površi [%s]"
 
-#: ../meld/filediff.py:1097
+#: ../meld/filediff.py:1123
 #, python-format
 msgid "[%s] Opening files"
 msgstr "Otvaram datoteke [%s]"
 
-#: ../meld/filediff.py:1120 ../meld/filediff.py:1130 ../meld/filediff.py:1143
-#: ../meld/filediff.py:1149
+#: ../meld/filediff.py:1146 ../meld/filediff.py:1184 ../meld/filediff.py:1190
 msgid "Could not read file"
 msgstr "Ne mogu da pročitam datoteku"
 
-#: ../meld/filediff.py:1121
+#: ../meld/filediff.py:1147
 #, python-format
 msgid "[%s] Reading files"
 msgstr "Čitam datoteke [%s]"
 
-#: ../meld/filediff.py:1131
+#: ../meld/filediff.py:1156
 #, python-format
-msgid "%s appears to be a binary file."
-msgstr "„%s“ izgleda da je izvršna datoteka."
+#| msgid "%s appears to be a binary file."
+msgid "File %s appears to be a binary file."
+msgstr "Datoteka „%s“ izgleda da je izvršna datoteka."
+
+#: ../meld/filediff.py:1157
+#| msgid "Open selected file or directory in the default external application"
+msgid "Do you want to open the file using the default application?"
+msgstr "Da li želite da otvorite datoteku koristeći podrazumevani program?"
+
+#: ../meld/filediff.py:1160
+msgid "Open"
+msgstr "Otvori"
 
-#: ../meld/filediff.py:1144
+#: ../meld/filediff.py:1185
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "„%s“ nije u kodiranjima: „%s“"
 
-#: ../meld/filediff.py:1182
+#: ../meld/filediff.py:1223
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "Sračunavam razlike [%s]"
 
-#: ../meld/filediff.py:1250
+#: ../meld/filediff.py:1291
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Datoteka „%s“ je izmenjena na disku"
 
-#: ../meld/filediff.py:1251
+#: ../meld/filediff.py:1292
 msgid "Do you want to reload the file?"
 msgstr "Da li želite ponovo da učitate datoteku?"
 
-#: ../meld/filediff.py:1254
+#: ../meld/filediff.py:1295
 msgid "_Reload"
 msgstr "_Učitaj ponovo"
 
-#: ../meld/filediff.py:1420
+#: ../meld/filediff.py:1454
+msgid "Files are identical"
+msgstr "Datoteke su istovetne"
+
+#: ../meld/filediff.py:1467
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
 msgstr ""
-"Korišćeni su propusnici teksta, a mogu postojati i zamaskirane razlike "
-"između datoteka. Da li želite da poredite neizdvojene datoteke?"
+"Korišćeni su filteri teksta, a mogu postojati i zamaskirane razlike između "
+"datoteka. Da li želite da poredite neizdvojene datoteke?"
 
-#: ../meld/filediff.py:1426
-msgid "Files are identical"
-msgstr "Datoteke su istovetne"
+#: ../meld/filediff.py:1472
+#| msgid "Files with invalid encodings found"
+msgid "Files differ in line endings only"
+msgstr "Datoteke se razlikuju samo po završecima redova"
+
+#: ../meld/filediff.py:1474
+#, python-format
+msgid ""
+"Files are identical except for differing line endings:\n"
+"%s"
+msgstr ""
+"Datoteke su istovetne osim po drugačijim završecima redova:\n"
+"%s"
 
-#: ../meld/filediff.py:1434
+#: ../meld/filediff.py:1494
 msgid "Show without filters"
-msgstr "Prikazuje bez propusnika"
+msgstr "Prikazuje bez filtera"
 
-#: ../meld/filediff.py:1456
+#: ../meld/filediff.py:1516
 msgid "Change highlighting incomplete"
 msgstr "Isticanje izmena nije dovršeno"
 
-#: ../meld/filediff.py:1457
+#: ../meld/filediff.py:1517
 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."
@@ -1527,88 +1639,117 @@ 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:1465
+#: ../meld/filediff.py:1525
 msgid "Keep highlighting"
 msgstr "Zadržite isticanje"
 
-#: ../meld/filediff.py:1467
+#: ../meld/filediff.py:1527
 msgid "_Keep highlighting"
 msgstr "_Zadrži isticanje"
 
-#: ../meld/filediff.py:1596
+#: ../meld/filediff.py:1662
+#, python-format
+msgid "Replace file “%s”?"
+msgstr "Da zamenim datoteku „%s“?"
+
+#: ../meld/filediff.py:1664
 #, python-format
 msgid ""
-"\"%s\" exists!\n"
-"Overwrite?"
+"A file with this name already exists in “%s”.\n"
+"If you replace the existing file, its contents will be lost."
 msgstr ""
-"„%s“ postoji!\n"
-"Da presnimim?"
+"Već postoji datoteka sa ovim nazivom u „%s“.\n"
+"Ako zamenite postojeću datoteku, njen sadržaj biće izgubljen."
 
-#: ../meld/filediff.py:1609
+#: ../meld/filediff.py:1682
+#, python-format
+#| msgid "Could not read file"
+msgid "Could not save file %s."
+msgstr "Ne mogu da sačuvam datoteku „%s“."
+
+#: ../meld/filediff.py:1683
 #, python-format
 msgid ""
-"Error writing to %s\n"
-"\n"
-"%s."
+"Couldn't save file due to:\n"
+"%s"
 msgstr ""
-"Greška pisanja u „%s“\n"
-"\n"
-"%s."
+"Ne mogu da sačuvam datoteku zbog:\n"
+"%s"
 
-#: ../meld/filediff.py:1620
+#: ../meld/filediff.py:1695
 msgid "Save Left Pane As"
 msgstr "Sačuvaj levu površ kao"
 
-#: ../meld/filediff.py:1622
+#: ../meld/filediff.py:1697
 msgid "Save Middle Pane As"
 msgstr "Sačuvaj srednju površ kao"
 
-#: ../meld/filediff.py:1624
+#: ../meld/filediff.py:1699
 msgid "Save Right Pane As"
 msgstr "Sačuvaj desnu površ kao"
 
-#: ../meld/filediff.py:1637
+#: ../meld/filediff.py:1713
 #, 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:1639
+#: ../meld/filediff.py:1715
 msgid "If you save it, any external changes will be lost."
-msgstr "Ako je sačuvate, sve spoljne izmene će biti izgubljene."
+msgstr "Ako je sačuvate, sve spoljne izmene biće izgubljene."
 
-#: ../meld/filediff.py:1642
+#: ../meld/filediff.py:1718
 msgid "Save Anyway"
 msgstr "Ipak sačuvaj"
 
-#: ../meld/filediff.py:1643
+#: ../meld/filediff.py:1719
 msgid "Don't Save"
 msgstr "Nemoj čuvati"
 
-#: ../meld/filediff.py:1667
+#: ../meld/filediff.py:1745
+#| msgid "Files with invalid encodings found"
+msgid "Inconsistent line endings found"
+msgstr "Pronađoh nedosledne završetke redova"
+
+#: ../meld/filediff.py:1747
 #, python-format
+#| msgid ""
+#| "This file '%s' contains a mixture of line endings.\n"
+#| "\n"
+#| "Which format would you like to use?"
 msgid ""
-"This file '%s' contains a mixture of line endings.\n"
-"\n"
-"Which format would you like to use?"
+"'%s' contains a mixture of line endings. Select the line ending format to "
+"use."
 msgstr ""
-"Datoteka „%s“ sadrži mešavinu završetaka reda.\n"
-"\n"
-"Koji oblik želite da koristite?"
+"„%s“ sadrži mešavinu završetaka redova. Izaberite zapis završetka reda koji "
+"želite da koristite."
 
-#: ../meld/filediff.py:1683
+#: ../meld/filediff.py:1768
+msgid "_Save as UTF-8"
+msgstr "_Sačuvaj kao UTF-8"
+
+#: ../meld/filediff.py:1771
+#, python-format
+msgid "Couldn't encode text as “%s”"
+msgstr "Ne mogu da kodiram tekst kao „%s“"
+
+#: ../meld/filediff.py:1773
 #, python-format
+#| msgid ""
+#| "'%s' contains characters not encodable with '%s'\n"
+#| "Would you like to save as UTF-8?"
 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“ sadrži znakove koji se ne mogu kodirati uz „%s“\n"
+"Datoteka „%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:2023
+#: ../meld/filediff.py:2125
 msgid "Live comparison updating disabled"
 msgstr "Isključeno je živo ažuriranje poređenja"
 
-#: ../meld/filediff.py:2024
+#: ../meld/filediff.py:2126
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1623,103 +1764,108 @@ msgstr ""
 msgid "[%s] Merging files"
 msgstr "Objedinjujem datoteke [%s]"
 
-#: ../meld/gutterrendererchunk.py:90
+#: ../meld/gutterrendererchunk.py:93
 msgid "Copy _up"
 msgstr "Umnoži _gore"
 
-#: ../meld/gutterrendererchunk.py:91
+#: ../meld/gutterrendererchunk.py:94
 msgid "Copy _down"
 msgstr "Umnoži _dole"
 
-#: ../meld/meldapp.py:170
+#: ../meld/meldapp.py:177
 msgid "wrong number of arguments supplied to --diff"
 msgstr "pogrešan broj argumenata pridodat uz „--diff“"
 
-#: ../meld/meldapp.py:175
+#: ../meld/meldapp.py:182
 msgid "Start with an empty window"
 msgstr "Otvara jedan prazan prozor"
 
 # bug: string composition is bad i18n, and will make l10n hard
-#: ../meld/meldapp.py:176 ../meld/meldapp.py:178
+#: ../meld/meldapp.py:183 ../meld/meldapp.py:185
 msgid "file"
 msgstr "datoteka"
 
-#: ../meld/meldapp.py:176 ../meld/meldapp.py:180
+#: ../meld/meldapp.py:183 ../meld/meldapp.py:187
 msgid "folder"
 msgstr "fascikla"
 
-#: ../meld/meldapp.py:177
+#: ../meld/meldapp.py:184
 msgid "Start a version control comparison"
 msgstr "Pokreće poređenje kontrole verzije"
 
-#: ../meld/meldapp.py:179
+#: ../meld/meldapp.py:186
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Pokreće poređenje 2 ili 3 datoteke"
 
-#: ../meld/meldapp.py:181
+#: ../meld/meldapp.py:188
 msgid "Start a 2- or 3-way folder comparison"
 msgstr "Pokreće poređenje 2 ili 3 fascikle"
 
-#: ../meld/meldapp.py:224
+#: ../meld/meldapp.py:231
 #, python-format
 msgid "Error: %s\n"
 msgstr "Greška: %s\n"
 
-#: ../meld/meldapp.py:231
+#: ../meld/meldapp.py:238
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld je alat za poređenje datoteka i fascikli."
 
-#: ../meld/meldapp.py:235
+#: ../meld/meldapp.py:242
 msgid "Set label to use instead of file name"
 msgstr "Podešava oznaku za korišćenje umesto naziva datoteke"
 
-#: ../meld/meldapp.py:238
+#: ../meld/meldapp.py:245
 msgid "Open a new tab in an already running instance"
 msgstr "Otvara novi jezičak u jednom već otvorenom primerku"
 
-#: ../meld/meldapp.py:241
+#: ../meld/meldapp.py:248
 msgid "Automatically compare all differing files on startup"
 msgstr "Samostalno poredi sve razlikujuće datoteke prilikom pokretanja"
 
-#: ../meld/meldapp.py:244
+#: ../meld/meldapp.py:251
 msgid "Ignored for compatibility"
 msgstr "Zanemareno zbog saglasnosti"
 
-#: ../meld/meldapp.py:248
+#: ../meld/meldapp.py:255
 msgid "Set the target file for saving a merge result"
 msgstr "Podešava ciljnu datoteku za čuvanje rezultata stapanja"
 
-#: ../meld/meldapp.py:251
+#: ../meld/meldapp.py:258
 msgid "Automatically merge files"
 msgstr "Samostalno stapa datoteke"
 
-#: ../meld/meldapp.py:255
+#: ../meld/meldapp.py:262
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "Učitava sačuvano poređenje iz Meldove datoteke poređenja"
 
-#: ../meld/meldapp.py:259
+#: ../meld/meldapp.py:266
 msgid "Create a diff tab for the supplied files or folders"
 msgstr "Pravi jezičak razlika pridodate datoteke ili fascikle"
 
-#: ../meld/meldapp.py:279
+#: ../meld/meldapp.py:286
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "previše argumenata (traženo je 0-3, dobih %d)"
 
-#: ../meld/meldapp.py:282
+#: ../meld/meldapp.py:289
 msgid "can't auto-merge less than 3 files"
 msgstr "ne mogu samostalno da stopim manje od 3 datoteke"
 
-#: ../meld/meldapp.py:284
+#: ../meld/meldapp.py:291
 msgid "can't auto-merge directories"
 msgstr "ne mogu samostalno da stopim direktorijume"
 
-#: ../meld/meldapp.py:298
+#: ../meld/meldapp.py:305
 msgid "Error reading saved comparison file"
 msgstr "Greška čitanja sačuvane datoteke poređenja"
 
+#: ../meld/meldapp.py:332
+#, python-format
+msgid "invalid path or URI \"%s\""
+msgstr "neispravna putanja „%s“"
+
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:137
+#: ../meld/meldbuffer.py:138
 msgid "<unnamed>"
 msgstr "<neimenovan>"
 
@@ -1947,21 +2093,21 @@ msgstr "Otvorite uputstvo Melda"
 msgid "About this application"
 msgstr "O ovom programu"
 
-#: ../meld/meldwindow.py:546
+#: ../meld/meldwindow.py:548
 msgid "Switch to this tab"
 msgstr "Prebacite se na ovaj jezičak"
 
-#: ../meld/meldwindow.py:657
+#: ../meld/meldwindow.py:659
 #, python-format
 msgid "Need three files to auto-merge, got: %r"
 msgstr "Potrebne su tri datoteke za samo-spajanje, dobih: %r"
 
-#: ../meld/meldwindow.py:671
+#: ../meld/meldwindow.py:673
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Ne mogu da poredim mešavinu datoteka i fascikli"
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:218
+#: ../meld/misc.py:203
 msgid "[None]"
 msgstr "[ništa]"
 
@@ -1987,14 +2133,14 @@ msgstr "Nijedna datoteka neće biti ugrađena"
 
 #. Translators: First %s is replaced by translated "%d unpushed
 #. commits", second %s is replaced by translated "%d branches"
-#: ../meld/vc/git.py:129
+#: ../meld/vc/git.py:127
 #, python-format
 msgid "%s in %s"
 msgstr "%s u %s"
 
 #. Translators: These messages cover the case where there is
 #. only one branch, and are not part of another message.
-#: ../meld/vc/git.py:130 ../meld/vc/git.py:137
+#: ../meld/vc/git.py:128 ../meld/vc/git.py:135
 #, python-format
 msgid "%d unpushed commit"
 msgid_plural "%d unpushed commits"
@@ -2003,7 +2149,7 @@ msgstr[1] "%d nepogurane predaje"
 msgstr[2] "%d nepoguranih predaja"
 msgstr[3] "%d nepogurana predaja"
 
-#: ../meld/vc/git.py:132
+#: ../meld/vc/git.py:130
 #, python-format
 msgid "%d branch"
 msgid_plural "%d branches"
@@ -2012,7 +2158,7 @@ msgstr[1] "%d grane"
 msgstr[2] "%d grana"
 msgstr[3] "%d grani"
 
-#: ../meld/vc/git.py:360
+#: ../meld/vc/git.py:357
 #, python-format
 msgid "Mode changed from %s to %s"
 msgstr "Režim je izmenjen iz „%s“ u „%s“"
@@ -2065,111 +2211,111 @@ msgstr "Nedostaje"
 msgid "Not present"
 msgstr "Nije prisutno"
 
-#: ../meld/vcview.py:233 ../meld/vcview.py:417
+#: ../meld/vcview.py:245 ../meld/vcview.py:426
 msgid "Location"
 msgstr "Putanja"
 
-#: ../meld/vcview.py:234
+#: ../meld/vcview.py:246
 msgid "Status"
 msgstr "Stanje"
 
-#: ../meld/vcview.py:235
+#: ../meld/vcview.py:247
 msgid "Revision"
 msgstr "Pregled"
 
-#: ../meld/vcview.py:236
+#: ../meld/vcview.py:248
 msgid "Options"
 msgstr "Opcije"
 
 #. TRANSLATORS: this is an error message when a version control
 #. application isn't installed or can't be found
-#: ../meld/vcview.py:324
+#: ../meld/vcview.py:336
 #, python-format
 msgid "%s not installed"
 msgstr "„%s“ nije instaliran"
 
 #. TRANSLATORS: this is an error message when a version
 #. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:328
+#: ../meld/vcview.py:340
 msgid "Invalid repository"
 msgstr "Neispravna riznica"
 
-#: ../meld/vcview.py:337
+#: ../meld/vcview.py:349
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../meld/vcview.py:339 ../meld/vcview.py:347
+#: ../meld/vcview.py:351 ../meld/vcview.py:359
 msgid "None"
 msgstr "Ništa"
 
-#: ../meld/vcview.py:358
+#: ../meld/vcview.py:370
 msgid "No valid version control system found in this folder"
 msgstr "U ovoj fascikli nije pronađen ispravan sistem upravljanja izdanjem"
 
-#: ../meld/vcview.py:360
+#: ../meld/vcview.py:372
 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:362
+#: ../meld/vcview.py:374
 msgid "Choose which version control system to use"
-msgstr "Izaberite koji sistem upravljanja izdanjem će biti korišćen"
+msgstr "Izaberite sistem upravljanja izdanjem za korišćenje"
 
 #. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:417
+#: ../meld/vcview.py:426
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:431 ../meld/vcview.py:439
+#: ../meld/vcview.py:448
 #, python-format
 msgid "Scanning %s"
 msgstr "Pregledam „%s“"
 
-#: ../meld/vcview.py:479
+#: ../meld/vcview.py:488
 msgid "(Empty)"
 msgstr "(Prazno)"
 
-#: ../meld/vcview.py:522
+#: ../meld/vcview.py:531
 #, python-format
 msgid "%s — local"
 msgstr "%s — mesna"
 
-#: ../meld/vcview.py:523
+#: ../meld/vcview.py:532
 #, python-format
 msgid "%s — remote"
 msgstr "%s — udaljena"
 
-#: ../meld/vcview.py:531
+#: ../meld/vcview.py:540
 #, python-format
 msgid "%s (local, merge, remote)"
 msgstr "%s (mesna, spojena, udaljena)"
 
-#: ../meld/vcview.py:536
+#: ../meld/vcview.py:545
 #, python-format
 msgid "%s (remote, merge, local)"
 msgstr "%s (udaljena, spojena, mesna)"
 
-#: ../meld/vcview.py:547
+#: ../meld/vcview.py:556
 #, python-format
 msgid "%s — repository"
 msgstr "%s — riznica"
 
-#: ../meld/vcview.py:553
+#: ../meld/vcview.py:562
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (radna, riznica)"
 
-#: ../meld/vcview.py:557
+#: ../meld/vcview.py:566
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (riznica, radna)"
 
-#: ../meld/vcview.py:741
+#: ../meld/vcview.py:756
 msgid "Remove folder and all its files?"
 msgstr "Da uklonim fasciklu i sve njene datoteke?"
 
-#: ../meld/vcview.py:743
+#: ../meld/vcview.py:758
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2177,11 +2323,37 @@ msgstr ""
 "Ovo će ukloniti sve izabrane datoteke i fascikle, i sve datoteke unutar svih "
 "izabranih fascikli, iz upravljanja izdanjem."
 
-#: ../meld/vcview.py:777
+#: ../meld/vcview.py:792
 #, python-format
 msgid "Error removing %s"
 msgstr "Greška pri uklanjanju „%s“"
 
+#~ msgid "Clear manual change sychronization points"
+#~ msgstr "Očistite tačke usklađivanja izmena"
+
+#~ msgid ""
+#~ "'%s' exists.\n"
+#~ "Overwrite?"
+#~ msgstr ""
+#~ "„%s“ postoji.\n"
+#~ "Da presnimim?"
+
+#~ msgid ""
+#~ "\"%s\" exists!\n"
+#~ "Overwrite?"
+#~ msgstr ""
+#~ "„%s“ postoji!\n"
+#~ "Da presnimim?"
+
+#~ msgid ""
+#~ "Error writing to %s\n"
+#~ "\n"
+#~ "%s."
+#~ msgstr ""
+#~ "Greška pisanja u „%s“\n"
+#~ "\n"
+#~ "%s."
+
 #~ msgid "Cycle Through Documents"
 #~ msgstr "Kruži kroz dokumente"