Merge lp:~noskcaj/ubuntu/utopic/meld/3.11.4 into lp:ubuntu/utopic/meld

[Jackson Doak]

New upstream bugfix release

[Sebastien Bacher (seb128)]

it got synced https://launchpad.net/ubuntu/+source/meld/3.11.4-1

review: Approve

=== modified file '.pc/01_skip_compile_schema_and_icon_cache_update.patch/meld/build_helpers.py'
--- .pc/01_skip_compile_schema_and_icon_cache_update.patch/meld/build_helpers.py	2014-07-20 03:05:38 +0000
+++ .pc/01_skip_compile_schema_and_icon_cache_update.patch/meld/build_helpers.py	2014-09-19 21:51:35 +0000
@@ -23,11 +23,13 @@
 import distutils.cmd
 import distutils.command.build
 import distutils.command.build_py
+import distutils.command.install
 import distutils.command.install_data
 import distutils.dist
 import distutils.dir_util
 import glob
 import os.path
+import platform
 import sys
 
 from distutils.log import info
@@ -360,6 +362,19 @@
             self, module, module_file, package)
 
 
+class install(distutils.command.install.install):
+
+    def finalize_options(self):
+        special_cases = ('debian', 'ubuntu')
+        if (platform.system() == 'Linux' and
+                platform.linux_distribution()[0].lower() in special_cases):
+            # Maintain an explicit install-layout, but use deb by default
+            specified_layout = getattr(self, 'install_layout', None)
+            self.install_layout = specified_layout or 'deb'
+
+        distutils.command.install.install.finalize_options(self)
+
+
 class install_data(distutils.command.install_data.install_data):
 
     def run(self):

=== removed directory '.pc/02_remove_install_layout.patch'
=== removed file '.pc/02_remove_install_layout.patch/setup.py'
--- .pc/02_remove_install_layout.patch/setup.py	2014-07-20 03:05:38 +0000
+++ .pc/02_remove_install_layout.patch/setup.py	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-#!/usr/bin/env python
-
-from distutils.core import setup
-import glob
-import platform
-import sys
-
-import meld.build_helpers
-import meld.conf
-
-
-if (platform.system() == 'Linux' and
-        platform.linux_distribution()[0] == 'Ubuntu'):
-    sys.argv.append('--install-layout=deb')
-
-setup(
-    name=meld.conf.__package__,
-    version=meld.conf.__version__,
-    description='Visual diff and merge tool',
-    author='Kai Willadsen',
-    author_email='[e-mail]',
-    url='http://meldmerge.org',
-    classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Environment :: X11 Applications :: GTK',
-        'Intended Audience :: Developers',
-        'Intended Audience :: System Administrators',
-        'License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)',
-        'Programming Language :: Python',
-        'Topic :: Desktop Environment :: Gnome',
-        'Topic :: Software Development',
-        'Topic :: Software Development :: Version Control',
-    ],
-    packages=[
-        'meld',
-        'meld.ui',
-        'meld.util',
-        'meld.vc',
-    ],
-    package_data={
-        'meld': ['README', 'COPYING', 'NEWS'],
-        'meld.vc': ['README', 'COPYING'],
-    },
-    scripts=['bin/meld'],
-    data_files=[
-        ('share/man/man1',
-         ['meld.1']
-         ),
-        ('share/doc/meld-' + meld.conf.__version__,
-         ['COPYING', 'NEWS']
-         ),
-        ('share/meld',
-         ['data/meld.css']
-         ),
-        ('share/meld/icons',
-         glob.glob("data/icons/*.png") +
-         glob.glob("data/icons/COPYING*")
-         ),
-        ('share/meld/ui',
-         glob.glob("data/ui/*.ui") + glob.glob("data/ui/*.xml")
-         ),
-    ],
-    cmdclass={
-        "build_i18n": meld.build_helpers.build_i18n,
-        "build_help": meld.build_helpers.build_help,
-        "build_icons": meld.build_helpers.build_icons,
-        "build_data": meld.build_helpers.build_data,
-        "build_py": meld.build_helpers.build_py,
-        "install_data": meld.build_helpers.install_data,
-    },
-    distclass=meld.build_helpers.MeldDistribution,
-)

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2014-08-23 21:43:46 +0000
+++ .pc/applied-patches	2014-09-19 21:51:35 +0000
@@ -1,2 +1,1 @@
 01_skip_compile_schema_and_icon_cache_update.patch
-02_remove_install_layout.patch

=== modified file 'NEWS'
--- NEWS	2014-08-23 21:43:46 +0000
+++ NEWS	2014-09-19 21:51:35 +0000
@@ -1,4 +1,29 @@
 
[phone] meld 3.11.4
+======================
+
+  Fixes:
+
+   * Only apply the auto merge flag to the last comparison started (Kai
+     Willadsen)
+   * Fix install layout issues on Debian-based systems (Kai Willadsen)
+   * Fix "Open External" for files on Windows (Kai Willadsen)
+   * Record installation directory and executable location on Windows (Kai
+     Willadsen)
+   * Revert to using latin1 as a fallback encoding; this will be reverted in
+     the next unstable series (Kai Willadsen)
+
+  Translations:
+
+   * Andika Triwidada (id)
+   * Daniel Mustieles (es)
+   * fr33domlover (he)
+   * Jiri Grönroos (fi)
+   * Josef Andersson (sv)
+   * Marek Černocký (cs)
+   * Piotr Drąg (pl)
+
+
 2014-08-23 meld 3.11.3
 ======================
 

=== modified file 'PKG-INFO'
--- PKG-INFO	2014-08-23 21:43:46 +0000
+++ PKG-INFO	2014-09-19 21:51:35 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: meld
-Version: 3.11.3
+Version: 3.11.4
 Summary: Visual diff and merge tool
 Home-page: http://meldmerge.org
 Author: Kai Willadsen

=== modified file 'data/org.gnome.meld.gschema.xml'
--- data/org.gnome.meld.gschema.xml	2014-08-23 21:43:46 +0000
+++ data/org.gnome.meld.gschema.xml	2014-09-19 21:51:35 +0000
@@ -191,7 +191,7 @@
       <key name="vc-commit-margin" type="i">
           <default>72</default>
           <summary>Margin column in commit message editor</summary>
-          <description>The column of the margin is at in the version control commit message editor.</description>
+          <description>The column at which to show the margin in the version control commit message editor.</description>
       </key>
       <key name="vc-break-commit-message" type="b">
           <default>false</default>

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-23 21:43:46 +0000
+++ debian/changelog	2014-09-19 21:51:35 +0000
@@ -1,3 +1,10 @@
+meld (3.11.4-0ubuntu1) utopic; urgency=medium
+
+  * New upstream bugfix release.
+  * Drop 02_remove_install_layout.patch, fixed upstream
+
+ -- Jackson Doak <[e-mail]>  Sat, 20 Sep 2014 06:45:18 +1000
+
 meld (3.11.3-1) experimental; urgency=medium
 
   * New upstream development release

=== modified file 'debian/control'
--- debian/control	2014-08-23 21:43:46 +0000
+++ debian/control	2014-09-19 21:51:35 +0000
@@ -6,7 +6,8 @@
 Source: meld
 Section: gnome
 Priority: optional
-Maintainer: Balint Reczey <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Balint Reczey <[e-mail]>
 Build-Depends: debhelper (>= 9),
                cdbs (>= 0.4.90~),
                python (>=2.6.6-3~),

=== modified file 'debian/control.in'
--- debian/control.in	2014-08-23 21:43:46 +0000
+++ debian/control.in	2014-09-19 21:51:35 +0000
@@ -1,7 +1,8 @@
 Source: meld
 Section: gnome
 Priority: optional
-Maintainer: Balint Reczey <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Balint Reczey <[e-mail]>
 Build-Depends: debhelper (>= 9),
                cdbs (>= 0.4.90~),
                python (>=2.6.6-3~),

=== removed file 'debian/patches/02_remove_install_layout.patch'
--- debian/patches/02_remove_install_layout.patch	2014-07-20 03:05:38 +0000
+++ debian/patches/02_remove_install_layout.patch	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-Description: remove broken hardcoded install-layout from setup.py
-Author: Dmitry Shachnev <[e-mail]>
-Forwarded: no
-Last-Update: 2014-06-16
-
---- a/setup.py
-+++ b/setup.py
-@@ -9,10 +9,6 @@
- import meld.conf
- 
- 
--if (platform.system() == 'Linux' and
--        platform.linux_distribution()[0] == 'Ubuntu'):
--    sys.argv.append('--install-layout=deb')
--
- setup(
-     name=meld.conf.__package__,
-     version=meld.conf.__version__,

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-08-23 21:43:46 +0000
+++ debian/patches/series	2014-09-19 21:51:35 +0000
@@ -1,2 +1,1 @@
 01_skip_compile_schema_and_icon_cache_update.patch
-02_remove_install_layout.patch

=== modified file 'meld/build_helpers.py'
--- meld/build_helpers.py	2014-07-20 03:05:38 +0000
+++ meld/build_helpers.py	2014-09-19 21:51:35 +0000
@@ -23,11 +23,13 @@
 import distutils.cmd
 import distutils.command.build
 import distutils.command.build_py
+import distutils.command.install
 import distutils.command.install_data
 import distutils.dist
 import distutils.dir_util
 import glob
 import os.path
+import platform
 import sys
 
 from distutils.log import info
@@ -360,6 +362,19 @@
             self, module, module_file, package)
 
 
+class install(distutils.command.install.install):
+
+    def finalize_options(self):
+        special_cases = ('debian', 'ubuntu')
+        if (platform.system() == 'Linux' and
+                platform.linux_distribution()[0].lower() in special_cases):
+            # Maintain an explicit install-layout, but use deb by default
+            specified_layout = getattr(self, 'install_layout', None)
+            self.install_layout = specified_layout or 'deb'
+
+        distutils.command.install.install.finalize_options(self)
+
+
 class install_data(distutils.command.install_data.install_data):
 
     def run(self):

=== modified file 'meld/conf.py'
--- meld/conf.py	2014-08-23 21:43:46 +0000
+++ meld/conf.py	2014-09-19 21:51:35 +0000
@@ -3,7 +3,7 @@
 import sys
 
 __package__ = "meld"
-__version__ = "3.11.3"
+__version__ = "3.11.4"
 
 # START; these paths are clobbered on install by meld.build_helpers
 DATADIR = os.path.join(sys.prefix, "share", "meld")

=== modified file 'meld/filediff.py'
--- meld/filediff.py	2014-08-23 21:43:46 +0000
+++ meld/filediff.py	2014-09-19 21:51:35 +0000
@@ -1114,6 +1114,7 @@
         self.linediffer.clear()
         self.queue_draw()
         try_codecs = list(settings.get_value('detect-encodings'))
+        try_codecs.append('latin1')
         yield _("[%s] Opening files") % self.label_text
         tasks = []
 

=== modified file 'meld/meldapp.py'
--- meld/meldapp.py	2014-07-20 03:05:38 +0000
+++ meld/meldapp.py	2014-09-19 21:51:35 +0000
@@ -307,10 +307,12 @@
         options.newtab = options.newtab or not command_line.get_is_remote()
         for i, paths in enumerate(comparisons):
             files = [command_line.create_file_for_arg(p) for p in paths]
+            auto_merge = (
+                options.auto_merge if i == len(comparisons) - 1 else False)
             try:
                 tab = self.open_files(
                     files, auto_compare=options.auto_compare,
-                    auto_merge=options.auto_merge, new_tab=options.newtab,
+                    auto_merge=auto_merge, new_tab=options.newtab,
                     focus=i == 0)
             except ValueError as err:
                 error = err

=== modified file 'meld/melddoc.py'
--- meld/melddoc.py	2014-07-20 03:05:38 +0000
+++ meld/melddoc.py	2014-09-19 21:51:35 +0000
@@ -121,8 +121,13 @@
                         sys.platform == "win32":
                     if settings.get_boolean('use-system-editor'):
                         gfile = Gio.File.new_for_path(path)
-                        Gio.AppInfo.launch_default_for_uri(
-                            gfile.get_uri(), None)
+                        if sys.platform == "win32":
+                            handler = gfile.query_default_handler(None)
+                            result = handler.launch([gfile], None)
+                        else:
+                            uri = gfile.get_uri()
+                            Gio.AppInfo.launch_default_for_uri(
+                                uri, None)
                     else:
                         editor = make_custom_editor_command(path, line)
                         if editor:

=== modified file 'meld/meldwindow.py'
--- meld/meldwindow.py	2014-08-23 21:43:46 +0000
+++ meld/meldwindow.py	2014-09-19 21:51:35 +0000
@@ -652,7 +652,9 @@
         return doc
 
     def append_filemerge(self, files, merge_output=None):
-        assert len(files) == 3
+        if len(files) != 3:
+            raise ValueError(
+                _("Need three files to auto-merge, got: %r") % files)
         doc = filemerge.FileMerge(len(files))
         self._append_page(doc, "text-x-generic")
         doc.set_files(files)

=== modified file 'po/LINGUAS'
--- po/LINGUAS	2014-01-23 21:03:05 +0000
+++ po/LINGUAS	2014-09-19 21:51:35 +0000
@@ -15,6 +15,7 @@
 fi
 fr
 gl
+he
 hu
 id
 it

=== modified file 'po/cs.po'
--- po/cs.po	2014-08-23 21:43:46 +0000
+++ po/cs.po	2014-09-19 21:51:35 +0000
@@ -11,8 +11,8 @@
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=meld&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-07-23 09:47+0000\n"
-"PO-Revision-Date: 2014-07-23 13:17+0200\n"
+"POT-Creation-Date: 2014-09-09 09:47+0000\n"
+"PO-Revision-Date: 2014-09-09 12:21+0200\n"
 "Last-Translator: Marek Černocký <[e-mail]>\n"
 "Language-Team: Czech <[e-mail]>\n"
 "Language: cs\n"
@@ -381,9 +381,10 @@
 
 #: ../data/org.gnome.meld.gschema.xml.h:54
 msgid ""
-"The column of the margin is at in the version control commit message editor."
+"The column at which to show the margin in the version control commit message "
+"editor."
 msgstr ""
-"Sloupec, na kterém je okraj v editoru zpráv popisujících zařazení ve správě "
+"Sloupec, ve kterém se má zobrazit okraj v editoru zpráv popisujících zařazení ve správě "
 "verzí."
 
 #: ../data/org.gnome.meld.gschema.xml.h:55
@@ -503,7 +504,7 @@
 msgid "Delete selected"
 msgstr "Odstranit vybrané"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1448
+#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1449
 msgid "Hide"
 msgstr "Skrýt"
 
@@ -1182,8 +1183,8 @@
 msgid "'%s' hidden by '%s'"
 msgstr "„%s“ skryto v „%s“"
 
-#: ../meld/dirdiff.py:873 ../meld/filediff.py:1123 ../meld/filediff.py:1274
-#: ../meld/filediff.py:1450 ../meld/filediff.py:1480 ../meld/filediff.py:1482
+#: ../meld/dirdiff.py:873 ../meld/filediff.py:1124 ../meld/filediff.py:1275
+#: ../meld/filediff.py:1451 ../meld/filediff.py:1481 ../meld/filediff.py:1483
 msgid "Hi_de"
 msgstr "_Skrýt"
 
@@ -1428,50 +1429,50 @@
 msgid "[%s] Set num panes"
 msgstr "[%s] Nastaven počet panelů"
 
-#: ../meld/filediff.py:1117
+#: ../meld/filediff.py:1118
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Otevírají se soubory"
 
-#: ../meld/filediff.py:1140 ../meld/filediff.py:1150 ../meld/filediff.py:1163
-#: ../meld/filediff.py:1169
+#: ../meld/filediff.py:1141 ../meld/filediff.py:1151 ../meld/filediff.py:1164
+#: ../meld/filediff.py:1170
 msgid "Could not read file"
 msgstr "Nelze přečíst soubor"
 
-#: ../meld/filediff.py:1141
+#: ../meld/filediff.py:1142
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Čtou se soubory"
 
-#: ../meld/filediff.py:1151
+#: ../meld/filediff.py:1152
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s je zřejmě binárním souborem."
 
-#: ../meld/filediff.py:1164
+#: ../meld/filediff.py:1165
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s není v kódováních: %s"
 
-#: ../meld/filediff.py:1202
+#: ../meld/filediff.py:1203
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Počítají se rozdíly"
 
-#: ../meld/filediff.py:1269
+#: ../meld/filediff.py:1270
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Soubor „%s“ byl změněn na disku."
 
-#: ../meld/filediff.py:1270
+#: ../meld/filediff.py:1271
 msgid "Do you want to reload the file?"
 msgstr "Chcete soubor znovu načíst?"
 
-#: ../meld/filediff.py:1273
+#: ../meld/filediff.py:1274
 msgid "_Reload"
 msgstr "Zno_vu načíst"
 
-#: ../meld/filediff.py:1439
+#: ../meld/filediff.py:1440
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1479,19 +1480,19 @@
 "Jsou používány textové filtry a může dojít k zamaskování rozdílů mezi "
 "soubory. Chcete porovnat nefiltrované soubory?"
 
-#: ../meld/filediff.py:1445
+#: ../meld/filediff.py:1446
 msgid "Files are identical"
 msgstr "Soubory jsou stejné"
 
-#: ../meld/filediff.py:1453
+#: ../meld/filediff.py:1454
 msgid "Show without filters"
 msgstr "Zobrazit bez filtrů"
 
-#: ../meld/filediff.py:1475
+#: ../meld/filediff.py:1476
 msgid "Change highlighting incomplete"
 msgstr "Změnit zvýraznění neúplných"
 
-#: ../meld/filediff.py:1476
+#: ../meld/filediff.py:1477
 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."
@@ -1500,15 +1501,15 @@
 "přimět k používání větší délky, aby se zvýraznily i rozsáhlé změny, ale může "
 "to pak být pomalé."
 
-#: ../meld/filediff.py:1484
+#: ../meld/filediff.py:1485
 msgid "Keep highlighting"
 msgstr "Zachovat zvýrazňování"
 
-#: ../meld/filediff.py:1486
+#: ../meld/filediff.py:1487
 msgid "_Keep highlighting"
 msgstr "Z_achovat zvýrazňování"
 
-#: ../meld/filediff.py:1617
+#: ../meld/filediff.py:1618
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -1517,7 +1518,7 @@
 "„%s“ existuje!\n"
 "Přepsat?"
 
-#: ../meld/filediff.py:1630
+#: ../meld/filediff.py:1631
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -1528,36 +1529,36 @@
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1641
+#: ../meld/filediff.py:1642
 msgid "Save Left Pane As"
 msgstr "Uložení levého panelu jako"
 
-#: ../meld/filediff.py:1643
+#: ../meld/filediff.py:1644
 msgid "Save Middle Pane As"
 msgstr "Uložení prostředního panelu jako"
 
-#: ../meld/filediff.py:1645
+#: ../meld/filediff.py:1646
 msgid "Save Right Pane As"
 msgstr "Uložení pravého panelu jako"
 
-#: ../meld/filediff.py:1658
+#: ../meld/filediff.py:1659
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Soubor „%s“ byl od doby, co jste jej otevřeli, změněn."
 
-#: ../meld/filediff.py:1660
+#: ../meld/filediff.py:1661
 msgid "If you save it, any external changes will be lost."
 msgstr "Pokud jej uložíte, budou vnější změny ztraceny."
 
-#: ../meld/filediff.py:1663
+#: ../meld/filediff.py:1664
 msgid "Save Anyway"
 msgstr "Přesto uložit"
 
-#: ../meld/filediff.py:1664
+#: ../meld/filediff.py:1665
 msgid "Don't Save"
 msgstr "Neukládat"
 
-#: ../meld/filediff.py:1688
+#: ../meld/filediff.py:1689
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -1568,7 +1569,7 @@
 "\n"
 "Jaký formát chcete používat?"
 
-#: ../meld/filediff.py:1704
+#: ../meld/filediff.py:1705
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -1577,11 +1578,11 @@
 "„%s“ obsahuje znaky, které nelze kódovat v „%s“\n"
 "Chcete uložit jako UTF-8?"
 
-#: ../meld/filediff.py:2065
+#: ../meld/filediff.py:2068
 msgid "Live comparison updating disabled"
 msgstr "Živá aktualizace porovnání zakázána"
 
-#: ../meld/filediff.py:2066
+#: ../meld/filediff.py:2069
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "

=== modified file 'po/es.po'
--- po/es.po	2014-08-23 21:43:46 +0000
+++ po/es.po	2014-09-19 21:51:35 +0000
@@ -13,8 +13,8 @@
 "Project-Id-Version: meld.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=meld&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-07-21 21:45+0000\n"
-"PO-Revision-Date: 2014-07-22 12:23+0200\n"
+"POT-Creation-Date: 2014-09-01 09:47+0000\n"
+"PO-Revision-Date: 2014-09-01 18:20+0200\n"
 "Last-Translator: Daniel Mustieles <[e-mail]>\n"
 "Language-Team: Español; Castellano <[e-mail]>\n"
 "Language: es\n"
@@ -83,7 +83,6 @@
 msgstr "Tamaño de predeterminado de la ventana"
 
 #: ../data/org.gnome.meld.gschema.xml.h:2
-#| msgid "Default window size"
 msgid "Default window state"
 msgstr "Estado predeterminado de la ventana"
 
@@ -391,11 +390,15 @@
 msgstr "Columna de margen en el editor de mensajes de «commit»"
 
 #: ../data/org.gnome.meld.gschema.xml.h:54
+#| msgid ""
+#| "The column of the margin is at in the version control commit message "
+#| "editor."
 msgid ""
-"The column of the margin is at in the version control commit message editor."
+"The column at which to show the margin in the version control commit message "
+"editor."
 msgstr ""
-"La columna del margen está en el editor de mensajes de «commit» del control "
-"de versiones."
+"La columna en la que mostrar el margen en el editor de mensajes de «commit» "
+"del control de versiones."
 
 #: ../data/org.gnome.meld.gschema.xml.h:55
 msgid "Automatically hard-wrap commit messages"
@@ -514,7 +517,7 @@
 msgid "Delete selected"
 msgstr "Eliminar seleccionados"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1448
+#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1449
 msgid "Hide"
 msgstr "Ocultar"
 
