diff --git a/.gitignore b/.gitignore
index 075a30d1..6e83d795 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,28 @@
-*.pyc
+# VCS conflicts
 *.orig
 *.rej
+
+# Byte compiled Python files
+__pycache__/
+*.pyc
+
+# Compiled resources
+data/gschemas.compiled
+
+# External tooling caches
+.flatpak-builder/
+.mypy_cache/
+.pytest_cache/
+
+# Build & distribution artifacts
+build/
+dist/
+MANIFEST
+
+# Special project build artifacts
+*-installed
+
+# Files created from intltool .in templates
 *.desktop
-*.install
 data/appdata.xml
 data/mime/meld.xml
-build
-dist
-MANIFEST
-data/gschemas.compiled
-build/
diff --git a/NEWS b/NEWS
index f23449e4..6d9be208 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,69 @@
 
+2018-11-16 meld 3.18.3
+======================
+
+  Features:
+
+   * Add simple zip-based Windows build output to pipeline (Vasily Galkin)
+
+  Fixes:
+
+   * Improve Windows logging behaviour (Vasily Galkin)
+   * Fix initial focus pane for two-pane comparison (Kai Willadsen)
+   * Remove encoding fallback check that caused surrogate issues (Kai Willadsen)
+   * Fix display of file encoding errors in folder comparison (Kai Willadsen)
+   * Fix Git unpushed commit check for ambiguous filenames (Kai Willadsen)
+   * Fix local install on Mint (Kai Willadsen)
+
+   * Bugs fixed: #205, #225, #233, #235, #239
+
+  Translations:
+
+   * Daniel Mustieles (es)
+
+
+2018-06-19 meld 3.18.2
+======================
+
+  Fixes:
+
+   * Fix help launching on Windows (Vasily Galkin)
+   * Fix Windows compatibility issue with multiprocessing (Vasily Galkin)
+   * Fix incorrect state handling during tab close (Kai Willadsen)
+   * Fix commit action on a folder not working in git (Kai Willadsen)
+
+   * Bugs fixed: #196, #197
+
+
+2018-04-29 meld 3.18.1
+======================
+
+  Features:
+
+   * Support for automated Windows builds using Appveyor (Vasily Galkin)
+   * The Find bar now hides when pressing Escape (Vladimir Panteleev)
+
+  Fixes:
+
+   * Several Windows fixes for cx_Freeze compatibility (Vasily Galkin)
+   * Fix slow startup on Windows due to FontConfig (Vasily Galkin)
+   * Translation and help fixes (Piotr Drąg)
+   * Hide our progress spinner on Windows for responsiveness (Kai Willadsen)
+   * Handle subprocess termination better in file comparisons (Kai Willadsen)
+   * Fix committing selected files only in Mercurial (Kai Willadsen)
+   * Fix Bazaar version control backend (Kai Willadsen)
+
+   * Bugs fixed: #133, 785313, 788487, 790335
+
+  Translations:
+
+   * Anders Jonsson (sv)
+   * Ask Hjorth Larsen (da)
+   * Marek Černocký (cs)
+   * Mario Blättermann (de)
+   * Piotr Drąg (pl)
+
+
 2017-09-10 meld 3.18.0
 ======================
 
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 00000000..b6c70c8e
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,58 @@
+version: tag-or-branch-set-from-init-script.{build}
+
+# Limit builds to release branches
+branches:
+  only:
+    - master
+    - meld-3-18
+
+# Only build tags automatically
+# TODO: Disabled due to https://github.com/appveyor/ci/issues/1887
+# skip_non_tags: true
+
+init:
+  - ps: |
+      if ($env:APPVEYOR_REPO_TAG -eq "true") {
+          Update-AppveyorBuild -Version "$env:APPVEYOR_REPO_TAG_NAME.$env:APPVEYOR_BUILD_NUMBER"
+      }
+      else {
+          Update-AppveyorBuild -Version "$env:APPVEYOR_REPO_BRANCH-$($env:APPVEYOR_REPO_COMMIT.substring(0,7)).$env:APPVEYOR_BUILD_NUMBER"
+      }
+
+environment:
+  PYTHON_PREFIX: C:\Python34
+  PATH: $(PYTHON_PREFIX);$(PYTHON_PREFIX)\Lib\site-packages\gnome;$(PATH)
+
+install:
+  # Install cxFreeze
+  - cmd: |
+      python -m pip install pypiwin32==219
+      python -m pip install cx_Freeze==5.0.2
+
+  # Download and extract the PyGI all-in-one installer
+  - cmd: |
+      curl "https://sourceforge.net/projects/pygobjectwin32/files/pygi-aio-3.24.1_rev1-setup_049a323fe25432b10f7e9f543b74598d4be74a39.exe/download" --location --output pygi-aio-setup.exe
+      set SOURCEPATH=%cd%\pygi-aio-source
+      mkdir %SOURCEPATH%
+      7z.exe x -o%SOURCEPATH% pygi-aio-setup.exe
+      mkdir pygi-aio-setup
+      7z.exe x -opygi-aio-setup %SOURCEPATH%\setup.exe
+      set GIR=True
+
+  # %PYTHON_PREFIX% is used because it is the last supported by
+  # pygi-aio, GTK is installed as a dependency of GTKSourceView
+  - cmd: |
+      pygi-aio-setup\rcmd.exe /c "cd pygi-aio-setup && setup.bat %PYTHON_PREFIX% GTKSourceView >pygi-aio-setup.log"
+
+build_script:
+  - cmd: |
+      %PYTHON_PREFIX%\Lib\site-packages\gnome\glib-compile-schemas data
+      %PYTHON_PREFIX%\python setup_win32.py bdist_msi
+      %PYTHON_PREFIX%\python setup_win32.py install --root build/install_root --prefix . bdist_dumb
+
+artifacts:
+  - path: dist/*.msi
+    name: Meld installer
+
+  - path: dist/*.zip
+    name: Meld freezed binaries archive
diff --git a/bin/meld b/bin/meld
index 8fb0a08c..8e19a587 100755
--- a/bin/meld
+++ b/bin/meld
@@ -22,16 +22,22 @@ import os
 import signal
 import subprocess
 import sys
+from multiprocessing import freeze_support
 
 # On Windows, pythonw.exe (which doesn't display a console window) supplies
 # dummy stdout and stderr streams that silently throw away any output. However,
 # these streams seem to have issues with flush() so we just redirect stdout and
 # stderr to actual dummy files (the equivalent of /dev/null).
 # Regarding pythonw.exe stdout, see also http://bugs.python.org/issue706263
-if sys.executable.endswith("pythonw.exe"):
+# Also cx_Freeze built with Win32GUI base sets sys.stdout to None
+# leading to exceptions in print() and freeze_support() that uses flush()
+if sys.executable.endswith("pythonw.exe") or sys.stdout is None:
     devnull = open(os.devnull, "w")
     sys.stdout = sys.stderr = devnull
 
+# Main module hasn't multiprocessing workers, so not imported in subprocesses.
+# This allows skipping '__name__ == "main"' guard, but freezed case is special.
+freeze_support()
 
 def disable_stdout_buffering():
 
@@ -173,6 +179,7 @@ def check_requirements():
     gtk_requirement = (3, 14)
     glib_requirement = (2, 36, 0)
     gtksourceview_requirement = (3, 14, 0)
+    pangocairo_requirement = (1, 34)
 
     def missing_reqs(mod, ver, exception=None):
         if isinstance(exception, ImportError):
@@ -192,13 +199,13 @@ def check_requirements():
         from gi.repository import Gtk
         version = (Gtk.get_major_version(), Gtk.get_minor_version())
         assert version >= gtk_requirement
-    except (ImportError, AssertionError) as e:
+    except (ImportError, AssertionError, ValueError) as e:
         missing_reqs("GTK+", gtk_requirement, e)
 
     try:
         from gi.repository import GObject
         assert GObject.glib_version >= glib_requirement
-    except (ImportError, AssertionError) as e:
+    except (ImportError, AssertionError, ValueError) as e:
         missing_reqs("GLib", glib_requirement, e)
 
     try:
@@ -206,9 +213,16 @@ def check_requirements():
         from gi.repository import GtkSource
         # TODO: There is no way to get at GtkSourceView's actual version
         assert hasattr(GtkSource, 'SearchSettings')
-    except (ImportError, AssertionError) as e:
+    except (ImportError, AssertionError, ValueError) as e:
         missing_reqs("GtkSourceView", gtksourceview_requirement, e)
 
+    try:
+        gi.require_version("PangoCairo", "1.0")
+        from gi.repository import PangoCairo
+        # Only check that imports ok; the version is fine since Gtk loaded fine
+    except (ImportError, ValueError) as e:
+        missing_reqs("PangoCairo", pangocairo_requirement, e)
+
 
 def setup_resources():
     from gi.repository import GLib
@@ -311,9 +325,16 @@ def setup_glib_logging():
     # redirection API became a no-op, so we need to hack both of these
     # handlers to get it to work.
     def structured_log_adapter(level, fields, field_count, user_data):
-        message = GLib.log_writer_format_fields(level, fields, True)
-        if not silence(message):
-            log.log(levels.get(level, logging.WARNING), message)
+        # Don't even format the message if it will be discarded
+        py_logging_level = levels.get(level, logging.WARNING)
+        if log.isEnabledFor(py_logging_level):
+            # at least glib 2.52 log_writer_format_fields can raise on win32
+            try:
+                message = GLib.log_writer_format_fields(level, fields, True)
+                if not silence(message):
+                    log.log(py_logging_level, message)
+            except Exception:
+                GLib.log_writer_standard_streams(level, fields, user_data)
         return GLib.LogWriterOutput.HANDLED
 
     try:
@@ -347,5 +368,10 @@ if __name__ == '__main__':
         from gi.repository import GLib
         GLib.unix_signal_add(GLib.PRIORITY_DEFAULT, signal.SIGINT,
                              lambda *args: meld.meldapp.app.quit(), None)
+    if sys.platform == 'win32':
+        # FontConfig on win32 at least with version <= 2.12.6 can cause several
+        # minutes 'hang' during first startup. So use native fonts backend.
+        from gi.repository import PangoCairo
+        PangoCairo.FontMap.set_default(PangoCairo.Win32FontMap())
     status = meld.meldapp.app.run(sys.argv)
     sys.exit(status)
diff --git a/data/ui/findbar.ui b/data/ui/findbar.ui
index f88d4623..74b06517 100644
--- a/data/ui/findbar.ui
+++ b/data/ui/findbar.ui
@@ -137,6 +137,7 @@
             <property name="secondary_icon_activatable">False</property>
             <signal name="changed" handler="on_find_entry_changed" swapped="no"/>
             <signal name="activate" handler="on_find_next_button_clicked" swapped="no"/>
+            <signal name="stop-search" handler="on_stop_search" swapped="no"/>
           </object>
           <packing>
             <property name="left_attach">1</property>
diff --git a/help/Makefile.am b/help/Makefile.am
new file mode 100644
index 00000000..bb48ce1a
--- /dev/null
+++ b/help/Makefile.am
@@ -0,0 +1,24 @@
+# Fake Makefile.am to get damned-lies to build a .pot file
+@YELP_HELP_RULES@
+
+HELP_ID = meld
+
+HELP_FILES = \
+ command-line.page \
+ file-changes.page \
+ file-filters.page \
+ file-mode.page \
+ flattened-view.page \
+ folder-mode.page \
+ index.page \
+ introduction.page \
+ keyboard-shortcuts.page \
+ legal.xml \
+ missing-functionality.page \
+ preferences.page \
+ resolving-conflicts.page \
+ text-filters.page \
+ vc-mode.page \
+ vc-supported.page
+
+HELP_LINGUAS = cs de el es pl sv
diff --git a/help/cs/cs.po b/help/cs/cs.po
index 076fd2ca..31d8b46e 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: 2017-03-10 23:07+0000\n"
-"PO-Revision-Date: 2017-03-15 00:58+0100\n"
+"Project-Id-Version: meld meld-3.18\n"
+"POT-Creation-Date: 2017-09-13 16:58+0000\n"
+"PO-Revision-Date: 2017-09-13 21:38+0200\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: čeština <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
@@ -23,253 +23,185 @@ msgid "translator-credits"
 msgstr "Marek Černocký <marek@manet.cz>"
 
 #. (itstool) path: info/title
-#: C/introduction.page:5 C/file-mode.page:5 C/missing-functionality.page:5
-#: C/folder-mode.page:5 C/preferences.page:5
+#: C/command-line.page:5 C/file-changes.page:5 C/file-filters.page:5
+#: C/flattened-view.page:5 C/keyboard-shortcuts.page:5
+#: C/resolving-conflicts.page:5 C/text-filters.page:5
 msgctxt "sort"
-msgid "1"
-msgstr "1"
+msgid "2"
+msgstr "2"
 
 #. (itstool) path: credit/name
-#: C/introduction.page:10 C/vc-supported.page:10 C/file-mode.page:11
-#: C/file-filters.page:10 C/missing-functionality.page:10 C/index.page:8
-#: C/command-line.page:10 C/text-filters.page:11 C/flattened-view.page:10
-#: C/vc-mode.page:10 C/folder-mode.page:10 C/resolving-conflicts.page:10
-#: C/preferences.page:10 C/keyboard-shortcuts.page:10 C/file-changes.page:10
+#: C/command-line.page:10 C/file-changes.page:10 C/file-filters.page:10
+#: C/file-mode.page:11 C/flattened-view.page:10 C/folder-mode.page:10
+#: C/index.page:8 C/introduction.page:10 C/keyboard-shortcuts.page:10
+#: C/missing-functionality.page:10 C/preferences.page:10
+#: C/resolving-conflicts.page:10 C/text-filters.page:11 C/vc-mode.page:10
+#: C/vc-supported.page:10
 msgid "Kai Willadsen"
 msgstr "Kai Willadsen"
 
 #. (itstool) path: credit/years
-#: C/introduction.page:12 C/vc-supported.page:12 C/file-mode.page:13
-#: C/file-filters.page:12 C/missing-functionality.page:12 C/index.page:10
-#: C/command-line.page:12 C/text-filters.page:13 C/flattened-view.page:12
-#: C/vc-mode.page:12 C/folder-mode.page:12 C/resolving-conflicts.page:12
-#: C/keyboard-shortcuts.page:12 C/file-changes.page:12
+#: C/command-line.page:12 C/file-changes.page:12 C/file-filters.page:12
+#: C/file-mode.page:13 C/flattened-view.page:12 C/folder-mode.page:12
+#: C/index.page:10 C/introduction.page:12 C/keyboard-shortcuts.page:12
+#: C/missing-functionality.page:12 C/resolving-conflicts.page:12
+#: C/text-filters.page:13 C/vc-mode.page:12 C/vc-supported.page:12
 msgid "2012"
 msgstr "2012"
 
 #. (itstool) path: page/title
-#: C/introduction.page:15
-msgid "What is Meld?"
-msgstr "Co je to Meld?"
+#: C/command-line.page:15
+msgid "Command line usage"
+msgstr "Použití příkazového řádku"
 
 #. (itstool) path: page/p
-#: C/introduction.page:16
+#: C/command-line.page:17
 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."
+"If you start <app>Meld</app> from the command line, you can tell it what to "
+"do when it starts."
 msgstr ""
-"<app>Meld</app> je nástroj sloužící k porovnávání souborů a složek a řešení "
-"rozdílů mezi nimi. Hodí se také k porovnání změn provedených v rámci systémů "
-"pro správu verzí."
+"Když spouštíte <app>Meld</app> z příkazové řádky, můžete mu říct, co má po "
+"spuštění udělat."
 
 #. (itstool) path: page/p
-#: C/introduction.page:22
+#: C/command-line.page:20
 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."
+"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 ""
-"<app>Meld</app> zobrazuje rozdíly mezi dvěma nebo třemi soubory (či dvěma "
-"nebo třemi složkami) a umožňuje mezi nimi přesouvat obsah nebo soubory ručně "
-"upravit. Cílem aplikace <app>Meld</app> je pomoci vývojářům porovnávat a "
-"slučovat soubory se zdrojovými kódy a získat vizuální přehled o změnách v "
-"jejich oblíbeném systému správy verzí."
-
-#. (itstool) path: info/title
-#: C/vc-supported.page:5
-msgctxt "sort"
-msgid "3"
-msgstr "3"
-
-#. (itstool) path: page/title
-#: C/vc-supported.page:15
-msgid "Supported version control systems"
-msgstr "Podporované systémy pro správu verzí"
+"Pro dvoj nebo trojcestné <link xref=\"file-mode\">porovnání souborů</link> "
+"spusťte <app>Meld</app> pomocí <cmd>meld <var>soubor1</var> <var>soubor2</"
+"var></cmd> respektive <cmd>meld <var>soubor1</var> <var>soubor2</var> "
+"<var>soubor3</var></cmd>."
 
 #. (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> podporuje širokou škálu systémů pro správu verzí:"
-
-#. (itstool) path: item/p
-#: C/vc-supported.page:22
-msgid "Bazaar"
-msgstr "Bazaar"
-
-#. (itstool) path: item/p
-#: C/vc-supported.page:23
-msgid "Darcs"
-msgstr "Darcs"
-
-#. (itstool) path: item/p
-#: C/vc-supported.page:24
-msgid "Git"
-msgstr "Git"
-
-#. (itstool) path: item/p
-#: C/vc-supported.page:25
-msgid "Mercurial"
-msgstr "Mercurial"
-
-#. (itstool) path: item/p
-#: C/vc-supported.page:26
-msgid "SVN"
-msgstr "SVN"
+#: 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 ""
+"Pro dvoj nebo trojcestné <link xref=\"file-mode\">porovnání složek</link> "
+"spusťte <app>Meld</app> pomocí <cmd>meld <var>složka1</var> <var>složka2</"
+"var></cmd> respektive <cmd>meld <var>složka1</var> <var>složka2</var> "
+"<var>složka3</var></cmd>."
 
-# Poznámky:
-# Přidat poznámku
-#
-# Vybalené komentáře:
-# (itstool) path: page/p
-#
 #. (itstool) path: page/p
-#: C/vc-supported.page:29
+#: C/command-line.page:31
 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>."
+"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 ""
-"Méně běžné systémy pro správu verzí nebo méně obvyklá nastavení nemusí být "
-"úplně otestovaná. Případné chyby v podpoře správy verzí prosím nahlaste na "
-"<link href=\"https://bugzilla.gnome.org/\">GNOME bugzilla</link>."
+"Porovnání ve <link xref=\"vc-mode\">správě verzí</link> můžete spustit "
+"zadání pouhého jednoho argumentu. Pokud je zadaný soubor nebo složka "
+"spravována některým <link xref=\"vc-supported\">rozpoznaným systémem správy "
+"verzí</link>, spustí se porovnání tohoto argumentu ve správě verzí. "
+"Například <cmd>meld .</cmd> by spustilo zobrazení správy verzí pro aktuální "
+"složku."
+
+#. (itstool) path: note/p
+#: C/command-line.page:40
+msgid "Run <cmd>meld --help</cmd> for a list of all command line options."
+msgstr ""
+"Spuštěním <cmd>meld --help</cmd> si můžete vypsat všechny možnosti "
+"příkazového řádku."
 
 #. (itstool) path: page/title
-#: C/file-mode.page:17
-msgid "Getting started comparing files"
-msgstr "Začínáme s porovnáváním souborů"
+#: C/file-changes.page:16
+msgid "Dealing with changes"
+msgstr "Práce se změnami"
 
 #. (itstool) path: page/p
-#: C/file-mode.page:19
+#: C/file-changes.page:18
 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."
+"<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> umožňuje porovnávat vedle sebe dva nebo tři textové soubory. "
-"Nové porovnávání souborů můžete začít pomocí položky <guiseq><gui style="
-"\"menu\">Soubor</gui><gui style=\"menuitem\">Nové…</gui></guiseq> v nabídce."
+"<app>Meld</app> se chová ke změnám mezi soubory jako k seznamu <em>bloků "
+"změn</em>, zkráceně jen <em>změn</em>. Každá změna sestává ze skupiny řádků, "
+"které si mezi soubory odpovídají. Protože právě tyto změny jsou obvykle to, "
+"co vás zajímá, poskytuje <app>Meld</app> nástroje pro přecházení mezi nimi a "
+"pro jejich úpravy. Tyto nástroje najdete v nabídce <gui style=\"menu"
+"\">Změny</gui>."
 
-#. (itstool) path: page/p
-#: C/file-mode.page:26
+#. (itstool) path: section/title
+#: C/file-changes.page:30
+msgid "Navigating between changes"
+msgstr "Pohyb mezi změnami"
+
+#. (itstool) path: section/p
+#: C/file-changes.page:32
 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\"/>."
+"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 ""
-"Po té, co si vyberete své soubory, <app>Meld</app> je zobrazí vedle sebe. "
-"Změny mezi soubory se zvýrazní, aby byly jednotlivé rozdíly lépe viditelné. "
-"Během případných úprav se porovnání ihned živě aktualizuje. Více podrobností "
-"o pohybu mezi jednotlivými změnami a jak použít úpravy založené na změnách, "
-"najdete v oddíle <link xref=\"file-changes\"/>."
+"Mezi změnami se můžete pohybovat pomocí položek nabídky <guiseq><gui style="
+"\"menu\">Změny</gui><gui style=\"menuitem\">Předchozí změna</gui></guiseq> a "
+"<guiseq><gui style=\"menu\">Změny</gui><gui style=\"menuitem\">Následující "
+"změna</gui></guiseq>. Můžete také použít kolečko myši nad středovou lištou "
+"se změnami."
 
 #. (itstool) path: section/title
-#: C/file-mode.page:35
-msgid "<app>Meld</app>'s file comparisons"
-msgstr "Porovnávání souborů v aplikaci <app>Meld</app>"
+#: C/file-changes.page:46
+msgid "Changing changes"
+msgstr "Změna změn"
 
 #. (itstool) path: section/p
-#: C/file-mode.page:37
+#: C/file-changes.page:48
 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."
+"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 ""
-"Okno s porovnáním souborů má několik různých části. Nejdůležitějšími částmi "
-"jsou editory, ve který se zobrazují soubory. Mimo těchto editorů se v "
-"místech okolo nich a mezi nimi nabízí vizuální přehled a funkce, které vám "
-"pomáhají se změnami mezi soubory pracovat."
+"Mimo přímých úprav textu vám <app>Meld</app> poskytuje nástroje pro přesun, "
+"kopírování nebo mazání jednotlivých rozdílů mezi soubory. Lišta mezi dvěma "
+"soubory nejen zobrazuje, které části těchto souborů si navzájem odpovídají, "
+"ale také umožňuje cíleně slučovat nebo mazat rozdílové změny kliknutím na "
+"ikonu se šipkou nebo křížkem vedle začátku každé změny."
 
 #. (itstool) path: section/p
-#: C/file-mode.page:43
+#: C/file-changes.page:52
 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."
+"The default action is <em>replace</em>. This action replaces the contents of "
+"the corresponding change with the current change."
 msgstr ""
-"Po levé a pravé straně okna se nachází dvě malé svislé lišty, které "
-"zobrazují různorodé barevné bloky. Slouží k tomu, abyste získali přehled o "
-"všech změnách mezi vašimi soubory. Každý barevný blok zastupuje úsek, který "
-"je v souboru vložený, smazaný, změněný nebo v konfliktu, což se rozlišuje "
-"barvou bloku."
+"Výchozí činností je <em>nahrazení</em>. Tím se nahradí obsah odpovídající "
+"změny aktuální změnou."
 
 #. (itstool) path: section/p
-#: C/file-mode.page:50
+#: C/file-changes.page:59
 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\"/>."
+"Hold down the <key>Shift</key> key to change the current action to "
+"<em>delete</em>. This action deletes the current change."
 msgstr ""
-"Mezi soubory je část zobrazující, které změněné úseky si mezi soubory "
-"navzájem odpovídají. Můžete kliknout na šipky v této části, aby se změny "
-"mezi soubory navzájem prohodily. Změny můžete také smazat, kopírovat nebo "
-"sloučit. Další popis, co s jednotlivými změnami můžete provádět, najdete v "
-"kapitole <link xref=\"file-changes#change-actions\"/>."
-
-#. (itstool) path: section/title
-#: C/file-mode.page:62
-msgid "Saving your changes"
-msgstr "Ukládání vašich změn"
+"Přidržením klávesy <key>Shift</key> změníte aktuální činnost na <em>smazat</"
+"em>. Touto činností se smažou současné změny."
 
 #. (itstool) path: section/p
-#: C/file-mode.page:64
+#: C/file-changes.page:62
 msgid ""
-"Once you've finished editing your files, you need to save each file you've "
-"changed."
-msgstr "Když dokončíte úpravy svých souborů, musíte je všechny uložit."
-
-#. (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 ""
-"Podle ikony, která se objeví vedle názvu souboru nad každým otevřeným "
-"souborem, můžete poznat, jestli byl soubor od poslední změny uložen. Navíc "
-"se na popisku sešitu zobrazuje hvězdička (<code>*</code>) za každým "
-"souborem, který nebyl uložen."
-
-#. (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 ""
-"Aktuální soubor uložíte pomocí položky nabídky <guiseq><gui style=\"menu"
-"\">Soubor</gui> <gui style=\"menuitem\">Uložit</gui></guiseq> nebo pomocí "
-"klávesové zkratky <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 ""
-"Uloží se pouze <em>právě zaměřený</em> soubor, což je ten, ve kterém se "
-"nachází kurzor. Pokud nedokážete rozlišit, který soubor je zaměřen, prostě "
-"na něj před uložením klikněte."
-
-#. (itstool) path: info/title
-#: C/file-filters.page:5 C/command-line.page:5 C/text-filters.page:5
-#: C/flattened-view.page:5 C/resolving-conflicts.page:5
-#: C/keyboard-shortcuts.page:5 C/file-changes.page:5
-msgctxt "sort"
-msgid "2"
-msgstr "2"
+"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 ""
+"Přidržením klávesy <key>Ctrl</key> změníte aktuální činnost na <em>vložit</"
+"em>. Touto činností se současné změny vloží nad nebo pod (podle výběru) "
+"odpovídající změny."
 
 #. (itstool) path: page/title
 #: C/file-filters.page:15
@@ -343,7 +275,7 @@ msgstr ""
 
 #. (itstool) path: item/title
 #. (itstool) path: td/p
-#: C/file-filters.page:58 C/vc-mode.page:107 C/folder-mode.page:148
+#: C/file-filters.page:58 C/folder-mode.page:148 C/vc-mode.page:107
 msgid "Modified"
 msgstr "Změněné"
 
@@ -354,7 +286,7 @@ msgstr "Soubor existuje ve více složkách, ale jednotlivé verze jsou rozdíln
 
 #. (itstool) path: item/title
 #. (itstool) path: td/p
-#: C/file-filters.page:62 C/vc-mode.page:121 C/folder-mode.page:162
+#: C/file-filters.page:62 C/folder-mode.page:162 C/vc-mode.page:121
 msgid "New"
 msgstr "Nové"
 
@@ -365,7 +297,7 @@ msgstr "Soubor existuje v jedné složce, ale v ostatních ne"
 
 #. (itstool) path: item/title
 #. (itstool) path: td/p
-#: C/file-filters.page:66 C/vc-mode.page:93 C/folder-mode.page:118
+#: C/file-filters.page:66 C/folder-mode.page:118 C/vc-mode.page:93
 msgid "Same"
 msgstr "Stejné"
 
@@ -571,983 +503,515 @@ msgstr ""
 "docílit přes nabídku <guiseq><gui style=\"menu\">Zobrazit</gui><gui style="
 "\"menuitem\">Ignorovat velikost písmen v názvu souboru</gui></guiseq>."
 
+#. (itstool) path: info/title
+#: C/file-mode.page:5 C/folder-mode.page:5 C/introduction.page:5
+#: C/missing-functionality.page:5 C/preferences.page:5
+msgctxt "sort"
+msgid "1"
+msgstr "1"
+
 #. (itstool) path: page/title
-#: C/missing-functionality.page:15
-msgid "Things that <app>Meld</app> doesn't do"
-msgstr "Věci, které <app>Meld</app> nedělá"
+#: C/file-mode.page:17
+msgid "Getting started comparing files"
+msgstr "Začínáme s porovnáváním souborů"
 
 #. (itstool) path: page/p
-#: C/missing-functionality.page:17
+#: C/file-mode.page:19
 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?"
+"<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 ""
-"Strávili jste hodinu a půl prozkoumáváním aplikace ve snaze najít, jak se "
-"udělá jedna konkrétní věc, protože jste si byli <em>jistí</em>, že to musí "
-"nějak jít?"
+"<app>Meld</app> umožňuje porovnávat vedle sebe dva nebo tři textové soubory. "
+"Nové porovnávání souborů můžete začít pomocí položky <guiseq><gui style="
+"\"menu\">Soubor</gui><gui style=\"menuitem\">Nové…</gui></guiseq> v nabídce."
 
 #. (itstool) path: page/p
-#: C/missing-functionality.page:23
+#: C/file-mode.page:26
 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."
+"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 ""
-"Tato část uvádí několik běžných věcí, které <app>Meld</app> <em>nedělá</em>, "
-"ať už záměrně nebo proto, že na ně ještě nebyl čas."
+"Po té, co si vyberete své soubory, <app>Meld</app> je zobrazí vedle sebe. "
+"Změny mezi soubory se zvýrazní, aby byly jednotlivé rozdíly lépe viditelné. "
+"Během případných úprav se porovnání ihned živě aktualizuje. Více podrobností "
+"o pohybu mezi jednotlivými změnami a jak použít úpravy založené na změnách, "
+"najdete v oddíle <link xref=\"file-changes\"/>."
 
 #. (itstool) path: section/title
-#: C/missing-functionality.page:30
-msgid "Aligning changes by adding lines"
-msgstr "Zarovnávání změn přidáním řádků"
+#: C/file-mode.page:35
+msgid "<app>Meld</app>'s file comparisons"
+msgstr "Porovnávání souborů v aplikaci <app>Meld</app>"
 
 #. (itstool) path: section/p
-#: C/missing-functionality.page:31
+#: C/file-mode.page:37
 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."
+"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 ""
-"Když <app>Meld</app> zobrazuje rozdíly mezi soubory, zobrazuje oba soubory "
-"stejným způsobem jako běžný textový editor. <em>Nevkládá</em> žádné "
-"dodatečné řádky, aby levá a pravá strana se změnami měly stejnou velikost. "
-"Není k dispozici ani žádná volba, která by to dělala."
+"Okno s porovnáním souborů má několik různých části. Nejdůležitějšími částmi "
+"jsou editory, ve který se zobrazují soubory. Mimo těchto editorů se v "
+"místech okolo nich a mezi nimi nabízí vizuální přehled a funkce, které vám "
+"pomáhají se změnami mezi soubory pracovat."
 
-#. (itstool) path: page/title
-#: C/index.page:14
-msgid "Meld Help"
-msgstr "Nápověda k aplikaci Meld"
+#. (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 ""
+"Po levé a pravé straně okna se nachází dvě malé svislé lišty, které "
+"zobrazují různorodé barevné bloky. Slouží k tomu, abyste získali přehled o "
+"všech změnách mezi vašimi soubory. Každý barevný blok zastupuje úsek, který "
+"je v souboru vložený, smazaný, změněný nebo v konfliktu, což se rozlišuje "
+"barvou bloku."
 
-#. (itstool) path: section/title
-#: C/index.page:17
-msgid "Introduction"
-msgstr "Úvod"
+#. (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 ""
+"Mezi soubory je část zobrazující, které změněné úseky si mezi soubory "
+"navzájem odpovídají. Můžete kliknout na šipky v této části, aby se změny "
+"mezi soubory navzájem prohodily. Změny můžete také smazat, kopírovat nebo "
+"sloučit. Další popis, co s jednotlivými změnami můžete provádět, najdete v "
+"kapitole <link xref=\"file-changes#change-actions\"/>."
 
 #. (itstool) path: section/title
-#: C/index.page:21
-msgid "Comparing Files"
-msgstr "Porovnávání souborů"
+#: C/file-mode.page:62
+msgid "Saving your changes"
+msgstr "Ukládání vašich změn"
 
-#. (itstool) path: section/title
-#: C/index.page:25
-msgid "Comparing Folders"
-msgstr "Porovnávání složek"
+#. (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 "Když dokončíte úpravy svých souborů, musíte je všechny uložit."
 
-#. (itstool) path: section/title
-#: C/index.page:29
-msgid "Using Meld with Version Control"
-msgstr "Používání aplikace Meld se správou verzí"
+#. (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 ""
+"Podle ikony, která se objeví vedle názvu souboru nad každým otevřeným "
+"souborem, můžete poznat, jestli byl soubor od poslední změny uložen. Navíc "
+"se na popisku sešitu zobrazuje hvězdička (<code>*</code>) za každým "
+"souborem, který nebyl uložen."
 
-#. (itstool) path: section/title
-#: C/index.page:33
-msgid "Advanced Usage"
-msgstr "Pokročilé používání"
+#. (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 ""
+"Aktuální soubor uložíte pomocí položky nabídky <guiseq><gui style=\"menu"
+"\">Soubor</gui> <gui style=\"menuitem\">Uložit</gui></guiseq> nebo pomocí "
+"klávesové zkratky <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 ""
+"Uloží se pouze <em>právě zaměřený</em> soubor, což je ten, ve kterém se "
+"nachází kurzor. Pokud nedokážete rozlišit, který soubor je zaměřen, prostě "
+"na něj před uložením klikněte."
 
 #. (itstool) path: page/title
-#: C/command-line.page:15
-msgid "Command line usage"
-msgstr "Použití příkazového řádku"
+#: C/flattened-view.page:15
+msgid "Flattened view"
+msgstr "Zúžené zobrazení"
 
 #. (itstool) path: page/p
-#: C/command-line.page:17
+#: C/flattened-view.page:17
 msgid ""
-"If you start <app>Meld</app> from the command line, you can tell it what to "
-"do when it starts."
+"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 ""
-"Když spouštíte <app>Meld</app> z příkazové řádky, můžete mu říct, co má po "
-"spuštění udělat."
+"Když si prohlížíte rozsáhle složky, může vás zajímat jen pár souborů z "
+"tisíců dalších. Z tohoto důvodu poskytuje <app>Meld</app> <em>zúžené "
+"zobrazení</em> složky. Pak se zobrazují jen soubory, které nejsou "
+"odfiltrovány (např. pomocí <link xref=\"vc-mode#vc-state-filtering\"/>) a "
+"stromová struktura je zrušena s tím, že ve sloupci <em>Umístění</em> je "
+"zobrazena cesta."
 
 #. (itstool) path: page/p
-#: C/command-line.page:20
+#: C/flattened-view.page:27
 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."
+"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 ""
-"Pro dvoj nebo trojcestné <link xref=\"file-mode\">porovnání souborů</link> "
-"spusťte <app>Meld</app> pomocí <cmd>meld <var>soubor1</var> <var>soubor2</"
-"var></cmd> respektive <cmd>meld <var>soubor1</var> <var>soubor2</var> "
-"<var>soubor3</var></cmd>."
+"Toto zúžené zobrazení můžete zapnout nebo vypnout zaškrtnutím položky "
+"nabídky <guiseq><gui style=\"menu\">Zobrazit</gui><gui style=\"menuitem"
+"\">Zúžené</gui></guiseq> nebo kliknutím na příslušné tlačítko <gui style="
+"\"button\">Zúžené</gui> na nástrojové liště."
+
+#. (itstool) path: page/title
+#: C/folder-mode.page:16
+msgid "Getting started comparing folders"
+msgstr "Začínáme s porovnáváním složek"
 
 #. (itstool) path: page/p
-#: C/command-line.page:26
+#: C/folder-mode.page:18
 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>."
+"<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 ""
-"Pro dvoj nebo trojcestné <link xref=\"file-mode\">porovnání složek</link> "
-"spusťte <app>Meld</app> pomocí <cmd>meld <var>složka1</var> <var>složka2</"
-"var></cmd> respektive <cmd>meld <var>složka1</var> <var>složka2</var> "
-"<var>složka3</var></cmd>."
+"<app>Meld</app> umožňuje porovnávat dvě nebo tři složky vedle sebe. Nové "
+"porovnávání složek začnete přes položku nabídky <guiseq><gui style=\"menu"
+"\">Soubor</gui><gui style=\"menuitem\">Nový…</gui></guiseq> a kliknutím na "
+"kartu <gui style=\"tab\">Porovnávání složek</gui>."
 
 #. (itstool) path: page/p
-#: C/command-line.page:31
+#: C/folder-mode.page:26
 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 ""
-"Porovnání ve <link xref=\"vc-mode\">správě verzí</link> můžete spustit "
-"zadání pouhého jednoho argumentu. Pokud je zadaný soubor nebo složka "
-"spravována některým <link xref=\"vc-supported\">rozpoznaným systémem správy "
-"verzí</link>, spustí se porovnání tohoto argumentu ve správě verzí. "
-"Například <cmd>meld .</cmd> by spustilo zobrazení správy verzí pro aktuální "
-"složku."
-
-#. (itstool) path: note/p
-#: C/command-line.page:40
-msgid "Run <cmd>meld --help</cmd> for a list of all command line options."
+"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 ""
-"Spuštěním <cmd>meld --help</cmd> si můžete vypsat všechny možnosti "
-"příkazového řádku."
+"Vybrané složky budou zobrazeny jako stromové struktury vedle sebe a rozdíly "
+"mezi soubory v každé složce budou zvýrazněny. Soubory v každé ze složek "
+"můžete kopírovat a mazat, případně si u textových souborů zobrazit rozdíly "
+"podrobně."
 
-#. (itstool) path: page/title
-#: C/text-filters.page:17
-msgid "Filtering out text"
-msgstr "Odfiltrování textu"
+#. (itstool) path: section/title
+#: C/folder-mode.page:36
+msgid "The folder comparison view"
+msgstr "Zobrazení porovnání složek"
 
-#. (itstool) path: page/p
-#: C/text-filters.page:19
+#. (itstool) path: section/p
+#: C/folder-mode.page:38
 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."
+"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 ""
-"Když porovnáváte několik souborů, můžete v nich mít části textu, ve kterých "
-"nejsou rozdíly důležité. Například se můžete chtít zaměřit na změny v části "
-"s kódem a ignorovat změny v řádcích s komentáři. Díky textovým filtrům stačí "
-"aplikaci <app>Meld</app> říci, aby při zobrazování rozdílů mezi soubory "
-"ignorovala text, který vyhovuje nějakému vzoru (tj. regulárnímu výrazu)."
+"Hlavními částmi v porovnání složek jsou stromy zobrazující porovnávané "
+"složky. V těchto porovnáních se můžete snadno <link xref=\"#folder-navigation"
+"\">pohybovat</link>, abyste našli změny, které vás zajímají. Když vyberete "
+"soubor nebo složku, na stavové liště ve spodní části okna se zobrazí "
+"podrobné informace. Zmáčknutím klávesy <key>Enter</key> na vybraném souboru "
+"nebo dvojitým kliknutím na libovolném souboru se otevře <link xref=\"file-"
+"mode\">porovnávání souboru</link> vedle sebe v nové kartě, ale rozumné "
+"použití to má jen pro textové soubory."
 
-#. (itstool) path: note/p
-#: C/text-filters.page:28
+#. (itstool) path: section/p
+#: C/folder-mode.page:50
 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."
+"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 ""
-"Textové filtry neovlivňují jen porovnání souborů, ale i porovnání složek. "
-"Více podrobností najdete v <link xref=\"file-filters\">poznámkách k "
-"filtrování souborů</link>."
+"Po levé i pravé straně okna se nachází lišty, které vám zobrazují jednoduchý "
+"barevný přehled výsledků porovnávání. Každý soubor nebo složka v porovnání "
+"odpovídají malému úseku lišty, přitom ale <app>Meld</app> nezobrazuje "
+"<em>stejné</em> soubory, takže jsou lépe vidět opravdu podstatné rozdíly. Na "
+"lištu můžete kdekoliv kliknout a dostat se tak přímo na místo v porovnání."
 
 #. (itstool) path: section/title
-#: C/text-filters.page:37
-msgid "Adding and using text filters"
-msgstr "Přidávání a používání textových filtrů"
+#: C/folder-mode.page:63
+msgid "Navigating folder comparisons"
+msgstr "Pohyb v porovnávání složek"
 
 #. (itstool) path: section/p
-#: C/text-filters.page:39
+#: C/folder-mode.page:65
 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."
+"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 ""
-"Textové filtry můžete zapínat a vypínat na kartě <gui>Filtry textu</gui> v "
-"dialogovém okně <gui>Předvolby</gui>. <app>Meld</app> má předdefinováno "
-"několik jednoduchých filtrů, které mohou být užitečné, a k tomu si můžete "
-"vytvořit své vlastní."
+"Mezi změněnými soubory (to jsou všechny soubory/složky, které <em>nejsou</"
+"em> označené jako shodné) se můžete pohybovat pomocí položek nabídky "
+"<guiseq><gui style=\"menu\">Změny</gui><gui style=\"menuitem\">Předchozí "
+"změna</gui></guiseq> a <guiseq><gui style=\"menu\">Změny</gui><gui style="
+"\"menuitem\">Následující změna</gui></guiseq> nebo použít příslušné tlačítko "
+"na nástrojové liště."
 
 #. (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 ""
-"V aplikaci <app>Meld</app> nejsou textové filtry nic jiného, než regulární "
-"výrazy spouštěné vůči textu nebo souborům, které porovnáváte. Text, který "
-"regulárnímu výrazu vyhovuje, je během porovnávání ignorován. V zobrazení "
-"porovnání sice takovýto text stále uvidíte, ale nebude brán v úvahu při "
-"hledání rozdílů. Textové filtry se použijí v určeném pořadí, takže je možné, "
-"aby první filtr odebral text tak, aby zbytek vyhovoval druhému filtru atd."
-
-#. (itstool) path: note/p
-#: C/text-filters.page:55
+#: C/folder-mode.page:73
 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>."
+"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 ""
-"Jestli nejste v regulárních výrazech zběhlí, můžete se podívat na <link href="
-"\"http://docs.python.org/howto/regex.html\">JAK NA regulární výrazy</link> v "
-"dokumentaci jazyka Python (odkazovaný text je v angličtině)."
+"Pomocí kláves <key>←</key> a <key>→</key> můžete přecházet mezi složkami, "
+"které porovnáváte. To se hodí, abyste mohli vybírat jednotlivé soubory ke "
+"zkopírování nebo ke smazání."
 
 #. (itstool) path: section/title
-#: C/text-filters.page:67
-msgid "Getting text filters right"
-msgstr "Aby textové filtry fungovaly správně"
+#: C/folder-mode.page:83
+msgid "States in folder comparisons"
+msgstr "Stavy při porovnávání složek"
 
 #. (itstool) path: section/p
-#: C/text-filters.page:69
+#: C/folder-mode.page:85
 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:"
+"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 ""
-"Udělat chybu v definici filtrování textu je lehké a podpora filtrování ze "
-"strany aplikace Meld také není úplně dodělaná. Jedním z problémů třeba je, "
-"že filtr nedokáže měnit počet řádků v souboru. Kupříkladu mějme zapnutý "
-"zabudovaný filtr <gui>Script comment</gui> a porovnejme následující soubory:"
+"Každý soubor či složka ve stromu má svůj vlastní <em>stav</em>, který vám "
+"říká, jak se liší od svého protějšku. Možné stavy jsou:"
 
-#. (itstool) path: listing/title
-#: C/text-filters.page:80
-msgid "<file>comment1.txt</file>"
-msgstr "<file>poznámky1.txt</file>"
+#. (itstool) path: table/title
+#: C/folder-mode.page:106
+msgid "Folder comparison states"
+msgstr "Stavy při porovnávání složek"
 
-#. (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#poznámka\n"
-"c\n"
-"d"
+#. (itstool) path: td/p
+#: C/folder-mode.page:110 C/vc-mode.page:85
+msgid "State"
+msgstr "stav"
 
-#. (itstool) path: listing/title
-#: C/text-filters.page:90
-msgid "<file>comment2.txt</file>"
-msgstr "<file>poznámky2.txt</file>"
+#. (itstool) path: td/p
+#: C/folder-mode.page:111 C/vc-mode.page:86
+msgid "Appearance"
+msgstr "vzhled"
 
-#. (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"
-"#poznámka"
+#. (itstool) path: td/p
+#: C/folder-mode.page:112 C/vc-mode.page:87
+msgid "Meaning"
+msgstr "význam"
 
-#. (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 ""
-"potom by řádky začínající <code>b</code> měly být zobrazeny jako shodné "
-"(komentář je zahozen), ale řádek <code>d</code> by měl být zobrazen jako "
-"lišící se od řádku s komentářem napravo. To je způsobeno tím, že na pravé "
-"straně je odstraněno <code>#comment</code>, ale řádek jako takový zůstává. "
-"<app>Meld</app> pak zobrazuje, že řádek <code>d</code> se liší od toho, co "
-"je na druhé straně zobrazeno, jako prázdný řádek."
+#. (itstool) path: td/p
+#: C/folder-mode.page:120 C/vc-mode.page:95
+msgid "Normal font"
+msgstr "normální písmo"
 
-#. (itstool) path: section/title
-#: C/text-filters.page:114
-msgid "Blank lines and filters"
-msgstr "Prázdné řádky a filtry"
-
-#. (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 ""
-"Předvolba <gui>Ignorovat změny, které přidávají nebo odstraňují prázdné "
-"řádky</gui> na kartě <gui>Filtry textu</gui> si vyžaduje vysvětlení. Když je "
-"tento speciální filtr zapnutý, pak jsou změny spočívající jen v prázdných "
-"řádcích zcela ignorovány. To může nastat, když byly současné bílé znaky v "
-"textu změněny, ale také když váš aktivní textový filtr odstranil ze změny "
-"všechen ostatní obsah a ponechal jen prázdné řádky."
-
-#. (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 ""
-"Tuto volbu můžete použít k obejití některých <link xref=\"#text-filter-"
-"problems\">problémů a omezení</link> vyplývajících z toho, že filtry nejsou "
-"schopné odstraňovat celé řádky, ale může být užitečná i sama o sobě."
-
-#. (itstool) path: page/title
-#: C/flattened-view.page:15
-msgid "Flattened view"
-msgstr "Zúžené zobrazení"
-
-#. (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 ""
-"Když si prohlížíte rozsáhle složky, může vás zajímat jen pár souborů z "
-"tisíců dalších. Z tohoto důvodu poskytuje <app>Meld</app> <em>zúžené "
-"zobrazení</em> složky. Pak se zobrazují jen soubory, které nejsou "
-"odfiltrovány (např. pomocí <link xref=\"vc-mode#vc-state-filtering\"/>) a "
-"stromová struktura je zrušena s tím, že ve sloupci <em>Umístění</em> je "
-"zobrazena cesta."
-
-#. (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 ""
-"Toto zúžené zobrazení můžete zapnout nebo vypnout zaškrtnutím položky "
-"nabídky <guiseq><gui style=\"menu\">Zobrazit</gui><gui style=\"menuitem"
-"\">Zúžené</gui></guiseq> nebo kliknutím na příslušné tlačítko <gui style="
-"\"button\">Zúžené</gui> na nástrojové liště."
-
-#. (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 "Zobrazení souborů ze správy verzí"
-
-#. (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> integruje <link xref=\"vc-supported\">řadu systémů pro "
-"správu verzí</link>, abyste si mohli prohlížet místně provedené změny a "
-"provádět jednoduché činnosti ve správě verzí. Nové porovnávání správy verzí "
-"můžete začít pomocí položky nabídky <guiseq><gui style=\"menu\">Soubor</"
-"gui><gui style=\"menuitem\">Nový…</gui></guiseq> a kliknutím na kartu <gui "
-"style=\"tab\">Správa verzí</gui>."
-
-#. (itstool) path: section/title
-#: C/vc-mode.page:30
-msgid "Version control comparisons"
-msgstr "Porovnávání správy verzí"
-
-#. (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 ""
-"Porovnání správy verzí zobrazuje rozdíly mezi obsahem vaší složky a aktuální "
-"verzí v repozitáři. Každý soubor ve vaší místní kopii má <link xref=\"#vc-"
-"state\">stav</link>, který určuje, jak se liší od kopie v repozitáři."
-
-#. (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 ""
-"Když se chcete podívat na rozdíly u konkrétního souboru, můžete jej vybrat a "
-"zmáčknout <key>Enter</key> nebo na něj dvojitě kliknout a začne <link xref="
-"\"file-mode\">porovnávání souboru</link>. Můžete take využí funkce svého "
-"systému správy verzí přes nabídku <gui style=\"menu\">Změny</gui>."
-
-#. (itstool) path: section/title
-#. (itstool) path: table/title
-#: C/vc-mode.page:56 C/vc-mode.page:81
-msgid "Version control states"
-msgstr "Stavy správy verzí"
-
-#. (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 ""
-"Každý soubor nebo složka v porovnání správy verzí má <em>stav</em> získaný "
-"přímo ze systém správy verzí. <app>Meld</app> převádí tyto různé stavy na "
-"standardní množinu stavů založené na podobném konceptu. Proto může používat "
-"mírně odlišné názvy stavů, než používá váš systém správy verzí. Možné stavy "
-"jsou:"
-
-#. (itstool) path: td/p
-#: C/vc-mode.page:85 C/folder-mode.page:110
-msgid "State"
-msgstr "stav"
-
-#. (itstool) path: td/p
-#: C/vc-mode.page:86 C/folder-mode.page:111
-msgid "Appearance"
-msgstr "vzhled"
+#. (itstool) path: td/p
+#: C/folder-mode.page:126
+msgid "The file/folder is the same across all compared folders."
+msgstr "Soubor/složka je stejná ve všech porovnávaných složkách."
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:87 C/folder-mode.page:112
-msgid "Meaning"
-msgstr "význam"
+#: C/folder-mode.page:132
+msgid "Same when filtered"
+msgstr "Stejné díky filtru"
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:95 C/folder-mode.page:120
-msgid "Normal font"
-msgstr "normální písmo"
+#: C/folder-mode.page:134
+msgid "Italics"
+msgstr "kurzíva"
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:101
-msgid "The file/folder is the same as the repository version."
-msgstr "Soubor/složka jsou stejné jako verze v repozitáři."
+#: 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 ""
+"Tyto soubory se napříč složkami liší, ale díky použití <link xref=\"text-"
+"filters\">textového filtru</link> se tyto soubory jeví jako stejné."
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:109
-msgid "Red and bold"
-msgstr "červené a tučné"
+#: C/folder-mode.page:150
+msgid "Blue and bold"
+msgstr "modré a tučné"
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:115
-msgid "This file is different to the repository version."
-msgstr "Tento soubor se liší od verze v repozitáři."
+#: C/folder-mode.page:156
+msgid "These files differ between the folders being compared."
+msgstr "Tyto soubory se liší mezi složkami, které jsou porovnávány."
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:123 C/folder-mode.page:164
+#: C/folder-mode.page:164 C/vc-mode.page:123
 msgid "Green and bold"
 msgstr "zelené a tučné"
 
 #. (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 ""
-"Tento soubor/složka jsou nové a je naplánováno jejich přidání do repozitáře."
+#: C/folder-mode.page:170
+msgid "This file/folder exists in this folder, but not in the others."
+msgstr "Tento soubor/složka existuje v této složce, ale ne v ostatních."
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:136
-msgid "Removed"
-msgstr "Odstraněno"
+#: C/folder-mode.page:176 C/vc-mode.page:167
+msgid "Missing"
+msgstr "Schází"
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:138
-msgid "Red bold text with a line through the middle"
-msgstr "přeškrtnuté červené tučné"
+#: C/folder-mode.page:178
+msgid "Greyed out text with a line through the middle"
+msgstr "zašedlý středem přeškrtnutý text"
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:144
+#: C/folder-mode.page:184
 msgid ""
-"This file/folder existed, but is scheduled to be removed from the repository."
+"This file/folder doesn't exist in this folder, but does in one of the others."
 msgstr ""
-"Tento soubor/složka existují, ale je naplánováno jejich odstranění z "
-"repozitáře."
+"Tento soubor/složka neexistuje v této složce, ale v některé z ostatních ano."
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:151
-msgid "Conflict"
-msgstr "Konflikt"
+#: C/folder-mode.page:191 C/vc-mode.page:212
+msgid "Error"
+msgstr "Chyba"
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:153
-msgid "Bright red bold text"
-msgstr "jasně červené a tučné"
+#: C/folder-mode.page:193 C/vc-mode.page:214
+msgid "Bright red with a yellow background and bold"
+msgstr "světle červený tučný text na žlutém pozadí"
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:159
+#: C/folder-mode.page:199
 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"
+"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 ""
-"Když se pokoušíte o sloučení s repozitářem, nemusí být možné vyřešit rozdíly "
-"mezi místním souborem a repozitářem a soubor se bude nacházet v konfliktu s "
-"obsahem repozitáře."
-
-#. (itstool) path: td/p
-#: C/vc-mode.page:167 C/folder-mode.page:176
-msgid "Missing"
-msgstr "Schází"
+"Při porovnávání tohoto souboru nastala chyba. Nejčastější příčinou chyb jsou "
+"oprávnění k souboru (tj. aplikaci <app>Meld</app> nebylo dovoleno soubor "
+"otevřít) a chyby v kódování názvu souboru."
 
-#. (itstool) path: td/p
-#: C/vc-mode.page:169
-msgid "Blue bold text with a line through the middle"
-msgstr "modré tučné přeškrtnuté"
+#. (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 ""
+"Můžete odfiltrovat soubory na základě jejich stavu, například aby se "
+"zobrazovaly jen soubory, které byly <em>změněné</em>. Více si o tom můžete "
+"přečíst v kapitole <link xref=\"file-filters#file-state-filter\"/>."
 
-#. (itstool) path: td/p
-#: C/vc-mode.page:175
-msgid "This file/folder should be present, but isn't."
-msgstr "Tento soubor/složka by měli existovat, ale není tomu tak."
+#. (itstool) path: section/p
+#: C/folder-mode.page:223
+msgid ""
+"Finally, the most recently modified file/folder has a small star emblem "
+"attached to it."
+msgstr ""
+"Navíc mají nejnověji změněné soubory/složky připojen symbol v podobě "
+"hvězdičky."
 
-#. (itstool) path: td/p
-#: C/vc-mode.page:181
-msgid "Ignored"
-msgstr "Ignorováno"
-
-#. (itstool) path: td/p
-#: C/vc-mode.page:183 C/vc-mode.page:199
-msgid "Greyed out text"
-msgstr "zašedlý 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 ""
-"Pro tento soubor/složku bylo určeno, že se mají ignorovat (tj. záznamem v "
-"<file>.gitignore</file>) a nejsou sledovány správou verzí."
-
-#. (itstool) path: td/p
-#: C/vc-mode.page:197
-msgid "Unversioned"
-msgstr "Neverzováno"
-
-#. (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 ""
-"Tento soubor není v systému správy verzí, nachází se pouze v místní kopii."
+#. (itstool) path: page/title
+#: C/index.page:14
+msgid "Meld Help"
+msgstr "Nápověda k aplikaci Meld"
 
-#. (itstool) path: td/p
-#: C/vc-mode.page:212 C/folder-mode.page:191
-msgid "Error"
-msgstr "Chyba"
+#. (itstool) path: section/title
+#: C/index.page:17
+msgid "Introduction"
+msgstr "Úvod"
 
-#. (itstool) path: td/p
-#: C/vc-mode.page:214 C/folder-mode.page:193
-msgid "Bright red with a yellow background and bold"
-msgstr "světle červený tučný text na žlutém pozadí"
+#. (itstool) path: section/title
+#: C/index.page:21
+msgid "Comparing Files"
+msgstr "Porovnávání souborů"
 
-#. (itstool) path: td/p
-#: C/vc-mode.page:220
-msgid "The version control system has reported a problem with this file."
-msgstr "Systém správy verzí oznámil problém s tímto souborem."
+#. (itstool) path: section/title
+#: C/index.page:25
+msgid "Comparing Folders"
+msgstr "Porovnávání složek"
 
 #. (itstool) path: section/title
-#: C/vc-mode.page:230
-msgid "Version control state filtering"
-msgstr "Filtrování stavu ve správě verzí"
+#: C/index.page:29
+msgid "Using Meld with Version Control"
+msgstr "Používání aplikace Meld se správou verzí"
 
-#. (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 ""
-"Velmi často budete chtít vidět jen soubory, u kterých bylo zjištěno, že se "
-"nějakým způsobem liší. Proto se jedná o výchozí nastavení aplikace "
-"<app>Meld</app>. Které stavy chcete vidět, můžete změnit pomocí nabídky "
-"<guiseq><gui style=\"menu\">Zobrazit</gui><gui style=\"menuitem\">Stav "
-"verze</gui></guiseq> nebo kliknutím na příslušné tlačítko <gui style=\"button"
-"\">Změněno</gui>, <gui style=\"button\">Normální</gui>, <gui style=\"button"
-"\">Neverzováno</gui> a <gui style=\"button\">Ignorováno</gui> na nástrojové "
-"liště."
+#. (itstool) path: section/title
+#: C/index.page:33
+msgid "Advanced Usage"
+msgstr "Pokročilé používání"
 
 #. (itstool) path: page/title
-#: C/folder-mode.page:16
-msgid "Getting started comparing folders"
-msgstr "Začínáme s porovnáváním složek"
+#: C/introduction.page:15
+msgid "What is Meld?"
+msgstr "Co je to Meld?"
 
 #. (itstool) path: page/p
-#: C/folder-mode.page:18
+#: C/introduction.page:16
 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."
+"<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> umožňuje porovnávat dvě nebo tři složky vedle sebe. Nové "
-"porovnávání složek začnete přes položku nabídky <guiseq><gui style=\"menu"
-"\">Soubor</gui><gui style=\"menuitem\">Nový…</gui></guiseq> a kliknutím na "
-"kartu <gui style=\"tab\">Porovnávání složek</gui>."
+"<app>Meld</app> je nástroj sloužící k porovnávání souborů a složek a řešení "
+"rozdílů mezi nimi. Hodí se také k porovnání změn provedených v rámci systémů "
+"pro správu verzí."
 
 #. (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 ""
-"Vybrané složky budou zobrazeny jako stromové struktury vedle sebe a rozdíly "
-"mezi soubory v každé složce budou zvýrazněny. Soubory v každé ze složek "
-"můžete kopírovat a mazat, případně si u textových souborů zobrazit rozdíly "
-"podrobně."
-
-#. (itstool) path: section/title
-#: C/folder-mode.page:36
-msgid "The folder comparison view"
-msgstr "Zobrazení porovnání složek"
-
-#. (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 ""
-"Hlavními částmi v porovnání složek jsou stromy zobrazující porovnávané "
-"složky. V těchto porovnáních se můžete snadno <link xref=\"#folder-navigation"
-"\">pohybovat</link>, abyste našli změny, které vás zajímají. Když vyberete "
-"soubor nebo složku, na stavové liště ve spodní části okna se zobrazí "
-"podrobné informace. Zmáčknutím klávesy <key>Enter</key> na vybraném souboru "
-"nebo dvojitým kliknutím na libovolném souboru se otevře <link xref=\"file-"
-"mode\">porovnávání souboru</link> vedle sebe v nové kartě, ale rozumné "
-"použití to má jen pro textové soubory."
-
-#. (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 ""
-"Po levé i pravé straně okna se nachází lišty, které vám zobrazují jednoduchý "
-"barevný přehled výsledků porovnávání. Každý soubor nebo složka v porovnání "
-"odpovídají malému úseku lišty, přitom ale <app>Meld</app> nezobrazuje "
-"<em>stejné</em> soubory, takže jsou lépe vidět opravdu podstatné rozdíly. Na "
-"lištu můžete kdekoliv kliknout a dostat se tak přímo na místo v porovnání."
-
-#. (itstool) path: section/title
-#: C/folder-mode.page:63
-msgid "Navigating folder comparisons"
-msgstr "Pohyb v porovnávání složek"
-
-#. (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 ""
-"Mezi změněnými soubory (to jsou všechny soubory/složky, které <em>nejsou</"
-"em> označené jako shodné) se můžete pohybovat pomocí položek nabídky "
-"<guiseq><gui style=\"menu\">Změny</gui><gui style=\"menuitem\">Předchozí "
-"změna</gui></guiseq> a <guiseq><gui style=\"menu\">Změny</gui><gui style="
-"\"menuitem\">Následující změna</gui></guiseq> nebo použít příslušné tlačítko "
-"na nástrojové liště."
-
-#. (itstool) path: section/p
-#: C/folder-mode.page:73
+#: C/introduction.page:22
 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."
+"<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 ""
-"Pomocí kláves <key>←</key> a <key>→</key> můžete přecházet mezi složkami, "
-"které porovnáváte. To se hodí, abyste mohli vybírat jednotlivé soubory ke "
-"zkopírování nebo ke smazání."
-
-#. (itstool) path: section/title
-#: C/folder-mode.page:83
-msgid "States in folder comparisons"
-msgstr "Stavy při porovnávání složek"
+"<app>Meld</app> zobrazuje rozdíly mezi dvěma nebo třemi soubory (či dvěma "
+"nebo třemi složkami) a umožňuje mezi nimi přesouvat obsah nebo soubory ručně "
+"upravit. Cílem aplikace <app>Meld</app> je pomoci vývojářům porovnávat a "
+"slučovat soubory se zdrojovými kódy a získat vizuální přehled o změnách v "
+"jejich oblíbeném systému správy verzí."
 
-#. (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 ""
-"Každý soubor či složka ve stromu má svůj vlastní <em>stav</em>, který vám "
-"říká, jak se liší od svého protějšku. Možné stavy jsou:"
+#. (itstool) path: page/title
+#: C/keyboard-shortcuts.page:15
+msgid "Keyboard shortcuts"
+msgstr "Klávesové zkratky"
 
 #. (itstool) path: table/title
-#: C/folder-mode.page:106
-msgid "Folder comparison states"
-msgstr "Stavy při porovnávání složek"
+#: C/keyboard-shortcuts.page:18
+msgid "Shortcuts for working with files and comparisons"
+msgstr "Klávesové zkratky pro práci se soubory a pro porovnávání"
 
 #. (itstool) path: td/p
-#: C/folder-mode.page:126
-msgid "The file/folder is the same across all compared folders."
-msgstr "Soubor/složka je stejná ve všech porovnávaných složkách."
+#: C/keyboard-shortcuts.page:22 C/keyboard-shortcuts.page:56
+#: C/keyboard-shortcuts.page:109 C/keyboard-shortcuts.page:131
+#: C/keyboard-shortcuts.page:153
+msgid "Shortcut"
+msgstr "klávesová zkratka"
 
 #. (itstool) path: td/p
-#: C/folder-mode.page:132
-msgid "Same when filtered"
-msgstr "Stejné díky filtru"
+#: C/keyboard-shortcuts.page:22 C/keyboard-shortcuts.page:56
+#: C/keyboard-shortcuts.page:109 C/keyboard-shortcuts.page:131
+#: C/keyboard-shortcuts.page:153
+msgid "Description"
+msgstr "popis"
 
 #. (itstool) path: td/p
-#: C/folder-mode.page:134
-msgid "Italics"
-msgstr "kurzíva"
+#: 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/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 ""
-"Tyto soubory se napříč složkami liší, ale díky použití <link xref=\"text-"
-"filters\">textového filtru</link> se tyto soubory jeví jako stejné."
-
-#. (itstool) path: td/p
-#: C/folder-mode.page:150
-msgid "Blue and bold"
-msgstr "modré a tučné"
-
-#. (itstool) path: td/p
-#: C/folder-mode.page:156
-msgid "These files differ between the folders being compared."
-msgstr "Tyto soubory se liší mezi složkami, které jsou porovnávány."
-
-#. (itstool) path: td/p
-#: C/folder-mode.page:170
-msgid "This file/folder exists in this folder, but not in the others."
-msgstr "Tento soubor/složka existuje v této složce, ale ne v ostatních."
-
-#. (itstool) path: td/p
-#: C/folder-mode.page:178
-msgid "Greyed out text with a line through the middle"
-msgstr "zašedlý středem přeškrtnutý 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 ""
-"Tento soubor/složka neexistuje v této složce, ale v některé z ostatních ano."
-
-#. (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 ""
-"Při porovnávání tohoto souboru nastala chyba. Nejčastější příčinou chyb jsou "
-"oprávnění k souboru (tj. aplikaci <app>Meld</app> nebylo dovoleno soubor "
-"otevřít) a chyby v kódování názvu souboru."
-
-#. (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 ""
-"Můžete odfiltrovat soubory na základě jejich stavu, například aby se "
-"zobrazovaly jen soubory, které byly <em>změněné</em>. Více si o tom můžete "
-"přečíst v kapitole <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 a small star emblem "
-"attached to it."
-msgstr ""
-"Navíc mají nejnověji změněné soubory/složky připojen symbol v podobě "
-"hvězdičky."
-
-#. (itstool) path: page/title
-#: C/resolving-conflicts.page:15
-msgid "Resolving merge conflicts"
-msgstr "Řešení konfliktů při slučování"
-
-#. (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 ""
-"Jednou z nejlepších věcí na aplikaci <app>Meld</app> je řešení konfliktů, "
-"které vznikají při slučování rozdílných větví."
-
-#. (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 ""
-"Například, když používáte <app>Git</app>, <cmd>git mergtool</app> spustí "
-"„pomocníka se slučováním“. <app>Meld</app> je jedním z možných takovýchto "
-"pomocníků. Jestli chcete, aby <app>git mergetool</app> používal <app>Meld</"
-"app> jako výchozího pomocníka, můžete přidat"
-
-#. (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 ""
-"do souboru <file>.git/gitconfig</file>. Podrobnější informace viz příručka "
-"ke <app>git mergetool</app>."
-
-#. (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 "Předvolby Meld"
-
-#. (itstool) path: terms/title
-#: C/preferences.page:18
-msgid "Editor preferences"
-msgstr "Předvolby editoru"
-
-#. (itstool) path: item/title
-#: C/preferences.page:20
-msgid "Editor command"
-msgstr "Příkaz editoru"
-
-#. (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 ""
-"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>)."
-
-#. (itstool) path: terms/title
-#: C/preferences.page:31
-msgid "Folder Comparison preferences"
-msgstr "Předvolby porovnávání složek"
-
-#. (itstool) path: item/title
-#: C/preferences.page:33
-msgid "Apply text filters during folder comparisons"
-msgstr "Použití textových filtrů při porovnávání složek"
-
-#. (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 ""
-"Když se porovnávají soubory v režimu porovnávání složek, mohou být na obsah "
-"souborů použity filtry a další možnosti práce s textem. Pokud je tato volba "
-"zapnutá, všechny zapnuté textové filtry se použijí, bude příslušně použita "
-"volba ořezávání prázných řádků a rozdíly v zakončeních řádků budou "
-"ignorovány."
-
-#. (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 ""
-"Zapnutí této volby znamená, že <app>Meld</app> musí během porovnávání složek "
-"načíst všechny nebinární soubory kompletně do paměti. U rozsáhlých textových "
-"souborů to může způsobit problémy v podobě zpomalení a velké spotřeby paměti."
-
-#. (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 ""
-"Tato volba má význam, jen když není zapnuto „Porovnávat soubory jen na "
-"základě velikosti a časového razítka“."
-
-#. (itstool) path: page/title
-#: C/keyboard-shortcuts.page:15
-msgid "Keyboard shortcuts"
-msgstr "Klávesové zkratky"
-
-#. (itstool) path: table/title
-#: C/keyboard-shortcuts.page:18
-msgid "Shortcuts for working with files and comparisons"
-msgstr "Klávesové zkratky pro práci se soubory a pro porovnávání"
-
-#. (itstool) path: td/p
-#: C/keyboard-shortcuts.page:22 C/keyboard-shortcuts.page:56
-#: C/keyboard-shortcuts.page:109 C/keyboard-shortcuts.page:131
-#: C/keyboard-shortcuts.page:153
-msgid "Shortcut"
-msgstr "klávesová zkratka"
-
-#. (itstool) path: td/p
-#: C/keyboard-shortcuts.page:22 C/keyboard-shortcuts.page:56
-#: C/keyboard-shortcuts.page:109 C/keyboard-shortcuts.page:131
-#: C/keyboard-shortcuts.page:153
-msgid "Description"
-msgstr "popis"
-
-#. (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 "Začít nové porovnávání"
+#: C/keyboard-shortcuts.page:30
+msgid "Start a new comparison."
+msgstr "Začít nové porovnávání"
 
 #. (itstool) path: td/p
 #: C/keyboard-shortcuts.page:33
@@ -1698,153 +1162,710 @@ msgid "Shortcuts for folder comparison"
 msgstr "Klávesové zkratky pro porovnávání složek"
 
 #. (itstool) path: td/p
-#: C/keyboard-shortcuts.page:115
-msgid "<keyseq><key>+</key></keyseq>"
-msgstr "<keyseq><key>+</key></keyseq>"
+#: C/keyboard-shortcuts.page:115
+msgid "<keyseq><key>+</key></keyseq>"
+msgstr "<keyseq><key>+</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:116
+msgid "Expand the current folder."
+msgstr "Rozbalit aktuální složku"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:119
+msgid "<keyseq><key>-</key></keyseq>"
+msgstr "<keyseq><key>-</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:120
+msgid "Collapse the current folder."
+msgstr "Sbalit aktuální složku"
+
+#. (itstool) path: table/title
+#: C/keyboard-shortcuts.page:127
+msgid "Shortcuts for view settings"
+msgstr "Klávesové zkratky pro zobrazení nastavení"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:137
+msgid "<keyseq><key>Escape</key></keyseq>"
+msgstr "<keyseq><key>Esc</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:138
+msgid "Stop the current comparison."
+msgstr "Zastavit aktuální porovnávání"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:141
+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:142
+msgid "Refresh the current comparison."
+msgstr "Aktualizovat aktuální porovnávání"
+
+#. (itstool) path: table/title
+#: C/keyboard-shortcuts.page:149
+msgid "Shortcuts for help"
+msgstr "Klávesové zkratky pro nápovědu"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:159
+msgid "<keyseq><key>F1</key></keyseq>"
+msgstr "<keyseq><key>F1</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:160
+msgid "Open <app>Meld</app>'s user manual."
+msgstr "Otevřít uživatelskou příručku <app>Meld</app>"
+
+#. (itstool) path: p/link
+#: C/legal.xml:4
+msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
+msgstr "Creative Commons Attribution-Share Alike 3.0 Unported License"
+
+#. (itstool) path: license/p
+#: C/legal.xml:3
+msgid "This work is licensed under a <_:link-1/>."
+msgstr "Toto dílo je licencováno pod <_:link-1/>."
+
+#. (itstool) path: license/p
+#: C/legal.xml:6
+msgid ""
+"As a special exception, the copyright holders give you permission to copy, "
+"modify, and distribute the example code contained in this document under the "
+"terms of your choosing, without restriction."
+msgstr ""
+"Jako zvláštní výjimka se vám držitelem autorských práv uděluje svolení "
+"kopírovat, upravovat a šířit ukázkový kód obsažený v tomto dokumentu za "
+"podmínek, které si zvolíte, bez dalších omezení."
+
+#. (itstool) path: page/title
+#: C/missing-functionality.page:15
+msgid "Things that <app>Meld</app> doesn't do"
+msgstr "Věci, které <app>Meld</app> nedělá"
+
+#. (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 ""
+"Strávili jste hodinu a půl prozkoumáváním aplikace ve snaze najít, jak se "
+"udělá jedna konkrétní věc, protože jste si byli <em>jistí</em>, že to musí "
+"nějak jít?"
+
+#. (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 ""
+"Tato část uvádí několik běžných věcí, které <app>Meld</app> <em>nedělá</em>, "
+"ať už záměrně nebo proto, že na ně ještě nebyl čas."
+
+#. (itstool) path: section/title
+#: C/missing-functionality.page:30
+msgid "Aligning changes by adding lines"
+msgstr "Zarovnávání změn přidáním řádků"
+
+#. (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 ""
+"Když <app>Meld</app> zobrazuje rozdíly mezi soubory, zobrazuje oba soubory "
+"stejným způsobem jako běžný textový editor. <em>Nevkládá</em> žádné "
+"dodatečné řádky, aby levá a pravá strana se změnami měly stejnou velikost. "
+"Není k dispozici ani žádná volba, která by to dělala."
+
+#. (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 "Předvolby Meld"
+
+#. (itstool) path: terms/title
+#: C/preferences.page:18
+msgid "Editor preferences"
+msgstr "Předvolby editoru"
+
+#. (itstool) path: item/title
+#: C/preferences.page:20
+msgid "Editor command"
+msgstr "Příkaz editoru"
+
+#. (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 ""
+"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>)."
+
+#. (itstool) path: terms/title
+#: C/preferences.page:31
+msgid "Folder Comparison preferences"
+msgstr "Předvolby porovnávání složek"
+
+#. (itstool) path: item/title
+#: C/preferences.page:33
+msgid "Apply text filters during folder comparisons"
+msgstr "Použití textových filtrů při porovnávání složek"
+
+#. (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 ""
+"Když se porovnávají soubory v režimu porovnávání složek, mohou být na obsah "
+"souborů použity filtry a další možnosti práce s textem. Pokud je tato volba "
+"zapnutá, všechny zapnuté textové filtry se použijí, bude příslušně použita "
+"volba ořezávání prázných řádků a rozdíly v zakončeních řádků budou "
+"ignorovány."
+
+#. (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 ""
+"Zapnutí této volby znamená, že <app>Meld</app> musí během porovnávání složek "
+"načíst všechny nebinární soubory kompletně do paměti. U rozsáhlých textových "
+"souborů to může způsobit problémy v podobě zpomalení a velké spotřeby paměti."
+
+#. (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 ""
+"Tato volba má význam, jen když není zapnuto „Porovnávat soubory jen na "
+"základě velikosti a časového razítka“."
+
+#. (itstool) path: page/title
+#: C/resolving-conflicts.page:15
+msgid "Resolving merge conflicts"
+msgstr "Řešení konfliktů při slučování"
+
+#. (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 ""
+"Jednou z nejlepších věcí na aplikaci <app>Meld</app> je řešení konfliktů, "
+"které vznikají při slučování rozdílných větví."
+
+#. (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 ""
+"Například, když používáte <app>Git</app>, <cmd>git mergtool</app> spustí "
+"„pomocníka se slučováním“. <app>Meld</app> je jedním z možných takovýchto "
+"pomocníků. Jestli chcete, aby <app>git mergetool</app> používal <app>Meld</"
+"app> jako výchozího pomocníka, můžete přidat"
+
+#. (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 ""
+"do souboru <file>.git/gitconfig</file>. Podrobnější informace viz příručka "
+"ke <app>git mergetool</app>."
+
+#. (itstool) path: page/title
+#: C/text-filters.page:17
+msgid "Filtering out text"
+msgstr "Odfiltrování textu"
+
+#. (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 ""
+"Když porovnáváte několik souborů, můžete v nich mít části textu, ve kterých "
+"nejsou rozdíly důležité. Například se můžete chtít zaměřit na změny v části "
+"s kódem a ignorovat změny v řádcích s komentáři. Díky textovým filtrům stačí "
+"aplikaci <app>Meld</app> říci, aby při zobrazování rozdílů mezi soubory "
+"ignorovala text, který vyhovuje nějakému vzoru (tj. regulárnímu výrazu)."
+
+#. (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 ""
+"Textové filtry neovlivňují jen porovnání souborů, ale i porovnání složek. "
+"Více podrobností najdete v <link xref=\"file-filters\">poznámkách k "
+"filtrování souborů</link>."
+
+#. (itstool) path: section/title
+#: C/text-filters.page:37
+msgid "Adding and using text filters"
+msgstr "Přidávání a používání textových filtrů"
+
+#. (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 ""
+"Textové filtry můžete zapínat a vypínat na kartě <gui>Filtry textu</gui> v "
+"dialogovém okně <gui>Předvolby</gui>. <app>Meld</app> má předdefinováno "
+"několik jednoduchých filtrů, které mohou být užitečné, a k tomu si můžete "
+"vytvořit své vlastní."
+
+#. (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 ""
+"V aplikaci <app>Meld</app> nejsou textové filtry nic jiného, než regulární "
+"výrazy spouštěné vůči textu nebo souborům, které porovnáváte. Text, který "
+"regulárnímu výrazu vyhovuje, je během porovnávání ignorován. V zobrazení "
+"porovnání sice takovýto text stále uvidíte, ale nebude brán v úvahu při "
+"hledání rozdílů. Textové filtry se použijí v určeném pořadí, takže je možné, "
+"aby první filtr odebral text tak, aby zbytek vyhovoval druhému filtru atd."
+
+#. (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 ""
+"Jestli nejste v regulárních výrazech zběhlí, můžete se podívat na <link href="
+"\"http://docs.python.org/howto/regex.html\">JAK NA regulární výrazy</link> v "
+"dokumentaci jazyka Python (odkazovaný text je v angličtině)."
+
+#. (itstool) path: section/title
+#: C/text-filters.page:67
+msgid "Getting text filters right"
+msgstr "Aby textové filtry fungovaly správně"
+
+#. (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 ""
+"Udělat chybu v definici filtrování textu je lehké a podpora filtrování ze "
+"strany aplikace Meld také není úplně dodělaná. Jedním z problémů třeba je, "
+"že filtr nedokáže měnit počet řádků v souboru. Kupříkladu mějme zapnutý "
+"zabudovaný filtr <gui>Script comment</gui> a porovnejme následující soubory:"
+
+#. (itstool) path: listing/title
+#: C/text-filters.page:80
+msgid "<file>comment1.txt</file>"
+msgstr "<file>poznámky1.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#poznámka\n"
+"c\n"
+"d"
+
+#. (itstool) path: listing/title
+#: C/text-filters.page:90
+msgid "<file>comment2.txt</file>"
+msgstr "<file>poznámky2.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"
+"#poznámka"
+
+#. (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 ""
+"potom by řádky začínající <code>b</code> měly být zobrazeny jako shodné "
+"(komentář je zahozen), ale řádek <code>d</code> by měl být zobrazen jako "
+"lišící se od řádku s komentářem napravo. To je způsobeno tím, že na pravé "
+"straně je odstraněno <code>#comment</code>, ale řádek jako takový zůstává. "
+"<app>Meld</app> pak zobrazuje, že řádek <code>d</code> se liší od toho, co "
+"je na druhé straně zobrazeno, jako prázdný řádek."
+
+#. (itstool) path: section/title
+#: C/text-filters.page:114
+msgid "Blank lines and filters"
+msgstr "Prázdné řádky a filtry"
+
+#. (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 ""
+"Předvolba <gui>Ignorovat změny, které přidávají nebo odstraňují prázdné "
+"řádky</gui> na kartě <gui>Filtry textu</gui> si vyžaduje vysvětlení. Když je "
+"tento speciální filtr zapnutý, pak jsou změny spočívající jen v prázdných "
+"řádcích zcela ignorovány. To může nastat, když byly současné bílé znaky v "
+"textu změněny, ale také když váš aktivní textový filtr odstranil ze změny "
+"všechen ostatní obsah a ponechal jen prázdné řádky."
+
+#. (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 ""
+"Tuto volbu můžete použít k obejití některých <link xref=\"#text-filter-"
+"problems\">problémů a omezení</link> vyplývajících z toho, že filtry nejsou "
+"schopné odstraňovat celé řádky, ale může být užitečná i sama o sobě."
+
+#. (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 "Zobrazení souborů ze správy verzí"
+
+#. (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> integruje <link xref=\"vc-supported\">řadu systémů pro "
+"správu verzí</link>, abyste si mohli prohlížet místně provedené změny a "
+"provádět jednoduché činnosti ve správě verzí. Nové porovnávání správy verzí "
+"můžete začít pomocí položky nabídky <guiseq><gui style=\"menu\">Soubor</"
+"gui><gui style=\"menuitem\">Nový…</gui></guiseq> a kliknutím na kartu <gui "
+"style=\"tab\">Správa verzí</gui>."
+
+#. (itstool) path: section/title
+#: C/vc-mode.page:30
+msgid "Version control comparisons"
+msgstr "Porovnávání správy verzí"
+
+#. (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 ""
+"Porovnání správy verzí zobrazuje rozdíly mezi obsahem vaší složky a aktuální "
+"verzí v repozitáři. Každý soubor ve vaší místní kopii má <link xref=\"#vc-"
+"state\">stav</link>, který určuje, jak se liší od kopie v repozitáři."
+
+#. (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 ""
+"Když se chcete podívat na rozdíly u konkrétního souboru, můžete jej vybrat a "
+"zmáčknout <key>Enter</key> nebo na něj dvojitě kliknout a začne <link xref="
+"\"file-mode\">porovnávání souboru</link>. Můžete take využí funkce svého "
+"systému správy verzí přes nabídku <gui style=\"menu\">Změny</gui>."
+
+#. (itstool) path: section/title
+#. (itstool) path: table/title
+#: C/vc-mode.page:56 C/vc-mode.page:81
+msgid "Version control states"
+msgstr "Stavy správy verzí"
+
+#. (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 ""
+"Každý soubor nebo složka v porovnání správy verzí má <em>stav</em> získaný "
+"přímo ze systém správy verzí. <app>Meld</app> převádí tyto různé stavy na "
+"standardní množinu stavů založené na podobném konceptu. Proto může používat "
+"mírně odlišné názvy stavů, než používá váš systém správy verzí. Možné stavy "
+"jsou:"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:101
+msgid "The file/folder is the same as the repository version."
+msgstr "Soubor/složka jsou stejné jako verze v repozitáři."
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:109
+msgid "Red and bold"
+msgstr "červené a tučné"
 
 #. (itstool) path: td/p
-#: C/keyboard-shortcuts.page:116
-msgid "Expand the current folder."
-msgstr "Rozbalit aktuální složku"
+#: C/vc-mode.page:115
+msgid "This file is different to the repository version."
+msgstr "Tento soubor se liší od verze v repozitáři."
 
 #. (itstool) path: td/p
-#: C/keyboard-shortcuts.page:119
-msgid "<keyseq><key>-</key></keyseq>"
-msgstr "<keyseq><key>-</key></keyseq>"
+#: C/vc-mode.page:129
+msgid ""
+"This file/folder is new, and is scheduled to be added to the repository."
+msgstr ""
+"Tento soubor/složka jsou nové a je naplánováno jejich přidání do repozitáře."
 
 #. (itstool) path: td/p
-#: C/keyboard-shortcuts.page:120
-msgid "Collapse the current folder."
-msgstr "Sbalit aktuální složku"
+#: C/vc-mode.page:136
+msgid "Removed"
+msgstr "Odstraněno"
 
-#. (itstool) path: table/title
-#: C/keyboard-shortcuts.page:127
-msgid "Shortcuts for view settings"
-msgstr "Klávesové zkratky pro zobrazení nastavení"
+#. (itstool) path: td/p
+#: C/vc-mode.page:138
+msgid "Red bold text with a line through the middle"
+msgstr "přeškrtnuté červené tučné"
 
 #. (itstool) path: td/p
-#: C/keyboard-shortcuts.page:137
-msgid "<keyseq><key>Escape</key></keyseq>"
-msgstr "<keyseq><key>Esc</key></keyseq>"
+#: C/vc-mode.page:144
+msgid ""
+"This file/folder existed, but is scheduled to be removed from the repository."
+msgstr ""
+"Tento soubor/složka existují, ale je naplánováno jejich odstranění z "
+"repozitáře."
 
 #. (itstool) path: td/p
-#: C/keyboard-shortcuts.page:138
-msgid "Stop the current comparison."
-msgstr "Zastavit aktuální porovnávání"
+#: C/vc-mode.page:151
+msgid "Conflict"
+msgstr "Konflikt"
 
 #. (itstool) path: td/p
-#: C/keyboard-shortcuts.page:141
-msgid "<keyseq><key>Ctrl</key><key>R</key></keyseq>"
-msgstr "<keyseq><key>Ctrl</key><key>R</key></keyseq>"
+#: C/vc-mode.page:153
+msgid "Bright red bold text"
+msgstr "jasně červené a tučné"
 
 #. (itstool) path: td/p
-#: C/keyboard-shortcuts.page:142
-msgid "Refresh the current comparison."
-msgstr "Aktualizovat aktuální porovnávání"
+#: 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 ""
+"Když se pokoušíte o sloučení s repozitářem, nemusí být možné vyřešit rozdíly "
+"mezi místním souborem a repozitářem a soubor se bude nacházet v konfliktu s "
+"obsahem repozitáře."
 
-#. (itstool) path: table/title
-#: C/keyboard-shortcuts.page:149
-msgid "Shortcuts for help"
-msgstr "Klávesové zkratky pro nápovědu"
+#. (itstool) path: td/p
+#: C/vc-mode.page:169
+msgid "Blue bold text with a line through the middle"
+msgstr "modré tučné přeškrtnuté"
 
 #. (itstool) path: td/p
-#: C/keyboard-shortcuts.page:159
-msgid "<keyseq><key>F1</key></keyseq>"
-msgstr "<keyseq><key>F1</key></keyseq>"
+#: C/vc-mode.page:175
+msgid "This file/folder should be present, but isn't."
+msgstr "Tento soubor/složka by měli existovat, ale není tomu tak."
 
 #. (itstool) path: td/p
-#: C/keyboard-shortcuts.page:160
-msgid "Open <app>Meld</app>'s user manual."
-msgstr "Otevřít uživatelskou příručku <app>Meld</app>"
+#: C/vc-mode.page:181
+msgid "Ignored"
+msgstr "Ignorováno"
 
-#. (itstool) path: page/title
-#: C/file-changes.page:16
-msgid "Dealing with changes"
-msgstr "Práce se změnami"
+#. (itstool) path: td/p
+#: C/vc-mode.page:183 C/vc-mode.page:199
+msgid "Greyed out text"
+msgstr "zašedlý text"
 
-#. (itstool) path: page/p
-#: C/file-changes.page:18
+#. (itstool) path: td/p
+#: C/vc-mode.page:189
 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."
+"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 ""
-"<app>Meld</app> se chová ke změnám mezi soubory jako k seznamu <em>bloků "
-"změn</em>, zkráceně jen <em>změn</em>. Každá změna sestává ze skupiny řádků, "
-"které si mezi soubory odpovídají. Protože právě tyto změny jsou obvykle to, "
-"co vás zajímá, poskytuje <app>Meld</app> nástroje pro přecházení mezi nimi a "
-"pro jejich úpravy. Tyto nástroje najdete v nabídce <gui style=\"menu"
-"\">Změny</gui>."
+"Pro tento soubor/složku bylo určeno, že se mají ignorovat (tj. záznamem v "
+"<file>.gitignore</file>) a nejsou sledovány správou verzí."
 
-#. (itstool) path: section/title
-#: C/file-changes.page:30
-msgid "Navigating between changes"
-msgstr "Pohyb mezi změnami"
+#. (itstool) path: td/p
+#: C/vc-mode.page:197
+msgid "Unversioned"
+msgstr "Neverzováno"
 
-#. (itstool) path: section/p
-#: C/file-changes.page:32
+#. (itstool) path: td/p
+#: C/vc-mode.page:205
 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."
+"This file is not in the version control system; it is only in the local copy."
 msgstr ""
-"Mezi změnami se můžete pohybovat pomocí položek nabídky <guiseq><gui style="
-"\"menu\">Změny</gui><gui style=\"menuitem\">Předchozí změna</gui></guiseq> a "
-"<guiseq><gui style=\"menu\">Změny</gui><gui style=\"menuitem\">Následující "
-"změna</gui></guiseq>. Můžete také použít kolečko myši nad středovou lištou "
-"se změnami."
+"Tento soubor není v systému správy verzí, nachází se pouze v místní kopii."
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:220
+msgid "The version control system has reported a problem with this file."
+msgstr "Systém správy verzí oznámil problém s tímto souborem."
 
 #. (itstool) path: section/title
-#: C/file-changes.page:46
-msgid "Changing changes"
-msgstr "Změna změn"
+#: C/vc-mode.page:230
+msgid "Version control state filtering"
+msgstr "Filtrování stavu ve správě verzí"
 
 #. (itstool) path: section/p
-#: C/file-changes.page:48
+#: C/vc-mode.page:232
 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."
+"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 ""
-"Mimo přímých úprav textu vám <app>Meld</app> poskytuje nástroje pro přesun, "
-"kopírování nebo mazání jednotlivých rozdílů mezi soubory. Lišta mezi dvěma "
-"soubory nejen zobrazuje, které části těchto souborů si navzájem odpovídají, "
-"ale také umožňuje cíleně slučovat nebo mazat rozdílové změny kliknutím na "
-"ikonu se šipkou nebo křížkem vedle začátku každé změny."
+"Velmi často budete chtít vidět jen soubory, u kterých bylo zjištěno, že se "
+"nějakým způsobem liší. Proto se jedná o výchozí nastavení aplikace "
+"<app>Meld</app>. Které stavy chcete vidět, můžete změnit pomocí nabídky "
+"<guiseq><gui style=\"menu\">Zobrazit</gui><gui style=\"menuitem\">Stav "
+"verze</gui></guiseq> nebo kliknutím na příslušné tlačítko <gui style=\"button"
+"\">Změněno</gui>, <gui style=\"button\">Normální</gui>, <gui style=\"button"
+"\">Neverzováno</gui> a <gui style=\"button\">Ignorováno</gui> na nástrojové "
+"liště."
 
-#. (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 ""
-"Výchozí činností je <em>nahrazení</em>. Tím se nahradí obsah odpovídající "
-"změny aktuální změnou."
+#. (itstool) path: info/title
+#: C/vc-supported.page:5
+msgctxt "sort"
+msgid "3"
+msgstr "3"
 
-#. (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 ""
-"Přidržením klávesy <key>Shift</key> změníte aktuální činnost na <em>smazat</"
-"em>. Touto činností se smažou současné změny."
+#. (itstool) path: page/title
+#: C/vc-supported.page:15
+msgid "Supported version control systems"
+msgstr "Podporované systémy pro správu verzí"
 
-#. (itstool) path: section/p
-#: C/file-changes.page:62
+#. (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> podporuje širokou škálu systémů pro správu verzí:"
+
+#. (itstool) path: item/p
+#: C/vc-supported.page:22
+msgid "Bazaar"
+msgstr "Bazaar"
+
+#. (itstool) path: item/p
+#: C/vc-supported.page:23
+msgid "Darcs"
+msgstr "Darcs"
+
+#. (itstool) path: item/p
+#: C/vc-supported.page:24
+msgid "Git"
+msgstr "Git"
+
+#. (itstool) path: item/p
+#: C/vc-supported.page:25
+msgid "Mercurial"
+msgstr "Mercurial"
+
+#. (itstool) path: item/p
+#: C/vc-supported.page:26
+msgid "SVN"
+msgstr "SVN"
+
+# Poznámky:
+# Přidat poznámku
+#
+# Vybalené komentáře:
+# (itstool) path: page/p
+#
+#. (itstool) path: page/p
+#: C/vc-supported.page:29
 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."
+"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 ""
-"Přidržením klávesy <key>Ctrl</key> změníte aktuální činnost na <em>vložit</"
-"em>. Touto činností se současné změny vloží nad nebo pod (podle výběru) "
-"odpovídající změny."
-
+"Méně běžné systémy pro správu verzí nebo méně obvyklá nastavení nemusí být "
+"úplně otestovaná. Případné chyby v podpoře správy verzí prosím nahlaste na "
+"<link href=\"https://bugzilla.gnome.org/\">GNOME bugzilla</link>."
diff --git a/help/de/de.po b/help/de/de.po
index b3085ee9..2d4c1bd7 100644
--- a/help/de/de.po
+++ b/help/de/de.po
@@ -8,134 +8,211 @@
 msgid ""
 msgstr ""
 "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"
+"POT-Creation-Date: 2017-09-13 16:58+0000\n"
+"PO-Revision-Date: 2017-10-10 20:49+0200\n"
+"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\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.8.6\n"
+"X-Generator: Poedit 2.0.3\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
 msgid "translator-credits"
 msgstr ""
-"Mario Blättermann <mario.blaettermann@gmail.com>, 2009, 2016\n"
+"Mario Blättermann <mario.blaettermann@gmail.com>, 2009, 2016, 2017\n"
 "Benjamin Steinwender <b@stbe.at>, 2014-2015\n"
 "Christian Kirbach <christian.kirbach@gmail.com>, 2014, 2016"
 
 #. (itstool) path: info/title
-#: C/vc-supported.page:5
+#: C/command-line.page:5 C/file-changes.page:5 C/file-filters.page:5
+#: C/flattened-view.page:5 C/keyboard-shortcuts.page:5
+#: C/resolving-conflicts.page:5 C/text-filters.page:5
 msgctxt "sort"
-msgid "3"
-msgstr "3"
+msgid "2"
+msgstr "2"
 
 #. (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
+#: C/command-line.page:10 C/file-changes.page:10 C/file-filters.page:10
+#: C/file-mode.page:11 C/flattened-view.page:10 C/folder-mode.page:10
+#: C/index.page:8 C/introduction.page:10 C/keyboard-shortcuts.page:10
+#: C/missing-functionality.page:10 C/preferences.page:10
+#: C/resolving-conflicts.page:10 C/text-filters.page:11 C/vc-mode.page:10
+#: C/vc-supported.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
+#: C/command-line.page:12 C/file-changes.page:12 C/file-filters.page:12
+#: C/file-mode.page:13 C/flattened-view.page:12 C/folder-mode.page:12
+#: C/index.page:10 C/introduction.page:12 C/keyboard-shortcuts.page:12
+#: C/missing-functionality.page:12 C/resolving-conflicts.page:12
+#: C/text-filters.page:13 C/vc-mode.page:12 C/vc-supported.page:12
 msgid "2012"
 msgstr "2012"
 
 #. (itstool) path: page/title
-#: C/vc-supported.page:15
-msgid "Supported version control systems"
-msgstr "Unterstützte Versionskontrollsysteme"
+#: C/command-line.page:15
+msgid "Command line usage"
+msgstr "Befehlszeilenverwendung"
 
 #. (itstool) path: page/p
-#: C/vc-supported.page:17
-msgid "<app>Meld</app> supports a wide range of version control systems:"
+#: 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 ""
-"<app>Meld</app> unterstützt eine große Anzahl von Versionskontrollsystemen:"
+"Wenn Sie <app>Meld</app> von der Befehlszeile starten, können Sie angeben, "
+"was beim Starten zu tun ist."
 
-#. (itstool) path: item/p
-#: C/vc-supported.page:22
-msgid "Arch"
-msgstr "Arch"
+#. (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 einen Zwei- oder Drei-Wege <link xref=\"file-mode\">Datei-Vergleich</"
+"link>, starten Sie <app>Meld</app> mit <cmd>meld <var>datei1</var> "
+"<var>datei2</var></cmd> beziehungsweise mit <cmd>meld <var>datei1</var> "
+"<var>datei2</var> <var>datei3</var></cmd>."
 
-#. (itstool) path: item/p
-#: C/vc-supported.page:23
-msgid "Bazaar"
-msgstr "Bazaar"
+#. (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 einen Zwei- oder Drei-Wege <link xref=\"file-mode\">Ordner-Vergleich</"
+"link>, starten Sie <app>Meld</app> mit <cmd>meld <var>ordner1</var> <var> "
+"ordner2</var></cmd> beziehungsweise mit <cmd>meld <var>ordner1</var> "
+"<var>ordner2</var> <var>ordner3</var></cmd>."
 
-#. (itstool) path: item/p
-#: C/vc-supported.page:24
-msgid "Codeville"
-msgstr "Codeville"
+#. (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 ""
+"Sie können einen <link xref=\"vc-mode\">Versionskontroll</link>-Vergleich "
+"mit einem einzelnen Argument starten. Wenn diese Datei oder dieses "
+"Verzeichnis durch ein <link xref=\"vc-supported\">unterstütztes "
+"Versionskontrollsystem</link> verwaltet wird, wird <app>Meld</app> einen "
+"Versionskontroll-Vergleich für das Argument starten. Zum Beispiel können Sie "
+"mit <cmd>meld .</cmd> eine Versionskontrollansicht des aktuellen Ordners "
+"starten."
 
-#. (itstool) path: item/p
-#: C/vc-supported.page:25
-msgid "CVS"
-msgstr "CVS"
+#. (itstool) path: note/p
+#: C/command-line.page:40
+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."
 
-#. (itstool) path: item/p
-#: C/vc-supported.page:26
-msgid "Fossil"
-msgstr "Fossil"
+#. (itstool) path: page/title
+#: C/file-changes.page:16
+msgid "Dealing with changes"
+msgstr "Umgang mit Änderungen"
 
-#. (itstool) path: item/p
-#: C/vc-supported.page:27
-msgid "Git"
-msgstr "Git"
+#. (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> 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: item/p
-#: C/vc-supported.page:28
-msgid "Mercurial"
-msgstr "Mercurial"
+#. (itstool) path: section/title
+#: C/file-changes.page:30
+msgid "Navigating between changes"
+msgstr "Navigieren zwischen Änderungen"
 
-#. (itstool) path: item/p
-#: C/vc-supported.page:29
-msgid "Monotone"
-msgstr "Monotone"
+#. (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 ""
+"Ü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: item/p
-#: C/vc-supported.page:30
-msgid "RCS"
-msgstr "RCS"
+#. (itstool) path: section/title
+#: C/file-changes.page:46
+msgid "Changing changes"
+msgstr "Bearbeiten von Änderungen"
 
-#. (itstool) path: item/p
-#: C/vc-supported.page:31
-msgid "SVK"
-msgstr "SVK"
+#. (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 ""
+"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: item/p
-#: C/vc-supported.page:32
-msgid "SVN"
-msgstr "SVN"
+#. (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 ""
+"Die vorgegebene Aktion ist <em>Ersetzen</em>. Damit wird der Inhalt der "
+"korrespondierenden Änderung durch die aktuelle Änderung ersetzt."
 
-#. (itstool) path: page/p
-#: C/vc-supported.page:35
+#. (itstool) path: section/p
+#: C/file-changes.page:59
 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>."
+"Hold down the <key>Shift</key> key to change the current action to "
+"<em>delete</em>. This action deletes the current change."
 msgstr ""
-"Weniger gebräuchliche Versionskontrollsysteme oder unübliche Einstellungen "
-"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>."
+"Halten Sie die <key>Umschalttaste</key> gedrückt, wird die Änderung nicht "
+"ersetzt, sondern <em>gelöscht</em>."
 
-#. (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: 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 ""
+"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-filters.page:15
@@ -211,7 +288,7 @@ msgstr ""
 
 #. (itstool) path: item/title
 #. (itstool) path: td/p
-#: C/file-filters.page:58 C/vc-mode.page:107 C/folder-mode.page:148
+#: C/file-filters.page:58 C/folder-mode.page:148 C/vc-mode.page:107
 msgid "Modified"
 msgstr "Geändert"
 
@@ -224,7 +301,7 @@ msgstr ""
 
 #. (itstool) path: item/title
 #. (itstool) path: td/p
-#: C/file-filters.page:62 C/vc-mode.page:121 C/folder-mode.page:162
+#: C/file-filters.page:62 C/folder-mode.page:162 C/vc-mode.page:121
 msgid "New"
 msgstr "Neu"
 
@@ -235,7 +312,7 @@ msgstr "Die Datei existiert in einem Ordnern, jedoch nicht in den anderen"
 
 #. (itstool) path: item/title
 #. (itstool) path: td/p
-#: C/file-filters.page:66 C/vc-mode.page:93 C/folder-mode.page:118
+#: C/file-filters.page:66 C/folder-mode.page:118 C/vc-mode.page:93
 msgid "Same"
 msgstr "Identisch"
 
@@ -445,889 +522,501 @@ msgstr ""
 "\"menu\">Ansicht</gui><gui style=\"menuitem\">Groß-/Kleinschreibung in "
 "Dateinamen ignorieren</gui></guiseq>."
 
+#. (itstool) path: info/title
+#: C/file-mode.page:5 C/folder-mode.page:5 C/introduction.page:5
+#: C/missing-functionality.page:5 C/preferences.page:5
+msgctxt "sort"
+msgid "1"
+msgstr "1"
+
 #. (itstool) path: page/title
-#: C/text-filters.page:17
-msgid "Filtering out text"
-msgstr "Filterung von Text"
+#: C/file-mode.page:17
+msgid "Getting started comparing files"
+msgstr "Erste Schritte beim Vergleichen von Dateien"
 
 #. (itstool) path: page/p
-#: C/text-filters.page:19
+#: C/file-mode.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."
+"<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 ""
-"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)."
+"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: note/p
-#: C/text-filters.page:28
+#. (itstool) path: page/p
+#: C/file-mode.page:26
 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."
+"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 ""
-"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>."
+"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/text-filters.page:37
-msgid "Adding and using text filters"
-msgstr "Hinzufügen und Verwenden von Textfiltern"
+#: C/file-mode.page:35
+msgid "<app>Meld</app>'s file comparisons"
+msgstr "Dateivergleiche in <app>Meld</app>"
 
 #. (itstool) path: section/p
-#: C/text-filters.page:39
+#: C/file-mode.page:37
 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."
+"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 ""
-"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."
+"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/text-filters.page:45
+#: C/file-mode.page:43
 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."
+"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 ""
-"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."
+"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: note/p
-#: C/text-filters.page:55
+#. (itstool) path: section/p
+#: C/file-mode.page:50
 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>."
+"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 ""
-"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."
+"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/text-filters.page:67
-msgid "Getting text filters right"
-msgstr "Richtige Filterung von Text"
+#: C/file-mode.page:62
+msgid "Saving your changes"
+msgstr "Speichern der Änderungen"
 
 #. (itstool) path: section/p
-#: C/text-filters.page:69
+#: C/file-mode.page:64
 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:"
+"Once you've finished editing your files, you need to save each file you've "
+"changed."
 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
-msgid "<file>comment1.txt</file>"
-msgstr "<file>Kommentar1.txt</file>"
+"Wenn Sie mit dem Bearbeiten der Dateien fertig sind, müssen Sie die von "
+"Ihnen geänderten Dateien speichern."
 
-#. (itstool) path: listing/code
-#: C/text-filters.page:81
-#, no-wrap
+#. (itstool) path: section/p
+#: C/file-mode.page:68
 msgid ""
-"\n"
-"a\n"
-"b#comment\n"
-"c\n"
-"d"
+"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 ""
-"\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>"
+"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: listing/code
-#: C/text-filters.page:91
-#, no-wrap
+#. (itstool) path: section/p
+#: C/file-mode.page:74
 msgid ""
-"\n"
-"a\n"
-"b\n"
-"c\n"
-"#comment"
+"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 ""
-"\n"
-"a\n"
-"b\n"
-"c\n"
-"#Kommentar"
+"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: section/p
-#: C/text-filters.page:101
+#. (itstool) path: note/p
+#: C/file-mode.page:81
 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."
+"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 ""
-"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."
+"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: section/title
-#: C/text-filters.page:114
-msgid "Blank lines and filters"
-msgstr "Leerzeilen und Filter"
+#. (itstool) path: page/title
+#: C/flattened-view.page:15
+msgid "Flattened view"
+msgstr "Eingeklappte Ansicht"
 
-#. (itstool) path: section/p
-#: C/text-filters.page:116
+#. (itstool) path: page/p
+#: C/flattened-view.page:17
 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."
+"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 ""
-"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."
+"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: section/p
-#: C/text-filters.page:125
+#. (itstool) path: page/p
+#: C/flattened-view.page:27
 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."
+"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 ""
-"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."
+"Ü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/resolving-conflicts.page:15
-msgid "Resolving merge conflicts"
-msgstr "Konflikte beim Zusammenführen lösen"
+#: C/folder-mode.page:16
+msgid "Getting started comparing folders"
+msgstr "Erste Schritte beim Vergleichen von Ordnern"
 
 #. (itstool) path: page/p
-#: C/resolving-conflicts.page:17
+#: C/folder-mode.page:18
 msgid ""
-"One of the best uses of <app>Meld</app> is to resolve conflicts that occur "
-"while merging different branches."
+"<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 ""
-"Einer der besten Anwendungsfälle von <app>Meld</app> ist die Auflösung von "
-"Konflikten, die beim Zusammenführen verschiedener Zweige entstehen."
+"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/resolving-conflicts.page:22
+#: C/folder-mode.page:26
 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"
+"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 ""
-"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 "
+"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: page/code
-#: C/resolving-conflicts.page:27
-#, no-wrap
+#. (itstool) path: section/title
+#: C/folder-mode.page:36
+msgid "The folder comparison view"
+msgstr "Die Ordnervergleichsansicht"
+
+#. (itstool) path: section/p
+#: C/folder-mode.page:38
 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 ""
-"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
-#: 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 "Einstellungen von Meld"
-
-#. (itstool) path: terms/title
-#: C/preferences.page:18
-msgid "Editor preferences"
-msgstr "Editor-Einstellungen"
-
-#. (itstool) path: item/title
-#: C/preferences.page:20
-msgid "Editor command"
-msgstr "Editor-Befehl"
-
-#. (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 ""
-"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
-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 ""
-"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
-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 ""
-"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
-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 "Umgang mit Änderungen"
-
-#. (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> 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 "Navigieren zwischen Änderungen"
-
-#. (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 ""
-"Ü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 "Bearbeiten von Änderungen"
-
-#. (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 ""
-"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
-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
-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
-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 ""
-"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 "Erste Schritte beim Vergleichen von Dateien"
-
-#. (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 ""
-"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
-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 ""
-"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 "Dateivergleiche in <app>Meld</app>"
-
-#. (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 ""
-"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
-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 ""
-"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
-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 ""
-"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 "Speichern der Änderungen"
-
-#. (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 ""
-"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
-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 ""
-"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
-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 ""
-"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
-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 ""
-"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 "Eingeklappte Ansicht"
-
-#. (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 ""
-"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
-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 ""
-"Ü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
-msgid "Meld Help"
-msgstr "Handbuch zu Meld"
-
-#. (itstool) path: section/title
-#: C/index.page:17
-msgid "Introduction"
-msgstr "Einführung"
-
-#. (itstool) path: section/title
-#: C/index.page:21
-msgid "Comparing Files"
-msgstr "Dateien vergleichen"
-
-#. (itstool) path: section/title
-#: C/index.page:25
-msgid "Comparing Folders"
-msgstr "Ordner vergleichen"
-
-#. (itstool) path: section/title
-#: C/index.page:29
-msgid "Using Meld with Version Control"
-msgstr "Meld für Versionskontrolle verwenden"
-
-#. (itstool) path: section/title
-#: C/index.page:33
-msgid "Advanced Usage"
-msgstr "Fortgeschrittene Verwendung"
-
-#. (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 "Betrachten von Dateien unter Versionskontrolle"
+"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 ""
+"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: page/p
-#: C/vc-mode.page:18
+#. (itstool) path: section/p
+#: C/folder-mode.page:50
 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."
+"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 ""
-"<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>."
+"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/vc-mode.page:30
-msgid "Version control comparisons"
-msgstr "Versionskontroll-Vergleiche"
+#: C/folder-mode.page:63
+msgid "Navigating folder comparisons"
+msgstr "Navigieren im Ordnervergleich"
 
 #. (itstool) path: section/p
-#: C/vc-mode.page:32
+#: C/folder-mode.page:65
 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."
+"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 ""
-"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."
+"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/vc-mode.page:46
+#: C/folder-mode.page:73
 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."
+"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 ""
-"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."
+"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
-#. (itstool) path: table/title
-#: C/vc-mode.page:56 C/vc-mode.page:81
-msgid "Version control states"
-msgstr "Status in Versionskontrollsystemen"
+#: C/folder-mode.page:83
+msgid "States in folder comparisons"
+msgstr "Zustände im Ordnervergleich"
 
 #. (itstool) path: section/p
-#: C/vc-mode.page:58
+#: C/folder-mode.page:85
 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:"
+"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 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:"
+"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
+msgid "Folder comparison states"
+msgstr "Ordnervergleichszustände"
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:85 C/folder-mode.page:110
+#: C/folder-mode.page:110 C/vc-mode.page:85
 msgid "State"
 msgstr "Status"
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:86 C/folder-mode.page:111
+#: C/folder-mode.page:111 C/vc-mode.page:86
 msgid "Appearance"
 msgstr "Erscheinungsbild"
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:87 C/folder-mode.page:112
+#: C/folder-mode.page:112 C/vc-mode.page:87
 msgid "Meaning"
 msgstr "Bedeutung"
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:95 C/folder-mode.page:120
+#: C/folder-mode.page:120 C/vc-mode.page:95
 msgid "Normal font"
 msgstr "Normale Schriftart"
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:101
-msgid "The file/folder is the same as the repository version."
-msgstr ""
-"Die Datei/der Ordner ist identisch mit der Version aus dem Softwarebestand."
-
-#. (itstool) path: td/p
-#: C/vc-mode.page:109
-msgid "Red and bold"
-msgstr "Rot und fett"
+#: C/folder-mode.page:126
+msgid "The file/folder is the same across all compared folders."
+msgstr "Die Datei/der Ordner ist identisch in allen verglichenen Ordnern."
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:115
-msgid "This file is different to the repository version."
-msgstr "Die Datei ist unterschiedlich zu der Version im Softwarebestand."
+#: C/folder-mode.page:132
+msgid "Same when filtered"
+msgstr "Identisch, wenn gefiltert"
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:123 C/folder-mode.page:164
-msgid "Green and bold"
-msgstr "Grün und fett"
+#: C/folder-mode.page:134
+msgid "Italics"
+msgstr "Kursiv"
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:129
+#: C/folder-mode.page:140
 msgid ""
-"This file/folder is new, and is scheduled to be added to the repository."
+"These files are different across folders, but once <link xref=\"text-filters"
+"\">text filters</link> are applied, these files become identical."
 msgstr ""
-"Die Datei/der Ordner ist neu und bereits zum Hinzufügen zum Softwarebestand "
-"markiert."
-
-#. (itstool) path: td/p
-#: C/vc-mode.page:136
-msgid "Removed"
-msgstr "Entfernt"
-
-#. (itstool) path: td/p
-#: C/vc-mode.page:138
-msgid "Red bold text with a line through the middle"
-msgstr "Roter, fetter, durchgestrichener Text"
+"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/vc-mode.page:144
-msgid ""
-"This file/folder existed, but is scheduled to be removed from the repository."
-msgstr ""
-"Diese Datei/dieser Ordner existiert, ist jedoch zum Entfernen aus dem "
-"Softwarebestand markiert."
+#: C/folder-mode.page:150
+msgid "Blue and bold"
+msgstr "Blau und fett"
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:151
-msgid "Conflict"
-msgstr "Konflikt"
+#: C/folder-mode.page:156
+msgid "These files differ between the folders being compared."
+msgstr "Diese Dateien unterscheiden sich zwischen den verglichenen Ordnern."
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:153
-msgid "Bright red bold text"
-msgstr "Heller, roter, fetter Text"
+#: C/folder-mode.page:164 C/vc-mode.page:123
+msgid "Green and bold"
+msgstr "Grün und fett"
 
 #. (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"
+#: C/folder-mode.page:170
+msgid "This file/folder exists in this folder, but not in the others."
 msgstr ""
-"Die Unterschiede zwischen der lokalen Datei und dem Softwarebestand konnten "
-"beim Zusammenzuführen nicht gelöst werden. Die Datei ist nun im Konflikt mit "
-"den Inhalten des Softwarebestandes."
+"Diese Datei/der Ordner existiert in diesem Ordner, jedoch nicht in den "
+"anderen."
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:167 C/folder-mode.page:176
+#: C/folder-mode.page:176 C/vc-mode.page:167
 msgid "Missing"
 msgstr "Fehlt"
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:169
-msgid "Blue bold text with a line through the middle"
-msgstr "Blauer, fetter, durchgestrichener Text"
+#: C/folder-mode.page:178
+msgid "Greyed out text with a line through the middle"
+msgstr "Ausgegrauter, durchgestrichener Text"
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:175
-msgid "This file/folder should be present, but isn't."
-msgstr "Diese Datei/dieser Ordner sollte vorhanden sein, ist es jedoch nicht."
+#: C/folder-mode.page:184
+msgid ""
+"This file/folder doesn't exist in this folder, but does in one of the others."
+msgstr ""
+"Diese Datei/dieser Ordner existiert nicht in diesem Ordner, jedoch in einem "
+"der anderen."
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:181
-msgid "Ignored"
-msgstr "Ignoriert"
+#: C/folder-mode.page:191 C/vc-mode.page:212
+msgid "Error"
+msgstr "Fehler"
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:183 C/vc-mode.page:199
-msgid "Greyed out text"
-msgstr "Ausgegrauter Text"
+#: C/folder-mode.page:193 C/vc-mode.page:214
+msgid "Bright red with a yellow background and bold"
+msgstr "Helles Rot mit einem gelben Hintergrund"
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:189
+#: C/folder-mode.page:199
 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."
+"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 ""
-"Diese Datei/dieser Ordner wurde ausdrücklich ignoriert (z.B. durch einen "
-"Eintrag in <file>.gitignore</file>) und wird nicht durch die "
-"Versionskontrolle überwacht."
+"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: td/p
-#: C/vc-mode.page:197
-msgid "Unversioned"
-msgstr "Nicht versioniert"
+#. (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 ""
+"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: td/p
-#: C/vc-mode.page:205
+#. (itstool) path: section/p
+#: C/folder-mode.page:223
 msgid ""
-"This file is not in the version control system; it is only in the local copy."
+"Finally, the most recently modified file/folder has a small star emblem "
+"attached to it."
 msgstr ""
-"Die Datei steht nicht unter Versionskontrolle. Sie ist nur lokal vorhanden."
+"Außerdem wird die zuletzt geänderte Datei oder der zuletzt geänderte Ordner "
+"mit einem kleinen Stern-Emblem versehen."
+
+#. (itstool) path: page/title
+#: C/index.page:14
+msgid "Meld Help"
+msgstr "Handbuch zu Meld"
 
-#. (itstool) path: td/p
-#: C/vc-mode.page:212 C/folder-mode.page:191
-msgid "Error"
-msgstr "Fehler"
+#. (itstool) path: section/title
+#: C/index.page:17
+msgid "Introduction"
+msgstr "Einführung"
 
-#. (itstool) path: td/p
-#: C/vc-mode.page:214 C/folder-mode.page:193
-msgid "Bright red with a yellow background and bold"
-msgstr "Helles Rot mit einem gelben Hintergrund"
+#. (itstool) path: section/title
+#: C/index.page:21
+msgid "Comparing Files"
+msgstr "Dateien vergleichen"
 
-#. (itstool) path: td/p
-#: C/vc-mode.page:220
-msgid "The version control system has reported a problem with this file."
-msgstr "Das Versionskontrollsystem hat ein Problem zu dieser Datei gemeldet."
+#. (itstool) path: section/title
+#: C/index.page:25
+msgid "Comparing Folders"
+msgstr "Ordner vergleichen"
 
 #. (itstool) path: section/title
-#: C/vc-mode.page:230
-msgid "Version control state filtering"
-msgstr "Filterung des Versionskontroll-Status"
+#: C/index.page:29
+msgid "Using Meld with Version Control"
+msgstr "Meld für Versionskontrolle verwenden"
 
-#. (itstool) path: section/p
-#: C/vc-mode.page:232
+#. (itstool) path: section/title
+#: C/index.page:33
+msgid "Advanced Usage"
+msgstr "Fortgeschrittene Verwendung"
+
+#. (itstool) path: page/title
+#: C/introduction.page:15
+msgid "What is Meld?"
+msgstr "Was is Meld?"
+
+#. (itstool) path: page/p
+#: C/introduction.page:16
 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."
+"<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 ""
-"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."
+"<app>Meld</app> ist ein Werkzeug zum Vergleichen von Dateien und Ordnern und "
+"zum Auflösen von Unterschieden zwischen solchen. Es ist nützlich zum "
+"Betrachten von Änderungen, die von Versionskontrollsystemen erfasst werden."
+
+#. (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> 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/keyboard-shortcuts.page:15
@@ -1342,12 +1031,14 @@ msgstr "Tastenkürzel zum Arbeiten mit Dateien und Vergleichen"
 #. (itstool) path: td/p
 #: C/keyboard-shortcuts.page:22 C/keyboard-shortcuts.page:56
 #: C/keyboard-shortcuts.page:109 C/keyboard-shortcuts.page:131
+#: C/keyboard-shortcuts.page:153
 msgid "Shortcut"
 msgstr "Tastenkürzel"
 
 #. (itstool) path: td/p
 #: C/keyboard-shortcuts.page:22 C/keyboard-shortcuts.page:56
 #: C/keyboard-shortcuts.page:109 C/keyboard-shortcuts.page:131
+#: C/keyboard-shortcuts.page:153
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -1475,434 +1166,764 @@ msgstr "Eine Zeichenkette suchen."
 msgid "<keyseq><key>Ctrl</key><key>G</key></keyseq>"
 msgstr "<keyseq><key>Strg</key><key>G</key></keyseq>"
 
-#. (itstool) path: td/p
-#: C/keyboard-shortcuts.page:87
-msgid "Find the next instance of the string."
-msgstr "Das nächste Vorkommen der Zeichenkette suchen."
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:87
+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
+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
+msgid ""
+"Go to the next difference. (Also <keyseq><key>Ctrl</key><key>D</key></"
+"keyseq>)"
+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 ""
+"Go to the previous difference. (Also <keyseq><key>Ctrl</key><key>E</key></"
+"keyseq>)"
+msgstr ""
+"Zum vorherigen Unterschied springen. (Auch <keyseq><key>Strg</key><key>E</"
+"key></keyseq>)"
+
+#. (itstool) path: table/title
+#: C/keyboard-shortcuts.page:105
+msgid "Shortcuts for folder comparison"
+msgstr "Tastenkombinationen im Ordnervergleich"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:115
+#| msgid "<keyseq><key>F1</key></keyseq>"
+msgid "<keyseq><key>+</key></keyseq>"
+msgstr "<keyseq><key>+</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:116
+msgid "Expand the current folder."
+msgstr "Den aktuellen Ordner ausklappen."
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:119
+#| msgid "<keyseq><key>F1</key></keyseq>"
+msgid "<keyseq><key>-</key></keyseq>"
+msgstr "<keyseq><key>-</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:120
+msgid "Collapse the current folder."
+msgstr "Den aktuellen Ordner einklappen."
+
+#. (itstool) path: table/title
+#: C/keyboard-shortcuts.page:127
+msgid "Shortcuts for view settings"
+msgstr "Tastenkürzel für Anzeigeoptionen"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:137
+msgid "<keyseq><key>Escape</key></keyseq>"
+msgstr "<keyseq><key>Esc</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:138
+msgid "Stop the current comparison."
+msgstr "Den aktuellen Vergleich stoppen."
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:141
+msgid "<keyseq><key>Ctrl</key><key>R</key></keyseq>"
+msgstr "<keyseq><key>Strg</key><key>R</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:142
+msgid "Refresh the current comparison."
+msgstr "Den aktuellen Vergleich aktualisieren."
+
+#. (itstool) path: table/title
+#: C/keyboard-shortcuts.page:149
+msgid "Shortcuts for help"
+msgstr "Tastenkürzel für Hilfe"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:159
+msgid "<keyseq><key>F1</key></keyseq>"
+msgstr "<keyseq><key>F1</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:160
+msgid "Open <app>Meld</app>'s user manual."
+msgstr "Das Benutzerhandbuch von <app>Meld</app> öffnen."
+
+#. (itstool) path: p/link
+#: C/legal.xml:4
+msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
+msgstr "Creative Commons Attribution-Share Alike 3.0 Unported License"
+
+#. (itstool) path: license/p
+#: C/legal.xml:3
+msgid "This work is licensed under a <_:link-1/>."
+msgstr "Dieses Werk wird unter einer <_:link-1/> verbreitet."
+
+#. (itstool) path: license/p
+#: C/legal.xml:6
+msgid ""
+"As a special exception, the copyright holders give you permission to copy, "
+"modify, and distribute the example code contained in this document under the "
+"terms of your choosing, without restriction."
+msgstr ""
+"Als besondere Ausnahme gewähren die Besitzer des Urheberrechts Erlaubnis, "
+"den Beispiel-Code in diesem Dokument zu kopieren, verändern und "
+"weiterzugeben, unter den Bedingungen Ihrer Wahl, ohne Einschränkungen."
+
+#. (itstool) path: page/title
+#: C/missing-functionality.page:15
+msgid "Things that <app>Meld</app> doesn't do"
+msgstr "Dinge, die <app>Meld</app> nicht macht"
+
+#. (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 ""
+"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
+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 ""
+"Dieser Abschnitt zählt ein paar der Dinge auf, die <app>Meld</app>, entweder "
+"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"
+
+#. (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 ""
+"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 "
+"keine Einstellungsmöglichkeit."
+
+#. (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 "Einstellungen von Meld"
+
+#. (itstool) path: terms/title
+#: C/preferences.page:18
+msgid "Editor preferences"
+msgstr "Editor-Einstellungen"
+
+#. (itstool) path: item/title
+#: C/preferences.page:20
+msgid "Editor command"
+msgstr "Editor-Befehl"
+
+#. (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 ""
+"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
+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: td/p
-#: C/keyboard-shortcuts.page:90
-msgid "<keyseq><key>Alt</key><key>Down</key></keyseq>"
-msgstr "<keyseq><key>Alt</key><key>↓</key></keyseq>"
+#. (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 ""
+"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: td/p
-#: C/keyboard-shortcuts.page:91
+#. (itstool) path: item/p
+#: C/preferences.page:40
 msgid ""
-"Go to the next difference. (Also <keyseq><key>Ctrl</key><key>D</key></"
-"keyseq>)"
+"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 ""
-"Zum nächsten Unterschied springen. (Auch <keyseq><key>Strg</key><key>D</"
-"key></keyseq>)"
+"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: 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: 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 ""
+"Diese Option ist nur wirksam, wenn <gui>Dateien nur anhand Größe und "
+"Änderungszeit vergleichen</gui> nicht aktiviert ist."
 
-#. (itstool) path: td/p
-#: C/keyboard-shortcuts.page:97
+#. (itstool) path: page/title
+#: C/resolving-conflicts.page:15
+msgid "Resolving merge conflicts"
+msgstr "Konflikte beim Zusammenführen lösen"
+
+#. (itstool) path: page/p
+#: C/resolving-conflicts.page:17
 msgid ""
-"Go to the previous difference. (Also <keyseq><key>Ctrl</key><key>E</key></"
-"keyseq>)"
+"One of the best uses of <app>Meld</app> is to resolve conflicts that occur "
+"while merging different branches."
 msgstr ""
-"Zum vorherigen Unterschied springen. (Auch <keyseq><key>Strg</key><key>E</"
-"key></keyseq>)"
+"Einer der besten Anwendungsfälle von <app>Meld</app> ist die Auflösung von "
+"Konflikten, die beim Zusammenführen verschiedener Zweige entstehen."
 
-#. (itstool) path: table/title
-#: C/keyboard-shortcuts.page:105
-msgid "Shortcuts for view settings"
-msgstr "Tastenkürzel für Anzeigeoptionen"
+#. (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 ""
+"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: td/p
-#: C/keyboard-shortcuts.page:115
-msgid "<keyseq><key>Escape</key></keyseq>"
-msgstr "<keyseq><key>Esc</key></keyseq>"
+#. (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: td/p
-#: C/keyboard-shortcuts.page:116
-msgid "Stop the current comparison."
-msgstr "Den aktuellen Vergleich stoppen."
+#. (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 ""
+"zur Datei <file>.git/gitconfig</file> hinzufügen. In der Handbuchseite zu "
+"<app>git mergetool</app> finden Sie Details dazu."
 
-#. (itstool) path: td/p
-#: C/keyboard-shortcuts.page:119
-msgid "<keyseq><key>Ctrl</key><key>R</key></keyseq>"
-msgstr "<keyseq><key>Strg</key><key>R</key></keyseq>"
+#. (itstool) path: page/title
+#: C/text-filters.page:17
+msgid "Filtering out text"
+msgstr "Filterung von Text"
 
-#. (itstool) path: td/p
-#: C/keyboard-shortcuts.page:120
-msgid "Refresh the current comparison."
-msgstr "Den aktuellen Vergleich aktualisieren."
+#. (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 ""
+"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: table/title
-#: C/keyboard-shortcuts.page:127
-msgid "Shortcuts for help"
-msgstr "Tastenkürzel für Hilfe"
+#. (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 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: td/p
-#: C/keyboard-shortcuts.page:137
-msgid "<keyseq><key>F1</key></keyseq>"
-msgstr "<keyseq><key>F1</key></keyseq>"
+#. (itstool) path: section/title
+#: C/text-filters.page:37
+msgid "Adding and using text filters"
+msgstr "Hinzufügen und Verwenden von Textfiltern"
 
-#. (itstool) path: td/p
-#: C/keyboard-shortcuts.page:138
-msgid "Open <app>Meld</app>'s user manual."
-msgstr "Das Benutzerhandbuch von <app>Meld</app> öffnen."
+#. (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 ""
+"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: page/title
-#: C/introduction.page:15
-msgid "What is Meld?"
-msgstr "Was is Meld?"
+#. (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 ""
+"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: page/p
-#: C/introduction.page:16
+#. (itstool) path: note/p
+#: C/text-filters.page:55
 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."
+"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 ""
-"<app>Meld</app> ist ein Werkzeug zum Vergleichen von Dateien und Ordnern und "
-"zum Auflösen von Unterschieden zwischen solchen. Es ist nützlich zum "
-"Betrachten von Änderungen, die von Versionskontrollsystemen erfasst werden."
+"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: page/p
-#: C/introduction.page:22
+#. (itstool) path: section/title
+#: C/text-filters.page:67
+msgid "Getting text filters right"
+msgstr "Richtige Filterung von Text"
+
+#. (itstool) path: section/p
+#: C/text-filters.page:69
 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."
+"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 ""
-"<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."
+"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
+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: page/title
-#: C/folder-mode.page:16
-msgid "Getting started comparing folders"
-msgstr "Erste Schritte beim Vergleichen von Ordnern"
+#. (itstool) path: listing/title
+#: C/text-filters.page:90
+msgid "<file>comment2.txt</file>"
+msgstr "<file>Kommentar2.txt</file>"
 
-#. (itstool) path: page/p
-#: C/folder-mode.page:18
+#. (itstool) path: listing/code
+#: C/text-filters.page:91
+#, no-wrap
 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."
+"\n"
+"a\n"
+"b\n"
+"c\n"
+"#comment"
 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."
+"\n"
+"a\n"
+"b\n"
+"c\n"
+"#Kommentar"
 
-#. (itstool) path: page/p
-#: C/folder-mode.page:26
+#. (itstool) path: section/p
+#: C/text-filters.page:101
 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."
+"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 ""
-"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."
+"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/folder-mode.page:36
-msgid "The folder comparison view"
-msgstr "Die Ordnervergleichsansicht"
+#: C/text-filters.page:114
+msgid "Blank lines and filters"
+msgstr "Leerzeilen und Filter"
 
 #. (itstool) path: section/p
-#: C/folder-mode.page:38
+#: C/text-filters.page:116
 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!"
+"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 ""
-"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!"
+"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/folder-mode.page:50
+#: C/text-filters.page:125
 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."
+"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 ""
-"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."
+"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: 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 "Betrachten von Dateien unter Versionskontrolle"
+
+#. (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> 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/folder-mode.page:63
-msgid "Navigating folder comparisons"
-msgstr "Navigieren im Ordnervergleich"
+#: C/vc-mode.page:30
+msgid "Version control comparisons"
+msgstr "Versionskontroll-Vergleiche"
 
 #. (itstool) path: section/p
-#: C/folder-mode.page:65
+#: C/vc-mode.page:32
 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."
+"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 ""
-"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."
+"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/folder-mode.page:73
+#: C/vc-mode.page:46
 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."
+"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 ""
-"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."
+"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
-#: C/folder-mode.page:83
-msgid "States in folder comparisons"
-msgstr "Zustände im Ordnervergleich"
+#. (itstool) path: table/title
+#: C/vc-mode.page:56 C/vc-mode.page:81
+msgid "Version control states"
+msgstr "Status in Versionskontrollsystemen"
 
 #. (itstool) path: section/p
-#: C/folder-mode.page:85
+#: C/vc-mode.page:58
 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:"
+"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 ""
-"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:"
+"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: table/title
-#: C/folder-mode.page:106
-msgid "Folder comparison states"
-msgstr "Ordnervergleichszustände"
+#. (itstool) path: td/p
+#: C/vc-mode.page:101
+msgid "The file/folder is the same as the repository version."
+msgstr ""
+"Die Datei/der Ordner ist identisch mit der Version aus dem Softwarebestand."
 
 #. (itstool) path: td/p
-#: C/folder-mode.page:126
-msgid "The file/folder is the same across all compared folders."
-msgstr "Die Datei/der Ordner ist identisch in allen verglichenen Ordnern."
+#: C/vc-mode.page:109
+msgid "Red and bold"
+msgstr "Rot und fett"
 
 #. (itstool) path: td/p
-#: C/folder-mode.page:132
-msgid "Same when filtered"
-msgstr "Identisch, wenn gefiltert"
+#: C/vc-mode.page:115
+msgid "This file is different to the repository version."
+msgstr "Die Datei ist unterschiedlich zu der Version im Softwarebestand."
+
+#. (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 ""
+"Die Datei/der Ordner ist neu und bereits zum Hinzufügen zum Softwarebestand "
+"markiert."
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:136
+msgid "Removed"
+msgstr "Entfernt"
 
 #. (itstool) path: td/p
-#: C/folder-mode.page:134
-msgid "Italics"
-msgstr "Kursiv"
+#: C/vc-mode.page:138
+msgid "Red bold text with a line through the middle"
+msgstr "Roter, fetter, durchgestrichener Text"
 
 #. (itstool) path: td/p
-#: C/folder-mode.page:140
+#: C/vc-mode.page:144
 msgid ""
-"These files are different across folders, but once <link xref=\"text-filters"
-"\">text filters</link> are applied, these files become identical."
+"This file/folder existed, but is scheduled to be removed from the repository."
 msgstr ""
-"Diese Dateien sind auf die Ordner bezogen unterschiedlich, aber sobald <link "
-"xref=\"text-filters\">Textfilter</link> eingesetzt werden, sind sie "
-"identisch."
+"Diese Datei/dieser Ordner existiert, ist jedoch zum Entfernen aus dem "
+"Softwarebestand markiert."
 
 #. (itstool) path: td/p
-#: C/folder-mode.page:150
-msgid "Blue and bold"
-msgstr "Blau und fett"
+#: C/vc-mode.page:151
+msgid "Conflict"
+msgstr "Konflikt"
 
 #. (itstool) path: td/p
-#: C/folder-mode.page:156
-msgid "These files differ between the folders being compared."
-msgstr "Diese Dateien unterscheiden sich zwischen den verglichenen Ordnern."
+#: C/vc-mode.page:153
+msgid "Bright red bold text"
+msgstr "Heller, roter, fetter Text"
 
 #. (itstool) path: td/p
-#: C/folder-mode.page:170
-msgid "This file/folder exists in this folder, but not in the others."
+#: 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 ""
-"Diese Datei/der Ordner existiert in diesem Ordner, jedoch nicht in den "
-"anderen."
+"Die Unterschiede zwischen der lokalen Datei und dem Softwarebestand konnten "
+"beim Zusammenzuführen nicht gelöst werden. Die Datei ist nun im Konflikt mit "
+"den Inhalten des Softwarebestandes."
 
 #. (itstool) path: td/p
-#: C/folder-mode.page:178
-msgid "Greyed out text with a line through the middle"
-msgstr "Ausgegrauter, durchgestrichener Text"
+#: C/vc-mode.page:169
+msgid "Blue bold text with a line through the middle"
+msgstr "Blauer, fetter, durchgestrichener 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 ""
-"Diese Datei/dieser Ordner existiert nicht in diesem Ordner, jedoch in einem "
-"der anderen."
+#: C/vc-mode.page:175
+msgid "This file/folder should be present, but isn't."
+msgstr "Diese Datei/dieser Ordner sollte vorhanden sein, ist es jedoch nicht."
 
 #. (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 ""
-"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."
+#: C/vc-mode.page:181
+msgid "Ignored"
+msgstr "Ignoriert"
 
-#. (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 ""
-"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: td/p
+#: C/vc-mode.page:183 C/vc-mode.page:199
+msgid "Greyed out text"
+msgstr "Ausgegrauter Text"
 
-#. (itstool) path: section/p
-#: C/folder-mode.page:223
+#. (itstool) path: td/p
+#: C/vc-mode.page:189
 msgid ""
-"Finally, the most recently modified file/folder has an emblem attached to it."
+"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 ""
-"Außerdem wird die zuletzt geänderte Datei oder der zuletzt geänderte Ordner "
-"mit einem Emblem versehen."
+"Diese Datei/dieser Ordner wurde ausdrücklich ignoriert (z.B. durch einen "
+"Eintrag in <file>.gitignore</file>) und wird nicht durch die "
+"Versionskontrolle überwacht."
 
-#. (itstool) path: page/title
-#: C/missing-functionality.page:15
-msgid "Things that <app>Meld</app> doesn't do"
-msgstr "Dinge, die <app>Meld</app> nicht macht"
+#. (itstool) path: td/p
+#: C/vc-mode.page:197
+msgid "Unversioned"
+msgstr "Nicht versioniert"
 
-#. (itstool) path: page/p
-#: C/missing-functionality.page:17
+#. (itstool) path: td/p
+#: C/vc-mode.page:205
 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?"
+"This file is not in the version control system; it is only in the local copy."
 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>?"
+"Die Datei steht nicht unter Versionskontrolle. Sie ist nur lokal vorhanden."
 
-#. (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 ""
-"Dieser Abschnitt zählt ein paar der Dinge auf, die <app>Meld</app>, entweder "
-"aus handfesten Gründen oder weil wir einfach keine Zeit hatten, <em>nicht "
-"macht</em>."
+#. (itstool) path: td/p
+#: C/vc-mode.page:220
+msgid "The version control system has reported a problem with this file."
+msgstr "Das Versionskontrollsystem hat ein Problem zu dieser Datei gemeldet."
 
 #. (itstool) path: section/title
-#: C/missing-functionality.page:30
-msgid "Aligning changes by adding lines"
-msgstr "Änderungen durch Hinzufügen von Zeilen aneinander ausrichten"
+#: C/vc-mode.page:230
+msgid "Version control state filtering"
+msgstr "Filterung des Versionskontroll-Status"
 
 #. (itstool) path: section/p
-#: C/missing-functionality.page:31
+#: C/vc-mode.page:232
 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."
+"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 ""
-"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 "
-"keine Einstellungsmöglichkeit."
+"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: info/title
+#: C/vc-supported.page:5
+msgctxt "sort"
+msgid "3"
+msgstr "3"
 
 #. (itstool) path: page/title
-#: C/command-line.page:15
-msgid "Command line usage"
-msgstr "Befehlszeilenverwendung"
+#: C/vc-supported.page:15
+msgid "Supported version control systems"
+msgstr "Unterstützte Versionskontrollsysteme"
 
 #. (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."
+#: C/vc-supported.page:17
+msgid "<app>Meld</app> supports a wide range of version control systems:"
 msgstr ""
-"Wenn Sie <app>Meld</app> von der Befehlszeile starten, können Sie angeben, "
-"was beim Starten zu tun ist."
+"<app>Meld</app> unterstützt eine große Anzahl von Versionskontrollsystemen:"
 
-#. (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 einen Zwei- oder Drei-Wege <link xref=\"file-mode\">Datei-Vergleich</"
-"link>, starten Sie <app>Meld</app> mit <cmd>meld <var>datei1</var> "
-"<var>datei2</var></cmd> beziehungsweise mit <cmd>meld <var>datei1</var> "
-"<var>datei2</var> <var>datei3</var></cmd>."
+#. (itstool) path: item/p
+#: C/vc-supported.page:22
+msgid "Bazaar"
+msgstr "Bazaar"
 
-#. (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 einen Zwei- oder Drei-Wege <link xref=\"file-mode\">Ordner-Vergleich</"
-"link>, starten Sie <app>Meld</app> mit <cmd>meld <var>ordner1</var> <var> "
-"ordner2</var></cmd> beziehungsweise mit <cmd>meld <var>ordner1</var> "
-"<var>ordner2</var> <var>ordner3</var></cmd>."
+#. (itstool) path: item/p
+#: C/vc-supported.page:23
+msgid "Darcs"
+msgstr "Darcs"
+
+#. (itstool) path: item/p
+#: C/vc-supported.page:24
+msgid "Git"
+msgstr "Git"
+
+#. (itstool) path: item/p
+#: C/vc-supported.page:25
+msgid "Mercurial"
+msgstr "Mercurial"
+
+#. (itstool) path: item/p
+#: C/vc-supported.page:26
+msgid "SVN"
+msgstr "SVN"
 
 #. (itstool) path: page/p
-#: C/command-line.page:31
+#: C/vc-supported.page:29
 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 ""
-"Sie können einen <link xref=\"vc-mode\">Versionskontroll</link>-Vergleich "
-"mit einem einzelnen Argument starten. Wenn diese Datei oder dieses "
-"Verzeichnis durch ein <link xref=\"vc-supported\">unterstütztes "
-"Versionskontrollsystem</link> verwaltet wird, wird <app>Meld</app> einen "
-"Versionskontroll-Vergleich für das Argument starten. Zum Beispiel können Sie "
-"mit <cmd>meld .</cmd> eine Versionskontrollansicht des aktuellen Ordners "
-"starten."
-
-#. (itstool) path: note/p
-#: C/command-line.page:40
-msgid "Run <cmd>meld --help</cmd> for a list of all command line options."
+"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 ""
-"Um eine vollständige Liste von Optionen zu erhalten, rufen Sie <cmd>meld --"
-"help</cmd> auf."
-
+"Weniger gebräuchliche Versionskontrollsysteme oder unübliche Einstellungen "
+"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>."
diff --git a/help/es/es.po b/help/es/es.po
index 0641a578..2d86d8e4 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the meld package.
 # Facundo Dario Illanes <fdillanes@gmail.com>, 2014.
 # Facundo Dario Illanes <fdillanes@gmail.com>, 2014.
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2014, 2015.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2014, 2015, 2018.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: meld master\n"
-"POT-Creation-Date: 2015-12-07 13:24+0000\n"
-"PO-Revision-Date: 2015-12-07 15:43+0100\n"
+"POT-Creation-Date: 2017-09-13 16:58+0000\n"
+"PO-Revision-Date: 2018-06-22 09:23+0200\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
-"Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n"
+"Language-Team: es <gnome-es-list@gnome.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,119 +23,191 @@ msgstr ""
 msgctxt "_"
 msgid "translator-credits"
 msgstr ""
-"Daniel Mustieles <daniel.mustieles@gmail.com>, 2014 - 2015\n"
+"Daniel Mustieles <daniel.mustieles@gmail.com>, 2014 - 2018\n"
 "Facundo Darío Illanes <fdillanes@gmail.com>, 2014"
 
 #. (itstool) path: info/title
-#: C/vc-supported.page:5
+#: C/command-line.page:5 C/file-changes.page:5 C/file-filters.page:5
+#: C/flattened-view.page:5 C/keyboard-shortcuts.page:5
+#: C/resolving-conflicts.page:5 C/text-filters.page:5
 msgctxt "sort"
-msgid "3"
-msgstr "3"
+msgid "2"
+msgstr "2"
 
 #. (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
+#: C/command-line.page:10 C/file-changes.page:10 C/file-filters.page:10
+#: C/file-mode.page:11 C/flattened-view.page:10 C/folder-mode.page:10
+#: C/index.page:8 C/introduction.page:10 C/keyboard-shortcuts.page:10
+#: C/missing-functionality.page:10 C/preferences.page:10
+#: C/resolving-conflicts.page:10 C/text-filters.page:11 C/vc-mode.page:10
+#: C/vc-supported.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
+#: C/command-line.page:12 C/file-changes.page:12 C/file-filters.page:12
+#: C/file-mode.page:13 C/flattened-view.page:12 C/folder-mode.page:12
+#: C/index.page:10 C/introduction.page:12 C/keyboard-shortcuts.page:12
+#: C/missing-functionality.page:12 C/resolving-conflicts.page:12
+#: C/text-filters.page:13 C/vc-mode.page:12 C/vc-supported.page:12
 msgid "2012"
 msgstr "2012"
 
 #. (itstool) path: page/title
-#: C/vc-supported.page:15
-msgid "Supported version control systems"
-msgstr "Sistemas de control de versiones controlados"
+#: C/command-line.page:15
+msgid "Command line usage"
+msgstr "Uso de línea de comandos"
 
 #. (itstool) path: page/p
-#: C/vc-supported.page:17
-msgid "<app>Meld</app> supports a wide range of version control systems:"
+#: 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 ""
-"<app>Meld</app> soporta un amplio rango de sistemas de control de versiones:"
+"Si ejecuta <app>Meld</app> desde la línea de comandos, puede decirle que "
+"hacer cuando arranca."
 
-#. (itstool) path: item/p
-#: C/vc-supported.page:22
-msgid "Arch"
-msgstr "Arch"
+#. (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 ""
+"Para una <link xref=\"file-mode\">comparación de archivos</link> de dos o "
+"tres vías, ejecute <app>Meld</app> con <cmd>meld <var>archivo1</var> "
+"<var>archivo2</var></cmd> o <cmd>meld <var>archivo1</var> <var>archivo2</"
+"var> <var>archivo3</var></cmd> respectivamente."
 
-#. (itstool) path: item/p
-#: C/vc-supported.page:23
-msgid "Bazaar"
-msgstr "Bazaar"
+#. (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 ""
+"Para una <link xref=\"folder-mode\">comparación de carpetas</link>de dos o "
+"tres vías, ejecute <app>Meld</app> con <cmd>meld <var>carpeta1</var> "
+"<var>carpeta2</var></cmd>  <cmd>meld <var>carpeta1</var> <var>carpeta2</var> "
+"<var>carpeta3</var></cmd>"
 
-#. (itstool) path: item/p
-#: C/vc-supported.page:24
-msgid "Codeville"
-msgstr "Codeville"
+#. (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 ""
+"Puede empezar una comparación de <link xref=\"vc-mode\">control de "
+"versiones</link> agregando un solo argumento; si es un archivo o carpeta "
+"manejado por un  <link xref=\"vc-supported\">sistema de control de versiones "
+"reconocido</link>, ejecutará la comparación de control de versiones con ese "
+"argumento. Por ejemplo, <cmd>meld .</cmd> ejecutaría una vista de control de "
+"versiones de la carpeta actual."
 
-#. (itstool) path: item/p
-#: C/vc-supported.page:25
-msgid "CVS"
-msgstr "CVS"
+#. (itstool) path: note/p
+#: C/command-line.page:40
+msgid "Run <cmd>meld --help</cmd> for a list of all command line options."
+msgstr ""
+"Ejecute <cmd>meld --help</cmd> para una lista de todas las opciones de línea "
+"de comandos."
 
-#. (itstool) path: item/p
-#: C/vc-supported.page:26
-msgid "Fossil"
-msgstr "Fossil"
+#. (itstool) path: page/title
+#: C/file-changes.page:16
+msgid "Dealing with changes"
+msgstr "Tratando con los cambios"
 
-#. (itstool) path: item/p
-#: C/vc-supported.page:27
-msgid "Git"
-msgstr "Git"
+#. (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> trata las diferencias entre archivos como si fueran una "
+"lista de <em>bloques de cambios</em> o simplemente <em>cambios</em>. Cada "
+"cambio es un grupo de líneas que se corresponden entre archivos. Dado que "
+"estos cambios son lo que usualmente más interesa, <app>Meld</app> ofrece "
+"herramientas específicas para navegar entre estos cambios y editarlos. Puede "
+"encontrar estas herramientas en el menú <gui style=\"menu\">Cambios</gui>."
 
-#. (itstool) path: item/p
-#: C/vc-supported.page:28
-msgid "Mercurial"
-msgstr "Mercurial"
+#. (itstool) path: section/title
+#: C/file-changes.page:30
+msgid "Navigating between changes"
+msgstr "Navegar entre los cambios"
 
-#. (itstool) path: item/p
-#: C/vc-supported.page:29
-msgid "Monotone"
-msgstr "Monotone"
+#. (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 ""
+"Puede navegar entre los cambios con los elementos de menú <guiseq><gui style="
+"\"menu\">Cambios</gui><gui style=\"menuitem\">Cambios Previos</gui></guiseq> "
+"y <guiseq><gui style=\"menu\">Cambios</gui><gui style=\"menuitem\">Siguiente "
+"cambio</gui></guiseq>. También puede usar la rueda de su ratón para moverse "
+"entre los cambios, desplazándose en la barra central de cambios."
 
-#. (itstool) path: item/p
-#: C/vc-supported.page:30
-msgid "RCS"
-msgstr "RCS"
+#. (itstool) path: section/title
+#: C/file-changes.page:46
+msgid "Changing changes"
+msgstr "Cambiando los cambios"
 
-#. (itstool) path: item/p
-#: C/vc-supported.page:31
-msgid "SVK"
-msgstr "SVK"
+#. (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 ""
+"Además de editar directamente archivos de texto, <app>Meld</app> brinda "
+"herramientas para mover, copiar o eliminar diferencias individuales entre "
+"archivos. La barra entre dos archivos no sólo muestra qué partes de los dos "
+"archivos se corresponden, sino que también permite combinar a su elección o "
+"eliminar diferentes cambios pulsando en los iconos de la flecha o cruz junto "
+"al comienzo de cada cambio."
 
-#. (itstool) path: item/p
-#: C/vc-supported.page:32
-msgid "SVN"
-msgstr "SVN"
+#. (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 ""
+"La acción predeterminada es <em>reemplazar</em>. Esta acción reemplaza el "
+"contenido del cambio que corresponde con el cambio en el que se está "
+"trabajando."
 
-#. (itstool) path: page/p
-#: C/vc-supported.page:35
+#. (itstool) path: section/p
+#: C/file-changes.page:59
 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>."
+"Hold down the <key>Shift</key> key to change the current action to "
+"<em>delete</em>. This action deletes the current change."
 msgstr ""
-"Algunos sistemas de control de versiones menos comunes o configuraciones "
-"inusuales pueden no estar probadas apropiadamente; por favor informe de los "
-"errores de soporte de cualquier control de versiones en <link href=\"https://"
-"bugzilla.gnome.org/\">GNOME bugzilla</link>."
+"Mantenga pulsada la tecla <key>Mayús</key> para cambiar la acción actual a "
+"<em>eliminar</em>. Esta acción elimina el cambio actual."
 
-#. (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: 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 ""
+"Mantenga pulsada la tecla <key>Ctrl</key> para cambiar la acción actual a "
+"<em>insertar</em>. Esta acción inserta el cambio actual arriba o abajo "
+"(según se haya elegido) del cambio correspondiente."
 
 #. (itstool) path: page/title
 #: C/file-filters.page:15
@@ -199,11 +271,6 @@ msgstr "Filtrado por diferencias de archivo"
 
 #. (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>Modifed</em>, <em>New</em> or "
-#| "<em>Same</em>:"
 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 "
@@ -217,7 +284,7 @@ msgstr ""
 
 #. (itstool) path: item/title
 #. (itstool) path: td/p
-#: C/file-filters.page:58 C/vc-mode.page:107 C/folder-mode.page:148
+#: C/file-filters.page:58 C/folder-mode.page:148 C/vc-mode.page:107
 msgid "Modified"
 msgstr "Modificado"
 
@@ -228,7 +295,7 @@ msgstr "El archivo existe en varias carpetas, pero los archivos son diferentes"
 
 #. (itstool) path: item/title
 #. (itstool) path: td/p
-#: C/file-filters.page:62 C/vc-mode.page:121 C/folder-mode.page:162
+#: C/file-filters.page:62 C/folder-mode.page:162 C/vc-mode.page:121
 msgid "New"
 msgstr "Nuevo"
 
@@ -239,7 +306,7 @@ msgstr "El archivo existe en una carpeta pero no en otras"
 
 #. (itstool) path: item/title
 #. (itstool) path: td/p
-#: C/file-filters.page:66 C/vc-mode.page:93 C/folder-mode.page:118
+#: C/file-filters.page:66 C/folder-mode.page:118 C/vc-mode.page:93
 msgid "Same"
 msgstr "El mismo"
 
@@ -450,614 +517,434 @@ msgstr ""
 "\">Vista</gui><gui style=\"menuitem\">Ignorar capitalización de archivos</"
 "gui></guiseq> desde los menús."
 
+#. (itstool) path: info/title
+#: C/file-mode.page:5 C/folder-mode.page:5 C/introduction.page:5
+#: C/missing-functionality.page:5 C/preferences.page:5
+msgctxt "sort"
+msgid "1"
+msgstr "1"
+
 #. (itstool) path: page/title
-#: C/text-filters.page:17
-msgid "Filtering out text"
-msgstr "Filtrado de texto"
+#: C/file-mode.page:17
+msgid "Getting started comparing files"
+msgstr "Primeros pasos para comparar archivos"
 
 #. (itstool) path: page/p
-#: C/text-filters.page:19
+#: C/file-mode.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."
+"<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 ""
-"Cuando compare varios archivos, puede tener varias secciones de texto donde "
-"las diferencias no sean realmente importantes, quizás quiera enfocarse en "
-"los cambios en las secciones de código, e ignorar los cambios en los "
-"comentarios. Con los filtros de texto puede decirle a <app>Meld</app> que "
-"ignore el texto que coincida con el patrón (ej, con una expresión regular) "
-"cuando muestre las diferencias entre archivos."
+"<app>Meld</app> permite comparar dos o tres archivos de texto uno al lado "
+"del otro. Puede comenzar una nueva comparación entre archivos seleccionando "
+"en el menú <guiseq><gui style=\"menu\">Archivo</gui><gui style=\"menuitem"
+"\">Nuevo...</gui></guiseq>."
 
-#. (itstool) path: note/p
-#: C/text-filters.page:28
+#. (itstool) path: page/p
+#: C/file-mode.page:26
 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."
+"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 ""
-"Los filtros de texto no solo afectan las comparaciones entre archivos, sino "
-"también las comparaciones entre carpetas. Consulte a las <link xref=\"file-"
-"filters\"> notas sobre filtros de archivos </link> para obtener más detalles."
+"Una vez que haya seleccionado sus archivos, <app>Meld</app> los mostrará uno "
+"junto a otro. Las diferencias entre los archivos se resaltarán para que cada "
+"cambio sea más fácil de ver. Editar los archivos hará que la comparación se "
+"actualice en el acto. Para obtener detalles sobre cómo navegar entre los "
+"cambios individuales, y cómo utilizar la edición basada en cambios, consulte "
+"la <link xref=\"file-changes\"/>."
 
 #. (itstool) path: section/title
-#: C/text-filters.page:37
-msgid "Adding and using text filters"
-msgstr "Agregar y usar filtros de texto"
+#: C/file-mode.page:35
+msgid "<app>Meld</app>'s file comparisons"
+msgstr "Las comparaciones de archivos de <app>Meld</app>"
 
 #. (itstool) path: section/p
-#: C/text-filters.page:39
+#: C/file-mode.page:37
 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."
+"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 ""
-"Se pueden activar o desactivar los filtros de texto desde la pestaña "
-"<gui>Filtros de Texto</gui> en la ventana de <gui>Preferencias</gui>. "
-"<app>Meld</app> proporciona unos pocos simples filtros que pueden resultar "
-"útiles, pero es posible añadir los propios también. "
+"Hay varias partes diferentes en una comparación entre archivos. La más "
+"importante son los editores en los que los archivos aparecen. Además de "
+"estos editores, las áreas alrededor y entre sus archivos brindan una visión "
+"general y acciones para ayudarle a manejar los cambios entre los archivos."
 
 #. (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 comparsion; 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."
+#: C/file-mode.page:43
 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."
+"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 ""
-"En <app>Meld</app>, los filtros de texto son expresiones regulares que se "
-"comparan con el texto de los archivos que se están comparando. Cualquier "
-"texto que coincida se ignora durante la comparación; todavía puede verse ese "
-"texto en la vista de comparación, pero no se tendrá en cuenta cuando se "
-"encuentren las diferencias. Los filtros de texto se aplican en orden, de "
-"forma que es posible para el primer filtro quitar texto que podría coincidir "
-"con el segundo filtro, y así sucesivamente."
+"En los lados izquierdo y derecho de la ventana, hay dos pequeñas barras "
+"verticales que muestran varios bloques de color. Estas barras están "
+"diseñadas para ofrecer una visión general de todas las diferencias entre los "
+"dos archivos. Cada bloque de color representa una sección que se inserta, "
+"elimina, cambia o en conflicto entre sus archivos, dependiendo del bloque de "
+"color usado."
 
-#. (itstool) path: note/p
-#: C/text-filters.page:55
+#. (itstool) path: section/p
+#: C/file-mode.page:50
 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>."
+"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 ""
-"Si no está familiarizado con las expresiones regulares, tal ve quiera "
-"consultar el <link href=\"http://docs.python.org/howto/regex.html\"> "
-"Tutorial de expresiones regulares</link> de Python."
+"Entre cada par de archivos hay un segmento que muestra cómo cambiaron las "
+"secciones que se corresponden entre los archivos. Puede pulsar en las "
+"flechas en el segmento para reemplazar las secciones en un archivo con las "
+"del otro. También puede eliminar, copiar o mezclar cambios. Para obtener "
+"detalles sobre cómo hacer cambios en segmentos individuales, consulte la "
+"<link xref=\"file-changes#change-actions\"/>."
 
 #. (itstool) path: section/title
-#: C/text-filters.page:67
-msgid "Getting text filters right"
-msgstr "Conseguir filtros de texto correctos"
+#: C/file-mode.page:62
+msgid "Saving your changes"
+msgstr "Guardar los cambios"
 
 #. (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 ""
-"Es fácil cometer errores con el filtrado de texto, y el soporte para "
-"filtrado de Meld no está completo. En particular, un filtro de texto no "
-"puede cambiar el número de líneas de un archivo. Por ejemplo, si activa el "
-"filtro <gui>Comentario de Script</gui>, y compara los siguientes archivos:"
-
-#. (itstool) path: listing/title
-#: C/text-filters.page:80
-msgid "<file>comment1.txt</file>"
-msgstr "<file>comentario1.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#comentario\n"
-"c\n"
-"d"
-
-#. (itstool) path: listing/title
-#: C/text-filters.page:90
-msgid "<file>comment2.txt</file>"
-msgstr "<file>comentario2.txt</file>"
-
-#. (itstool) path: listing/code
-#: C/text-filters.page:91
-#, no-wrap
+#: C/file-mode.page:64
 msgid ""
-"\n"
-"a\n"
-"b\n"
-"c\n"
-"#comment"
+"Once you've finished editing your files, you need to save each file you've "
+"changed."
 msgstr ""
-"\n"
-"a\n"
-"b\n"
-"c\n"
-"#comentario"
+"Cuando haya terminado de editar los archivos, es necesario guardar cada "
+"archivo que se haya modificado."
 
 #. (itstool) path: section/p
-#: C/text-filters.page:101
+#: C/file-mode.page:68
 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."
+"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 ""
-"por lo tanto, las líneas que comienzan con <code>b</code> se mostrarían como "
-"idénticas (los comentarios se eliminan) pero la línea <code>d</code> se "
-"mostraría como diferente a la línea de comentario de la derecha. Esto ocurre "
-"porque el <code>#comentario</code> se quita de la parte derecho, pero la "
-"línea en sí misma no se puede quitar; <app>Meld</app> mostrará la línea "
-"<code>d</code> como diferente de lo que ve como una línea en blanco en el "
-"otro lado."
-
-#. (itstool) path: section/title
-#: C/text-filters.page:114
-msgid "Blank lines and filters"
-msgstr "Líneas en blanco y filtros"
+"Es posible decir si sus archivos se han grabado desde el último cambio por "
+"el icono de guardar que aparece junto al nombre sobre cada archivo. También, "
+"la etiqueta del bloc de notas mostrará un asterisco (<code>*</code>) cuando "
+"el archivo no se haya grabado."
 
 #. (itstool) path: section/p
-#: C/text-filters.page:116
+#: C/file-mode.page:74
 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."
+"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 ""
-"La preferencia <gui>Ignorar cambios con líneas vacías insertadas o "
-"eliminadas</gui> en la pestaña <gui>Filtros de texto</gui> requiere una "
-"explicación más detallada. Si este filtro especial está activado, entonces "
-"cualquier cambio que consista solamente en líneas en blanco, se ignora por "
-"completo. Esto puede ocurrir porque solo haya un cambio de un espacio en "
-"blanco en el texto, pero también puede surgir si los otros filtros de texto "
-"activos han quitado todo el contenido de un cambio, dejando solo líneas en "
-"blanco."
+"Puede guardar el archivo actual seleccionando en el menú <guiseq><gui style="
+"\"menu\">Archivo</gui><gui style=\"menuitem\">Guardar</gui></guiseq>, o "
+"utilizando el atajo <keyseq><key>Ctrl</key><key>S</key></keyseq>. "
 
-#. (itstool) path: section/p
-#: C/text-filters.page:125
+#. (itstool) path: note/p
+#: C/file-mode.page:81
 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."
+"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 ""
-"Puede usarse esta opción para acotar algunos de los <link xref=\"#text-"
-"filter-problems\">problemas y limitaciones</link> resultantes de que los "
-"filtros no son capaces de quitar líneas enteras, pero también puede resultar "
-"útil en y por si mismo."
+"Guardar solo guarda el archivo <em>enfocado actualmente</em>, que es la "
+"página que contiene el cursor. Si no puede decir cual es el archivo "
+"enfocado, puede pulsar en el archivo para enfocarlo antes de guardarlo."
 
 #. (itstool) path: page/title
-#: C/resolving-conflicts.page:15
-msgid "Resolving merge conflicts"
-msgstr "Resolver conflictos al combinar"
+#: C/flattened-view.page:15
+msgid "Flattened view"
+msgstr "Vista aplanada"
 
 #. (itstool) path: page/p
-#: C/resolving-conflicts.page:17
+#: C/flattened-view.page:17
 msgid ""
-"One of the best uses of <app>Meld</app> is to resolve conflicts that occur "
-"while merging different branches."
+"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 ""
-"Uno de los mejores usos de <app>Meld</app> es resolver los conflictos que "
-"ocurren cuando se mezclan diferentes ramas."
+"Cuando esté viendo carpetas grandes, puede estar interesado en solo unos "
+"pocos archivos entre los miles que estén en la carpeta. Por esta razón, "
+"<app>Meld</app> incluye la <em>vista aplanada</em> de una carpeta; solo se "
+"muestran los archivos que no se hayan filtrado (por ejemplo, mediante <link "
+"xref=\"vc-mode#vc-state-filtering\"/>), y la jerarquía de la carpeta se "
+"elimina, con las direcciones de los archivos mostrados en la columna "
+"<em>Ubicación</em>."
 
 #. (itstool) path: page/p
-#: C/resolving-conflicts.page:22
+#: C/flattened-view.page:27
 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"
+"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 ""
-"Por ejemplo, cuando al usar <app>Git</app>, <cmd>git mergetool</cmd> arranca "
-"un «ayudante de mezcla»; <app>Meld</app> es uno de estos ayudantes. Si "
-"quiere hacer que <app>git mergetool</app> use <app>Meld</app> de manera "
-"predeterminada, puede agregar"
+"Se puede activar o desactivar esta vista aplanada seleccionando el menú "
+"<guiseq><gui style=\"menu\">Vista</gui><gui style=\"menuitem\">Aplanar</"
+"gui></guiseq>, o pulsando en el botón <gui style=\"button\">Aplanar</gui> en "
+"la barra de herramientas."
 
-#. (itstool) path: page/code
-#: C/resolving-conflicts.page:27
-#, no-wrap
+#. (itstool) path: page/title
+#: C/folder-mode.page:16
+msgid "Getting started comparing folders"
+msgstr "Primeros pasos para comparar carpetas"
+
+#. (itstool) path: page/p
+#: C/folder-mode.page:18
 msgid ""
-"\n"
-"[merge]\n"
-"    tool = meld\n"
+"<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 ""
-"\n"
-"[merge]\n"
-"    tool = meld\n"
+"<app>Meld</app> permite comparar dos o tres carpetas una junto a la otra. "
+"Puede comenzar una nueva comparación de carpetas seleccionando <guiseq><gui "
+"style=\"menu\">Archivo</gui><gui style=\"menuitem\">Nuevo...</gui></guiseq> "
+"en el menú, y pulsando en la pestaña <gui style=\"tab\">Comparación de "
+"carpetas</gui>."
 
 #. (itstool) path: page/p
-#: C/resolving-conflicts.page:31
+#: C/folder-mode.page:26
 msgid ""
-"to <file>.git/gitconfig</file>. See the <app>git mergetool</app> manual for "
-"details."
+"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 ""
-"al archivo <file>.git/gitconfig</file>. Consulte el manual de <app>git "
-"mergetool</app> para obtener más detalles."
-
-#. (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 "Preferencias de Meld"
-
-#. (itstool) path: terms/title
-#: C/preferences.page:18
-msgid "Editor preferences"
-msgstr "Preferencias del editor"
-
-#. (itstool) path: item/title
-#: C/preferences.page:20
-msgid "Editor command"
-msgstr "Comando del editor"
-
-#. (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 ""
-"El nombre del comando que ejecutar para abrir archivos de texto en un editor "
-"externo. Este puede ser simplemente el comando (por ejemplo: <cmd>gedit</"
-"cmd>) en cuyo caso el archivo que abrir se pasará como el último argumento. "
-"De otra manera, puede agregar los elementos <code>{archivo}</code> y "
-"<code>{línea}</code> al comando, en cuyo caso <app>Meld</app> sustituirá la "
-"ruta al archivo y el número de línea respectivamente (por ejemplo: "
-"<cmd>gedit {archivo}:{línea}</cmd>)."
-
-#. (itstool) path: terms/title
-#: C/preferences.page:31
-#| msgid "Folder comparison states"
-msgid "Folder Comparison preferences"
-msgstr "Preferencias de la comparación de carpetas"
-
-#. (itstool) path: item/title
-#: C/preferences.page:33
-#| msgid "States in folder comparisons"
-msgid "Apply text filters during folder comparisons"
-msgstr "Aplicar filtros de texto en la comparación de carpetas"
+"Las carpetas elegidas se mostrarán una junto a la otra como árboles, con las "
+"diferencias entre archivos resaltadas en cada carpeta. Puede copiar o "
+"eliminar archivos de cada carpeta, o comparar con más detalle archivos de "
+"texto individualmente."
 
-#. (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 ""
-"Al comparar archivo en modo de comparación de carpetas, se pueden aplicar "
-"filtros de texto y otras opciones de manipulación de texto al contenido de "
-"los archivos. Si esta opción está activada, se aplicarán todos los filtros "
-"de texto activados, la opción de eliminación de líneas en blanco se aplicará "
-"adecuadamente, y las diferencias en los finales de línea de ignorarán."
+#. (itstool) path: section/title
+#: C/folder-mode.page:36
+msgid "The folder comparison view"
+msgstr "La vista de comparación de carpetas"
 
-#. (itstool) path: item/p
-#: C/preferences.page:40
+#. (itstool) path: section/p
+#: C/folder-mode.page:38
 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."
+"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 ""
-"Activar esta opción hará que <app>Meld</app> lea por completo todos los "
-"archivos no binarios que estén en memoria durante la comparación de "
-"carpetas. Con archivos de texto grandes, esto puede ser lento y provocar "
-"problemas de memoria."
+"Lo principal en una comparación de carpetas son los árboles que muestran las "
+"carpetas comparadas. Puede <link xref=\"#folder-navigation\">moverse entre</"
+"link> estas comparaciones fácilmente para encontrar los cambios de su "
+"interés. Al elegir un archivo o carpeta, se le brindará información más "
+"detallada en la barra de estado en la parte de abajo de la ventana. "
+"Presionando <key>Intro</key> en el archivo elegido, o pulsando dos veces con "
+"el ratón en cualquier archivo del árbol se abrirá en una nueva pestaña una "
+"<link xref=\"file-mode\">comparación de archivos</link> uno junto al otro, "
+"pero esta opción solo funcionará apropiadamente si son archivos de texto."
 
-#. (itstool) path: item/p
-#: C/preferences.page:44
+#. (itstool) path: section/p
+#: C/folder-mode.page:50
 msgid ""
-"This option only has an effect if \"Compare files based only on size and "
-"timestamp\" is not enabled."
+"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 ""
-"Esta opción sólo tiene efecto si la opción «Comparar archivos basándose sólo "
-"en el tamaño y en la marca de tiempo» no está activada."
+"Hay barras a los lados izquierdo y derecho de la ventana que muestran un "
+"resumen simple y coloreado de los resultados de la comparación. Cada archivo "
+"o carpeta en la comparación corresponde a una pequeña sección de estas "
+"barras, aunque <app>Meld</app> no muestra los archivos <em>Iguales</em> para "
+"que sea más fácil ver cualquier diferencia realmente importante. Es posible "
+"pulsar en cualquier lugar de esta barra para saltar directamente al lugar en "
+"la comparación."
 
-#. (itstool) path: page/title
-#: C/file-changes.page:16
-msgid "Dealing with changes"
-msgstr "Tratando con los cambios"
+#. (itstool) path: section/title
+#: C/folder-mode.page:63
+msgid "Navigating folder comparisons"
+msgstr "Navegar entre comparaciones"
 
-#. (itstool) path: page/p
-#: C/file-changes.page:18
+#. (itstool) path: section/p
+#: C/folder-mode.page:65
 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."
+"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 ""
-"<app>Meld</app> trata las diferencias entre archivos como si fueran una "
-"lista de <em>bloques de cambios</em> o simplemente <em>cambios</em>. Cada "
-"cambio es un grupo de líneas que se corresponden entre archivos. Dado que "
-"estos cambios son lo que usualmente más interesa, <app>Meld</app> ofrece "
-"herramientas específicas para navegar entre estos cambios y editarlos. Puede "
-"encontrar estas herramientas en el menú <gui style=\"menu\">Cambios</gui>."
-
-#. (itstool) path: section/title
-#: C/file-changes.page:30
-msgid "Navigating between changes"
-msgstr "Navegar entre los cambios"
+"Puede saltar entre archivos modificados (esto es, cualquier archivo/carpeta "
+"que <em>no</em> se clasifique como igual) seleccionando en el menú "
+"<guiseq><gui style=\"menu\">Cambios</gui><gui style=\"menuitem\">Cambios "
+"anteriores</gui></guiseq> y <guiseq><gui style=\"menu\">Cambios</gui><gui "
+"style=\"menuitem\">Cambios siguientes</gui></guiseq>, o utilizando los "
+"correspondientes botones en la barra de herramientas."
 
 #. (itstool) path: section/p
-#: C/file-changes.page:32
+#: C/folder-mode.page:73
 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."
+"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 ""
-"Puede navegar entre los cambios con los elementos de menú <guiseq><gui style="
-"\"menu\">Cambios</gui><gui style=\"menuitem\">Cambios Previos</gui></guiseq> "
-"y <guiseq><gui style=\"menu\">Cambios</gui><gui style=\"menuitem\">Siguiente "
-"cambio</gui></guiseq>. También puede usar la rueda de su ratón para moverse "
-"entre los cambios, desplazándose en la barra central de cambios."
+"Puede usar las teclas <key>Izquierda</key> y <key>Derecha</key> para moverse "
+"entre las carpetas comparadas. Esto es útil para poder elegir los archivos "
+"para copiar o eliminar."
 
 #. (itstool) path: section/title
-#: C/file-changes.page:46
-msgid "Changing changes"
-msgstr "Cambiando los cambios"
+#: C/folder-mode.page:83
+msgid "States in folder comparisons"
+msgstr "Estados en la comparación de carpetas"
 
 #. (itstool) path: section/p
-#: C/file-changes.page:48
+#: C/folder-mode.page:85
 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."
+"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 ""
-"Además de editar directamente archivos de texto, <app>Meld</app> brinda "
-"herramientas para mover, copiar o eliminar diferencias individuales entre "
-"archivos. La barra entre dos archivos no sólo muestra qué partes de los dos "
-"archivos se corresponden, sino que también permite combinar a su elección o "
-"eliminar diferentes cambios pulsando en los iconos de la flecha o cruz junto "
-"al comienzo de cada cambio."
+"Cada archivo o carpeta en un árbol tiene su propio <em>estado</em>, que dice "
+"címo difiere del correspondiente archivo/carpeta. Los posibles estados son:"
 
-#. (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 ""
-"La acción predeterminada es <em>reemplazar</em>. Esta acción reemplaza el "
-"contenido del cambio que corresponde con el cambio en el que se está "
-"trabajando."
+#. (itstool) path: table/title
+#: C/folder-mode.page:106
+msgid "Folder comparison states"
+msgstr "Estados de la comparación de carpetas"
 
-#. (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 ""
-"Mantenga pulsada la tecla <key>Mayús</key> para cambiar la acción actual a "
-"<em>eliminar</em>. Esta acción elimina el cambio actual."
+#. (itstool) path: td/p
+#: C/folder-mode.page:110 C/vc-mode.page:85
+msgid "State"
+msgstr "Estado"
 
-#. (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 ""
-"Mantenga pulsada la tecla <key>Ctrl</key> para cambiar la acción actual a "
-"<em>insertar</em>. Esta acción inserta el cambio actual arriba o abajo "
-"(según se haya elegido) del cambio correspondiente."
+#. (itstool) path: td/p
+#: C/folder-mode.page:111 C/vc-mode.page:86
+msgid "Appearance"
+msgstr "Apariencia"
 
-#. (itstool) path: page/title
-#: C/file-mode.page:17
-msgid "Getting started comparing files"
-msgstr "Primeros pasos para comparar archivos"
+#. (itstool) path: td/p
+#: C/folder-mode.page:112 C/vc-mode.page:87
+msgid "Meaning"
+msgstr "Significado"
 
-#. (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> permite comparar dos o tres archivos de texto uno al lado "
-"del otro. Puede comenzar una nueva comparación entre archivos seleccionando "
-"en el menú <guiseq><gui style=\"menu\">Archivo</gui><gui style=\"menuitem"
-"\">Nuevo...</gui></guiseq>."
+#. (itstool) path: td/p
+#: C/folder-mode.page:120 C/vc-mode.page:95
+msgid "Normal font"
+msgstr "Tipografía normal"
 
-#. (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 ""
-"Una vez que haya seleccionado sus archivos, <app>Meld</app> los mostrará uno "
-"junto a otro. Las diferencias entre los archivos se resaltarán para que cada "
-"cambio sea más fácil de ver. Editar los archivos hará que la comparación se "
-"actualice en el acto. Para obtener detalles sobre cómo navegar entre los "
-"cambios individuales, y cómo utilizar la edición basada en cambios, consulte "
-"la <link xref=\"file-changes\"/>."
+#. (itstool) path: td/p
+#: C/folder-mode.page:126
+msgid "The file/folder is the same across all compared folders."
+msgstr "El archivo/carpeta es igual en todas las carpetas comparadas."
 
-#. (itstool) path: section/title
-#: C/file-mode.page:35
-msgid "<app>Meld</app>'s file comparisons"
-msgstr "Las comparaciones de archivos de <app>Meld</app>"
+#. (itstool) path: td/p
+#: C/folder-mode.page:132
+msgid "Same when filtered"
+msgstr "Igual cuando se filtró"
 
-#. (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 ""
-"Hay varias partes diferentes en una comparación entre archivos. La más "
-"importante son los editores en los que los archivos aparecen. Además de "
-"estos editores, las áreas alrededor y entre sus archivos brindan una visión "
-"general y acciones para ayudarle a manejar los cambios entre los archivos."
+#. (itstool) path: td/p
+#: C/folder-mode.page:134
+msgid "Italics"
+msgstr "Cursivas"
 
-#. (itstool) path: section/p
-#: C/file-mode.page:43
+#. (itstool) path: td/p
+#: C/folder-mode.page:140
 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."
+"These files are different across folders, but once <link xref=\"text-filters"
+"\">text filters</link> are applied, these files become identical."
 msgstr ""
-"En los lados izquierdo y derecho de la ventana, hay dos pequeñas barras "
-"verticales que muestran varios bloques de color. Estas barras están "
-"diseñadas para ofrecer una visión general de todas las diferencias entre los "
-"dos archivos. Cada bloque de color representa una sección que se inserta, "
-"elimina, cambia o en conflicto entre sus archivos, dependiendo del bloque de "
-"color usado."
+"Estos archivos son diferentes en las carpetas, pero una vez aplicados los "
+"<link xref=\"text-filters\">filtros de texto</link>, se han vuelto idénticos."
 
-#. (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 ""
-"Entre cada par de archivos hay un segmento que muestra cómo cambiaron las "
-"secciones que se corresponden entre los archivos. Puede pulsar en las "
-"flechas en el segmento para reemplazar las secciones en un archivo con las "
-"del otro. También puede eliminar, copiar o mezclar cambios. Para obtener "
-"detalles sobre cómo hacer cambios en segmentos individuales, consulte la "
-"<link xref=\"file-changes#change-actions\"/>."
+#. (itstool) path: td/p
+#: C/folder-mode.page:150
+msgid "Blue and bold"
+msgstr "Azul y en negrita"
 
-#. (itstool) path: section/title
-#: C/file-mode.page:62
-msgid "Saving your changes"
-msgstr "Guardar los cambios"
+#. (itstool) path: td/p
+#: C/folder-mode.page:156
+msgid "These files differ between the folders being compared."
+msgstr "Estos archivos difieren entre las carpetas comparadas."
 
-#. (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 ""
-"Cuando haya terminado de editar los archivos, es necesario guardar cada "
-"archivo que se haya modificado."
+#. (itstool) path: td/p
+#: C/folder-mode.page:164 C/vc-mode.page:123
+msgid "Green and bold"
+msgstr "Verde y en negrita"
 
-#. (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 ""
-"Es posible decir si sus archivos se han grabado desde el último cambio por "
-"el icono de guardar que aparece junto al nombre sobre cada archivo. También, "
-"la etiqueta del bloc de notas mostrará un asterisco (<code>*</code>) cuando "
-"el archivo no se haya grabado."
+#. (itstool) path: td/p
+#: C/folder-mode.page:170
+msgid "This file/folder exists in this folder, but not in the others."
+msgstr "Este archivo/carpeta existe en esta carpeta, pero no en las otras."
 
-#. (itstool) path: section/p
-#: C/file-mode.page:74
+#. (itstool) path: td/p
+#: C/folder-mode.page:176 C/vc-mode.page:167
+msgid "Missing"
+msgstr "Faltante"
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:178
+msgid "Greyed out text with a line through the middle"
+msgstr "El texto en gris y tachado"
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:184
 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."
+"This file/folder doesn't exist in this folder, but does in one of the others."
 msgstr ""
-"Puede guardar el archivo actual seleccionando en el menú <guiseq><gui style="
-"\"menu\">Archivo</gui><gui style=\"menuitem\">Guardar</gui></guiseq>, o "
-"utilizando el atajo <keyseq><key>Ctrl</key><key>S</key></keyseq>. "
+"Este archivo/carpeta no existe en esta carpeta, pero se encuentra en otra."
 
-#. (itstool) path: note/p
-#: C/file-mode.page:81
+#. (itstool) path: td/p
+#: C/folder-mode.page:191 C/vc-mode.page:212
+msgid "Error"
+msgstr "Error"
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:193 C/vc-mode.page:214
+msgid "Bright red with a yellow background and bold"
+msgstr "Rojo brillante con un fondo amarillo y negrita"
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:199
 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."
+"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 ""
-"Guardar solo guarda el archivo <em>enfocado actualmente</em>, que es la "
-"página que contiene el cursor. Si no puede decir cual es el archivo "
-"enfocado, puede pulsar en el archivo para enfocarlo antes de guardarlo."
-
-#. (itstool) path: page/title
-#: C/flattened-view.page:15
-msgid "Flattened view"
-msgstr "Vista aplanada"
+"Hubo un error al comparar este archivo. La causa de error más común son los "
+"permisos (esto es, <app>Meld</app> no pudo abrir el archivo) y los errores "
+"en la codificación del nombre de archivo."
 
-#. (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 heirarchy is stripped away, with file paths "
-#| "shown in the <em>Location</em> column."
+#. (itstool) path: section/p
+#: C/folder-mode.page:217
 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."
+"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 ""
-"Cuando esté viendo carpetas grandes, puede estar interesado en solo unos "
-"pocos archivos entre los miles que estén en la carpeta. Por esta razón, "
-"<app>Meld</app> incluye la <em>vista aplanada</em> de una carpeta; solo se "
-"muestran los archivos que no se hayan filtrado (por ejemplo, mediante <link "
-"xref=\"vc-mode#vc-state-filtering\"/>), y la jerarquía de la carpeta se "
-"elimina, con las direcciones de los archivos mostrados en la columna "
-"<em>Ubicación</em>."
+"Es posible filtrar archivos en base a sus estados, por ejemplo, mostrar solo "
+"los archivos <em>Modificados</em>. Puede leer más sobre esto en la <link "
+"xref=\"file-filters#file-state-filter\"/>."
 
-#. (itstool) path: page/p
-#: C/flattened-view.page:27
+#. (itstool) path: section/p
+#: C/folder-mode.page:223
+#| msgid ""
+#| "Finally, the most recently modified file/folder has an emblem attached to "
+#| "it."
 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."
+"Finally, the most recently modified file/folder has a small star emblem "
+"attached to it."
 msgstr ""
-"Se puede activar o desactivar esta vista aplanada seleccionando el menú "
-"<guiseq><gui style=\"menu\">Vista</gui><gui style=\"menuitem\">Aplanar</"
-"gui></guiseq>, o pulsando en el botón <gui style=\"button\">Aplanar</gui> en "
-"la barra de herramientas."
+"Por último, el archivo/carpeta modificado más recientemente lleva una "
+"pequeña estrella adjunta."
 
 #. (itstool) path: page/title
 #: C/index.page:14
@@ -1089,269 +976,36 @@ msgstr "Usar Meld con un sistema de control de versiones"
 msgid "Advanced Usage"
 msgstr "Uso avanzado"
 
-#. (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 "Ver archivos bajo control de versiones"
+#: C/introduction.page:15
+msgid "What is Meld?"
+msgstr "¿Qué es Meld?"
 
 #. (itstool) path: page/p
-#: C/vc-mode.page:18
+#: C/introduction.page:16
 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."
+"<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> se integra con <link xref=\"vc-supported\">varios sistemas "
-"de control de versiones</link> para permitir revisar los cambios locales y "
-"ejecutar tareas simples de control de versiones. Puede empezar una nueva "
-"comparación de control de versiones eligiendo en el menú <guiseq><gui style="
-"\"menu\">Archivo</gui><gui style=\"menuitem\">Nuevo...</gui></guiseq>, y "
-"pulsando en la pestaña <gui style=\"tab\">Control de Versiones</gui>."
-
-#. (itstool) path: section/title
-#: C/vc-mode.page:30
-msgid "Version control comparisons"
-msgstr "Comparaciones entre versiones"
+"<app>Meld</app> es una herramienta para comparar archivos y carpetas, y para "
+"resolver diferencias entre ellos. También es útil para comparar cambios "
+"capturados por sistemas de control de versiones."
 
-#. (itstool) path: section/p
-#: C/vc-mode.page:32
+#. (itstool) path: page/p
+#: C/introduction.page:22
 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 ""
-"Las comparaciones en sistemas de control de versiones muestran las "
-"diferencias entre los contenidos de su carpeta y la versión del repositorio "
-"actual. Cada archivo en su copia local tienen un <link xref=\"#vc-state"
-"\">estado</link> que indica en qué difiere de la copia del repositorio."
-
-#. (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 ""
-"Si quiere mirar unas diferencias de archivos en particular, puede elegirlo y "
-"presionar <key>Intro</key>, o pulsar dos veces en el archivo para empezar "
-"una <link xref=\"file-mode\">comparación de archivos</link>. También puede "
-"interactuar con su sistema de control de versiones usando el menú <gui style="
-"\"menu\">Cambios</gui>."
-
-#. (itstool) path: section/title
-#. (itstool) path: table/title
-#: C/vc-mode.page:56 C/vc-mode.page:81
-msgid "Version control states"
-msgstr "Estados del control de versiones"
-
-#. (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 ""
-"Cada archivo o carpeta en una comparación de control de versiones tiene un "
-"<em>estado</em>, obtenido por el propio sistema de control de versiones. "
-"<app>Meld</app> mapea estos diferentes estados en un conjunto estándar de "
-"conceptos muy similares. De este modo, <app>Meld</app> puede utilizar "
-"nombres ligeramente diferentes para los estados de los que emplea su sistema "
-"de control de versiones. Los estados posibles son:"
-
-#. (itstool) path: td/p
-#: C/vc-mode.page:85 C/folder-mode.page:110
-msgid "State"
-msgstr "Estado"
-
-#. (itstool) path: td/p
-#: C/vc-mode.page:86 C/folder-mode.page:111
-msgid "Appearance"
-msgstr "Apariencia"
-
-#. (itstool) path: td/p
-#: C/vc-mode.page:87 C/folder-mode.page:112
-msgid "Meaning"
-msgstr "Significado"
-
-#. (itstool) path: td/p
-#: C/vc-mode.page:95 C/folder-mode.page:120
-msgid "Normal font"
-msgstr "Tipografía normal"
-
-#. (itstool) path: td/p
-#: C/vc-mode.page:101
-msgid "The file/folder is the same as the repository version."
-msgstr "El archivo o carpeta es el mismo que el del repositorio"
-
-#. (itstool) path: td/p
-#: C/vc-mode.page:109
-msgid "Red and bold"
-msgstr "Rojo y en negrita"
-
-#. (itstool) path: td/p
-#: C/vc-mode.page:115
-msgid "This file is different to the repository version."
-msgstr "El archivo difiere respecto a la versión del repositorio."
-
-#. (itstool) path: td/p
-#: C/vc-mode.page:123 C/folder-mode.page:164
-msgid "Green and bold"
-msgstr "Verde y en negrita"
-
-#. (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 ""
-"El archivo o carpeta es nuevo, y está programado para añadirlo al "
-"repositorio."
-
-#. (itstool) path: td/p
-#: C/vc-mode.page:136
-msgid "Removed"
-msgstr "Eliminado"
-
-#. (itstool) path: td/p
-#: C/vc-mode.page:138
-msgid "Red bold text with a line through the middle"
-msgstr "Rojo en negrita y con una línea en el medio"
-
-#. (itstool) path: td/p
-#: C/vc-mode.page:144
-msgid ""
-"This file/folder existed, but is scheduled to be removed from the repository."
-msgstr ""
-"El archivo o carpeta existe, pero está programado para quitarlo del "
-"repositorio."
-
-#. (itstool) path: td/p
-#: C/vc-mode.page:151
-msgid "Conflict"
-msgstr "Conflicto"
-
-#. (itstool) path: td/p
-#: C/vc-mode.page:153
-msgid "Bright red bold text"
-msgstr "Texto en negrita rojo claro"
-
-#. (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 ""
-"Cuando se intenta mezclar con el repositorio, las diferencias entre los "
-"archivos locales y los del repositorio podrían no resolverse, y entonces el "
-"archivo se encontrará en conflicto con el contenido del repositorio"
-
-#. (itstool) path: td/p
-#: C/vc-mode.page:167 C/folder-mode.page:176
-msgid "Missing"
-msgstr "Faltante"
-
-#. (itstool) path: td/p
-#: C/vc-mode.page:169
-msgid "Blue bold text with a line through the middle"
-msgstr "Negrita azul con una línea en el medio"
-
-#. (itstool) path: td/p
-#: C/vc-mode.page:175
-msgid "This file/folder should be present, but isn't."
-msgstr "Este archivo/carpeta debería estar presente, pero no lo está."
-
-#. (itstool) path: td/p
-#: C/vc-mode.page:181
-msgid "Ignored"
-msgstr "Ignorado"
-
-#. (itstool) path: td/p
-#: C/vc-mode.page:183 C/vc-mode.page:199
-msgid "Greyed out text"
-msgstr "Texto en gris"
-
-#. (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 ""
-"Este archivo/carpeta se ha ignorado deliberadamente (ej. por una entrada en "
-"<file>.gitignore</file>) y no está bajo el control de versiones."
-
-#. (itstool) path: td/p
-#: C/vc-mode.page:197
-msgid "Unversioned"
-msgstr "Sin control de versiones"
-
-#. (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 ""
-"Este archivo no se encuentra en el sistema de control de versiones; solo en "
-"la copia local"
-
-#. (itstool) path: td/p
-#: C/vc-mode.page:212 C/folder-mode.page:191
-msgid "Error"
-msgstr "Error"
-
-#. (itstool) path: td/p
-#: C/vc-mode.page:214 C/folder-mode.page:193
-msgid "Bright red with a yellow background and bold"
-msgstr "Rojo brillante con un fondo amarillo y negrita"
-
-#. (itstool) path: td/p
-#: C/vc-mode.page:220
-msgid "The version control system has reported a problem with this file."
-msgstr ""
-"El sistema de control de versiones ha reportado un problema con este archivo."
-
-#. (itstool) path: section/title
-#: C/vc-mode.page:230
-msgid "Version control state filtering"
-msgstr "Filtrar el estado del control de versiones"
-
-#. (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\">Non VC</"
-#| "gui> and <gui style=\"button\">Ignored</gui> buttons on the toolbar."
-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."
+"<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 ""
-"A menudo, querrá ver solo los archivos que se presentan alguna diferencia; "
-"esta es la configuración predeterminada en <app>Meld</app>. Puede cambiar "
-"qué estados de archivos se muestran usando el menú <guiseq><gui style=\"menu"
-"\">Vista</gui><gui style=\"menuitem\">Estado de la versión</gui></guiseq> o "
-"pulsando los botones <gui style=\"button\">Modificado</gui>, <gui style="
-"\"button\">Normal</gui>, <gui style=\"button\">Sin control de versiones</"
-"gui> o <gui style=\"button\">Ignorado</gui> en la barra de herramientas."
+"<app>Meld</app> muestra las diferencias entre dos o tres archivos (o dos o "
+"tres carpetas) y permite mover contenido entre ellos, o editar los archivos "
+"manualmente. <app>Meld</app> está enfocado a ayudar a los desarrolladores a "
+"comparar y mezclar archivos fuente, y tener una supervisión gráfica de los "
+"cambios en su sistema de control de versiones favorito."
 
 #. (itstool) path: page/title
 #: C/keyboard-shortcuts.page:15
@@ -1366,12 +1020,14 @@ msgstr "Atajos para trabajar con archivos y comparaciones"
 #. (itstool) path: td/p
 #: C/keyboard-shortcuts.page:22 C/keyboard-shortcuts.page:56
 #: C/keyboard-shortcuts.page:109 C/keyboard-shortcuts.page:131
+#: C/keyboard-shortcuts.page:153
 msgid "Shortcut"
 msgstr "Atajo"
 
 #. (itstool) path: td/p
 #: C/keyboard-shortcuts.page:22 C/keyboard-shortcuts.page:56
 #: C/keyboard-shortcuts.page:109 C/keyboard-shortcuts.page:131
+#: C/keyboard-shortcuts.page:153
 msgid "Description"
 msgstr "Descripción"
 
@@ -1503,7 +1159,6 @@ msgstr "Buscar la siguiente instancia de la cadena"
 
 #. (itstool) path: td/p
 #: C/keyboard-shortcuts.page:90
-#| msgid "<keyseq><key>Alt</key><key>Up</key></keyseq>"
 msgid "<keyseq><key>Alt</key><key>Down</key></keyseq>"
 msgstr "<keyseq><key>Alt</key><key>Abajo</key></keyseq>"
 
@@ -1532,391 +1187,752 @@ msgstr ""
 
 #. (itstool) path: table/title
 #: C/keyboard-shortcuts.page:105
+#| msgid "States in folder comparisons"
+msgid "Shortcuts for folder comparison"
+msgstr "Atajos para la comparación de carpetas"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:115
+#| msgid "<keyseq><key>F1</key></keyseq>"
+msgid "<keyseq><key>+</key></keyseq>"
+msgstr "<keyseq><key>+</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:116
+#| msgid "Stop the current comparison."
+msgid "Expand the current folder."
+msgstr "Expandir la carpeta actual."
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:119
+#| msgid "<keyseq><key>F1</key></keyseq>"
+msgid "<keyseq><key>-</key></keyseq>"
+msgstr "<keyseq><key>-</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:120
+#| msgid "Close the current comparison."
+msgid "Collapse the current folder."
+msgstr "Contraer la carpeta actual."
+
+#. (itstool) path: table/title
+#: C/keyboard-shortcuts.page:127
 msgid "Shortcuts for view settings"
 msgstr "Atajos para la configuración de la vista."
 
 #. (itstool) path: td/p
-#: C/keyboard-shortcuts.page:115
+#: C/keyboard-shortcuts.page:137
 msgid "<keyseq><key>Escape</key></keyseq>"
 msgstr "<keyseq><key>Esc</key></keyseq>"
 
 #. (itstool) path: td/p
-#: C/keyboard-shortcuts.page:116
+#: C/keyboard-shortcuts.page:138
 msgid "Stop the current comparison."
 msgstr "Detener la comparación actual."
 
 #. (itstool) path: td/p
-#: C/keyboard-shortcuts.page:119
+#: C/keyboard-shortcuts.page:141
 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
+#: C/keyboard-shortcuts.page:142
 msgid "Refresh the current comparison."
 msgstr "Actualizar la comparación actual."
 
 #. (itstool) path: table/title
-#: C/keyboard-shortcuts.page:127
+#: C/keyboard-shortcuts.page:149
 msgid "Shortcuts for help"
 msgstr "Atajos para la ayuda"
 
 #. (itstool) path: td/p
-#: C/keyboard-shortcuts.page:137
+#: C/keyboard-shortcuts.page:159
 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 "Abrir en manual de usuario de <app>Meld</app>."
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:160
+msgid "Open <app>Meld</app>'s user manual."
+msgstr "Abrir en manual de usuario de <app>Meld</app>."
+
+#. (itstool) path: p/link
+#: C/legal.xml:4
+msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
+msgstr "Creative Commons Atribución - Compartir igual 3.0 sin soporte"
+
+#. (itstool) path: license/p
+#: C/legal.xml:3
+msgid "This work is licensed under a <_:link-1/>."
+msgstr "Este trabajo está licenciado bajo la <_:link-1/>."
+
+#. (itstool) path: license/p
+#: C/legal.xml:6
+msgid ""
+"As a special exception, the copyright holders give you permission to copy, "
+"modify, and distribute the example code contained in this document under the "
+"terms of your choosing, without restriction."
+msgstr ""
+"Como excepción especial, los poseedores de los derechos de autor le dan "
+"permiso para copiar, modificar y distribuir el código de ejemplo contenido "
+"en este documento bajo los términos que usted elija, sin restricción."
+
+#. (itstool) path: page/title
+#: C/missing-functionality.page:15
+msgid "Things that <app>Meld</app> doesn't do"
+msgstr "Cosas que <app>Meld</app> no hace"
+
+#
+#. (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 ""
+"¿Nunca ha perdido media hora investigando una aplicación intentando ver cómo "
+"hacer algo, pensando que <em>seguramente</em> debe haber una opción para eso?"
+
+#. (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 ""
+"Esta sección lista unas pocas cosas comunes que <app>Meld</app> <em>no</em> "
+"hace, ya sea por una decisión deliberada, o porque nos faltó tiempo."
+
+#. (itstool) path: section/title
+#: C/missing-functionality.page:30
+msgid "Aligning changes by adding lines"
+msgstr "Alinear los cambios al agregar líneas"
+
+#. (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 ""
+"Cuando <app>Meld</app> muestra diferencias entre archivos, muestra ambos de "
+"la manera en que aparecerían en un editor de textos normal. <em>No</em> "
+"inserta líneas adicionales de manera que los lados derecho e izquierdo de un "
+"cambio en particular sean del mismo tamaño. No existe una opción para esto."
+
+#. (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 "Preferencias de Meld"
+
+#. (itstool) path: terms/title
+#: C/preferences.page:18
+msgid "Editor preferences"
+msgstr "Preferencias del editor"
+
+#. (itstool) path: item/title
+#: C/preferences.page:20
+msgid "Editor command"
+msgstr "Comando del editor"
+
+#. (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 ""
+"El nombre del comando que ejecutar para abrir archivos de texto en un editor "
+"externo. Este puede ser simplemente el comando (por ejemplo: <cmd>gedit</"
+"cmd>) en cuyo caso el archivo que abrir se pasará como el último argumento. "
+"De otra manera, puede agregar los elementos <code>{archivo}</code> y "
+"<code>{línea}</code> al comando, en cuyo caso <app>Meld</app> sustituirá la "
+"ruta al archivo y el número de línea respectivamente (por ejemplo: "
+"<cmd>gedit {archivo}:{línea}</cmd>)."
+
+#. (itstool) path: terms/title
+#: C/preferences.page:31
+msgid "Folder Comparison preferences"
+msgstr "Preferencias de la comparación de carpetas"
+
+#. (itstool) path: item/title
+#: C/preferences.page:33
+msgid "Apply text filters during folder comparisons"
+msgstr "Aplicar filtros de texto en la comparación de carpetas"
+
+#. (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 ""
+"Al comparar archivo en modo de comparación de carpetas, se pueden aplicar "
+"filtros de texto y otras opciones de manipulación de texto al contenido de "
+"los archivos. Si esta opción está activada, se aplicarán todos los filtros "
+"de texto activados, la opción de eliminación de líneas en blanco se aplicará "
+"adecuadamente, y las diferencias en los finales de línea de ignorarán."
+
+#. (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 ""
+"Activar esta opción hará que <app>Meld</app> lea por completo todos los "
+"archivos no binarios que estén en memoria durante la comparación de "
+"carpetas. Con archivos de texto grandes, esto puede ser lento y provocar "
+"problemas de memoria."
+
+#. (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 ""
+"Esta opción sólo tiene efecto si la opción «Comparar archivos basándose sólo "
+"en el tamaño y en la marca de tiempo» no está activada."
+
+#. (itstool) path: page/title
+#: C/resolving-conflicts.page:15
+msgid "Resolving merge conflicts"
+msgstr "Resolver conflictos al combinar"
+
+#. (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 ""
+"Uno de los mejores usos de <app>Meld</app> es resolver los conflictos que "
+"ocurren cuando se mezclan diferentes ramas."
+
+#. (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 ""
+"Por ejemplo, cuando al usar <app>Git</app>, <cmd>git mergetool</cmd> arranca "
+"un «ayudante de mezcla»; <app>Meld</app> es uno de estos ayudantes. Si "
+"quiere hacer que <app>git mergetool</app> use <app>Meld</app> de manera "
+"predeterminada, puede agregar"
+
+#. (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 ""
+"al archivo <file>.git/gitconfig</file>. Consulte el manual de <app>git "
+"mergetool</app> para obtener más detalles."
+
+#. (itstool) path: page/title
+#: C/text-filters.page:17
+msgid "Filtering out text"
+msgstr "Filtrado de texto"
+
+#. (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 ""
+"Cuando compare varios archivos, puede tener varias secciones de texto donde "
+"las diferencias no sean realmente importantes, quizás quiera enfocarse en "
+"los cambios en las secciones de código, e ignorar los cambios en los "
+"comentarios. Con los filtros de texto puede decirle a <app>Meld</app> que "
+"ignore el texto que coincida con el patrón (ej, con una expresión regular) "
+"cuando muestre las diferencias entre archivos."
+
+#. (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 ""
+"Los filtros de texto no solo afectan las comparaciones entre archivos, sino "
+"también las comparaciones entre carpetas. Consulte a las <link xref=\"file-"
+"filters\"> notas sobre filtros de archivos </link> para obtener más detalles."
+
+#. (itstool) path: section/title
+#: C/text-filters.page:37
+msgid "Adding and using text filters"
+msgstr "Agregar y usar filtros de texto"
+
+#. (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 ""
+"Se pueden activar o desactivar los filtros de texto desde la pestaña "
+"<gui>Filtros de Texto</gui> en la ventana de <gui>Preferencias</gui>. "
+"<app>Meld</app> proporciona unos pocos simples filtros que pueden resultar "
+"útiles, pero es posible añadir los propios también. "
+
+#. (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 ""
+"En <app>Meld</app>, los filtros de texto son expresiones regulares que se "
+"comparan con el texto de los archivos que se están comparando. Cualquier "
+"texto que coincida se ignora durante la comparación; todavía puede verse ese "
+"texto en la vista de comparación, pero no se tendrá en cuenta cuando se "
+"encuentren las diferencias. Los filtros de texto se aplican en orden, de "
+"forma que es posible para el primer filtro quitar texto que podría coincidir "
+"con el segundo filtro, y así sucesivamente."
+
+#. (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 ""
+"Si no está familiarizado con las expresiones regulares, tal ve quiera "
+"consultar el <link href=\"http://docs.python.org/howto/regex.html\"> "
+"Tutorial de expresiones regulares</link> de Python."
+
+#. (itstool) path: section/title
+#: C/text-filters.page:67
+msgid "Getting text filters right"
+msgstr "Conseguir filtros de texto correctos"
+
+#. (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 ""
+"Es fácil cometer errores con el filtrado de texto, y el soporte para "
+"filtrado de Meld no está completo. En particular, un filtro de texto no "
+"puede cambiar el número de líneas de un archivo. Por ejemplo, si activa el "
+"filtro <gui>Comentario de Script</gui>, y compara los siguientes archivos:"
+
+#. (itstool) path: listing/title
+#: C/text-filters.page:80
+msgid "<file>comment1.txt</file>"
+msgstr "<file>comentario1.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#comentario\n"
+"c\n"
+"d"
+
+#. (itstool) path: listing/title
+#: C/text-filters.page:90
+msgid "<file>comment2.txt</file>"
+msgstr "<file>comentario2.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"
+"#comentario"
+
+#. (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 ""
+"por lo tanto, las líneas que comienzan con <code>b</code> se mostrarían como "
+"idénticas (los comentarios se eliminan) pero la línea <code>d</code> se "
+"mostraría como diferente a la línea de comentario de la derecha. Esto ocurre "
+"porque el <code>#comentario</code> se quita de la parte derecho, pero la "
+"línea en sí misma no se puede quitar; <app>Meld</app> mostrará la línea "
+"<code>d</code> como diferente de lo que ve como una línea en blanco en el "
+"otro lado."
 
-#. (itstool) path: page/title
-#: C/introduction.page:15
-msgid "What is Meld?"
-msgstr "¿Qué es Meld?"
+#. (itstool) path: section/title
+#: C/text-filters.page:114
+msgid "Blank lines and filters"
+msgstr "Líneas en blanco y filtros"
 
-#. (itstool) path: page/p
-#: C/introduction.page:16
+#. (itstool) path: section/p
+#: C/text-filters.page:116
 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."
+"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 ""
-"<app>Meld</app> es una herramienta para comparar archivos y carpetas, y para "
-"resolver diferencias entre ellos. También es útil para comparar cambios "
-"capturados por sistemas de control de versiones."
+"La preferencia <gui>Ignorar cambios con líneas vacías insertadas o "
+"eliminadas</gui> en la pestaña <gui>Filtros de texto</gui> requiere una "
+"explicación más detallada. Si este filtro especial está activado, entonces "
+"cualquier cambio que consista solamente en líneas en blanco, se ignora por "
+"completo. Esto puede ocurrir porque solo haya un cambio de un espacio en "
+"blanco en el texto, pero también puede surgir si los otros filtros de texto "
+"activos han quitado todo el contenido de un cambio, dejando solo líneas en "
+"blanco."
 
-#. (itstool) path: page/p
-#: C/introduction.page:22
+#. (itstool) path: section/p
+#: C/text-filters.page:125
 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."
+"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 ""
-"<app>Meld</app> muestra las diferencias entre dos o tres archivos (o dos o "
-"tres carpetas) y permite mover contenido entre ellos, o editar los archivos "
-"manualmente. <app>Meld</app> está enfocado a ayudar a los desarrolladores a "
-"comparar y mezclar archivos fuente, y tener una supervisión gráfica de los "
-"cambios en su sistema de control de versiones favorito."
+"Puede usarse esta opción para acotar algunos de los <link xref=\"#text-"
+"filter-problems\">problemas y limitaciones</link> resultantes de que los "
+"filtros no son capaces de quitar líneas enteras, pero también puede resultar "
+"útil en y por si mismo."
 
-#. (itstool) path: page/title
-#: C/folder-mode.page:16
-msgid "Getting started comparing folders"
-msgstr "Primeros pasos para comparar carpetas"
+#. (itstool) path: info/title
+#: C/vc-mode.page:5
+msgctxt "sort"
+msgid "0"
+msgstr "0"
 
-#. (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> permite comparar dos o tres carpetas una junto a la otra. "
-"Puede comenzar una nueva comparación de carpetas seleccionando <guiseq><gui "
-"style=\"menu\">Archivo</gui><gui style=\"menuitem\">Nuevo...</gui></guiseq> "
-"en el menú, y pulsando en la pestaña <gui style=\"tab\">Comparación de "
-"carpetas</gui>."
+#. (itstool) path: page/title
+#: C/vc-mode.page:16
+msgid "Viewing version-controlled files"
+msgstr "Ver archivos bajo control de versiones"
 
 #. (itstool) path: page/p
-#: C/folder-mode.page:26
+#: C/vc-mode.page:18
 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."
+"<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 ""
-"Las carpetas elegidas se mostrarán una junto a la otra como árboles, con las "
-"diferencias entre archivos resaltadas en cada carpeta. Puede copiar o "
-"eliminar archivos de cada carpeta, o comparar con más detalle archivos de "
-"texto individualmente."
+"<app>Meld</app> se integra con <link xref=\"vc-supported\">varios sistemas "
+"de control de versiones</link> para permitir revisar los cambios locales y "
+"ejecutar tareas simples de control de versiones. Puede empezar una nueva "
+"comparación de control de versiones eligiendo en el menú <guiseq><gui style="
+"\"menu\">Archivo</gui><gui style=\"menuitem\">Nuevo...</gui></guiseq>, y "
+"pulsando en la pestaña <gui style=\"tab\">Control de Versiones</gui>."
 
 #. (itstool) path: section/title
-#: C/folder-mode.page:36
-msgid "The folder comparison view"
-msgstr "La vista de comparación de carpetas"
+#: C/vc-mode.page:30
+msgid "Version control comparisons"
+msgstr "Comparaciones entre versiones"
 
 #. (itstool) path: section/p
-#: C/folder-mode.page:38
+#: C/vc-mode.page:32
 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!"
+"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 ""
-"Lo principal en una comparación de carpetas son los árboles que muestran las "
-"carpetas comparadas. Puede <link xref=\"#folder-navigation\">moverse entre</"
-"link> estas comparaciones fácilmente para encontrar los cambios de su "
-"interés. Al elegir un archivo o carpeta, se le brindará información más "
-"detallada en la barra de estado en la parte de abajo de la ventana. "
-"Presionando <key>Intro</key> en el archivo elegido, o pulsando dos veces con "
-"el ratón en cualquier archivo del árbol se abrirá en una nueva pestaña una "
-"<link xref=\"file-mode\">comparación de archivos</link> uno junto al otro, "
-"pero esta opción solo funcionará apropiadamente si son archivos de texto."
+"Las comparaciones en sistemas de control de versiones muestran las "
+"diferencias entre los contenidos de su carpeta y la versión del repositorio "
+"actual. Cada archivo en su copia local tienen un <link xref=\"#vc-state"
+"\">estado</link> que indica en qué difiere de la copia del repositorio."
 
 #. (itstool) path: section/p
-#: C/folder-mode.page:50
+#: C/vc-mode.page:46
 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."
+"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 ""
-"Hay barras a los lados izquierdo y derecho de la ventana que muestran un "
-"resumen simple y coloreado de los resultados de la comparación. Cada archivo "
-"o carpeta en la comparación corresponde a una pequeña sección de estas "
-"barras, aunque <app>Meld</app> no muestra los archivos <em>Iguales</em> para "
-"que sea más fácil ver cualquier diferencia realmente importante. Es posible "
-"pulsar en cualquier lugar de esta barra para saltar directamente al lugar en "
-"la comparación."
+"Si quiere mirar unas diferencias de archivos en particular, puede elegirlo y "
+"presionar <key>Intro</key>, o pulsar dos veces en el archivo para empezar "
+"una <link xref=\"file-mode\">comparación de archivos</link>. También puede "
+"interactuar con su sistema de control de versiones usando el menú <gui style="
+"\"menu\">Cambios</gui>."
 
 #. (itstool) path: section/title
-#: C/folder-mode.page:63
-msgid "Navigating folder comparisons"
-msgstr "Navegar entre comparaciones"
+#. (itstool) path: table/title
+#: C/vc-mode.page:56 C/vc-mode.page:81
+msgid "Version control states"
+msgstr "Estados del control de versiones"
 
 #. (itstool) path: section/p
-#: C/folder-mode.page:65
+#: C/vc-mode.page:58
 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."
+"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 ""
-"Puede saltar entre archivos modificados (esto es, cualquier archivo/carpeta "
-"que <em>no</em> se clasifique como igual) seleccionando en el menú "
-"<guiseq><gui style=\"menu\">Cambios</gui><gui style=\"menuitem\">Cambios "
-"anteriores</gui></guiseq> y <guiseq><gui style=\"menu\">Cambios</gui><gui "
-"style=\"menuitem\">Cambios siguientes</gui></guiseq>, o utilizando los "
-"correspondientes botones en la barra de herramientas."
+"Cada archivo o carpeta en una comparación de control de versiones tiene un "
+"<em>estado</em>, obtenido por el propio sistema de control de versiones. "
+"<app>Meld</app> mapea estos diferentes estados en un conjunto estándar de "
+"conceptos muy similares. De este modo, <app>Meld</app> puede utilizar "
+"nombres ligeramente diferentes para los estados de los que emplea su sistema "
+"de control de versiones. Los estados posibles son:"
 
-#. (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 ""
-"Puede usar las teclas <key>Izquierda</key> y <key>Derecha</key> para moverse "
-"entre las carpetas comparadas. Esto es útil para poder elegir los archivos "
-"para copiar o eliminar."
+#. (itstool) path: td/p
+#: C/vc-mode.page:101
+msgid "The file/folder is the same as the repository version."
+msgstr "El archivo o carpeta es el mismo que el del repositorio"
 
-#. (itstool) path: section/title
-#: C/folder-mode.page:83
-msgid "States in folder comparisons"
-msgstr "Estados en la comparación de carpetas"
+#. (itstool) path: td/p
+#: C/vc-mode.page:109
+msgid "Red and bold"
+msgstr "Rojo y en negrita"
 
-#. (itstool) path: section/p
-#: C/folder-mode.page:85
+#. (itstool) path: td/p
+#: C/vc-mode.page:115
+msgid "This file is different to the repository version."
+msgstr "El archivo difiere respecto a la versión del repositorio."
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:129
 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:"
+"This file/folder is new, and is scheduled to be added to the repository."
 msgstr ""
-"Cada archivo o carpeta en un árbol tiene su propio <em>estado</em>, que dice "
-"címo difiere del correspondiente archivo/carpeta. Los posibles estados son:"
+"El archivo o carpeta es nuevo, y está programado para añadirlo al "
+"repositorio."
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:136
+msgid "Removed"
+msgstr "Eliminado"
 
-#. (itstool) path: table/title
-#: C/folder-mode.page:106
-msgid "Folder comparison states"
-msgstr "Estados de la comparación de carpetas"
+#. (itstool) path: td/p
+#: C/vc-mode.page:138
+msgid "Red bold text with a line through the middle"
+msgstr "Rojo en negrita y con una línea en el medio"
 
 #. (itstool) path: td/p
-#: C/folder-mode.page:126
-msgid "The file/folder is the same across all compared folders."
-msgstr "El archivo/carpeta es igual en todas las carpetas comparadas."
+#: C/vc-mode.page:144
+msgid ""
+"This file/folder existed, but is scheduled to be removed from the repository."
+msgstr ""
+"El archivo o carpeta existe, pero está programado para quitarlo del "
+"repositorio."
 
 #. (itstool) path: td/p
-#: C/folder-mode.page:132
-msgid "Same when filtered"
-msgstr "Igual cuando se filtró"
+#: C/vc-mode.page:151
+msgid "Conflict"
+msgstr "Conflicto"
 
 #. (itstool) path: td/p
-#: C/folder-mode.page:134
-msgid "Italics"
-msgstr "Cursivas"
+#: C/vc-mode.page:153
+msgid "Bright red bold text"
+msgstr "Texto en negrita rojo claro"
 
 #. (itstool) path: td/p
-#: C/folder-mode.page:140
+#: C/vc-mode.page:159
 msgid ""
-"These files are different across folders, but once <link xref=\"text-filters"
-"\">text filters</link> are applied, these files become identical."
+"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 ""
-"Estos archivos son diferentes en las carpetas, pero una vez aplicados los "
-"<link xref=\"text-filters\">filtros de texto</link>, se han vuelto idénticos."
+"Cuando se intenta mezclar con el repositorio, las diferencias entre los "
+"archivos locales y los del repositorio podrían no resolverse, y entonces el "
+"archivo se encontrará en conflicto con el contenido del repositorio"
 
 #. (itstool) path: td/p
-#: C/folder-mode.page:150
-#| msgid "Red and bold"
-msgid "Blue and bold"
-msgstr "Azul y en negrita"
+#: C/vc-mode.page:169
+msgid "Blue bold text with a line through the middle"
+msgstr "Negrita azul con una línea en el medio"
 
 #. (itstool) path: td/p
-#: C/folder-mode.page:156
-msgid "These files differ between the folders being compared."
-msgstr "Estos archivos difieren entre las carpetas comparadas."
+#: C/vc-mode.page:175
+msgid "This file/folder should be present, but isn't."
+msgstr "Este archivo/carpeta debería estar presente, pero no lo está."
 
 #. (itstool) path: td/p
-#: C/folder-mode.page:170
-msgid "This file/folder exists in this folder, but not in the others."
-msgstr "Este archivo/carpeta existe en esta carpeta, pero no en las otras."
+#: C/vc-mode.page:181
+msgid "Ignored"
+msgstr "Ignorado"
 
 #. (itstool) path: td/p
-#: C/folder-mode.page:178
-msgid "Greyed out text with a line through the middle"
-msgstr "El texto en gris y tachado"
+#: C/vc-mode.page:183 C/vc-mode.page:199
+msgid "Greyed out text"
+msgstr "Texto en gris"
 
 #. (itstool) path: td/p
-#: C/folder-mode.page:184
+#: C/vc-mode.page:189
 msgid ""
-"This file/folder doesn't exist in this folder, but does in one of the others."
+"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 ""
-"Este archivo/carpeta no existe en esta carpeta, pero se encuentra en otra."
+"Este archivo/carpeta se ha ignorado deliberadamente (ej. por una entrada en "
+"<file>.gitignore</file>) y no está bajo el control de versiones."
 
 #. (itstool) path: td/p
-#: C/folder-mode.page:199
+#: C/vc-mode.page:197
+msgid "Unversioned"
+msgstr "Sin control de versiones"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:205
 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."
+"This file is not in the version control system; it is only in the local copy."
 msgstr ""
-"Hubo un error al comparar este archivo. La causa de error más común son los "
-"permisos (esto es, <app>Meld</app> no pudo abrir el archivo) y los errores "
-"en la codificación del nombre de archivo."
+"Este archivo no se encuentra en el sistema de control de versiones; solo en "
+"la copia local"
 
-#. (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\"/>."
+#. (itstool) path: td/p
+#: C/vc-mode.page:220
+msgid "The version control system has reported a problem with this file."
 msgstr ""
-"Es posible filtrar archivos en base a sus estados, por ejemplo, mostrar solo "
-"los archivos <em>Modificados</em>. Puede leer más sobre esto en la <link "
-"xref=\"file-filters#file-state-filter\"/>."
+"El sistema de control de versiones ha reportado un problema con este archivo."
+
+#. (itstool) path: section/title
+#: C/vc-mode.page:230
+msgid "Version control state filtering"
+msgstr "Filtrar el estado del control de versiones"
 
 #. (itstool) path: section/p
-#: C/folder-mode.page:223
+#: C/vc-mode.page:232
 msgid ""
-"Finally, the most recently modified file/folder has an emblem attached to it."
+"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 ""
-"Por último, el archivo/carpeta modificado más recientemente lleva una marca "
-"adjunta."
+"A menudo, querrá ver solo los archivos que se presentan alguna diferencia; "
+"esta es la configuración predeterminada en <app>Meld</app>. Puede cambiar "
+"qué estados de archivos se muestran usando el menú <guiseq><gui style=\"menu"
+"\">Vista</gui><gui style=\"menuitem\">Estado de la versión</gui></guiseq> o "
+"pulsando los botones <gui style=\"button\">Modificado</gui>, <gui style="
+"\"button\">Normal</gui>, <gui style=\"button\">Sin control de versiones</"
+"gui> o <gui style=\"button\">Ignorado</gui> en la barra de herramientas."
+
+#. (itstool) path: info/title
+#: C/vc-supported.page:5
+msgctxt "sort"
+msgid "3"
+msgstr "3"
 
 #. (itstool) path: page/title
-#: C/missing-functionality.page:15
-msgid "Things that <app>Meld</app> doesn't do"
-msgstr "Cosas que <app>Meld</app> no hace"
+#: C/vc-supported.page:15
+msgid "Supported version control systems"
+msgstr "Sistemas de control de versiones controlados"
 
-#
 #. (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?"
+#: C/vc-supported.page:17
+msgid "<app>Meld</app> supports a wide range of version control systems:"
 msgstr ""
-"¿Nunca ha perdido media hora investigando una aplicación intentando ver cómo "
-"hacer algo, pensando que <em>seguramente</em> debe haber una opción para eso?"
+"<app>Meld</app> soporta un amplio rango de sistemas de control de versiones:"
 
-#. (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 ""
-"Esta sección lista unas pocas cosas comunes que <app>Meld</app> <em>no</em> "
-"hace, ya sea por una decisión deliberada, o porque nos faltó tiempo."
+#. (itstool) path: item/p
+#: C/vc-supported.page:22
+msgid "Bazaar"
+msgstr "Bazaar"
 
-#. (itstool) path: section/title
-#: C/missing-functionality.page:30
-msgid "Aligning changes by adding lines"
-msgstr "Alinear los cambios al agregar líneas"
+#. (itstool) path: item/p
+#: C/vc-supported.page:23
+msgid "Darcs"
+msgstr "Darcs"
 
-#. (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 ""
-"Cuando <app>Meld</app> muestra diferencias entre archivos, muestra ambos de "
-"la manera en que aparecerían en un editor de textos normal. <em>No</em> "
-"inserta líneas adicionales de manera que los lados derecho e izquierdo de un "
-"cambio en particular sean del mismo tamaño. No existe una opción para esto."
+#. (itstool) path: item/p
+#: C/vc-supported.page:24
+msgid "Git"
+msgstr "Git"
 
-#. (itstool) path: page/title
-#: C/command-line.page:15
-msgid "Command line usage"
-msgstr "Uso de línea de comandos"
+#. (itstool) path: item/p
+#: C/vc-supported.page:25
+msgid "Mercurial"
+msgstr "Mercurial"
 
-#. (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 ""
-"Si ejecuta <app>Meld</app> desde la línea de comandos, puede decirle que "
-"hacer cuando arranca."
+#. (itstool) path: item/p
+#: C/vc-supported.page:26
+msgid "SVN"
+msgstr "SVN"
 
 #. (itstool) path: page/p
-#: C/command-line.page:20
+#: C/vc-supported.page:29
 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."
+"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 ""
-"Para una <link xref=\"file-mode\">comparación de archivos</link> de dos o "
-"tres vías, ejecute <app>Meld</app> con <cmd>meld <var>archivo1</var> "
-"<var>archivo2</var></cmd> o <cmd>meld <var>archivo1</var> <var>archivo2</"
-"var> <var>archivo3</var></cmd> respectivamente."
+"Algunos sistemas de control de versiones menos comunes o configuraciones "
+"inusuales pueden no estar probadas apropiadamente; por favor informe de los "
+"errores de soporte de cualquier control de versiones en <link href=\"https://"
+"bugzilla.gnome.org/\">GNOME bugzilla</link>."
 
-#. (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 ""
-"Para una <link xref=\"folder-mode\">comparación de carpetas</link>de dos o "
-"tres vías, ejecute <app>Meld</app> con <cmd>meld <var>carpeta1</var> "
-"<var>carpeta2</var></cmd>  <cmd>meld <var>carpeta1</var> <var>carpeta2</var> "
-"<var>carpeta3</var></cmd>"
+#~ msgid "Arch"
+#~ msgstr "Arch"
 
-#. (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 ""
-"Puede empezar una comparación de <link xref=\"vc-mode\">control de "
-"versiones</link> agregando un solo argumento; si es un archivo o carpeta "
-"manejado por un  <link xref=\"vc-supported\">sistema de control de versiones "
-"reconocido</link>, ejecutará la comparación de control de versiones con ese "
-"argumento. Por ejemplo, <cmd>meld .</cmd> ejecutaría una vista de control de "
-"versiones de la carpeta actual."
+#~ msgid "Codeville"
+#~ msgstr "Codeville"
 
-#. (itstool) path: note/p
-#: C/command-line.page:40
-msgid "Run <cmd>meld --help</cmd> for a list of all command line options."
-msgstr ""
-"Ejecute <cmd>meld --help</cmd> para una lista de todas las opciones de línea "
-"de comandos."
+#~ msgid "CVS"
+#~ msgstr "CVS"
+
+#~ msgid "Fossil"
+#~ msgstr "Fossil"
+
+#~ msgid "Monotone"
+#~ msgstr "Monotone"
+
+#~ msgid "RCS"
+#~ msgstr "RCS"
+
+#~ msgid "SVK"
+#~ msgstr "SVK"
 
 #~ msgid "Non VC"
 #~ msgstr "Sin control de versiones"
diff --git a/help/pl/pl.po b/help/pl/pl.po
new file mode 100644
index 00000000..4e339466
--- /dev/null
+++ b/help/pl/pl.po
@@ -0,0 +1,1876 @@
+# Polish translation for meld help.
+# Copyright © 2018 the meld authors.
+# This file is distributed under the same license as the meld help.
+# Piotr Drąg <piotrdrag@gmail.com>, 2018.
+# Aviary.pl <community-poland@mozilla.org>, 2018.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: meld-help\n"
+"POT-Creation-Date: 2018-02-22 19:36+0000\n"
+"PO-Revision-Date: 2018-02-25 23:55+0100\n"
+"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
+"Language-Team: Polish <community-poland@mozilla.org>\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+
+#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
+msgctxt "_"
+msgid "translator-credits"
+msgstr ""
+"Piotr Drąg <piotrdrag@gmail.com>, 2018\n"
+"Aviary.pl <community-poland@mozilla.org>, 2018"
+
+#. (itstool) path: info/title
+#: C/command-line.page:5 C/file-changes.page:5 C/file-filters.page:5
+#: C/flattened-view.page:5 C/keyboard-shortcuts.page:5
+#: C/resolving-conflicts.page:5 C/text-filters.page:5
+msgctxt "sort"
+msgid "2"
+msgstr "2"
+
+#. (itstool) path: credit/name
+#: C/command-line.page:10 C/file-changes.page:10 C/file-filters.page:10
+#: C/file-mode.page:11 C/flattened-view.page:10 C/folder-mode.page:10
+#: C/index.page:8 C/introduction.page:10 C/keyboard-shortcuts.page:10
+#: C/missing-functionality.page:10 C/preferences.page:10
+#: C/resolving-conflicts.page:10 C/text-filters.page:11 C/vc-mode.page:10
+#: C/vc-supported.page:10
+msgid "Kai Willadsen"
+msgstr "Kai Willadsen"
+
+#. (itstool) path: credit/years
+#: C/command-line.page:12 C/file-changes.page:12 C/file-filters.page:12
+#: C/file-mode.page:13 C/flattened-view.page:12 C/folder-mode.page:12
+#: C/index.page:10 C/introduction.page:12 C/keyboard-shortcuts.page:12
+#: C/missing-functionality.page:12 C/resolving-conflicts.page:12
+#: C/text-filters.page:13 C/vc-mode.page:12 C/vc-supported.page:12
+msgid "2012"
+msgstr "2012"
+
+#. (itstool) path: page/title
+#: C/command-line.page:15
+msgid "Command line usage"
+msgstr "Użycie wiersza poleceń"
+
+#. (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 ""
+"Podczas uruchamiania programu <app>Meld</app> z wiersza poleceń można "
+"określić, co program ma zrobić."
+
+#. (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 ""
+"Aby porównać dwa lub trzy <link xref=\"file-mode\">pliki</link>, uruchom "
+"program <app>Meld</app> za pomocą polecenia <cmd>meld <var>plik1</var> "
+"<var>plik2</var></cmd> lub <cmd>meld <var>plik1</var> <var>plik2</var> "
+"<var>plik3</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 ""
+"Aby porównać dwa lub trzy <link xref=\"folder-mode\">katalogi</link>, "
+"uruchom program <app>Meld</app> za pomocą polecenia <cmd>meld <var>katalog1</"
+"var> <var>katalog2</var></cmd> lub <cmd>meld <var>katalog1</var> "
+"<var>katalog2</var> <var>katalog3</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 ""
+"Można rozpocząć porównanie <link xref=\"vc-mode\">kontroli wersji</link> "
+"podając jeden parametr, jeśli dany plik lub katalog jest zarządzany przez "
+"<link xref=\"vc-supported\">obsługiwany system kontroli wersji</link>. Na "
+"przykład, polecenie <cmd>meld .</cmd> rozpocznie widok kontroli wersji "
+"obecnego katalogu."
+
+#. (itstool) path: note/p
+#: C/command-line.page:40
+msgid "Run <cmd>meld --help</cmd> for a list of all command line options."
+msgstr ""
+"Polecenie <cmd>meld --help</cmd> wyświetli listę wszystkich opcji wiersza "
+"poleceń."
+
+#. (itstool) path: page/title
+#: C/file-changes.page:16
+msgid "Dealing with changes"
+msgstr "Praca na zmianach"
+
+#. (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> traktuje różnice między plikami jako listę <em>bloków zmian</"
+"em> lub po prostu <em>zmian</em>. Każda zmiana jest grupą wierszy "
+"pokrywających się między plikami. Ponieważ użytkownik jest zwykle "
+"zainteresowany zmianami, <app>Meld</app> zapewnia narzędzia do poruszania "
+"się między tymi zmianami i ich modyfikowania. Można je znaleźć w menu <gui "
+"style=\"menu\">Zmiany</gui>."
+
+#. (itstool) path: section/title
+#: C/file-changes.page:30
+msgid "Navigating between changes"
+msgstr "Nawigacja między zmianami"
+
+#. (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 ""
+"Można przechodzić między zmianami za pomocą elementów menu <guiseq><gui "
+"style=\"menu\">Zmiany</gui><gui style=\"menuitem\">Poprzednia zmiana</gui></"
+"guiseq> i <guiseq><gui style=\"menu\">Zmiany</gui><gui style=\"menuitem"
+"\">Następna zmiana</gui></guiseq>. Można także używać kółka przewijania "
+"myszy, aby przechodzić między zmianami przez przewijanie na środkowym pasku "
+"zmian."
+
+#. (itstool) path: section/title
+#: C/file-changes.page:46
+msgid "Changing changes"
+msgstr "Zmiana zmian"
+
+#. (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 ""
+"Poza bezpośrednim modyfikowaniem plików tekstowych <app>Meld</app> zapewnia "
+"narzędzia do przenoszenia, kopiowania i usuwania poszczególnych różnic "
+"między plikami. Pasek między dwoma plikami nie tylko wyświetla, które części "
+"dwóch plików się pokrywają, ale także umożliwia wybiórcze scalanie lub "
+"usuwanie różniących się zmian przez klikanie ikon strzałki lub krzyżyka obok "
+"początku każdej zmiany."
+
+#. (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 ""
+"Domyślne działanie to <em>zastąpienie</em>. To działanie zastępuje zawartość "
+"pokrywającej się zmiany obecną zmianą."
+
+#. (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 ""
+"Przytrzymaj klawisz <key>Shift</key>, aby zmienić obecne działanie na "
+"<em>usuwanie</em>. To działanie usuwa obecną zmianę."
+
+#. (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 ""
+"Przytrzymaj klawisz <key>Ctrl</key>, aby zmienić obecne działanie na "
+"<em>wstawianie</em>. To działanie wstawia obecną zmianę nad lub pod (według "
+"wyboru) pokrywającą się zmianę."
+
+#. (itstool) path: page/title
+#: C/file-filters.page:15
+msgid "Filtering out files"
+msgstr "Filtrowanie plików"
+
+#. (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 ""
+"Podczas porównywania katalogów można ustawić ignorowanie pewnych plików. Na "
+"przykład, można wyświetlić tylko pliki obecne i różne w obu katalogach, "
+"ignorując te, które są takie same lub istnieją tylko w jednym katalogu. "
+"Można także ignorować wszystkie pliki w katalogu <file>.git</file> lub "
+"ignorować wszystkie obrazy."
+
+#. (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> ma kilka sposób sterowania, które pliki i jakie rodzaje "
+"różnic są wyświetlane. Można je filtrować według <link xref=\"#file-state-"
+"filter\">różnic między plikiem w dwóch katalogach</link> lub <link xref="
+"\"#file-name-filter\">nazw plików i katalogów</link>. Można także ustawić "
+"<app>Meld</app> tak, aby traktował nazwy plików <link xref=\"#file-case-"
+"filter\">bez rozróżniania wielkości znaków</link>. Dostępne są także <link "
+"xref=\"text-filters\">filtry tekstowe</link> do zmiany, co wyświetlają "
+"porównania katalogów i plików."
+
+#. (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 ""
+"Wszystkie <link xref=\"text-filters\">filtry tekstowe</link> określone przez "
+"użytkownika są <em>automatycznie zastosowywane</em> podczas porównywania "
+"katalogów. Pliki, które są identyczne po zastosowaniu wszystkich filtrów "
+"tekstowych nie są wyróżniane jako różne, ale są wyświetlane pochyloną "
+"czcionką."
+
+#. (itstool) path: section/title
+#: C/file-filters.page:48
+msgid "File differences filtering"
+msgstr "Filtrowanie różnic plików"
+
+#. (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 ""
+"Podczas porównywania katalogów każdy wiersz zawiera jeden plik lub katalog, "
+"który jest obecny w co najmniej jednym z porównywanych katalogów. Każdy "
+"z tych wierszy jest sklasyfikowany jako <em>Zmodyfikowane</em>, <em>Nowe</"
+"em> lub <em>Takie same</em>:"
+
+#. (itstool) path: item/title
+#. (itstool) path: td/p
+#: C/file-filters.page:58 C/folder-mode.page:148 C/vc-mode.page:107
+msgid "Modified"
+msgstr "Zmodyfikowane"
+
+#. (itstool) path: item/p
+#: C/file-filters.page:59
+msgid "The file exists in multiple folders, but the files are different"
+msgstr "Plik istnieje w wielu katalogach, ale pliki są różne"
+
+#. (itstool) path: item/title
+#. (itstool) path: td/p
+#: C/file-filters.page:62 C/folder-mode.page:162 C/vc-mode.page:121
+msgid "New"
+msgstr "Nowe"
+
+#. (itstool) path: item/p
+#: C/file-filters.page:63
+msgid "The file exists in one folder but not in the others"
+msgstr "Plik istnieje w jednym katalogu, ale nie w pozostałych"
+
+#. (itstool) path: item/title
+#. (itstool) path: td/p
+#: C/file-filters.page:66 C/folder-mode.page:118 C/vc-mode.page:93
+msgid "Same"
+msgstr "Takie same"
+
+#. (itstool) path: item/p
+#: C/file-filters.page:67
+msgid "The file exists in all folders, and is the same everywhere"
+msgstr "Plik istnieje we wszystkich katalogach, i wszędzie jest taki sam"
+
+#. (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 ""
+"Można zmienić, które typy różnic są wyświetlane w obecnym porównaniu za "
+"pomocą przycisków <gui style=\"button\">Takie same</gui>, <gui style=\"button"
+"\">Nowe</gui> i <gui style=\"button\">Zmodyfikowane</gui> na pasku "
+"narzędziowym lub menu <guiseq><gui style=\"menu\">Widok</gui><gui style="
+"\"menuitem\">Stan pliku</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 ""
+"Obecnie można filtrować pliki tylko na podstawie ich stanu. Nie można w ten "
+"sposób filtrować katalogów. Na przykład, nie można ustawić programu "
+"<app>Meld</app> na ignorowanie wszystkich katalogów, które zawierają tylko "
+"nowe pliki. Katalog zawierający tylko „Nowe” pliki zostałby wyświetlony jako "
+"pusty, ale nadal obecny."
+
+#. (itstool) path: section/title
+#: C/file-filters.page:94
+msgid "Filename filtering"
+msgstr "Filtrowanie nazw plików"
+
+#. (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> zawiera przydatny zestaw filtrów nazw plików, które "
+"umożliwiają ignorowanie nieciekawych plików i katalogów, takich jak "
+"popularne pliki kopii zapasowych i katalogi z metadanymi systemów kontroli "
+"wersji. Każdy filtr nazw plików może być oddzielnie włączony lub wyłączony "
+"przyciskiem <gui style=\"button\">Filtry</gui> na pasku narzędziowym lub "
+"menu <guiseq><gui style=\"menu\">Widok</gui><gui style=\"menuitem\">Filtry "
+"plików</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 ""
+"Można dodawać, usunąć i zmieniać filtry nazw plików w sekcji <gui style=\"tab"
+"\">Filtry plików</gui> okna <gui>Preferencji</gui>. Filtry nazw plików "
+"określają wzory nazw plików, które <em>nie</em> będą uwzględniane podczas "
+"wykonywania porównywania katalogów. Wszystkie pliki pasujące do włączonego "
+"filtru nie będą nawet wyświetlane w porównywaniu drzewa. Filtry nazw plików "
+"dopasowują pliki i katalogi. Jeśli katalog pasuje do filtru, to on i jego "
+"zawartość są ignorowane."
+
+#. (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 ""
+"Filtry nazw plików są dopasowywane zgodnie ze wzorami wieloznaczników "
+"powłoki. Na przykład, <code>*.jpg</code> dopasuje wszystkie nazwy plików "
+"kończące się <code>.jpg</code>. Poniższa tabela zawiera wszystkie znaki "
+"wieloznaczników powłoki rozpoznawane przez <app>Meld</app>."
+
+#. (itstool) path: table/title
+#: C/file-filters.page:124
+msgid "Shell glob patterns"
+msgstr "Wzory wieloznaczników powłoki"
+
+#. (itstool) path: td/p
+#: C/file-filters.page:128
+msgid "Wildcard"
+msgstr "Wieloznacznik"
+
+#. (itstool) path: td/p
+#: C/file-filters.page:128
+msgid "Matches"
+msgstr "Dopasowuje"
+
+#. (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 "wszystko (tzn. zero lub więcej znaków)"
+
+#. (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 "dokładnie jeden znak"
+
+#. (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 "dowolny z zawartych znaków"
+
+#. (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 "wszystko <em>poza</em> jednym z zawartych znaków"
+
+#. (itstool) path: td/p
+#: C/file-filters.page:150
+msgid "<code>{cat,dog}</code>"
+msgstr "<code>{kot,pies}</code>"
+
+#. (itstool) path: td/p
+#: C/file-filters.page:151
+msgid "either \"cat\" or \"dog\""
+msgstr "„kot” lub „pies”"
+
+#. (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 ""
+"Zmiana ustawienia <gui>Aktywne</gui> w oknie <gui>Preferencji</gui> zmienia, "
+"czy ten filtr jest <em>domyślnie</em> włączony."
+
+#. (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 ""
+"Włączenie filtru w menu lub pasku narzędziowym włącza lub wyłącza go "
+"<em>tylko dla tego porównania</em>."
+
+#. (itstool) path: section/title
+#: C/file-filters.page:174
+msgid "Case insensitive filenames"
+msgstr "Rozróżnianie wielkości znaków w nazwach plików"
+
+#. (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 ""
+"Pliki są porównywane w dwóch katalogach zgodnie z ich nazwami. To porównanie "
+"domyślnie rozróżnia wielkość znaków, tzn. pliki <file>README</file>, "
+"<file>readme</file> i <file>ReadMe</file> są tratowane jako różne pliki."
+
+#. (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 ""
+"Podczas porównywania plików na niektórych systemach plików (np. HFS+ lub "
+"FAT) można ustawić <app>Meld</app> tak, aby nie rozróżniał wielkości znaków "
+"w nazwach plików. Można to zrobić wybierając <guiseq><gui style=\"menu"
+"\">Widok</gui><gui style=\"menuitem\">Ignorowanie wielkości liter w nazwach "
+"plików</gui></guiseq> w menu."
+
+#. (itstool) path: info/title
+#: C/file-mode.page:5 C/folder-mode.page:5 C/introduction.page:5
+#: C/missing-functionality.page:5 C/preferences.page:5
+msgctxt "sort"
+msgid "1"
+msgstr "1"
+
+#. (itstool) path: page/title
+#: C/file-mode.page:17
+msgid "Getting started comparing files"
+msgstr "Pierwsze kroki porównywania plików"
+
+#. (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> umożliwia porównywanie dwóch lub trzech plików tekstowych "
+"obok siebie. Można rozpocząć nowe porównanie plików wybierając <guiseq><gui "
+"style=\"menu\">Plik</gui><gui style=\"menuitem\">Nowe…</gui></guiseq> z menu."
+
+#. (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 ""
+"Po wybraniu plików <app>Meld</app> wyświetli je obok siebie. Różnice między "
+"plikami będą wyróżnione, aby lepiej widzieć poszczególne zmiany. Modyfikacja "
+"plików spowoduje aktualizację porównania na żywo. <link xref=\"file-changes"
+"\"/> zawiera informacje o poruszaniu się między poszczególnymi zmianami oraz "
+"jak używać edycji na podstawie zmian."
+
+#. (itstool) path: section/title
+#: C/file-mode.page:35
+msgid "<app>Meld</app>'s file comparisons"
+msgstr "Porównania plików programu <app>Meld</app>"
+
+#. (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 ""
+"Porównywanie plików ma kilka różnych części. Najważniejsze to edytory, "
+"w których pliki są wyświetlane. Poza nimi, obszary wokół i między plikami "
+"zapewniają wizualny przegląd i działania pomagające pracować na zmianach "
+"między plikami."
+
+#. (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 ""
+"Po lewej i prawej stronie okna znajdują się dwa małe pionowe paski, "
+"wyświetlające różne kolorowe bloki. Są one zaprojektowane, aby zapewniać "
+"przegląd wszystkich różnic między dwoma plikami. Każdy kolorowy blok "
+"reprezentuje wstawioną, usuniętą, zmienioną lub sprzeczną sekcję między "
+"plikami, w zależności od jego koloru."
+
+#. (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 ""
+"Między każdą parą plików jest segment wyświetlający, jak zmienione sekcje "
+"między plikami się pokrywają. Można kliknąć strzałki w segmencie, aby "
+"zastąpić sekcje w jednym pliku sekcjami z drugiego. Można także usuwać, "
+"kopiować i scalać zmiany. <link xref=\"file-changes#change-actions\"/> "
+"zawiera informacje o tym, co można robić z poszczególnymi segmentami zmian."
+
+#. (itstool) path: section/title
+#: C/file-mode.page:62
+msgid "Saving your changes"
+msgstr "Zapisywanie zmian"
+
+#. (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 ""
+"Po ukończeniu modyfikowania plików należy zapisać każdy zmieniony plik."
+
+#. (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 ""
+"Ikona zapisu obok nazwy pliku nad każdym plikiem wskazuje, czy plik został "
+"zapisany od ostatniej zmiany. Etykieta na karcie wyświetla także gwiazdkę "
+"(<code>*</code>) po każdym pliku, który nie został zapisany."
+
+#. (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 ""
+"Można zapisać obecny plik wybierając <guiseq><gui style=\"menu\">Plik</"
+"gui><gui style=\"menuitem\">Zapisz</gui></guiseq> z menu lub za pomocą "
+"skrótu klawiszowego <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 ""
+"Zapisywanie zapisuje tylko <em>obecnie aktywny</em> plik, czyli plik "
+"zawierający kursor. Jeśli nie wiadomo, który plik jest aktywny, to można "
+"kliknąć plik, aby aktywować go przed zapisaniem."
+
+#. (itstool) path: page/title
+#: C/flattened-view.page:15
+msgid "Flattened view"
+msgstr "Uproszczony widok"
+
+#. (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 ""
+"Podczas przeglądania dużych katalogów użytkownik może być zainteresowany "
+"tylko kilkoma plikami z tysięcy znajdujących się w katalogu. Z tego powodu "
+"<app>Meld</app> zawiera <em>uproszczony widok</em> katalogu. Wyświetlane są "
+"w nim tylko pliki, które nie są filtrowane (np. przez <link xref=\"vc-"
+"mode#vc-state-filtering\"/>), a hierarchia katalogu jest usuwana z ścieżek "
+"do plików wyświetlanych w kolumnie <em>Położenie</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 ""
+"Można włączyć lub wyłączyć ten uproszczony widok odznaczając <guiseq><gui "
+"style=\"menu\">Widok</gui><gui style=\"menuitem\">Uprość</gui></guiseq> "
+"w menu lub klikając odpowiedni przycisk <gui style=\"button\">Uprość</gui> "
+"na pasku narzędziowym."
+
+#. (itstool) path: page/title
+#: C/folder-mode.page:16
+msgid "Getting started comparing folders"
+msgstr "Pierwsze kroki porównywania katalogów"
+
+#. (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> umożliwia porównywanie dwóch lub trzech katalogów obok "
+"siebie. Można rozpocząć nowe porównanie katalogów wybierając <guiseq><gui "
+"style=\"menu\">Plik</gui><gui style=\"menuitem\">Nowe…</gui></guiseq> z menu "
+"i klikając kartę <gui style=\"tab\">Porównanie katalogów</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 ""
+"Wybrane katalogi będą wyświetlane jako dwa drzewa obok siebie, "
+"z wyróżnionymi różnicami między plikami w każdym katalogu. Można kopiować "
+"lub usuwać pliki z każdego katalogu lub bardziej szczegółowo porównywać "
+"poszczególne pliki tekstowe."
+
+#. (itstool) path: section/title
+#: C/folder-mode.page:36
+msgid "The folder comparison view"
+msgstr "Widok porównania katalogów"
+
+#. (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 ""
+"Główne części porównania katalogów to drzewa wyświetlające porównywane "
+"katalogi. Można łatwo <link xref=\"#folder-navigation\">poruszać się</link> "
+"między tymi porównaniami, aby wyszukiwać interesujące zmiany. Po zaznaczeniu "
+"pliku lub katalogu więcej informacji jest wyświetlanych na pasku stanu na "
+"dole okna. Naciśnięcie klawisza <key>Enter</key> na zaznaczonym pliku lub "
+"podwójne kliknięcie dowolnego pliku na drzewie otworzy <link xref=\"file-mode"
+"\">porównanie plików</link> obok siebie w nowej karcie, ale działa to tylko "
+"na plikach tekstowych."
+
+#. (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 ""
+"Paski po lewej i prawej stronie okna wyświetlają proste, kolorowe "
+"podsumowanie wyników porównania. Każdy plik i katalog w porównaniu odpowiada "
+"małej sekcji tych pasków, chociaż <app>Meld</app> nie wyświetla plików "
+"o stanie <em>Takie same</em>, aby ważne zmiany były lepiej widoczne. Można "
+"kliknąć w dowolnym miejscu tego paska, aby przejść prosto do tego miejsca "
+"w porównaniu."
+
+#. (itstool) path: section/title
+#: C/folder-mode.page:63
+msgid "Navigating folder comparisons"
+msgstr "Nawigacja w porównaniach katalogów"
+
+#. (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 ""
+"Można przechodzić między zmienionymi plikami (tzn. wszystkimi plikami/"
+"katalogami, które <em>nie</em> są sklasyfikowane jako identyczne) za pomocą "
+"<guiseq><gui style=\"menu\">Zmiany</gui><gui style=\"menuitem\">Poprzednia "
+"zmiana</gui></guiseq> i <guiseq><gui style=\"menu\">Zmiany</gui><gui style="
+"\"menuitem\">Następna zmiana</gui></guiseq> w menu lub odpowiednich "
+"przycisków na pasku narzędziowym."
+
+#. (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 ""
+"Można używać klawiszy strzałek <key>W lewo</key> i <key>W prawo</key> do "
+"przechodzenia między porównywanymi katalogami. Jest to przydatne do "
+"wybierania jednego pliku do skopiowania lub usunięcia."
+
+#. (itstool) path: section/title
+#: C/folder-mode.page:83
+msgid "States in folder comparisons"
+msgstr "Stany w porównaniach katalogów"
+
+#. (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 ""
+"Każdy plik lub katalog na drzewie ma swój <em>stan</em>, mówiący o tym, jak "
+"różni się on od odpowiadających mu plików/katalogów. Możliwe stany:"
+
+#. (itstool) path: table/title
+#: C/folder-mode.page:106
+msgid "Folder comparison states"
+msgstr "Stany w porównaniach plików"
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:110 C/vc-mode.page:85
+msgid "State"
+msgstr "Stan"
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:111 C/vc-mode.page:86
+msgid "Appearance"
+msgstr "Wygląd"
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:112 C/vc-mode.page:87
+msgid "Meaning"
+msgstr "Znaczenie"
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:120 C/vc-mode.page:95
+msgid "Normal font"
+msgstr "Zwykła czcionka"
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:126
+msgid "The file/folder is the same across all compared folders."
+msgstr "Plik/katalog jest taki sam we wszystkich porównywanych katalogach."
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:132
+msgid "Same when filtered"
+msgstr "Takie same po filtrowaniu"
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:134
+msgid "Italics"
+msgstr "Pochylenie"
+
+#. (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 ""
+"Te pliki różnią się między katalogami, ale po zastosowaniu <link xref=\"text-"
+"filters\">filtrów tekstowych</link> stają się identyczne."
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:150
+msgid "Blue and bold"
+msgstr "Niebieski i pogrubienie"
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:156
+msgid "These files differ between the folders being compared."
+msgstr "Te pliki różnią się między porównywanymi katalogami."
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:164 C/vc-mode.page:123
+msgid "Green and bold"
+msgstr "Zielony i pogrubienie"
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:170
+msgid "This file/folder exists in this folder, but not in the others."
+msgstr "Ten plik/katalog istnieje w tym katalogu, ale nie w pozostałych."
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:176 C/vc-mode.page:167
+msgid "Missing"
+msgstr "Brakujący"
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:178
+msgid "Greyed out text with a line through the middle"
+msgstr "Wyszarzony, przekreślony tekst"
+
+#. (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 ""
+"Ten plik/katalog nie istnieje w tym katalogu, ale istnieje w jednym "
+"z pozostałych."
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:191 C/vc-mode.page:212
+msgid "Error"
+msgstr "Błąd"
+
+#. (itstool) path: td/p
+#: C/folder-mode.page:193 C/vc-mode.page:214
+msgid "Bright red with a yellow background and bold"
+msgstr "Jasnoczerwony z żółtym tłem i pogrubienie"
+
+#. (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 ""
+"Podczas porównywania tego pliku wystąpił błąd. Najczęstsze przyczyny błędów "
+"to uprawnienia plików (np. <app>Meld</app> nie ma uprawnienia do otwarcia "
+"pliku) i problemy z kodowaniem ich nazw."
+
+#. (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 ""
+"Można filtrować pliki na podstawie tych stanów, na przykład, aby wyświetlać "
+"tylko <em>Zmodyfikowane</em> pliki. <link xref=\"file-filters#file-state-"
+"filter\"/> zawiera więcej informacji na ten temat."
+
+#. (itstool) path: section/p
+#: C/folder-mode.page:223
+msgid ""
+"Finally, the most recently modified file/folder has a small star emblem "
+"attached to it."
+msgstr "Ostatni zmodyfikowany plik/katalog ma mały symbol gwiazdy."
+
+#. (itstool) path: page/title
+#: C/index.page:14
+msgid "Meld Help"
+msgstr "Pomoc programu Meld"
+
+#. (itstool) path: section/title
+#: C/index.page:17
+msgid "Introduction"
+msgstr "Wprowadzenie"
+
+#. (itstool) path: section/title
+#: C/index.page:21
+msgid "Comparing Files"
+msgstr "Porównywanie plików"
+
+#. (itstool) path: section/title
+#: C/index.page:25
+msgid "Comparing Folders"
+msgstr "Porównywanie katalogów"
+
+#. (itstool) path: section/title
+#: C/index.page:29
+msgid "Using Meld with Version Control"
+msgstr "Używanie kontroli wersji"
+
+#. (itstool) path: section/title
+#: C/index.page:33
+msgid "Advanced Usage"
+msgstr "Zaawansowane"
+
+#. (itstool) path: page/title
+#: C/introduction.page:15
+msgid "What is Meld?"
+msgstr "Czym jest 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> to narzędzie do porównywania plików i katalogów oraz do "
+"rozwiązywania różnic między nimi. Jest także przydatne do porównywania zmian "
+"w systemach kontroli wersji."
+
+#. (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> wyświetla różnice między dwoma lub trzema plikami (lub dwoma "
+"lub trzema katalogami) i umożliwia przenoszenie treści między nimi oraz "
+"ręczne ich redagowanie. <app>Meld</app> ma na celu pomoc programistom "
+"porównywać i scalać pliki źródłowe oraz wyświetlać przegląd zmian w ich "
+"ulubionym systemie kontroli wersji."
+
+#. (itstool) path: page/title
+#: C/keyboard-shortcuts.page:15
+msgid "Keyboard shortcuts"
+msgstr "Skróty klawiszowe"
+
+#. (itstool) path: table/title
+#: C/keyboard-shortcuts.page:18
+msgid "Shortcuts for working with files and comparisons"
+msgstr "Skróty do działania na plikach i porównaniach"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:22 C/keyboard-shortcuts.page:56
+#: C/keyboard-shortcuts.page:109 C/keyboard-shortcuts.page:131
+#: C/keyboard-shortcuts.page:153
+msgid "Shortcut"
+msgstr "Skrót"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:22 C/keyboard-shortcuts.page:56
+#: C/keyboard-shortcuts.page:109 C/keyboard-shortcuts.page:131
+#: C/keyboard-shortcuts.page:153
+msgid "Description"
+msgstr "Opis"
+
+#. (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 "Rozpoczęcie nowego porównania."
+
+#. (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 "Zapisanie obecnego dokumentu na dysku."
+
+#. (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>Shift</key><key>S</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:38
+msgid "Save the current document with a new filename."
+msgstr "Zapisanie obecnego dokumentu pod nową nazwą pliku."
+
+#. (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 "Zamkniecie obecnego porównania."
+
+#. (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 "Zakończenie programu <app>Meld</app>."
+
+#. (itstool) path: table/title
+#: C/keyboard-shortcuts.page:52
+msgid "Shortcuts for editing documents"
+msgstr "Skróty do redakcji dokumentów"
+
+#. (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 "Cofnięcie ostatniego działania."
+
+#. (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>Shift</key><key>Z</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:67
+msgid "Redo the last undone action."
+msgstr "Ponowienie ostatniego cofniętego działania."
+
+#. (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 "Wycięcie zaznaczonego tekstu lub obszaru i umieszczenie go w schowku."
+
+#. (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 "Skopiowanie zaznaczonego tekstu lub obszaru do schowka."
+
+#. (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 "Wklejenie zawartości schowka."
+
+#. (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 "Wyszukanie ciągu."
+
+#. (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 "Wyszukanie następnego wystąpienia ciągu."
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:90
+msgid "<keyseq><key>Alt</key><key>Down</key></keyseq>"
+msgstr "<keyseq><key>Alt</key><key>W dół</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 ""
+"Przejście do następnej różnicy (także <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>W górę</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 ""
+"Przejście do poprzendiej różnicy (także <keyseq><key>Ctrl</key><key>E</key></"
+"keyseq>)."
+
+#. (itstool) path: table/title
+#: C/keyboard-shortcuts.page:105
+msgid "Shortcuts for folder comparison"
+msgstr "Skróty porównania katalogów"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:115
+msgid "<keyseq><key>+</key></keyseq>"
+msgstr "<keyseq><key>+</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:116
+msgid "Expand the current folder."
+msgstr "Rozwinięcie obecnego katalogu."
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:119
+msgid "<keyseq><key>-</key></keyseq>"
+msgstr "<keyseq><key>-</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:120
+msgid "Collapse the current folder."
+msgstr "Zwinięcie obecnego katalogu."
+
+#. (itstool) path: table/title
+#: C/keyboard-shortcuts.page:127
+msgid "Shortcuts for view settings"
+msgstr "Skróty ustawień widoku"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:137
+msgid "<keyseq><key>Escape</key></keyseq>"
+msgstr "<keyseq><key>Esc</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:138
+msgid "Stop the current comparison."
+msgstr "Zatrzymanie obecnego porównania."
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:141
+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:142
+msgid "Refresh the current comparison."
+msgstr "Odświeżenie obecnego porównania."
+
+#. (itstool) path: table/title
+#: C/keyboard-shortcuts.page:149
+msgid "Shortcuts for help"
+msgstr "Skróty pomocy"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:159
+msgid "<keyseq><key>F1</key></keyseq>"
+msgstr "<keyseq><key>F1</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:160
+msgid "Open <app>Meld</app>'s user manual."
+msgstr "Otwarcie podręcznika programu <app>Meld</app>."
+
+#. (itstool) path: p/link
+#: C/legal.xml:4
+msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
+msgstr "Creative Commons Attribution-Share Alike 3.0 Unported"
+
+#. (itstool) path: license/p
+#: C/legal.xml:3
+msgid "This work is licensed under a <_:link-1/>."
+msgstr "Na warunkach licencji <_:link-1/>."
+
+#. (itstool) path: license/p
+#: C/legal.xml:6
+msgid ""
+"As a special exception, the copyright holders give you permission to copy, "
+"modify, and distribute the example code contained in this document under the "
+"terms of your choosing, without restriction."
+msgstr ""
+"W drodze specjalnego wyjątku posiadacze praw autorskich udzielają pozwolenia "
+"na kopiowanie, modyfikowanie i rozprowadzanie przykładowego kodu zawartego "
+"w tej dokumentacji na dowolnych warunkach, bez ograniczeń."
+
+#. (itstool) path: page/title
+#: C/missing-functionality.page:15
+msgid "Things that <app>Meld</app> doesn't do"
+msgstr "Czego <app>Meld</app> nie robi"
+
+#. (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 ""
+"Czy zdarzyło Ci się kiedyś spędzić pół godziny grzebiąc w programie, "
+"próbując dowiedzieć się, jak coś zrobić, myśląc, że <em>niewątpliwie</em> "
+"gdzieś jest do tego opcja?"
+
+#. (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 ""
+"Ta sekcja zawiera listę kilku popularnych funkcji, których <app>Meld</app> "
+"<em>nie</em> zawiera, albo w wyniku decyzji, albo ponieważ nie mieliśmy "
+"czasu na jej napisanie."
+
+#. (itstool) path: section/title
+#: C/missing-functionality.page:30
+msgid "Aligning changes by adding lines"
+msgstr "Wyrównywanie zmian przed dodanie wierszy"
+
+#. (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 ""
+"Podczas wyświetlania różnic między plikami <app>Meld</app> wyświetla oba "
+"pliki tak, jak wyglądałyby w zwykłym edytorze tekstu. <em>Nie</em> wstawia "
+"dodatkowych wierszy tak, aby lewa i prawa strona danej zmiany były tej samej "
+"wielkości. Program nie ma takiej opcji."
+
+#. (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 "Preferencje programu Meld"
+
+#. (itstool) path: terms/title
+#: C/preferences.page:18
+msgid "Editor preferences"
+msgstr "Preferencje edytora"
+
+#. (itstool) path: item/title
+#: C/preferences.page:20
+msgid "Editor command"
+msgstr "Polecenie edytora"
+
+#. (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 ""
+"Nazwa polecenia wykonywanego do otwierania plików tekstowych w edytorze "
+"zewnętrznym. Może to być po prostu polecenie (np. <cmd>gedit</cmd>), "
+"w przypadku którego plik do otwarcia zostanie przekazany jako ostatni "
+"parametr. Można także dodać elementy <code>{file}</code> (plik) "
+"i <code>{line}</code> (wiersz) do polecenia, w przypadku których <app>Meld</"
+"app> zastąpi je ścieżką do pliku i numerem bieżącego wiersza (np. <cmd>gedit "
+"{file}:{line}</cmd>)."
+
+#. (itstool) path: terms/title
+#: C/preferences.page:31
+msgid "Folder Comparison preferences"
+msgstr "Preferencje porównania plików"
+
+#. (itstool) path: item/title
+#: C/preferences.page:33
+msgid "Apply text filters during folder comparisons"
+msgstr "Zastosowywanie filtrów tekstowych podczas porównywania katalogów"
+
+#. (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 ""
+"Podczas porównywania plików w trybie porównywania katalogów można "
+"zastosowywać filtry tekstowe i pozostałe opcje manipulacji tekstem do "
+"zawartości plików. Włączenie tej opcji spowoduje zastosowanie wszystkich "
+"obecnie włączonych filtrów tekstowych, zastosowanie opcji obcinania pustych "
+"wierszy w razie potrzeby oraz ignorowanie różnic w końcach wierszy."
+
+#. (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 ""
+"Włączenie tej opcji oznacza, że <app>Meld</app> musi w pełni odczytać "
+"wszystkie niebinarne pliki do pamięci podczas porównania katalogów. Jeśli "
+"pliki tekstowe są duże, to może to spowolnić działanie programu i spowodować "
+"problemy z pamięcią."
+
+#. (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 ""
+"Ta opcja jest uwzględniana tylko, jeśli nie włączono opcji „Porównywanie "
+"plików tylko na podstawie rozmiaru i czasu modyfikacji”."
+
+#. (itstool) path: page/title
+#: C/resolving-conflicts.page:15
+msgid "Resolving merge conflicts"
+msgstr "Rozwiązywanie konfliktów scalania"
+
+#. (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 ""
+"Jednym z najlepszych zastosować programu <app>Meld</app> jest rozwiązywanie "
+"konfliktów powstałych podczas scalania różnych gałęzi."
+
+#. (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 ""
+"Na przykład, podczas używania systemu <app>Git</app>, <cmd>git mergetool</"
+"cmd> uruchomi „program pomocniczy scalania”. <app>Meld</app> to jeden "
+"z takich programów pomocniczych. Aby polecenie <app>git mergetool</app> "
+"domyślnie używało programu <app>Meld</app>, dodaj"
+
+#. (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 ""
+"do pliku <file>.git/gitconfig</file>. Strona podręcznika <app>git mergetool</"
+"app> zawiera więcej informacji."
+
+#. (itstool) path: page/title
+#: C/text-filters.page:17
+msgid "Filtering out text"
+msgstr "Filtrowanie tekstu"
+
+#. (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 ""
+"Podczas porównywania kilku plików mogą występować sekcje tekstu, w których "
+"różnice nie są zbyt ważne. Na przykład, można skupić się na zmienionych "
+"sekcjach kodu i ignorować wszelkie zmiany w komentarzach. Za pomocą filtrów "
+"tekstowych można ustawić <app>Meld</app> tak, aby ignorował tekst pasujący "
+"do wzoru (tzn. wyrażenia regularnego) podczas wyświetlania różnic między "
+"plikami."
+
+#. (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 ""
+"Filtry tekstowe wpływają nie tylko na porównania plików, ale także "
+"porównania katalogów. <link xref=\"file-filters\">Uwagi o filtrowaniu "
+"plików</link> zawierają więcej informacji."
+
+#. (itstool) path: section/title
+#: C/text-filters.page:37
+msgid "Adding and using text filters"
+msgstr "Dodawanie i używanie filtrów tekstowych"
+
+#. (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 ""
+"Można włączać i wyłączać filtry tekstowe w karcie <gui>Filtry tekstowe</gui> "
+"okna <gui>Preferencji</gui>. <app>Meld</app> domyślnie zawiera kilka "
+"prostych filtrów, które mogą być przydatne, ale można także dodać swoje."
+
+#. (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 ""
+"W programie <app>Meld</app> filtry tekstowe są wyrażeniami regularnymi, "
+"które są dopasowywane do tekstu porównywanych plików. Każdy dopasowany tekst "
+"jest ignorowany podczas porównania. Nadal będzie on widoczny w widoku "
+"porównania, ale nie będzie uwzględniany podczas wyszukiwania różnic. Filtry "
+"tekstowe są zastosowywane w kolejności, więc to możliwe, że pierwszy filtr "
+"usunie tekst, co spowoduje dopasowanie drugiego filtru, i tak dalej."
+
+#. (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 ""
+"<link href=\"https://docs.python.org/howto/regex.html\">Strona o wyrażeniach "
+"regularnych języka Python</link> zawiera informacje przydatne dla osób "
+"niezaznajomionych z wyrażeniami regularnymi (w języku angielskim)."
+
+#. (itstool) path: section/title
+#: C/text-filters.page:67
+msgid "Getting text filters right"
+msgstr "Jak napisać dobry filtr tekstowy"
+
+#. (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 ""
+"Łatwo jest napisać błędny filtr tekstowy, a ich obsługa w programie "
+"<app>Meld</app> jest niepełna. W szczególności należy pamiętać, że filtr "
+"tekstowy nie może zmienić liczby wierszy w pliku. Na przykład, jeśli "
+"włączono wbudowany filtr <gui>Komentarz skryptu</gui> i porównano te pliki:"
+
+#. (itstool) path: listing/title
+#: C/text-filters.page:80
+msgid "<file>comment1.txt</file>"
+msgstr "<file>komentarz1.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#komentarz\n"
+"c\n"
+"d"
+
+#. (itstool) path: listing/title
+#: C/text-filters.page:90
+msgid "<file>comment2.txt</file>"
+msgstr "<file>komentarz2.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"
+"#komentarz"
+
+#. (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 ""
+"to wiersze zaczynające się od <code>b</code> zostałyby wyświetlane jako "
+"identyczne (komentarz został usunięty), ale wiersz <code>d</code> zostałby "
+"wyświetlony jako różny od wiersza komentarza po prawej. Dzieje się tak, "
+"ponieważ <code>#komentarz</code> jest usuwany z prawej strony, ale sam "
+"wiersz nie może zostać usunięty. <app>Meld</app> wyświetli wiersz <code>d</"
+"code> jako różny od tego, co widzi jako pusty wiersz po drugiej stronie."
+
+#. (itstool) path: section/title
+#: C/text-filters.page:114
+msgid "Blank lines and filters"
+msgstr "Puste wiersze i filtry"
+
+#. (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 ""
+"Opcja <gui>Ignorowanie zmian wstawiających lub usuwających puste wiersze</"
+"gui> w karcie <gui>Filtry tekstowe</gui> wymaga specjalnego wyjaśnienia. "
+"Włączenie tego specjalnego filtru spowoduje, że każda zmiana składająca się "
+"tylko z pustych wierszy jest całkowicie ignorowana. Może się tak stać, "
+"ponieważ wystąpiła zmiana niedrukowalnych znaków w tekście, ale może też się "
+"wydarzyć, jeśli włączone filtry tekstowe usunęły pozostałą treść zmiany, "
+"pozostawiając tylko puste wiersze."
+
+#. (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 ""
+"Można użyć tej opcji, aby obejść pewne <link xref=\"#text-filter-problems"
+"\">problemy i ograniczenia</link> powstałe, ponieważ filtry nie mogą usuwać "
+"całych wierszy, ale może także być przydatna sama w sobie."
+
+#. (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 "Wyświetlanie plików w kontroli wersji"
+
+#. (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> integruje się z <link xref=\"vc-supported\">wieloma "
+"systemami kontroli wersji</link>, aby umożliwiać przeglądanie lokalnych "
+"zmian i wykonywanie prostych zadań kontroli wersji. Można rozpocząć nowe "
+"porównanie kontroli wersji wybierając <guiseq><gui style=\"menu\">Plik</"
+"gui><gui style=\"menuitem\">Nowe…</gui></guiseq> z menu lub klikając kartę "
+"<gui style=\"tab\">System kontroli wersji</gui>."
+
+#. (itstool) path: section/title
+#: C/vc-mode.page:30
+msgid "Version control comparisons"
+msgstr "Porównania kontroli wersji"
+
+#. (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 ""
+"Porównania kontroli wersji wyświetlają różnice między zawartością katalogu "
+"a obecną wersją w repozytorium. Każdy plik w lokalnej kopii ma <link xref="
+"\"#vc-state\">stan</link> wskazujący, jak różni się od kopii w repozytorium."
+
+#. (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 ""
+"Aby wyświetlić różnice danego pliku, można zaznaczyć go i nacisnąć klawisz "
+"<key>Enter</key> lub podwójnie kliknąć plik, aby rozpocząć <link xref=\"file-"
+"mode\">porównanie plików</link>. Można także działać na systemie kontroli "
+"wersji za pomocą menu <gui style=\"menu\">Zmiany</gui>."
+
+#. (itstool) path: section/title
+#. (itstool) path: table/title
+#: C/vc-mode.page:56 C/vc-mode.page:81
+msgid "Version control states"
+msgstr "Stany kontroli wersji"
+
+#. (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 ""
+"Każdy plik lub katalog w porównaniu kontroli wersji ma <em>stan</em>, "
+"uzyskany z systemu kontroli wersji. <app>Meld</app> odzwierciedla te różne "
+"stany na standardowy zestaw bardzo podobnych pojęć. Z tego powodu <app>Meld</"
+"app> może używać trochę innych nazw dla stanów niż używany system kontroli "
+"wersji. Możliwe stany:"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:101
+msgid "The file/folder is the same as the repository version."
+msgstr "Plik/katalog jest taki sam, jak w wersji w repozytorium."
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:109
+msgid "Red and bold"
+msgstr "Czerwony i pogrubienie"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:115
+msgid "This file is different to the repository version."
+msgstr "Ten plik jest różny od wersji w repozytorium."
+
+#. (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 ""
+"Ten plik/katalog jest nowy, i jest zaplanowany do dodania do repozytorium."
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:136
+msgid "Removed"
+msgstr "Usunięty"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:138
+msgid "Red bold text with a line through the middle"
+msgstr "Czerwony, pogrubiony i przekreślony tekst"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:144
+msgid ""
+"This file/folder existed, but is scheduled to be removed from the repository."
+msgstr ""
+"Ten plik/katalog istniał, ale jest zaplanowany do usunięcia z repozytorium."
+
+#. (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 "Jasnoczerwony, pogrubiony tekst"
+
+#. (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 ""
+"Podczas scalania w repozytorium różnice między lokalnym plikiem "
+"a repozytorium nie mogą zostać rozwiązane, a plik jest teraz sprzeczny "
+"z treścią repozytorium"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:169
+msgid "Blue bold text with a line through the middle"
+msgstr "Niebieski, pogrubiony i przekreślony tekst"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:175
+msgid "This file/folder should be present, but isn't."
+msgstr "Ten plik/katalog powinien być obecny, ale nie jest."
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:181
+msgid "Ignored"
+msgstr "Zignorowane"
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:183 C/vc-mode.page:199
+msgid "Greyed out text"
+msgstr "Wyszarzony tekst"
+
+#. (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 ""
+"Ten plik/katalog jest ignorowany (np. przez wpis w pliku <file>.gitignore</"
+"file>) i nie podlega kontroli wersji."
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:197
+msgid "Unversioned"
+msgstr "Poza systemem kontroli wersji"
+
+#. (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 ""
+"Ten plik nie jest w systemie kontroli wersji, a tylko w lokalnej kopii."
+
+#. (itstool) path: td/p
+#: C/vc-mode.page:220
+msgid "The version control system has reported a problem with this file."
+msgstr "System kontroli wersji zgłosił problem z tym plikiem."
+
+#. (itstool) path: section/title
+#: C/vc-mode.page:230
+msgid "Version control state filtering"
+msgstr "Filtrowanie stanów kontroli wersji"
+
+#. (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 ""
+"Najczęściej potrzebne jest wyświetlanie tylko plików, które zostały "
+"zidentyfikowane jako w jakiś sposób różne. To domyślne ustawienie programu "
+"<app>Meld</app>. Można zmienić, które stany plików są wyświetlane za pomocą "
+"menu <guiseq><gui style=\"menu\">Widok</gui><gui style=\"menuitem\">Stan "
+"wersji</gui></guiseq> lub klikając odpowiednie przyciski <gui style=\"button"
+"\">Zmodyfikowane</gui>, <gui style=\"button\">Zwykłe</gui>, <gui style="
+"\"button\">Poza systemem kontroli wersji</gui> i <gui style=\"button"
+"\">Zignorowane</gui> na pasku narzędziowym."
+
+#. (itstool) path: info/title
+#: C/vc-supported.page:5
+msgctxt "sort"
+msgid "3"
+msgstr "3"
+
+#. (itstool) path: page/title
+#: C/vc-supported.page:15
+msgid "Supported version control systems"
+msgstr "Obsługiwane systemy kontroli wersji"
+
+#. (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> obsługuje wiele systemów kontroli wersji:"
+
+#. (itstool) path: item/p
+#: C/vc-supported.page:22
+msgid "Bazaar"
+msgstr "Bazaar"
+
+#. (itstool) path: item/p
+#: C/vc-supported.page:23
+msgid "Darcs"
+msgstr "Darcs"
+
+#. (itstool) path: item/p
+#: C/vc-supported.page:24
+msgid "Git"
+msgstr "Git"
+
+#. (itstool) path: item/p
+#: C/vc-supported.page:25
+msgid "Mercurial"
+msgstr "Mercurial"
+
+#. (itstool) path: item/p
+#: C/vc-supported.page:26
+msgid "SVN"
+msgstr "SVN"
+
+#. (itstool) path: page/p
+#: C/vc-supported.page:29
+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 ""
+"Mniej popularne systemy kontroli wersji lub nietypowe konfiguracje mogą nie "
+"być dokładnie przetestowane. Prosimy zgłaszać wszelkie błędy w obsłudze "
+"kontroli wersji w systemie śledzenia błędów <link href=\"https://bugzilla."
+"gnome.org/\">Bugzilla</link> projektu GNOME."
diff --git a/help/sv/sv.po b/help/sv/sv.po
index b290315b..55c8c5b2 100644
--- a/help/sv/sv.po
+++ b/help/sv/sv.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: meld master\n"
-"POT-Creation-Date: 2017-03-10 23:07+0000\n"
-"PO-Revision-Date: 2017-03-11 12:37+0100\n"
+"POT-Creation-Date: 2017-09-13 16:58+0000\n"
+"PO-Revision-Date: 2017-09-13 23:31+0200\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -16,7 +16,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.11\n"
+"X-Generator: Poedit 2.0.3\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -24,260 +24,189 @@ msgid "translator-credits"
 msgstr "Josef Andersson <josef.andersson@fripost.org>, 2015"
 
 #. (itstool) path: info/title
-#: C/introduction.page:5 C/file-mode.page:5 C/missing-functionality.page:5
-#: C/folder-mode.page:5 C/preferences.page:5
+#: C/command-line.page:5 C/file-changes.page:5 C/file-filters.page:5
+#: C/flattened-view.page:5 C/keyboard-shortcuts.page:5
+#: C/resolving-conflicts.page:5 C/text-filters.page:5
 msgctxt "sort"
-msgid "1"
-msgstr "1"
+msgid "2"
+msgstr "2"
 
 #. (itstool) path: credit/name
-#: C/introduction.page:10 C/vc-supported.page:10 C/file-mode.page:11
-#: C/file-filters.page:10 C/missing-functionality.page:10 C/index.page:8
-#: C/command-line.page:10 C/text-filters.page:11 C/flattened-view.page:10
-#: C/vc-mode.page:10 C/folder-mode.page:10 C/resolving-conflicts.page:10
-#: C/preferences.page:10 C/keyboard-shortcuts.page:10 C/file-changes.page:10
+#: C/command-line.page:10 C/file-changes.page:10 C/file-filters.page:10
+#: C/file-mode.page:11 C/flattened-view.page:10 C/folder-mode.page:10
+#: C/index.page:8 C/introduction.page:10 C/keyboard-shortcuts.page:10
+#: C/missing-functionality.page:10 C/preferences.page:10
+#: C/resolving-conflicts.page:10 C/text-filters.page:11 C/vc-mode.page:10
+#: C/vc-supported.page:10
 msgid "Kai Willadsen"
 msgstr "Kai Willadsen"
 
 #. (itstool) path: credit/years
-#: C/introduction.page:12 C/vc-supported.page:12 C/file-mode.page:13
-#: C/file-filters.page:12 C/missing-functionality.page:12 C/index.page:10
-#: C/command-line.page:12 C/text-filters.page:13 C/flattened-view.page:12
-#: C/vc-mode.page:12 C/folder-mode.page:12 C/resolving-conflicts.page:12
-#: C/keyboard-shortcuts.page:12 C/file-changes.page:12
+#: C/command-line.page:12 C/file-changes.page:12 C/file-filters.page:12
+#: C/file-mode.page:13 C/flattened-view.page:12 C/folder-mode.page:12
+#: C/index.page:10 C/introduction.page:12 C/keyboard-shortcuts.page:12
+#: C/missing-functionality.page:12 C/resolving-conflicts.page:12
+#: C/text-filters.page:13 C/vc-mode.page:12 C/vc-supported.page:12
 msgid "2012"
 msgstr "2012"
 
 #. (itstool) path: page/title
-#: C/introduction.page:15
-msgid "What is Meld?"
-msgstr "Vad är Meld?"
+#: C/command-line.page:15
+msgid "Command line usage"
+msgstr "Kommandoradsanvändning"
 
 #. (itstool) path: page/p
-#: C/introduction.page:16
+#: C/command-line.page:17
 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."
+"If you start <app>Meld</app> from the command line, you can tell it what to "
+"do when it starts."
 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."
+"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/introduction.page:22
+#: C/command-line.page:20
 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."
+"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 ""
-"<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: info/title
-#: C/vc-supported.page:5
-msgctxt "sort"
-msgid "3"
-msgstr "3"
-
-#. (itstool) path: page/title
-#: C/vc-supported.page:15
-msgid "Supported version control systems"
-msgstr "Versionshanteringssystem som stöds"
+"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/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 "Bazaar"
-msgstr "Bazaar"
-
-#. (itstool) path: item/p
-#: C/vc-supported.page:23
-msgid "Darcs"
-msgstr "Darcs"
-
-#. (itstool) path: item/p
-#: C/vc-supported.page:24
-msgid "Git"
-msgstr "Git"
-
-#. (itstool) path: item/p
-#: C/vc-supported.page:25
-msgid "Mercurial"
-msgstr "Mercurial"
-
-#. (itstool) path: item/p
-#: C/vc-supported.page:26
-msgid "SVN"
-msgstr "SVN"
+#: 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/vc-supported.page:29
+#: C/command-line.page:31
 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>."
+"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 ""
-"Mindre vanliga versionshanteringssystem eller ovanliga konfigurationer är "
-"inte lika vältestade; rapportera fel till <link href=\"https://bugzilla."
-"gnome.org/\">GNOME bugzilla</link>."
+"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."
 
 #. (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"
+#: C/file-changes.page:16
+msgid "Dealing with changes"
+msgstr "Hantera ändringar"
 
 #. (itstool) path: page/p
-#: C/file-mode.page:19
+#: C/file-changes.page:18
 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."
+"<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> 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>."
+"<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: page/p
-#: C/file-mode.page:26
+#. (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 ""
-"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\"/>."
+"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 ""
-"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\"/>."
+"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-mode.page:35
-msgid "<app>Meld</app>'s file comparisons"
-msgstr "<app>Meld</app>s filjämförelser"
+#: C/file-changes.page:46
+msgid "Changing changes"
+msgstr "Ändra ändringar"
 
 #. (itstool) path: section/p
-#: C/file-mode.page:37
+#: C/file-changes.page:48
 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."
+"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 ""
-"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."
+"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-mode.page:43
+#: C/file-changes.page:52
 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."
+"The default action is <em>replace</em>. This action replaces the contents of "
+"the corresponding change with the current change."
 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."
+"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-mode.page:50
+#: C/file-changes.page:59
 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\"/>."
+"Hold down the <key>Shift</key> key to change the current action to "
+"<em>delete</em>. This action deletes the current change."
 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"
+"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-mode.page:64
+#: C/file-changes.page:62
 msgid ""
-"Once you've finished editing your files, you need to save each file you've "
-"changed."
+"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 ""
-"När du väl har slutat redigera dina filer behöver du spara varje fil du har "
-"ändrat."
+"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: 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: info/title
-#: C/file-filters.page:5 C/command-line.page:5 C/text-filters.page:5
-#: C/flattened-view.page:5 C/resolving-conflicts.page:5
-#: C/keyboard-shortcuts.page:5 C/file-changes.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
+#. (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 "
@@ -342,7 +271,7 @@ msgstr ""
 
 #. (itstool) path: item/title
 #. (itstool) path: td/p
-#: C/file-filters.page:58 C/vc-mode.page:107 C/folder-mode.page:148
+#: C/file-filters.page:58 C/folder-mode.page:148 C/vc-mode.page:107
 msgid "Modified"
 msgstr "Ändrad"
 
@@ -353,7 +282,7 @@ 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
+#: C/file-filters.page:62 C/folder-mode.page:162 C/vc-mode.page:121
 msgid "New"
 msgstr "Ny"
 
@@ -364,7 +293,7 @@ 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
+#: C/file-filters.page:66 C/folder-mode.page:118 C/vc-mode.page:93
 msgid "Same"
 msgstr "Samma"
 
@@ -570,864 +499,792 @@ msgstr ""
 "style=\"menuitem\">Ignorera skiftlägeskänslighet för filnamn</gui></guiseq> "
 "i menyerna."
 
+#. (itstool) path: info/title
+#: C/file-mode.page:5 C/folder-mode.page:5 C/introduction.page:5
+#: C/missing-functionality.page:5 C/preferences.page:5
+msgctxt "sort"
+msgid "1"
+msgstr "1"
+
 #. (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"
+#: 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/missing-functionality.page:17
+#: C/file-mode.page:19
 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?"
+"<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 ""
-"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?"
+"<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/missing-functionality.page:23
+#: C/file-mode.page:26
 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."
+"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 ""
-"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."
+"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/missing-functionality.page:30
-msgid "Aligning changes by adding lines"
-msgstr "Justera ändringar genom att lägga till rader"
+#: 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/missing-functionality.page:31
+#: C/file-mode.page:37
 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."
+"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 ""
-"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/index.page:14
-msgid "Meld Help"
-msgstr "Meld hjälp"
-
-#. (itstool) path: section/title
-#: C/index.page:17
-msgid "Introduction"
-msgstr "Introduktion"
+"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/title
-#: C/index.page:21
-msgid "Comparing Files"
-msgstr "Jämföra filer"
+#. (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/title
-#: C/index.page:25
-msgid "Comparing Folders"
-msgstr "Jämföra mappar"
+#. (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/index.page:29
-msgid "Using Meld with Version Control"
-msgstr "Använda Meld med versionshantering"
+#: C/file-mode.page:62
+msgid "Saving your changes"
+msgstr "Spara dina ändringar"
 
-#. (itstool) path: section/title
-#: C/index.page:33
-msgid "Advanced Usage"
-msgstr "Avancerad användning"
+#. (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: page/title
-#: C/command-line.page:15
-msgid "Command line usage"
-msgstr "Kommandoradsanvändning"
+#. (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: page/p
-#: C/command-line.page:17
+#. (itstool) path: section/p
+#: C/file-mode.page:74
 msgid ""
-"If you start <app>Meld</app> from the command line, you can tell it what to "
-"do when it starts."
+"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 ""
-"Om du startar <app>Meld</app> från kommandoraden kan du berätta hur det ska "
-"bete sig vid uppstart."
+"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: page/p
-#: C/command-line.page:20
+#. (itstool) path: note/p
+#: C/file-mode.page:81
 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."
+"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 ""
-"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>."
+"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/command-line.page:26
+#: C/flattened-view.page:17
 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>."
+"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 ""
-"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>."
+"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/command-line.page:31
+#: C/flattened-view.page:27
 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."
+"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 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."
+"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/text-filters.page:17
-msgid "Filtering out text"
-msgstr "Filtrera ut text"
+#: 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/text-filters.page:19
+#: C/folder-mode.page:18
 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."
+"<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 ""
-"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."
+"<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: note/p
-#: C/text-filters.page:28
+#. (itstool) path: page/p
+#: C/folder-mode.page:26
 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."
+"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 ""
-"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."
+"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/text-filters.page:37
-msgid "Adding and using text filters"
-msgstr "Lägga till och använda textfilter"
+#: C/folder-mode.page:36
+msgid "The folder comparison view"
+msgstr "Vyn för mappjämförelse"
 
 #. (itstool) path: section/p
-#: C/text-filters.page:39
+#: C/folder-mode.page:38
 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."
+"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 ""
-"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å."
+"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/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
+#: C/folder-mode.page:50
 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>."
+"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 ""
-"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>."
+"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/text-filters.page:67
-msgid "Getting text filters right"
-msgstr "Skriva korrekta textfilter"
+#: C/folder-mode.page:63
+msgid "Navigating folder comparisons"
+msgstr "Navigera mappjämförelser"
 
 #. (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
+#: C/folder-mode.page:65
 msgid ""
-"\n"
-"a\n"
-"b\n"
-"c\n"
-"#comment"
+"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 ""
-"\n"
-"a\n"
-"b\n"
-"c\n"
-"#kommentar"
+"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/text-filters.page:101
+#: C/folder-mode.page:73
 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."
+"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 ""
-"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."
+"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/text-filters.page:114
-msgid "Blank lines and filters"
-msgstr "Tomma rader och filter"
+#: C/folder-mode.page:83
+msgid "States in folder comparisons"
+msgstr "Tillstånd i mappjämförelser"
 
 #. (itstool) path: section/p
-#: C/text-filters.page:116
+#: C/folder-mode.page:85
 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."
+"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 ""
-"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."
+"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: 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/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: 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:"
+#: C/folder-mode.page:106
+msgid "Folder comparison states"
+msgstr "Tillstånd för mappjämförelser"
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:85 C/folder-mode.page:110
+#: C/folder-mode.page:110 C/vc-mode.page:85
 msgid "State"
 msgstr "Tillstånd"
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:86 C/folder-mode.page:111
+#: C/folder-mode.page:111 C/vc-mode.page:86
 msgid "Appearance"
 msgstr "Utseende"
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:87 C/folder-mode.page:112
+#: C/folder-mode.page:112 C/vc-mode.page:87
 msgid "Meaning"
 msgstr "Betyder"
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:95 C/folder-mode.page:120
+#: C/folder-mode.page:120 C/vc-mode.page:95
 msgid "Normal font"
 msgstr "Normalt typsnitt"
 
 #. (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"
+#: 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/vc-mode.page:115
-msgid "This file is different to the repository version."
-msgstr "Filen skiljer sig mot förrådsversionen."
+#: C/folder-mode.page:132
+msgid "Same when filtered"
+msgstr "Samma när filtrerad"
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:123 C/folder-mode.page:164
-msgid "Green and bold"
-msgstr "Grön och fet"
+#: C/folder-mode.page:134
+msgid "Italics"
+msgstr "Kursiva"
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:129
+#: C/folder-mode.page:140
 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"
+"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/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."
+#: C/folder-mode.page:150
+msgid "Blue and bold"
+msgstr "Blå och fet"
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:151
-msgid "Conflict"
-msgstr "Konflikt"
+#: 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/vc-mode.page:153
-msgid "Bright red bold text"
-msgstr "Ljust röd fet text"
+#: C/folder-mode.page:164 C/vc-mode.page:123
+msgid "Green and bold"
+msgstr "Grön och fet"
 
 #. (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"
+#: 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/vc-mode.page:167 C/folder-mode.page:176
+#: C/folder-mode.page:176 C/vc-mode.page:167
 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"
+#: 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/vc-mode.page:205
+#: C/folder-mode.page:184
 msgid ""
-"This file is not in the version control system; it is only in the local copy."
+"This file/folder doesn't exist in this folder, but does in one of the others."
 msgstr ""
-"Denna fil finns inte i versionshanteringssystemet; den finns endast i den "
-"lokala kopian."
+"Denna fil/mapp existerar inte i denna mapp, men finns i en av de andra."
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:212 C/folder-mode.page:191
+#: C/folder-mode.page:191 C/vc-mode.page:212
 msgid "Error"
 msgstr "Fel"
 
 #. (itstool) path: td/p
-#: C/vc-mode.page:214 C/folder-mode.page:193
+#: C/folder-mode.page:193 C/vc-mode.page:214
 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."
+#: 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 ""
-"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"
+"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/vc-mode.page:232
+#: C/folder-mode.page:217
 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."
+"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 ""
-"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/folder-mode.page:16
-msgid "Getting started comparing folders"
-msgstr "Kom igång med att jämföra mappar"
+"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: page/p
-#: C/folder-mode.page:18
+#. (itstool) path: section/p
+#: C/folder-mode.page:223
 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."
+"Finally, the most recently modified file/folder has a small star emblem "
+"attached to it."
 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>."
+"Slutligen, den senast ändrade filen/mappen har ett litet stjärnemblem fäst "
+"vid sig."
 
-#. (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: page/title
+#: C/index.page:14
+msgid "Meld Help"
+msgstr "Meld hjälp"
 
 #. (itstool) path: section/title
-#: C/folder-mode.page:36
-msgid "The folder comparison view"
-msgstr "Vyn för mappjämförelse"
+#: C/index.page:17
+msgid "Introduction"
+msgstr "Introduktion"
 
-#. (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/title
+#: C/index.page:21
+msgid "Comparing Files"
+msgstr "Jämföra filer"
 
-#. (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/index.page:25
+msgid "Comparing Folders"
+msgstr "Jämföra mappar"
 
 #. (itstool) path: section/title
-#: C/folder-mode.page:63
-msgid "Navigating folder comparisons"
-msgstr "Navigera mappjämförelser"
+#: C/index.page:29
+msgid "Using Meld with Version Control"
+msgstr "Använda Meld med versionshantering"
 
-#. (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/title
+#: C/index.page:33
+msgid "Advanced Usage"
+msgstr "Avancerad användning"
 
-#. (itstool) path: section/p
-#: C/folder-mode.page:73
+#. (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 ""
-"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."
+"<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 ""
-"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"
+"<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: section/p
-#: C/folder-mode.page:85
+#. (itstool) path: page/p
+#: C/introduction.page:22
 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:"
+"<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 ""
-"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:"
+"<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/keyboard-shortcuts.page:15
+msgid "Keyboard shortcuts"
+msgstr "Tangentbordsgenvägar"
 
 #. (itstool) path: table/title
-#: C/folder-mode.page:106
-msgid "Folder comparison states"
-msgstr "Tillstånd för mappjämförelser"
+#: 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/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."
+#: C/keyboard-shortcuts.page:22 C/keyboard-shortcuts.page:56
+#: C/keyboard-shortcuts.page:109 C/keyboard-shortcuts.page:131
+#: C/keyboard-shortcuts.page:153
+msgid "Shortcut"
+msgstr "Genväg"
 
 #. (itstool) path: td/p
-#: C/folder-mode.page:132
-msgid "Same when filtered"
-msgstr "Samma när filtrerad"
+#: C/keyboard-shortcuts.page:22 C/keyboard-shortcuts.page:56
+#: C/keyboard-shortcuts.page:109 C/keyboard-shortcuts.page:131
+#: C/keyboard-shortcuts.page:153
+msgid "Description"
+msgstr "Beskrivning"
 
 #. (itstool) path: td/p
-#: C/folder-mode.page:134
-msgid "Italics"
-msgstr "Kursiva"
+#: 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/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."
+#: C/keyboard-shortcuts.page:30
+msgid "Start a new comparison."
+msgstr "Påbörja en ny jämförelse."
 
 #. (itstool) path: td/p
-#: C/folder-mode.page:150
-msgid "Blue and bold"
-msgstr "Blå och fet"
+#: 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/folder-mode.page:156
-msgid "These files differ between the folders being compared."
-msgstr "Dessa filer skiljer mellan mapparna som jämförs."
+#: C/keyboard-shortcuts.page:34
+msgid "Save the current document to disk."
+msgstr "Spara aktuellt dokument till disk."
 
 #. (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."
+#: 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/folder-mode.page:178
-msgid "Greyed out text with a line through the middle"
-msgstr "Utgråad genomstruken text"
+#: 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/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."
+#: 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/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
+#: 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>Ned</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:91
 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\"/>."
+"Go to the next difference. (Also <keyseq><key>Ctrl</key><key>D</key></"
+"keyseq>)"
 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\"/>."
+"Gå till nästa skillnad. (också <keyseq><key>Ctrl</key><key>D</key></keyseq>)"
 
-#. (itstool) path: section/p
-#: C/folder-mode.page:223
+#. (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 ""
-"Finally, the most recently modified file/folder has a small star emblem "
-"attached to it."
+"Go to the previous difference. (Also <keyseq><key>Ctrl</key><key>E</key></"
+"keyseq>)"
 msgstr ""
-"Slutligen, den senast ändrade filen/mappen har ett litet stjärnemblem fäst "
-"vid sig."
+"Gå till föregående skillnad. (också <keyseq><key>Ctrl</key><key>E</key></"
+"keyseq>)"
 
-#. (itstool) path: page/title
-#: C/resolving-conflicts.page:15
-msgid "Resolving merge conflicts"
-msgstr "Att lösa konflikter vid sammanfogning"
+#. (itstool) path: table/title
+#: C/keyboard-shortcuts.page:105
+msgid "Shortcuts for folder comparison"
+msgstr "Genvägar för mappjämförelse"
 
-#. (itstool) path: page/p
-#: C/resolving-conflicts.page:17
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:115
+msgid "<keyseq><key>+</key></keyseq>"
+msgstr "<keyseq><key>+</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:116
+msgid "Expand the current folder."
+msgstr "Expandera aktuell mapp."
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:119
+msgid "<keyseq><key>-</key></keyseq>"
+msgstr "<keyseq><key>-</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:120
+msgid "Collapse the current folder."
+msgstr "Fäll ihop aktuell mapp."
+
+#. (itstool) path: table/title
+#: C/keyboard-shortcuts.page:127
+msgid "Shortcuts for view settings"
+msgstr "Genvägar för visa-inställningar"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:137
+msgid "<keyseq><key>Escape</key></keyseq>"
+msgstr "<keyseq><key>Escape</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:138
+msgid "Stop the current comparison."
+msgstr "Avsluta pågående jämförelse."
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:141
+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:142
+msgid "Refresh the current comparison."
+msgstr "Uppdatera pågående jämförelse."
+
+#. (itstool) path: table/title
+#: C/keyboard-shortcuts.page:149
+msgid "Shortcuts for help"
+msgstr "Genvägar för hjälp"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:159
+msgid "<keyseq><key>F1</key></keyseq>"
+msgstr "<keyseq><key>F1</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:160
+msgid "Open <app>Meld</app>'s user manual."
+msgstr "Öppna <app>Meld</app>s användarhandbok."
+
+#. (itstool) path: p/link
+#: C/legal.xml:4
+msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
+msgstr "Creative Commons Erkännande-Dela Lika 3.0 Unported"
+
+#. (itstool) path: license/p
+#: C/legal.xml:3
+msgid "This work is licensed under a <_:link-1/>."
+msgstr "Detta verk är licensierat under licensen <_:link-1/>."
+
+#. (itstool) path: license/p
+#: C/legal.xml:6
 msgid ""
-"One of the best uses of <app>Meld</app> is to resolve conflicts that occur "
-"while merging different branches."
+"As a special exception, the copyright holders give you permission to copy, "
+"modify, and distribute the example code contained in this document under the "
+"terms of your choosing, without restriction."
 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."
+"Som ett speciellt undantag, ger upphovsrättsinnehavarna dig tillåtelse att "
+"kopiera, modifiera och distribuera exempelkoden som finns i detta dokument "
+"under de villkor som du väljer, utan restriktioner."
+
+#. (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/resolving-conflicts.page:22
+#: C/missing-functionality.page:17
 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"
+"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 ""
-"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"
+"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/code
-#: C/resolving-conflicts.page:27
-#, no-wrap
+#. (itstool) path: page/p
+#: C/missing-functionality.page:23
 msgid ""
-"\n"
-"[merge]\n"
-"    tool = meld\n"
+"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 ""
-"\n"
-"[merge]\n"
-"    tool = meld\n"
+"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: page/p
-#: C/resolving-conflicts.page:31
+#. (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 ""
-"to <file>.git/gitconfig</file>. See the <app>git mergetool</app> manual for "
-"details."
+"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 ""
-"till <file>.git/gitconfig</file>. Se handboken <app>git mergetool</app> för "
-"detaljer."
+"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: credit/years
 #: C/preferences.page:12
@@ -1512,337 +1369,502 @@ msgstr ""
 "storlek och tidsstämpel” inte är aktiverad."
 
 #. (itstool) path: page/title
-#: C/keyboard-shortcuts.page:15
-msgid "Keyboard shortcuts"
-msgstr "Tangentbordsgenvägar"
+#: C/resolving-conflicts.page:15
+msgid "Resolving merge conflicts"
+msgstr "Att lösa konflikter vid sammanfogning"
 
-#. (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: 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: td/p
-#: C/keyboard-shortcuts.page:22 C/keyboard-shortcuts.page:56
-#: C/keyboard-shortcuts.page:109 C/keyboard-shortcuts.page:131
-#: C/keyboard-shortcuts.page:153
-msgid "Shortcut"
-msgstr "Genväg"
+#. (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: td/p
-#: C/keyboard-shortcuts.page:22 C/keyboard-shortcuts.page:56
-#: C/keyboard-shortcuts.page:109 C/keyboard-shortcuts.page:131
-#: C/keyboard-shortcuts.page:153
-msgid "Description"
-msgstr "Beskrivning"
+#. (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: 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: 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: td/p
-#: C/keyboard-shortcuts.page:30
-msgid "Start a new comparison."
-msgstr "Påbörja en ny jämförelse."
+#. (itstool) path: page/title
+#: C/text-filters.page:17
+msgid "Filtering out text"
+msgstr "Filtrera ut text"
 
-#. (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: 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: td/p
-#: C/keyboard-shortcuts.page:34
-msgid "Save the current document to disk."
-msgstr "Spara aktuellt dokument till disk."
+#. (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: 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: section/title
+#: C/text-filters.page:37
+msgid "Adding and using text filters"
+msgstr "Lägga till och använda textfilter"
 
-#. (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: 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: 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: 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: td/p
-#: C/keyboard-shortcuts.page:42
-msgid "Close the current comparison."
-msgstr "Stäng aktuell jämförelse."
+#. (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: 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: section/title
+#: C/text-filters.page:67
+msgid "Getting text filters right"
+msgstr "Skriva korrekta textfilter"
 
-#. (itstool) path: td/p
-#: C/keyboard-shortcuts.page:46
-msgid "Quit <app>Meld</app>."
-msgstr "Avsluta <app>Meld</app>."
+#. (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: table/title
-#: C/keyboard-shortcuts.page:52
-msgid "Shortcuts for editing documents"
-msgstr "Genvägar för att redigera dokument"
+#. (itstool) path: listing/title
+#: C/text-filters.page:80
+msgid "<file>comment1.txt</file>"
+msgstr "<file>kommentar1.txt</file>"
 
-#. (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: 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: td/p
-#: C/keyboard-shortcuts.page:63
-msgid "Undo the last action."
-msgstr "Ångra den senaste åtgärden."
+#. (itstool) path: listing/title
+#: C/text-filters.page:90
+msgid "<file>comment2.txt</file>"
+msgstr "<file>kommentar2.txt</file>"
 
-#. (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: 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: td/p
-#: C/keyboard-shortcuts.page:67
-msgid "Redo the last undone action."
-msgstr "Gör om den senast ångrade åtgärden."
+#. (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: 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: section/title
+#: C/text-filters.page:114
+msgid "Blank lines and filters"
+msgstr "Tomma rader och filter"
 
-#. (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: 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: 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: 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: 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: info/title
+#: C/vc-mode.page:5
+msgctxt "sort"
+msgid "0"
+msgstr "0"
 
-#. (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: page/title
+#: C/vc-mode.page:16
+msgid "Viewing version-controlled files"
+msgstr "Visa versionshanterade filer"
 
-#. (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: 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: 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: 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/keyboard-shortcuts.page:83
-msgid "Find a string."
-msgstr "Hitta en sträng."
+#: 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/keyboard-shortcuts.page:86
-msgid "<keyseq><key>Ctrl</key><key>G</key></keyseq>"
-msgstr "<keyseq><key>Ctrl</key><key>G</key></keyseq>"
+#: C/vc-mode.page:109
+msgid "Red and bold"
+msgstr "Röd och fet"
 
 #. (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."
+#: 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/keyboard-shortcuts.page:90
-msgid "<keyseq><key>Alt</key><key>Down</key></keyseq>"
-msgstr "<keyseq><key>Alt</key><key>Ned</key></keyseq>"
+#: 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/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>)"
+#: C/vc-mode.page:136
+msgid "Removed"
+msgstr "Borttagen"
 
 #. (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>"
+#: 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/keyboard-shortcuts.page:97
+#: C/vc-mode.page:144
 msgid ""
-"Go to the previous difference. (Also <keyseq><key>Ctrl</key><key>E</key></"
-"keyseq>)"
+"This file/folder existed, but is scheduled to be removed from the repository."
 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 folder comparison"
-msgstr "Genvägar för mappjämförelse"
+"Filen/mappen existerade, men är schemalagd till att tas bort från förrådet."
 
 #. (itstool) path: td/p
-#: C/keyboard-shortcuts.page:115
-msgid "<keyseq><key>+</key></keyseq>"
-msgstr "<keyseq><key>+</key></keyseq>"
+#: C/vc-mode.page:151
+msgid "Conflict"
+msgstr "Konflikt"
 
 #. (itstool) path: td/p
-#: C/keyboard-shortcuts.page:116
-msgid "Expand the current folder."
-msgstr "Expandera aktuell mapp."
+#: C/vc-mode.page:153
+msgid "Bright red bold text"
+msgstr "Ljust röd fet text"
 
 #. (itstool) path: td/p
-#: C/keyboard-shortcuts.page:119
-msgid "<keyseq><key>-</key></keyseq>"
-msgstr "<keyseq><key>-</key></keyseq>"
+#: 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/keyboard-shortcuts.page:120
-msgid "Collapse the current folder."
-msgstr "Fäll ihop aktuell mapp."
-
-#. (itstool) path: table/title
-#: C/keyboard-shortcuts.page:127
-msgid "Shortcuts for view settings"
-msgstr "Genvägar för visa-inställningar"
+#: 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/keyboard-shortcuts.page:137
-msgid "<keyseq><key>Escape</key></keyseq>"
-msgstr "<keyseq><key>Escape</key></keyseq>"
+#: 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/keyboard-shortcuts.page:138
-msgid "Stop the current comparison."
-msgstr "Avsluta pågående jämförelse."
+#: C/vc-mode.page:181
+msgid "Ignored"
+msgstr "Ignorerad"
 
 #. (itstool) path: td/p
-#: C/keyboard-shortcuts.page:141
-msgid "<keyseq><key>Ctrl</key><key>R</key></keyseq>"
-msgstr "<keyseq><key>Ctrl</key><key>R</key></keyseq>"
+#: C/vc-mode.page:183 C/vc-mode.page:199
+msgid "Greyed out text"
+msgstr "Utgråad text"
 
 #. (itstool) path: td/p
-#: C/keyboard-shortcuts.page:142
-msgid "Refresh the current comparison."
-msgstr "Uppdatera pågående jämförelse."
-
-#. (itstool) path: table/title
-#: C/keyboard-shortcuts.page:149
-msgid "Shortcuts for help"
-msgstr "Genvägar för hjälp"
+#: 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/keyboard-shortcuts.page:159
-msgid "<keyseq><key>F1</key></keyseq>"
-msgstr "<keyseq><key>F1</key></keyseq>"
+#: C/vc-mode.page:197
+msgid "Unversioned"
+msgstr "Oversionerad"
 
 #. (itstool) path: td/p
-#: C/keyboard-shortcuts.page:160
-msgid "Open <app>Meld</app>'s user manual."
-msgstr "Öppna <app>Meld</app>s användarhandbok."
-
-#. (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
+#: C/vc-mode.page:205
 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."
+"This file is not in the version control system; it is only in the local copy."
 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"
+"Denna fil finns inte i versionshanteringssystemet; den finns endast i den "
+"lokala kopian."
 
-#. (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."
+#. (itstool) path: td/p
+#: C/vc-mode.page:220
+msgid "The version control system has reported a problem with this file."
 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."
+"Versionshanteringssystemet har rapporterat att denna fil har ett problem."
 
 #. (itstool) path: section/title
-#: C/file-changes.page:46
-msgid "Changing changes"
-msgstr "Ändra ändringar"
+#: C/vc-mode.page:230
+msgid "Version control state filtering"
+msgstr "Filtrering av versionshanteringstillstånd"
 
 #. (itstool) path: section/p
-#: C/file-changes.page:48
+#: C/vc-mode.page:232
 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."
+"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 ""
-"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."
+"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: 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: info/title
+#: C/vc-supported.page:5
+msgctxt "sort"
+msgid "3"
+msgstr "3"
 
-#. (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: page/title
+#: C/vc-supported.page:15
+msgid "Supported version control systems"
+msgstr "Versionshanteringssystem som stöds"
 
-#. (itstool) path: section/p
-#: C/file-changes.page:62
+#. (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 "Bazaar"
+msgstr "Bazaar"
+
+#. (itstool) path: item/p
+#: C/vc-supported.page:23
+msgid "Darcs"
+msgstr "Darcs"
+
+#. (itstool) path: item/p
+#: C/vc-supported.page:24
+msgid "Git"
+msgstr "Git"
+
+#. (itstool) path: item/p
+#: C/vc-supported.page:25
+msgid "Mercurial"
+msgstr "Mercurial"
+
+#. (itstool) path: item/p
+#: C/vc-supported.page:26
+msgid "SVN"
+msgstr "SVN"
+
+#. (itstool) path: page/p
+#: C/vc-supported.page:29
 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."
+"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 ""
-"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."
+"Mindre vanliga versionshanteringssystem eller ovanliga konfigurationer är "
+"inte lika vältestade; rapportera fel till <link href=\"https://bugzilla."
+"gnome.org/\">GNOME bugzilla</link>."
 
 #~ msgid "Arch"
 #~ msgstr "Arch"
diff --git a/maint b/maint
index 7776f0c9..cf5127cf 100755
--- a/maint
+++ b/maint
@@ -5,8 +5,11 @@ import datetime
 import os
 import re
 import subprocess
+import urllib.parse
 
 import click
+import keyring
+import requests
 from jinja2 import Environment
 
 import meld.conf
@@ -16,6 +19,8 @@ HELP_DIR = "help"
 RELEASE_BRANCH_RE = r'%s-\d+-\d+' % meld.conf.__package__
 VERSION_RE = r'__version__\s*=\s*"(?P<version>.*)"'
 UPLOAD_SERVER = 'master.gnome.org'
+GITLAB_API_BASE = 'https://gitlab.gnome.org/api/v4'
+GITLAB_PROJECT_ID = 'GNOME/meld'
 
 NEWS_TEMPLATE = """
 {{ [date, app, version]|join(' ') }}
@@ -153,8 +158,13 @@ def get_translator_langs(folders=[PO_DIR, HELP_DIR]):
 def get_non_translation_commits():
     last_release = get_last_release_tag()
     revspec = "%s..HEAD" % last_release
-    # FIXME: Use the Git 1.9 spec to negate logging translation commits
-    cmd = ['git', 'log', '--pretty=format:%s (%an)', revspec]
+    cmd = [
+        'git', 'log', '--pretty=format:%s (%an)', revspec,
+        # Exclude commits that only cover the po/ or help/ folders,
+        # except commits in help/C. Basically, we want to separate
+        # translation-only commits from everything else.
+        '--', '.', ":!po/", ':(glob,exclude)help/[!C]*/**',
+    ]
     commits = subprocess.check_output(cmd).strip().splitlines()
     return [c.decode('utf-8') for c in commits]
 
@@ -233,7 +243,7 @@ def render_template(template):
 
 def call_with_output(
         cmd, stdin_text=None, echo_stdout=True, abort_on_fail=True,
-        timeout=10):
+        timeout=30):
     PIPE = subprocess.PIPE
     with subprocess.Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE) as proc:
         stdout, stderr = proc.communicate(stdin_text, timeout=timeout)
@@ -289,6 +299,49 @@ def push():
     call_with_output(cmd, echo_stdout=True)
 
 
+def gitlab_release_tag(tag):
+    auth_token = keyring.get_password('gitlab-api', GITLAB_PROJECT_ID)
+    if not auth_token:
+        raise click.ClickException(
+            "No password in keychain for {id}\n\n"
+            "Set password using the Python `keyring` package. "
+            "From the command line:\n"
+            "  $ keyring set gitlab-api {id}\n"
+            "and enter your secret token from the Gitlab UI.\n".format(
+                id=GITLAB_PROJECT_ID)
+        )
+
+    cmd = ['git', 'tag', '-l', "--format=%(contents)", tag]
+    description = subprocess.check_output(cmd).decode('utf-8')
+
+    endpoint = '{base}/projects/{id}/repository/tags/{tag_name}/release'
+    release_url = endpoint.format(
+        base=GITLAB_API_BASE,
+        id=urllib.parse.quote_plus(GITLAB_PROJECT_ID),
+        tag_name=tag,
+    )
+    release_data = {
+        "tag_name": tag,
+        "description": description
+    }
+
+    # TODO: Should probably sanity-check that it's not already a
+    # release tag.
+
+    response = requests.post(
+        release_url,
+        json=release_data,
+        headers={
+            'Private-Token': auth_token,
+        },
+    )
+    try:
+        response.raise_for_status()
+    except Exception as e:
+        click.secho(
+            'Error making release: {}\n{}'.format(e, response.text), fg='red')
+
+
 @click.group()
 def cli():
     pass
@@ -379,6 +432,17 @@ def tag():
     call_with_output(cmd, echo_stdout=True)
 
 
+@cli.command('gitlab-release')
+def gitlab_release():
+    last_release = get_last_release_tag()
+    confirm = click.confirm(
+        'Annotate {} as a Gitlab release?'.format(last_release), default=True)
+    if not confirm:
+        return
+
+    gitlab_release_tag(last_release)
+
+
 @cli.command()
 @click.argument('path', type=click.Path(exists=True))
 def upload(path):
@@ -391,7 +455,7 @@ def upload(path):
     call_with_output(cmd, timeout=120)
 
 
-@cli.command()
+@cli.command('version-bump')
 def version_bump():
     with open(meld.conf.__file__) as f:
         conf_data = f.read().splitlines()
@@ -419,7 +483,7 @@ def version_bump():
         f.write('\n'.join(conf_data) + '\n')
 
 
-@cli.command()
+@cli.command('release')
 @click.pass_context
 def make_release(ctx):
     pull()
@@ -428,7 +492,7 @@ def make_release(ctx):
     push()
     archive_path = ctx.forward(dist)
     ctx.forward(tag)
-    ctx.forward(upload, path=archive_path)
+    ctx.forward(gitlab_release)
     file_prefix = '%s-%s' % (meld.conf.__package__, meld.conf.__version__)
     ctx.forward(email, filename=file_prefix + '-email')
     ctx.forward(markdown, filename=file_prefix + '.md')
@@ -436,6 +500,8 @@ def make_release(ctx):
     commit(message='Post-release version bump')
     push()
 
+    ctx.forward(upload, path=archive_path)
+
     # TODO: ssh in and run ftpadmin install
     click.echo('\nNow run:')
     click.echo('ssh %s' % UPLOAD_SERVER)
diff --git a/meld/build_helpers.py b/meld/build_helpers.py
index 17f421a8..8fd4a9a7 100644
--- a/meld/build_helpers.py
+++ b/meld/build_helpers.py
@@ -113,7 +113,9 @@ def get_data_files(self):
         if "LINGUAS" in os.environ:
             self.selected_languages = os.environ["LINGUAS"].split()
         else:
-            self.selected_languages = os.listdir(self.help_dir)
+            self.selected_languages = [
+                d for d in os.listdir(self.help_dir) if os.path.isdir(d)
+            ]
 
         if 'C' not in self.selected_languages:
             self.selected_languages.append('C')
@@ -371,7 +373,7 @@ def build_module(self, module, module_file, package):
 class install(distutils.command.install.install):
 
     def finalize_options(self):
-        special_cases = ('debian', 'ubuntu')
+        special_cases = ('debian', 'ubuntu', 'linuxmint')
         if (platform.system() == 'Linux' and
                 platform.linux_distribution()[0].lower() in special_cases):
             # Maintain an explicit install-layout, but use deb by default
diff --git a/meld/conf.py b/meld/conf.py
index 4074f690..5188bb5a 100644
--- a/meld/conf.py
+++ b/meld/conf.py
@@ -3,14 +3,15 @@
 import sys
 
 __package__ = "meld"
-__version__ = "3.18.0"
+__version__ = "3.18.4"
 
 # START; these paths are clobbered on install by meld.build_helpers
 DATADIR = os.path.join(sys.prefix, "share", "meld")
 LOCALEDIR = os.path.join(sys.prefix, "share", "locale")
 # END
-UNINSTALLED = False
-UNINSTALLED_SCHEMA = False
+
+# Flag enabling some workarounds if data dir isn't installed in standard prefix
+DATADIR_IS_UNINSTALLED = False
 PYTHON_REQUIREMENT_TUPLE = (3, 3)
 
 # Installed from main script
@@ -19,13 +20,13 @@
 
 
 def frozen():
-    global DATADIR, LOCALEDIR, UNINSTALLED_SCHEMA
+    global DATADIR, LOCALEDIR, DATADIR_IS_UNINSTALLED
 
     melddir = os.path.dirname(sys.executable)
 
     DATADIR = os.path.join(melddir, "share", "meld")
     LOCALEDIR = os.path.join(melddir, "share", "mo")
-    UNINSTALLED_SCHEMA = True
+    DATADIR_IS_UNINSTALLED = True
 
     # This first bit should be unnecessary, but some things (GTK icon theme
     # location, GSettings schema location) don't fall back correctly.
@@ -35,14 +36,13 @@ def frozen():
 
 
 def uninstalled():
-    global DATADIR, LOCALEDIR, UNINSTALLED, UNINSTALLED_SCHEMA
+    global DATADIR, LOCALEDIR, DATADIR_IS_UNINSTALLED
     melddir = os.path.abspath(os.path.join(
         os.path.dirname(os.path.realpath(__file__)), ".."))
 
     DATADIR = os.path.join(melddir, "data")
     LOCALEDIR = os.path.join(melddir, "build", "mo")
-    UNINSTALLED = True
-    UNINSTALLED_SCHEMA = True
+    DATADIR_IS_UNINSTALLED = True
 
     # This first bit should be unnecessary, but some things (GTK icon theme
     # location, GSettings schema location) don't fall back correctly.
diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index b26acae4..ac1803b8 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -716,11 +716,11 @@ def _search_recursively_iter(self, rootpath):
 
                 for e in entries:
                     try:
-                        if not isinstance(e, str):
-                            e = e.decode('utf8')
-                    except UnicodeDecodeError:
-                        approximate_name = e.decode('utf8', 'replace')
-                        encoding_errors.append((pane, approximate_name))
+                        e.encode('utf8')
+                    except UnicodeEncodeError:
+                        invalid = e.encode('utf8', 'surrogatepass')
+                        printable = invalid.decode('utf8', 'backslashreplace')
+                        encoding_errors.append((pane, printable))
                         continue
 
                     try:
diff --git a/meld/filediff.py b/meld/filediff.py
index 9cf02c46..86ac1341 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -842,6 +842,9 @@ def on_delete_event(self):
         if response == Gtk.ResponseType.OK:
             for h in self.settings_handlers:
                 meldsettings.disconnect(h)
+            # TODO: This should not be necessary; remove if and when we
+            # figure out what's keeping MeldDocs alive for too long.
+            del self._cached_match
             # TODO: Base the return code on something meaningful for VC tools
             self.emit('close', 0)
         return response
@@ -1139,7 +1142,7 @@ def _compare_files_internal(self):
             yield i
         for i in self._diff_files():
             yield i
-        focus_pane = 0 if self.num_panes < 3 else 1
+        focus_pane = 0 if self.num_panes < 2 else 1
         self.textview[focus_pane].grab_focus()
 
     def set_meta(self, meta):
@@ -1478,38 +1481,6 @@ def on_file_changed_response(msgarea, response_id, *args):
             msgarea.show_all()
             return False
 
-        start, end = buf.get_bounds()
-        text = buf.get_text(start, end, False)
-
-        source_encoding = bufdata.sourcefile.get_encoding()
-        if not source_encoding:
-            # no encoding for new blank comparison
-            source_encoding = GtkSource.Encoding.get_utf8()
-
-        while isinstance(text, str):
-            try:
-                encoding = source_encoding.get_charset()
-                text = text.encode(encoding)
-            except UnicodeEncodeError:
-                dialog_buttons = [
-                    (_("_Cancel"), Gtk.ResponseType.CANCEL),
-                    (_("_Save as UTF-8"), Gtk.ResponseType.OK),
-                ]
-                reencode = misc.modal_dialog(
-                    primary=_(u"Couldn't encode text as “%s”") % encoding,
-                    secondary=_(
-                        u"File “%s” contains characters that can't be encoded "
-                        u"using encoding “%s”.\n"
-                        u"Would you like to save as UTF-8?") % (
-                        bufdata.label, encoding),
-                    buttons=dialog_buttons,
-                    messagetype=Gtk.MessageType.WARNING
-                )
-                if reencode != Gtk.ResponseType.OK:
-                    return False
-
-                source_encoding = GtkSource.Encoding.get_utf8()
-
         saver = GtkSource.FileSaver.new_with_target(
             self.textbuffer[pane], bufdata.sourcefile, bufdata.gfiletarget)
         # TODO: Think about removing this flag and above handling, and instead
@@ -1551,9 +1522,9 @@ def file_saved_cb(self, saver, result, user_data):
         if pane == 1 and self.num_panes == 3:
             self.meta['middle_saved'] = True
 
-        if (self.state == melddoc.STATE_CLOSING and
-                not any(b.get_modified() for b in self.textbuffer)):
-            self.on_delete_event()
+        if self.state == melddoc.STATE_CLOSING:
+            if not any(b.get_modified() for b in self.textbuffer):
+                self.on_delete_event()
         else:
             self.state = melddoc.STATE_NORMAL
 
diff --git a/meld/matchers/helpers.py b/meld/matchers/helpers.py
index 5710c9ba..5f2e15cc 100644
--- a/meld/matchers/helpers.py
+++ b/meld/matchers/helpers.py
@@ -14,6 +14,8 @@
 
 class MatcherWorker(multiprocessing.Process):
 
+    END_TASK = -1
+
     matcher_class = myers.InlineMyersSequenceMatcher
 
     def __init__(self, tasks, results):
@@ -25,6 +27,9 @@ def __init__(self, tasks, results):
     def run(self):
         while True:
             task_id, (text1, textn) = self.tasks.get()
+            if task_id == self.END_TASK:
+                break
+
             try:
                 matcher = self.matcher_class(None, text1, textn)
                 self.results.put((task_id, matcher.get_opcodes()))
@@ -43,6 +48,8 @@ class CachedSequenceMatcher(object):
     eviction is overly simplistic, but is okay for our usage pattern.
     """
 
+    TASK_GRACE_PERIOD = 5
+
     def __init__(self, scheduler):
         """Create a new caching sequence matcher
 
@@ -62,6 +69,12 @@ def __init__(self, scheduler):
         self.queued_matches = {}
         GLib.idle_add(self.thread.start)
 
+    def __del__(self):
+        self.tasks.put((MatcherWorker.END_TASK, ('', '')))
+        self.thread.join(self.TASK_GRACE_PERIOD)
+        if self.thread.exitcode is None:
+            self.thread.terminate()
+
     def match(self, text1, textn, cb):
         texts = (text1, textn)
         try:
diff --git a/meld/meldapp.py b/meld/meldapp.py
index c1bbafcf..037ebbe1 100644
--- a/meld/meldapp.py
+++ b/meld/meldapp.py
@@ -109,7 +109,7 @@ def preferences_callback(self, action, parameter):
         meld.preferences.PreferencesDialog(self.get_active_window())
 
     def help_callback(self, action, parameter):
-        if meld.conf.UNINSTALLED:
+        if meld.conf.DATADIR_IS_UNINSTALLED:
             uri = "http://meldmerge.org/help/"
         else:
             uri = "help:meld"
@@ -150,7 +150,9 @@ def open_files(self, files, **kwargs):
 
         paths = [f.get_path() for f in files]
         try:
-            return window.open_paths(paths, **kwargs)
+            tab = window.open_paths(paths, **kwargs)
+            window.widget.show()
+            return tab
         except ValueError:
             if not new_tab:
                 self.remove_window(window.widget)
diff --git a/meld/meldwindow.py b/meld/meldwindow.py
index ce9dbd86..1786e5ea 100644
--- a/meld/meldwindow.py
+++ b/meld/meldwindow.py
@@ -215,8 +215,13 @@ def app_action(*args):
             action.connect('activate', callback)
             self.widget.add_action(action)
 
+        # Create a secondary toolbar, just to hold our progress spinner
         toolbutton = Gtk.ToolItem()
         self.spinner = Gtk.Spinner()
+        # Fake out the spinner on Windows. See Gitlab issue #133.
+        if os.name == 'nt':
+            for attr in ('stop', 'hide', 'show', 'start'):
+                setattr(self.spinner, attr, lambda *args: True)
         toolbutton.add(self.spinner)
         self.secondary_toolbar.insert(toolbutton, -1)
         # Set a minimum size because the spinner requests nothing
diff --git a/meld/settings.py b/meld/settings.py
index ee4d02f6..7f9f9ead 100644
--- a/meld/settings.py
+++ b/meld/settings.py
@@ -79,7 +79,7 @@ def _current_font_from_gsetting(self, *args):
 
 
 def load_settings_schema(schema_id):
-    if meld.conf.UNINSTALLED_SCHEMA:
+    if meld.conf.DATADIR_IS_UNINSTALLED:
         schema_source = Gio.SettingsSchemaSource.new_from_directory(
             meld.conf.DATADIR,
             Gio.SettingsSchemaSource.get_default(),
diff --git a/meld/ui/findbar.py b/meld/ui/findbar.py
index 2dae1831..aa67c6ad 100644
--- a/meld/ui/findbar.py
+++ b/meld/ui/findbar.py
@@ -48,6 +48,9 @@ def hide(self):
         self.wrap_box.set_visible(False)
         self.widget.hide()
 
+    def on_stop_search(self, search_entry):
+        self.hide()
+
     def set_text_view(self, textview):
         self.textview = textview
         if textview is not None:
diff --git a/meld/vc/__init__.py b/meld/vc/__init__.py
index 656167fd..c6999542 100644
--- a/meld/vc/__init__.py
+++ b/meld/vc/__init__.py
@@ -40,7 +40,7 @@
     "darcs",
 )
 
-_plugins = [importlib.import_module("." + vc, __package__) for vc in vc_names]
+_plugins = [importlib.import_module("." + vc, __name__) for vc in vc_names]
 
 
 def get_plugins_metadata():
diff --git a/meld/vc/bzr.py b/meld/vc/bzr.py
index 4c302e48..fb175e78 100644
--- a/meld/vc/bzr.py
+++ b/meld/vc/bzr.py
@@ -172,7 +172,7 @@ def _update_tree_state_cache(self, path):
             state2 = self.state_2_map.get(state_string[1])
             state3 = self.state_3_map.get(state_string[2])
 
-            states = {state1, state2, state3}
+            states = {state1, state2, state3} - {None}
 
             if _vc.STATE_CONFLICT in states:
                 real_path_match = re.search(self.CONFLICT_RE, name)
diff --git a/meld/vc/git.py b/meld/vc/git.py
index ce82ff20..072d4ec8 100644
--- a/meld/vc/git.py
+++ b/meld/vc/git.py
@@ -118,7 +118,7 @@ def get_commits_to_push(self):
             except ValueError:
                 continue
 
-            proc = self.run("rev-list", branch, "^" + remote)
+            proc = self.run("rev-list", branch, "^" + remote, "--")
             revisions = proc.stdout.read().split("\n")[:-1]
             branch_revisions[branch] = revisions
         return branch_revisions
@@ -127,8 +127,11 @@ def get_files_to_commit(self, paths):
         files = []
         for p in paths:
             if os.path.isdir(p):
-                entries = self._get_modified_files(p)
-                names = [self.DIFF_RE.search(e).groups()[5] for e in entries]
+                cached_entries, entries = self._get_modified_files(p)
+                all_entries = set(entries + cached_entries)
+                names = [
+                    self.DIFF_RE.search(e).groups()[5] for e in all_entries
+                ]
                 files.extend(names)
             else:
                 files.append(os.path.relpath(p, self.root))
diff --git a/meld/vc/mercurial.py b/meld/vc/mercurial.py
index d49196d0..041542bc 100644
--- a/meld/vc/mercurial.py
+++ b/meld/vc/mercurial.py
@@ -47,7 +47,7 @@ class Vc(_vc.Vc):
 
     def commit(self, runner, files, message):
         command = [self.CMD, 'commit', '-m', message]
-        runner(command, [], refresh=True, working_dir=self.root)
+        runner(command, files, refresh=True, working_dir=self.root)
 
     def update(self, runner):
         command = [self.CMD, 'pull', '-u']
diff --git a/po/da.po b/po/da.po
index 98dd6dd3..f9f210c3 100644
--- a/po/da.po
+++ b/po/da.po
@@ -16,10 +16,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: meld master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=meld&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-01-21 23:12+0000\n"
-"PO-Revision-Date: 2017-02-11 19:39+0100\n"
+"POT-Creation-Date: 2017-09-13 16:58+0000\n"
+"PO-Revision-Date: 2017-10-23 17:49+0200\n"
 "Last-Translator: Alan Mortensen <alanmortensen.am@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
@@ -204,8 +204,8 @@ msgid ""
 "Selector for individual whitespace character types to be shown. Possible "
 "values are 'space', 'tab', 'newline' and 'nbsp'."
 msgstr ""
-"Hvilken type blanktegn skal vises. Mulige værdier er: \"space\", \"tab\", "
-"\"newline\" og \"nbsp\"."
+"Hvilken type blanktegn skal vises. Mulige værdier er: “space”, “tab”, "
+"“newline” og “nbsp”."
 
 #: ../data/org.gnome.meld.gschema.xml.h:23
 msgid "Wrap mode"
@@ -218,8 +218,8 @@ msgid ""
 "('word')."
 msgstr ""
 "Linjer i filsammenligninger vil blive ombrudt i henhold til denne "
-"indstilling: overhovedet ikke (\"none\"), ved ethvert tegn (\"char\") eller "
-"kun efter et ord (\"word\")."
+"indstilling: overhovedet ikke (“none”), ved ethvert tegn (“char”) eller kun "
+"efter et ord (“word”)."
 
 #: ../data/org.gnome.meld.gschema.xml.h:25
 msgid "Highlight current line"
@@ -277,7 +277,7 @@ msgid ""
 "If false, custom-editor-command will be used instead of the system editor "
 "when opening files externally."
 msgstr ""
-"Hvis falsk vil \"custom-editor-command\" blive brugt i stedet for systemets "
+"Hvis falsk vil “custom-editor-command” blive brugt i stedet for systemets "
 "redigeringsprogram, når filer åbnes eksternt."
 
 #: ../data/org.gnome.meld.gschema.xml.h:35
@@ -290,7 +290,7 @@ msgid ""
 "supported here; at the moment '{file}' and '{line}' are recognised tokens."
 msgstr ""
 "Kommandoen til at starte et brugerdefineret redigeringsprogram. Begrænset "
-"brug af skabeloner understøttes; for øjeblikket kan \"{file}\" og \"{line}\" "
+"brug af skabeloner understøttes; for øjeblikket kan “{file}” og “{line}” "
 "bruges."
 
 #: ../data/org.gnome.meld.gschema.xml.h:37
@@ -530,7 +530,7 @@ msgstr "Websted"
 msgid "translator-credits"
 msgstr ""
 "Joe Hansen, 2010, 2011.\n"
-"Alan Mortensen, 2016.\n"
+"Alan Mortensen, 2016, 2017.\n"
 "\n"
 "Dansk-gruppen <dansk@dansk-gruppen.dk>\n"
 "Mere info: http://www.dansk-gruppen.dk"
@@ -583,7 +583,7 @@ msgstr "Kopiér til højre"
 msgid "Delete selected"
 msgstr "Slet det valgte"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1336
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:856 ../meld/filediff.py:1357
 msgid "Hide"
 msgstr "Skjul"
 
@@ -619,7 +619,7 @@ msgstr "Ny"
 msgid "Show new"
 msgstr "Vis ny"
 
-#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:76
+#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:77
 msgid "Modified"
 msgstr "Ændret"
 
@@ -674,7 +674,7 @@ msgstr "Flyt _ned"
 
 #. Create icon and filename CellRenderer
 #: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35
-#: ../meld/dirdiff.py:373
+#: ../meld/dirdiff.py:374
 msgid "Name"
 msgstr "Navn"
 
@@ -875,8 +875,8 @@ msgstr "Ændringerne vil gå tabt, hvis ikke du gemmer."
 msgid "Close _without Saving"
 msgstr "Luk _uden at gemme"
 
-#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1402
-#: ../meld/filediff.py:1474
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:938 ../meld/filediff.py:1423
+#: ../meld/filediff.py:1495
 msgid "_Cancel"
 msgstr "_Annullér"
 
@@ -912,7 +912,7 @@ msgstr "Forkast ikke gemte ændringer i dokumentet?"
 msgid "Changes made to the following documents will be permanently lost:\n"
 msgstr "Ændringer foretaget i følgende dokumenter vil gå tabt for altid:\n"
 
-#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1403
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:939 ../meld/filediff.py:1424
 msgid "_Replace"
 msgstr "_Erstat"
 
@@ -1069,7 +1069,9 @@ msgstr "_Tidsstempelopløsning:"
 
 #: ../data/ui/preferences.ui.h:23
 msgid "Note: enabling text filters may make comparing large files much slower"
-msgstr "Bemærk: Aktivering af tekstfiltre kan gøre sammenligning af store filer meget langsommere"
+msgstr ""
+"Bemærk: Aktivering af tekstfiltre kan gøre sammenligning af store filer "
+"meget langsommere"
 
 #: ../data/ui/preferences.ui.h:24
 msgid "Symbolic Links"
@@ -1439,7 +1441,7 @@ msgctxt "shortcut window"
 msgid "Show/hide console output"
 msgstr "Vis/skjul konsoloutput"
 
-#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:559
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:562
 #: ../meld/newdifftab.py:38
 msgid "New comparison"
 msgstr "Ny sammenligning"
@@ -1593,7 +1595,7 @@ msgstr "Ikke _versioneret"
 msgid "Show unversioned files"
 msgstr "Vis filer uden versionering"
 
-#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69
+#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:70
 msgid "Ignored"
 msgstr "Ignoreret"
 
@@ -1664,44 +1666,44 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:391 ../meld/preferences.py:82
+#: ../meld/dirdiff.py:392 ../meld/preferences.py:82
 msgid "Size"
 msgstr "Størrelse"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:399 ../meld/preferences.py:83
+#: ../meld/dirdiff.py:400 ../meld/preferences.py:83
 msgid "Modification time"
 msgstr "Ændringstidspunkt"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:407 ../meld/preferences.py:84
+#: ../meld/dirdiff.py:408 ../meld/preferences.py:84
 msgid "Permissions"
 msgstr "Rettigheder"
 
-#: ../meld/dirdiff.py:537
+#: ../meld/dirdiff.py:535
 #, python-format
 msgid "Hide %s"
 msgstr "Skjul %s"
 
-#: ../meld/dirdiff.py:669 ../meld/dirdiff.py:693
+#: ../meld/dirdiff.py:667 ../meld/dirdiff.py:691
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Skanner %s"
 
-#: ../meld/dirdiff.py:825
+#: ../meld/dirdiff.py:823
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Færdig"
 
-#: ../meld/dirdiff.py:833
+#: ../meld/dirdiff.py:831
 msgid "Folders have no differences"
 msgstr "Der er ingen forskelle på mapperne"
 
-#: ../meld/dirdiff.py:835
+#: ../meld/dirdiff.py:833
 msgid "Contents of scanned files in folders are identical."
 msgstr "Indholdet af de skannede filer i mapperne er ens."
 
-#: ../meld/dirdiff.py:837
+#: ../meld/dirdiff.py:835
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1709,40 +1711,40 @@ msgstr ""
 "De skannede filer i mapperne ser ud til at være ens, men indholdet er ikke "
 "blevet skannet."
 
-#: ../meld/dirdiff.py:840
+#: ../meld/dirdiff.py:838
 msgid "File filters are in use, so not all files have been scanned."
 msgstr "Ikke alle filer er blevet skannet, da filfiltre er i brug."
 
-#: ../meld/dirdiff.py:842
+#: ../meld/dirdiff.py:840
 msgid "Text filters are in use and may be masking content differences."
 msgstr "Tekstfiltre er i brug og kan maskere forskelle i indhold."
 
-#: ../meld/dirdiff.py:860 ../meld/filediff.py:1338 ../meld/filediff.py:1368
-#: ../meld/filediff.py:1370 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122
+#: ../meld/dirdiff.py:858 ../meld/filediff.py:1359 ../meld/filediff.py:1389
+#: ../meld/filediff.py:1391 ../meld/ui/msgarea.py:105 ../meld/ui/msgarea.py:118
 msgid "Hi_de"
 msgstr "_Skjul"
 
-#: ../meld/dirdiff.py:870
+#: ../meld/dirdiff.py:868
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Der opstod flere fejl, under skanning af mappen"
 
-#: ../meld/dirdiff.py:871
+#: ../meld/dirdiff.py:869
 msgid "Files with invalid encodings found"
 msgstr "Fandt filer med ugyldige kodninger"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:873
+#: ../meld/dirdiff.py:871
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "Nogle filer var ikke kodet korrekt. Navnene er noget lignende dette:"
 
-#: ../meld/dirdiff.py:875
+#: ../meld/dirdiff.py:873
 msgid "Files hidden by case insensitive comparison"
 msgstr "Filer skjult af søgning, som ikke tager højde for store/små bogstaver"
 
 # Du udfører en sammenligning uden forskel på store og små bogstaver på
 # et filsystem, hvor der er forskel på store og små bogstaver.
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:877
+#: ../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:"
@@ -1751,30 +1753,30 @@ msgstr ""
 "på et filsystem, som tager højde for store/små bogstaver. Følgende filer i "
 "denne mappe er skjulte:"
 
-#: ../meld/dirdiff.py:888
+#: ../meld/dirdiff.py:886
 #, python-format
 msgid "'%s' hidden by '%s'"
-msgstr "\"%s\" skjult af \"%s\""
+msgstr "“%s” skjult af “%s”"
 
-#: ../meld/dirdiff.py:944
+#: ../meld/dirdiff.py:942
 #, python-format
 msgid "Replace folder “%s”?"
-msgstr "Erstat mappen \"%s\"?"
+msgstr "Erstat mappen “%s”?"
 
-#: ../meld/dirdiff.py:946
+#: ../meld/dirdiff.py:944
 #, 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 ""
-"En mappe med det samme navn findes allerede i \"%s\".\n"
+"En mappe med det samme navn findes allerede i “%s”.\n"
 "Hvis du erstatter den eksisterende mappe, vil alle filer i den gå tabt."
 
-#: ../meld/dirdiff.py:959
+#: ../meld/dirdiff.py:957
 msgid "Error copying file"
 msgstr "Fejl ved kopiering af fil"
 
-#: ../meld/dirdiff.py:960
+#: ../meld/dirdiff.py:958
 #, python-format
 msgid ""
 "Couldn't copy %s\n"
@@ -1787,7 +1789,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/dirdiff.py:983
+#: ../meld/dirdiff.py:981
 #, python-format
 msgid "Error deleting %s"
 msgstr "Fejl ved sletning af %s"
@@ -1797,25 +1799,25 @@ msgid "No folder"
 msgstr "Ingen mappe"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:311
+#: ../meld/filediff.py:335
 msgid "INS"
 msgstr "INDS"
 
-#: ../meld/filediff.py:311
+#: ../meld/filediff.py:335
 msgid "OVR"
 msgstr "OVS."
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:313
+#: ../meld/filediff.py:337
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Lin. %i, kol. %i"
 
-#: ../meld/filediff.py:738
+#: ../meld/filediff.py:762
 msgid "Comparison results will be inaccurate"
 msgstr "Resultatet af sammenligningen vil være unøjagtigt"
 
-#: ../meld/filediff.py:740
+#: ../meld/filediff.py:764
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1823,64 +1825,64 @@ msgstr ""
 "Et filter ændrede antallet af linjer i filen, hvilket ikke understøttes. "
 "Sammenligningen vil ikke være nøjagtig."
 
-#: ../meld/filediff.py:796
+#: ../meld/filediff.py:820
 msgid "Mark conflict as resolved?"
 msgstr "Markér konflikt som løst?"
 
-#: ../meld/filediff.py:798
+#: ../meld/filediff.py:822
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr "Hvis konflikten blev løst, kan du nu markere den som løst."
 
-#: ../meld/filediff.py:800
+#: ../meld/filediff.py:824
 msgid "Cancel"
 msgstr "Annullér"
 
-#: ../meld/filediff.py:801
+#: ../meld/filediff.py:825
 msgid "Mark _Resolved"
 msgstr "Markér som _løst"
 
-#: ../meld/filediff.py:1049
+#: ../meld/filediff.py:1073
 #, python-format
 msgid "There was a problem opening the file “%s”."
-msgstr "Der var et problem med at åbne filen \"%s\"."
+msgstr "Der var et problem med at åbne filen “%s”."
 
-#: ../meld/filediff.py:1057
+#: ../meld/filediff.py:1081
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Filen %s ser ud til at være en binær fil."
 
-#: ../meld/filediff.py:1059
+#: ../meld/filediff.py:1083
 msgid "Do you want to open the file using the default application?"
 msgstr "Vil du åbne filen med standardprogrammet?"
 
-#: ../meld/filediff.py:1061
+#: ../meld/filediff.py:1085
 msgid "Open"
 msgstr "Åbn"
 
-#: ../meld/filediff.py:1077
+#: ../meld/filediff.py:1101
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Beregner forskelle"
 
-#: ../meld/filediff.py:1142
+#: ../meld/filediff.py:1163
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Filen %s er blevet ændret på disken"
 
-#: ../meld/filediff.py:1143
+#: ../meld/filediff.py:1164
 msgid "Do you want to reload the file?"
 msgstr "Vil du genindlæse filen?"
 
-#: ../meld/filediff.py:1145
+#: ../meld/filediff.py:1166
 msgid "_Reload"
 msgstr "_Genindlæs"
 
-#: ../meld/filediff.py:1301
+#: ../meld/filediff.py:1322
 msgid "Files are identical"
 msgstr "Filer er identiske"
 
-#: ../meld/filediff.py:1314
+#: ../meld/filediff.py:1335
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1888,11 +1890,11 @@ msgstr ""
 "Tekstfiltre er i brug og kan maskere forskelle mellem filer. Vil du "
 "sammenligne de ikke-filtrerede filer?"
 
-#: ../meld/filediff.py:1319
+#: ../meld/filediff.py:1340
 msgid "Files differ in line endings only"
 msgstr "Filer er kun forskellige i slutningen af linjerne"
 
-#: ../meld/filediff.py:1321
+#: ../meld/filediff.py:1342
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1901,15 +1903,15 @@ msgstr ""
 "Filerne er ens bortset fra forskelle i slutningen af linjerne:\n"
 "%s"
 
-#: ../meld/filediff.py:1341
+#: ../meld/filediff.py:1362
 msgid "Show without filters"
 msgstr "Vis uden filtre"
 
-#: ../meld/filediff.py:1363
+#: ../meld/filediff.py:1384
 msgid "Change highlighting incomplete"
 msgstr "Fremhævning af ændringer ufuldstændig"
 
-#: ../meld/filediff.py:1364
+#: ../meld/filediff.py:1385
 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."
@@ -1918,82 +1920,82 @@ msgstr ""
 "Meld til at bruge længere tid på at fremhæve større ændringer, selvom det "
 "kan være langsomt."
 
-#: ../meld/filediff.py:1372
+#: ../meld/filediff.py:1393
 msgid "Keep highlighting"
 msgstr "Bliv ved med at fremhæve"
 
-#: ../meld/filediff.py:1374
+#: ../meld/filediff.py:1395
 msgid "_Keep highlighting"
 msgstr "_Bliv ved med at fremhæve"
 
-#: ../meld/filediff.py:1406
+#: ../meld/filediff.py:1427
 #, python-format
 msgid "Replace file “%s”?"
-msgstr "Erstat filen \"%s\"?"
+msgstr "Erstat filen “%s”?"
 
-#: ../meld/filediff.py:1408
+#: ../meld/filediff.py:1429
 #, 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 ""
-"Der er allerede en fil med dette navn i \"%s\".\n"
+"Der er allerede en fil med dette navn i “%s”.\n"
 "Hvis du erstatter den eksisterende fil, vil dens indhold gå tabt."
 
-#: ../meld/filediff.py:1425
+#: ../meld/filediff.py:1446
 msgid "Save Left Pane As"
 msgstr "Gem venstre rude som"
 
-#: ../meld/filediff.py:1427
+#: ../meld/filediff.py:1448
 msgid "Save Middle Pane As"
 msgstr "Gem midterste rude som"
 
-#: ../meld/filediff.py:1429
+#: ../meld/filediff.py:1450
 msgid "Save Right Pane As"
 msgstr "Gem højre rude som"
 
-#: ../meld/filediff.py:1443
+#: ../meld/filediff.py:1464
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Filen %s er blevet ændret på disken, siden den blev åbnet"
 
-#: ../meld/filediff.py:1445
+#: ../meld/filediff.py:1466
 msgid "If you save it, any external changes will be lost."
 msgstr ""
 "Hvis du gemmer den, vil alle ændringer, som er foretaget eksternt, gå tabt."
 
-#: ../meld/filediff.py:1448
+#: ../meld/filediff.py:1469
 msgid "Save Anyway"
 msgstr "Gem alligevel"
 
-#: ../meld/filediff.py:1449
+#: ../meld/filediff.py:1470
 msgid "Don't Save"
 msgstr "Gem ikke"
 
-#: ../meld/filediff.py:1475
+#: ../meld/filediff.py:1496
 msgid "_Save as UTF-8"
 msgstr "_Gem som UTF-8"
 
-#: ../meld/filediff.py:1478
+#: ../meld/filediff.py:1499
 #, python-format
 msgid "Couldn't encode text as “%s”"
-msgstr "Kunne ikke kode teksten som \"%s\""
+msgstr "Kunne ikke kode teksten som “%s”"
 
-#: ../meld/filediff.py:1480
+#: ../meld/filediff.py:1501
 #, 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 ""
-"Filen \"%s\" indeholder tegn, som ikke kan kodes med kodningen \"%s\".\n"
+"Filen “%s” indeholder tegn, som ikke kan kodes med kodningen “%s”.\n"
 "Ønsker du at gemme som UTF-8?"
 
-#: ../meld/filediff.py:1520 ../meld/patchdialog.py:130
+#: ../meld/filediff.py:1541 ../meld/patchdialog.py:130
 #, python-format
 msgid "Could not save file %s."
 msgstr "Kunne ikke gemme filen %s."
 
-#: ../meld/filediff.py:1521 ../meld/patchdialog.py:131
+#: ../meld/filediff.py:1542 ../meld/patchdialog.py:131
 #, python-format
 msgid ""
 "Couldn't save file due to:\n"
@@ -2002,11 +2004,11 @@ msgstr ""
 "Kunne ikke gemme filen pga.:\n"
 "%s"
 
-#: ../meld/filediff.py:1867
+#: ../meld/filediff.py:1906
 msgid "Live comparison updating disabled"
 msgstr "Liveopdatering af sammenligninger deaktiveret"
 
-#: ../meld/filediff.py:1868
+#: ../meld/filediff.py:1907
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2121,7 +2123,7 @@ msgstr "Fejl ved læsning af gemt sammenligningsfil"
 #: ../meld/meldapp.py:330
 #, python-format
 msgid "invalid path or URI \"%s\""
-msgstr "ugyldig sti eller URI \"%s\""
+msgstr "ugyldig sti eller URI “%s”"
 
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
 #: ../meld/meldbuffer.py:131
@@ -2317,12 +2319,12 @@ msgstr "Åbn manualen til Meld"
 msgid "About this application"
 msgstr "Om programmet"
 
-#: ../meld/meldwindow.py:593
+#: ../meld/meldwindow.py:596
 #, python-format
 msgid "Need three files to auto-merge, got: %r"
 msgstr "Behøver tre filer for at auto-flette, fik: %r"
 
-#: ../meld/meldwindow.py:607
+#: ../meld/meldwindow.py:610
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Kan ikke sammenligne en blanding af filer og mapper"
 
@@ -2334,7 +2336,7 @@ msgstr ""
 "installation"
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:265
+#: ../meld/misc.py:261
 msgid "[None]"
 msgstr "[Ingen]"
 
@@ -2381,16 +2383,16 @@ msgid_plural "%d branches"
 msgstr[0] "%d gren"
 msgstr[1] "%d grene"
 
-#: ../meld/vc/git.py:330
+#: ../meld/vc/git.py:333
 #, python-format
 msgid "Mode changed from %s to %s"
 msgstr "Tilstand skiftede fra %s til %s"
 
-#: ../meld/vc/git.py:338
+#: ../meld/vc/git.py:341
 msgid "Partially staged"
 msgstr "Delvist staged"
 
-#: ../meld/vc/git.py:338
+#: ../meld/vc/git.py:341
 msgid "Staged"
 msgstr "Staged"
 
@@ -2405,53 +2407,53 @@ msgstr "Ingen"
 msgid "Rev %s"
 msgstr "Rev. %s"
 
-#: ../meld/vc/_vc.py:54
+#: ../meld/vc/_vc.py:55
 msgid "Merged"
 msgstr "Flettet"
 
-#: ../meld/vc/_vc.py:54
+#: ../meld/vc/_vc.py:55
 msgid "Base"
 msgstr "Base"
 
-#: ../meld/vc/_vc.py:54
+#: ../meld/vc/_vc.py:55
 msgid "Local"
 msgstr "Lokal"
 
-#: ../meld/vc/_vc.py:54
+#: ../meld/vc/_vc.py:55
 msgid "Remote"
 msgstr "Fjern"
 
 # "Vis ikke-versionsstyrede filer"
-#: ../meld/vc/_vc.py:70
+#: ../meld/vc/_vc.py:71
 msgid "Unversioned"
 msgstr "Uden versionering"
 
-#: ../meld/vc/_vc.py:73
+#: ../meld/vc/_vc.py:74
 msgid "Error"
 msgstr "Fejl"
 
-#: ../meld/vc/_vc.py:75
+#: ../meld/vc/_vc.py:76
 msgid "Newly added"
 msgstr "Nyligt tilføjet"
 
-#: ../meld/vc/_vc.py:77
+#: ../meld/vc/_vc.py:78
 msgid "Renamed"
 msgstr "Omdøbt"
 
-#: ../meld/vc/_vc.py:78
+#: ../meld/vc/_vc.py:79
 msgid "Conflict"
 msgstr "Konflikt"
 
-#: ../meld/vc/_vc.py:79
+#: ../meld/vc/_vc.py:80
 msgid "Removed"
 msgstr "Fjernet"
 
 # Manglende?
-#: ../meld/vc/_vc.py:80
+#: ../meld/vc/_vc.py:81
 msgid "Missing"
 msgstr "Mangler"
 
-#: ../meld/vc/_vc.py:81
+#: ../meld/vc/_vc.py:82
 msgid "Not present"
 msgstr "Ikke tilstedeværende"
 
@@ -2549,7 +2551,7 @@ msgstr ""
 msgid "Error removing %s"
 msgstr "Fejl ved fjernelse af %s"
 
-#: ../meld/vcview.py:745
+#: ../meld/vcview.py:746
 msgid "Clear"
 msgstr "Ryd"
 
@@ -2644,14 +2646,14 @@ msgstr "Ryd"
 #~ "'%s' exists.\n"
 #~ "Overwrite?"
 #~ msgstr ""
-#~ "\"%s\" findes.\n"
+#~ "“%s” findes.\n"
 #~ "Overskriv?"
 
 #~ msgid ""
 #~ "'%s' is a directory.\n"
 #~ "Remove recursively?"
 #~ msgstr ""
-#~ "\"%s\" er en mappe.\n"
+#~ "“%s” er en mappe.\n"
 #~ "Fjern rekursivt?"
 
 #~ msgid "%i second"
@@ -2708,7 +2710,7 @@ msgstr "Ryd"
 #~ "\"%s\" exists!\n"
 #~ "Overwrite?"
 #~ msgstr ""
-#~ "\"%s\" findes!\n"
+#~ "“%s” findes!\n"
 #~ "Overskriv?"
 
 #~ msgid ""
@@ -2728,7 +2730,7 @@ msgstr "Ryd"
 #~ "\n"
 #~ "Which format would you like to use?"
 #~ msgstr ""
-#~ "Denne fil \"%s\" indeholder en blanding af linjeafslutninger.\n"
+#~ "Denne fil “%s” indeholder en blanding af linjeafslutninger.\n"
 #~ "\n"
 #~ "Hvilket format ønsker du at bruge?"
 
@@ -2753,7 +2755,7 @@ msgstr "Ryd"
 #~ msgstr "Start en sammenligning mellem fil og mappe/fil"
 
 #~ msgid "_New..."
-#~ msgstr "_Ny..."
+#~ msgstr "_Ny …"
 
 #~ msgid "Report _Bug"
 #~ msgstr "Rapporter en _fejl"
@@ -2896,7 +2898,7 @@ msgstr "Ryd"
 #~ "'%s'"
 
 #~ msgid "_Browse..."
-#~ msgstr "_Gennemse..."
+#~ msgstr "_Gennemse …"
 
 #~ msgid "Path"
 #~ msgstr "Sti"
@@ -2920,8 +2922,8 @@ msgstr "Ryd"
 #~ "The error was '%s'"
 #~ msgstr ""
 #~ "Fejl ved konvertering til et regulært udtryk\n"
-#~ "Mønsteret var \"%s\"\n"
-#~ "Fejlen var \"%s\""
+#~ "Mønsteret var “%s”\n"
+#~ "Fejlen var “%s”"
 
 #~ msgid "Left"
 #~ msgstr "Venstre"
@@ -2930,7 +2932,7 @@ msgstr "Ryd"
 #~ msgstr "Højre"
 
 #~ msgid "Error converting pattern '%s' to regular expression"
-#~ msgstr "Fejl under konvertering af mønster \"%s\" til regulært udtryk"
+#~ msgstr "Fejl under konvertering af mønster “%s” til regulært udtryk"
 
 #~ msgid "Regex"
 #~ msgstr "Reg.udt."
diff --git a/po/fr.po b/po/fr.po
index 8848f62a..2c9edbbf 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -13,28 +13,28 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Meld HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=meld&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-10-08 00:22+0000\n"
-"PO-Revision-Date: 2016-10-08 15:31+0200\n"
-"Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n"
+"POT-Creation-Date: 2018-11-15 20:30+0000\n"
+"PO-Revision-Date: 2018-11-30 18:29+0100\n"
+"Last-Translator: ghentdebian <ghent.debian@gmail.com>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Poedit 2.2\n"
 
-#: ../bin/meld:142
+#: ../bin/meld:186
 msgid "Cannot import: "
 msgstr "Impossible d'importer : "
 
-#: ../bin/meld:145
+#: ../bin/meld:189
 #, c-format
 msgid "Meld requires %s or higher."
 msgstr "Meld nécessite %s ou supérieur."
 
-#: ../bin/meld:191
+#: ../bin/meld:241
 #, c-format
 msgid ""
 "Couldn't load Meld-specific CSS (%s)\n"
@@ -74,9 +74,9 @@ msgid ""
 msgstr ""
 "Meld est un visionneur de différences et un outil de fusion destiné à des "
 "développeurs. Il aide à comparer des fichiers, des dossiers et des projets "
-"dépendants d'un gestionnaire de version. Il permet des comparaisons de 2 ou 3 "
-"fichiers ou dossiers, et prend en charge de nombreux gestionnaires de version, "
-"dont Git, Mercurial, Bazaar et Subversion."
+"dépendants d'un gestionnaire de version. Il permet des comparaisons de 2 ou "
+"3 fichiers ou dossiers, et prend en charge de nombreux gestionnaires de "
+"version, dont Git, Mercurial, Bazaar et Subversion."
 
 #: ../data/meld.appdata.xml.in.h:4
 msgid ""
@@ -139,10 +139,10 @@ msgid ""
 "may also be tried, depending on the user's locale."
 msgstr ""
 "Meld utilise ces codages de caractères pour tenter de décoder les fichiers "
-"texte chargés avant d'essayer d'en utiliser d'autres. En plus des codages "
-"de cette liste, UTF-8 et le codage de la langue actuelle par défaut "
-"sont toujours utilisés ; d'autres codages peuvent être essayés, selon la "
-"langue locale de l'utilisateur."
+"texte chargés avant d'essayer d'en utiliser d'autres. En plus des codages de "
+"cette liste, UTF-8 et le codage de la langue actuelle par défaut sont "
+"toujours utilisés ; d'autres codages peuvent être essayés, selon la langue "
+"locale de l'utilisateur."
 
 #: ../data/org.gnome.meld.gschema.xml.h:11
 msgid "Width of an indentation step"
@@ -154,7 +154,8 @@ msgstr "Nombre d'espaces à utiliser pour un pas d'indentation"
 
 #: ../data/org.gnome.meld.gschema.xml.h:13
 msgid "Whether to indent using spaces or tabs"
-msgstr "Indique s'il faut utiliser des espaces ou des tabulations pour indenter"
+msgstr ""
+"Indique s'il faut utiliser des espaces ou des tabulations pour indenter"
 
 #: ../data/org.gnome.meld.gschema.xml.h:14
 msgid "If true, any new indentation will use spaces instead of tabs."
@@ -203,9 +204,9 @@ msgid ""
 "Selector for individual whitespace character types to be shown. Possible "
 "values are 'space', 'tab', 'newline' and 'nbsp'."
 msgstr ""
-"Sélecteur de caractère d'espace à afficher. Les choix possibles sont « space » "
-"(espace), « tab », « newline » (retour à la ligne) et « nbsp » (espace "
-"insécable)."
+"Sélecteur de caractère d'espace à afficher. Les choix possibles sont "
+"« space » (espace), « tab », « newline » (retour à la ligne) et "
+"« nbsp » (espace insécable)."
 
 #: ../data/org.gnome.meld.gschema.xml.h:23
 msgid "Wrap mode"
@@ -218,8 +219,8 @@ msgid ""
 "('word')."
 msgstr ""
 "Les retours à la ligne dans les comparaisons de fichiers se font selon ce "
-"choix : « none » (pas du tout), « char » (n'importe quel caractère) ou « word » "
-"(seulement à la fin des mots)."
+"choix : « none » (pas du tout), « char » (n'importe quel caractère) ou "
+"« word » (seulement à la fin des mots)."
 
 #: ../data/org.gnome.meld.gschema.xml.h:25
 msgid "Highlight current line"
@@ -230,8 +231,8 @@ msgid ""
 "If true, the line containing the cursor will be highlighted in file "
 "comparisons."
 msgstr ""
-"Si cette option est cochée, la ligne où le curseur se trouve sera "
-"surlignée dans les comparaisons de fichiers."
+"Si cette option est cochée, la ligne où le curseur se trouve sera surlignée "
+"dans les comparaisons de fichiers."
 
 #: ../data/org.gnome.meld.gschema.xml.h:27
 msgid "Use the system default monospace font"
@@ -276,9 +277,9 @@ msgid ""
 "If false, custom-editor-command will be used instead of the system editor "
 "when opening files externally."
 msgstr ""
-"Si cette option n'est pas cochée, l'éditeur personnalisé "
-"(« custom-editor-command ») sera utilisé à la place de l'éditeur par défaut "
-"du système lors de l'ouverture de fichiers en dehors de Meld."
+"Si cette option n'est pas cochée, l'éditeur personnalisé (« custom-editor-"
+"command ») sera utilisé à la place de l'éditeur par défaut du système lors "
+"de l'ouverture de fichiers en dehors de Meld."
 
 #: ../data/org.gnome.meld.gschema.xml.h:35
 msgid "The custom editor launch command"
@@ -290,8 +291,8 @@ msgid ""
 "supported here; at the moment '{file}' and '{line}' are recognised tokens."
 msgstr ""
 "La commande utilisée pour lancer un éditeur personnalisé. L'utilisation de "
-"modèle est, dans certaines limites, permise ici ; pour le moment, "
-"« {file} » et « {line} » sont des marqueurs reconnus."
+"modèle est, dans certaines limites, permise ici ; pour le moment, « {file} » "
+"et « {line} » sont des marqueurs reconnus."
 
 #: ../data/org.gnome.meld.gschema.xml.h:37
 msgid "Columns to display"
@@ -305,7 +306,7 @@ msgstr ""
 "Liste des noms de colonnes dans la comparaison de dossiers et choix de leur "
 "affichage ou non."
 
-#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:32
+#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:25
 msgid "Ignore symbolic links"
 msgstr "Ignorer les liens symboliques"
 
@@ -348,7 +349,7 @@ msgstr ""
 "stockés sur des systèmes de fichiers ayant une précision d'horodatage "
 "différente."
 
-#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:30
+#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:22
 msgid "Apply text filters during folder comparisons"
 msgstr "Appliquer les filtres de texte dans la comparaison de dossiers"
 
@@ -476,8 +477,8 @@ msgstr "Filtres d'état du gestionnaire de version"
 msgid ""
 "List of statuses used to filter visible files in version control comparison."
 msgstr ""
-"Liste d'états utilisés pour filtrer les fichiers visibles dans la comparaison "
-"en mode gestionnaire de version."
+"Liste d'états utilisés pour filtrer les fichiers visibles dans la "
+"comparaison en mode gestionnaire de version."
 
 #: ../data/org.gnome.meld.gschema.xml.h:65
 msgid "Filename-based filters"
@@ -596,7 +597,7 @@ msgstr "Copie vers la droite"
 msgid "Delete selected"
 msgstr "Effacer la sélection"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:858 ../meld/filediff.py:1382
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:856 ../meld/filediff.py:1360
 msgid "Hide"
 msgstr "Masquer"
 
@@ -630,7 +631,7 @@ msgstr "Nouveaux"
 msgid "Show new"
 msgstr "Afficher les nouveaux fichiers"
 
-#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:76
+#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:77
 msgid "Modified"
 msgstr "Modifiés"
 
@@ -685,7 +686,7 @@ msgstr "_Descendre"
 
 #. Create icon and filename CellRenderer
 #: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35
-#: ../meld/dirdiff.py:373
+#: ../meld/dirdiff.py:374
 msgid "Name"
 msgstr "Nom"
 
@@ -893,8 +894,7 @@ msgstr ""
 msgid "Close _without Saving"
 msgstr "Fermer _sans enregistrer"
 
-#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:940 ../meld/filediff.py:1448
-#: ../meld/filediff.py:1520
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:938 ../meld/filediff.py:1426
 msgid "_Cancel"
 msgstr "_Annuler"
 
@@ -933,7 +933,7 @@ msgstr ""
 "Les changements apportés aux documents suivants seront définitivement "
 "perdus :\n"
 
-#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:941 ../meld/filediff.py:1449
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:939 ../meld/filediff.py:1427
 msgid "_Replace"
 msgstr "_Remplacer"
 
@@ -973,7 +973,7 @@ msgstr "E_xpression régulière"
 msgid "Wrapped"
 msgstr "Saut de ligne"
 
-# Mieux vaut donner à la commande le nom de l'action. 
+# Mieux vaut donner à la commande le nom de l'action.
 # patch est beaucoup plus connu des utilisateurs de git que correctif
 #: ../data/ui/patch-dialog.ui.h:1
 msgid "Format as Patch"
@@ -983,7 +983,7 @@ msgstr "Créer un correctif (patch)"
 msgid "Copy to Clipboard"
 msgstr "Copier vers le presse-papiers"
 
-#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:155
+#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:154
 msgid "Save Patch"
 msgstr "Enregistrer le correctif"
 
@@ -1004,166 +1004,140 @@ msgid "_Reverse patch direction"
 msgstr "Inve_rser la direction du correctif"
 
 #: ../data/ui/preferences.ui.h:1
-msgid "Left is remote, right is local"
-msgstr "Distant à gauche, local à droite"
-
-#: ../data/ui/preferences.ui.h:2
-msgid "Left is local, right is remote"
-msgstr "Local à gauche, distant à droite"
-
-#: ../data/ui/preferences.ui.h:3
-msgid "Remote, merge, local"
-msgstr "Distant, fusionné, local"
-
-#: ../data/ui/preferences.ui.h:4
-msgid "Local, merge, remote"
-msgstr "Local, fusionné, distant"
-
-#: ../data/ui/preferences.ui.h:5
-msgid "1ns (ext4)"
-msgstr "1ns (ext4)"
-
-#: ../data/ui/preferences.ui.h:6
-msgid "100ns (NTFS)"
-msgstr "100ns (NTFS)"
-
-#: ../data/ui/preferences.ui.h:7
-msgid "1s (ext2/ext3)"
-msgstr "1s (ext2/ext3)"
-
-#: ../data/ui/preferences.ui.h:8
-msgid "2s (VFAT)"
-msgstr "2s (VFAT)"
-
-#: ../data/ui/preferences.ui.h:9
 msgid "Meld Preferences"
 msgstr "Préférences de Meld"
 
-#: ../data/ui/preferences.ui.h:10
+#: ../data/ui/preferences.ui.h:2
 msgid "Font"
 msgstr "Police"
 
-#: ../data/ui/preferences.ui.h:11
+#: ../data/ui/preferences.ui.h:3
 msgid "_Use the system fixed width font"
 msgstr "_Utiliser la police à chasse fixe du système"
 
-#: ../data/ui/preferences.ui.h:12
+#: ../data/ui/preferences.ui.h:4
 msgid "_Editor font:"
 msgstr "_Police de l'éditeur :"
 
-#: ../data/ui/preferences.ui.h:13
+#: ../data/ui/preferences.ui.h:5
 msgid "Display"
 msgstr "Affichage"
 
-#: ../data/ui/preferences.ui.h:14
+#: ../data/ui/preferences.ui.h:6
 msgid "_Tab width:"
 msgstr "Largeur des _tabulations :"
 
-#: ../data/ui/preferences.ui.h:15
+#: ../data/ui/preferences.ui.h:7
 msgid "_Insert spaces instead of tabs"
 msgstr "Insérer des _espaces au lieu des tabulations"
 
-#: ../data/ui/preferences.ui.h:16
+#: ../data/ui/preferences.ui.h:8
 msgid "Enable text _wrapping"
 msgstr "Acti_ver les sauts de ligne automatiques"
 
-#: ../data/ui/preferences.ui.h:17
+#: ../data/ui/preferences.ui.h:9
 msgid "Do not _split words over two lines"
 msgstr "Ne pas _couper les mots par les sauts de ligne"
 
-#: ../data/ui/preferences.ui.h:18
+#: ../data/ui/preferences.ui.h:10
 msgid "Highlight _current line"
 msgstr "Surligner la ligne _actuelle"
 
-#: ../data/ui/preferences.ui.h:19
+#: ../data/ui/preferences.ui.h:11
 msgid "Show _line numbers"
 msgstr "Afficher les numéros de _ligne"
 
-#: ../data/ui/preferences.ui.h:20
+#: ../data/ui/preferences.ui.h:12
 msgid "Show w_hitespace"
 msgstr "Affic_her les espaces"
 
-#: ../data/ui/preferences.ui.h:21
+#: ../data/ui/preferences.ui.h:13
 msgid "Use s_yntax highlighting"
 msgstr "Utiliser la _coloration syntaxique"
 
-#: ../data/ui/preferences.ui.h:22
+#: ../data/ui/preferences.ui.h:14
 msgid "Syntax highlighting color scheme:"
 msgstr "Jeu de couleurs de la coloration syntaxique :"
 
-#: ../data/ui/preferences.ui.h:23
+#: ../data/ui/preferences.ui.h:15
 msgid "External Editor"
 msgstr "Éditeur externe"
 
-#: ../data/ui/preferences.ui.h:24
+#: ../data/ui/preferences.ui.h:16
 msgid "Use _default system editor"
 msgstr "Utiliser l'éditeur par _défaut du système"
 
-#: ../data/ui/preferences.ui.h:25
+#: ../data/ui/preferences.ui.h:17
 msgid "Edito_r command:"
 msgstr "Commande de l'éditeu_r :"
 
-#: ../data/ui/preferences.ui.h:26
+#: ../data/ui/preferences.ui.h:18
 msgid "Editor"
 msgstr "Éditeur"
 
-#: ../data/ui/preferences.ui.h:27
+#: ../data/ui/preferences.ui.h:19
 msgid "Shallow Comparison"
 msgstr "Comparaison superficielle"
 
-#: ../data/ui/preferences.ui.h:28
+#: ../data/ui/preferences.ui.h:20
 msgid "C_ompare files based only on size and timestamp"
 msgstr "C_omparer les fichiers selon la taille et l'horodatage uniquement"
 
-#: ../data/ui/preferences.ui.h:29
+#: ../data/ui/preferences.ui.h:21
 msgid "_Timestamp resolution:"
 msgstr "Précision de l'horoda_tage :"
 
-#: ../data/ui/preferences.ui.h:31
+#: ../data/ui/preferences.ui.h:23
+msgid "Note: enabling text filters may make comparing large files much slower"
+msgstr ""
+"Note : activer les filtres textuels peut rendre la comparaison des gros "
+"fichiers beaucoup plus lente"
+
+#: ../data/ui/preferences.ui.h:24
 msgid "Symbolic Links"
 msgstr "Liens symboliques"
 
-#: ../data/ui/preferences.ui.h:33
+#: ../data/ui/preferences.ui.h:26
 msgid "Visible Columns"
 msgstr "Colonnes visibles"
 
-#: ../data/ui/preferences.ui.h:34
+#: ../data/ui/preferences.ui.h:27
 msgid "Folder Comparisons"
 msgstr "Comparaisons de dossiers"
 
-#: ../data/ui/preferences.ui.h:35
+#: ../data/ui/preferences.ui.h:28
 msgid "Version Comparisons"
 msgstr "Comparaisons de versions"
 
-#: ../data/ui/preferences.ui.h:36
+#: ../data/ui/preferences.ui.h:29
 msgid "_Order when comparing file revisions:"
 msgstr "_Ordre lors des comparaisons de révisions de fichiers :"
 
-#: ../data/ui/preferences.ui.h:37
+#: ../data/ui/preferences.ui.h:30
 msgid "Order when _merging files:"
 msgstr "Ordre lors des _fusions de fichiers :"
 
-#: ../data/ui/preferences.ui.h:38
+#: ../data/ui/preferences.ui.h:31
 msgid "Commit Messages"
 msgstr "Messages de « commit »"
 
-#: ../data/ui/preferences.ui.h:39
+#: ../data/ui/preferences.ui.h:32
 msgid "Show _right margin at:"
 msgstr "Afficher la marge d_roite à :"
 
-#: ../data/ui/preferences.ui.h:40
+#: ../data/ui/preferences.ui.h:33
 msgid "Automatically _break lines at right margin on commit"
 msgstr "Retour à la ligne automatique lors du « commit »"
 
-#: ../data/ui/preferences.ui.h:41
+#: ../data/ui/preferences.ui.h:34
 msgid "Version Control"
 msgstr "Gestionnaire de versions"
 
-#: ../data/ui/preferences.ui.h:42
+#: ../data/ui/preferences.ui.h:35
 msgid "Filename filters"
 msgstr "Filtres sur les noms de fichiers"
 
-#: ../data/ui/preferences.ui.h:43
+#: ../data/ui/preferences.ui.h:36
 msgid ""
 "When performing directory comparisons, you may filter out files and "
 "directories by name. Each pattern is a list of shell style wildcards "
@@ -1173,24 +1147,25 @@ msgstr ""
 "dossiers en fonction de leur nom. Chaque motif est une liste de jokers de "
 "type shell séparés par des espaces."
 
-#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:104
+#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:104
 msgid "File Filters"
 msgstr "Filtres de fichiers"
 
-#: ../data/ui/preferences.ui.h:45
+#: ../data/ui/preferences.ui.h:38
 msgid "Change trimming"
 msgstr "Ignorance des changements « blancs »"
 
-#: ../data/ui/preferences.ui.h:46
+#: ../data/ui/preferences.ui.h:39
 msgid "Trim blank line differences from the start and end of changes"
 msgstr ""
-"Ignorer les différences de lignes vides au début et à la fin des modifications"
+"Ignorer les différences de lignes vides au début et à la fin des "
+"modifications"
 
-#: ../data/ui/preferences.ui.h:47
+#: ../data/ui/preferences.ui.h:40
 msgid "Text filters"
 msgstr "Filtres textuels"
 
-#: ../data/ui/preferences.ui.h:48
+#: ../data/ui/preferences.ui.h:41
 msgid ""
 "When performing file comparisons, you may ignore certain types of changes. "
 "Each pattern here is a python regular expression which replaces matching "
@@ -1204,10 +1179,42 @@ msgstr ""
 "comparaison. Si l'expression contient des groupes, seuls les groupes sont "
 "remplacés. Consultez le manuel d'utilisation pour plus de détails."
 
-#: ../data/ui/preferences.ui.h:49
+#: ../data/ui/preferences.ui.h:42
 msgid "Text Filters"
 msgstr "Filtres textuels"
 
+#: ../data/ui/preferences.ui.h:43
+msgid "Left is remote, right is local"
+msgstr "Distant à gauche, local à droite"
+
+#: ../data/ui/preferences.ui.h:44
+msgid "Left is local, right is remote"
+msgstr "Local à gauche, distant à droite"
+
+#: ../data/ui/preferences.ui.h:45
+msgid "Remote, merge, local"
+msgstr "Distant, fusionné, local"
+
+#: ../data/ui/preferences.ui.h:46
+msgid "Local, merge, remote"
+msgstr "Local, fusionné, distant"
+
+#: ../data/ui/preferences.ui.h:47
+msgid "1ns (ext4)"
+msgstr "1ns (ext4)"
+
+#: ../data/ui/preferences.ui.h:48
+msgid "100ns (NTFS)"
+msgstr "100ns (NTFS)"
+
+#: ../data/ui/preferences.ui.h:49
+msgid "1s (ext2/ext3)"
+msgstr "1s (ext2/ext3)"
+
+#: ../data/ui/preferences.ui.h:50
+msgid "2s (VFAT)"
+msgstr "2s (VFAT)"
+
 #: ../data/ui/shortcuts.ui.h:1
 msgctxt "shortcut window"
 msgid "General"
@@ -1453,7 +1460,7 @@ msgctxt "shortcut window"
 msgid "Show/hide console output"
 msgstr "Afficher/Masquer la sortie de la console"
 
-#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:559
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:567
 #: ../meld/newdifftab.py:38
 msgid "New comparison"
 msgstr "Nouvelle comparaison"
@@ -1604,7 +1611,7 @@ msgstr "Non _versionnés"
 msgid "Show unversioned files"
 msgstr "Afficher les fichiers qui ne sont pas versionnés"
 
-#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69
+#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:70
 msgid "Ignored"
 msgstr "Ignorés"
 
@@ -1674,44 +1681,44 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:391 ../meld/preferences.py:82
+#: ../meld/dirdiff.py:392 ../meld/preferences.py:82
 msgid "Size"
 msgstr "Taille"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:399 ../meld/preferences.py:83
+#: ../meld/dirdiff.py:400 ../meld/preferences.py:83
 msgid "Modification time"
 msgstr "Date de modification"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:407 ../meld/preferences.py:84
+#: ../meld/dirdiff.py:408 ../meld/preferences.py:84
 msgid "Permissions"
 msgstr "Droits"
 
-#: ../meld/dirdiff.py:537
+#: ../meld/dirdiff.py:535
 #, python-format
 msgid "Hide %s"
 msgstr "Masquer %s"
 
-#: ../meld/dirdiff.py:669 ../meld/dirdiff.py:693
+#: ../meld/dirdiff.py:667 ../meld/dirdiff.py:691
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] En cours d'analyse de %s"
 
-#: ../meld/dirdiff.py:825
+#: ../meld/dirdiff.py:823
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Terminé"
 
-#: ../meld/dirdiff.py:833
+#: ../meld/dirdiff.py:831
 msgid "Folders have no differences"
 msgstr "Les dossiers ne comportent aucune différence"
 
-#: ../meld/dirdiff.py:835
+#: ../meld/dirdiff.py:833
 msgid "Contents of scanned files in folders are identical."
 msgstr "Les contenus des fichiers examinés dans les dossiers sont identiques."
 
-#: ../meld/dirdiff.py:837
+#: ../meld/dirdiff.py:835
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
@@ -1719,44 +1726,44 @@ msgstr ""
 "Les fichiers examinés dans les dossiers paraissent identiques, mais les "
 "contenus n'ont pas été examinés."
 
-#: ../meld/dirdiff.py:840
+#: ../meld/dirdiff.py:838
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
-"Des filtres de fichier sont en cours d'utilisation, tous les fichiers "
-"n'ont donc pas été examinés."
+"Des filtres de fichier sont en cours d'utilisation, tous les fichiers n'ont "
+"donc pas été examinés."
 
-#: ../meld/dirdiff.py:842
+#: ../meld/dirdiff.py:840
 msgid "Text filters are in use and may be masking content differences."
 msgstr ""
 "Des filtres de texte sont actuellement utilisés et il se peut qu'ils "
 "masquent des différences de contenu."
 
-#: ../meld/dirdiff.py:860 ../meld/filediff.py:1384 ../meld/filediff.py:1414
-#: ../meld/filediff.py:1416 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122
+#: ../meld/dirdiff.py:858 ../meld/filediff.py:1362 ../meld/filediff.py:1392
+#: ../meld/filediff.py:1394 ../meld/ui/msgarea.py:105 ../meld/ui/msgarea.py:118
 msgid "Hi_de"
 msgstr "Mas_quer"
 
-#: ../meld/dirdiff.py:870
+#: ../meld/dirdiff.py:868
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Plusieurs erreurs se sont produites lors de l'analyse de ce dossier"
 
-#: ../meld/dirdiff.py:871
+#: ../meld/dirdiff.py:869
 msgid "Files with invalid encodings found"
 msgstr "Le codage de caractères de certains fichiers n'est pas valide"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:873
+#: ../meld/dirdiff.py:871
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "Le codage de caractères de certains fichiers n'est pas correct. Les noms "
 "ressemblent à :"
 
-#: ../meld/dirdiff.py:875
+#: ../meld/dirdiff.py:873
 msgid "Files hidden by case insensitive comparison"
 msgstr "Fichiers cachés en raison de la comparaison insensible à la casse"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:877
+#: ../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:"
@@ -1765,17 +1772,17 @@ msgstr ""
 "fichiers sensible à la casse. Les fichiers suivants de ce dossier sont "
 "masqués :"
 
-#: ../meld/dirdiff.py:888
+#: ../meld/dirdiff.py:886
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "« %s » est masqué par « %s »"
 
-#: ../meld/dirdiff.py:944
+#: ../meld/dirdiff.py:942
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Remplacer le dossier « %s » ?"
 
-#: ../meld/dirdiff.py:946
+#: ../meld/dirdiff.py:944
 #, python-format
 msgid ""
 "Another folder with the same name already exists in “%s”.\n"
@@ -1785,11 +1792,11 @@ msgstr ""
 "Si vous remplacez le fichier existant, tous les fichiers qu'il contient "
 "seront perdus."
 
-#: ../meld/dirdiff.py:959
+#: ../meld/dirdiff.py:957
 msgid "Error copying file"
 msgstr "Erreur lors de la copie du fichier"
 
-#: ../meld/dirdiff.py:960
+#: ../meld/dirdiff.py:958
 #, python-format
 msgid ""
 "Couldn't copy %s\n"
@@ -1802,35 +1809,35 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/dirdiff.py:983
+#: ../meld/dirdiff.py:981
 #, python-format
 msgid "Error deleting %s"
 msgstr "Erreur lors de la suppression de %s"
 
-#: ../meld/dirdiff.py:1488
+#: ../meld/dirdiff.py:1494
 msgid "No folder"
 msgstr "Aucun dossier"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:355
+#: ../meld/filediff.py:335
 msgid "INS"
 msgstr "INS"
 
-#: ../meld/filediff.py:355
+#: ../meld/filediff.py:335
 msgid "OVR"
 msgstr "ÉCR"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:357
+#: ../meld/filediff.py:337
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Ln %i, Col %i"
 
-#: ../meld/filediff.py:782
+#: ../meld/filediff.py:762
 msgid "Comparison results will be inaccurate"
 msgstr "Les résultats de la comparaison manqueront de précision"
 
-#: ../meld/filediff.py:784
+#: ../meld/filediff.py:764
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
@@ -1838,66 +1845,66 @@ msgstr ""
 "Un filtre a modifié le nombre de lignes du fichier, ce qui n'est pas pris en "
 "charge. La comparaison ne sera pas précise."
 
-#: ../meld/filediff.py:840
+#: ../meld/filediff.py:820
 msgid "Mark conflict as resolved?"
 msgstr "Marquer le conflit comme résolu ?"
 
-#: ../meld/filediff.py:842
+#: ../meld/filediff.py:822
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
 "Si le conflit a été résolu avec succès, vous pouvez maintenant le marquer "
 "comme résolu."
 
-#: ../meld/filediff.py:844
+#: ../meld/filediff.py:824
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../meld/filediff.py:845
+#: ../meld/filediff.py:825
 msgid "Mark _Resolved"
 msgstr "Marquer comme _résolu"
 
-#: ../meld/filediff.py:1093
+#: ../meld/filediff.py:1076
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Un problème est survenu lors de l'ouverture du fichier « %s »."
 
-#: ../meld/filediff.py:1101
+#: ../meld/filediff.py:1084
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Le fichier %s semble être un fichier binaire."
 
-#: ../meld/filediff.py:1103
+#: ../meld/filediff.py:1086
 msgid "Do you want to open the file using the default application?"
 msgstr "Voulez-vous ouvrir le fichier avec l'application par défaut ?"
 
-#: ../meld/filediff.py:1105
+#: ../meld/filediff.py:1088
 msgid "Open"
 msgstr "Ouvrir"
 
-#: ../meld/filediff.py:1121
+#: ../meld/filediff.py:1104
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Calcul des différences"
 
-#: ../meld/filediff.py:1186
+#: ../meld/filediff.py:1166
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Le fichier %s a été modifié sur le disque"
 
-#: ../meld/filediff.py:1187
+#: ../meld/filediff.py:1167
 msgid "Do you want to reload the file?"
 msgstr "Voulez vous recharger le fichier ?"
 
-#: ../meld/filediff.py:1189
+#: ../meld/filediff.py:1169
 msgid "_Reload"
 msgstr "_Recharger"
 
-#: ../meld/filediff.py:1347
+#: ../meld/filediff.py:1325
 msgid "Files are identical"
 msgstr "Les fichiers sont identiques"
 
-#: ../meld/filediff.py:1360
+#: ../meld/filediff.py:1338
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1906,11 +1913,11 @@ msgstr ""
 "masquent des différences entre les fichiers. Voulez-vous comparer les "
 "fichiers non filtrés ?"
 
-#: ../meld/filediff.py:1365
+#: ../meld/filediff.py:1343
 msgid "Files differ in line endings only"
 msgstr "Les fichiers ne diffèrent que par les fins de lignes"
 
-#: ../meld/filediff.py:1367
+#: ../meld/filediff.py:1345
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
@@ -1919,15 +1926,15 @@ msgstr ""
 "Les fichiers sont identiques sauf dans les fins de lignes :\n"
 "%s"
 
-#: ../meld/filediff.py:1387
+#: ../meld/filediff.py:1365
 msgid "Show without filters"
 msgstr "Afficher sans les filtres"
 
-#: ../meld/filediff.py:1409
+#: ../meld/filediff.py:1387
 msgid "Change highlighting incomplete"
 msgstr "Surlignage des modifications incomplet"
 
-#: ../meld/filediff.py:1410
+#: ../meld/filediff.py:1388
 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."
@@ -1936,20 +1943,20 @@ msgstr ""
 "importantes. Vous pouvez forcer Meld à surligner des modifications plus "
 "importantes, mais cela risque d'être plus long."
 
-#: ../meld/filediff.py:1418
+#: ../meld/filediff.py:1396
 msgid "Keep highlighting"
 msgstr "Continuer à surligner"
 
-#: ../meld/filediff.py:1420
+#: ../meld/filediff.py:1398
 msgid "_Keep highlighting"
 msgstr "_Continuer à surligner"
 
-#: ../meld/filediff.py:1452
+#: ../meld/filediff.py:1430
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Remplacer le fichier « %s » ?"
 
-#: ../meld/filediff.py:1454
+#: ../meld/filediff.py:1432
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
@@ -1958,60 +1965,41 @@ msgstr ""
 "Un fichier avec le même nom existe déjà dans « %s ».\n"
 "Si vous remplacez le fichier existant, tout son contenu sera perdu."
 
-#: ../meld/filediff.py:1471
+#: ../meld/filediff.py:1449
 msgid "Save Left Pane As"
 msgstr "Enregistrer le panneau de gauche sous"
 
-#: ../meld/filediff.py:1473
+#: ../meld/filediff.py:1451
 msgid "Save Middle Pane As"
 msgstr "Enregistrer le panneau du milieu sous"
 
-#: ../meld/filediff.py:1475
+#: ../meld/filediff.py:1453
 msgid "Save Right Pane As"
 msgstr "Enregistrer le panneau de droite sous"
 
-#: ../meld/filediff.py:1489
+#: ../meld/filediff.py:1467
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Le fichier %s a été modifié sur le disque après son ouverture"
 
-#: ../meld/filediff.py:1491
+#: ../meld/filediff.py:1469
 msgid "If you save it, any external changes will be lost."
 msgstr "Si vous l'enregistrez, toute modification extérieure sera perdue."
 
-#: ../meld/filediff.py:1494
+#: ../meld/filediff.py:1472
 msgid "Save Anyway"
 msgstr "Enregistrer malgré tout"
 
-#: ../meld/filediff.py:1495
+#: ../meld/filediff.py:1473
 msgid "Don't Save"
 msgstr "Ne pas enregistrer"
 
-#: ../meld/filediff.py:1521
-msgid "_Save as UTF-8"
-msgstr "_Enregistrer en tant qu'UTF-8"
-
-#: ../meld/filediff.py:1524
-#, python-format
-msgid "Couldn't encode text as “%s”"
-msgstr "Impossible de coder le texte en « %s »"
-
-#: ../meld/filediff.py:1526
-#, 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 ""
-"Le fichier « %s » contient des caractères qui ne peuvent être codés avec le "
-"codage « %s ».\n"
-"Voulez-vous enregistrer en UTF-8 ?"
-
-#: ../meld/filediff.py:1566 ../meld/patchdialog.py:131
+#: ../meld/filediff.py:1512 ../meld/patchdialog.py:130
 #, python-format
 msgid "Could not save file %s."
 msgstr "Impossible d'enregistrer le fichier %s."
 
-#: ../meld/filediff.py:1567 ../meld/patchdialog.py:132
+#: ../meld/filediff.py:1513 ../meld/patchdialog.py:131
 #, python-format
 msgid ""
 "Couldn't save file due to:\n"
@@ -2020,11 +2008,11 @@ msgstr ""
 "Impossible d'enregistrer le fichier à cause de :\n"
 "%s"
 
-#: ../meld/filediff.py:1913
+#: ../meld/filediff.py:1877
 msgid "Live comparison updating disabled"
 msgstr "La mise à jour en direct des comparaisons est désactivée"
 
-#: ../meld/filediff.py:1914
+#: ../meld/filediff.py:1878
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -2040,11 +2028,11 @@ msgstr ""
 msgid "[%s] Merging files"
 msgstr "[%s] Fusion des fichiers"
 
-#: ../meld/gutterrendererchunk.py:189
+#: ../meld/gutterrendererchunk.py:210
 msgid "Copy _up"
 msgstr "Copier au-dess_us"
 
-#: ../meld/gutterrendererchunk.py:190
+#: ../meld/gutterrendererchunk.py:211
 msgid "Copy _down"
 msgstr "Copier au-dess_ous"
 
@@ -2335,12 +2323,12 @@ msgstr "Ouvrir le manuel Meld"
 msgid "About this application"
 msgstr "À propos de cette application"
 
-#: ../meld/meldwindow.py:593
+#: ../meld/meldwindow.py:601
 #, python-format
 msgid "Need three files to auto-merge, got: %r"
 msgstr "Trois fichiers sont nécessaires pour une auto-fusion, reçu %r"
 
-#: ../meld/meldwindow.py:607
+#: ../meld/meldwindow.py:615
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Impossible de comparer des fichiers avec des dossiers"
 
@@ -2352,7 +2340,7 @@ msgstr ""
 "d'une mauvaise installation"
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:263
+#: ../meld/misc.py:261
 msgid "[None]"
 msgstr "[Aucun]"
 
@@ -2399,16 +2387,16 @@ msgid_plural "%d branches"
 msgstr[0] "%d branche"
 msgstr[1] "%d branches"
 
-#: ../meld/vc/git.py:330
+#: ../meld/vc/git.py:336
 #, python-format
 msgid "Mode changed from %s to %s"
 msgstr "Mode changé de %s à %s"
 
-#: ../meld/vc/git.py:338
+#: ../meld/vc/git.py:344
 msgid "Partially staged"
 msgstr "Partiellement présélectionné"
 
-#: ../meld/vc/git.py:338
+#: ../meld/vc/git.py:344
 msgid "Staged"
 msgstr "Présélectionné"
 
@@ -2423,51 +2411,51 @@ msgstr "Aucun"
 msgid "Rev %s"
 msgstr "Rév %s"
 
-#: ../meld/vc/_vc.py:54
+#: ../meld/vc/_vc.py:55
 msgid "Merged"
 msgstr "Fusionné"
 
-#: ../meld/vc/_vc.py:54
+#: ../meld/vc/_vc.py:55
 msgid "Base"
 msgstr "Base"
 
-#: ../meld/vc/_vc.py:54
+#: ../meld/vc/_vc.py:55
 msgid "Local"
 msgstr "Local"
 
-#: ../meld/vc/_vc.py:54
+#: ../meld/vc/_vc.py:55
 msgid "Remote"
 msgstr "Distant"
 
-#: ../meld/vc/_vc.py:70
+#: ../meld/vc/_vc.py:71
 msgid "Unversioned"
 msgstr "Non versionné"
 
-#: ../meld/vc/_vc.py:73
+#: ../meld/vc/_vc.py:74
 msgid "Error"
 msgstr "Erreur"
 
-#: ../meld/vc/_vc.py:75
+#: ../meld/vc/_vc.py:76
 msgid "Newly added"
 msgstr "Récemment ajouté"
 
-#: ../meld/vc/_vc.py:77
+#: ../meld/vc/_vc.py:78
 msgid "Renamed"
 msgstr "Renommé"
 
-#: ../meld/vc/_vc.py:78
+#: ../meld/vc/_vc.py:79
 msgid "Conflict"
 msgstr "Conflit"
 
-#: ../meld/vc/_vc.py:79
+#: ../meld/vc/_vc.py:80
 msgid "Removed"
 msgstr "Supprimé"
 
-#: ../meld/vc/_vc.py:80
+#: ../meld/vc/_vc.py:81
 msgid "Missing"
 msgstr "Manquant"
 
-#: ../meld/vc/_vc.py:81
+#: ../meld/vc/_vc.py:82
 msgid "Not present"
 msgstr "Absent"
 
@@ -2556,14 +2544,28 @@ msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
 msgstr ""
-"Supprime de la gestion de versions tous les fichiers et dossiers sélectionnés "
-"et tous les fichiers qu'ils contiennent."
+"Supprime de la gestion de versions tous les fichiers et dossiers "
+"sélectionnés et tous les fichiers qu'ils contiennent."
 
 #: ../meld/vcview.py:665
 #, python-format
 msgid "Error removing %s"
 msgstr "Erreur lors de la suppression de %s"
 
-#: ../meld/vcview.py:745
+#: ../meld/vcview.py:746
 msgid "Clear"
 msgstr "Effacer"
+
+#~ msgid "_Save as UTF-8"
+#~ msgstr "_Enregistrer en tant qu'UTF-8"
+
+#~ msgid "Couldn't encode text as “%s”"
+#~ msgstr "Impossible de coder le texte en « %s »"
+
+#~ msgid ""
+#~ "File “%s” contains characters that can't be encoded using encoding “%s”.\n"
+#~ "Would you like to save as UTF-8?"
+#~ msgstr ""
+#~ "Le fichier « %s » contient des caractères qui ne peuvent être codés avec "
+#~ "le codage « %s ».\n"
+#~ "Voulez-vous enregistrer en UTF-8 ?"
diff --git a/setup_win32.py b/setup_win32.py
index c3dc9a59..2e7b1cef 100644
--- a/setup_win32.py
+++ b/setup_win32.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import glob
 import os
@@ -37,11 +37,15 @@
     'libjasper-1.dll',
     'libjpeg-8.dll',
     'libpng16-16.dll',
-    'libgnutls-26.dll',
     'libxmlxpat.dll',
     'librsvg-2-2.dll',
+    'libtiff-5.dll',
+    'libepoxy-0.dll',
+    'libharfbuzz-0.dll',
     'libharfbuzz-gobject-0.dll',
     'libwebp-5.dll',
+    # for Gtk.show_uri; note that name is bitness-dependant
+    'gspawn-win32-helper.exe',
 ]
 
 gtk_libs = [
@@ -61,12 +65,12 @@
                  missing_dll + gtk_libs]
 
 build_exe_options = {
-    "compressed": False,
-    "icon": "data/icons/meld.ico",
     "includes": ["gi"],
     "packages": ["gi", "weakref"],
     "include_files": include_files,
     "bin_path_excludes": [""],
+    "zip_exclude_packages": [],
+    "zip_include_packages": ["*"],
 }
 
 
@@ -123,6 +127,7 @@
         Executable(
             "bin/meld",
             base="Win32GUI",
+            icon="data/icons/meld.ico",
             targetName="Meld.exe",
             shortcutName="Meld",
             shortcutDir="ProgramMenuFolder",