@@ -1200,8 +1203,8 @@
 msgid "'%s' hidden by '%s'"
 msgstr "«%s» oculto por «%s»"
 
-#: ../meld/dirdiff.py:873 ../meld/filediff.py:1123 ../meld/filediff.py:1274
-#: ../meld/filediff.py:1450 ../meld/filediff.py:1480 ../meld/filediff.py:1482
+#: ../meld/dirdiff.py:873 ../meld/filediff.py:1124 ../meld/filediff.py:1275
+#: ../meld/filediff.py:1451 ../meld/filediff.py:1481 ../meld/filediff.py:1483
 msgid "Hi_de"
 msgstr "_Ocultar"
 
@@ -1449,50 +1452,50 @@
 msgid "[%s] Set num panes"
 msgstr "[%s] Establezca el número de paneles"
 
-#: ../meld/filediff.py:1117
+#: ../meld/filediff.py:1118
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Abriendo archivos"
 
-#: ../meld/filediff.py:1140 ../meld/filediff.py:1150 ../meld/filediff.py:1163
-#: ../meld/filediff.py:1169
+#: ../meld/filediff.py:1141 ../meld/filediff.py:1151 ../meld/filediff.py:1164
+#: ../meld/filediff.py:1170
 msgid "Could not read file"
 msgstr "No se pudo leer el archivo"
 
-#: ../meld/filediff.py:1141
+#: ../meld/filediff.py:1142
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Leyendo archivos"
 
-#: ../meld/filediff.py:1151
+#: ../meld/filediff.py:1152
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s parece ser un archivo binario."
 
-#: ../meld/filediff.py:1164
+#: ../meld/filediff.py:1165
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s no está en codificación: %s"
 
-#: ../meld/filediff.py:1202
+#: ../meld/filediff.py:1203
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Calculando las diferencias"
 
-#: ../meld/filediff.py:1269
+#: ../meld/filediff.py:1270
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "El archivo %s ha cambiado en el disco"
 
-#: ../meld/filediff.py:1270
+#: ../meld/filediff.py:1271
 msgid "Do you want to reload the file?"
 msgstr "¿Quiere recargar el archivo?"
 
-#: ../meld/filediff.py:1273
+#: ../meld/filediff.py:1274
 msgid "_Reload"
 msgstr "_Recargar"
 
-#: ../meld/filediff.py:1439
+#: ../meld/filediff.py:1440
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1500,19 +1503,19 @@
 "Se están usando filtros de texto, y pueden estar ocultando diferencias entre "
 "archivos. ¿Quiere comprar los archivos no filtrados?"
 
-#: ../meld/filediff.py:1445
+#: ../meld/filediff.py:1446
 msgid "Files are identical"
 msgstr "Los campos son idénticos"
 
-#: ../meld/filediff.py:1453
+#: ../meld/filediff.py:1454
 msgid "Show without filters"
 msgstr "Mostrar sin filtros"
 
-#: ../meld/filediff.py:1475
+#: ../meld/filediff.py:1476
 msgid "Change highlighting incomplete"
 msgstr "Cambiar el resaltado incompleto"
 
-#: ../meld/filediff.py:1476
+#: ../meld/filediff.py:1477
 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."
@@ -1521,15 +1524,15 @@
 "forzar a Meld para que resalte los cambios largos, aunque esto haga que sea "
 "más lento."
 
-#: ../meld/filediff.py:1484
+#: ../meld/filediff.py:1485
 msgid "Keep highlighting"
 msgstr "Mantener el resaltado"
 
-#: ../meld/filediff.py:1486
+#: ../meld/filediff.py:1487
 msgid "_Keep highlighting"
 msgstr "_Mantener el resaltado"
 
-#: ../meld/filediff.py:1617
+#: ../meld/filediff.py:1618
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -1538,7 +1541,7 @@
 "«%s» ya existe.\n"
 "¿Quiere sobrescribirlo?"
 
-#: ../meld/filediff.py:1630
+#: ../meld/filediff.py:1631
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -1549,36 +1552,36 @@
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1641
+#: ../meld/filediff.py:1642
 msgid "Save Left Pane As"
 msgstr "Guardar panel izquierdo como"
 
-#: ../meld/filediff.py:1643
+#: ../meld/filediff.py:1644
 msgid "Save Middle Pane As"
 msgstr "Guardar el panel central como"
 
-#: ../meld/filediff.py:1645
+#: ../meld/filediff.py:1646
 msgid "Save Right Pane As"
 msgstr "Guardar el panel derecho como"
 
-#: ../meld/filediff.py:1658
+#: ../meld/filediff.py:1659
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "El archivo %s ha cambiado en el disco desde que se abrió"
 
-#: ../meld/filediff.py:1660
+#: ../meld/filediff.py:1661
 msgid "If you save it, any external changes will be lost."
 msgstr "Si lo guarda, los cambios externos se perderán."
 
-#: ../meld/filediff.py:1663
+#: ../meld/filediff.py:1664
 msgid "Save Anyway"
 msgstr "Guardar de todas formas"
 
-#: ../meld/filediff.py:1664
+#: ../meld/filediff.py:1665
 msgid "Don't Save"
 msgstr "No guardar"
 
-#: ../meld/filediff.py:1688
+#: ../meld/filediff.py:1689
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -1589,7 +1592,7 @@
 "\n"
 "¿Qué formato quiere usar?"
 
-#: ../meld/filediff.py:1704
+#: ../meld/filediff.py:1705
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -1598,11 +1601,11 @@
 "«%s» contiene caracteres no codificables con «%s»\n"
 "¿Quiere guardarlos como UTF-8?"
 
-#: ../meld/filediff.py:2065
+#: ../meld/filediff.py:2068
 msgid "Live comparison updating disabled"
 msgstr "Actualización de la comparación en directo desactivada"
 
-#: ../meld/filediff.py:2066
+#: ../meld/filediff.py:2069
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1918,7 +1921,6 @@
 msgstr "Abrir archivos recientes"
 
 #: ../meld/meldwindow.py:164
-#| msgid "Meld"
 msgid "_Meld"
 msgstr "_Meld"
 
@@ -1927,7 +1929,6 @@
 msgstr "Salir del programa"
 
 #: ../meld/meldwindow.py:167
-#| msgid "_Preferences"
 msgid "Prefere_nces"
 msgstr "Prefere_ncias"
 
@@ -1944,7 +1945,6 @@
 msgstr "Abrir el manual de Meld"
 
 #: ../meld/meldwindow.py:173
-#| msgid "Configure the application"
 msgid "About this application"
 msgstr "Acerca de esta aplicación"
 

=== modified file 'po/fi.po'
--- po/fi.po	2014-07-20 03:05:38 +0000
+++ po/fi.po	2014-09-19 21:51:35 +0000
@@ -3,34 +3,35 @@
 # This file is distributed under the same license as the meld package.
 #
 # Ilkka Tuohela <[e-mail]>, 2006-2008.
+# Lasse Liehu <[e-mail]>, 2014.
 # Jiri Grönroos <[e-mail]>, 2013, 2014.
-# Lasse Liehu <[e-mail]>, 2014.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
-"cgi?product=meld&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-05-03 09:33+0000\n"
-"PO-Revision-Date: 2014-05-04 04:09+0300\n"
-"Last-Translator: Lasse Liehu <[e-mail]>\n"
-"Language-Team: Finnish <[e-mail]>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=meld&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2014-09-10 09:47+0000\n"
+"PO-Revision-Date: 2014-09-10 18:48+0300\n"
+"Last-Translator: Jiri Grönroos <[e-mail]>\n"
+"Language-Team: suomi <[e-mail]>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Gtranslator 2.91.6\n"
 
-#: ../bin/meld:134
+#: ../bin/meld:138
 msgid "Cannot import: "
 msgstr "Tuonti ei onnistu: "
 
-#: ../bin/meld:137
+#: ../bin/meld:141
 #, c-format
 msgid "Meld requires %s or higher."
 msgstr "Meld vaatii version %s tai uudemman."
 
-#: ../bin/meld:141
+#: ../bin/meld:145
 msgid "Meld does not support Python 3."
 msgstr "Meld ei tue Python 3:a."
 
@@ -57,12 +58,20 @@
 "two- and three-way comparison of both files and directories, and supports "
 "many version control systems including Git, Mercurial, Bazaar and Subversion."
 msgstr ""
+"Meld on visuaalinen työkalu eroavaisuuksien (diff) vertailuun ja "
+"yhdistämiseen (merge). Sovelluksen kohderyhmänä on sovelluskehittäjät. Meld "
+"auttaa vertailemaan tiedostoja, kansioita ja versiohallittuja projekteja. "
+"Meld tarjoaa kaksi- ja kolmisuuntaisen vertailun tiedostoille ja kansioille. "
+"Versionhallintajärjestelmistä tuettuina ovat muun muassa Git, Mercurial, "
+"Bazaar ja Subversion."
 
 #: ../data/meld.appdata.xml.in.h:2
 msgid ""
 "Meld helps you review code changes, understand patches, and makes enormous "
 "merge conflicts slightly less painful."
 msgstr ""
+"Meld helpottaa tarkastelemaan koodimuutoksia ja ymmärtämään paikkatiedostoja "
+"samalla helpottaen mahdollisia suuria yhdistämiseen liittyviä ristiriitoja."
 
 #: ../data/mime/meld.xml.in.h:1
 msgid "Meld comparison description"
@@ -73,187 +82,192 @@
 msgstr "Ikkunan oletuskoko"
 
 #: ../data/org.gnome.meld.gschema.xml.h:2
+#| msgid "Default window size"
+msgid "Default window state"
+msgstr "Ikkunan oletustila"
+
+#: ../data/org.gnome.meld.gschema.xml.h:3
 msgid "Show toolbar"
 msgstr "Näytä työkalupalkki"
 
-#: ../data/org.gnome.meld.gschema.xml.h:3
+#: ../data/org.gnome.meld.gschema.xml.h:4
 msgid "If true, the window toolbar is visible."
 msgstr "Jos tosi, ikkunan työkalupalkki näytetään."
 
-#: ../data/org.gnome.meld.gschema.xml.h:4
+#: ../data/org.gnome.meld.gschema.xml.h:5
 msgid "Show statusbar"
 msgstr "Näytä tilapalkki"
 
-#: ../data/org.gnome.meld.gschema.xml.h:5
+#: ../data/org.gnome.meld.gschema.xml.h:6
 msgid "If true, the window statusbar is visible."
 msgstr "Jos tosi, ikkunan tilapalkki näytetään."
 
-#: ../data/org.gnome.meld.gschema.xml.h:6
+#: ../data/org.gnome.meld.gschema.xml.h:7
 msgid "Automatically detected text encodings"
-msgstr ""
+msgstr "Automaattisesti havaitut merkistökoodaukset"
 
-#: ../data/org.gnome.meld.gschema.xml.h:7
+#: ../data/org.gnome.meld.gschema.xml.h:8
 msgid ""
 "These text encodings will be automatically used (in order) to try to decode "
 "loaded text files."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:8
+#: ../data/org.gnome.meld.gschema.xml.h:9
 msgid "Width of an indentation step"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:9
+#: ../data/org.gnome.meld.gschema.xml.h:10
 msgid "The number of spaces to use for a single indent step"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:10
+#: ../data/org.gnome.meld.gschema.xml.h:11
 msgid "Whether to indent using spaces or tabs"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:11
+#: ../data/org.gnome.meld.gschema.xml.h:12
 msgid "If true, any new indentation will use spaces instead of tabs."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:12
+#: ../data/org.gnome.meld.gschema.xml.h:13
 msgid "Show line numbers"
 msgstr "Näytä rivinumerot"
 
-#: ../data/org.gnome.meld.gschema.xml.h:13
+#: ../data/org.gnome.meld.gschema.xml.h:14
 msgid "If true, line numbers will be shown in the gutter of file comparisons."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:14
+#: ../data/org.gnome.meld.gschema.xml.h:15
 msgid "Highlight syntax"
 msgstr "Korosta syntaksi"
 
-#: ../data/org.gnome.meld.gschema.xml.h:15
+#: ../data/org.gnome.meld.gschema.xml.h:16
 msgid ""
 "Whether to highlight syntax in comparisons. Because of Meld's own color "
 "highlighting, this is off by default."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:16
+#: ../data/org.gnome.meld.gschema.xml.h:17
 #, fuzzy
 #| msgid "Show w_hitespace"
 msgid "Displayed whitespace"
 msgstr "Näytä _tyhjätila"
 
-#: ../data/org.gnome.meld.gschema.xml.h:17
+#: ../data/org.gnome.meld.gschema.xml.h:18
 msgid ""
 "Selector for individual whitespace character types to be shown. Possible "
 "values are 'space', 'tab', 'newline' and 'nbsp'."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:18
+#: ../data/org.gnome.meld.gschema.xml.h:19
 #, fuzzy
 #| msgid "_Wrap around"
 msgid "Wrap mode"
 msgstr "_Rivitä"
 
-#: ../data/org.gnome.meld.gschema.xml.h:19
+#: ../data/org.gnome.meld.gschema.xml.h:20
 msgid ""
 "Lines in file comparisons will be wrapped according to this setting, either "
 "not at all ('none'), at any character ('char') or only at the end of words "
 "('word')."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:20
+#: ../data/org.gnome.meld.gschema.xml.h:21
 msgid "Highlight current line"
 msgstr "Korosta nykyinen rivi"
 
-#: ../data/org.gnome.meld.gschema.xml.h:21
+#: ../data/org.gnome.meld.gschema.xml.h:22
 msgid ""
 "If true, the line containing the cursor will be highlighted in file "
 "comparisons."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:22
+#: ../data/org.gnome.meld.gschema.xml.h:23
 #, fuzzy
 #| msgid "Use the system default editor"
 msgid "Use the system default monospace font"
 msgstr "Käytä järjestelmän oletusmuokkainta"
 
-#: ../data/org.gnome.meld.gschema.xml.h:23
+#: ../data/org.gnome.meld.gschema.xml.h:24
 msgid ""
 "If false, the defined custom font will be used instead of the system "
 "monospace font."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:24
+#: ../data/org.gnome.meld.gschema.xml.h:25
 msgid "Custom font"
 msgstr "Omavalintainen fontti"
 
-#: ../data/org.gnome.meld.gschema.xml.h:25
+#: ../data/org.gnome.meld.gschema.xml.h:26
 msgid ""
 "The custom font to use, stored as a string and parsed as a Pango font "
 "description."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:26
+#: ../data/org.gnome.meld.gschema.xml.h:27
 msgid "Ignore blank lines when comparing files"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:27
+#: ../data/org.gnome.meld.gschema.xml.h:28
 msgid ""
 "If true, blank lines will be trimmed when highlighting changes between files."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:28
+#: ../data/org.gnome.meld.gschema.xml.h:29
 msgid "Use the system default editor"
 msgstr "Käytä järjestelmän oletusmuokkainta"
 
-#: ../data/org.gnome.meld.gschema.xml.h:29
+#: ../data/org.gnome.meld.gschema.xml.h:30
 msgid ""
 "If false, the defined custom editor will be used instead of the system "
 "editor when opening files externally."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:30
+#: ../data/org.gnome.meld.gschema.xml.h:31
 msgid "The custom editor launch command"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:31
+#: ../data/org.gnome.meld.gschema.xml.h:32
 msgid ""
 "The command used to launch a custom editor. Some limited templating is "
 "supported here; at the moment '{file}' and '{line}' are recognised tokens."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:32
+#: ../data/org.gnome.meld.gschema.xml.h:33
 msgid "Columns to display"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:33
+#: ../data/org.gnome.meld.gschema.xml.h:34
 msgid ""
 "List of column names in folder comparison and whether they should be "
 "displayed."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:34 ../data/ui/preferences.ui.h:30
+#: ../data/org.gnome.meld.gschema.xml.h:35 ../data/ui/preferences.ui.h:30
 msgid "Ignore symbolic links"
 msgstr "Älä huomioi symbolisia linkkejä"
 
-#: ../data/org.gnome.meld.gschema.xml.h:35
+#: ../data/org.gnome.meld.gschema.xml.h:36
 msgid ""
 "If true, folder comparisons do not follow symbolic links when traversing the "
 "folder tree."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:36
+#: ../data/org.gnome.meld.gschema.xml.h:37
 msgid "Use shallow comparison"
 msgstr "Käytä pinnallista vertailua"
 
-#: ../data/org.gnome.meld.gschema.xml.h:37
+#: ../data/org.gnome.meld.gschema.xml.h:38
 msgid ""
 "If true, folder comparisons compare files based solely on size and mtime, "
 "considering files to be identical if their size and mtime match, and "
 "different otherwise."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:38
+#: ../data/org.gnome.meld.gschema.xml.h:39
 msgid "File timestamp resolution"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:39
+#: ../data/org.gnome.meld.gschema.xml.h:40
 msgid ""
 "When comparing based on mtime, this is the minimum difference in nanoseconds "
 "between two files before they're considered to have different mtimes. This "
@@ -261,119 +275,120 @@
 "resolution."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:40
+#: ../data/org.gnome.meld.gschema.xml.h:41
 #, fuzzy
 #| msgid "File Filters"
 msgid "File status filters"
 msgstr "Tiedostosuodattimet"
 
-#: ../data/org.gnome.meld.gschema.xml.h:41
+#: ../data/org.gnome.meld.gschema.xml.h:42
 msgid "List of statuses used to filter visible files in folder comparison."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:42
+#: ../data/org.gnome.meld.gschema.xml.h:43
 #, fuzzy
 #| msgid "Choose which version control system to use"
 msgid "Show the version control console output"
 msgstr "Valitse käytettävä versionhallinta"
 
-#: ../data/org.gnome.meld.gschema.xml.h:43
+#: ../data/org.gnome.meld.gschema.xml.h:44
 msgid ""
 "If true, a console output section will be shown in version control views, "
 "showing the commands run for version control operations."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:44
+#: ../data/org.gnome.meld.gschema.xml.h:45
 #, fuzzy
 #| msgid "Version control view"
 msgid "Version control pane position"
 msgstr "Versionhallintanäkymä"
 
-#: ../data/org.gnome.meld.gschema.xml.h:45
+#: ../data/org.gnome.meld.gschema.xml.h:46
 msgid ""
 "This is the height of the main version control tree when the console pane is "
 "shown."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:46
+#: ../data/org.gnome.meld.gschema.xml.h:47
 msgid "Present version comparisons as left-local/right-remote"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:47
+#: ../data/org.gnome.meld.gschema.xml.h:48
 msgid ""
 "If true, version control comparisons will use a left-is-local, right-is-"
 "remote scheme to determine what order to present files in panes. Otherwise, "
 "a left-is-theirs, right-is-mine scheme is used."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:48
+#: ../data/org.gnome.meld.gschema.xml.h:49
 #, fuzzy
 #| msgid "Start a version control comparison"
 msgid "Order for files in three-way version control merge comparisons"
 msgstr "Aloita versionhallinnan vertailu"
 
-#: ../data/org.gnome.meld.gschema.xml.h:49
+#: ../data/org.gnome.meld.gschema.xml.h:50
 msgid ""
 "Choices for file order are remote/merge/local and local/merged/remote. This "
 "preference only affects three-way comparisons launched from the version "
 "control view, so is used solely for merges/conflict resolution within Meld."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:50
+#: ../data/org.gnome.meld.gschema.xml.h:51
 msgid "Show margin in commit message editor"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:51
+#: ../data/org.gnome.meld.gschema.xml.h:52
 msgid ""
 "If true, a guide will be displayed to show what column the margin is at in "
 "the version control commit message editor."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:52
+#: ../data/org.gnome.meld.gschema.xml.h:53
 msgid "Margin column in commit message editor"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:53
-msgid ""
-"The column of the margin is at in the version control commit message editor."
-msgstr ""
-
 #: ../data/org.gnome.meld.gschema.xml.h:54
+msgid ""
+"The column at which to show the margin in the version control commit message "
+"editor."
+msgstr ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:55
 msgid "Automatically hard-wrap commit messages"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:55
+#: ../data/org.gnome.meld.gschema.xml.h:56
 msgid ""
 "If true, the version control commit message editor will hard-wrap (i.e., "
 "insert line breaks) at the defined commit margin before commit."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:56
+#: ../data/org.gnome.meld.gschema.xml.h:57
 #, fuzzy
 #| msgid "Version control view"
 msgid "Version control status filters"
 msgstr "Versionhallintanäkymä"
 
-#: ../data/org.gnome.meld.gschema.xml.h:57
+#: ../data/org.gnome.meld.gschema.xml.h:58
 msgid ""
 "List of statuses used to filter visible files in version control comparison."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:58
+#: ../data/org.gnome.meld.gschema.xml.h:59
 msgid "Filename-based filters"
 msgstr "Tiedostonimeen pohjautuvat suodattimet"
 
-#: ../data/org.gnome.meld.gschema.xml.h:59
+#: ../data/org.gnome.meld.gschema.xml.h:60
 msgid ""
 "List of predefined filename-based filters that, if active, will remove "
 "matching files from a folder comparison."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:60
+#: ../data/org.gnome.meld.gschema.xml.h:61
 msgid "Text-based filters"
 msgstr "Tekstipohjaiset suodattimet"
 
-#: ../data/org.gnome.meld.gschema.xml.h:61
+#: ../data/org.gnome.meld.gschema.xml.h:62
 msgid ""
 "List of predefined text-based regex filters that, if active, will remove "
 "text from being used in a file comparison. The text will still be displayed, "
@@ -444,7 +459,7 @@
 msgid "Delete selected"
 msgstr "Poista valittu"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1439
+#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1449
 msgid "Hide"
 msgstr "Piilota"
 
@@ -513,7 +528,7 @@
 msgstr "_Lisää"
 
 #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:723
+#: ../meld/vcview.py:747
 msgid "_Remove"
 msgstr "_Poista"
 
@@ -534,7 +549,8 @@
 msgstr "Siirrä _alas"
 
 #. Create icon and filename CellRenderer
-#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:364 ../meld/vcview.py:203
+#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:363
+#: ../meld/vcview.py:203
 msgid "Name"
 msgstr "Nimi"
 
@@ -575,28 +591,28 @@
 "This file can not be written to. You may click here to unlock this file and "
 "make changes anyway, but these changes must be saved to a new file."
 msgstr ""
+"Tähän tiedostoon ei voi kirjoittaa. Voit napsauttaa tästä avataksesi "
+"tiedoston lukituksen ja tehdäksesi muutokset, mutta kyseiset muutokset tulee "
+"tallentaa uuteen tiedostoon."
 
 #: ../data/ui/filediff.ui.h:7
-#, fuzzy
 #| msgid "_File"
 msgid "File 3"
-msgstr "_Tiedosto"
+msgstr "Tiedosto 3"
 
 #: ../data/ui/filediff.ui.h:8
-#, fuzzy
 #| msgid "_File"
 msgid "File 2"
-msgstr "_Tiedosto"
+msgstr "Tiedosto 2"
 
 #: ../data/ui/filediff.ui.h:9
-#, fuzzy
 #| msgid "_File"
 msgid "File 1"
-msgstr "_Tiedosto"
+msgstr "Tiedosto 1"
 
 #: ../data/ui/filediff.ui.h:10
 msgid "Revert unsaved changes to documents?"
-msgstr ""
+msgstr "Perutaanko tallentamattomat muutokset asiakirjoihin?"
 
 #: ../data/ui/filediff.ui.h:11
 msgid "Changes made to the following documents will be permanently lost:\n"
@@ -681,16 +697,14 @@
 msgstr "Vasemmalla on paikallinen, oikealla on etä"
 
 #: ../data/ui/preferences.ui.h:3
-#, fuzzy
 #| msgid "Left is remote, right is local"
 msgid "Remote, merge, local"
-msgstr "Vasemmalla on etä, oikealla on paikallinen"
+msgstr "Etä, yhdistäminen, paikallinen"
 
 #: ../data/ui/preferences.ui.h:4
-#, fuzzy
 #| msgid "Left is local, right is remote"
 msgid "Local, merge, remote"
-msgstr "Vasemmalla on paikallinen, oikealla on etä"
+msgstr "Paikallinen, yhdistäminen, etä"
 
 #: ../data/ui/preferences.ui.h:5
 msgid "1ns (ext4)"
@@ -782,7 +796,7 @@
 
 #: ../data/ui/preferences.ui.h:27
 msgid "C_ompare files based only on size and timestamp"
-msgstr ""
+msgstr "_Vertaa tiedostoja pohjautuen vain kokoon ja aikaleimaan"
 
 #: ../data/ui/preferences.ui.h:28
 msgid "_Timestamp resolution:"
@@ -797,16 +811,14 @@
 msgstr "Näkyvät sarakkeet"
 
 #: ../data/ui/preferences.ui.h:32
-#, fuzzy
 #| msgid "_File Comparison"
 msgid "Folder Comparisons"
-msgstr "_Tiedostojen vertailu"
+msgstr "Kansiovertailut"
 
 #: ../data/ui/preferences.ui.h:33
-#, fuzzy
 #| msgid "_File Comparison"
 msgid "Version Comparisons"
-msgstr "_Tiedostojen vertailu"
+msgstr "Versiovertailut"
 
 #: ../data/ui/preferences.ui.h:34
 msgid "_Order when comparing file revisions:"
@@ -817,10 +829,9 @@
 msgstr ""
 
 #: ../data/ui/preferences.ui.h:36
-#, fuzzy
 #| msgid "Log Message"
 msgid "Commit Messages"
-msgstr "Lokiviesti"
+msgstr "Pysyvien muutosten viestit"
 
 #: ../data/ui/preferences.ui.h:37
 msgid "Show _right margin at:"
@@ -835,6 +846,12 @@
 msgstr "Versionhallinta"
 
 #: ../data/ui/preferences.ui.h:40
+#, fuzzy
+#| msgid "Filename-based filters"
+msgid "Filename filters"
+msgstr "Tiedostonimeen pohjautuvat suodattimet"
+
+#: ../data/ui/preferences.ui.h:41
 msgid ""
 "When performing directory comparisons, you may filter out files and "
 "directories by name. Each pattern is a list of shell style wildcards "
@@ -844,11 +861,25 @@
 "suoritettaessa hakemistojen vertailuja. Kukin malli on lista komentorivin "
 "tapaisia jokerimerkkejä erotettuna välilyönneillä."
 
-#: ../data/ui/preferences.ui.h:41 ../meld/meldwindow.py:103
+#: ../data/ui/preferences.ui.h:42 ../meld/meldwindow.py:103
 msgid "File Filters"
 msgstr "Tiedostosuodattimet"
 
-#: ../data/ui/preferences.ui.h:42
+#: ../data/ui/preferences.ui.h:43
+msgid "Change trimming"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:44
+msgid "Trim blank line differences from the start and end of changes"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:45
+#, fuzzy
+#| msgid "Text Filters"
+msgid "Text filters"
+msgstr "Tekstisuodattimet"
+
+#: ../data/ui/preferences.ui.h:46
 msgid ""
 "When performing file comparisons, you may ignore certain types of changes. "
 "Each pattern here is a python regular expression which replaces matching "
@@ -862,15 +893,11 @@
 "vertailua. Jos lauseke sisältää ryhmiä, vain ryhmät korvataan. Katso "
 "lisätietoja käyttöohjeesta."
 
-#: ../data/ui/preferences.ui.h:43
-msgid "Ignore changes which insert or delete blank lines"
-msgstr "Älä huomioi muutoksia, jotka lisäävät tai poistavat tyhjiä rivejä"
-
-#: ../data/ui/preferences.ui.h:44
+#: ../data/ui/preferences.ui.h:47
 msgid "Text Filters"
 msgstr "Tekstisuodattimet"
 
-#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:583
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:623
 msgid "New comparison"
 msgstr "Uusi vertalu"
 
@@ -919,10 +946,9 @@
 msgstr "Valitse versiohallittu kansio"
 
 #: ../data/ui/tab-placeholder.ui.h:13
-#, fuzzy
 #| msgid "_File Comparison"
 msgid "_Blank comparison"
-msgstr "_Tiedostojen vertailu"
+msgstr "T_yhjä vertailu"
 
 #: ../data/ui/tab-placeholder.ui.h:14
 msgid "C_ompare"
@@ -942,15 +968,15 @@
 
 #: ../data/ui/vcview.ui.h:6
 msgid "Update working copy from version control"
-msgstr ""
+msgstr "Päivitä työskentelyhakemisto versionhallinnasta"
 
 #: ../data/ui/vcview.ui.h:7
 msgid "_Push"
-msgstr ""
+msgstr "Ty_önnä"
 
 #: ../data/ui/vcview.ui.h:8
 msgid "Push local changes to remote"
-msgstr ""
+msgstr "Työnnä paikalliset muutokset etäpäähän"
 
 #: ../data/ui/vcview.ui.h:10
 msgid "Add to version control"
@@ -962,11 +988,11 @@
 
 #: ../data/ui/vcview.ui.h:13
 msgid "Mar_k as Resolved"
-msgstr ""
+msgstr "Merkitse _selvitetyksi"
 
 #: ../data/ui/vcview.ui.h:14
 msgid "Mark as resolved in version control"
-msgstr ""
+msgstr "Merkitse selvitetyksi versionhallinnassa"
 
 #: ../data/ui/vcview.ui.h:15
 msgid "Re_vert"
@@ -1018,7 +1044,7 @@
 
 #: ../data/ui/vcview.ui.h:26
 msgid "Un_versioned"
-msgstr ""
+msgstr "_Versioimattomat"
 
 #: ../data/ui/vcview.ui.h:27
 msgid "Show unversioned files"
@@ -1058,69 +1084,67 @@
 
 #: ../data/ui/vcview.ui.h:36
 msgid "Push local commits to remote?"
-msgstr ""
+msgstr "Työnnetäänkö paikalliset pysyvät muutokset etäpäähän?"
 
 #: ../data/ui/vcview.ui.h:37
 msgid "The commits to be pushed are determined by your version control system."
 msgstr ""
 
 #: ../data/ui/vcview.ui.h:38
-#, fuzzy
 #| msgid "_Commit"
 msgid "_Push commits"
-msgstr "_Toteuta"
+msgstr "_Työnnä pysyvät muutokset"
 
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:382
+#: ../meld/dirdiff.py:381 ../meld/preferences.py:82
 msgid "Size"
 msgstr "Koko"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:390
+#: ../meld/dirdiff.py:389 ../meld/preferences.py:83
 msgid "Modification time"
 msgstr "Muokkausaika"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:398
+#: ../meld/dirdiff.py:397 ../meld/preferences.py:84
 msgid "Permissions"
 msgstr "Oikeudet"
 
-#: ../meld/dirdiff.py:546
+#: ../meld/dirdiff.py:543
 #, python-format
 msgid "Hide %s"
 msgstr "Piilota %s"
 
-#: ../meld/dirdiff.py:675 ../meld/dirdiff.py:697
+#: ../meld/dirdiff.py:672 ../meld/dirdiff.py:694
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Tutkitaan %s"
 
-#: ../meld/dirdiff.py:826
+#: ../meld/dirdiff.py:823
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Valmis"
 
-#: ../meld/dirdiff.py:833
+#: ../meld/dirdiff.py:830
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Tätä kansiota tutkittaessa tapahtui lukuisia virheitä"
 
-#: ../meld/dirdiff.py:834
+#: ../meld/dirdiff.py:831
 msgid "Files with invalid encodings found"
 msgstr "Virheellisellä merkistökoodauksella varustettuja tiedostoja löytyi"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:836
+#: ../meld/dirdiff.py:833
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "Joillain tiedostoilla on virheellinen merkistö. Nimet ovat jotain tällaisia:"
 
-#: ../meld/dirdiff.py:838
+#: ../meld/dirdiff.py:835
 msgid "Files hidden by case insensitive comparison"
 msgstr ""
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:840
-#, fuzzy
+#: ../meld/dirdiff.py:837
 #| msgid ""
 #| "You are running a case insensitive comparison on a case sensitive "
 #| "filesystem. Some files are not visible:\n"
@@ -1129,21 +1153,20 @@
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
 msgstr ""
-"Suoritat kirjainkoosta riippuvaa vertailua tiedostojärjestelmässä, joka ei "
-"tue kirjainkokoja. Jotkut tiedostot eivät näy:\n"
-"%s"
+"Suoritat kirjainkoosta riippumatonta vertailua kirjainkoon huomioivassa "
+"tiedostojärjestelmässä. Seuraavat tiedostot tässä hakemistossa on piilotettu:"
 
-#: ../meld/dirdiff.py:851
+#: ../meld/dirdiff.py:848
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "\"%s\" piilottanut \"%s\""
 
-#: ../meld/dirdiff.py:876 ../meld/filediff.py:1117 ../meld/filediff.py:1265
-#: ../meld/filediff.py:1441 ../meld/filediff.py:1471 ../meld/filediff.py:1473
+#: ../meld/dirdiff.py:873 ../meld/filediff.py:1124 ../meld/filediff.py:1275
+#: ../meld/filediff.py:1451 ../meld/filediff.py:1481 ../meld/filediff.py:1483
 msgid "Hi_de"
 msgstr "_Piilota"
 
-#: ../meld/dirdiff.py:907
+#: ../meld/dirdiff.py:904
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -1152,12 +1175,12 @@
 "\"%s\" on olemassa.\n"
 "Korvataanko se?"
 
-#: ../meld/dirdiff.py:915
+#: ../meld/dirdiff.py:912
 msgid "Error copying file"
 msgstr "Virhe tiedostoa kopioitaessa"
 
-#: ../meld/dirdiff.py:916
-#, fuzzy, python-format
+#: ../meld/dirdiff.py:913
+#, python-format
 #| msgid ""
 #| "Error copying '%s' to '%s'\n"
 #| "\n"
@@ -1168,11 +1191,12 @@
 "\n"
 "%s"
 msgstr ""
-"Virhe kopioitaessa \"%s\" kohteeseen \"%s\"\n"
+"Virhe kopioitaessa \"%s\"\n"
+"kohteeseen \"%s\".\n"
 "\n"
-"%s."
+"%s"
 
-#: ../meld/dirdiff.py:939
+#: ../meld/dirdiff.py:936
 #, python-format
 msgid "Error deleting %s"
 msgstr "Virhe poistettaessa %s"
@@ -1195,7 +1219,7 @@
 
 #: ../meld/filediff.py:250
 msgid "Revert files to their saved versions"
-msgstr ""
+msgstr "Palauta tiedostot tallennettuihin versioihin"
 
 #: ../meld/filediff.py:252
 msgid "Add Synchronization Point"
@@ -1327,7 +1351,7 @@
 
 #: ../meld/filediff.py:297
 msgid "Merge all non-conflicting changes from the left"
-msgstr ""
+msgstr "Yhdistä kaikki ilman ristiriitoja olevat muutokset vasemmalta"
 
 #: ../meld/filediff.py:299
 msgid "Merge All from Right"
@@ -1335,17 +1359,17 @@
 
 #: ../meld/filediff.py:300
 msgid "Merge all non-conflicting changes from the right"
-msgstr ""
+msgstr "Yhdistä kaikki ilman ristiriitoja olevat muutokset oikealta"
 
 #: ../meld/filediff.py:302
 msgid "Merge All"
 msgstr "Yhdistä kaikki"
 
 #: ../meld/filediff.py:303
-#, fuzzy
 #| msgid "Copy all changes from left pane to right pane"
 msgid "Merge all non-conflicting changes from left and right panes"
-msgstr "Kopioi kaikki muutokset vasemmasta paneelista oikeaan"
+msgstr ""
+"Yhdistä kaikki ilman ristiriitoja olevat muutokset vasemmalta ja oikealta"
 
 #: ../meld/filediff.py:307
 msgid "Cycle Through Documents"
@@ -1364,25 +1388,25 @@
 msgstr ""
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:479
+#: ../meld/filediff.py:472
 #, fuzzy
 #| msgid "INS,OVR"
 msgid "INS"
 msgstr "INS, OVR"
 
-#: ../meld/filediff.py:479
+#: ../meld/filediff.py:472
 #, fuzzy
 #| msgid "INS,OVR"
 msgid "OVR"
 msgstr "INS, OVR"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:481
+#: ../meld/filediff.py:474
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Rv %i, sar %i"
 
-#: ../meld/filediff.py:818
+#: ../meld/filediff.py:821
 #, fuzzy, python-format
 #| msgid ""
 #| "Regular expression '%s' changed the number of lines in the file. "
@@ -1394,107 +1418,107 @@
 "Säännöllinen lauseke \"%s\" muutti tiedoston rivien määrää, joten vertailu "
 "on nyt virheellinen. Katso opaskirjasta lisätietoja."
 
-#: ../meld/filediff.py:887
+#: ../meld/filediff.py:890
 msgid "Mark conflict as resolved?"
-msgstr ""
+msgstr "Merkitäänkö ristiriita selvitetyksi?"
 
-#: ../meld/filediff.py:889
+#: ../meld/filediff.py:892
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
+"Jos ristiriita selvitettiin onnistuneesti, voit merkitä sen selvitetyksi."
 
-#: ../meld/filediff.py:891
-#, fuzzy
+#: ../meld/filediff.py:894
 #| msgid "_Cancel"
 msgid "Cancel"
-msgstr "_Peru"
+msgstr "Peru"
 
-#: ../meld/filediff.py:892
+#: ../meld/filediff.py:895
 msgid "Mark _Resolved"
-msgstr ""
+msgstr "Merkitse _selvitetyksi"
 
-#: ../meld/filediff.py:1105
+#: ../meld/filediff.py:1111
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s} aseta paneelien lukumäärä"
 
-#: ../meld/filediff.py:1111
+#: ../meld/filediff.py:1118
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] avataan tiedostoja"
 
-#: ../meld/filediff.py:1134 ../meld/filediff.py:1144 ../meld/filediff.py:1157
-#: ../meld/filediff.py:1163
+#: ../meld/filediff.py:1141 ../meld/filediff.py:1151 ../meld/filediff.py:1164
+#: ../meld/filediff.py:1170
 msgid "Could not read file"
 msgstr "Tiedoston lukeminen epäonnistui"
 
-#: ../meld/filediff.py:1135
+#: ../meld/filediff.py:1142
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] luetaan tiedostoja"
 
-#: ../meld/filediff.py:1145
+#: ../meld/filediff.py:1152
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s vaikuttaa binääritiedostolta."
 
-#: ../meld/filediff.py:1158
+#: ../meld/filediff.py:1165
 #, fuzzy, python-format
 #| msgid "I tried encodings %s."
 msgid "%s is not in encodings: %s"
 msgstr "Yritettiin merkistöjä %s."
 
-#: ../meld/filediff.py:1193
+#: ../meld/filediff.py:1203
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] lasketaan eroja"
 
-#: ../meld/filediff.py:1260
+#: ../meld/filediff.py:1270
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Tiedosto %s on muuttunut levyllä"
 
-#: ../meld/filediff.py:1261
+#: ../meld/filediff.py:1271
 msgid "Do you want to reload the file?"
 msgstr "Haluatko ladata tiedoston uudelleen?"
 
-#: ../meld/filediff.py:1264
+#: ../meld/filediff.py:1274
 msgid "_Reload"
 msgstr "_Lataa uudestaan"
 
-#: ../meld/filediff.py:1430
+#: ../meld/filediff.py:1440
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
 msgstr ""
 
-#: ../meld/filediff.py:1436
+#: ../meld/filediff.py:1446
 msgid "Files are identical"
 msgstr "Tiedostot ovat identtiset"
 
-#: ../meld/filediff.py:1444
+#: ../meld/filediff.py:1454
 msgid "Show without filters"
 msgstr "Näytä ilman suodattimia"
 
-#: ../meld/filediff.py:1466
+#: ../meld/filediff.py:1476
 msgid "Change highlighting incomplete"
 msgstr ""
 
-#: ../meld/filediff.py:1467
+#: ../meld/filediff.py:1477
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
 msgstr ""
 
-#: ../meld/filediff.py:1475
+#: ../meld/filediff.py:1485
 msgid "Keep highlighting"
 msgstr "Säilytä korostus"
 
-#: ../meld/filediff.py:1477
+#: ../meld/filediff.py:1487
 msgid "_Keep highlighting"
 msgstr "_Säilytä korostus"
 
-#: ../meld/filediff.py:1608
+#: ../meld/filediff.py:1618
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -1503,7 +1527,7 @@
 "\"%s\" on olemassa\n"
 "Korvataanko se?"
 
-#: ../meld/filediff.py:1621
+#: ../meld/filediff.py:1631
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -1514,36 +1538,36 @@
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1632
+#: ../meld/filediff.py:1642
 msgid "Save Left Pane As"
 msgstr ""
 
-#: ../meld/filediff.py:1634
+#: ../meld/filediff.py:1644
 msgid "Save Middle Pane As"
 msgstr ""
 
-#: ../meld/filediff.py:1636
+#: ../meld/filediff.py:1646
 msgid "Save Right Pane As"
 msgstr ""
 
-#: ../meld/filediff.py:1649
+#: ../meld/filediff.py:1659
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Tiedosto %s on muuttunut levyllä sen avaamisen jälkeen"
 
-#: ../meld/filediff.py:1651
+#: ../meld/filediff.py:1661
 msgid "If you save it, any external changes will be lost."
 msgstr "Jos tallennat sen, kaikki ulkoiset muutokset häviävät pysyvästi."
 
-#: ../meld/filediff.py:1654
+#: ../meld/filediff.py:1664
 msgid "Save Anyway"
 msgstr "Tallenna silti"
 
-#: ../meld/filediff.py:1655
+#: ../meld/filediff.py:1665
 msgid "Don't Save"
 msgstr "Älä tallenna"
 
-#: ../meld/filediff.py:1679
+#: ../meld/filediff.py:1689
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -1554,7 +1578,7 @@
 "\n"
 "Mitä muotoa haluat käyttää?"
 
-#: ../meld/filediff.py:1695
+#: ../meld/filediff.py:1705
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -1563,11 +1587,11 @@
 "\"%s\" sisältää merkkejä, joita ei voi esittää merkistössä \"%s\".\n"
 "Haluatko tallentaa UTF-8 -muodossa?"
 
-#: ../meld/filediff.py:2056
+#: ../meld/filediff.py:2068
 msgid "Live comparison updating disabled"
-msgstr ""
+msgstr "Reaaliaikainen vertailupäivitys poistettu käytöstä"
 
-#: ../meld/filediff.py:2057
+#: ../meld/filediff.py:2069
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1592,90 +1616,95 @@
 msgid "Copy _down"
 msgstr "Kopioi _vasemmalle"
 
-#: ../meld/meldapp.py:160
+#: ../meld/meldapp.py:170
 #, fuzzy
 #| msgid "Wrong number of arguments (Got %i)"
 msgid "wrong number of arguments supplied to --diff"
 msgstr "Virheellinen määrä argumentteja (saatiin %i)"
 
-#: ../meld/meldapp.py:165
+#: ../meld/meldapp.py:175
 msgid "Start with an empty window"
 msgstr "Aloita tyhjällä ikkunalla"
 
-#: ../meld/meldapp.py:166 ../meld/meldapp.py:168
+#: ../meld/meldapp.py:176 ../meld/meldapp.py:178
 msgid "file"
 msgstr "tiedosto"
 
-#: ../meld/meldapp.py:166 ../meld/meldapp.py:170
+#: ../meld/meldapp.py:176 ../meld/meldapp.py:180
 msgid "folder"
 msgstr "kansio"
 
-#: ../meld/meldapp.py:167
+#: ../meld/meldapp.py:177
 msgid "Start a version control comparison"
 msgstr "Aloita versionhallinnan vertailu"
 
-#: ../meld/meldapp.py:169
+#: ../meld/meldapp.py:179
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Aloita 2- tai 3-osainen tiedostovertailu"
 
-#: ../meld/meldapp.py:171
-#, fuzzy
+#: ../meld/meldapp.py:181
 #| msgid "Start a 2- or 3-way file comparison"
 msgid "Start a 2- or 3-way folder comparison"
-msgstr "Aloita 2- tai 3-osainen tiedostovertailu"
-
-#: ../meld/meldapp.py:209
+msgstr "Aloita 2- tai 3-osainen kansiovertailu"
+
+#: ../meld/meldapp.py:224
+#, python-format
+#| msgid "Error"
+msgid "Error: %s\n"
+msgstr "Virhe: %s\n"
+
+#: ../meld/meldapp.py:231
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld on työkalu tiedostojen ja kansioiden vertailuun."
 
-#: ../meld/meldapp.py:213
+#: ../meld/meldapp.py:235
 msgid "Set label to use instead of file name"
 msgstr "Aseta käytettävä otsikko tiedostonimen sijasta"
 
-#: ../meld/meldapp.py:216
+#: ../meld/meldapp.py:238
 msgid "Open a new tab in an already running instance"
 msgstr "Avaa uusi välilehti jo avoinna olevassa ikkunassa"
 
-#: ../meld/meldapp.py:219
+#: ../meld/meldapp.py:241
 msgid "Automatically compare all differing files on startup"
 msgstr ""
 
-#: ../meld/meldapp.py:222
+#: ../meld/meldapp.py:244
 msgid "Ignored for compatibility"
 msgstr "Jätetty huomioimatta yhteensopivuuden takaamiseksi"
 
-#: ../meld/meldapp.py:226
+#: ../meld/meldapp.py:248
 msgid "Set the target file for saving a merge result"
 msgstr ""
 
-#: ../meld/meldapp.py:229
+#: ../meld/meldapp.py:251
 msgid "Automatically merge files"
-msgstr ""
+msgstr "Yhdistä tiedostot automaattisesti"
 
-#: ../meld/meldapp.py:233
+#: ../meld/meldapp.py:255
 msgid "Load a saved comparison from a Meld comparison file"
-msgstr ""
+msgstr "Lataa tallennettu vertailu Meld-vertailutiedostosta"
 
-#: ../meld/meldapp.py:237
+#: ../meld/meldapp.py:259
 msgid "Create a diff tab for the supplied files or folders"
 msgstr ""
 
-#: ../meld/meldapp.py:249
+#: ../meld/meldapp.py:279
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr ""
 
-#: ../meld/meldapp.py:252
+#: ../meld/meldapp.py:282
 msgid "can't auto-merge less than 3 files"
 msgstr ""
 
-#: ../meld/meldapp.py:254
+#: ../meld/meldapp.py:284
 #, fuzzy
 #| msgid "Flatten directories"
 msgid "can't auto-merge directories"
 msgstr "Litistä kansiot"
 
-#: ../meld/meldapp.py:264
+#: ../meld/meldapp.py:298
 msgid "Error reading saved comparison file"
 msgstr ""
 
@@ -1684,7 +1713,7 @@
 msgid "<unnamed>"
 msgstr "<nimetön>"
 
-#: ../meld/melddoc.py:76 ../meld/melddoc.py:77
+#: ../meld/melddoc.py:78 ../meld/melddoc.py:79
 msgid "untitled"
 msgstr "nimeämätön"
 
@@ -1880,15 +1909,46 @@
 msgid "Open recent files"
 msgstr "Avaa viimeisimpiä tiedostoja"
 
-#: ../meld/meldwindow.py:506
+#: ../meld/meldwindow.py:164
+#| msgid "Meld"
+msgid "_Meld"
+msgstr "_Meld"
+
+#: ../meld/meldwindow.py:165
+msgid "Quit the program"
+msgstr "Lopeta sovellus"
+
+#: ../meld/meldwindow.py:167
+#| msgid "_Preferences"
+msgid "Prefere_nces"
+msgstr "_Asetukset"
+
+#: ../meld/meldwindow.py:168
+#| msgid "Cut the selection"
+msgid "Configure the application"
+msgstr "Muuta sovelluksen asetuksia"
+
+#: ../meld/meldwindow.py:170
+msgid "_Contents"
+msgstr "_Sisältö"
+
+#: ../meld/meldwindow.py:171
+msgid "Open the Meld manual"
+msgstr "Avaa Meldin ohje"
+
+#: ../meld/meldwindow.py:173
+#| msgid "Cut the selection"
+msgid "About this application"
+msgstr "Tietoja sovelluksesta"
+
+#: ../meld/meldwindow.py:546
 msgid "Switch to this tab"
 msgstr "Vaihda tähän välilehteen"
 
-#: ../meld/meldwindow.py:629
-#, fuzzy
+#: ../meld/meldwindow.py:669
 #| msgid "Cannot compare a mixture of files and directories.\n"
 msgid "Cannot compare a mixture of files and directories"
-msgstr "Hakemistoja ja tiedostoja ei voi verrata samanaikaisesti.\n"
+msgstr "Hakemistoja ja tiedostoja ei voi verrata samanaikaisesti"
 
 #. no common path. empty names get changed to "[None]"
 #: ../meld/misc.py:213
@@ -1903,11 +1963,11 @@
 msgid "pattern"
 msgstr "malli"
 
-#: ../meld/recent.py:105
+#: ../meld/recent.py:114
 msgid "Version control:"
 msgstr "Versionhallinta:"
 
-#: ../meld/ui/findbar.py:141
+#: ../meld/ui/findbar.py:144
 msgid "Regular expression error"
 msgstr "Säännöllisen lausekkeen virhe"
 
@@ -1932,15 +1992,15 @@
 #, python-format
 msgid "%d unpushed commit"
 msgid_plural "%d unpushed commits"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d työntämätön pysyvä muutos"
+msgstr[1] "%d työntämätöntä pysyvää muutosta"
 
 #: ../meld/vc/git.py:129
 #, python-format
 msgid "%d branch"
 msgid_plural "%d branches"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d haara"
+msgstr[1] "%d haaraa"
 
 #: ../meld/vc/git.py:348
 #, python-format
@@ -1949,7 +2009,7 @@
 
 #: ../meld/vc/_vc.py:47
 msgid "Merged"
-msgstr ""
+msgstr "Yhdistetty"
 
 #: ../meld/vc/_vc.py:47
 msgid "Base"
@@ -1973,25 +2033,30 @@
 
 #: ../meld/vc/_vc.py:70
 msgid "Newly added"
-msgstr ""
+msgstr "Äskettäin lisätty"
 
 #: ../meld/vc/_vc.py:72
+#| msgid "<unnamed>"
+msgid "Renamed"
+msgstr "Nimetty uudelleen"
+
+#: ../meld/vc/_vc.py:73
 msgid "Conflict"
 msgstr "Ristiriita"
 
-#: ../meld/vc/_vc.py:73
+#: ../meld/vc/_vc.py:74
 msgid "Removed"
 msgstr "Poistettu"
 
-#: ../meld/vc/_vc.py:74
+#: ../meld/vc/_vc.py:75
 msgid "Missing"
-msgstr ""
+msgstr "Puuttuu"
 
-#: ../meld/vc/_vc.py:75
+#: ../meld/vc/_vc.py:76
 msgid "Not present"
-msgstr ""
+msgstr "Ei läsnä"
 
-#: ../meld/vcview.py:233 ../meld/vcview.py:401
+#: ../meld/vcview.py:233 ../meld/vcview.py:417
 msgid "Location"
 msgstr "Sijainti"
 
@@ -2009,102 +2074,107 @@
 
 #. TRANSLATORS: this is an error message when a version control
 #. application isn't installed or can't be found
-#: ../meld/vcview.py:312
+#: ../meld/vcview.py:324
 #, python-format
 msgid "%s not installed"
 msgstr "%s ei ole asennettu"
 
 #. TRANSLATORS: this is an error message when a version
 #. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:316
+#: ../meld/vcview.py:328
 msgid "Invalid repository"
 msgstr "Virheellinen tietovarasto"
 
-#: ../meld/vcview.py:325
+#: ../meld/vcview.py:337
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../meld/vcview.py:327 ../meld/vcview.py:335
+#: ../meld/vcview.py:339 ../meld/vcview.py:347
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../meld/vcview.py:346
+#: ../meld/vcview.py:358
 msgid "No valid version control system found in this folder"
 msgstr "Tästä kansiosta ei löytynyt kelvollista versionhallintajärjestelmää"
 
-#: ../meld/vcview.py:348
+#: ../meld/vcview.py:360
 msgid "Only one version control system found in this folder"
 msgstr "Tästä kansiosta löytyi vain yksi versionhallintajärjestelmä"
 
-#: ../meld/vcview.py:350
+#: ../meld/vcview.py:362
 msgid "Choose which version control system to use"
 msgstr "Valitse käytettävä versionhallinta"
 
 #. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:401
+#: ../meld/vcview.py:417
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:415 ../meld/vcview.py:423
+#: ../meld/vcview.py:431 ../meld/vcview.py:439
 #, python-format
 msgid "Scanning %s"
 msgstr "Tutkitaan %s"
 
-#: ../meld/vcview.py:458
+#: ../meld/vcview.py:479
 msgid "(Empty)"
 msgstr "(tyhjä)"
 
-#: ../meld/vcview.py:498
+#: ../meld/vcview.py:522
 #, python-format
 msgid "%s — local"
-msgstr ""
+msgstr "%s — paikallinen"
 
-#: ../meld/vcview.py:499
+#: ../meld/vcview.py:523
 #, python-format
 msgid "%s — remote"
-msgstr ""
+msgstr "%s — etä"
 
-#: ../meld/vcview.py:507
-#, fuzzy, python-format
+#: ../meld/vcview.py:531
+#, python-format
 #| msgid "Left is local, right is remote"
 msgid "%s (local, merge, remote)"
-msgstr "Vasemmalla on paikallinen, oikealla on etä"
+msgstr "%s (paikallinen, yhdistäminen, etä)"
 
-#: ../meld/vcview.py:512
-#, fuzzy, python-format
+#: ../meld/vcview.py:536
+#, python-format
 #| msgid "Left is remote, right is local"
 msgid "%s (remote, merge, local)"
-msgstr "Vasemmalla on etä, oikealla on paikallinen"
+msgstr "%s (etä, yhdistäminen, paikallinen)"
 
-#: ../meld/vcview.py:523
-#, fuzzy, python-format
+#: ../meld/vcview.py:547
+#, python-format
 #| msgid "Invalid repository"
 msgid "%s — repository"
-msgstr "Virheellinen tietovarasto"
+msgstr "%s — tietovarasto"
 
-#: ../meld/vcview.py:529
+#: ../meld/vcview.py:553
 #, python-format
 msgid "%s (working, repository)"
-msgstr ""
+msgstr "%s (työskentely, tietovarasto)"
 
-#: ../meld/vcview.py:533
+#: ../meld/vcview.py:557
 #, python-format
 msgid "%s (repository, working)"
-msgstr ""
+msgstr "%s (tietovarasto, työskentely)"
 
-#: ../meld/vcview.py:717
+#: ../meld/vcview.py:741
 msgid "Remove folder and all its files?"
 msgstr "Poistetaanko kansio ja kaikki sen tiedostot?"
 
-#: ../meld/vcview.py:719
+#: ../meld/vcview.py:743
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
 msgstr ""
+"Tämä poistaa kaikki valitut tiedostot ja kansiot sekä kaikki valituissa "
+"kansioissa olevat tiedostot versionhallinnasta."
 
-#: ../meld/vcview.py:753
+#: ../meld/vcview.py:777
 #, python-format
 msgid "Error removing %s"
 msgstr "Virhe kohdetta %s poistaessa"
+
+#~ msgid "Ignore changes which insert or delete blank lines"
+#~ msgstr "Älä huomioi muutoksia, jotka lisäävät tai poistavat tyhjiä rivejä"

=== added file 'po/he.po'
--- po/he.po	1970-01-01 00:00:00 +0000
+++ po/he.po	2014-09-19 21:51:35 +0000
@@ -0,0 +1,2160 @@
+# Hebrew translation for meld.
+# Copyright (C) 2010 meld's COPYRIGHT HOLDER
+# This file is distributed under the same license as the meld package.
+# Assaf Sapir  <[e-mail]>,     2010.
+# fr33domlover <[e-mail]>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: meld master\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-01 16:07+0300\n"
+"PO-Revision-Date: 2014-09-01 16:08+0200\n"
+"Last-Translator: fr33domlover <[e-mail]>\n"
+"Language-Team: Hebrew <[e-mail]>\n"
+"Language: he\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"
+
+#: ../bin/meld:138
+msgid "Cannot import: "
+msgstr "לא ניתן לייבא: "
+
+#: ../bin/meld:141
+#, c-format
+msgid "Meld requires %s or higher."
+msgstr "‏Meld דורש %s ומעלה."
+
+#: ../bin/meld:145
+msgid "Meld does not support Python 3."
+msgstr "‏Meld אינו תומך בפייתון 3."
+
+#: ../data/meld.desktop.in.h:1
+#: ../data/ui/meldapp.ui.h:1
+msgid "Meld"
+msgstr "‏Meld"
+
+#: ../data/meld.desktop.in.h:2
+msgid "Diff Viewer"
+msgstr "מציג הבדלי קבצים"
+
+#: ../data/meld.desktop.in.h:3
+msgid "Meld Diff Viewer"
+msgstr "מציג הבדלי קבצים"
+
+#: ../data/meld.desktop.in.h:4
+msgid "Compare and merge your files"
+msgstr "השוואה ומיזוג של קבצים"
+
+#: ../data/meld.appdata.xml.in.h:1
+msgid "Meld is a visual diff and merge tool targeted at developers. Meld helps you compare files, directories, and version controlled projects. It provides two- and three-way comparison of both files and directories, and supports many version control systems including Git, Mercurial, Bazaar and Subversion."
+msgstr "‏Meld הוא כלי להצגת הבדל בין קבצים ולמיזוג קבצים, המוכוון למפתחים. Meld מסייע בהשוואת קבצים, תיקיות ופרויקטים עם בקרת גרסות. הוא מאפשר השוואה בין שניים ובין שלושה (three-way) קבצים או תיקיות, ותומך במערכות בקרת גרסות רבות, כולל Git, ‏Mercurial, ‏Bazaar ו־Subversion."
+
+#: ../data/meld.appdata.xml.in.h:2
+msgid "Meld helps you review code changes, understand patches, and makes enormous merge conflicts slightly less painful."
+msgstr "‏Meld מסייע בסקירת השינויים בקוד ובהבנת טלאים, ומקל על פתירת התנגשויות מיזוג גדולות."
+
+#: ../data/mime/meld.xml.in.h:1
+msgid "Meld comparison description"
+msgstr "תיאור ההשוואה"
+
+#: ../data/org.gnome.meld.gschema.xml.h:1
+msgid "Default window size"
+msgstr "Default window size"
+
+#: ../data/org.gnome.meld.gschema.xml.h:2
+msgid "Default window state"
+msgstr "Default window state"
+
+#: ../data/org.gnome.meld.gschema.xml.h:3
+msgid "Show toolbar"
+msgstr "Show toolbar"
+
+#: ../data/org.gnome.meld.gschema.xml.h:4
+msgid "If true, the window toolbar is visible."
+msgstr "If true, the window toolbar is visible."
+
+#: ../data/org.gnome.meld.gschema.xml.h:5
+msgid "Show statusbar"
+msgstr "Show statusbar"
+
+#: ../data/org.gnome.meld.gschema.xml.h:6
+msgid "If true, the window statusbar is visible."
+msgstr "If true, the window statusbar is visible."
+
+#: ../data/org.gnome.meld.gschema.xml.h:7
+msgid "Automatically detected text encodings"
+msgstr "Automatically detected text encodings"
+
+#: ../data/org.gnome.meld.gschema.xml.h:8
+msgid "These text encodings will be automatically used (in order) to try to decode loaded text files."
+msgstr "These text encodings will be automatically used (in order) to try to decode loaded text files."
+
+#: ../data/org.gnome.meld.gschema.xml.h:9
+msgid "Width of an indentation step"
+msgstr "Width of an indentation step"
+
+#: ../data/org.gnome.meld.gschema.xml.h:10
+msgid "The number of spaces to use for a single indent step"
+msgstr "The number of spaces to use for a single indent step"
+
+#: ../data/org.gnome.meld.gschema.xml.h:11
+msgid "Whether to indent using spaces or tabs"
+msgstr "Whether to indent using spaces or tabs"
+
+#: ../data/org.gnome.meld.gschema.xml.h:12
+msgid "If true, any new indentation will use spaces instead of tabs."
+msgstr "If true, any new indentation will use spaces instead of tabs."
+
+#: ../data/org.gnome.meld.gschema.xml.h:13
+msgid "Show line numbers"
+msgstr "הצגת מספרי שורות"
+
+#: ../data/org.gnome.meld.gschema.xml.h:14
+msgid "If true, line numbers will be shown in the gutter of file comparisons."
+msgstr "If true, line numbers will be shown in the gutter of file comparisons."
+
+#: ../data/org.gnome.meld.gschema.xml.h:15
+msgid "Highlight syntax"
+msgstr "Highlight syntax"
+
+#: ../data/org.gnome.meld.gschema.xml.h:16
+msgid "Whether to highlight syntax in comparisons. Because of Meld's own color highlighting, this is off by default."
+msgstr "Whether to highlight syntax in comparisons. Because of Meld's own color highlighting, this is off by default."
+
+#: ../data/org.gnome.meld.gschema.xml.h:17
+msgid "Displayed whitespace"
+msgstr "Displayed whitespace"
+
+#: ../data/org.gnome.meld.gschema.xml.h:18
+msgid "Selector for individual whitespace character types to be shown. Possible values are 'space', 'tab', 'newline' and 'nbsp'."
+msgstr "Selector for individual whitespace character types to be shown. Possible values are 'space', 'tab', 'newline' and 'nbsp'."
+
+#: ../data/org.gnome.meld.gschema.xml.h:19
+msgid "Wrap mode"
+msgstr "Wrap mode"
+
+#: ../data/org.gnome.meld.gschema.xml.h:20
+msgid "Lines in file comparisons will be wrapped according to this setting, either not at all ('none'), at any character ('char') or only at the end of words ('word')."
+msgstr "Lines in file comparisons will be wrapped according to this setting, either not at all ('none'), at any character ('char') or only at the end of words ('word')."
+
+#: ../data/org.gnome.meld.gschema.xml.h:21
+msgid "Highlight current line"
+msgstr "Highlight current line"
+
+#: ../data/org.gnome.meld.gschema.xml.h:22
+msgid "If true, the line containing the cursor will be highlighted in file comparisons."
+msgstr "If true, the line containing the cursor will be highlighted in file comparisons."
+
+#: ../data/org.gnome.meld.gschema.xml.h:23
+msgid "Use the system default monospace font"
+msgstr "Use the system default monospace font"
+
+#: ../data/org.gnome.meld.gschema.xml.h:24
+msgid "If false, the defined custom font will be used instead of the system monospace font."
+msgstr "If false, the defined custom font will be used instead of the system monospace font."
+
+#: ../data/org.gnome.meld.gschema.xml.h:25
+msgid "Custom font"
+msgstr "Custom font"
+
+#: ../data/org.gnome.meld.gschema.xml.h:26
+msgid "The custom font to use, stored as a string and parsed as a Pango font description."
+msgstr "The custom font to use, stored as a string and parsed as a Pango font description."
+
+#: ../data/org.gnome.meld.gschema.xml.h:27
+msgid "Ignore blank lines when comparing files"
+msgstr "Ignore blank lines when comparing files"
+
+#: ../data/org.gnome.meld.gschema.xml.h:28
+msgid "If true, blank lines will be trimmed when highlighting changes between files."
+msgstr "If true, blank lines will be trimmed when highlighting changes between files."
+
+#: ../data/org.gnome.meld.gschema.xml.h:29
+msgid "Use the system default editor"
+msgstr "שימוש בעורך ברירת המחדל של המערכת"
+
+#: ../data/org.gnome.meld.gschema.xml.h:30
+msgid "If false, the defined custom editor will be used instead of the system editor when opening files externally."
+msgstr "If false, the defined custom editor will be used instead of the system editor when opening files externally."
+
+#: ../data/org.gnome.meld.gschema.xml.h:31
+msgid "The custom editor launch command"
+msgstr "The custom editor launch command"
+
+#: ../data/org.gnome.meld.gschema.xml.h:32
+msgid "The command used to launch a custom editor. Some limited templating is supported here; at the moment '{file}' and '{line}' are recognised tokens."
+msgstr "The command used to launch a custom editor. Some limited templating is supported here; at the moment '{file}' and '{line}' are recognised tokens."
+
+#: ../data/org.gnome.meld.gschema.xml.h:33
+msgid "Columns to display"
+msgstr "Columns to display"
+
+#: ../data/org.gnome.meld.gschema.xml.h:34
+msgid "List of column names in folder comparison and whether they should be displayed."
+msgstr "List of column names in folder comparison and whether they should be displayed."
+
+#: ../data/org.gnome.meld.gschema.xml.h:35
+#: ../data/ui/preferences.ui.h:30
+msgid "Ignore symbolic links"
+msgstr "התעלמות מקישורים סמליים"
+
+#: ../data/org.gnome.meld.gschema.xml.h:36
+msgid "If true, folder comparisons do not follow symbolic links when traversing the folder tree."
+msgstr "If true, folder comparisons do not follow symbolic links when traversing the folder tree."
+
+#: ../data/org.gnome.meld.gschema.xml.h:37
+msgid "Use shallow comparison"
+msgstr "Use shallow comparison"
+
+#: ../data/org.gnome.meld.gschema.xml.h:38
+msgid "If true, folder comparisons compare files based solely on size and mtime, considering files to be identical if their size and mtime match, and different otherwise."
+msgstr "If true, folder comparisons compare files based solely on size and mtime, considering files to be identical if their size and mtime match, and different otherwise."
+
+#: ../data/org.gnome.meld.gschema.xml.h:39
+msgid "File timestamp resolution"
+msgstr "File timestamp resolution"
+
+#: ../data/org.gnome.meld.gschema.xml.h:40
+msgid "When comparing based on mtime, this is the minimum difference in nanoseconds between two files before they're considered to have different mtimes. This is useful when comparing files between filesystems with different timestamp resolution."
+msgstr "When comparing based on mtime, this is the minimum difference in nanoseconds between two files before they're considered to have different mtimes. This is useful when comparing files between filesystems with different timestamp resolution."
+
+#: ../data/org.gnome.meld.gschema.xml.h:41
+msgid "File status filters"
+msgstr "מסנני מצב קובץ"
+
+#: ../data/org.gnome.meld.gschema.xml.h:42
+msgid "List of statuses used to filter visible files in folder comparison."
+msgstr "List of statuses used to filter visible files in folder comparison."
+
+#: ../data/org.gnome.meld.gschema.xml.h:43
+msgid "Show the version control console output"
+msgstr "Show the version control console output"
+
+#: ../data/org.gnome.meld.gschema.xml.h:44
+msgid "If true, a console output section will be shown in version control views, showing the commands run for version control operations."
+msgstr "If true, a console output section will be shown in version control views, showing the commands run for version control operations."
+
+#: ../data/org.gnome.meld.gschema.xml.h:45
+msgid "Version control pane position"
+msgstr "מיקום חלונית בקרת גרסה"
+
+#: ../data/org.gnome.meld.gschema.xml.h:46
+msgid "This is the height of the main version control tree when the console pane is shown."
+msgstr "This is the height of the main version control tree when the console pane is shown."
+
+#: ../data/org.gnome.meld.gschema.xml.h:47
+msgid "Present version comparisons as left-local/right-remote"
+msgstr "Present version comparisons as left-local/right-remote"
+
+#: ../data/org.gnome.meld.gschema.xml.h:48
+msgid "If true, version control comparisons will use a left-is-local, right-is-remote scheme to determine what order to present files in panes. Otherwise, a left-is-theirs, right-is-mine scheme is used."
+msgstr "If true, version control comparisons will use a left-is-local, right-is-remote scheme to determine what order to present files in panes. Otherwise, a left-is-theirs, right-is-mine scheme is used."
+
+#: ../data/org.gnome.meld.gschema.xml.h:49
+msgid "Order for files in three-way version control merge comparisons"
+msgstr "Order for files in three-way version control merge comparisons"
+
+#: ../data/org.gnome.meld.gschema.xml.h:50
+msgid "Choices for file order are remote/merge/local and local/merged/remote. This preference only affects three-way comparisons launched from the version control view, so is used solely for merges/conflict resolution within Meld."
+msgstr "Choices for file order are remote/merge/local and local/merged/remote. This preference only affects three-way comparisons launched from the version control view, so is used solely for merges/conflict resolution within Meld."
+
+#: ../data/org.gnome.meld.gschema.xml.h:51
+msgid "Show margin in commit message editor"
+msgstr "Show margin in commit message editor"
+
+#: ../data/org.gnome.meld.gschema.xml.h:52
+msgid "If true, a guide will be displayed to show what column the margin is at in the version control commit message editor."
+msgstr "If true, a guide will be displayed to show what column the margin is at in the version control commit message editor."
+
+#: ../data/org.gnome.meld.gschema.xml.h:53
+msgid "Margin column in commit message editor"
+msgstr "Margin column in commit message editor"
+
+#: ../data/org.gnome.meld.gschema.xml.h:54
+msgid "The column at which to show the margin in the version control commit message editor."
+msgstr "The column at which to show the margin in the version control commit message editor."
+
+#: ../data/org.gnome.meld.gschema.xml.h:55
+msgid "Automatically hard-wrap commit messages"
+msgstr "Automatically hard-wrap commit messages"
+
+#: ../data/org.gnome.meld.gschema.xml.h:56
+msgid "If true, the version control commit message editor will hard-wrap (i.e., insert line breaks) at the defined commit margin before commit."
+msgstr "If true, the version control commit message editor will hard-wrap (i.e., insert line breaks) at the defined commit margin before commit."
+
+#: ../data/org.gnome.meld.gschema.xml.h:57
+msgid "Version control status filters"
+msgstr "מסנני מצב בקרת גרסה"
+
+#: ../data/org.gnome.meld.gschema.xml.h:58
+msgid "List of statuses used to filter visible files in version control comparison."
+msgstr "List of statuses used to filter visible files in version control comparison."
+
+#: ../data/org.gnome.meld.gschema.xml.h:59
+msgid "Filename-based filters"
+msgstr "מסנני שם קובץ"
+
+#: ../data/org.gnome.meld.gschema.xml.h:60
+msgid "List of predefined filename-based filters that, if active, will remove matching files from a folder comparison."
+msgstr "List of predefined filename-based filters that, if active, will remove matching files from a folder comparison."
+
+#: ../data/org.gnome.meld.gschema.xml.h:61
+msgid "Text-based filters"
+msgstr "מסנני טקסט"
+
+#: ../data/org.gnome.meld.gschema.xml.h:62
+msgid "List of predefined text-based regex filters that, if active, will remove text from being used in a file comparison. The text will still be displayed, but won't contribute to the comparison itself."
+msgstr "List of predefined text-based regex filters that, if active, will remove text from being used in a file comparison. The text will still be displayed, but won't contribute to the comparison itself."
+
+#: ../data/ui/application.ui.h:1
+msgid "About Meld"
+msgstr "אודות Meld"
+
+#: ../data/ui/application.ui.h:2
+msgid ""
+"Copyright © 2002-2009 Stephen Kennedy\n"
+"Copyright © 2009-2013 Kai Willadsen"
+msgstr ""
+"הזכויות שמורות © 2002-‏2009 Stephen Kennedy\n"
+"הזכויות שמורות © 2009-‏2013 Kai Willadsen"
+
+#: ../data/ui/application.ui.h:4
+msgid "Website"
+msgstr "אתר אינטרנט"
+
+#: ../data/ui/application.ui.h:5
+msgid "translator-credits"
+msgstr ""
+"Assaf Sapir <[e-mail]>\n"
+"fr33domlover <[e-mail]>"
+
+#: ../data/ui/application.ui.h:6
+msgid "_Preferences"
+msgstr "ה_עדפות"
+
+#: ../data/ui/application.ui.h:7
+msgid "_Help"
+msgstr "_עזרה"
+
+#: ../data/ui/application.ui.h:8
+msgid "_About"
+msgstr "_אודות"
+
+#: ../data/ui/application.ui.h:9
+msgid "_Quit"
+msgstr "_יציאה"
+
+#: ../data/ui/dirdiff.ui.h:1
+#: ../data/ui/vcview.ui.h:1
+msgid "_Compare"
+msgstr "_השוואה"
+
+#: ../data/ui/dirdiff.ui.h:2
+#: ../data/ui/vcview.ui.h:2
+msgid "Compare selected files"
+msgstr "השוואת הקבצים הנבחרים"
+
+#: ../data/ui/dirdiff.ui.h:3
+msgid "Copy _Left"
+msgstr "העתקה _שמאלה"
+
+#: ../data/ui/dirdiff.ui.h:4
+msgid "Copy to left"
+msgstr "העתקה לחלונית השמאלית"
+
+#: ../data/ui/dirdiff.ui.h:5
+msgid "Copy _Right"
+msgstr "העתקה _ימינה"
+
+#: ../data/ui/dirdiff.ui.h:6
+msgid "Copy to right"
+msgstr "העתקה לחלונית הימנית"
+
+#: ../data/ui/dirdiff.ui.h:7
+msgid "Delete selected"
+msgstr "מחיקת הבחירה"
+
+#: ../data/ui/dirdiff.ui.h:8
+#: ../meld/filediff.py:1449
+msgid "Hide"
+msgstr "הסתרה"
+
+#: ../data/ui/dirdiff.ui.h:9
+msgid "Hide selected"
+msgstr "הסתרת הבחירה"
+
+#: ../data/ui/dirdiff.ui.h:10
+msgid "Ignore Filename Case"
+msgstr "התעלמות מרישיות בשמות קבצים"
+
+#: ../data/ui/dirdiff.ui.h:11
+msgid "Consider differently-cased filenames that are otherwise-identical to be the same"
+msgstr "יש להתייחס לשמות קבצים שההבדל היחיד ביניהם הוא רישיות האותיות כשמות זהים"
+
+#: ../data/ui/dirdiff.ui.h:12
+msgid "Same"
+msgstr "זהה"
+
+#: ../data/ui/dirdiff.ui.h:13
+msgid "Show identical"
+msgstr "הצגת זהים"
+
+#: ../data/ui/dirdiff.ui.h:14
+msgid "New"
+msgstr "חדש"
+
+#: ../data/ui/dirdiff.ui.h:15
+msgid "Show new"
+msgstr "הצגת חדש"
+
+#: ../data/ui/dirdiff.ui.h:16
+#: ../meld/vc/_vc.py:71
+msgid "Modified"
+msgstr "השתנה"
+
+#: ../data/ui/dirdiff.ui.h:17
+msgid "Show modified"
+msgstr "הצגת שינויים"
+
+#: ../data/ui/dirdiff.ui.h:18
+msgid "Filters"
+msgstr "מסננים"
+
+#: ../data/ui/dirdiff.ui.h:19
+msgid "Set active filters"
+msgstr "קביעת מסננים פעילים"
+
+#: ../data/ui/EditableList.ui.h:1
+msgid "Editable List"
+msgstr "רשימה שניתנת לעריכה"
+
+#: ../data/ui/EditableList.ui.h:2
+msgid "Active"
+msgstr "האם מוצגת"
+
+#: ../data/ui/EditableList.ui.h:3
+msgid "Column Name"
+msgstr "שם העמודה"
+
+#: ../data/ui/EditableList.ui.h:4
+#: ../data/ui/vcview.ui.h:9
+msgid "_Add"
+msgstr "_הוספה"
+
+#: ../data/ui/EditableList.ui.h:5
+#: ../data/ui/vcview.ui.h:11
+#: ../meld/vcview.py:747
+msgid "_Remove"
+msgstr "_הסרה"
+
+#: ../data/ui/EditableList.ui.h:6
+msgid "Move item up"
+msgstr "הזזת הפריט מעלה"
+
+#: ../data/ui/EditableList.ui.h:7
+msgid "Move _Up"
+msgstr "הזזה מ_עלה"
+
+#: ../data/ui/EditableList.ui.h:8
+msgid "Move item down"
+msgstr "הזזת הפריט מטה"
+
+#: ../data/ui/EditableList.ui.h:9
+msgid "Move _Down"
+msgstr "הזזה מ_טה"
+
+#. Create icon and filename CellRenderer
+#: ../data/ui/EditableList.ui.h:10
+#: ../meld/dirdiff.py:363
+#: ../meld/vcview.py:203
+msgid "Name"
+msgstr "שם"
+
+#: ../data/ui/EditableList.ui.h:11
+msgid "Pattern"
+msgstr "תבנית"
+
+#: ../data/ui/EditableList.ui.h:12
+msgid "Add new filter"
+msgstr "הוספת מסנן חדש"
+
+#: ../data/ui/EditableList.ui.h:13
+msgid "Remove selected filter"
+msgstr "הסרת המסנן הנבחר"
+
+#: ../data/ui/filediff.ui.h:1
+msgid "Save changes to documents before closing?"
+msgstr "האם לשמור את השינויים במסמכים לפני הסגירה?"
+
+#: ../data/ui/filediff.ui.h:2
+msgid "If you don't save, changes will be permanently lost."
+msgstr "אם לא תתבצע שמירה, השינויים יאבדו."
+
+#: ../data/ui/filediff.ui.h:3
+msgid "Close _without Saving"
+msgstr "סגירה _ללא שמירה"
+
+#: ../data/ui/filediff.ui.h:4
+msgid "_Cancel"
+msgstr "_ביטול"
+
+#: ../data/ui/filediff.ui.h:5
+msgid "_Save"
+msgstr "_שמירה"
+
+#: ../data/ui/filediff.ui.h:6
+msgid "This file can not be written to. You may click here to unlock this file and make changes anyway, but these changes must be saved to a new file."
+msgstr "לא ניתן לכתוב לקובץ זה. ניתן בכל־זאת לפתוח את הקובץ ולבצע השינויים, אך עליהם להישמר בקובץ חדש."
+
+#: ../data/ui/filediff.ui.h:7
+msgid "File 3"
+msgstr "קובץ 3"
+
+#: ../data/ui/filediff.ui.h:8
+msgid "File 2"
+msgstr "קובץ 2"
+
+#: ../data/ui/filediff.ui.h:9
+msgid "File 1"
+msgstr "קובץ 1"
+
+#: ../data/ui/filediff.ui.h:10
+msgid "Revert unsaved changes to documents?"
+msgstr "האם לבטל שינויים שלא נשמרו?"
+
+#: ../data/ui/filediff.ui.h:11
+msgid "Changes made to the following documents will be permanently lost:\n"
+msgstr "שינויים שנעשו במסמכים הבאים יאבדו:\n"
+
+#: ../data/ui/findbar.ui.h:1
+msgid "_Replace"
+msgstr "ה_חלפה"
+
+#: ../data/ui/findbar.ui.h:2
+msgid "Replace _All"
+msgstr "החלפת _הכל"
+
+#: ../data/ui/findbar.ui.h:3
+msgid "_Previous"
+msgstr "ה_קודם"
+
+#: ../data/ui/findbar.ui.h:4
+msgid "_Next"
+msgstr "ה_בא"
+
+#: ../data/ui/findbar.ui.h:5
+msgid "Find:"
+msgstr "חיפוש:"
+
+#: ../data/ui/findbar.ui.h:6
+msgid "Replace _with:"
+msgstr "החלפה _עם:"
+
+#: ../data/ui/findbar.ui.h:7
+msgid "_Match case"
+msgstr "ה_תאמת רישיות"
+
+#: ../data/ui/findbar.ui.h:8
+msgid "Who_le word"
+msgstr "מילה _שלמה"
+
+#: ../data/ui/findbar.ui.h:9
+msgid "Regular e_xpression"
+msgstr "ביטוי ר_גולרי"
+
+#: ../data/ui/findbar.ui.h:10
+msgid "Wrapped"
+msgstr "עטוף"
+
+#: ../data/ui/patch-dialog.ui.h:1
+msgid "Format as Patch"
+msgstr "יצירת טלאי"
+
+#: ../data/ui/patch-dialog.ui.h:2
+msgid "Use differences between:"
+msgstr "יש להשתמש בהבדלים בין:"
+
+#: ../data/ui/patch-dialog.ui.h:3
+msgid "Left and middle panes"
+msgstr "החלוניות האמצעית והשמאלית"
+
+#: ../data/ui/patch-dialog.ui.h:4
+msgid "Middle and right panes"
+msgstr "החלוניות הימנית והאמצעית"
+
+#: ../data/ui/patch-dialog.ui.h:5
+msgid "_Reverse patch direction"
+msgstr "_היפוך כיוון הטלאי"
+
+#: ../data/ui/patch-dialog.ui.h:6
+msgid "Copy to Clipboard"
+msgstr "העתקה ללוח הגזירים"
+
+#: ../data/ui/patch-dialog.ui.h:7
+#: ../meld/patchdialog.py:119
+msgid "Save Patch"
+msgstr "שמירת טלאי"
+
+#: ../data/ui/preferences.ui.h:1
+msgid "Left is remote, right is local"
+msgstr "ימין מקומי, שמאל מרוחק"
+
+#: ../data/ui/preferences.ui.h:2
+msgid "Left is local, right is remote"
+msgstr "ימין מרוחק, שמאל מקומי"
+
+#: ../data/ui/preferences.ui.h:3
+msgid "Remote, merge, local"
+msgstr "מקומי, ממוזג, מרוחק"
+
+#: ../data/ui/preferences.ui.h:4
+msgid "Local, merge, remote"
+msgstr "מרוחק, ממוזג, מקומי"
+
+#: ../data/ui/preferences.ui.h:5
+msgid "1ns (ext4)"
+msgstr "ננו־שנייה אחת (ext4)"
+
+#: ../data/ui/preferences.ui.h:6
+msgid "100ns (NTFS)"
+msgstr "100 ננו־שניות (NTFS)"
+
+#: ../data/ui/preferences.ui.h:7
+msgid "1s (ext2/ext3)"
+msgstr "שנייה אחת (ext 2/3)"
+
+#: ../data/ui/preferences.ui.h:8
+msgid "2s (VFAT)"
+msgstr "2 שניות (VFAT)"
+
+#: ../data/ui/preferences.ui.h:9
+msgid "Meld Preferences"
+msgstr "העדפות"
+
+#: ../data/ui/preferences.ui.h:10
+msgid "Font"
+msgstr "גופן"
+
+#: ../data/ui/preferences.ui.h:11
+msgid "_Use the system fixed width font"
+msgstr "_יש להשתמש בגופן הרוחב הקבוע של המערכת"
+
+#: ../data/ui/preferences.ui.h:12
+msgid "_Editor font:"
+msgstr "גופן ה_עורך:"
+
+#: ../data/ui/preferences.ui.h:13
+msgid "Display"
+msgstr "תצוגה"
+
+#: ../data/ui/preferences.ui.h:14
+msgid "_Tab width:"
+msgstr "_רוחב זיח:"
+
+#: ../data/ui/preferences.ui.h:15
+msgid "_Insert spaces instead of tabs"
+msgstr "_הכנסת רווחים במקום הזחות"
+
+#: ../data/ui/preferences.ui.h:16
+msgid "Enable text _wrapping"
+msgstr "אפשור _גלישת טקסט"
+
+#: ../data/ui/preferences.ui.h:17
+msgid "Do not _split words over two lines"
+msgstr "אין ל_פצל מילים ליותר משתי שורות"
+
+#: ../data/ui/preferences.ui.h:18
+msgid "Highlight _current line"
+msgstr "הדגשת השורה ה_נוכחית"
+
+#: ../data/ui/preferences.ui.h:19
+msgid "Show _line numbers"
+msgstr "הצגת מספרי _שורות"
+
+#: ../data/ui/preferences.ui.h:20
+msgid "Show w_hitespace"
+msgstr "הצגת _רווחים"
+
+#: ../data/ui/preferences.ui.h:21
+msgid "Use s_yntax highlighting"
+msgstr "שימוש בהדגשת ת_חביר"
+
+#: ../data/ui/preferences.ui.h:22
+msgid "External Editor"
+msgstr "עורך חיצוני"
+
+#: ../data/ui/preferences.ui.h:23
+msgid "Use _default system editor"
+msgstr "שימוש בעורך _ברירת המחדל של המערכת"
+
+#: ../data/ui/preferences.ui.h:24
+msgid "Edito_r command:"
+msgstr "פקודת ע_ורך:"
+
+#: ../data/ui/preferences.ui.h:25
+msgid "Editor"
+msgstr "עורך"
+
+#: ../data/ui/preferences.ui.h:26
+msgid "Shallow Comparison"
+msgstr "השוואה שטחית"
+
+#: ../data/ui/preferences.ui.h:27
+msgid "C_ompare files based only on size and timestamp"
+msgstr "ה_שוואת קבצים לפי גודל וחותם זמן בלבד"
+
+#: ../data/ui/preferences.ui.h:28
+msgid "_Timestamp resolution:"
+msgstr "דיוק _חותם זמן:"
+
+#: ../data/ui/preferences.ui.h:29
+msgid "Symbolic Links"
+msgstr "קישורים סמליים"
+
+#: ../data/ui/preferences.ui.h:31
+msgid "Visible Columns"
+msgstr "עמודות מוצגות"
+
+#: ../data/ui/preferences.ui.h:32
+msgid "Folder Comparisons"
+msgstr "השוואת תיקיות"
+
+#: ../data/ui/preferences.ui.h:33
+msgid "Version Comparisons"
+msgstr "השוואת גרסות"
+
+#: ../data/ui/preferences.ui.h:34
+msgid "_Order when comparing file revisions:"
+msgstr "_סדר בעת השוואת מהדורות קובץ:"
+
+#: ../data/ui/preferences.ui.h:35
+msgid "Order when _merging files:"
+msgstr "סדר בעת _מיזוג קבצים:"
+
+#: ../data/ui/preferences.ui.h:36
+msgid "Commit Messages"
+msgstr "הודעות הגשה"
+
+#: ../data/ui/preferences.ui.h:37
+msgid "Show _right margin at:"
+msgstr "הצגת השוליים ה_ימניים בעמודה:"
+
+#: ../data/ui/preferences.ui.h:38
+msgid "Automatically _break lines at right margin on commit"
+msgstr "_שבירת שורות אוטומטית בשוליים הימניים בעת ההגשה"
+
+#: ../data/ui/preferences.ui.h:39
+msgid "Version Control"
+msgstr "בקרת גרסות"
+
+#: ../data/ui/preferences.ui.h:40
+msgid "Filename filters"
+msgstr "מסנני שם קובץ"
+
+#: ../data/ui/preferences.ui.h:41
+msgid "When performing directory comparisons, you may filter out files and directories by name. Each pattern is a list of shell style wildcards separated by spaces."
+msgstr "בעת השוואת תיקיות, ניתן לסנן קבצים ותיקיות לפי שם. כל תבנית היא רשימה של wildcards בסגנון המעטפת שמופרדים על־ידי רווחים."
+
+#: ../data/ui/preferences.ui.h:42
+#: ../meld/meldwindow.py:103
+msgid "File Filters"
+msgstr "מסנני קבצים"
+
+#: ../data/ui/preferences.ui.h:43
+msgid "Change trimming"
+msgstr "חיתוך קצוות"
+
+#: ../data/ui/preferences.ui.h:44
+msgid "Trim blank line differences from the start and end of changes"
+msgstr "הסרת הבדלי שורות ריקות מההתחלה ומהסוף של שינויים"
+
+#: ../data/ui/preferences.ui.h:45
+msgid "Text filters"
+msgstr "מסנני טקסט"
+
+#: ../data/ui/preferences.ui.h:46
+msgid "When performing file comparisons, you may ignore certain types of changes. Each pattern here is a python regular expression which replaces matching text with the empty string before comparison is performed. If the expression contains groups, only the groups are replaced. See the user manual for more details."
+msgstr "בעת השוואת קבצים, ניתן להתעלם מסוגים מסוימים של שינויים. כל תבנית כאן היא ביטוי רגולרי של פייתון, וטקסט שמתאים לתבנית מוחלף במחרוזת הריקה לפני ביצוע ההשוואה. אם הביטוי כולל קבוצות, רק הקבוצות מוחלפות. ניתן לעיין במדריך המשתמש לפרטים נוספים."
+
+#: ../data/ui/preferences.ui.h:47
+msgid "Text Filters"
+msgstr "מסנני טקסט"
+
+#: ../data/ui/tab-placeholder.ui.h:1
+#: ../meld/meldwindow.py:623
+msgid "New comparison"
+msgstr "השוואה חדשה"
+
+#: ../data/ui/tab-placeholder.ui.h:2
+msgid "File comparison"
+msgstr "השוואת קבצים"
+
+#: ../data/ui/tab-placeholder.ui.h:3
+msgid "Directory comparison"
+msgstr "השוואת תיקיות"
+
+#: ../data/ui/tab-placeholder.ui.h:4
+msgid "Version control view"
+msgstr "תצוגת בקרת גרסות"
+
+#: ../data/ui/tab-placeholder.ui.h:5
+msgid "_3-way comparison"
+msgstr "השוואת 3 קבצים/תיקיות (three-way)"
+
+#: ../data/ui/tab-placeholder.ui.h:6
+msgid "Select Third File"
+msgstr "בחירת קובץ שלישי"
+
+#: ../data/ui/tab-placeholder.ui.h:7
+msgid "Select Second File"
+msgstr "בחירת קובץ שני"
+
+#: ../data/ui/tab-placeholder.ui.h:8
+msgid "Select First File"
+msgstr "בחירת קובץ ראשון"
+
+#: ../data/ui/tab-placeholder.ui.h:9
+msgid "Select First Folder"
+msgstr "בחירת תיקייה ראשונה"
+
+#: ../data/ui/tab-placeholder.ui.h:10
+msgid "Select Second Folder"
+msgstr "בחירת תיקייה שנייה"
+
+#: ../data/ui/tab-placeholder.ui.h:11
+msgid "Select Third Folder"
+msgstr "בחירת תיקייה שלישית"
+
+#: ../data/ui/tab-placeholder.ui.h:12
+msgid "Select A Version-Controlled Folder"
+msgstr "יש לבחור תיקייה מבוקרת גרסה"
+
+#: ../data/ui/tab-placeholder.ui.h:13
+msgid "_Blank comparison"
+msgstr "השוואה ריקה"
+
+#: ../data/ui/tab-placeholder.ui.h:14
+msgid "C_ompare"
+msgstr "ה_שוואה"
+
+#: ../data/ui/vcview.ui.h:3
+msgid "Co_mmit..."
+msgstr "ה_גשה..."
+
+#: ../data/ui/vcview.ui.h:4
+msgid "Commit changes to version control"
+msgstr "הגשת השינויים למערכת בקרת גרסות"
+
+#: ../data/ui/vcview.ui.h:5
+msgid "_Update"
+msgstr "_עדכון"
+
+#: ../data/ui/vcview.ui.h:6
+msgid "Update working copy from version control"
+msgstr "עדכון עותק העבודה מתוך מערכת בקרת הגרסות"
+
+#: ../data/ui/vcview.ui.h:7
+msgid "_Push"
+msgstr "_דחיפה"
+
+#: ../data/ui/vcview.ui.h:8
+msgid "Push local changes to remote"
+msgstr "דחיפת השינויים המקומיים למאגר המרוחק"
+
+#: ../data/ui/vcview.ui.h:10
+msgid "Add to version control"
+msgstr "הוספה לבקרת גרסות"
+
+#: ../data/ui/vcview.ui.h:12
+msgid "Remove from version control"
+msgstr "הסרה ממערכת בקרת הגרסות"
+
+#: ../data/ui/vcview.ui.h:13
+msgid "Mar_k as Resolved"
+msgstr "_סימון כפתור"
+
+#: ../data/ui/vcview.ui.h:14
+msgid "Mark as resolved in version control"
+msgstr "סימון הבדל הגורם להתנגשות כְפתור במערכת בקרת הגרסות"
+
+#: ../data/ui/vcview.ui.h:15
+msgid "Re_vert"
+msgstr "_שחזור"
+
+#: ../data/ui/vcview.ui.h:16
+msgid "Revert working copy to original state"
+msgstr "שחזור עותק העבודה למצב המקורי"
+
+#: ../data/ui/vcview.ui.h:17
+msgid "Delete from working copy"
+msgstr "מחיקה מעותק העבודה"
+
+#: ../data/ui/vcview.ui.h:18
+msgid "Console"
+msgstr "מסוף"
+
+#: ../data/ui/vcview.ui.h:19
+msgid "Show or hide the version control console output pane"
+msgstr "הצגה או הסתרה של חלונית פלט המסוף של מערכת בקרת הגרסות"
+
+#: ../data/ui/vcview.ui.h:20
+msgid "_Flatten"
+msgstr "_שיטוח"
+
+#: ../data/ui/vcview.ui.h:21
+msgid "Flatten directories"
+msgstr "שיטוח עץ התיקיות"
+
+#: ../data/ui/vcview.ui.h:22
+msgid "_Modified"
+msgstr "ה_שתנה"
+
+#: ../data/ui/vcview.ui.h:23
+msgid "Show modified files"
+msgstr "הצגת קבצים שהשתנו"
+
+#: ../data/ui/vcview.ui.h:24
+msgid "_Normal"
+msgstr "_רגיל"
+
+#: ../data/ui/vcview.ui.h:25
+msgid "Show normal files"
+msgstr "הצגת קבצים רגילים"
+
+#: ../data/ui/vcview.ui.h:26
+msgid "Un_versioned"
+msgstr "לא _מבוקר גרסה"
+
+#: ../data/ui/vcview.ui.h:27
+msgid "Show unversioned files"
+msgstr "הצגת קבצים שאינם מבוקרים על־ידי מערכת בקרת הגרסות"
+
+#: ../data/ui/vcview.ui.h:28
+#: ../meld/vc/_vc.py:64
+msgid "Ignored"
+msgstr "תחת התעלמות"
+
+#: ../data/ui/vcview.ui.h:29
+msgid "Show ignored files"
+msgstr "הצגת קבצים שתחת התעלמות"
+
+#: ../data/ui/vcview.ui.h:30
+msgid "Commit"
+msgstr "הגשה"
+
+#: ../data/ui/vcview.ui.h:31
+msgid "Commit Files"
+msgstr "הגשת הקבצים"
+
+#: ../data/ui/vcview.ui.h:32
+msgid "Log Message"
+msgstr "הודעת הגשה"
+
+#: ../data/ui/vcview.ui.h:33
+msgid "Previous logs:"
+msgstr "הודעות הגשה קודמות:"
+
+#: ../data/ui/vcview.ui.h:34
+msgid "Co_mmit"
+msgstr "ה_גשה"
+
+#: ../data/ui/vcview.ui.h:35
+msgid "Console output"
+msgstr "פלט מסוף"
+
+#: ../data/ui/vcview.ui.h:36
+msgid "Push local commits to remote?"
+msgstr "האם לדחוף את ההגשות המקומיות למאגר המרוחק?"
+
+#: ../data/ui/vcview.ui.h:37
+msgid "The commits to be pushed are determined by your version control system."
+msgstr "מערכת בקרת הגרסות קובעת אילו הגשות יידחפו למאגר המרוחק."
+
+#: ../data/ui/vcview.ui.h:38
+msgid "_Push commits"
+msgstr "_דחיפת הגשות"
+
+#. Create file size CellRenderer
+#: ../meld/dirdiff.py:381
+#: ../meld/preferences.py:82
+msgid "Size"
+msgstr "גודל"
+
+#. Create date-time CellRenderer
+#: ../meld/dirdiff.py:389
+#: ../meld/preferences.py:83
+msgid "Modification time"
+msgstr "זמן שינוי אחרון"
+
+#. Create permissions CellRenderer
+#: ../meld/dirdiff.py:397
+#: ../meld/preferences.py:84
+msgid "Permissions"
+msgstr "הרשאות"
+
+#: ../meld/dirdiff.py:543
+#, python-format
+msgid "Hide %s"
+msgstr "הסתרת %s"
+
+#: ../meld/dirdiff.py:672
+#: ../meld/dirdiff.py:694
+#, python-format
+msgid "[%s] Scanning %s"
+msgstr "‏[%s] סורק את %s"
+
+#: ../meld/dirdiff.py:823
+#, python-format
+msgid "[%s] Done"
+msgstr "‏[%s] הסתיים"
+
+#: ../meld/dirdiff.py:830
+msgid "Multiple errors occurred while scanning this folder"
+msgstr "אירעו מספר שגיאות בעת סריקת תיקייה זו"
+
+#: ../meld/dirdiff.py:831
+msgid "Files with invalid encodings found"
+msgstr "נמצאו קבצים בעלי קידוד לא תקין"
+
+#. TRANSLATORS: This is followed by a list of files
+#: ../meld/dirdiff.py:833
+msgid "Some files were in an incorrect encoding. The names are something like:"
+msgstr "לקבצים אחדים היה קידוד שגוי. השמות הם משהו כמו:"
+
+#: ../meld/dirdiff.py:835
+msgid "Files hidden by case insensitive comparison"
+msgstr "קבצים שמוסתרים על־ידי השוואה שמתעלמת מרישיות האותיות"
+
+#. TRANSLATORS: This is followed by a list of files
+#: ../meld/dirdiff.py:837
+msgid "You are running a case insensitive comparison on a case sensitive filesystem. The following files in this folder are hidden:"
+msgstr "ההשוואה מתעלמת מרישיות האותיות בשמות קבצים אך היא תרוץ על־גבי מערכת קבצים רגישה לרישיות. הקבצים הבאים בתיקיה זו מוסתרים:"
+
+#: ../meld/dirdiff.py:848
+#, python-format
+msgid "'%s' hidden by '%s'"
+msgstr "‏'%s' מוסתר על־ידי '%s'"
+
+#: ../meld/dirdiff.py:873
+#: ../meld/filediff.py:1124
+#: ../meld/filediff.py:1275
+#: ../meld/filediff.py:1451
+#: ../meld/filediff.py:1481
+#: ../meld/filediff.py:1483
+msgid "Hi_de"
+msgstr "הסת_רה"
+
+#: ../meld/dirdiff.py:904
+#, python-format
+msgid ""
+"'%s' exists.\n"
+"Overwrite?"
+msgstr ""
+"הקובץ '%s' כבר קיים.\n"
+"האם להחליפו?"
+
+#: ../meld/dirdiff.py:912
+msgid "Error copying file"
+msgstr "אירעה שגיאה בעת העתקת קובץ"
+
+#: ../meld/dirdiff.py:913
+#, python-format
+msgid ""
+"Couldn't copy %s\n"
+"to %s.\n"
+"\n"
+"%s"
+msgstr ""
+"לא ניתן להעתיק את %s\n"
+"אל %s\n"
+"\n"
+"‏%s"
+
+#: ../meld/dirdiff.py:936
+#, python-format
+msgid "Error deleting %s"
+msgstr "אירעה תקלה בעת מחיקת %s"
+
+#: ../meld/filediff.py:243
+msgid "Format as Patch..."
+msgstr "יצירת טלאי..."
+
+#: ../meld/filediff.py:244
+msgid "Create a patch using differences between files"
+msgstr "יצירת טלאי מתוך ההבדלים בין הקבצים"
+
+#: ../meld/filediff.py:246
+msgid "Save A_ll"
+msgstr "שמירת ה_כל"
+
+#: ../meld/filediff.py:247
+msgid "Save all files in the current comparison"
+msgstr "שמירת כל הקבצים בהשוואה הנוכחית"
+
+#: ../meld/filediff.py:250
+msgid "Revert files to their saved versions"
+msgstr "שחזור הקבצים לגרסות השמורות"
+
+#: ../meld/filediff.py:252
+msgid "Add Synchronization Point"
+msgstr "הוספת נקודת סנכרון"
+
+#: ../meld/filediff.py:253
+msgid "Add a manual point for synchronization of changes between files"
+msgstr "הוספת נקודה ידנית לסנכרון ההבדלים בין הקבצים"
+
+#: ../meld/filediff.py:256
+msgid "Clear Synchronization Points"
+msgstr "הסרת כל נקודות הסנכרון"
+
+#: ../meld/filediff.py:257
+msgid "Clear manual change sychronization points"
+msgstr "הסרת נקודות סנכרון השינויים הידניות"
+
+#: ../meld/filediff.py:259
+msgid "Previous Conflict"
+msgstr "ההתנגשות הקודמת"
+
+#: ../meld/filediff.py:260
+msgid "Go to the previous conflict"
+msgstr "מעבר להתנגשות הקודמת"
+
+#: ../meld/filediff.py:262
+msgid "Next Conflict"
+msgstr "ההתנגשות הבאה"
+
+#: ../meld/filediff.py:263
+msgid "Go to the next conflict"
+msgstr "מעבר להתנגשות הבאה"
+
+#: ../meld/filediff.py:265
+msgid "Push to Left"
+msgstr "דחיפה לשמאל"
+
+#: ../meld/filediff.py:266
+msgid "Push current change to the left"
+msgstr "דחיפת השינוי הנוכחי לחלונית השמאלית"
+
+#: ../meld/filediff.py:269
+msgid "Push to Right"
+msgstr "דחיפה לימין"
+
+#: ../meld/filediff.py:270
+msgid "Push current change to the right"
+msgstr "דחיפת השינוי הנוכחי לחלונית הימנית"
+
+#: ../meld/filediff.py:274
+msgid "Pull from Left"
+msgstr "משיכה משמאל"
+
+#: ../meld/filediff.py:275
+msgid "Pull change from the left"
+msgstr "משיכת השינוי מהחלונית השמאלית"
+
+#: ../meld/filediff.py:278
+msgid "Pull from Right"
+msgstr "משיכה מימין"
+
+#: ../meld/filediff.py:279
+msgid "Pull change from the right"
+msgstr "משיכת השינוי מהחלונית הימנית"
+
+#: ../meld/filediff.py:281
+msgid "Copy Above Left"
+msgstr "העתקה מעל שמאל"
+
+#: ../meld/filediff.py:282
+msgid "Copy change above the left chunk"
+msgstr "הדבקת השינוי מעל הגוש בחלונית השמאלית"
+
+#: ../meld/filediff.py:284
+msgid "Copy Below Left"
+msgstr "העתקה מתחת לשמאל"
+
+#: ../meld/filediff.py:285
+msgid "Copy change below the left chunk"
+msgstr "הדבקת השינוי מתחת לגוש בחלונית השמאלית"
+
+#: ../meld/filediff.py:287
+msgid "Copy Above Right"
+msgstr "העתקה מעל ימין"
+
+#: ../meld/filediff.py:288
+msgid "Copy change above the right chunk"
+msgstr "הדבקת השינוי מעל הגוש בחלונית הימנית"
+
+#: ../meld/filediff.py:290
+msgid "Copy Below Right"
+msgstr "העתקה מתחת לימין"
+
+#: ../meld/filediff.py:291
+msgid "Copy change below the right chunk"
+msgstr "הדבקת השינוי מתחת לגוש בחלונית הימנית"
+
+#: ../meld/filediff.py:293
+msgid "Delete"
+msgstr "מחיקה"
+
+#: ../meld/filediff.py:294
+msgid "Delete change"
+msgstr "מחיקת השינוי"
+
+#: ../meld/filediff.py:296
+msgid "Merge All from Left"
+msgstr "מיזוג כל השינויים משמאל"
+
+#: ../meld/filediff.py:297
+msgid "Merge all non-conflicting changes from the left"
+msgstr "מיזוג כל השינויים מהחלונית השמאלית שאינם מתנגשים"
+
+#: ../meld/filediff.py:299
+msgid "Merge All from Right"
+msgstr "מיזוג כל השינויים מימין"
+
+#: ../meld/filediff.py:300
+msgid "Merge all non-conflicting changes from the right"
+msgstr "מיזוג כל השינויים מהחלונית הימנית שאינם מתנגשים"
+
+#: ../meld/filediff.py:302
+msgid "Merge All"
+msgstr "מיזוג הכל"
+
+#: ../meld/filediff.py:303
+msgid "Merge all non-conflicting changes from left and right panes"
+msgstr "מיזוג כל השינויים שאינם מתנגשים מהחלוניות הימנית והשמאלית"
+
+#: ../meld/filediff.py:307
+msgid "Cycle Through Documents"
+msgstr "מעבר בין המסמכים"
+
+#: ../meld/filediff.py:308
+msgid "Move keyboard focus to the next document in this comparison"
+msgstr "העברת מיקוד המקלדת למסמך הבא בהשוואה זו"
+
+#: ../meld/filediff.py:314
+msgid "Lock Scrolling"
+msgstr "נעילת הגלילה"
+
+#: ../meld/filediff.py:315
+msgid "Lock scrolling of all panes"
+msgstr "נעילת הגלילה בכל החלוניות"
+
+#. Abbreviations for insert and overwrite that fit in the status bar
+#: ../meld/filediff.py:472
+msgid "INS"
+msgstr "הכנסה"
+
+#: ../meld/filediff.py:472
+msgid "OVR"
+msgstr "דריסה"
+
+#. Abbreviation for line, column so that it will fit in the status bar
+#: ../meld/filediff.py:474
+#, python-format
+msgid "Ln %i, Col %i"
+msgstr "שורה %i, עמודה %i"
+
+#: ../meld/filediff.py:821
+#, python-format
+msgid "Filter '%s' changed the number of lines in the file. Comparison will be incorrect. See the user manual for more details."
+msgstr "המסנן '%s' שינה את מספר השורות בקובץ. ההשוואה תהיה שגויה. ניתן לעיין במדריך המשתמש לפרטים נוספים."
+
+#: ../meld/filediff.py:890
+msgid "Mark conflict as resolved?"
+msgstr "האם לסמן את ההתנגשות כפתורה?"
+
+#: ../meld/filediff.py:892
+msgid "If the conflict was resolved successfully, you may mark it as resolved now."
+msgstr "אם ההתנגשות נפתרה בהצלחה, ניתן כעת לסמן אותה כפתורה."
+
+#: ../meld/filediff.py:894
+msgid "Cancel"
+msgstr "ביטול"
+
+#: ../meld/filediff.py:895
+msgid "Mark _Resolved"
+msgstr "סימון התנגשות כ_פתורה"
+
+#: ../meld/filediff.py:1111
+#, python-format
+msgid "[%s] Set num panes"
+msgstr "‏[%s] קובע את מספר החלוניות"
+
+#: ../meld/filediff.py:1118
+#, python-format
+msgid "[%s] Opening files"
+msgstr "‏[%s] פותח קבצים"
+
+#: ../meld/filediff.py:1141
+#: ../meld/filediff.py:1151
+#: ../meld/filediff.py:1164
+#: ../meld/filediff.py:1170
+msgid "Could not read file"
+msgstr "לא ניתן לקרוא את הקובץ"
+
+#: ../meld/filediff.py:1142
+#, python-format
+msgid "[%s] Reading files"
+msgstr "‏[%s] קורא את הקבצים"
+
+#: ../meld/filediff.py:1152
+#, python-format
+msgid "%s appears to be a binary file."
+msgstr "נראה שהקובץ %s אינו קובץ טקסט."
+
+#: ../meld/filediff.py:1165
+#, python-format
+msgid "%s is not in encodings: %s"
+msgstr "‏%s אינו אחד מהקידודים: %s"
+
+#: ../meld/filediff.py:1203
+#, python-format
+msgid "[%s] Computing differences"
+msgstr "‏[%s] מאתר הבדלים"
+
+#: ../meld/filediff.py:1270
+#, python-format
+msgid "File %s has changed on disk"
+msgstr "הקובץ %s השתנה בכונן"
+
+#: ../meld/filediff.py:1271
+msgid "Do you want to reload the file?"
+msgstr "האם לטעון מחדש את הקובץ?"
+
+#: ../meld/filediff.py:1274
+msgid "_Reload"
+msgstr "_טעינה מחדש"
+
+#: ../meld/filediff.py:1440
+msgid "Text filters are being used, and may be masking differences between files. Would you like to compare the unfiltered files?"
+msgstr "הוגדר להשתמש במסנני טקסט, מה שעשוי להסתיר הבדלים בין קבצים. האם להשוות בין הקבצים ללא מסננים?"
+
+#: ../meld/filediff.py:1446
+msgid "Files are identical"
+msgstr "הקבצים זהים"
+
+#: ../meld/filediff.py:1454
+msgid "Show without filters"
+msgstr "הצגה ללא מסננים"
+
+#: ../meld/filediff.py:1476
+msgid "Change highlighting incomplete"
+msgstr "הדגשת השינויים לא הושלמה"
+
+#: ../meld/filediff.py:1477
+msgid "Some changes were not highlighted because they were too large. You can force Meld to take longer to highlight larger changes, though this may be slow."
+msgstr "חלק מהשינויים לא הודגשו משום שהם גדולים מדי. ניתן לאלץ הדגשה של שינויים אלה, אך פעולה זו עשויה להיות איטית."
+
+#: ../meld/filediff.py:1485
+msgid "Keep highlighting"
+msgstr "שמירת ההדגשה"
+
+#: ../meld/filediff.py:1487
+msgid "_Keep highlighting"
+msgstr "_שמירת ההדגשה"
+
+#: ../meld/filediff.py:1618
+#, python-format
+msgid ""
+"\"%s\" exists!\n"
+"Overwrite?"
+msgstr ""
+"הקובץ \"%s\" כבר קיים!\n"
+"האם להחליפו?"
+
+#: ../meld/filediff.py:1631
+#, python-format
+msgid ""
+"Error writing to %s\n"
+"\n"
+"%s."
+msgstr ""
+"אירעה שגיאה בעת כתיבה לקובץ %s\n"
+"\n"
+"‏%s."
+
+#: ../meld/filediff.py:1642
+msgid "Save Left Pane As"
+msgstr "שמירת החלונית הימנית בשם"
+
+#: ../meld/filediff.py:1644
+msgid "Save Middle Pane As"
+msgstr "שמירת החלונית האמצעית בשם"
+
+#: ../meld/filediff.py:1646
+msgid "Save Right Pane As"
+msgstr "שמירת החלונית השמאלית בשם"
+
+#: ../meld/filediff.py:1659
+#, python-format
+msgid "File %s has changed on disk since it was opened"
+msgstr "הקובץ %s השתנה על־גבי הכונן מאז שנפתח"
+
+#: ../meld/filediff.py:1661
+msgid "If you save it, any external changes will be lost."
+msgstr "אם הקובץ יישמר, שינויים חיצוניים אלה יאבדו."
+
+#: ../meld/filediff.py:1664
+msgid "Save Anyway"
+msgstr "שמירה בכל־זאת"
+
+#: ../meld/filediff.py:1665
+msgid "Don't Save"
+msgstr "ביטול"
+
+#: ../meld/filediff.py:1689
+#, python-format
+msgid ""
+"This file '%s' contains a mixture of line endings.\n"
+"\n"
+"Which format would you like to use?"
+msgstr ""
+"קובץ זה ('%s') מכיל מספר תווי סוף שורה שונים.\n"
+"\n"
+"באיזה סוג סוף שורה להשתמש?"
+
+#: ../meld/filediff.py:1705
+#, python-format
+msgid ""
+"'%s' contains characters not encodable with '%s'\n"
+"Would you like to save as UTF-8?"
+msgstr ""
+"הקובץ '%s' מכיל תווים שאינם ניתנים לייצוג בקידוד '%s'\n"
+"האם לשמור בקידוד UTF-8?"
+
+#: ../meld/filediff.py:2068
+msgid "Live comparison updating disabled"
+msgstr "עדכון השוואה אוטומטי כבוי"
+
+#: ../meld/filediff.py:2069
+msgid "Live updating of comparisons is disabled when synchronization points are active. You can still manually refresh the comparison, and live updates will resume when synchronization points are cleared."
+msgstr "עדכון ההשוואה האוטומטי כבוי כאשר יש נקודות סנכרון פעילות. ניתן לרענן ידנית את ההשוואה, והעדכון האוטומטי יאופשר כאשר נקודות הסנכרון יוסרו."
+
+#: ../meld/filemerge.py:48
+#, python-format
+msgid "[%s] Merging files"
+msgstr "‏[%s] ממזג קבצים"
+
+#: ../meld/gutterrendererchunk.py:90
+msgid "Copy _up"
+msgstr "העתקה מ_עלה"
+
+#: ../meld/gutterrendererchunk.py:91
+msgid "Copy _down"
+msgstr "העתקה מ_טה"
+
+#: ../meld/meldapp.py:170
+msgid "wrong number of arguments supplied to --diff"
+msgstr "ניתן ל־‎--diff מספר ארגומנטים שגוי"
+
+#: ../meld/meldapp.py:175
+msgid "Start with an empty window"
+msgstr "פתיחת חלון ריק"
+
+#: ../meld/meldapp.py:176
+#: ../meld/meldapp.py:178
+msgid "file"
+msgstr "קובץ"
+
+#: ../meld/meldapp.py:176
+#: ../meld/meldapp.py:180
+msgid "folder"
+msgstr "תיקייה"
+
+#: ../meld/meldapp.py:177
+msgid "Start a version control comparison"
+msgstr "פתיחת השוואה מבוקרת גרסה"
+
+#: ../meld/meldapp.py:179
+msgid "Start a 2- or 3-way file comparison"
+msgstr "פתיחת השוואת 2 או 3 קבצים"
+
+#: ../meld/meldapp.py:181
+msgid "Start a 2- or 3-way folder comparison"
+msgstr "פתיחת השוואת 2 או 3 תיקיות"
+
+#: ../meld/meldapp.py:224
+#, python-format
+msgid "Error: %s\n"
+msgstr "שגיאה: %s\n"
+
+#: ../meld/meldapp.py:231
+msgid "Meld is a file and directory comparison tool."
+msgstr "‏Meld הוא כלי להשוואת קבצים ותיקיות."
+
+#: ../meld/meldapp.py:235
+msgid "Set label to use instead of file name"
+msgstr "קביעת תווית לשימוש במקום שם הקובץ"
+
+#: ../meld/meldapp.py:238
+msgid "Open a new tab in an already running instance"
+msgstr "פתיחת לשונית חדשה ביישום שכבר רץ"
+
+#: ../meld/meldapp.py:241
+msgid "Automatically compare all differing files on startup"
+msgstr "השוואה אוטומטית של כל הקבצים השונים בעת עליית היישום"
+
+#: ../meld/meldapp.py:244
+msgid "Ignored for compatibility"
+msgstr "אינו עושה דבר, נותר לצורך תאימות"
+
+#: ../meld/meldapp.py:248
+msgid "Set the target file for saving a merge result"
+msgstr "קביעת קובץ המטרה לשמירת תוצאת מיזוג"
+
+#: ../meld/meldapp.py:251
+msgid "Automatically merge files"
+msgstr "מיזוג קבצים אוטומטי"
+
+#: ../meld/meldapp.py:255
+msgid "Load a saved comparison from a Meld comparison file"
+msgstr "טעינת השוואה שמורה מתוך קובץ השוואה של Meld"
+
+#: ../meld/meldapp.py:259
+msgid "Create a diff tab for the supplied files or folders"
+msgstr "יצירת לשוניות השוואה עבור הקבצים או התיקיות הנתונים"
+
+#: ../meld/meldapp.py:279
+#, python-format
+msgid "too many arguments (wanted 0-3, got %d)"
+msgstr "יותר מדי ארגומנטים (התבקשו 0-3, התקבלו %d)"
+
+#: ../meld/meldapp.py:282
+msgid "can't auto-merge less than 3 files"
+msgstr "לא ניתן למזג אוטומטית פחות מ־3 קבצים"
+
+#: ../meld/meldapp.py:284
+msgid "can't auto-merge directories"
+msgstr "לא ניתן למזג אוטומטית תיקיות"
+
+#: ../meld/meldapp.py:298
+msgid "Error reading saved comparison file"
+msgstr "אירעה שגיאה בעת קריאת קובץ השוואה שמורה"
+
+#. TRANSLATORS: This is the label of a new, currently-unnamed file.
+#: ../meld/meldbuffer.py:131
+msgid "<unnamed>"
+msgstr "<ללא שם>"
+
+#: ../meld/melddoc.py:78
+#: ../meld/melddoc.py:79
+msgid "untitled"
+msgstr "ללא כותרת"
+
+#: ../meld/meldwindow.py:48
+msgid "_File"
+msgstr "_קובץ"
+
+#: ../meld/meldwindow.py:49
+msgid "_New Comparison..."
+msgstr "השוואה _חדשה..."
+
+#: ../meld/meldwindow.py:50
+msgid "Start a new comparison"
+msgstr "השוואה חדשה"
+
+#: ../meld/meldwindow.py:53
+msgid "Save the current file"
+msgstr "שמירת הקובץ הנוכחי"
+
+#: ../meld/meldwindow.py:55
+msgid "Save As..."
+msgstr "שמירה בשם..."
+
+#: ../meld/meldwindow.py:56
+msgid "Save the current file with a different name"
+msgstr "שמירת הקובץ הנוכחי בשם חדש"
+
+#: ../meld/meldwindow.py:59
+msgid "Close the current file"
+msgstr "סגירת הקובץ הנוכחי"
+
+#: ../meld/meldwindow.py:62
+msgid "_Edit"
+msgstr "_עריכה"
+
+#: ../meld/meldwindow.py:64
+msgid "Undo the last action"
+msgstr "ביטול הפעולה האחרונה"
+
+#: ../meld/meldwindow.py:67
+msgid "Redo the last undone action"
+msgstr "ביצוע מחדש של הפעולה האחרונה שבוטלה"
+
+#: ../meld/meldwindow.py:69
+msgid "Cut the selection"
+msgstr "גזירת הבחירה"
+
+#: ../meld/meldwindow.py:71
+msgid "Copy the selection"
+msgstr "העתקת הבחירה"
+
+#: ../meld/meldwindow.py:73
+msgid "Paste the clipboard"
+msgstr "הדבקת לוח הגזירים"
+
+#: ../meld/meldwindow.py:75
+msgid "Find..."
+msgstr "חיפוש..."
+
+#: ../meld/meldwindow.py:75
+msgid "Search for text"
+msgstr "חיפוש טקסט"
+
+#: ../meld/meldwindow.py:77
+msgid "Find Ne_xt"
+msgstr "ה_בא"
+
+#: ../meld/meldwindow.py:78
+msgid "Search forwards for the same text"
+msgstr "חיפוש קדימה של אותו הטקסט"
+
+#: ../meld/meldwindow.py:80
+msgid "Find _Previous"
+msgstr "ה_קודם"
+
+#: ../meld/meldwindow.py:81
+msgid "Search backwards for the same text"
+msgstr "חיפוש לאחור של אותו הטקסט"
+
+#: ../meld/meldwindow.py:84
+msgid "_Replace..."
+msgstr "ה_חלפה..."
+
+#: ../meld/meldwindow.py:85
+msgid "Find and replace text"
+msgstr "מציאה והחלפה של טקסט"
+
+#: ../meld/meldwindow.py:88
+msgid "_Changes"
+msgstr "_שינויים"
+
+#: ../meld/meldwindow.py:89
+msgid "Next Change"
+msgstr "השינוי הבא"
+
+#: ../meld/meldwindow.py:90
+msgid "Go to the next change"
+msgstr "מעבר לשינוי הבא"
+
+#: ../meld/meldwindow.py:92
+msgid "Previous Change"
+msgstr "השינוי הקודם"
+
+#: ../meld/meldwindow.py:93
+msgid "Go to the previous change"
+msgstr "מעבר לשינוי הקודם"
+
+#: ../meld/meldwindow.py:95
+msgid "Open Externally"
+msgstr "פתיחה באמצעות יישום חיצוני"
+
+#: ../meld/meldwindow.py:96
+msgid "Open selected file or directory in the default external application"
+msgstr "פתיחת הקובץ או התיקייה הנבחרים ביישום החיצוני שנבחר כברירת מחדל"
+
+#: ../meld/meldwindow.py:100
+msgid "_View"
+msgstr "_תצוגה"
+
+#: ../meld/meldwindow.py:101
+msgid "File Status"
+msgstr "מצב קובץ"
+
+#: ../meld/meldwindow.py:102
+msgid "Version Status"
+msgstr "מצב הגרסה"
+
+#: ../meld/meldwindow.py:105
+msgid "Stop the current action"
+msgstr "עצירת הפעולה הנוכחית"
+
+#: ../meld/meldwindow.py:108
+msgid "Refresh the view"
+msgstr "רענון התצוגה"
+
+#: ../meld/meldwindow.py:111
+msgid "_Tabs"
+msgstr "_לשוניות"
+
+#: ../meld/meldwindow.py:112
+msgid "_Previous Tab"
+msgstr "הלשונית ה_קודמת"
+
+#: ../meld/meldwindow.py:113
+msgid "Activate previous tab"
+msgstr "בחירת הלשונית הקודמת"
+
+#: ../meld/meldwindow.py:115
+msgid "_Next Tab"
+msgstr "הלשונית ה_באה"
+
+#: ../meld/meldwindow.py:116
+msgid "Activate next tab"
+msgstr "בחירת הלשונית הבאה"
+
+#: ../meld/meldwindow.py:119
+msgid "Move Tab _Left"
+msgstr "הזזת הלשונית _ימינה"
+
+#: ../meld/meldwindow.py:120
+msgid "Move current tab to left"
+msgstr "הזזת הלשונית הנוכחית ימינה"
+
+#: ../meld/meldwindow.py:123
+msgid "Move Tab _Right"
+msgstr "הזזת הלשונית _שמאלה"
+
+#: ../meld/meldwindow.py:124
+msgid "Move current tab to right"
+msgstr "הזזת הלשונית הנוכחית שמאלה"
+
+#: ../meld/meldwindow.py:128
+msgid "Fullscreen"
+msgstr "מסך מלא"
+
+#: ../meld/meldwindow.py:129
+msgid "View the comparison in fullscreen"
+msgstr "הצגת ההשוואה במסך מלא"
+
+#: ../meld/meldwindow.py:131
+msgid "_Toolbar"
+msgstr "סרגל _כלים"
+
+#: ../meld/meldwindow.py:132
+msgid "Show or hide the toolbar"
+msgstr "הצגה או הסתרה של סרגל הכלים"
+
+#: ../meld/meldwindow.py:141
+msgid "Open Recent"
+msgstr "מסמכים אחרונים"
+
+#: ../meld/meldwindow.py:142
+msgid "Open recent files"
+msgstr "פתיחת קבצים אחרונים"
+
+#: ../meld/meldwindow.py:164
+msgid "_Meld"
+msgstr "‏_Meld"
+
+#: ../meld/meldwindow.py:165
+msgid "Quit the program"
+msgstr "סגירת היישום"
+
+#: ../meld/meldwindow.py:167
+msgid "Prefere_nces"
+msgstr "העד_פות"
+
+#: ../meld/meldwindow.py:168
+msgid "Configure the application"
+msgstr "הגדרת היישום"
+
+#: ../meld/meldwindow.py:170
+msgid "_Contents"
+msgstr "_תוכן"
+
+#: ../meld/meldwindow.py:171
+msgid "Open the Meld manual"
+msgstr "פתיחת מדריך המשתמש"
+
+#: ../meld/meldwindow.py:173
+msgid "About this application"
+msgstr "אודות"
+
+#: ../meld/meldwindow.py:546
+msgid "Switch to this tab"
+msgstr "מעבר ללשונית זו"
+
+#: ../meld/meldwindow.py:669
+msgid "Cannot compare a mixture of files and directories"
+msgstr "לא ניתן להשוות בין קבצים לתיקיות"
+
+#. no common path. empty names get changed to "[None]"
+#: ../meld/misc.py:213
+msgid "[None]"
+msgstr "[ללא]"
+
+#: ../meld/preferences.py:33
+msgid "label"
+msgstr "תווית"
+
+#: ../meld/preferences.py:33
+msgid "pattern"
+msgstr "תבנית"
+
+#: ../meld/recent.py:114
+msgid "Version control:"
+msgstr "בקרת גרסות:"
+
+#: ../meld/ui/findbar.py:144
+msgid "Regular expression error"
+msgstr "שגיאה בביטוי רגולרי"
+
+#: ../meld/ui/notebooklabel.py:65
+msgid "Close tab"
+msgstr "סגירת לשונית"
+
+#: ../meld/ui/vcdialogs.py:61
+msgid "No files will be committed"
+msgstr "לא יוגשו קבצים"
+
+#. Translators: First %s is replaced by translated "%d unpushed
+#. commits", second %s is replaced by translated "%d branches"
+#: ../meld/vc/git.py:126
+#, python-format
+msgid "%s in %s"
+msgstr "‏%s ב־%s"
+
+#. Translators: These messages cover the case where there is
+#. only one branch, and are not part of another message.
+#: ../meld/vc/git.py:127
+#: ../meld/vc/git.py:134
+#, python-format
+msgid "%d unpushed commit"
+msgid_plural "%d unpushed commits"
+msgstr[0] "%d הגשה שלא נדחפה"
+msgstr[1] "%d הגשות שלא נדחפו"
+
+#: ../meld/vc/git.py:129
+#, python-format
+msgid "%d branch"
+msgid_plural "%d branches"
+msgstr[0] "%d ענף"
+msgstr[1] "%d ענפים"
+
+#: ../meld/vc/git.py:348
+#, python-format
+msgid "Mode changed from %s to %s"
+msgstr "המצב השתנה מ־%s ל־%s"
+
+#: ../meld/vc/_vc.py:47
+msgid "Merged"
+msgstr "ממוזג"
+
+#: ../meld/vc/_vc.py:47
+msgid "Base"
+msgstr "בסיס"
+
+#: ../meld/vc/_vc.py:47
+msgid "Local"
+msgstr "מקומי"
+
+#: ../meld/vc/_vc.py:47
+msgid "Remote"
+msgstr "מרוחק"
+
+#: ../meld/vc/_vc.py:65
+msgid "Unversioned"
+msgstr "לא מבוקר גרסה"
+
+#: ../meld/vc/_vc.py:68
+msgid "Error"
+msgstr "שגיאה"
+
+#: ../meld/vc/_vc.py:70
+msgid "Newly added"
+msgstr "חדש"
+
+#: ../meld/vc/_vc.py:72
+msgid "Renamed"
+msgstr "בעל שם חדש"
+
+#: ../meld/vc/_vc.py:73
+msgid "Conflict"
+msgstr "התנגשות"
+
+#: ../meld/vc/_vc.py:74
+msgid "Removed"
+msgstr "מוסר"
+
+#: ../meld/vc/_vc.py:75
+msgid "Missing"
+msgstr "חסר"
+
+#: ../meld/vc/_vc.py:76
+msgid "Not present"
+msgstr "לא נמצא"
+
+#: ../meld/vcview.py:233
+#: ../meld/vcview.py:417
+msgid "Location"
+msgstr "מיקום"
+
+#: ../meld/vcview.py:234
+msgid "Status"
+msgstr "מצב"
+
+#: ../meld/vcview.py:235
+msgid "Revision"
+msgstr "מהדורה"
+
+#: ../meld/vcview.py:236
+msgid "Options"
+msgstr "אפשרויות"
+
+#. TRANSLATORS: this is an error message when a version control
+#. application isn't installed or can't be found
+#: ../meld/vcview.py:324
+#, python-format
+msgid "%s not installed"
+msgstr "‏%s אינו מותקן"
+
+#. TRANSLATORS: this is an error message when a version
+#. controlled repository is invalid or corrupted
+#: ../meld/vcview.py:328
+msgid "Invalid repository"
+msgstr "מאגר מבוקר גרסה לא תקין"
+
+#: ../meld/vcview.py:337
+#, python-format
+msgid "%s (%s)"
+msgstr "‏%s ‏(%s)"
+
+#: ../meld/vcview.py:339
+#: ../meld/vcview.py:347
+msgid "None"
+msgstr "ללא"
+
+#: ../meld/vcview.py:358
+msgid "No valid version control system found in this folder"
+msgstr "לא נמצאה מערכת בקרת גרסות תקינה בתיקייה זו"
+
+#: ../meld/vcview.py:360
+msgid "Only one version control system found in this folder"
+msgstr "נמצאה רק מערכת בקרת גרסות אחת בתיקיה זו"
+
+#: ../meld/vcview.py:362
+msgid "Choose which version control system to use"
+msgstr "יש לבחור באיזו מערכת בקרת גרסות להשתמש"
+
+#. TRANSLATORS: This is the location of the directory the user is diffing
+#: ../meld/vcview.py:417
+#, python-format
+msgid "%s: %s"
+msgstr "‏%s: ‏%s"
+
+#: ../meld/vcview.py:431
+#: ../meld/vcview.py:439
+#, python-format
+msgid "Scanning %s"
+msgstr "סורק את %s"
+
+#: ../meld/vcview.py:479
+msgid "(Empty)"
+msgstr "(ריק)"
+
+#: ../meld/vcview.py:522
+#, python-format
+msgid "%s — local"
+msgstr "‏%s — מקומי"
+
+#: ../meld/vcview.py:523
+#, python-format
+msgid "%s — remote"
+msgstr "‏%s — מרוחק"
+
+#: ../meld/vcview.py:531
+#, python-format
+msgid "%s (local, merge, remote)"
+msgstr "%s (מרוחק, ממוזג, מקומי)"
+
+#: ../meld/vcview.py:536
+#, python-format
+msgid "%s (remote, merge, local)"
+msgstr "%s (מקומי, ממוזג, מרוחק)"
+
+#: ../meld/vcview.py:547
+#, python-format
+msgid "%s — repository"
+msgstr "‏%s — מאגר"
+
+#: ../meld/vcview.py:553
+#, python-format
+msgid "%s (working, repository)"
+msgstr "%s (מאגר, מקומי)"
+
+#: ../meld/vcview.py:557
+#, python-format
+msgid "%s (repository, working)"
+msgstr "%s (מקומי, מאגר)"
+
+#: ../meld/vcview.py:741
+msgid "Remove folder and all its files?"
+msgstr "האם להסיר את התיקייה ואת כל הקבצים שבתוכה?"
+
+#: ../meld/vcview.py:743
+msgid "This will remove all selected files and folders, and all files within any selected folders, from version control."
+msgstr "פעולה זו תסיר מבקרת הגרסות את כל הקבצים והתיקיות הנבחרים, ואת כל הקבצים שבתוך התיקיות הנבחרות."
+
+#: ../meld/vcview.py:777
+#, python-format
+msgid "Error removing %s"
+msgstr "אירעה תקלה בעת הסרת %s"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Some files have been modified.\n"
+#~ "Which ones would you like to save?</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">במהלך העבודה השתנו קבצים אחדים.\n"
+#~ "איזה מהם לשמור?</span>"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "_התעלמות משינויים"
+
+#~ msgid "_Save Selected"
+#~ msgstr "_שמירת אלו שנבחרו"
+
+#~ msgid "_Search for"
+#~ msgstr "ח_יפוש"
+
+#~ msgid "Choose Files"
+#~ msgstr "בחירת קבצים"
+
+#~ msgid "Directory"
+#~ msgstr "תיקיה"
+
+#~ msgid "Original"
+#~ msgstr "מקורי"
+
+#~ msgid "Other"
+#~ msgstr "אחר"
+
+#~ msgid "<b>Font</b>"
+#~ msgstr "<b>גופן</b>"
+
+#~ msgid "<b>Loading</b>"
+#~ msgstr "<b>טעינה</b>"
+
+#~ msgid "Encoding"
+#~ msgstr "קידוד"
+
+#~ msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
+#~ msgstr ""
+#~ "כאשר התוכנה נטענת, יתבצע ניסיון לפתוח את הקבצים עם הקידודים הללו, לפי "
+#~ "הסדר (לדוגמה, utf8, iso8859)"
+
+#~ msgid "Compare Options"
+#~ msgstr "אפשרויות השוואה"
+
+#~ msgid "Date"
+#~ msgstr "תאריך"
+
+#~ msgid "Left"
+#~ msgstr "שמאל"
+
+#~ msgid "Right"
+#~ msgstr "ימין"
+
+#~ msgid "%i second"
+
+#~ msgid_plural "%i seconds"
+#~ msgstr[0] "שניה %i"
+#~ msgstr[1] "%i שניות"
+
+#~ msgid "%i minute"
+
+#~ msgid_plural "%i minutes"
+#~ msgstr[0] "דקה %i"
+#~ msgstr[1] "%i דקות"
+
+#~ msgid "%i hour"
+
+#~ msgid_plural "%i hours"
+#~ msgstr[0] "שעה %i"
+#~ msgstr[1] "%i שעות"
+
+#~ msgid "%i day"
+
+#~ msgid_plural "%i days"
+#~ msgstr[0] "יום %i"
+#~ msgstr[1] "%i ימים"
+
+#~ msgid "%i week"
+
+#~ msgid_plural "%i weeks"
+#~ msgstr[0] "שבוע %i"
+#~ msgstr[1] "%i שבועות"
+
+#~ msgid "%i month"
+
+#~ msgid_plural "%i months"
+#~ msgstr[0] "חודש %i"
+#~ msgstr[1] "%i חודשים"
+
+#~ msgid "%i year"
+
+#~ msgid_plural "%i years"
+#~ msgstr[0] "שנה %i"
+#~ msgstr[1] "%i שנים"
+
+#~ msgid "Merge all non-conflicting"
+#~ msgstr "מיזוג כל אלו שאינם מתנגשים"
+
+#~ msgid "_New..."
+#~ msgstr "_חדש..."
+
+#~ msgid "Report _Bug"
+#~ msgstr "דיווח _באג"
+
+#~ msgid "Report a bug in Meld"
+#~ msgstr "דיווח באג ב־Meld"
+
+#~ msgid "dir"
+#~ msgstr "תיקיה"
+
+#~ msgid "Regex"
+#~ msgstr "ביטוי רגלטורי"
+
+#~ msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
+#~ msgstr "גיבויים\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
+
+#~ msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
+#~ msgstr "בינאריים\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
+
+#~ msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
+#~ msgstr "מדיה\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
+
+#~ msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
+#~ msgstr "מילת מפתח ל־CVS\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
+
+#~ msgid "C++ comment\t0\t//.*\n"
+#~ msgstr "הערה של C++\t0\t//.*\n"
+
+#~ msgid "C comment\t0\t/\\*.*?\\*/\n"
+#~ msgstr "הערה של C\t0\t/\\*.*?\\*/\n"
+
+#~ msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n"
+#~ msgstr "כל הרווחים\t0\t[ \\t\\r\\f\\v]*\n"
+
+#~ msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n"
+#~ msgstr "רווחים בהתחלה\t0\t^[ \\t\\r\\f\\v]*\n"
+
+#~ msgid "Script comment\t0\t#.*"
+#~ msgstr "הערות תסריט\t0\t#.*"
+
+#~ msgid "Update"
+#~ msgstr "עדכון"
+
+#~ msgid "Add to VC"
+#~ msgstr "הוספה ל־ֱֻ"
+
+#~ msgid "Add _Binary"
+#~ msgstr "הוספת _בינארי"
+
+#~ msgid "Add binary to VC"
+#~ msgstr "הוספת בינארי ל־VC"
+
+#~ msgid "Delete locally"
+#~ msgstr "מחיקה מקומית"
+
+#~ msgid "_Browse..."
+#~ msgstr "_עיון"
+
+#~ msgid "Path"
+#~ msgstr "נתיב"
+
+#~ msgid "Path to file"
+#~ msgstr "נתיב לקובץ"

=== modified file 'po/id.po'
--- po/id.po	2014-05-26 10:25:13 +0000
+++ po/id.po	2014-09-19 21:51:35 +0000
@@ -8,8 +8,8 @@
 "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=meld&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-03-30 10:16+0000\n"
-"PO-Revision-Date: 2014-03-30 18:02+0700\n"
+"POT-Creation-Date: 2014-09-05 09:45+0000\n"
+"PO-Revision-Date: 2014-09-06 13:21+0700\n"
 "Last-Translator: Andika Triwidada <[e-mail]>\n"
 "Language-Team: Indonesian <[e-mail]>\n"
 "Language: id\n"
@@ -17,18 +17,18 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.7\n"
+"X-Generator: Poedit 1.6.9\n"
 
-#: ../bin/meld:134
+#: ../bin/meld:138
 msgid "Cannot import: "
 msgstr "Tak bisa mengimpor:"
 
-#: ../bin/meld:137
+#: ../bin/meld:141
 #, c-format
 msgid "Meld requires %s or higher."
 msgstr "Meld memerlukan %s atau lebih tinggi."
 
-#: ../bin/meld:141
+#: ../bin/meld:145
 msgid "Meld does not support Python 3."
 msgstr "Meld tidak mendukung Python 3."
 
@@ -78,26 +78,30 @@
 msgstr "Ukuran jendela baku"
 
 #: ../data/org.gnome.meld.gschema.xml.h:2
+msgid "Default window state"
+msgstr "Keadaan jendela baku"
+
+#: ../data/org.gnome.meld.gschema.xml.h:3
 msgid "Show toolbar"
 msgstr "Tampilkan bilah alat"
 
-#: ../data/org.gnome.meld.gschema.xml.h:3
+#: ../data/org.gnome.meld.gschema.xml.h:4
 msgid "If true, the window toolbar is visible."
 msgstr "Bila berisi true, bilah alat jendela tampak."
 
-#: ../data/org.gnome.meld.gschema.xml.h:4
+#: ../data/org.gnome.meld.gschema.xml.h:5
 msgid "Show statusbar"
 msgstr "Tampilkan bilah status"
 
-#: ../data/org.gnome.meld.gschema.xml.h:5
+#: ../data/org.gnome.meld.gschema.xml.h:6
 msgid "If true, the window statusbar is visible."
 msgstr "Bila berisi true, bilah status jendela tampak."
 
-#: ../data/org.gnome.meld.gschema.xml.h:6
+#: ../data/org.gnome.meld.gschema.xml.h:7
 msgid "Automatically detected text encodings"
 msgstr "Enkoding teks yang dideteksi secara otomatis "
 
-#: ../data/org.gnome.meld.gschema.xml.h:7
+#: ../data/org.gnome.meld.gschema.xml.h:8
 msgid ""
 "These text encodings will be automatically used (in order) to try to decode "
 "loaded text files."
@@ -105,39 +109,39 @@
 "Enkoding teks ini akan dipakai secara otomatis (sesuai urutan) untuk mencoba "
 "mendekode berkas teks yang dimuat."
 
-#: ../data/org.gnome.meld.gschema.xml.h:8
+#: ../data/org.gnome.meld.gschema.xml.h:9
 msgid "Width of an indentation step"
 msgstr "Lebar langkah indentasi"
 
-#: ../data/org.gnome.meld.gschema.xml.h:9
+#: ../data/org.gnome.meld.gschema.xml.h:10
 msgid "The number of spaces to use for a single indent step"
 msgstr "Banyaknya spasi yang dipakai untuk langkah indentasi tunggal"
 
-#: ../data/org.gnome.meld.gschema.xml.h:10
+#: ../data/org.gnome.meld.gschema.xml.h:11
 msgid "Whether to indent using spaces or tabs"
 msgstr "Apakah indentasi memakai spasi atau tab"
 
-#: ../data/org.gnome.meld.gschema.xml.h:11
+#: ../data/org.gnome.meld.gschema.xml.h:12
 msgid "If true, any new indentation will use spaces instead of tabs."
 msgstr ""
 "Bila berisi true, sebarang indentasi baru akan memakai spasi sebagai ganti "
 "tab."
 
-#: ../data/org.gnome.meld.gschema.xml.h:12
+#: ../data/org.gnome.meld.gschema.xml.h:13
 msgid "Show line numbers"
 msgstr "Tampilkan nomor baris"
 
-#: ../data/org.gnome.meld.gschema.xml.h:13
+#: ../data/org.gnome.meld.gschema.xml.h:14
 msgid "If true, line numbers will be shown in the gutter of file comparisons."
 msgstr ""
 "Bila berisi true, nomor baris akan ditampilkan dalam parit perbandingan "
 "berkas."
 
-#: ../data/org.gnome.meld.gschema.xml.h:14
+#: ../data/org.gnome.meld.gschema.xml.h:15
 msgid "Highlight syntax"
 msgstr "Sorot sintaks"
 
-#: ../data/org.gnome.meld.gschema.xml.h:15
+#: ../data/org.gnome.meld.gschema.xml.h:16
 msgid ""
 "Whether to highlight syntax in comparisons. Because of Meld's own color "
 "highlighting, this is off by default."
@@ -145,11 +149,11 @@
 "Apakah menyorot sintaks dalam perbandingan. Karena warna penyorotan milik "
 "Meld, ini secara baku mati."
 
-#: ../data/org.gnome.meld.gschema.xml.h:16
+#: ../data/org.gnome.meld.gschema.xml.h:17
 msgid "Displayed whitespace"
 msgstr "Whitespace yang ditampilkan"
 
-#: ../data/org.gnome.meld.gschema.xml.h:17
+#: ../data/org.gnome.meld.gschema.xml.h:18
 msgid ""
 "Selector for individual whitespace character types to be shown. Possible "
 "values are 'space', 'tab', 'newline' and 'nbsp'."
@@ -158,11 +162,11 @@
 "yang mungkin adalah 'space' (spasi), 'tab', 'newline' (baris baru), dan "
 "'nbsp' (spasi tak putus)."
 
-#: ../data/org.gnome.meld.gschema.xml.h:18
+#: ../data/org.gnome.meld.gschema.xml.h:19
 msgid "Wrap mode"
 msgstr "Mode lipat"
 
-#: ../data/org.gnome.meld.gschema.xml.h:19
+#: ../data/org.gnome.meld.gschema.xml.h:20
 msgid ""
 "Lines in file comparisons will be wrapped according to this setting, either "
 "not at all ('none'), at any character ('char') or only at the end of words "
@@ -172,11 +176,11 @@
 "tidak sedikitpun ('none'), pada sebarang karakter ('char'), atau hanya pada "
 "akhir kata ('word')."
 
-#: ../data/org.gnome.meld.gschema.xml.h:20
+#: ../data/org.gnome.meld.gschema.xml.h:21
 msgid "Highlight current line"
 msgstr "Sorot baris saat ini"
 
-#: ../data/org.gnome.meld.gschema.xml.h:21
+#: ../data/org.gnome.meld.gschema.xml.h:22
 msgid ""
 "If true, the line containing the cursor will be highlighted in file "
 "comparisons."
@@ -184,11 +188,11 @@
 "Bila berisi true, baris yang memuat kursor akan disorot dalam perbandingan "
 "berkas."
 
-#: ../data/org.gnome.meld.gschema.xml.h:22
+#: ../data/org.gnome.meld.gschema.xml.h:23
 msgid "Use the system default monospace font"
 msgstr "Gunakan fonta monospace bawaan sistem"
 
-#: ../data/org.gnome.meld.gschema.xml.h:23
+#: ../data/org.gnome.meld.gschema.xml.h:24
 msgid ""
 "If false, the defined custom font will be used instead of the system "
 "monospace font."
@@ -196,11 +200,11 @@
 "Bila berisi false, fonta ubahan yang didefinisikan akan dipakai sebagai "
 "ganti fonta monospace sistem."
 
-#: ../data/org.gnome.meld.gschema.xml.h:24
+#: ../data/org.gnome.meld.gschema.xml.h:25
 msgid "Custom font"
 msgstr "Fonta ubahan"
 
-#: ../data/org.gnome.meld.gschema.xml.h:25
+#: ../data/org.gnome.meld.gschema.xml.h:26
 msgid ""
 "The custom font to use, stored as a string and parsed as a Pango font "
 "description."
@@ -208,22 +212,22 @@
 "Fonta ubahan yang dipakai, disimpan sebagai suatu string dan diurai sebagai "
 "suatu deskripsi fonta Pango."
 
-#: ../data/org.gnome.meld.gschema.xml.h:26
+#: ../data/org.gnome.meld.gschema.xml.h:27
 msgid "Ignore blank lines when comparing files"
 msgstr "Abaikan baris kosong ketika membandingkan berkas"
 
-#: ../data/org.gnome.meld.gschema.xml.h:27
+#: ../data/org.gnome.meld.gschema.xml.h:28
 msgid ""
 "If true, blank lines will be trimmed when highlighting changes between files."
 msgstr ""
 "Bila berisi true, baris-baris kosong akan dibuang ketika menyorot perubahan "
 "antar berkas."
 
-#: ../data/org.gnome.meld.gschema.xml.h:28
+#: ../data/org.gnome.meld.gschema.xml.h:29
 msgid "Use the system default editor"
 msgstr "Gunakan penyunting bawaan sistem"
 
-#: ../data/org.gnome.meld.gschema.xml.h:29
+#: ../data/org.gnome.meld.gschema.xml.h:30
 msgid ""
 "If false, the defined custom editor will be used instead of the system "
 "editor when opening files externally."
@@ -231,11 +235,11 @@
 "Bila berisi false, penyunting ubahan yang didefinisikan akan dipakai sebagai "
 "ganti penyunting sistem ketika membuka berkas secara eksternal."
 
-#: ../data/org.gnome.meld.gschema.xml.h:30
+#: ../data/org.gnome.meld.gschema.xml.h:31
 msgid "The custom editor launch command"
 msgstr "Perintah peluncuran penyunting ubahan"
 
-#: ../data/org.gnome.meld.gschema.xml.h:31
+#: ../data/org.gnome.meld.gschema.xml.h:32
 msgid ""
 "The command used to launch a custom editor. Some limited templating is "
 "supported here; at the moment '{file}' and '{line}' are recognised tokens."
@@ -244,11 +248,11 @@
 "penemplatan yang terbatas didukung di sini; saat ini '{file}' dan '{line}' "
 "adalah token yang dikenal."
 
-#: ../data/org.gnome.meld.gschema.xml.h:32
+#: ../data/org.gnome.meld.gschema.xml.h:33
 msgid "Columns to display"
 msgstr "Kolom yang akan ditampilkan"
 
-#: ../data/org.gnome.meld.gschema.xml.h:33
+#: ../data/org.gnome.meld.gschema.xml.h:34
 msgid ""
 "List of column names in folder comparison and whether they should be "
 "displayed."
@@ -256,11 +260,11 @@
 "Daftar nama kolom dalam perbandingan folder dan apakah mereka mesti "
 "ditampilkan."
 
-#: ../data/org.gnome.meld.gschema.xml.h:34 ../data/ui/preferences.ui.h:28
+#: ../data/org.gnome.meld.gschema.xml.h:35 ../data/ui/preferences.ui.h:30
 msgid "Ignore symbolic links"
 msgstr "Abaikan taut simbolik"
 
-#: ../data/org.gnome.meld.gschema.xml.h:35
+#: ../data/org.gnome.meld.gschema.xml.h:36
 msgid ""
 "If true, folder comparisons do not follow symbolic links when traversing the "
 "folder tree."
@@ -268,11 +272,11 @@
 "Bila berisi true, perbandingan folder tidak mengikuti taut simbolik ketika "
 "menelusuri pohon folder."
 
-#: ../data/org.gnome.meld.gschema.xml.h:36
+#: ../data/org.gnome.meld.gschema.xml.h:37
 msgid "Use shallow comparison"
 msgstr "Gunakan perbandingan dangkal"
 
-#: ../data/org.gnome.meld.gschema.xml.h:37
+#: ../data/org.gnome.meld.gschema.xml.h:38
 msgid ""
 "If true, folder comparisons compare files based solely on size and mtime, "
 "considering files to be identical if their size and mtime match, and "
@@ -282,11 +286,11 @@
 "pada ukuran dan mtime, menganggap berkas identik bila ukuran dan mtime "
 "mereka cocok, dan berbeda bila tidak."
 
-#: ../data/org.gnome.meld.gschema.xml.h:38
+#: ../data/org.gnome.meld.gschema.xml.h:39
 msgid "File timestamp resolution"
 msgstr "Resolusi penanda waktu"
 
-#: ../data/org.gnome.meld.gschema.xml.h:39
+#: ../data/org.gnome.meld.gschema.xml.h:40
 msgid ""
 "When comparing based on mtime, this is the minimum difference in nanoseconds "
 "between two files before they're considered to have different mtimes. This "
@@ -298,21 +302,21 @@
 "berbeda. Ini berguna ketika membandingkan berkas antar sistem berkas dengan "
 "resolusi penanda waktu yang berbeda."
 
-#: ../data/org.gnome.meld.gschema.xml.h:40
+#: ../data/org.gnome.meld.gschema.xml.h:41
 msgid "File status filters"
 msgstr "Penyaring status berkas"
 
-#: ../data/org.gnome.meld.gschema.xml.h:41
+#: ../data/org.gnome.meld.gschema.xml.h:42
 msgid "List of statuses used to filter visible files in folder comparison."
 msgstr ""
 "Daftar dari status yang dipakai untuk menyaring berkas yang tampak dalam "
 "perbandingan folder."
 
-#: ../data/org.gnome.meld.gschema.xml.h:42
+#: ../data/org.gnome.meld.gschema.xml.h:43
 msgid "Show the version control console output"
 msgstr "Tampilkan keluaran konsol kendali versi"
 
-#: ../data/org.gnome.meld.gschema.xml.h:43
+#: ../data/org.gnome.meld.gschema.xml.h:44
 msgid ""
 "If true, a console output section will be shown in version control views, "
 "showing the commands run for version control operations."
@@ -321,22 +325,22 @@
 "kendali versi, menunjukkan perintah yang dijalankan bagi operasi kendali "
 "versi."
 
-#: ../data/org.gnome.meld.gschema.xml.h:44
+#: ../data/org.gnome.meld.gschema.xml.h:45
 msgid "Version control pane position"
 msgstr "Posisi panel kendali versi"
 
-#: ../data/org.gnome.meld.gschema.xml.h:45
+#: ../data/org.gnome.meld.gschema.xml.h:46
 msgid ""
 "This is the height of the main version control tree when the console pane is "
 "shown."
 msgstr ""
 "Ini adalah tinggi phon kendali versi utama ketika panel konsol ditampilkan."
 
-#: ../data/org.gnome.meld.gschema.xml.h:46
+#: ../data/org.gnome.meld.gschema.xml.h:47
 msgid "Present version comparisons as left-local/right-remote"
 msgstr "Sajikan perbandingan versi sebagai kiri-lokal/kanan-jauh"
 
-#: ../data/org.gnome.meld.gschema.xml.h:47
+#: ../data/org.gnome.meld.gschema.xml.h:48
 msgid ""
 "If true, version control comparisons will use a left-is-local, right-is-"
 "remote scheme to determine what order to present files in panes. Otherwise, "
@@ -347,11 +351,26 @@
 "dalam panel. Bila tidak, skema left-adalah-milik-mereka, kanan-adalah-"
 "milikku dipakai."
 
-#: ../data/org.gnome.meld.gschema.xml.h:48
+#: ../data/org.gnome.meld.gschema.xml.h:49
+msgid "Order for files in three-way version control merge comparisons"
+msgstr "Urutan bagi berkas dalam perbandingan merge kendali versi tiga arah"
+
+#: ../data/org.gnome.meld.gschema.xml.h:50
+msgid ""
+"Choices for file order are remote/merge/local and local/merged/remote. This "
+"preference only affects three-way comparisons launched from the version "
+"control view, so is used solely for merges/conflict resolution within Meld."
+msgstr ""
+"Pilihan untuk urutan berkas adalah remote/merge/local dan local/merged/"
+"remote. Preferensi ini hanya mempengaruhi perbandingan tiga arah yang "
+"diluncurkan dari tilikan kendali versi, sehingga hanya dipakai untuk "
+"resolusi merge/konflik di dalam Meld."
+
+#: ../data/org.gnome.meld.gschema.xml.h:51
 msgid "Show margin in commit message editor"
 msgstr "Tampilkan marjin dalam penyunting pesan komit"
 
-#: ../data/org.gnome.meld.gschema.xml.h:49
+#: ../data/org.gnome.meld.gschema.xml.h:52
 msgid ""
 "If true, a guide will be displayed to show what column the margin is at in "
 "the version control commit message editor."
@@ -359,20 +378,23 @@
 "Bila berisi true, suatu panduan akan ditampilkan untuk menunjukkan marjin "
 "pada kolom mana dalam penyunting pesan komit kendali versi."
 
-#: ../data/org.gnome.meld.gschema.xml.h:50
+#: ../data/org.gnome.meld.gschema.xml.h:53
 msgid "Margin column in commit message editor"
 msgstr "Marjin kolom dalam penyunting pesan komit"
 
-#: ../data/org.gnome.meld.gschema.xml.h:51
+#: ../data/org.gnome.meld.gschema.xml.h:54
 msgid ""
-"The column of the margin is at in the version control commit message editor."
-msgstr "Kolom tempat marjin berada dalam penyunting pesan komit kendali versi."
+"The column at which to show the margin in the version control commit message "
+"editor."
+msgstr ""
+"Kolom tempat menunjukkan posisi marjin dalam penyunting pesan komit kendali "
+"versi."
 
-#: ../data/org.gnome.meld.gschema.xml.h:52
+#: ../data/org.gnome.meld.gschema.xml.h:55
 msgid "Automatically hard-wrap commit messages"
 msgstr "Secara otomatis melipat isi pesan komit"
 
-#: ../data/org.gnome.meld.gschema.xml.h:53
+#: ../data/org.gnome.meld.gschema.xml.h:56
 msgid ""
 "If true, the version control commit message editor will hard-wrap (i.e., "
 "insert line breaks) at the defined commit margin before commit."
@@ -381,22 +403,22 @@
 "menyisipkan pemecah baris) pada marjin komit yang didefinisikan sebelum "
 "komit."
 
-#: ../data/org.gnome.meld.gschema.xml.h:54
+#: ../data/org.gnome.meld.gschema.xml.h:57
 msgid "Version control status filters"
 msgstr "Penyaring status kendali versi"
 
-#: ../data/org.gnome.meld.gschema.xml.h:55
+#: ../data/org.gnome.meld.gschema.xml.h:58
 msgid ""
 "List of statuses used to filter visible files in version control comparison."
 msgstr ""
 "Daftar status yang dipakai untuk menyaring berkas yang tampak dalam "
 "perbandingan kendali versi."
 
-#: ../data/org.gnome.meld.gschema.xml.h:56
+#: ../data/org.gnome.meld.gschema.xml.h:59
 msgid "Filename-based filters"
 msgstr "Penyaring berbasis nama berkas"
 
-#: ../data/org.gnome.meld.gschema.xml.h:57
+#: ../data/org.gnome.meld.gschema.xml.h:60
 msgid ""
 "List of predefined filename-based filters that, if active, will remove "
 "matching files from a folder comparison."
@@ -404,11 +426,11 @@
 "Daftar penyaring berbasis nama berkas yang terpradefinisi, yang bila aktif, "
 "akan menghapus berkas yang cocok dari perbandingan folder."
 
-#: ../data/org.gnome.meld.gschema.xml.h:58
+#: ../data/org.gnome.meld.gschema.xml.h:61
 msgid "Text-based filters"
 msgstr "Penyaring berbasis teks"
 
-#: ../data/org.gnome.meld.gschema.xml.h:59
+#: ../data/org.gnome.meld.gschema.xml.h:62
 msgid ""
 "List of predefined text-based regex filters that, if active, will remove "
 "text from being used in a file comparison. The text will still be displayed, "
@@ -482,7 +504,7 @@
 msgid "Delete selected"
 msgstr "Hapus yang dipilih"