diff -Nru diffuse-0.4.4/AUTHORS diffuse-0.4.5/AUTHORS
--- diffuse-0.4.4/AUTHORS	2010-10-21 01:58:03.000000000 +0000
+++ diffuse-0.4.5/AUTHORS	2011-07-13 09:18:34.000000000 +0000
@@ -4,6 +4,7 @@
 
 Translators
 -----------
+Cristian Marchi <cri.penta@gmail.com> (Italian)
 Derrick Moser <derrick_moser@yahoo.com> (Japanese)
 Henri Menke <henrimenke4@aim.com> (German, Spanish)
 Kang Bundo <kangbundo@gmail.com> (Korean)
diff -Nru diffuse-0.4.4/ChangeLog diffuse-0.4.5/ChangeLog
--- diffuse-0.4.4/ChangeLog	2010-10-21 01:58:03.000000000 +0000
+++ diffuse-0.4.5/ChangeLog	2011-07-13 09:18:34.000000000 +0000
@@ -1,3 +1,17 @@
+Diffuse 0.4.5 - 2011-07-13
+- fixed a bug in CVS and Subversion support that prevented Diffuse from displaying some removed files
+- added syntax highlighting for JSON files
+- added menu items and keyboard shortcuts for "First Tab" and "Last Tab"
+- added "--line" command line option
+- fixed a bug that caused deleted files to be ignored when using the '-m' option
+- fixed a bug that incorrectly encoded pasted text if utf_8 was not specified in the Region Settings preferences
+- state information is now stored in ~/.local/share/diffuse
+- Diffuse now uses a patience diff-based algorithm to align lines
+- added command line option to specify a label to display instead of the file name
+- added preference to display the right margin
+- added Cristian Marchi's Italian translation
+- fixed a bug that could cause "Save As..." to fail with some user specified encodings
+
 Diffuse 0.4.4 - 2010-10-21
 - Git support now recognises conflicts when re-applying the stash
 - double clicking on text can now select full words with non-English characters
diff -Nru diffuse-0.4.4/debian/changelog diffuse-0.4.5/debian/changelog
--- diffuse-0.4.4/debian/changelog	2010-10-22 07:31:41.000000000 +0000
+++ diffuse-0.4.5/debian/changelog	2011-08-06 05:08:02.000000000 +0000
@@ -1,3 +1,18 @@
+diffuse (0.4.5-1) unstable; urgency=low
+
+  * New upstream release (closes: #623991)
+  * Removed unnecessary use of python-support
+  * debian/copyright:
+    - bumped up copyright years
+    - updated maintainer's email address
+  * debian/rules:
+    - added build-arch and build-indep targets
+    - removed unnecessary calls of dh_pysupport, dh_makeshlibs and dh_shlibdeps
+  * Updated Standards-Version: 3.9.2 (no changes needed)
+  * Deleted deprecated README.Debian
+
+ -- Philipp Huebner <debalance@debian.org>  Sat, 06 Aug 2011 15:06:57 +1000
+
 diffuse (0.4.4-1) unstable; urgency=low
 
   * New upstream release
diff -Nru diffuse-0.4.4/debian/control diffuse-0.4.5/debian/control
--- diffuse-0.4.4/debian/control	2010-10-22 07:29:39.000000000 +0000
+++ diffuse-0.4.5/debian/control	2011-08-06 04:59:25.000000000 +0000
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Philipp Huebner <debalance@debian.org>
 Build-Depends: debhelper (>= 7)
-Build-Depends-indep: gettext, python, python-support
-Standards-Version: 3.9.1
+Build-Depends-indep: gettext
+Standards-Version: 3.9.2
 Homepage: http://diffuse.sourceforge.net/
 
 Package: diffuse
diff -Nru diffuse-0.4.4/debian/copyright diffuse-0.4.5/debian/copyright
--- diffuse-0.4.4/debian/copyright	2010-04-13 16:06:37.000000000 +0000
+++ diffuse-0.4.5/debian/copyright	2011-08-06 01:05:44.000000000 +0000
@@ -1,4 +1,4 @@
-This package was debianized by Philipp Huebner <debalance@arcor.de> on
+This package was debianized by Philipp Huebner <debalance@debian.org> on
 Sat, 07 Jun 2008 19:54:13 +0200.
 
 It was downloaded from http://sourceforge.net/project/showfiles.php?group_id=157784
@@ -9,7 +9,7 @@
 
 Copyright: 
 
-    © 2006-2009 Derrick Moser 
+    © 2006-2011 Derrick Moser 
 
 License:
 
@@ -30,5 +30,5 @@
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
-The Debian packaging is © 2008-2009, Philipp Huebner <debalance@arcor.de> and
+The Debian packaging is © 2008-2011, Philipp Huebner <debalance@debian.org> and
 is licensed under the GPL-2, see above.
diff -Nru diffuse-0.4.4/debian/README.Debian diffuse-0.4.5/debian/README.Debian
--- diffuse-0.4.4/debian/README.Debian	2010-04-13 16:06:37.000000000 +0000
+++ diffuse-0.4.5/debian/README.Debian	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-diffuse for Debian
-------------------
-
-Diffuse now has Japanese and simplified Chinese localisation.
-It also follows the XDG standard for configuration files.
-Users wishing to keep their old settings should either follow the instruction in
-the README file to migrate the data or re-enter them in the preferences dialogue.
-
-Cheers,
-Derrick
-
- -- Derrick Moser <derrick_moser@yahoo.com>  Tue, 13 Oct 2009 04:46:10 +0200 
diff -Nru diffuse-0.4.4/debian/rules diffuse-0.4.5/debian/rules
--- diffuse-0.4.4/debian/rules	2010-04-13 16:39:30.000000000 +0000
+++ diffuse-0.4.5/debian/rules	2011-08-06 05:08:17.000000000 +0000
@@ -17,7 +17,10 @@
 	msgfmt -o debian/diffuse/usr/share/locale/$$BASENAME/LC_MESSAGES/diffuse.mo $$po;	\
 	done
 
-build:
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
+build-stamp:
 
 binary-arch: install
 
@@ -26,15 +29,12 @@
 	dh_testroot
 	dh_installchangelogs ChangeLog
 	dh_installdocs README
-	dh_pysupport
 	dh_compress
 	dh_fixperms
-	dh_makeshlibs
 	dh_installdeb
-	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: clean binary-indep binary-arch binary install build 
+.PHONY: clean binary-indep binary-arch binary install build build-arch build-indep
diff -Nru diffuse-0.4.4/README diffuse-0.4.5/README
--- diffuse-0.4.4/README	2010-10-21 01:58:03.000000000 +0000
+++ diffuse-0.4.5/README	2011-07-13 09:18:34.000000000 +0000
@@ -1,7 +1,7 @@
 Diffuse
-Version 0.4.4
+Version 0.4.5
 
-Copyright (C) 2006-2010 Derrick Moser <derrick_moser@yahoo.com>
+Copyright (C) 2006-2011 Derrick Moser <derrick_moser@yahoo.com>
 
 ----
 
@@ -72,6 +72,13 @@
 The 'windows-installer' directory contains scripts for building an installable
 package for Windows that includes all dependencies.
 
+Diffuse can be packaged as a portable application by copying the installation
+directory to a pen drive and creating a front end that sets the XDG_CONFIG_HOME
+and XDG_DATA_DIR environment variables prior to launching Diffuse.  The
+XDG_CONFIG_HOME and XDG_DATA_DIR environment variables indicate where Diffuse
+should store persistent settings (eg. the path to a writable directory on the
+pen drive).
+
 ----
 
 Help Documentation:
diff -Nru diffuse-0.4.4/README_ru diffuse-0.4.5/README_ru
--- diffuse-0.4.4/README_ru	2010-10-21 01:58:03.000000000 +0000
+++ diffuse-0.4.5/README_ru	2011-07-13 09:18:34.000000000 +0000
@@ -1,23 +1,23 @@
 Diffuse
-Версия 0.4.4
+Версия 0.4.5
 
-Copyright (C) 2006-2010 Derrick Moser <derrick_moser@yahoo.com>
+Copyright (C) 2006-2011 Derrick Moser <derrick_moser@yahoo.com>
 Перевод:О.Ю.Пахтусов (Oleg Pakhtusov) <oupakhtusov@gmail.com> 
 
 ----
 
-Программа Diffuse является графическим инструментом для слияния и сравнения текстовых 
-файлов.  Она может сравнить произвольное число файлов в представлении бок о бок, 
-предоставляет пользователям возможность вручную корректировать соответствие строк и 
-редактировать файлы напрямую.  Diffuse может также извлекать ревизии файлов из Bazaar, 
-CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion и SVK репозиториев для их сравнения 
-и слияния.
+Программа Diffuse является графическим инструментом для слияния и сравнения
+текстовых файлов.  Она может сравнить произвольное число файлов в представлении
+бок о бок, предоставляет пользователям возможность вручную корректировать
+соответствие строк и редактировать файлы напрямую.  Diffuse может также
+извлекать ревизии файлов из Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS,
+Subversion и SVK репозиториев для их сравнения и слияния.
 
 Некоторые основные свойства Diffuse:
 - возможность сравнивать и объединять произвольное число файлов бок о бок (n-оконные слияния)
 - соответствие строк может быть скорректирована пользователем вручную
 - возможность напрямую редактировать файлы
-- syntax highlighting
+- подсвечивание синтаксиса
 - Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion и SVK поддержка
 - поддержка Unicode
 - неограниченное число отмен
@@ -32,41 +32,41 @@
 
 ----
 
-Diffuse реализована полностью на Python и должен работать на любой платформе 
-с Python и PyGTK. Если Вам нужно вручную установить PyGTK, пожалуйста знайте
+Diffuse реализована полностью на Python и должен работать на любой платформе с
+Python и PyGTK. Если Вам нужно вручную установить PyGTK, пожалуйста знайте
 зависимости (подчиненные) должны быть инсталлированы до установки PyGTK.
 
 Diffuse может быть выполнена непосредственно из не .tar исходного дистрибутива 
 на любой POSIX системе или установлена с инструкциями, описанными в следующем 
 разделе.
 
-Расположение персональных предпочтений, состояния, и файлов инициализации изменены
-в 0.4.1 выпуске. Старые настройки могут быть перемещены использованием следующих
-команд:
+Расположение персональных предпочтений, состояния, и файлов инициализации
+изменены в 0.4.1 выпуске. Старые настройки могут быть перемещены использованием
+следующих команд:
 
   $ mkdir -p ~/.config/diffuse
   $ mv ~/.diffuse/config ~/.config/diffuse/state
   $ mv ~/.diffuse/* ~/.config/diffuse
   $ rmdir ~/.diffuse
 
-Правила для парсинга файлов в ~/.diffuse изменены в 0.3.0 выпуске.
-Могут сообщаться нефатальные ошибки на парсинге старых файлов. Эти
-ошибки могут быть устранены удалением проблемных строк (или всего 
-файла) из ~/.config/diffuse/diffuserc.
+Правила для парсинга файлов в ~/.diffuse изменены в 0.3.0 выпуске.  Могут
+сообщаться нефатальные ошибки на парсинге старых файлов. Эти ошибки могут быть
+устранены удалением проблемных строк (или всего файла) из
+~/.config/diffuse/diffuserc.
 
 ----
 
 Установка на POSIX системах:
 
-Выполните 'install.py' скрипт для установки Diffuse. Скрипт принимает 
-несколько опций для настройки поведения установки. Используйте опцию
-'--help', чтобы получить полное перечисление этих опциий.
+Выполните 'install.py' скрипт для установки Diffuse. Скрипт принимает несколько
+опций для настройки поведения установки. Используйте опцию '--help', чтобы
+получить полное перечисление этих опциий.
 
-Diffuse может быть деинсталлирован выполнением 'install.py' скрипта с
-опцией '--remove'.
+Diffuse может быть деинсталлирован выполнением 'install.py' скрипта с опцией
+'--remove'.
 
-Определите опции '--destdir=' и '--files-only' для 'install.py' скрипта
-при использовании для создания платформо-определенного пакета Diffuse.
+Определите опции '--destdir=' и '--files-only' для 'install.py' скрипта при
+использовании для создания платформо-определенного пакета Diffuse.
 
 ----
 
@@ -75,11 +75,19 @@
 Каталог 'windows-installer' содержит скрипты для сборки устанавливаемого
 Windows пакета, который включает все зависимости.
 
+Программа Diffuse может быть собрана как портативное приложение путем
+копирования каталога установки на флэшку и создания внешнего интерфейса,
+который устанавливает переменные окружения (среды) XDG_CONFIG_HOME и
+XDG_DATA_DIR перед запуском Diffuse.  Переменные окружения (среды)
+XDG_CONFIG_HOME и XDG_DATA_DIR указывают где программа Diffuse должна хранить
+свои постоянные настройки (напр. путь к перезаписываемому каталогу на данной
+флэшке).
+
 ----
 
 Справочная Документация:
 
 Справочная документация Diffuse написана в формате DocBook и может быть легко
 преобразована в другие форматы, используя XSLT таблицы стилей. Если локальная
-справочная документация или ее браузер недоступны, Diffuse попытается отобразить
-онлайновую справочную документацию, используя веб-браузер.
+справочная документация или ее браузер недоступны, Diffuse попытается
+отобразить онлайновую справочную документацию, используя веб-браузер.
diff -Nru diffuse-0.4.4/src/usr/bin/diffuse diffuse-0.4.5/src/usr/bin/diffuse
--- diffuse-0.4.4/src/usr/bin/diffuse	2010-10-21 01:58:02.000000000 +0000
+++ diffuse-0.4.5/src/usr/bin/diffuse	2011-07-13 09:18:33.000000000 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2006-2010 Derrick Moser <derrick_moser@yahoo.com>
+# Copyright (C) 2006-2011 Derrick Moser <derrick_moser@yahoo.com>
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
@@ -19,6 +19,7 @@
 # (http://www.fsf.org/) or by writing to the Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+import codecs
 import gettext
 import locale
 import os
@@ -29,7 +30,7 @@
 if hasattr(sys, 'frozen'):
     app_path = sys.executable
 else:
-    app_path = sys.argv[0]
+    app_path = os.path.realpath(sys.argv[0])
 bin_dir = os.path.dirname(app_path)
 
 # platform test
@@ -63,19 +64,26 @@
 _ = gettext.gettext
 
 APP_NAME = 'Diffuse'
-VERSION = '0.4.4'
-COPYRIGHT = _('Copyright © 2006-2010 Derrick Moser')
+VERSION = '0.4.5'
+COPYRIGHT = _('Copyright © 2006-2011 Derrick Moser')
 WEBSITE = 'http://diffuse.sourceforge.net/'
 
+# print a UTF-8 string using the host's native encoding
+def printMessage(s):
+    try:
+        print codecs.encode(unicode(s, 'utf_8'), sys.getfilesystemencoding())
+    except UnicodeEncodeError:
+        pass
+
 # process help options
 if __name__ == '__main__':
     args = sys.argv
     argc = len(args)
     if argc == 2 and args[1] in [ '-v', '--version' ]:
-        print '%s %s\n%s' % (APP_NAME, VERSION, COPYRIGHT)
+        printMessage('%s %s\n%s' % (APP_NAME, VERSION, COPYRIGHT))
         sys.exit(0)
     if argc == 2 and args[1] in [ '-h', '-?', '--help' ]:
-        print _("""Usage:
+        printMessage(_('''Usage:
     diffuse [ [OPTION...] [FILE...] ]...
     diffuse ( -h | -? | --help | -v | --version )
 
@@ -97,10 +105,12 @@
   ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>
   ( -D | --close-if-same )         Close all tabs with no differences
   ( -e | --encoding ) <codec>      Use <codec> to read and write files
+  ( -L | --label ) <label>         Display <label> instead of the file name
   ( -m | --modified )              Create a new tab for each modified file
   ( -r | --revision ) <rev>        File revision <rev>
   ( -s | --separate )              Create a new tab for each file
   ( -t | --tab )                   Start a new tab
+  --line <line>                    Start with line <line> selected
   --null-file                      Create a blank file comparison pane
 
 Display Options:
@@ -108,14 +118,13 @@
   ( -B | --ignore-blank-lines )    Ignore changes in blank lines
   ( -E | --ignore-end-of-line )    Ignore end of line differences
   ( -i | --ignore-case )           Ignore case differences
-  ( -w | --ignore-all-space )      Ignore white space differences""")
+  ( -w | --ignore-all-space )      Ignore white space differences'''))
         sys.exit(0)
 
 import pygtk
 pygtk.require('2.0')
 import gtk
 
-import codecs
 import difflib
 import encodings
 import glob
@@ -143,16 +152,15 @@
 # associate our icon with all of our windows
 if __name__ == '__main__':
     # handle platform specific icon
-    if isWindows():
-        iconpath = os.path.join(bin_dir, 'diffuse.ico')
-    else:
+    # icon will be provided by py2exe on Windows
+    if not isWindows():
         iconpath = os.path.join(bin_dir, '../share/pixmaps/diffuse.png')
-    if os.path.isfile(iconpath):
-        gtk.window_set_default_icon(gtk.gdk.pixbuf_new_from_file(iconpath))
-    else:
-        # this can occur if we are run without a proper install
-        # it is just cosmetic, don't bother the user
-        logDebug('Missing icon %s' % (iconpath, ))
+        if os.path.isfile(iconpath):
+            gtk.window_set_default_icon(gtk.gdk.pixbuf_new_from_file(iconpath))
+        else:
+            # this can occur if we are run without a proper install
+            # it is just cosmetic, don't bother the user
+            logDebug('Missing icon %s' % (iconpath, ))
 
 # convenience class for displaying a message dialogue
 class MessageDialog(gtk.MessageDialog):
@@ -271,7 +279,7 @@
 
 # also recognise old Mac OS line endings
 def readlines(fd):
-    return splitlines(fd.read())
+    return strip_eols(splitlines(fd.read()))
 
 # This class to hold all customisable behaviour not exposed in the preferences
 # dialogue: hotkey assignment, colours, syntax highlighting, etc.
@@ -315,8 +323,10 @@
         set_binding('menu', 'previous_difference', 'Ctrl+Up')
         set_binding('menu', 'next_difference', 'Ctrl+Down')
         set_binding('menu', 'last_difference', 'Shift+Ctrl+Down')
+        set_binding('menu', 'first_tab', 'Shift+Ctrl+Page_Up')
         set_binding('menu', 'previous_tab', 'Ctrl+Page_Up')
         set_binding('menu', 'next_tab', 'Ctrl+Page_Down')
+        set_binding('menu', 'last_tab', 'Shift+Ctrl+Page_Down')
         set_binding('menu', 'shift_pane_right', 'Shift+Ctrl+parenright')
         set_binding('menu', 'shift_pane_left', 'Shift+Ctrl+parenleft')
         set_binding('menu', 'convert_to_upper_case', 'Ctrl+u')
@@ -419,6 +429,7 @@
             'line_number_background' : Colour(0.75, 0.75, 0.75),
             'line_selection' : Colour(0.7, 0.7, 1.0),
             'map_background' : Colour(0.6, 0.6, 0.6),
+            'margin' : Colour(0.8, 0.8, 0.8),
             'edited' : Colour(0.5, 1.0, 0.5),
             'preedit' : Colour(0.0, 0.0, 0.0),
             'text' : Colour(0.0, 0.0, 0.0),
@@ -686,14 +697,44 @@
 
 theResources = Resources()
 
-def decodefilename(s):
+# convert a string obtained from the file system or command line to unicode
+def decode_fs_string(s):
     if s is not None:
         if isWindows():
             s = unicode(s, 'utf_8')
         else:
             s = unicode(s, sys.getfilesystemencoding())
     return s
- 
+
+# map an encoding name to its standard form
+def norm_encoding(e):
+    if e is not None:
+        return e.replace('-', '_').lower()
+
+# widget to help pick an encoding
+class EncodingMenu(gtk.HBox):
+    def __init__(self, prefs, autodetect=False):
+        gtk.HBox.__init__(self)
+        self.combobox = combobox = gtk.combo_box_new_text()
+        self.encodings = prefs.getEncodings()[:]
+        for e in self.encodings:
+            combobox.append_text(e)
+        if autodetect:
+            self.encodings.insert(0, None)
+            combobox.prepend_text(_('Auto Detect'))
+        self.pack_start(combobox, False, False, 0)
+        combobox.show()
+
+    def set_text(self, encoding):
+        encoding = norm_encoding(encoding)
+        if encoding in self.encodings:
+            self.combobox.set_active(self.encodings.index(encoding))
+
+    def get_text(self):
+        i = self.combobox.get_active()
+        if i >= 0:
+            return self.encodings[i]
+
 # text entry widget with a button to help pick file names
 class FileEntry(gtk.HBox):
     def __init__(self, parent, title):
@@ -752,6 +793,13 @@
         else:
             svk_bin = 'svk'
 
+        auto_detect_codecs = [ 'utf_8', 'latin_1' ]
+        e = norm_encoding(sys.getfilesystemencoding())
+        if e not in auto_detect_codecs:
+            # insert after UTF-8 as the default encoding may prevent UTF-8 from
+            # being tried
+            auto_detect_codecs.insert(1, e)
+
         # self.template describes how preference dialogue layout
         #
         # this will be traversed later to build the preferences dialogue and
@@ -773,27 +821,29 @@
             [ 'List',
               [ 'Font', 'display_font', 'Monospace 10', _('Font') ],
               [ 'Integer', 'display_tab_width', 8, _('Tab width'), 1, 1024 ],
+              [ 'Boolean', 'display_show_right_margin', False, _('Show right margin') ],
+              [ 'Integer', 'display_right_margin', 80, _('Right margin'), 1, 8192 ],
               [ 'Boolean', 'display_show_line_numbers', True, _('Show line numbers') ],
               [ 'Boolean', 'display_show_whitespace', False, _('Show white space characters') ],
+              [ 'Boolean', 'display_ignore_case', False, _('Ignore case differences') ],
               [ 'Boolean', 'display_ignore_whitespace', False, _('Ignore white space differences') ],
               [ 'Boolean', 'display_ignore_whitespace_changes', False, _('Ignore changes to white space') ],
               [ 'Boolean', 'display_ignore_blanklines', False, _('Ignore blank line differences') ],
-              [ 'Boolean', 'display_ignore_case', False, _('Ignore case differences') ],
               [ 'Boolean', 'display_ignore_endofline', False, _('Ignore end of line differences') ]
             ],
             _('Alignment'),
             [ 'List',
+              [ 'Boolean', 'align_ignore_case', False, _('Ignore case') ],
               [ 'Boolean', 'align_ignore_whitespace', True, _('Ignore white space') ],
               [ 'Boolean', 'align_ignore_whitespace_changes', False, _('Ignore changes to white space') ],
               [ 'Boolean', 'align_ignore_blanklines', False, _('Ignore blank lines') ],
-              [ 'Boolean', 'align_ignore_endofline', True, _('Ignore end of line characters') ],
-              [ 'Boolean', 'align_ignore_case', False, _('Ignore case') ]
+              [ 'Boolean', 'align_ignore_endofline', True, _('Ignore end of line characters') ]
             ],
             _('Editor'),
             [ 'List',
-              [ 'Integer', 'editor_soft_tab_width', 8, _('Soft tab width'), 1, 1024 ],
+              [ 'Boolean', 'editor_auto_indent', False, _('Auto indent') ],
               [ 'Boolean', 'editor_expand_tabs', False, _('Expand tabs to spaces') ],
-              [ 'Boolean', 'editor_auto_indent', False, _('Auto indent') ]
+              [ 'Integer', 'editor_soft_tab_width', 8, _('Soft tab width'), 1, 1024 ]
             ],
             _('Tabs'),
             [ 'List',
@@ -803,9 +853,20 @@
             ],
             _('Regional Settings'),
             [ 'List',
-              [ 'String', 'encoding_auto_detect_codecs', ' '.join([sys.getfilesystemencoding(), 'latin_1']), _('Order of codecs used to identify encoding') ]
+              [ 'Encoding', 'encoding_default_codec', sys.getfilesystemencoding(), _('Default codec') ],
+              [ 'String', 'encoding_auto_detect_codecs', ' '.join(auto_detect_codecs), _('Order of codecs used to identify encoding') ]
             ],
         ]
+        # conditions used to determine if a preference should be greyed out
+        self.disable_when = {
+            'display_right_margin': ('display_show_right_margin', False),
+            'display_ignore_whitespace_changes': ('display_ignore_whitespace', True),
+            'display_ignore_blanklines': ('display_ignore_whitespace', True),
+            'display_ignore_endofline': ('display_ignore_whitespace', True),
+            'align_ignore_whitespace_changes': ('align_ignore_whitespace', True),
+            'align_ignore_blanklines': ('align_ignore_whitespace', True),
+            'align_ignore_endofline': ('align_ignore_whitespace', True)
+        }
         if isWindows():
             root = os.environ.get('SYSTEMDRIVE', None)
             if root is None:
@@ -849,6 +910,9 @@
 
         self.template.extend([ _('Version Control'), vcs_template ])
         self._initFromTemplate(self.template)
+        self.default_bool_prefs = self.bool_prefs.copy()
+        self.default_int_prefs = self.int_prefs.copy()
+        self.default_string_prefs = self.string_prefs.copy()
         # load the user's preferences
         self.path = path
         if os.path.isfile(self.path):
@@ -860,12 +924,13 @@
                     try:
                         a = shlex.split(s, True)
                         if len(a) > 0:
-                            if len(a) == 2 and self.bool_prefs.has_key(a[0]):
-                                self.bool_prefs[a[0]] = (a[1] == 'True')
-                            elif len(a) == 2 and self.int_prefs.has_key(a[0]):
-                                self.int_prefs[a[0]] = max(self.int_prefs_min[a[0]], min(int(a[1]), self.int_prefs_max[a[0]]))
-                            elif len(a) == 2 and self.string_prefs.has_key(a[0]):
-                                self.string_prefs[a[0]] = a[1]
+                            p = a[0]
+                            if len(a) == 2 and self.bool_prefs.has_key(p):
+                                self.bool_prefs[p] = (a[1] == 'True')
+                            elif len(a) == 2 and self.int_prefs.has_key(p):
+                                self.int_prefs[p] = max(self.int_prefs_min[p], min(int(a[1]), self.int_prefs_max[p]))
+                            elif len(a) == 2 and self.string_prefs.has_key(p):
+                                self.string_prefs[p] = a[1]
                             else:
                                 raise ValueError()
                     except ValueError:
@@ -893,9 +958,17 @@
             self.int_prefs[template[1]] = template[2]
             self.int_prefs_min[template[1]] = template[4]
             self.int_prefs_max[template[1]] = template[5]
-        elif template[0] in [ 'String', 'File', 'Font' ]:
+        elif template[0] in [ 'String', 'File', 'Font', 'Encoding' ]:
             self.string_prefs[template[1]] = template[2]
 
+    # callback used when a preference is toggled
+    def _toggled_cb(self, widget, widgets, name):
+        # disable any preferences than are no longer relevant
+        for k, v in self.disable_when.items():
+            p, t = v
+            if p == name:
+                widgets[k].set_sensitive(widgets[p].get_active() != t)
+
     # display the dialogue and update the preference values if the accept
     # button was pressed
     def runDialog(self, parent):
@@ -903,19 +976,33 @@
 
         widgets = {}
         w = self._buildPrefsDialog(parent, widgets, self.template)
+        # disable any preferences than are not relevant
+        for k, v in self.disable_when.items():
+            p, t = v
+            if widgets[p].get_active() == t:
+                widgets[k].set_sensitive(False)
         dialog.vbox.add(w)
         w.show()
 
         accept = (dialog.run() == gtk.RESPONSE_OK)
         if accept:
+            for k in self.bool_prefs.keys():
+                self.bool_prefs[k] = widgets[k].get_active()
+            for k in self.int_prefs.keys():
+                self.int_prefs[k] = widgets[k].get_value_as_int()
+            for k in self.string_prefs.keys():
+                self.string_prefs[k] = widgets[k].get_text()
             try:
                 ss = []
-                for k in self.bool_prefs.keys():
-                    ss.append('%s %s\n' % (k, widgets[k].get_active()))
-                for k in self.int_prefs.keys():
-                    ss.append('%s %s\n' % (k, widgets[k].get_value_as_int()))
-                for k in self.string_prefs.keys():
-                    ss.append('%s "%s"\n' % (k, widgets[k].get_text().replace('\\', '\\\\').replace('"', '\\"')))
+                for k, v in self.bool_prefs.items():
+                    if v != self.default_bool_prefs[k]:
+                        ss.append('%s %s\n' % (k, v))
+                for k, v in self.int_prefs.items():
+                    if v != self.default_int_prefs[k]:
+                        ss.append('%s %s\n' % (k, v))
+                for k, v in self.string_prefs.items():
+                    if v != self.default_string_prefs[k]:
+                        ss.append('%s "%s"\n' % (k, v.replace('\\', '\\\\').replace('"', '\\"')))
                 ss.sort()
                 f = open(self.path, 'w')
                 f.write('# This prefs file was generated by %s %s.\n\n' % (APP_NAME, VERSION))
@@ -926,12 +1013,6 @@
                 m = MessageDialog(parent, gtk.MESSAGE_ERROR, _('Error writing %s.') % (self.path, ))
                 m.run()
                 m.destroy()
-            for k in self.bool_prefs.keys():
-                self.bool_prefs[k] = widgets[k].get_active()
-            for k in self.int_prefs.keys():
-                self.int_prefs[k] = widgets[k].get_value_as_int()
-            for k in self.string_prefs.keys():
-                self.string_prefs[k] = widgets[k].get_text()
         dialog.destroy()
         return accept
 
@@ -968,6 +1049,7 @@
                     button.set_active(self.bool_prefs[tpl[1]])
                     widgets[tpl[1]] = button
                     table.attach(button, 1, 2, i, i + 1, gtk.FILL, gtk.FILL)
+                    button.connect('toggled', self._toggled_cb, widgets, tpl[1])
                     button.show()
                 else:
                     label = gtk.Label(tpl[3] + ': ')
@@ -983,12 +1065,14 @@
                             button = gtk.SpinButton()
                             button.set_range(tpl[4], tpl[5])
                             button.set_value(self.int_prefs[tpl[1]])
-                            button.set_increments(1, 1)
                         widgets[tpl[1]] = button
                         entry.pack_start(button, False, False, 0)
                         button.show()
                     else:
-                        if tpl[0] == 'File':
+                        if tpl[0] == 'Encoding':
+                            entry = EncodingMenu(self)
+                            entry.set_text(tpl[3])
+                        elif tpl[0] == 'File':
                             entry = FileEntry(parent, tpl[3])
                         else:
                             entry = gtk.Entry()
@@ -1019,34 +1103,21 @@
         return self.string_prefs['encoding_auto_detect_codecs'].split()
 
     def getDefaultEncoding(self):
-        encodings = self._getDefaultEncodings()
-        if len(encodings) > 0:
-            return encodings[0]
-        return 'utf_8'
+        return self.string_prefs['encoding_default_codec']
 
     # attempt to convert a string to unicode from an unknown encoding
-    def convertToUnicode(self, ss):
+    def convertToUnicode(self, s):
         for encoding in self._getDefaultEncodings():
             try:
-                result = []
-                for s in ss:
-                    if s is not None:
-                        s = unicode(s, encoding)
-                    result.append(s)
-                return result, encoding
+                return unicode(s, encoding), encoding
             except (UnicodeDecodeError, LookupError):
                 pass
-        result = []
-        for s in ss:
-            if s is not None:
-                s = ''.join([unichr(ord(c)) for c in s])
-            result.append(s)
-        return result, None
+        return u''.join([ unichr(ord(c)) for c in s ]), None
 
     # cygwin and native applications can be used on windows, use this method
     # to convert a path to the usual form expected on sys.platform
     def convertToNativePath(self, s):
-	s = unicode(s, sys.getfilesystemencoding())
+        s = unicode(s, sys.getfilesystemencoding())
         if isWindows() and s.find('/') >= 0:
             # treat as a cygwin path
             s = s.replace(os.sep, '/')
@@ -1260,7 +1331,7 @@
     return "'" + s.replace("'", "'\\''") + "'"
 
 # use popen to read the output of a command
-def popenReadLines(dn, cmd, prefs, bash_pref, success_results=None):
+def popenRead(dn, cmd, prefs, bash_pref, success_results=None):
     if success_results is None:
         success_results = [ 0 ]
     if isWindows() and prefs.getBool(bash_pref):
@@ -1279,14 +1350,18 @@
     proc.stderr.close()
     fd = proc.stdout
     # read the command's output
-    ss = readlines(fd)
+    s = fd.read()
     fd.close()
     if proc.wait() not in success_results:
         raise IOError('Command failed.')
-    return ss
+    return s
+
+# use popen to read the output of a command
+def popenReadLines(dn, cmd, prefs, bash_pref, success_results=None):
+    return strip_eols(splitlines(popenRead(dn, cmd, prefs, bash_pref, success_results)))
 
 # simulate use of popen with xargs to read the output of a command
-def popenXArgsReadLines(dn, cmd, args, prefs, bash_pref, success_results=None):
+def popenXArgsReadLines(dn, cmd, args, prefs, bash_pref):
     # os.sysconf() is only available on Unix
     if hasattr(os, 'sysconf'):
         maxsize = os.sysconf('SC_ARG_MAX')
@@ -1311,7 +1386,7 @@
             s += len(args[i]) + 1
             i += 1
         if i == len(args) or not f:
-            ss.extend(popenReadLines(dn, a, prefs, bash_pref, success_results))
+            ss.extend(popenReadLines(dn, a, prefs, bash_pref))
             s, a = 0, []
     return ss
 
@@ -1369,6 +1444,7 @@
             return [ (name, prefs.getString('bzr_default_revision')), (name, None) ]
 
         def getFolderTemplate(self, prefs, names):
+            fs = _VcsFolderSet(names)
             result = []
             pwd, isabs = os.path.abspath(os.curdir), False
             args = [ prefs.getString('bzr_bin'), 'status', '-SV' ]
@@ -1378,7 +1454,7 @@
             # build list of interesting files
             # files will not appear in more than one set
             removed, modified, added, renamed = {}, {}, {}, {}
-            for s in strip_eols(popenReadLines(self.root, args, prefs, 'bzr_bash')):
+            for s in popenReadLines(self.root, args, prefs, 'bzr_bash'):
                 if len(s) > 4:
                     k = s[4:]
                     if s[1] == 'D':
@@ -1386,25 +1462,28 @@
                         k = prefs.convertToNativePath(k)
                         if not k.endswith(os.sep):
                             k = os.path.join(self.root, k)
-                            if not isabs:
-                                k = relpath(pwd, k)
-                            removed[k] = [ (k, prefs.getString('bzr_default_revision')), (None, None) ]
+                            if fs.contains(k):
+                                if not isabs:
+                                    k = relpath(pwd, k)
+                                removed[k] = [ (k, prefs.getString('bzr_default_revision')), (None, None) ]
                     elif s[1] == 'N':
                         # new file
                         k = prefs.convertToNativePath(k)
                         if not k.endswith(os.sep):
                             k = os.path.join(self.root, k)
-                            if not isabs:
-                                k = relpath(pwd, k)
-                            added[k] = [ (None, None), (k, None) ]
+                            if fs.contains(k):
+                                if not isabs:
+                                    k = relpath(pwd, k)
+                                added[k] = [ (None, None), (k, None) ]
                     elif s[1] == 'M':
                         # modified file or merge conflict
                         k = prefs.convertToNativePath(k)
                         if not k.endswith(os.sep):
                             k = os.path.join(self.root, k)
-                            if not isabs:
-                                k = relpath(pwd, k)
-                            modified[k] = self.getFileTemplate(prefs, k)
+                            if fs.contains(k):
+                                if not isabs:
+                                    k = relpath(pwd, k)
+                                modified[k] = self.getFileTemplate(prefs, k)
                     elif s[0] == 'R':
                         # renamed file
                         k = k.split(' => ')
@@ -1414,10 +1493,11 @@
                             if not k0.endswith(os.sep) and not k1.endswith(os.sep):
                                 k0 = os.path.join(self.root, k0)
                                 k1 = os.path.join(self.root, k1)
-                                if not isabs:
-                                    k0 = relpath(pwd, k0)
-                                    k1 = relpath(pwd, k1)
-                                renamed[k1] = [ (k0, prefs.getString('bzr_default_revision')), (k1, None) ]
+                                if fs.contains(k0) or fs.contains(k1):
+                                    if not isabs:
+                                        k0 = relpath(pwd, k0)
+                                        k1 = relpath(pwd, k1)
+                                    renamed[k1] = [ (k0, prefs.getString('bzr_default_revision')), (k1, None) ]
             # sort the results
             r = set()
             for m in removed, modified, added, renamed:
@@ -1429,7 +1509,7 @@
             return result
 
         def getRevision(self, prefs, name, rev):
-            return popenReadLines(self.root, [ prefs.getString('bzr_bin'), 'cat', '--name-from-revision', '-r', rev, safeRelativePath(self.root, name, prefs, 'bzr_cygwin') ], prefs, 'bzr_bash')
+            return popenRead(self.root, [ prefs.getString('bzr_bin'), 'cat', '--name-from-revision', '-r', rev, safeRelativePath(self.root, name, prefs, 'bzr_cygwin') ], prefs, 'bzr_bash')
 
     # CVS support
     class Cvs:
@@ -1440,6 +1520,7 @@
             return [ (name, prefs.getString('cvs_default_revision')), (name, None) ]
 
         def getFolderTemplate(self, prefs, names):
+            fs = _VcsFolderSet(names)
             result = []
             pwd, isabs = os.path.abspath(os.curdir), False
             r = {}
@@ -1448,12 +1529,13 @@
                 isabs |= os.path.isabs(name)
                 args.append(safeRelativePath(self.root, name, prefs, 'cvs_cygwin'))
             # build list of interesting files
-            for s in strip_eols(popenReadLines(self.root, args, prefs, 'cvs_bash')):
+            for s in popenReadLines(self.root, args, prefs, 'cvs_bash'):
                 if len(s) > 2 and s[0] in 'ACMR':
                     k = os.path.join(self.root, prefs.convertToNativePath(s[2:]))
-                    if not isabs:
-                        k = relpath(pwd, k)
-                    r[k] = s[0]
+                    if fs.contains(k):
+                        if not isabs:
+                            k = relpath(pwd, k)
+                        r[k] = s[0]
             # sort the results
             for k in sorted(r.keys()):
                 v = r[k]
@@ -1469,7 +1551,12 @@
             return result
 
         def getRevision(self, prefs, name, rev):
-            return popenReadLines(self.root, [ prefs.getString('cvs_bin'), '-Q', 'update', '-p', '-r', rev, safeRelativePath(self.root, name, prefs, 'cvs_cygwin') ], prefs, 'cvs_bash')
+            if rev == 'BASE' and not os.path.exists(name):
+                # find revision for removed files
+                for s in popenReadLines(self.root, [ prefs.getString('cvs_bin'), 'status', safeRelativePath(self.root, name, prefs, 'cvs_cygwin') ], prefs, 'cvs_bash'):
+                    if s.startswith('   Working revision:\t-'):
+                        rev = s.split('\t')[1][1:]
+            return popenRead(self.root, [ prefs.getString('cvs_bin'), '-Q', 'update', '-p', '-r', rev, safeRelativePath(self.root, name, prefs, 'cvs_cygwin') ], prefs, 'cvs_bash')
 
     # Darcs support
     class Darcs:
@@ -1481,23 +1568,25 @@
             return [ (name, prefs.getString('darcs_default_revision')), (name, None) ]
 
         def getFolderTemplate(self, prefs, names):
+            fs = _VcsFolderSet(names)
             result = []
             pwd, isabs = os.path.abspath(os.curdir), False
             r = {}
-            args = [ prefs.getString('darcs_bin'), 'whatsnew', '-l' ]
+            args = [ prefs.getString('darcs_bin'), 'whatsnew', '-s' ]
             for name in names:
                 isabs |= os.path.isabs(name)
                 args.append(safeRelativePath(self.root, name, prefs, 'darcs_cygwin'))
             # build list of interesting files
-            for s in strip_eols(popenReadLines(self.root, args, prefs, 'darcs_bash')):
+            for s in popenReadLines(self.root, args, prefs, 'darcs_bash'):
                 p = s.split(' ')
                 if len(p) >= 2 and s[0] in 'AMR':
                     k = prefs.convertToNativePath(p[1])
                     if not k.endswith(os.sep):
                         k = os.path.join(self.root, k)
-                        if not isabs:
-                            k = relpath(pwd, k)
-                        r[k] = s[0]
+                        if fs.contains(k):
+                            if not isabs:
+                                k = relpath(pwd, k)
+                            r[k] = s[0]
             # sort the results
             for k in sorted(r.keys()):
                 v = r[k]
@@ -1513,7 +1602,7 @@
             return result
 
         def getRevision(self, prefs, name, rev):
-            return popenReadLines(self.root, [ prefs.getString('darcs_bin'), 'show', 'contents', '-p', rev, safeRelativePath(self.root, name, prefs, 'darcs_cygwin') ], prefs, 'darcs_bash')
+            return popenRead(self.root, [ prefs.getString('darcs_bin'), 'show', 'contents', '-p', rev, safeRelativePath(self.root, name, prefs, 'darcs_cygwin') ], prefs, 'darcs_bash')
 
     # Git support
     class Git:
@@ -1527,83 +1616,84 @@
             return os.path.join(self.root, prefs.convertToNativePath(s.strip()))
 
         def getFolderTemplate(self, prefs, names):
-            fs = _VcsFolderSet(names)
-            result = []
+            # build command
+            args = [ prefs.getString('git_bin'), 'status', '--porcelain', '-s', '--untracked-files=no' ]
+            # build list of interesting files
             pwd, isabs = os.path.abspath(os.curdir), False
-            args = [ prefs.getString('git_bin'), 'status' ]
             for name in names:
                 isabs |= os.path.isabs(name)
+            # run command
+            prev = prefs.getString('git_default_revision')
+            fs = _VcsFolderSet(names)
+            added, modified, removed, renamed = {}, {}, {}, {}
             # 'git status' will return 1 when a commit would fail
-            ss = strip_eols(popenReadLines(self.root, args, prefs, 'git_bash', [0, 1]))
-            # build list of interesting files
-            # files may appear in more than one set
-            i = 0
-            unmerged, removed, added, modified, renamed = {}, {}, {}, {}, {}
-            while i < len(ss):
-                s = ss[i]
-                i += 1
-                if s.startswith('# Untracked files:'):
-                    break
-                elif s.startswith('#\tunmerged:'):
-                    # merge conflict
-                    k = self._extractPath(s[11:], prefs)
-                    if fs.contains(k):
-                        if not isabs:
-                            k = relpath(pwd, k)
-                        unmerged[k] = [ (k, prefs.getString('git_default_revision')), (k, None), (k, 'MERGE_HEAD') ]
-                elif s.startswith('#\tdeleted:'):
-                    # deleted file
-                    k = self._extractPath(s[10:], prefs)
+            for s in popenReadLines(self.root, args, prefs, 'git_bash', [0, 1]):
+                # parse response
+                if len(s) < 3:
+                    continue
+                x, y, k = s[0], s[1], s[2:]
+                if (y == 'D' and x not in 'UD') or (x == 'D' and y == ' '):
+                    # removed
+                    k = self._extractPath(k, prefs)
                     if fs.contains(k):
                         if not isabs:
                             k = relpath(pwd, k)
-                        removed[k] = [ (k, prefs.getString('git_default_revision')), (None, None) ]
-                elif s.startswith('#\tnew file:'):
-                    # new file
-                    k = self._extractPath(s[11:], prefs)
+                        removed[k] = [ (k, prev), (None, None) ]
+                elif x == 'A' and y not in 'UA':
+                    # added
+                    k = self._extractPath(k, prefs)
                     if fs.contains(k):
                         if not isabs:
                             k = relpath(pwd, k)
                         added[k] = [ (None, None), (k, None) ]
-                elif s.startswith('#\tmodified:'):
-                    # modified file
-                    k = self._extractPath(s[11:], prefs)
+                elif x == 'R':
+                    # renamed
+                    k = k.split(' -> ')
+                    if len(k) == 2:
+                        k0 = self._extractPath(k[0], prefs)
+                        k1 = self._extractPath(k[1], prefs)
+                        if fs.contains(k0) or fs.contains(k1):
+                            if not isabs:
+                                k0 = relpath(pwd, k0)
+                                k1 = relpath(pwd, k1)
+                            renamed[k1] = [ (k0, prev), (k1, None) ]
+                elif x in 'CM' or y == 'M':
+                    # modified
+                    k = self._extractPath(k, prefs)
                     if fs.contains(k):
                         if not isabs:
                             k = relpath(pwd, k)
-                        modified[k] = self.getFileTemplate(prefs, k)
-                elif s.startswith('#\tboth modified:'):
-                    # stash conflict
-                    k = self._extractPath(s[16:], prefs)
+                        modified[k] = [ (k, prev), (k, None) ]
+                else:
+                    # merge conflict
+                    k = self._extractPath(k, prefs)
                     if fs.contains(k):
                         if not isabs:
                             k = relpath(pwd, k)
-                        unmerged[k] = [ (k, prefs.getString('git_default_revision')), (k, None), (k, ':3') ]
-                elif s.startswith('#\trenamed:'):
-                    # renamed file
-                    keys = s[10:].split(' -> ')
-                    if len(keys) == 2:
-                        k0 = self._extractPath(keys[0], prefs)
-                        k1 = self._extractPath(keys[1], prefs)
-                        if fs.contains(k0) or fs.contains(k1):
-                            if not isabs:
-                                k0 = relpath(pwd, k0)
-                                k1 = relpath(pwd, k1)
-                            renamed[k1] = [ (k0, prefs.getString('git_default_revision')), (k1, None) ]
+                        if x == 'D':
+                            panes = [ (None, None) ]
+                        else:
+                            panes = [ (k, ':2') ]
+                        panes.append((k, None))
+                        if y == 'D':
+                            panes.append((None, None))
+                        else:
+                            panes.append((k, ':3'))
+                        if x != 'A' and y != 'A':
+                            panes.append((k, ':1'))
+                        modified[k] = panes
             # sort the results
-            r = set()
-            for m in unmerged, removed, added, modified, renamed:
+            result, r = [], set()
+            for m in added, modified, removed, renamed:
                 r.update(m.keys())
             for k in sorted(r):
-                for m in unmerged, removed, added, modified, renamed:
+                for m in removed, added, modified, renamed:
                     if m.has_key(k):
                         result.append(m[k])
-                        # break so we open no more than one tab per file
-                        break
             return result
 
         def getRevision(self, prefs, name, rev):
-            return popenReadLines(self.root, [ prefs.getString('git_bin'), 'show', '%s:%s' % (rev, relpath(self.root, os.path.abspath(name)).replace(os.sep, '/')) ], prefs, 'git_bash')
+            return popenRead(self.root, [ prefs.getString('git_bin'), 'show', '%s:%s' % (rev, relpath(self.root, os.path.abspath(name)).replace(os.sep, '/')) ], prefs, 'git_bash')
 
     # Mercurial support
     class Hg:
@@ -1614,6 +1704,7 @@
             return [ (name, prefs.getString('hg_default_revision')), (name, None) ]
 
         def getFolderTemplate(self, prefs, names):
+            fs = _VcsFolderSet(names)
             result = []
             pwd, isabs = os.path.abspath(os.curdir), False
             r = {}
@@ -1622,16 +1713,17 @@
                 isabs |= os.path.isabs(name)
                 args.append(safeRelativePath(self.root, name, prefs, 'hg_cygwin'))
             # build list of interesting files
-            for s in strip_eols(popenReadLines(self.root, args, prefs, 'hg_bash')):
-                if len(s) > 2 and s[0] in 'ADM':
+            for s in popenReadLines(self.root, args, prefs, 'hg_bash'):
+                if len(s) > 2 and s[0] in 'AMR':
                     k = os.path.join(self.root, prefs.convertToNativePath(s[2:]))
-                    if not isabs:
-                        k = relpath(pwd, k)
-                    r[k] = s[0]
+                    if fs.contains(k):
+                        if not isabs:
+                            k = relpath(pwd, k)
+                        r[k] = s[0]
             # sort the results
             for k in sorted(r.keys()):
                 v = r[k]
-                if v == 'D':
+                if v == 'R':
                     # deleted file
                     result.append( [ (k, prefs.getString('hg_default_revision')), (None, None) ] )
                 elif v == 'A':
@@ -1643,7 +1735,7 @@
             return result
 
         def getRevision(self, prefs, name, rev):
-            return popenReadLines(self.root, [ prefs.getString('hg_bin'), 'cat', '-r', rev, safeRelativePath(self.root, name, prefs, 'hg_cygwin') ], prefs, 'hg_bash')
+            return popenRead(self.root, [ prefs.getString('hg_bin'), 'cat', '-r', rev, safeRelativePath(self.root, name, prefs, 'hg_cygwin') ], prefs, 'hg_bash')
 
     # Monotone support
     class Mtn:
@@ -1662,7 +1754,7 @@
             for name in names:
                 isabs |= os.path.isabs(name)
             # build list of interesting files
-            ss = strip_eols(popenReadLines(self.root, args, prefs, 'mtn_bash'))
+            ss = popenReadLines(self.root, args, prefs, 'mtn_bash')
             removed, added, modified, renamed = {}, {}, {}, {}
             i = 0
             while i < len(ss):
@@ -1723,7 +1815,7 @@
             return result
 
         def getRevision(self, prefs, name, rev):
-            return popenReadLines(self.root, [ prefs.getString('mtn_bin'), 'cat', '--quiet', '-r', rev, safeRelativePath(self.root, name, prefs, 'mtn_cygwin') ], prefs, 'mtn_bash')
+            return popenRead(self.root, [ prefs.getString('mtn_bin'), 'cat', '--quiet', '-r', rev, safeRelativePath(self.root, name, prefs, 'mtn_cygwin') ], prefs, 'mtn_bash')
 
     # RCS support
     class Rcs:
@@ -1733,15 +1825,16 @@
         def getFileTemplate(self, prefs, name):
             args = [ prefs.getString('rcs_bin_rlog'), '-L', '-h', safeRelativePath(self.root, name, prefs, 'rcs_cygwin') ]
             rev = ''
-            for line in strip_eols(popenReadLines(self.root, args, prefs, 'rcs_bash')):
+            for line in popenReadLines(self.root, args, prefs, 'rcs_bash'):
                 if line.startswith('head: '):
                     rev = line[6:]
             return [ (name, rev), (name, None) ]
 
         def getFolderTemplate(self, prefs, names):
-            result = []
+            # build command
+            cmd = [ prefs.getString('rcs_bin_rlog'), '-L', '-h' ]
+            # build list of interesting files
             pwd, isabs = os.path.abspath(os.curdir), False
-
             r = []
             for k in names:
                 if os.path.isdir(k):
@@ -1781,15 +1874,13 @@
                     s[-1] += ',v'
                     if os.path.isfile(os.sep.join(s)):
                         r.append(k)
-
-            # build list of interesting files
             for k in r:
                 isabs |= os.path.isabs(k)
-            cmd = [ prefs.getString('rcs_bin_rlog'), '-L', '-h' ]
             args = [ safeRelativePath(self.root, k, prefs, 'rcs_cygwin') for k in r ]
-
+            # run command
             r, k = {}, ''
-            for line in strip_eols(popenXArgsReadLines(self.root, cmd, args, prefs, 'rcs_bash')):
+            for line in popenXArgsReadLines(self.root, cmd, args, prefs, 'rcs_bash'):
+                # parse response
                 if line.startswith('Working file: '):
                     k = prefs.convertToNativePath(line[14:])
                     k = os.path.join(self.root, os.path.normpath(k))
@@ -1797,19 +1888,26 @@
                         k = relpath(pwd, k)
                 elif line.startswith('head: '):
                     r[k] = line[6:]
-
             # sort the results
-            for k in sorted(r.keys()):
-                result.append([ (k, r[k]), (k, None) ])
-            return result
+            return [ [ (k, r[k]), (k, None) ] for k in sorted(r.keys()) ]
 
         def getRevision(self, prefs, name, rev):
-            return popenReadLines(self.root, [ prefs.getString('rcs_bin_co'), '-p', '-q', '-r' + rev, safeRelativePath(self.root, name, prefs, 'rcs_cygwin') ], prefs, 'rcs_bash')
+            return popenRead(self.root, [ prefs.getString('rcs_bin_co'), '-p', '-q', '-r' + rev, safeRelativePath(self.root, name, prefs, 'rcs_cygwin') ], prefs, 'rcs_bash')
 
     # Subversion support
     class Svn:
         def __init__(self, root):
             self.root = root
+            self.url = None
+
+        def getURL(self, prefs):
+            if self.url is None:
+                args = [ prefs.getString('svn_bin'), 'info' ]
+                for s in popenReadLines(self.root, args, prefs, 'svn_bash'):
+                    if s.startswith('URL: '):
+                        self.url = s[5:]
+                        break
+            return self.url
 
         def getFileTemplate(self, prefs, name):
             # merge conflict
@@ -1827,6 +1925,7 @@
             return [ (name, prefs.getString('svn_default_revision')), (name, None) ]
 
         def getFolderTemplate(self, prefs, names):
+            fs = _VcsFolderSet(names)
             result = []
             pwd, isabs = os.path.abspath(os.curdir), False
             r = {}
@@ -1835,17 +1934,17 @@
                 isabs |= os.path.isabs(name)
                 args.append(safeRelativePath(self.root, name, prefs, 'svn_cygwin'))
             # build list of interesting files
-            for s in strip_eols(popenReadLines(self.root, args, prefs, 'svn_bash')):
+            for s in popenReadLines(self.root, args, prefs, 'svn_bash'):
                 if len(s) > 7 and s[0] in 'ACDMR':
                     # subversion 1.6 adds a new column
                     k = 7
                     if k < len(s) and s[k] == ' ':
                         k += 1
                     k = os.path.join(self.root, prefs.convertToNativePath(s[k:]))
-                    if not isabs:
-                        k = relpath(pwd, k)
                     # FIXME: prune dropped directories from the results
-                    if not os.path.isdir(k):
+                    if fs.contains(k) and not os.path.isdir(k):
+                        if not isabs:
+                            k = relpath(pwd, k)
                         r[k] = s[0]
             # sort the results
             for k in sorted(r.keys()):
@@ -1861,12 +1960,14 @@
                     result.append(self.getFileTemplate(prefs, k))
                 elif v == 'R':
                     # renamed file
-                    result.append( [ (k + '@BASE', prefs.getString('svn_default_revision')), (None, None) ] )
+                    result.append( [ (k, prefs.getString('svn_default_revision')), (None, None) ] )
                     result.append( [ (None, None), (k, None) ] )
             return result
 
         def getRevision(self, prefs, name, rev):
-            return popenReadLines(self.root, [ prefs.getString('svn_bin'), 'cat', '-r', rev, safeRelativePath(self.root, name, prefs, 'svn_cygwin') ], prefs, 'svn_bash')
+            if rev in [ 'PREV', 'BASE', 'COMMITTED' ]:
+                return popenRead(self.root, [ prefs.getString('svn_bin'), 'cat', '%s@%s' % (safeRelativePath(self.root, name, prefs, 'svn_cygwin'), rev) ], prefs, 'svn_bash')
+            return popenRead(self.root, [ prefs.getString('svn_bin'), 'cat', '%s/%s@%s' % (self.getURL(prefs), relpath(self.root, os.path.abspath(name)).replace(os.sep, '/'), rev) ], prefs, 'svn_bash')
 
     # SVK support
     def isSvkManaged(self, name):
@@ -1878,7 +1979,7 @@
             try:
                 # find working copies by parsing the config file
                 f = open(self.svkconfig, 'r')
-                ss = strip_eols(readlines(f))
+                ss = readlines(f)
                 f.close()
                 projs, sep = [], os.sep
                 # find the separator character
@@ -1935,6 +2036,7 @@
             return [ (name, prefs.getString('svk_default_revision')), (name, None) ]
 
         def getFolderTemplate(self, prefs, names):
+            fs = _VcsFolderSet(names)
             result = []
             pwd, isabs = os.path.abspath(os.curdir), False
             r = {}
@@ -1943,13 +2045,13 @@
                 isabs |= os.path.isabs(name)
                 args.append(safeRelativePath(self.root, name, prefs, 'svk_cygwin'))
             # build list of interesting files
-            for s in strip_eols(popenReadLines(self.root, args, prefs, 'svk_bash')):
+            for s in popenReadLines(self.root, args, prefs, 'svk_bash'):
                 if len(s) > 4 and s[0] in 'ACDMR':
                     k = os.path.join(self.root, prefs.convertToNativePath(s[4:]))
-                    if not isabs:
-                        k = relpath(pwd, k)
                     # FIXME: prune dropped directories from the results
-                    if not os.path.isdir(k):
+                    if fs.contains(k) and not os.path.isdir(k):
+                        if not isabs:
+                            k = relpath(pwd, k)
                         r[k] = s[0]
             # sort the results
             for k in sorted(r.keys()):
@@ -1966,7 +2068,7 @@
             return result
 
         def getRevision(self, prefs, name, rev):
-            return popenReadLines(self.root, [ prefs.getString('svk_bin'), 'cat', '-r', rev, safeRelativePath(self.root, name, prefs, 'svk_cygwin') ], prefs, 'svk_bash')
+            return popenRead(self.root, [ prefs.getString('svk_bin'), 'cat', '-r', rev, safeRelativePath(self.root, name, prefs, 'svk_cygwin') ], prefs, 'svk_bash')
 
     def __init__(self):
         # initialise the VCS objects
@@ -1974,8 +2076,8 @@
         if svkroot is None:
             svkroot = os.path.expanduser('~/.svk')
         self.svkconfig = os.path.join(svkroot, 'config')
-        self.leaf_dir_repos = [('.svn', VCSs.Svn), ('CVS', VCSs.Cvs), ('RCS', VCSs.Rcs)]
-        self.common_dir_repos = [('.git', VCSs.Git), ('.hg', VCSs.Hg), ('.bzr', VCSs.Bzr), ('_darcs', VCSs.Darcs), ('_MTN', VCSs.Mtn)]
+        self.leaf_dir_repos = [ ('.svn', VCSs.Svn), ('CVS', VCSs.Cvs), ('RCS', VCSs.Rcs) ]
+        self.common_dir_repos = [ ('.git', VCSs.Git), ('.hg', VCSs.Hg), ('.bzr', VCSs.Bzr), ('_darcs', VCSs.Darcs), ('_MTN', VCSs.Mtn) ]
 
     # determines which VCS to use for the named file
     def findByFolder(self, path, prefs):
@@ -2321,6 +2423,213 @@
         return 1
     return 2
 
+# longest common subsequence of unique elements common to 'a' and 'b'
+def __patience_subsequence(a, b):
+    # value unique lines by their order in each list
+    value_a, value_b = {}, {}
+    # find unique values in 'a'
+    for i, s in enumerate(a):
+        if s in value_a:
+            value_a[s] = -1
+        else:
+            value_a[s] = i
+    # find unique values in 'b'
+    for i, s in enumerate(b):
+        if s in value_b:
+            value_b[s] = -1
+        else:
+            value_b[s] = i
+    # lay down items in 'b' as if playing patience if the item is unique in
+    # 'a' and 'b'
+    pile, pointers, atob = [], {}, {}
+    get, append = value_a.get, pile.append
+    for s in b:
+        v = get(s, -1)
+        if v != -1:
+            vb = value_b[s]
+            if vb != -1:
+                atob[v] = vb
+                # find appropriate pile for v
+                start, end = 0, len(pile)
+                # optimisation as values usually increase
+                if end and v > pile[-1]:
+                    start = end
+                else:
+                    while start < end:
+                        mid = (start + end) // 2
+                        if v < pile[mid]:
+                            end = mid
+                        else:
+                            start = mid + 1
+                if start < len(pile):
+                    pile[start] = v
+                else:
+                    append(v)
+                if start:
+                    pointers[v] = pile[start-1]
+    # examine our piles to determine the longest common subsequence
+    result = []
+    if pile:
+        v, append = pile[-1], result.append
+        append((v, atob[v]))
+        while v in pointers:
+            v = pointers[v]
+            append((v, atob[v]))
+        result.reverse()
+    return result
+
+# difflib-style approximation of the longest common subsequence
+def __lcs_approx(a, b):
+    count1, lookup = {}, {}
+    # count occurances of each element in 'a'
+    for s in a:
+        count1[s] = count1.get(s, 0) + 1
+    # construct a mapping from a element to where it can be found in 'b'
+    for i, s in enumerate(b):
+        if s in lookup:
+            lookup[s].append(i)
+        else:
+            lookup[s] = [ i ]
+    if set(lookup).intersection(count1):
+        # we have some common elements
+        # identify popular entries
+        popular = {}
+        n = len(a)
+        if n > 200:
+            for k, v in count1.items():
+                if 100 * v > n:
+                    popular[k] = 1
+        n = len(b)
+        if n > 200:
+            for k, v in lookup.items():
+                if 100 * len(v) > n:
+                    popular[k] = 1
+        # while walk through entries in 'a', incrementally update the list of
+        # matching subsequences in 'b' and keep track of the longest match
+        # found
+        prev_matches, matches, max_length, max_indices = {}, {}, 0, []
+        for ai, s in enumerate(a):
+            if s in lookup:
+                if s in popular:
+                    # we only extend existing previously found matches to avoid
+                    # performance issues
+                    for bi in prev_matches:
+                        if bi + 1 < n and b[bi + 1] == s:
+                            matches[bi] = v = prev_matches[bi] + 1
+                            # check if this is now the longest match
+                            if v >= max_length:
+                                if v == max_length:
+                                    max_indices.append((ai, bi))
+                                else:
+                                    max_length = v
+                                    max_indices = [ (ai, bi) ]
+                else:
+                    prev_get = prev_matches.get
+                    for bi in lookup[s]:
+                        matches[bi] = v = prev_get(bi - 1, 0) + 1
+                        # check if this is now the longest match
+                        if v >= max_length:
+                            if v == max_length:
+                                max_indices.append((ai, bi))
+                            else:
+                                max_length = v
+                                max_indices = [ (ai, bi) ]
+            prev_matches, matches = matches, {}
+        if max_indices:
+            # include any popular entries at the beginning
+            aidx, bidx, nidx = 0, 0, 0
+            for ai, bi in max_indices:
+                n = max_length
+                ai += 1 - n
+                bi += 1 - n
+                while ai and bi and a[ai - 1] == b[bi - 1]:
+                    ai -= 1
+                    bi -= 1
+                    n += 1
+                if n > nidx:
+                    aidx, bidx, nidx = ai, bi, n
+            return aidx, bidx, nidx
+
+# patinence diff with difflib-style fallback
+def patience_diff(a, b):
+    matches, len_a, len_b = [], len(a), len(b)
+    if len_a and len_b:
+        blocks = [ (0, len_a, 0, len_b, 0) ]
+        while blocks:
+            start_a, end_a, start_b, end_b, match_idx = blocks.pop()
+            aa, bb = a[start_a:end_a], b[start_b:end_b]
+            # try patience
+            pivots = __patience_subsequence(aa, bb)
+            if pivots:
+                offset_a, offset_b = start_a, start_b
+                for pivot_a, pivot_b in pivots:
+                    pivot_a += offset_a
+                    pivot_b += offset_b
+                    if start_a <= pivot_a:
+                        # extend before
+                        idx_a, idx_b = pivot_a, pivot_b
+                        while start_a < idx_a and start_b < idx_b and a[idx_a - 1] == b[idx_b - 1]:
+                            idx_a -= 1
+                            idx_b -= 1
+                        # if anything is before recurse on the section
+                        if start_a < idx_a and start_b < idx_b:
+                            blocks.append((start_a, idx_a, start_b, idx_b, match_idx))
+                        # extend after
+                        start_a, start_b = pivot_a + 1, pivot_b + 1
+                        while start_a < end_a and start_b < end_b and a[start_a] == b[start_b]:
+                            start_a += 1
+                            start_b += 1
+                        # record match
+                        matches.insert(match_idx, (idx_a, idx_b, start_a - idx_a))
+                        match_idx += 1
+                # if anything is after recurse on the section
+                if start_a < end_a and start_b < end_b:
+                    blocks.append((start_a, end_a, start_b, end_b, match_idx))
+            else:
+                # fallback if patience fails
+                pivots = __lcs_approx(aa, bb)
+                if pivots:
+                    idx_a, idx_b, n = pivots
+                    idx_a += start_a
+                    idx_b += start_b
+                    # if anything is before recurse on the section
+                    if start_a < idx_a and start_b < idx_b:
+                        blocks.append((start_a, idx_a, start_b, idx_b, match_idx))
+                    # record match
+                    matches.insert(match_idx, (idx_a, idx_b, n))
+                    match_idx += 1
+                    idx_a += n
+                    idx_b += n
+                    # if anything is after recurse on the section
+                    if idx_a < end_a and idx_b < end_b:
+                        blocks.append((idx_a, end_a, idx_b, end_b, match_idx))
+    # try matching from begining to first match block
+    if matches:
+        end_a, end_b = matches[0][:2]
+    else:
+        end_a, end_b = len_a, len_b
+    i = 0
+    while i < end_a and i < end_b and a[i] == b[i]:
+        i += 1
+    if i:
+        matches.insert(0, (0, 0, i))
+    # try matching from last match block to end
+    if matches:
+        start_a, start_b, n = matches[-1]
+        start_a += n
+        start_b += n
+    else:
+        start_a, start_b = 0, 0
+    end_a, end_b = len_a, len_b
+    while start_a < end_a and start_b < end_b and a[end_a - 1] == b[end_b - 1]:
+        end_a -= 1
+        end_b -= 1
+    if end_a < len_a:
+        matches.append((end_a, end_b, len_a - end_a))
+    # add a zero length block to the end
+    matches.append((len_a, len_b, 0))
+    return matches
+
 # widget used to compare and merge text files
 class FileDiffViewer(gtk.Table):
     # class describing a text pane
@@ -2377,6 +2686,7 @@
         self.set_flags(gtk.CAN_FOCUS)
         self.prefs = prefs
         self.string_width_cache = {}
+        self.options = {}
 
         # diff blocks
         self.blocks = []
@@ -2545,7 +2855,10 @@
     # are known and the scroll bar can be moved to the first difference
     def _realise_cb(self, widget):
         self.im_context.set_client_window(self.window)
-        self.first_difference()
+        try:
+            self.go_to_line(self.options['line'])
+        except KeyError:
+            self.first_difference()
 
     # callback for most menu items and buttons
     def button_cb(self, widget, data):
@@ -2553,6 +2866,10 @@
         self._button_actions[data]()
         self.closeUndoBlock()
 
+    # set startup options
+    def setOptions(self, options):
+        self.options = options
+
     # updates the display font and resizes viewports as necessary
     def setFont(self, font):
         self.font = font
@@ -2572,7 +2889,7 @@
         get = char_width_cache.get
         for c in s:
             w = get(c, 0)
-            if w == 0: 
+            if w == 0:
                 v = ord(c)
                 if v < 32:
                     if c == '\t':
@@ -3283,7 +3600,7 @@
         # align s1 and s2 by inserting spacer lines
         # this will be used to determine which lines from the inner lists of
         # lines should be neighbours
-        for block in difflib.SequenceMatcher(None, t1, t2).get_matching_blocks():
+        for block in patience_diff(t1, t2):
             delta = (n1 + block[0]) - (n2 + block[1])
             if delta < 0:
                 # insert spacer lines in s1
@@ -4283,6 +4600,17 @@
                                 cr.rectangle(x_start + pixels(x_temp), y_start, pixels(w), h)
                                 cr.fill()
 
+                if self.prefs.getBool('display_show_right_margin'):
+                    # draw margin
+                    x_temp = line_number_width + pixels(self.prefs.getInt('display_right_margin') * self.digit_width)
+                    if x_temp >= x and x_temp < maxx:
+                        colour = theResources.getColour('margin')
+                        cr.set_source_rgb(colour.red, colour.green, colour.blue)
+                        cr.set_line_width(1)
+                        cr.move_to(x_temp, y_start)
+                        cr.rel_line_to(0, h)
+                        cr.stroke()
+
                 if text is None:
                     # draw hatching
                     colour = theResources.getColour('hatch')
@@ -4696,7 +5024,7 @@
     def im_commit_cb(self, im, s):
         if self.mode == CHAR_MODE:
             self.openUndoBlock()
-            self.replaceText(self.prefs.convertToUnicode([ s ])[0][0])
+            self.replaceText(unicode(s, 'utf_8'))
             self.closeUndoBlock()
 
     # update the cached preedit text
@@ -4717,7 +5045,7 @@
             s, a, c = self.im_context.get_preedit_string()
             if len(s) > 0:
                 # we have preedit text, draw that instead
-                s = self.prefs.convertToUnicode([ s ])[0][0]
+                s = unicode(s, 'utf_8')
                 p = (s, a, c)
             else:
                 p = None
@@ -5000,7 +5328,7 @@
             needs_block = (self.undoblock is None)
             if needs_block:
                 self.openUndoBlock()
-            self.replaceText(self.prefs.convertToUnicode([ text ])[0][0])
+            self.replaceText(unicode(nullToEmpty(text), 'utf_8'))
             if needs_block:
                 self.closeUndoBlock()
 
@@ -5232,7 +5560,7 @@
         vadj.set_value(y)
 
     # move the cursor from line 'i' to the next difference in direction 'delta'
-    def goto_difference(self, i, delta):
+    def go_to_difference(self, i, delta):
         f = self.current_pane
         nlines = len(self.panes[f].lines)
         # back up to beginning of difference
@@ -5260,25 +5588,25 @@
     # 'first_difference' action
     def first_difference(self):
         self.setLineMode()
-        self.goto_difference(0, 1)
+        self.go_to_difference(0, 1)
 
     # 'previous_difference' action
     def previous_difference(self):
         self.setLineMode()
         i = min(self.current_line, self.selection_line) - 1
-        self.goto_difference(i, -1)
+        self.go_to_difference(i, -1)
 
     # 'next_difference' action
     def next_difference(self):
         self.setLineMode()
         i = max(self.current_line, self.selection_line) + 1
-        self.goto_difference(i, 1)
+        self.go_to_difference(i, 1)
 
     # 'last_difference' action
     def last_difference(self):
         self.setLineMode()
         i = len(self.panes[self.current_pane].lines)
-        self.goto_difference(i, -1)
+        self.go_to_difference(i, -1)
 
     # Undo for changes to the pane ordering
     class SwapPanesUndo:
@@ -5818,17 +6146,9 @@
         label = gtk.Label(_('Encoding: '))
         hbox.pack_start(label, False, False, 0)
         label.show()
-        self.combobox = combobox = gtk.combo_box_new_text()
-        self.encodings = prefs.getEncodings()
-        for e in self.encodings:
-            combobox.append_text(e)
-        if action in [ gtk.FILE_CHOOSER_ACTION_OPEN, gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER ]:
-            self.encodings = self.encodings[:]
-            self.encodings.insert(0, None)
-            combobox.prepend_text(_('Auto Detect'))
-            combobox.set_active(0)
-        hbox.pack_start(combobox, False, False, 5)
-        combobox.show()
+        self.encoding = entry = EncodingMenu(prefs, action in [ gtk.FILE_CHOOSER_ACTION_OPEN, gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER ])
+        hbox.pack_start(entry, False, False, 5)
+        entry.show()
         if action == gtk.FILE_CHOOSER_ACTION_OPEN:
             self.revision = entry = gtk.Entry()
             hbox.pack_end(entry, False, False, 0)
@@ -5842,22 +6162,17 @@
         self.set_current_folder(unicode(os.path.realpath(os.curdir), sys.getfilesystemencoding()))
 
     def set_encoding(self, encoding):
-        if encoding not in self.encodings:
-            encoding = self.prefs.getDefaultEncoding()
-        if encoding in self.encodings:
-            self.combobox.set_active(self.encodings.index(encoding))
+        self.encoding.set_text(encoding)
 
     def get_encoding(self):
-        i = self.combobox.get_active()
-        if i >= 0:
-            return self.encodings[i]
+        return self.encoding.get_text()
 
     def get_revision(self):
         return self.revision.get_text()
 
     def get_filename(self):
         # convert from UTF-8 string to unicode
-        return decodefilename(gtk.FileChooserDialog.get_filename(self))
+        return decode_fs_string(gtk.FileChooserDialog.get_filename(self))
 
 # dialogue used to search for text
 class GoToLineDialog(gtk.Dialog):
@@ -5954,7 +6269,7 @@
 
 # contains information about a file
 class FileInfo:
-    def __init__(self, name=None, encoding=None, vcs=None, revision=None):
+    def __init__(self, name=None, encoding=None, vcs=None, revision=None, label=None):
         # file name
         self.name = name
         # name of codec used to translate the file contents to unicode text
@@ -5963,6 +6278,8 @@
         self.vcs = vcs
         # revision used to retrieve file from the VCS
         self.revision = revision
+        # alternate text to display instead of the actual file name
+        self.label = label
         # 'stat' for files read from disk -- used to warn about changes to the
         # file on disk before saving
         self.stat = None
@@ -5970,6 +6287,18 @@
         # to warn about changes to file on disk
         self.last_stat = None
 
+# assign user specified labels to the corresponding files
+def assign_file_labels(items, labels):
+    new_items = []
+    ss = labels[::-1]
+    for name, data in items:
+        if ss:
+            s = ss.pop()
+        else:
+            s = None
+        new_items.append((name, data, s))
+    return new_items
+
 # the main application class containing a set of file viewers
 # this class displays tab for switching between viewers and dispatches menu
 # commands to the current viewer
@@ -6005,10 +6334,14 @@
             def updateTitle(self):
                 ss = []
                 info = self.info
-                if info.name is not None:
-                    ss.append(info.name)
-                if info.revision is not None:
-                    ss.append('(' + info.revision + ')')
+                if info.label is not None:
+                    # show the provided label instead of the file name
+                    ss.append(info.label)
+                else:
+                    if info.name is not None:
+                        ss.append(info.name)
+                    if info.revision is not None:
+                        ss.append('(' + info.revision + ')')
                 if self.has_edits:
                     ss.append('*')
                 s = ' '.join(ss)
@@ -6193,9 +6526,13 @@
             unique_names = set()
             for header in self.headers:
                 has_edits |= header.has_edits
-                s = header.info.name
+                s = header.info.label
+                if s is None:
+                    # no label provided, show the file name instead
+                    s = header.info.name
+                    if s is not None:
+                        s = os.path.basename(s)
                 if s is not None:
-                    s = os.path.basename(s)
                     names.append(s)
                     unique_names.add(s)
 
@@ -6230,7 +6567,7 @@
                     if rev is None:
                         # load the contents of a plain file
                         fd = open(name, 'rb')
-                        ss = readlines(fd)
+                        s = fd.read()
                         fd.close()
                         # get the file's modification times so we can detect changes
                         stat = os.stat(name)
@@ -6239,12 +6576,13 @@
                             raise IOError('Not under version control.')
                         fullname = os.path.abspath(name)
                         # retrieve the revision from the version control system
-                        ss = info.vcs.getRevision(self.prefs, fullname, rev)
+                        s = info.vcs.getRevision(self.prefs, fullname, rev)
                     # convert file contents to unicode
                     if encoding is None:
-                        ss, encoding = self.prefs.convertToUnicode(ss)
+                        s, encoding = self.prefs.convertToUnicode(s)
                     else:
-                        ss = [ unicode(s, encoding) for s in ss ]
+                        s = unicode(s, encoding)
+                    ss = splitlines(s)
                 except (IOError, OSError, UnicodeDecodeError, WindowsError, LookupError):
                     # FIXME: this can occur before the toplevel window is drawn
                     if rev is not None:
@@ -6319,7 +6657,11 @@
                         if info.last_stat[stat.ST_MTIME] < new_stat[stat.ST_MTIME]:
                             # update our notion of the most recent modification
                             info.last_stat = new_stat
-                            msg = _('The file %s changed on disk.  Do you want to reload the file?') % (info.name, )
+                            if info.label is not None:
+                                s = info.label
+                            else:
+                                s = info.name
+                            msg = _('The file %s changed on disk.  Do you want to reload the file?') % (s, )
                             dialog = MessageDialog(self.get_toplevel(), gtk.MESSAGE_QUESTION, msg)
                             ok = (dialog.run() == gtk.RESPONSE_OK)
                             dialog.destroy()
@@ -6332,7 +6674,7 @@
         def save_file(self, f, save_as=False):
             h = self.headers[f]
             info = h.info
-            name, encoding, rev = info.name, info.encoding, info.revision
+            name, encoding, rev, label = info.name, info.encoding, info.revision, info.label
             if name is None or rev is not None:
                 # we need to prompt for a file name the current contents were
                 # not loaded from a regular file
@@ -6342,12 +6684,21 @@
                 dialog = FileChooserDialog(_('Save %(title)s Pane %(pane)d') % { 'title': self.title, 'pane': f + 1 }, self.get_toplevel(), self.prefs, gtk.FILE_CHOOSER_ACTION_SAVE, gtk.STOCK_SAVE)
                 if name is not None:
                     dialog.set_filename(os.path.abspath(name))
+                if encoding is None:
+                    encoding = self.prefs.getDefaultEncoding()
                 dialog.set_encoding(encoding)
-                name = None
+                name, label = None, None
                 dialog.set_default_response(gtk.RESPONSE_OK)
                 if dialog.run() == gtk.RESPONSE_OK:
                     name = dialog.get_filename()
                     encoding = dialog.get_encoding()
+                    if encoding is None:
+                        if info.encoding is not None:
+                            # this case can occur if the user provided the
+                            # encoding and it is not an encoding we know about
+                            encoding = info.encoding
+                        else:
+                            encoding = self.prefs.getDefaultEncoding()
                 dialog.destroy()
             if name is None:
                 return False
@@ -6393,7 +6744,7 @@
                 self.bakeEdits(f)
                 self.closeUndoBlock()
                 # update the pane file info
-                info.name, info.encoding, info.revision = name, encoding, None
+                info.name, info.encoding, info.revision, info.label = name, encoding, None, label
                 info.last_stat = info.stat = os.stat(name)
                 self.setFileInfo(f, info)
                 # update the syntax highlighting incase we changed the file
@@ -6627,8 +6978,10 @@
                      [_('_Next Difference'), self.button_cb, 'next_difference', gtk.STOCK_GO_DOWN, 'next_difference'],
                      [_('_Last Difference'), self.button_cb, 'last_difference', gtk.STOCK_GOTO_BOTTOM, 'last_difference'],
                      [],
+                     [_('Fir_st Tab'), self.first_tab_cb, None, None, 'first_tab'],
                      [_('Pre_vious Tab'), self.previous_tab_cb, None, None, 'previous_tab'],
                      [_('Next _Tab'), self.next_tab_cb, None, None, 'next_tab'],
+                     [_('Las_t Tab'), self.last_tab_cb, None, None, 'last_tab'],
                      [],
                      [_('Shift Pane _Right'), self.button_cb, 'shift_pane_right', None, 'shift_pane_right'],
                      [_('Shift Pane _Left'), self.button_cb, 'shift_pane_left', None, 'shift_pane_left'] ] ])
@@ -6951,31 +7304,35 @@
         elif len(items) == 1 and len(items[0][1]) == 1:
             # one file specified
             # determine which other files to compare it with
-            name, data = items[0]
+            name, data, label = items[0]
             rev, encoding = data[0]
             vcs = theVCSs.findByFilename(name, self.prefs)
             if vcs is None:
                 # shift the existing file so it will be in the second pane
                 specs.append(FileInfo())
-                specs.append(FileInfo(name, encoding))
+                specs.append(FileInfo(name, encoding, None, None, label))
             else:
                 if rev is None:
                     # no revision specified assume defaults
                     for name, rev in vcs.getFileTemplate(self.prefs, name):
-                        specs.append(FileInfo(name, encoding, vcs, rev))
+                        if rev is None:
+                            s = label
+                        else:
+                            s = None
+                        specs.append(FileInfo(name, encoding, vcs, rev, s))
                 else:
                     # single revision specified
                     specs.append(FileInfo(name, encoding, vcs, rev))
-                    specs.append(FileInfo(name, encoding))
+                    specs.append(FileInfo(name, encoding, None, None, label))
         else:
             # multiple files specified, use one pane for each file
-            for name, data in items:
+            for name, data, label in items:
                 for rev, encoding in data:
                     if rev is None:
-                        vcs = None
+                        vcs, s = None, label
                     else:
-                        vcs = theVCSs.findByFilename(name, self.prefs)
-                    specs.append(FileInfo(name, encoding, vcs, rev))
+                        vcs, s = theVCSs.findByFilename(name, self.prefs), None
+                    specs.append(FileInfo(name, encoding, vcs, rev, s))
 
         # open a new viewer
         viewer = self.newFileDiffViewer(max(2, len(specs)))
@@ -6986,28 +7343,33 @@
         return viewer
 
     # create a new viewer for 'items'
-    def createSingleTab(self, items):
+    def createSingleTab(self, items, labels, options):
         if len(items) > 0:
-            self.newLoadedFileDiffViewer(items)
+            self.newLoadedFileDiffViewer(assign_file_labels(items, labels)).setOptions(options)
 
     # create a new viewer for each item in 'items'
-    def createSeparateTabs(self, items):
-        for item in items:
-            self.newLoadedFileDiffViewer([ item ])
+    def createSeparateTabs(self, items, labels, options):
+        # all tabs inherit the first tab's revision and encoding specifications
+        items = [ (name, items[0][1]) for name, data in items ]
+        for item in assign_file_labels(items, labels):
+            self.newLoadedFileDiffViewer([ item ]).setOptions(options)
 
     # create a new viewer for each modified file found in 'items'
-    def createModifiedFileTabs(self, items):
+    def createModifiedFileTabs(self, items, labels, options):
         new_items = []
         for item in items:
-            s, r = item
-            dn = s
-            if os.path.isfile(dn):
-                dn = os.path.dirname(dn)
+            name, data = item
+            # get full path to an existing ancessor directory
+            dn = os.path.abspath(name)
+            while not os.path.isdir(dn):
+                dn, old_dn = os.path.dirname(dn), dn
+                if dn == old_dn:
+                    break
             if len(new_items) == 0 or dn != new_items[-1][0]:
                 new_items.append([ dn, None, [] ])
             dst = new_items[-1]
-            dst[1] = r[-1][1]
-            dst[2].append(s)
+            dst[1] = data[-1][1]
+            dst[2].append(name)
         for dn, encoding, names in new_items:
             vcs = theVCSs.findByFolder(dn, self.prefs)
             if vcs is not None:
@@ -7017,6 +7379,7 @@
                         for i, spec in enumerate(specs):
                             name, rev = spec
                             viewer.load(i, FileInfo(name, encoding, vcs, rev))
+                        viewer.setOptions(options)
                 except (IOError, OSError, WindowsError):
                     dialog = MessageDialog(self.get_toplevel(), gtk.MESSAGE_ERROR, _('Error retrieving modifications for %s.') % (dn, ))
                     dialog.run()
@@ -7060,7 +7423,7 @@
             rev = None
         dialog.destroy()
         if accept:
-            viewer = self.newLoadedFileDiffViewer([ (name, [ (rev, encoding) ]) ])
+            viewer = self.newLoadedFileDiffViewer([ (name, [ (rev, encoding) ], None) ])
             self.notebook.set_current_page(self.notebook.get_n_pages() - 1)
             viewer.grab_focus()
 
@@ -7074,7 +7437,7 @@
         dialog.destroy()
         if accept:
             n = self.notebook.get_n_pages()
-            self.createModifiedFileTabs([ (name, [ (None, encoding) ]) ])
+            self.createModifiedFileTabs([ (name, [ (None, encoding) ]) ], [], {})
             if self.notebook.get_n_pages() > n:
                 # we added some new tabs, focus on the first one
                 self.notebook.set_current_page(n)
@@ -7213,18 +7576,23 @@
         if self.menu_update_depth == 0 and widget.get_active():
             self.getCurrentViewer().setSyntax(data)
 
+    # callback for the first tab menu item
+    def first_tab_cb(self, widget, data):
+        self.notebook.set_current_page(0)
+
     # callback for the previous tab menu item
     def previous_tab_cb(self, widget, data):
-        i = self.notebook.get_current_page() - 1
-        if i >= 0:
-            self.notebook.set_current_page(i)
+        i, n = self.notebook.get_current_page(), self.notebook.get_n_pages()
+        self.notebook.set_current_page((n + i - 1) % n)
 
     # callback for the next tab menu item
     def next_tab_cb(self, widget, data):
-        i = self.notebook.get_current_page() + 1
-        n = self.notebook.get_n_pages()
-        if i < n:
-            self.notebook.set_current_page(i)
+        i, n = self.notebook.get_current_page(), self.notebook.get_n_pages()
+        self.notebook.set_current_page((i + 1) % n)
+
+    # callback for the last tab menu item
+    def last_tab_cb(self, widget, data):
+        self.notebook.set_current_page(self.notebook.get_n_pages() - 1)
 
     # callback for most menu items and buttons
     def button_cb(self, widget, data):
@@ -7302,23 +7670,33 @@
 gobject.signal_new('save', Diffuse.FileDiffViewer.PaneHeader, gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, ())
 gobject.signal_new('save_as', Diffuse.FileDiffViewer.PaneHeader, gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, ())
 
-# process the command line arguments
-if __name__ == '__main__':
-    # find the config directory
-    rc_dir = os.environ.get('XDG_CONFIG_HOME', None)
-    if rc_dir is None:
-        rc_dir = os.path.join(os.path.expanduser('~'), '.config')
-    for rc_dir in rc_dir, os.path.join(rc_dir, 'diffuse'):
-        # create the directory if it didn't exist
-        if not os.path.exists(rc_dir):
+# create nested subdirectories and return the complete path
+def make_subdirs(p, ss):
+    for s in ss:
+        p = os.path.join(p, s)
+        if not os.path.exists(p):
             try:
-                os.mkdir(rc_dir)
+                os.mkdir(p)
             except IOError:
                 pass
+    return p
 
+# process the command line arguments
+if __name__ == '__main__':
+    # find the config directory and create it if it didn't exist
+    rc_dir, subdirs = os.environ.get('XDG_CONFIG_HOME', None), ['diffuse']
+    if rc_dir is None:
+        rc_dir = os.path.expanduser('~')
+        subdirs.insert(0, '.config')
+    rc_dir = make_subdirs(rc_dir, subdirs)
+    # find the local data directory and create it if it didn't exist
+    data_dir, subdirs = os.environ.get('XDG_DATA_HOME', None), ['diffuse']
+    if data_dir is None:
+        data_dir = os.path.expanduser('~')
+        subdirs[:0] = [ '.local', 'share' ]
+    data_dir = make_subdirs(data_dir, subdirs)
     # load resource files
-    i = 1
-    rc_files = []
+    i, rc_files = 1, []
     if argc == 2 and args[1] == '--no-rcfile':
         i += 1
     elif argc == 3 and args[1] == '--rcfile':
@@ -7345,16 +7723,16 @@
 
     diff = Diffuse(rc_dir)
     # load state
-    statepath = os.path.join(rc_dir, 'state')
+    statepath = os.path.join(data_dir, 'state')
     diff.loadState(statepath)
 
     # process remaining command line arguments
     encoding, revs, close_on_same = None, [], False
-    specs, had_specs = [], False
+    specs, had_specs, labels = [], False, []
     funcs = { 'modified': diff.createModifiedFileTabs,
               'separate': diff.createSeparateTabs,
               'single': diff.createSingleTab }
-    mode = 'single'
+    mode, options = 'single', {}
     while i < argc:
         arg = args[i]
         if len(arg) > 0 and arg[0] == '-':
@@ -7379,21 +7757,21 @@
                 encoding = args[i]
                 encoding = encodings.aliases.aliases.get(encoding, encoding)
             elif arg in [ '-m', '--modified' ]:
-                funcs[mode](specs)
-                specs = []
+                funcs[mode](specs, labels, options)
+                specs, labels, options = [], [], {}
                 mode = 'modified'
             elif i + 1 < argc and arg in [ '-r', '--revision' ]:
                 # specified revision
                 i += 1
-                revs.append((args[i], encoding))
+                revs.append((decode_fs_string(args[i]), encoding))
             elif arg in [ '-s', '--separate' ]:
-                funcs[mode](specs)
-                specs = []
+                funcs[mode](specs, labels, options)
+                specs, labels, options = [], [], {}
                 # open items in separate tabs
                 mode = 'separate'
-            elif i + 1 < argc and arg in [ '-t', '--tab' ]:
-                funcs[mode](specs)
-                specs = []
+            elif arg in [ '-t', '--tab' ]:
+                funcs[mode](specs, labels, options)
+                specs, labels, options = [], [], {}
                 # start a new tab
                 mode = 'single'
             elif arg in [ '-b', '--ignore-space-change' ]:
@@ -7416,6 +7794,15 @@
                 diff.prefs.setBool('display_ignore_whitespace', True)
                 diff.prefs.setBool('align_ignore_whitespace', True)
                 diff.preferences_updated()
+            elif i + 1 < argc and arg == '-L':
+                i += 1
+                labels.append(decode_fs_string(args[i]))
+            elif i + 1 < argc and arg == '--line':
+                i += 1
+                try:
+                    options['line'] = int(args[i])
+                except ValueError:
+                    logError(_('Error parsing line number.'))
             elif arg == '--null-file':
                 # add a blank file pane
                 if mode == 'single' or mode == 'separate':
@@ -7444,7 +7831,7 @@
     if mode == 'modified' and len(specs) == 0:
         specs.append((os.curdir, [ (None, encoding) ]))
         had_specs = True
-    funcs[mode](specs)
+    funcs[mode](specs, labels, options)
 
     # create a file diff viewer if the command line arguments haven't
     # implicitly created any
diff -Nru diffuse-0.4.4/src/usr/share/applications/diffuse.desktop diffuse-0.4.5/src/usr/share/applications/diffuse.desktop
--- diffuse-0.4.4/src/usr/share/applications/diffuse.desktop	2010-10-21 01:58:02.000000000 +0000
+++ diffuse-0.4.5/src/usr/share/applications/diffuse.desktop	2011-07-13 09:18:33.000000000 +0000
@@ -2,6 +2,7 @@
 Name=Diffuse Merge Tool
 Name[de]=Diffuse Mischwerkzeug
 Name[es]=Diffuse utillaje de textos
+Name[it]=Diffuse - strumento di unione
 Name[ja]=Diffuse マージツール
 Name[ko]=Diffuse 병합도구
 Name[ru]=Diffuse Инструмент Слияния
@@ -9,6 +10,7 @@
 Comment=Graphical tool for merging and comparing text files
 Comment[de]=Werzeug zum Mischen und Vergleichen von Textdateien
 Comment[es]=Un utillaje para juntar y comparar archivos de texto
+Comment[it]=Strumento grafico per l'unione e il confronto di file
 Comment[ja]=テキストファイルをマージして比較するためのグラフィックツール
 Comment[ko]=텍스트 파일을 병합하고 비교하기위한 도구
 Comment[ru]=Графический инструмент для слияния и сравнения текстовых файлов
@@ -18,5 +20,5 @@
 Terminal=false
 Type=Application
 MimeType=text/plain;text/x-csrc;text/x-chdr;
-Categories=Development;GTK;TextEditor;TextTools;
+Categories=Development;GTK;
 StartupNotify=true
diff -Nru diffuse-0.4.4/src/usr/share/diffuse/syntax/json.syntax diffuse-0.4.5/src/usr/share/diffuse/syntax/json.syntax
--- diffuse-0.4.4/src/usr/share/diffuse/syntax/json.syntax	1970-01-01 00:00:00.000000000 +0000
+++ diffuse-0.4.5/src/usr/share/diffuse/syntax/json.syntax	2011-07-13 09:18:33.000000000 +0000
@@ -0,0 +1,29 @@
+# JSON syntax file for Diffuse
+# Copyright (C) 2011 Derrick Moser <derrick_moser@yahoo.com>
+syntax JSON normal text
+syntax_files JSON '\.json$'
+
+# colours
+colour json_literal 1.0 0.2 0.8
+colour json_string 0.8 0.0 0.0
+colour json_escapedchar 0.46 0.31 0.48
+colour json_punctuation 0.5 0.5 0.5
+
+# whitespace
+syntax_pattern normal normal text '[ \t\r\n]+'
+
+# string
+syntax_pattern normal string json_string '"'
+syntax_pattern string string json_escapedchar '(\\(u[0-9a-f]{4}|.))+' ignorecase
+syntax_pattern string normal json_string '"'
+syntax_pattern string string json_string '.[^\\"]*'
+
+# literals
+syntax_pattern normal normal json_literal '-?(0|[1-9][0-9]*)(\.[0-9]+)?(e[\+\-]?[0-9]+)?' ignorecase
+syntax_pattern normal normal json_literal '\b(true|false|null)\b'
+
+# punctuation
+syntax_pattern normal normal json_punctuation '[\{\}\[\]:,]+'
+
+# parsing optimisation
+syntax_pattern normal normal text '[a-z_][a-z_0-9]*' ignorecase
diff -Nru diffuse-0.4.4/src/usr/share/diffuse/syntax/patch.syntax diffuse-0.4.5/src/usr/share/diffuse/syntax/patch.syntax
--- diffuse-0.4.4/src/usr/share/diffuse/syntax/patch.syntax	2010-10-21 01:58:03.000000000 +0000
+++ diffuse-0.4.5/src/usr/share/diffuse/syntax/patch.syntax	2011-07-13 09:18:34.000000000 +0000
@@ -1,5 +1,5 @@
 # Patch syntax file for Diffuse
-# Copyright (C) 2008 Derrick Moser <derrick_moser@yahoo.com>
+# Copyright (C) 2011 Derrick Moser <derrick_moser@yahoo.com>
 syntax Patch normal text
 syntax_files Patch '\.patch$'
 
@@ -12,8 +12,8 @@
 # changed/information lines
 syntax_pattern normal normal patch_info '^(diff|---|\+\+\+) .*'
 syntax_pattern normal normal patch_lines '^@@.*'
-syntax_pattern normal normal patch_add '^\+ .*'
-syntax_pattern normal normal patch_remove '^- .*'
+syntax_pattern normal normal patch_add '^\+.*'
+syntax_pattern normal normal patch_remove '^-.*'
 
 # optimisation
 syntax_pattern normal normal text '.+'
diff -Nru diffuse-0.4.4/src/usr/share/gnome/help/diffuse/C/diffuse.xml diffuse-0.4.5/src/usr/share/gnome/help/diffuse/C/diffuse.xml
--- diffuse-0.4.4/src/usr/share/gnome/help/diffuse/C/diffuse.xml	2010-10-21 01:58:02.000000000 +0000
+++ diffuse-0.4.5/src/usr/share/gnome/help/diffuse/C/diffuse.xml	2011-07-13 09:18:33.000000000 +0000
@@ -2,14 +2,14 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
   <!ENTITY app "Diffuse">
-  <!ENTITY app-version "0.4.4">
+  <!ENTITY app-version "0.4.5">
 ]>
 <book id="index" lang="en">
-  <title>&app; User's Manual</title>
+  <title><application>&app;</application> User's Manual</title>
 
   <bookinfo>
     <copyright>
-      <year>2009-2010</year>
+      <year>2009-2011</year>
       <holder>Derrick Moser</holder>
     </copyright>
 
@@ -21,17 +21,17 @@
       </author>
     </authorgroup>
 
-    <releaseinfo>This manual describes version &app-version; of &app;.</releaseinfo>
+    <releaseinfo>This manual describes version &app-version; of <application>&app;</application>.</releaseinfo>
   </bookinfo>
 
   <chapter id="introduction">
     <title>Introduction</title>
 
     <para>
-      &app; is a graphical tool for merging and comparing text files.  &app;
+      <application>&app;</application> is a graphical tool for merging and comparing text files.  <application>&app;</application>
       is able to compare an arbitrary number of files side-by-side and gives
       users the ability to manually adjust line matching and directly edit
-      files.  &app; can also retrieve revisions of files from Bazaar, CVS,
+      files.  <application>&app;</application> can also retrieve revisions of files from Bazaar, CVS,
       Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK repositories
       for comparison and merging.
     </para>
@@ -39,28 +39,28 @@
     <sect1 id="introduction-about">
       <title>About</title>
       <para>
-        &app; was written by Derrick Moser <email>derrick_moser@yahoo.com</email>.
+        <application>&app;</application> was written by Derrick Moser <email>derrick_moser@yahoo.com</email>.
       </para>
-      <para>&copy; 2006-2010 Derrick Moser.  All Rights Reserved.</para>
+      <para>&copy; 2006-2011 Derrick Moser.  All Rights Reserved.</para>
     </sect1>
 
     <sect1 id="introduction-licence">
       <title>Licence</title>
       <para>
-        &app; is free software; you may redistribute it and/or modify it under
+        <application>&app;</application> is free software; you may redistribute it and/or modify it under
         the terms of the <citetitle>GNU General Public License</citetitle> as
         published by the Free Software Foundation; either version 2 of the
         licence, or (at your option) any later version.
       </para>
       <para>
-        &app; is distributed in the hope that it will be useful, but WITHOUT
+        <application>&app;</application> is distributed in the hope that it will be useful, but WITHOUT
         ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
         FITNESS FOR A PARTICULAR PURPOSE.  See the <citetitle>GNU General
         Public License</citetitle> for more details.
       </para>
       <para>
         You should have received a copy of the <citetitle>GNU General Public
-        License</citetitle> along with &app;.  You may also obtain a copy of
+        License</citetitle> along with <application>&app;</application>.  You may also obtain a copy of
         the <citetitle>GNU General Public License</citetitle> from the Free
         Software Foundation by visiting
         <ulink type="http" url="http://www.fsf.org/">their web site</ulink> or
@@ -81,7 +81,7 @@
         <varlistentry>
           <term><userinput>diffuse [ -h | -? | --help | -v | --version ]</userinput></term>
           <listitem>
-            <para>Display information about &app;.</para>
+            <para>Display information about <application>&app;</application>.</para>
           </listitem>
         </varlistentry>
 
@@ -98,7 +98,7 @@
 
         <para>
           If a help option is specified, it must be the only argument
-          specified on the command line.  &app; will immediately quit after
+          specified on the command line.  <application>&app;</application> will immediately quit after
           displaying the help information.
         </para>
 
@@ -183,6 +183,15 @@
           </varlistentry>
 
           <varlistentry>
+            <term><userinput>-L</userinput>, <userinput>--label</userinput> <replaceable>label</replaceable></term>
+            <listitem>
+              <para>
+                Display <replaceable>label</replaceable> instead of the file name.
+              </para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
             <term><userinput>-m</userinput>, <userinput>--modified</userinput></term>
             <listitem>
               <para>
@@ -224,6 +233,15 @@
           </varlistentry>
 
           <varlistentry>
+            <term><userinput>--line <replaceable>line</replaceable></userinput></term>
+            <listitem>
+              <para>
+                Start with line <replaceable>line</replaceable> selected.
+              </para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
             <term><userinput>--null-file</userinput></term>
             <listitem>
               <para>
@@ -301,12 +319,12 @@
       <menuchoice><guimenu>File</guimenu><guimenuitem>New 3-Way File
       Merge</guimenuitem></menuchoice> menu items to create additional tabs
       for comparing text files.  File names and revisions can be specified
-      either in the command line arguments used to invoke &app; or in fields
+      either in the command line arguments used to invoke <application>&app;</application> or in fields
       on the Open File dialogue.
     </para>
 
     <para>
-      &app; displays files side-by-side inserting gaps to align similar lines
+      <application>&app;</application> displays files side-by-side inserting gaps to align similar lines
       of text.  Differences are highlighted with a different background
       colour.
     </para>
@@ -347,16 +365,16 @@
         text with adjacent files.  To aligning lines of text using the mouse
         pointer, select a line of text with the left mouse button, right click
         on a line of text from an adjacent file, and choose
-        <menuchoice><guimenu>Align with Selection</guimenu></menuchoice>.  To
+        <menuchoice><guimenuitem>Align with Selection</guimenuitem></menuchoice>.  To
         align lines of text using the keyboard, move the selection with the
         cursor keys, press the space bar to pick the current line of text, move
         the selection with the cursor keys to a line of text in an adjacent
         file, and press the space bar to pick the target line of text.
-        Pressing the escape key will cancel the operation.
+        Pressing the <keycap>Escape</keycap> key will cancel the operation.
       </para>
 
       <para>
-        Use the <menuchoice><guimenu>Isolate</guimenu></menuchoice> menu item
+        Use the <menuchoice><guimenuitem>Isolate</guimenuitem></menuchoice> menu item
         to prevent the selected lines from being matched with any lines from
         the adjacent files.
       </para>
@@ -366,7 +384,7 @@
       <title>Editing</title>
 
       <para>
-        Press the enter key or double-click on a text area to enter text
+        Press the <keycap>Enter</keycap> key or double-click on a text area to enter text
         editing mode.  The cursor will change to indicate text editing mode
         and the status bar at the bottom of the window will display the
         cursor's column position.
@@ -385,13 +403,13 @@
       <para>
         Modify text by typing on the keyword.  Modified lines will be
         highlighted in green.  Use the
-        <menuchoice><guimenu>Undo</guimenu></menuchoice> and
-        <menuchoice><guimenu>Redo</guimenu></menuchoice> menu items to
+        <menuchoice><guimenuitem>Undo</guimenuitem></menuchoice> and
+        <menuchoice><guimenuitem>Redo</guimenuitem></menuchoice> menu items to
         undo and redo the previously preformed operations.
       </para>
 
       <para>
-        Press the escape key or click on another file's text area using the
+        Press the <keycap>Escape</keycap> key or click on another file's text area using the
         left mouse button to leave editing mode.
       </para>
     </sect1>
@@ -401,7 +419,7 @@
 
       <para>
         Use the difference buttons or menu items to navigate between blocks
-        of differences within a file.  When navigating, &app; will move the
+        of differences within a file.  When navigating, <application>&app;</application> will move the
         selection to the next continuous set of lines with differences or
         edits.
       </para>
@@ -409,11 +427,11 @@
       <para>
         Use the merge buttons or menu items to copy blocks of text into the
         selected range of lines.  The
-        <menuchoice><guimenu>Undo</guimenu></menuchoice> and
-        <menuchoice><guimenu>Redo</guimenu></menuchoice> menu items can be used
+        <menuchoice><guimenuitem>Undo</guimenuitem></menuchoice> and
+        <menuchoice><guimenuitem>Redo</guimenuitem></menuchoice> menu items can be used
         to undo and redo the previously preformed operations.  All changes to a
         set of lines can be reverted using the
-        <menuchoice><guimenu>Clear Edits</guimenu></menuchoice> menu item
+        <menuchoice><guimenuitem>Clear Edits</guimenuitem></menuchoice> menu item
         regardless of the order the edits were performed.
       </para>
     </sect1>
@@ -423,11 +441,11 @@
     <title>Version Control</title>
 
     <para>
-      &app; can retrieve file revisions from several version control systems
-      via their command line interface.  The Microsoft Windows build of &app;
+      <application>&app;</application> can retrieve file revisions from several version control systems
+      via their command line interface.  The Microsoft Windows build of <application>&app;</application>
       is able to use both the Cygwin and native versions of the supported
-      version control systems.  When using &app; with Cygwin, ensure
-      &app;'s Cygwin preferences correctly describe your system.  If the
+      version control systems.  When using <application>&app;</application> with Cygwin, ensure
+      <application>&app;</application>'s Cygwin preferences correctly describe your system.  If the
       <guilabel>Update paths for Cygwin</guilabel> preference exists for a
       version control system, it must be enabled to use the Cygwin version.
     </para>
@@ -443,7 +461,7 @@
       <title>Viewing Uncommitted Modifications</title>
 
       <para>
-        The <userinput>-m</userinput> option will cause &app; to open
+        The <userinput>-m</userinput> option will cause <application>&app;</application> to open
         comparison tabs for each file the version control system indicates has
         uncommitted modifications.  This is convenient for reviewing all
         changes before committing or resolving a merge conflict.  If no paths
@@ -520,7 +538,7 @@
       </para>
 
       <para>
-        &app; does not limit the number of panes that can be used for
+        <application>&app;</application> does not limit the number of panes that can be used for
         comparing files.  The inputs to a Git octopus merge could be viewed
         with a command line like this:
       </para>
@@ -535,7 +553,7 @@
     <title>Resources</title>
 
     <para>
-      Resources can be used to customise several aspects of &app;'s
+      Resources can be used to customise several aspects of <application>&app;</application>'s
       appearance and behaviour such as changing the colours used in the user
       interface, customising the keyboard shortcuts, adding or replacing syntax
       highlighting rules, or changing the mapping from file extensions to
@@ -543,7 +561,7 @@
     </para>
 
     <para>
-      When &app; is started, it will read commands from the system wide
+      When <application>&app;</application> is started, it will read commands from the system wide
       initialisation file <filename>/etc/diffuserc</filename>
       (<filename>%INSTALL_DIR%\diffuserc</filename> on Microsoft Windows) and
       then the personal initialisation file
@@ -615,7 +633,7 @@
             <term><userinput>open_file</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>File</guimenu><guimenuitem>Open File...</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Ctrl+o</para>
+              <para>Default: <literal>Ctrl+o</literal></para>
             </listitem>
           </varlistentry>
 
@@ -623,7 +641,7 @@
             <term><userinput>open_file_in_new_tab</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>File</guimenu><guimenuitem>Open File In New Tab...</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Ctrl+t</para>
+              <para>Default: <literal>Ctrl+t</literal></para>
             </listitem>
           </varlistentry>
 
@@ -631,7 +649,7 @@
             <term><userinput>open_modified_files</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>File</guimenu><guimenuitem>Open Modified Files...</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Shift+Ctrl+O</para>
+              <para>Default: <literal>Shift+Ctrl+O</literal></para>
             </listitem>
           </varlistentry>
 
@@ -639,7 +657,7 @@
             <term><userinput>reload_file</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>File</guimenu><guimenuitem>Reload File</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Shift+Ctrl+R</para>
+              <para>Default: <literal>Shift+Ctrl+R</literal></para>
             </listitem>
           </varlistentry>
 
@@ -647,7 +665,7 @@
             <term><userinput>save_file</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>File</guimenu><guimenuitem>Save File</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Ctrl+s</para>
+              <para>Default: <literal>Ctrl+s</literal></para>
             </listitem>
           </varlistentry>
 
@@ -655,7 +673,7 @@
             <term><userinput>save_file_as</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>File</guimenu><guimenuitem>Save File As...</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Shift+Ctrl+A</para>
+              <para>Default: <literal>Shift+Ctrl+A</literal></para>
             </listitem>
           </varlistentry>
 
@@ -663,7 +681,7 @@
             <term><userinput>save_all</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>File</guimenu><guimenuitem>Save All</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Shift+Ctrl+S</para>
+              <para>Default: <literal>Shift+Ctrl+S</literal></para>
             </listitem>
           </varlistentry>
 
@@ -671,7 +689,7 @@
             <term><userinput>new_2_way_file_merge</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>File</guimenu><guimenuitem>New 2-Way File Merge</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Ctrl+2</para>
+              <para>Default: <literal>Ctrl+2</literal></para>
             </listitem>
           </varlistentry>
 
@@ -679,7 +697,7 @@
             <term><userinput>new_3_way_file_merge</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>File</guimenu><guimenuitem>New 3-Way File Merge</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Ctrl+3</para>
+              <para>Default: <literal>Ctrl+3</literal></para>
             </listitem>
           </varlistentry>
 
@@ -687,7 +705,7 @@
             <term><userinput>close_tab</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>File</guimenu><guimenuitem>Close Tab</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Ctrl+w</para>
+              <para>Default: <literal>Ctrl+w</literal></para>
             </listitem>
           </varlistentry>
 
@@ -695,7 +713,7 @@
             <term><userinput>undo_close_tab</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>File</guimenu><guimenuitem>Undo Close Tab</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Shift+Ctrl+w</para>
+              <para>Default: <literal>Shift+Ctrl+w</literal></para>
             </listitem>
           </varlistentry>
 
@@ -703,7 +721,7 @@
             <term><userinput>quit</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>File</guimenu><guimenuitem>Quit</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Ctrl+q</para>
+              <para>Default: <literal>Ctrl+q</literal></para>
             </listitem>
           </varlistentry>
 
@@ -711,7 +729,7 @@
             <term><userinput>undo</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Edit</guimenu><guimenuitem>Undo</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Ctrl+z</para>
+              <para>Default: <literal>Ctrl+z</literal></para>
             </listitem>
           </varlistentry>
 
@@ -719,7 +737,7 @@
             <term><userinput>redo</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Edit</guimenu><guimenuitem>Redo</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Shift+Ctrl+Z</para>
+              <para>Default: <literal>Shift+Ctrl+Z</literal></para>
             </listitem>
           </varlistentry>
 
@@ -727,7 +745,7 @@
             <term><userinput>cut</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Edit</guimenu><guimenuitem>Cut</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Ctrl+x</para>
+              <para>Default: <literal>Ctrl+x</literal></para>
             </listitem>
           </varlistentry>
 
@@ -735,7 +753,7 @@
             <term><userinput>copy</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Edit</guimenu><guimenuitem>Copy</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Ctrl+c</para>
+              <para>Default: <literal>Ctrl+c</literal></para>
             </listitem>
           </varlistentry>
 
@@ -743,7 +761,7 @@
             <term><userinput>paste</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Edit</guimenu><guimenuitem>Paste</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Ctrl+v</para>
+              <para>Default: <literal>Ctrl+v</literal></para>
             </listitem>
           </varlistentry>
 
@@ -751,7 +769,7 @@
             <term><userinput>select_all</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Edit</guimenu><guimenuitem>Select All</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Ctrl+a</para>
+              <para>Default: <literal>Ctrl+a</literal></para>
             </listitem>
           </varlistentry>
 
@@ -759,7 +777,7 @@
             <term><userinput>clear_edits</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Edit</guimenu><guimenuitem>Clear Edits</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Ctrl+r</para>
+              <para>Default: <literal>Ctrl+r</literal></para>
             </listitem>
           </varlistentry>
 
@@ -767,7 +785,7 @@
             <term><userinput>dismiss_all_edits</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Edit</guimenu><guimenuitem>Dismiss All Edits</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Ctrl+d</para>
+              <para>Default: <literal>Ctrl+d</literal></para>
             </listitem>
           </varlistentry>
 
@@ -775,7 +793,7 @@
             <term><userinput>find</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Edit</guimenu><guimenuitem>Find...</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Ctrl+f</para>
+              <para>Default: <literal>Ctrl+f</literal></para>
             </listitem>
           </varlistentry>
 
@@ -783,7 +801,7 @@
             <term><userinput>find_next</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Edit</guimenu><guimenuitem>Find Next</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Ctrl+g</para>
+              <para>Default: <literal>Ctrl+g</literal></para>
             </listitem>
           </varlistentry>
 
@@ -791,7 +809,7 @@
             <term><userinput>find_previous</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Edit</guimenu><guimenuitem>Find Previous</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Shift+Ctrl+G</para>
+              <para>Default: <literal>Shift+Ctrl+G</literal></para>
             </listitem>
           </varlistentry>
 
@@ -799,7 +817,7 @@
             <term><userinput>go_to_line</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Edit</guimenu><guimenuitem>Go To Line...</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Shift+Ctrl+L</para>
+              <para>Default: <literal>Shift+Ctrl+L</literal></para>
             </listitem>
           </varlistentry>
 
@@ -814,7 +832,7 @@
           <varlistentry>
             <term><userinput>no_syntax_highlighting</userinput></term>
             <listitem>
-              <para><menuchoice><guimenu>View</guimenu><guimenuitem>Syntax Highlighting</guimenuitem><guimenuitem>None</guimenuitem></menuchoice> menu item</para>
+              <para><menuchoice><guimenu>View</guimenu><guisubmenu>Syntax Highlighting</guisubmenu><guimenuitem>None</guimenuitem></menuchoice> menu item</para>
               <para>Default: None</para>
             </listitem>
           </varlistentry>
@@ -822,7 +840,7 @@
           <varlistentry>
             <term><userinput>syntax_highlighting_<replaceable>syntax</replaceable></userinput></term>
             <listitem>
-              <para><menuchoice><guimenu>View</guimenu><guimenuitem>Syntax Highlighting</guimenuitem><guimenuitem><replaceable>syntax</replaceable></guimenuitem></menuchoice> menu item</para>
+              <para><menuchoice><guimenu>View</guimenu><guisubmenu>Syntax Highlighting</guisubmenu><guimenuitem><replaceable>syntax</replaceable></guimenuitem></menuchoice> menu item</para>
               <para>Default: None</para>
             </listitem>
           </varlistentry>
@@ -831,7 +849,7 @@
             <term><userinput>realign_all</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>View</guimenu><guimenuitem>Realign All</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Ctrl+l</para>
+              <para>Default: <literal>Ctrl+l</literal></para>
             </listitem>
           </varlistentry>
 
@@ -839,7 +857,7 @@
             <term><userinput>isolate</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>View</guimenu><guimenuitem>Isolate</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Ctrl+i</para>
+              <para>Default: <literal>Ctrl+i</literal></para>
             </listitem>
           </varlistentry>
 
@@ -847,7 +865,7 @@
             <term><userinput>first_difference</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>View</guimenu><guimenuitem>First Difference</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Shift+Ctrl+Up</para>
+              <para>Default: <literal>Shift+Ctrl+Up</literal></para>
             </listitem>
           </varlistentry>
 
@@ -855,7 +873,7 @@
             <term><userinput>previous_difference</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>View</guimenu><guimenuitem>Previous Difference</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Ctrl+Up</para>
+              <para>Default: <literal>Ctrl+Up</literal></para>
             </listitem>
           </varlistentry>
 
@@ -863,7 +881,7 @@
             <term><userinput>next_difference</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>View</guimenu><guimenuitem>Next Difference</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Ctrl+Down</para>
+              <para>Default: <literal>Ctrl+Down</literal></para>
             </listitem>
           </varlistentry>
 
@@ -871,7 +889,15 @@
             <term><userinput>last_difference</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>View</guimenu><guimenuitem>Last Difference</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Shift+Ctrl+Down</para>
+              <para>Default: <literal>Shift+Ctrl+Down</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>first_tab</userinput></term>
+            <listitem>
+              <para><menuchoice><guimenu>View</guimenu><guimenuitem>First Tab</guimenuitem></menuchoice> menu item</para>
+              <para>Default: <literal>Shift+Ctrl+Page_Up</literal></para>
             </listitem>
           </varlistentry>
 
@@ -879,7 +905,7 @@
             <term><userinput>previous_tab</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>View</guimenu><guimenuitem>Previous Tab</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Ctrl+Page_Up</para>
+              <para>Default: <literal>Ctrl+Page_Up</literal></para>
             </listitem>
           </varlistentry>
 
@@ -887,7 +913,15 @@
             <term><userinput>next_tab</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>View</guimenu><guimenuitem>Next Tab</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Ctrl+Page_Down</para>
+              <para>Default: <literal>Ctrl+Page_Down</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>last_tab</userinput></term>
+            <listitem>
+              <para><menuchoice><guimenu>View</guimenu><guimenuitem>Last Tab</guimenuitem></menuchoice> menu item</para>
+              <para>Default: <literal>Shift+Ctrl+Page_Down</literal></para>
             </listitem>
           </varlistentry>
 
@@ -895,7 +929,7 @@
             <term><userinput>shift_pane_right</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>View</guimenu><guimenuitem>Shift Pane Right</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Shift+Ctrl+parenleft</para>
+              <para>Default: <literal>Shift+Ctrl+parenleft</literal></para>
             </listitem>
           </varlistentry>
 
@@ -903,7 +937,7 @@
             <term><userinput>shift_pane_left</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>View</guimenu><guimenuitem>Shift Pane Left</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Shift+Ctrl+parenright</para>
+              <para>Default: <literal>Shift+Ctrl+parenright</literal></para>
             </listitem>
           </varlistentry>
 
@@ -911,7 +945,7 @@
             <term><userinput>convert_to_upper_case</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Format</guimenu><guimenuitem>Convert To Upper Case</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Ctrl+u</para>
+              <para>Default: <literal>Ctrl+u</literal></para>
             </listitem>
           </varlistentry>
 
@@ -919,7 +953,7 @@
             <term><userinput>convert_to_lower_case</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Format</guimenu><guimenuitem>Convert To Lower Case</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Shift+Ctrl+U</para>
+              <para>Default: <literal>Shift+Ctrl+U</literal></para>
             </listitem>
           </varlistentry>
 
@@ -927,7 +961,7 @@
             <term><userinput>sort_lines_in_ascending_order</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Format</guimenu><guimenuitem>Sort Lines In Ascending Order</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Ctrl+y</para>
+              <para>Default: <literal>Ctrl+y</literal></para>
             </listitem>
           </varlistentry>
 
@@ -935,7 +969,7 @@
             <term><userinput>sort_lines_in_descending_order</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Format</guimenu><guimenuitem>Sort Lines In Descending Order</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Shift+Ctrl+Y</para>
+              <para>Default: <literal>Shift+Ctrl+Y</literal></para>
             </listitem>
           </varlistentry>
 
@@ -943,7 +977,7 @@
             <term><userinput>remove_trailing_white_space</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Format</guimenu><guimenuitem>Remove Trailing White Space</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Ctrl+k</para>
+              <para>Default: <literal>Ctrl+k</literal></para>
             </listitem>
           </varlistentry>
 
@@ -951,7 +985,7 @@
             <term><userinput>convert_tabs_to_spaces</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Format</guimenu><guimenuitem>Convert Tabs To Spaces</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Ctrl+b</para>
+              <para>Default: <literal>Ctrl+b</literal></para>
             </listitem>
           </varlistentry>
 
@@ -959,7 +993,7 @@
             <term><userinput>convert_leading_spaces_to_tabs</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Format</guimenu><guimenuitem>Convert Leading Spaces To Tabs</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Shift+Ctrl+B</para>
+              <para>Default: <literal>Shift+Ctrl+B</literal></para>
             </listitem>
           </varlistentry>
 
@@ -967,7 +1001,7 @@
             <term><userinput>increase_indenting</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Format</guimenu><guimenuitem>Increase Indenting</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Shift+Ctrl+&gt;</para>
+              <para>Default: <literal>Shift+Ctrl+greater</literal></para>
             </listitem>
           </varlistentry>
 
@@ -975,7 +1009,7 @@
             <term><userinput>decrease_indenting</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Format</guimenu><guimenuitem>Decrease Indenting</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Shift+Ctrl+&lt;</para>
+              <para>Default: <literal>Shift+Ctrl+less</literal></para>
             </listitem>
           </varlistentry>
 
@@ -983,7 +1017,7 @@
             <term><userinput>convert_to_dos</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Format</guimenu><guimenuitem>Convert To DOS Format</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Shift+Ctrl+E</para>
+              <para>Default: <literal>Shift+Ctrl+E</literal></para>
             </listitem>
           </varlistentry>
 
@@ -991,7 +1025,7 @@
             <term><userinput>convert_to_mac</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Format</guimenu><guimenuitem>Convert To Mac Format</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Shift+Ctrl+C</para>
+              <para>Default: <literal>Shift+Ctrl+C</literal></para>
             </listitem>
           </varlistentry>
 
@@ -999,7 +1033,7 @@
             <term><userinput>convert_to_unix</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Format</guimenu><guimenuitem>Convert To Unix Format</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Ctrl+e</para>
+              <para>Default: <literal>Ctrl+e</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1007,7 +1041,7 @@
             <term><userinput>copy_selection_right</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Merge</guimenu><guimenuitem>Copy Selection Right</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Shift+Ctrl+Right</para>
+              <para>Default: <literal>Shift+Ctrl+Right</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1015,7 +1049,7 @@
             <term><userinput>copy_selection_left</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Merge</guimenu><guimenuitem>Copy Selection Left</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Shift+Ctrl+Left</para>
+              <para>Default: <literal>Shift+Ctrl+Left</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1023,7 +1057,7 @@
             <term><userinput>copy_left_into_selection</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Merge</guimenu><guimenuitem>Copy Left Into Selection</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Ctrl+Right</para>
+              <para>Default: <literal>Ctrl+Right</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1031,7 +1065,7 @@
             <term><userinput>copy_right_into_selection</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Merge</guimenu><guimenuitem>Copy Right Into Selection</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Ctrl+Left</para>
+              <para>Default: <literal>Ctrl+Left</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1039,7 +1073,7 @@
             <term><userinput>merge_from_left_then_right</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Merge</guimenu><guimenuitem>Merge From Left Then Right</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Ctrl+m</para>
+              <para>Default: <literal>Ctrl+m</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1047,7 +1081,7 @@
             <term><userinput>merge_from_right_then_left</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Merge</guimenu><guimenuitem>Merge From Right Then Left</guimenuitem></menuchoice> menu item</para>
-              <para>Default: Shift+Ctrl+M</para>
+              <para>Default: <literal>Shift+Ctrl+M</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1055,7 +1089,7 @@
             <term><userinput>help_contents</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Help</guimenu><guimenuitem>Help Contents</guimenuitem></menuchoice> menu item</para>
-              <para>Default: F1</para>
+              <para>Default: <literal>F1</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1084,7 +1118,7 @@
             <term><userinput>enter_align_mode</userinput></term>
             <listitem>
               <para>enter alignment editing mode</para>
-              <para>Default: space</para>
+              <para>Default: <literal>space</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1092,7 +1126,7 @@
             <term><userinput>enter_character_mode</userinput></term>
             <listitem>
               <para>enter character editing mode</para>
-              <para>Default: Return, KP_Enter</para>
+              <para>Defaults: <literal>Return</literal>, <literal>KP_Enter</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1100,7 +1134,7 @@
             <term><userinput>first_line</userinput></term>
             <listitem>
               <para>move cursor to the first line</para>
-              <para>Defaults: Home, g</para>
+              <para>Defaults: <literal>Home</literal>, <literal>g</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1108,7 +1142,7 @@
             <term><userinput>extend_first_line</userinput></term>
             <listitem>
               <para>move cursor to the first line, extending the selection</para>
-              <para>Default: Shift+Home</para>
+              <para>Default: <literal>Shift+Home</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1116,7 +1150,7 @@
             <term><userinput>last_line</userinput></term>
             <listitem>
               <para>move cursor to the last line</para>
-              <para>Defaults: End, Shift+G</para>
+              <para>Defaults: <literal>End</literal>, <literal>Shift+G</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1124,7 +1158,7 @@
             <term><userinput>extend_last_line</userinput></term>
             <listitem>
               <para>move cursor to the last line, extending the selection</para>
-              <para>Default: Shift+End</para>
+              <para>Default: <literal>Shift+End</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1132,7 +1166,7 @@
             <term><userinput>up</userinput></term>
             <listitem>
               <para>move cursor up one line</para>
-              <para>Defaults: Up, k</para>
+              <para>Defaults: <literal>Up</literal>, <literal>k</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1140,7 +1174,7 @@
             <term><userinput>extend_up</userinput></term>
             <listitem>
               <para>move cursor up one line, extending the selection</para>
-              <para>Defaults: Shift+Up, Shift+K</para>
+              <para>Defaults: <literal>Shift+Up</literal>, <literal>Shift+K</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1148,7 +1182,7 @@
             <term><userinput>down</userinput></term>
             <listitem>
               <para>move cursor down one line</para>
-              <para>Defaults: Down, j</para>
+              <para>Defaults: <literal>Down</literal>, <literal>j</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1156,7 +1190,7 @@
             <term><userinput>extend_down</userinput></term>
             <listitem>
               <para>move cursor down one line, extending the selection</para>
-              <para>Defaults: Shift+Down, Shift+J</para>
+              <para>Defaults: <literal>Shift+Down</literal>, <literal>Shift+J</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1164,7 +1198,7 @@
             <term><userinput>left</userinput></term>
             <listitem>
               <para>move cursor left one file</para>
-              <para>Defaults: Left, h</para>
+              <para>Defaults: <literal>Left</literal>, <literal>h</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1172,7 +1206,7 @@
             <term><userinput>extend_left</userinput></term>
             <listitem>
               <para>move cursor left one file, extending the selection</para>
-              <para>Default: Shift+Left</para>
+              <para>Default: <literal>Shift+Left</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1180,7 +1214,7 @@
             <term><userinput>right</userinput></term>
             <listitem>
               <para>move cursor right one file</para>
-              <para>Defaults: Right, l</para>
+              <para>Defaults: <literal>Right</literal>, <literal>l</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1188,7 +1222,7 @@
             <term><userinput>extend_right</userinput></term>
             <listitem>
               <para>move cursor right one file, extending the selection</para>
-              <para>Default: Shift+Right</para>
+              <para>Default: <literal>Shift+Right</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1196,7 +1230,7 @@
             <term><userinput>page_up</userinput></term>
             <listitem>
               <para>move cursor up one page</para>
-              <para>Defaults: Page_Up, Ctrl+u</para>
+              <para>Defaults: <literal>Page_Up</literal>, <literal>Ctrl+u</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1204,7 +1238,7 @@
             <term><userinput>extend_page_up</userinput></term>
             <listitem>
               <para>move cursor up one page, extending the selection</para>
-              <para>Defaults: Shift+Page_Up, Shift+Ctrl+u</para>
+              <para>Defaults: <literal>Shift+Page_Up</literal>, <literal>Shift+Ctrl+u</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1212,7 +1246,7 @@
             <term><userinput>page_down</userinput></term>
             <listitem>
               <para>move cursor down one page</para>
-              <para>Defaults: Page_Down, Ctrl+d</para>
+              <para>Defaults: <literal>Page_Down</literal>, <literal>Ctrl+d</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1220,7 +1254,7 @@
             <term><userinput>extend_page_down</userinput></term>
             <listitem>
               <para>move cursor down one page, extending the selection</para>
-              <para>Defaults: Shift+Page_Down, Shift+Ctrl+d</para>
+              <para>Defaults: <literal>Shift+Page_Down</literal>, <literal>Shift+Ctrl+d</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1228,7 +1262,7 @@
             <term><userinput>delete_text</userinput></term>
             <listitem>
               <para>delete the selected text</para>
-              <para>Defaults: BackSpace, Delete, x</para>
+              <para>Defaults: <literal>BackSpace</literal>, <literal>Delete</literal>, <literal>x</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1236,7 +1270,7 @@
             <term><userinput>first_difference</userinput></term>
             <listitem>
               <para>select the first difference</para>
-              <para>Defaults: Ctrl+Home, Shift+P</para>
+              <para>Defaults: <literal>Ctrl+Home</literal>, <literal>Shift+P</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1244,7 +1278,7 @@
             <term><userinput>previous_difference</userinput></term>
             <listitem>
               <para>select the previous difference</para>
-              <para>Default: p</para>
+              <para>Default: <literal>p</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1252,7 +1286,7 @@
             <term><userinput>next_difference</userinput></term>
             <listitem>
               <para>select the next difference</para>
-              <para>Default: n</para>
+              <para>Default: <literal>n</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1260,7 +1294,7 @@
             <term><userinput>last_difference</userinput></term>
             <listitem>
               <para>select the last difference</para>
-              <para>Defaults: Ctrl+End, Shift+N</para>
+              <para>Defaults: <literal>Ctrl+End</literal>, <literal>Shift+N</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1268,7 +1302,7 @@
             <term><userinput>clear_edits</userinput></term>
             <listitem>
               <para>clear all edits from the selected lines</para>
-              <para>Default: r</para>
+              <para>Default: <literal>r</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1276,7 +1310,7 @@
             <term><userinput>copy_left_into_selection</userinput></term>
             <listitem>
               <para>copy lines from the file on the left into the selection</para>
-              <para>Default: Shift+L</para>
+              <para>Default: <literal>Shift+L</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1284,7 +1318,7 @@
             <term><userinput>copy_right_into_selection</userinput></term>
             <listitem>
               <para>copy lines from the file on the right into the selection</para>
-              <para>Default: Shift+H</para>
+              <para>Default: <literal>Shift+H</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1292,7 +1326,7 @@
             <term><userinput>merge_from_left_then_right</userinput></term>
             <listitem>
               <para>merge lines from file on the left then file on the right</para>
-              <para>Default: m</para>
+              <para>Default: <literal>m</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1300,7 +1334,7 @@
             <term><userinput>merge_from_right_then_left</userinput></term>
             <listitem>
               <para>merge lines from file on the right then file on the left</para>
-              <para>Default: Shift+M</para>
+              <para>Default: <literal>Shift+M</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1308,7 +1342,7 @@
             <term><userinput>isolate</userinput></term>
             <listitem>
               <para>isolate the selected lines</para>
-              <para>Default: i</para>
+              <para>Default: <literal>i</literal></para>
             </listitem>
           </varlistentry>
         </variablelist>
@@ -1329,7 +1363,7 @@
             <term><userinput>enter_line_mode</userinput></term>
             <listitem>
               <para>enter line editing mode</para>
-              <para>Default: Escape</para>
+              <para>Default: <literal>Escape</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1337,7 +1371,7 @@
             <term><userinput>enter_character_mode</userinput></term>
             <listitem>
               <para>enter character editing mode</para>
-              <para>Default: Return, KP_Enter</para>
+              <para>Defaults: <literal>Return</literal>, <literal>KP_Enter</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1345,7 +1379,7 @@
             <term><userinput>first_line</userinput></term>
             <listitem>
               <para>move cursor to the first line</para>
-              <para>Default: g</para>
+              <para>Default: <literal>g</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1353,7 +1387,7 @@
             <term><userinput>last_line</userinput></term>
             <listitem>
               <para>move cursor to the last line</para>
-              <para>Default: Shift+G</para>
+              <para>Default: <literal>Shift+G</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1361,7 +1395,7 @@
             <term><userinput>up</userinput></term>
             <listitem>
               <para>move cursor up one line</para>
-              <para>Defaults: Up, k</para>
+              <para>Defaults: <literal>Up</literal>, <literal>k</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1369,7 +1403,7 @@
             <term><userinput>down</userinput></term>
             <listitem>
               <para>move cursor down one line</para>
-              <para>Defaults: Down, j</para>
+              <para>Defaults: <literal>Down</literal>, <literal>j</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1377,7 +1411,7 @@
             <term><userinput>left</userinput></term>
             <listitem>
               <para>move cursor left one file</para>
-              <para>Defaults: Left, h</para>
+              <para>Defaults: <literal>Left</literal>, <literal>h</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1385,7 +1419,7 @@
             <term><userinput>right</userinput></term>
             <listitem>
               <para>move cursor right one file</para>
-              <para>Defaults: Right, l</para>
+              <para>Defaults: <literal>Right</literal>, <literal>l</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1393,7 +1427,7 @@
             <term><userinput>page_up</userinput></term>
             <listitem>
               <para>move cursor up one page</para>
-              <para>Defaults: Page_Up, Ctrl+u</para>
+              <para>Defaults: <literal>Page_Up</literal>, <literal>Ctrl+u</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1401,7 +1435,7 @@
             <term><userinput>page_down</userinput></term>
             <listitem>
               <para>move cursor down one page</para>
-              <para>Defaults: Page_Down, Ctrl+d</para>
+              <para>Defaults: <literal>Page_Down</literal>, <literal>Ctrl+d</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1409,7 +1443,7 @@
             <term><userinput>align</userinput></term>
             <listitem>
               <para>align the selected line to the cursor position</para>
-              <para>Default: space</para>
+              <para>Default: <literal>space</literal></para>
             </listitem>
           </varlistentry>
         </variablelist>
@@ -1430,7 +1464,7 @@
             <term><userinput>enter_line_mode</userinput></term>
             <listitem>
               <para>enter line editing mode</para>
-              <para>Default: Escape</para>
+              <para>Default: <literal>Escape</literal></para>
             </listitem>
           </varlistentry>
         </variablelist>
@@ -1456,13 +1490,14 @@
       <sect2 id="resources-strings-used">
         <title>Used String Resources</title>
 
-        <para>The following string resources are used by &app;:</para>
+        <para>The following string resources are used by <application>&app;</application>:</para>
 
         <variablelist>
           <varlistentry>
             <term><userinput>difference_colours</userinput></term>
             <listitem>
               <para>a list of colour resources used to indicate differences</para>
+              <para>Default: <literal>difference_1 difference_2 difference_3</literal></para>
             </listitem>
           </varlistentry>
         </variablelist>
@@ -1488,7 +1523,7 @@
       <sect2 id="resources-colours-used">
         <title>Used Colour Resources</title>
 
-        <para>The following colour resources are used by &app;:</para>
+        <para>The following colour resources are used by <application>&app;</application>:</para>
 
         <variablelist>
 
@@ -1496,6 +1531,7 @@
             <term><userinput>alignment</userinput></term>
             <listitem>
               <para>colour used to indicate a line picked for manual alignment</para>
+              <para>Default: <literal>1 1 0</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1503,6 +1539,7 @@
             <term><userinput>character_selection</userinput></term>
             <listitem>
               <para>colour used to indicate selected characters</para>
+              <para>Default: <literal>0.7 0.7 1</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1510,6 +1547,7 @@
             <term><userinput>cursor</userinput></term>
             <listitem>
               <para>colour used for the cursor</para>
+              <para>Default: <literal>0 0 0</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1517,6 +1555,7 @@
             <term><userinput>difference_1</userinput></term>
             <listitem>
               <para>colour used to identify differences between the first pair of files</para>
+              <para>Default: <literal>1 0.625 0.625</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1524,6 +1563,7 @@
             <term><userinput>difference_2</userinput></term>
             <listitem>
               <para>colour used to identify differences between the second pair of files</para>
+              <para>Default: <literal>0.85 0.625 0.775</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1531,6 +1571,7 @@
             <term><userinput>difference_3</userinput></term>
             <listitem>
               <para>colour used to identify differences between the third pair of files</para>
+              <para>Default: <literal>0.85 0.775 0.625</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1538,6 +1579,7 @@
             <term><userinput>edited</userinput></term>
             <listitem>
               <para>colour used to indicate edited lines</para>
+              <para>Default: <literal>0.5 1 0.5</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1545,6 +1587,7 @@
             <term><userinput>hatch</userinput></term>
             <listitem>
               <para>colour used for indicating alignment gaps</para>
+              <para>Default: <literal>0.8 0.8 0.8</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1552,6 +1595,7 @@
             <term><userinput>line_number</userinput></term>
             <listitem>
               <para>colour used for line numbers</para>
+              <para>Default: <literal>0 0 0</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1559,6 +1603,7 @@
             <term><userinput>line_number_background</userinput></term>
             <listitem>
               <para>background colour for the line number area</para>
+              <para>Default: <literal>0.75 0.75 0.75</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1566,6 +1611,7 @@
             <term><userinput>line_selection</userinput></term>
             <listitem>
               <para>colour used to indicate selected lines</para>
+              <para>Default: <literal>0.7 0.7 1</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1573,6 +1619,15 @@
             <term><userinput>map_background</userinput></term>
             <listitem>
               <para>background colour for the map area</para>
+              <para>Default: <literal>0.6 0.6 0.6</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>margin</userinput></term>
+            <listitem>
+              <para>colour used to indicate the right margin</para>
+              <para>Default: <literal>0.8 0.8 0.8</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1580,6 +1635,7 @@
             <term><userinput>preedit</userinput></term>
             <listitem>
               <para>pre-edit text colour</para>
+              <para>Default: <literal>0 0 0</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1587,6 +1643,7 @@
             <term><userinput>text</userinput></term>
             <listitem>
               <para>regular text colour</para>
+              <para>Default: <literal>0 0 0</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1594,6 +1651,7 @@
             <term><userinput>text_background</userinput></term>
             <listitem>
               <para>background colour for the text area</para>
+              <para>Default: <literal>1 1 1</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1620,7 +1678,7 @@
       <sect2 id="resources-floats-used">
         <title>Used Floating Point Resources</title>
 
-        <para>The following floating point resources are used by &app;:</para>
+        <para>The following floating point resources are used by <application>&app;</application>:</para>
 
         <variablelist>
 
@@ -1628,7 +1686,7 @@
             <term><userinput>alignment_opacity</userinput></term>
             <listitem>
               <para>opacity used when compositing the manual alignment colour</para>
-              <para>Defaults: 1</para>
+              <para>Defaults: <literal>1</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1636,7 +1694,7 @@
             <term><userinput>character_difference_opacity</userinput></term>
             <listitem>
               <para>opacity used when compositing character difference colours</para>
-              <para>Defaults: 0.4</para>
+              <para>Defaults: <literal>0.4</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1644,7 +1702,7 @@
             <term><userinput>character_selection_opacity</userinput></term>
             <listitem>
               <para>opacity used when compositing the character selection colour</para>
-              <para>Defaults: 0.4</para>
+              <para>Defaults: <literal>0.4</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1652,7 +1710,7 @@
             <term><userinput>edited_opacity</userinput></term>
             <listitem>
               <para>opacity used when compositing the edited line colour</para>
-              <para>Defaults: 0.4</para>
+              <para>Defaults: <literal>0.4</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1660,7 +1718,7 @@
             <term><userinput>line_difference_alpha</userinput></term>
             <listitem>
               <para>alpha value used when compositing line difference colours</para>
-              <para>Defaults: 0.3</para>
+              <para>Defaults: <literal>0.3</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1668,7 +1726,7 @@
             <term><userinput>line_selection_opacity</userinput></term>
             <listitem>
               <para>opacity used when compositing the line selection colour</para>
-              <para>Defaults: 0.4</para>
+              <para>Defaults: <literal>0.4</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1752,7 +1810,7 @@
 
   <chapter id="files">
     <title>Files</title>
-    <para>The following files are used by &app;:</para>
+    <para>The following files are used by <application>&app;</application>:</para>
 
     <variablelist>
       <varlistentry>
diff -Nru diffuse-0.4.4/src/usr/share/gnome/help/diffuse/it/diffuse.xml diffuse-0.4.5/src/usr/share/gnome/help/diffuse/it/diffuse.xml
--- diffuse-0.4.4/src/usr/share/gnome/help/diffuse/it/diffuse.xml	1970-01-01 00:00:00.000000000 +0000
+++ diffuse-0.4.5/src/usr/share/gnome/help/diffuse/it/diffuse.xml	2011-07-13 09:18:33.000000000 +0000
@@ -0,0 +1,1535 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+  <!ENTITY app "Diffuse">
+<!ENTITY app-version "0.4.5">
+]>
+<book id="index" lang="it">
+  <title>Manuale utente di <application>&app;</application></title>
+
+  <bookinfo>
+    <copyright>
+      <year>2009-2011</year>
+      <holder>Derrick Moser</holder>
+    </copyright>
+
+    <authorgroup>
+      <author>
+        <firstname>Derrick</firstname>
+        <surname>Moser</surname>
+        <email>derrick_moser@yahoo.com</email>
+      </author>
+      <othercredit role='translator'>
+        <firstname>Cristian</firstname>
+        <surname>Marchi</surname>
+        <email>cri.penta@gmail.com</email>
+        <contrib>Traduzione</contrib>
+      </othercredit>
+    </authorgroup>
+
+    <releaseinfo>Questo manuale descrive la versione &app-version; di <application>&app;</application>.</releaseinfo>
+  </bookinfo>
+
+  <chapter id="introduction">
+    <title>Introduzione</title>
+
+    <para><application>&app;</application> è uno strumento grafico per l'unione e il confronto di file di testo. <application>&app;</application> è in grado di confrontare uno a fianco all'altro un qualsiasi numero di file e fornisce all'utente la possibilità di correggere manualmente la corrispondenza fra le righe e di modificare i file. <application>&app;</application> è anche in grado di recuperare le revisioni dei file dai repository Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, e SVK per confrontarle e unirle.</para>
+
+    <sect1 id="introduction-about">
+      <title>Informazioni</title>
+      <para><application>&app;</application> è stato scritto da Derrick Moser <email>derrick_moser@yahoo.com</email>.</para>
+      <para>&copy; 2006-2011 Derrick Moser. Tutti i diritti riservati.</para>
+    </sect1>
+
+    <sect1 id="introduction-licence">
+      <title>Licenza</title>
+      <para><application>&app;</application> è software libero; è possibile ridistribuirlo e modificarlo nel rispetto dei termini della <citetitle>GNU General Public License</citetitle> come pubblicata dalla Free Software Foundation sia essa nella versione 2 o (a propria scelta) qualsiasi versione successiva.</para>
+      <para><application>&app;</application> è distribuito con la speranza che possa essere utile, ma SENZA ALCUNA GARANZIA; senza nemmeno la garanzia implicita di MERCANTABILITÀ o di ADATTABILITÀ A UN PARTICOLARE UTILIZZO. Consultare la <citetitle>GNU General Public License</citetitle> per maggiori dettagli.</para>
+      <para>Dovrebbe essere stata fornita una copia della <citetitle>GNU General Public License</citetitle> con <application>&app;</application>. È anche possibile ottenere una copia della <citetitle>GNU General Public License</citetitle> dalla Free Software Foundation visitando <ulink type="http" url="http://www.fsf.org/">il loro sito web</ulink> o scrivendo a <address> Free Software Foundation, Inc. <street>51 Franklin St</street>, Fifth Floor, <city>Boston</city>, <state>MA</state><postcode>02110-1301</postcode><country>USA</country></address></para>
+    </sect1>
+
+    <sect1 id="introduction-usage">
+      <title>Utilizzo dalla linea di comando</title>
+
+      <variablelist>
+        <varlistentry>
+          <term><userinput>diffuse [ -h | -? | --help | -v | --version ]</userinput></term>
+          <listitem>
+            <para>Visualizza le informazioni relative a <application>&app;</application>.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><userinput>diffuse [ [ <replaceable>opzione</replaceable> ]... [ <replaceable>file</replaceable> ]... ]...</userinput></term>
+          <listitem>
+            <para>Confronta e unisce file.</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+
+      <sect2 id="introduction-options-help">
+        <title>Opzioni di aiuto</title>
+
+        <para>Se viene specificata una opzione di aiuto, questa deve essere l'unico argomento inserito nella linea di comando. <application>&app;</application> uscirà subito dopo aver visualizzato le informazioni.</para>
+
+        <variablelist>
+          <varlistentry>
+            <term><userinput>-h</userinput>, <userinput>-?</userinput>, <userinput>--help</userinput></term>
+            <listitem>
+              <para>Mostra le informazioni di utilizzo.</para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>-v</userinput>, <userinput>--version</userinput></term>
+            <listitem>
+              <para>Mostra la versione e il copyright.</para>
+            </listitem>
+          </varlistentry>
+        </variablelist>
+      </sect2>
+
+      <sect2 id="introduction-options-configuration">
+        <title>Opzioni di configurazione</title>
+
+        <para>Se viene specificata una opzione di configurazione, questa deve essere il primo argomento indicato nella riga di comando.</para>
+
+        <variablelist>
+          <varlistentry>
+            <term><userinput>--no-rcfile</userinput></term>
+            <listitem>
+              <para>Non legge alcun file di inizializzazione.</para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>--rcfile <replaceable>file</replaceable></userinput></term>
+            <listitem>
+              <para>Legge i comandi di inizializzazione esclusivamente dal file <replaceable>file</replaceable>.</para>
+            </listitem>
+          </varlistentry>
+        </variablelist>
+      </sect2>
+
+      <sect2 id="introduction-options-general">
+        <title>Opzioni generali</title>
+
+        <variablelist>
+          <varlistentry>
+            <term><userinput>-c</userinput>, <userinput>--commit</userinput> <replaceable>rev</replaceable></term>
+            <listitem>
+              <para>Include in una scheda di confronto le revisioni <replaceable>rev - 1</replaceable> e <replaceable>rev</replaceable> del file successivo indicato negli argomenti della linea di comando.</para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>-D</userinput>, <userinput>--close-if-same</userinput></term>
+            <listitem>
+              <para>Chiude tutte le schede senza differenze.</para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>-e</userinput>, <userinput>--encoding</userinput> <replaceable>codec</replaceable></term>
+            <listitem>
+              <para>Usa <replaceable>codec</replaceable> per leggere e scrivere i file.</para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>-L</userinput>, <userinput>--label</userinput> <replaceable>etichetta</replaceable></term>
+            <listitem>
+              <para>Visualizza <replaceable>etichetta</replaceable> invece del nome del file.</para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>-m</userinput>, <userinput>--modified</userinput></term>
+            <listitem>
+              <para>Apre tutti i file modificati dai restanti percorsi indicati tra gli argomenti della linea di comando in schede di confronto separate.</para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>-r</userinput>, <userinput>--revision</userinput> <replaceable>rev</replaceable></term>
+            <listitem>
+              <para>Include nella scheda di comparazione dei file la revisione <replaceable>rev</replaceable> del file successivo contenuto negli argomenti della linea di comando.</para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>-s</userinput>, <userinput>--separate</userinput></term>
+            <listitem>
+              <para>Apre tutti i restanti file specificati come argomento della linea di comando in schede di confronto separate.</para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>-t</userinput>, <userinput>--tab</userinput></term>
+            <listitem>
+              <para>Apre una nuova scheda per ogni altro file indicato come argomento della riga di comando.</para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>--line <replaceable>linea</replaceable></userinput></term>
+            <listitem>
+              <para>Inizia con la <replaceable>linea</replaceable> selezionata.</para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>--null-file</userinput></term>
+            <listitem>
+              <para>Crea un riquadro di confronto vuoto.</para>
+            </listitem>
+          </varlistentry>
+        </variablelist>
+      </sect2>
+
+      <sect2 id="introduction-options-display">
+        <title>Opzioni di visualizzazione</title>
+
+        <para>Le opzioni di visualizzazione indicate come argomenti della linea di comando hanno la precedenza sui valori salvati delle preferenze.</para>
+
+        <variablelist>
+          <varlistentry>
+            <term><userinput>-b</userinput>, <userinput>--ignore-space-change</userinput></term>
+            <listitem>
+              <para>Ignora i cambiamenti del numero di spazi vuoti.</para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>-B</userinput>, <userinput>--ignore-blank-lines</userinput></term>
+            <listitem>
+              <para>Ignora i cambiamenti le cui righe sono tutte vuote.</para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>-E</userinput>, <userinput>--ignore-end-of-line</userinput></term>
+            <listitem>
+              <para>Ignora le differenze alla fine della riga.</para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>-i</userinput>, <userinput>--ignore-case</userinput></term>
+            <listitem>
+              <para>Ignora le differenze tra lettere maiuscole e minuscole nel contenuto del file.</para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>-w</userinput>, <userinput>--ignore-all-space</userinput></term>
+            <listitem>
+              <para>Ignora tutti gli spazi vuoti.</para>
+            </listitem>
+          </varlistentry>
+        </variablelist>
+      </sect2>
+    </sect1>
+  </chapter>
+
+  <chapter id="file-comparison">
+    <title>Confrontare i file</title>
+
+    <para>Usare le voci del menu <menuchoice><guimenu>File</guimenu><guimenuitem>Nuova unione a 2 file</guimenuitem></menuchoice> e <menuchoice><guimenu>File</guimenu><guimenuitem>Nuova unione a 3 file</guimenuitem></menuchoice> per creare ulteriori schede di confronto tra file di testo. I nomi dei file e le revisioni possono essere indicati sia come argomenti della linea di comando di <application>&app;</application> sia nei campi della finestra di apertura file.</para>
+
+    <para><application>&app;</application> visualizza i file uno a fianco all'altro inserendo degli spazi per allineare le righe di testo simili. Le differenze sono evidenziate con diversi colori di sfondo.</para>
+
+    <sect1 id="file-comparison-summary">
+      <title>Sommario del confronto</title>
+
+      <para>Nel margine destro della finestra è visibile un sommario del confronto dei file. Il sommario mostra dove sono stati inseriti degli spazi per allineare le righe di testo corrispondenti ed evidenzia le differenze usando i colori. Le modifiche manuali sono evidenziate in verde. Un cursore blu identifica la regione che si sta visualizzando. La regione visualizzata può essere cambiata facendo clic in un qualsiasi punto del sommario.</para>
+    </sect1>
+
+    <sect1 id="file-comparison-selecting">
+      <title>Selezionare</title>
+
+      <para>Le righe di testo possono essere selezionate utilizzando il mouse o la tastiera. Selezionare le righe di testo facendovi clic sopra con il puntatore del mouse. Fare clic e trascinare il puntatore per selezionare più righe. Mantenendo premuto <keycap>Maiusc</keycap> quando si fa clic la selezione corrente verrà estesa. Selezionare le righe con la tastiera premendo i tasti <keycap>Pag_Su</keycap>, <keycap>Pag_Giù</keycap> o le <keycap>frecce</keycap>. Tenere premuto <keycap>Maiusc</keycap> mentre si usano questi tasti per estendere la selezione. Spostare la selezione in un file adiacente utilizzando i tasti delle frecce sinistra e destra.</para>
+    </sect1>
+
+    <sect1 id="file-comparison-alignment">
+      <title>Far corrispondere le righe</title>
+
+      <para>Il puntatore del mouse o la tastiera possono essere usati per allineare manualmente le righe di testo con i file adiacenti. Per allineare le righe di testo usando il puntatore del mouse, selezionare una riga di testo con il pulsante sinistro del mouse, fare clic con il tasto destro del mouse su una riga di testo del file adiacente e scegliere <menuchoice><guimenuitem>Allinea con la selezione</guimenuitem></menuchoice>. Per allineare le righe di testo con la tastiera, spostare la selezione con i tasti freccia, premere la barra spaziatrice per selezionare la riga corrente di testo, spostare la selezione con i tasti freccia a una riga di testo nel file adiacente e premere di nuovo la barra spaziatrice per indicare la riga di destinazione del testo. Premere il tasto <keycap>Esc</keycap> in qualsiasi momento per annullare l'operazione.</para>
+
+      <para>Usare la voce di menu <menuchoice><guimenuitem>Isola</guimenuitem></menuchoice> per evitare che le righe selezionate vengano fatte corrispondere a una qualsiasi riga dei file adiacenti.</para>
+    </sect1>
+
+    <sect1 id="file-comparison-editing">
+      <title>Modificare</title>
+
+      <para>Premere il tasto <keycap>Invio</keycap> o fare doppio clic nell'area di testo per avviare la modalità di modifica del testo. Il cursore cambierà e nella barra di stato verrà visualizzato il numero della colonna in cui il cursore è posizionato.</para>
+
+      <para>Nella modalità di modifica testo, il testo può essere selezionato con il puntatore del mouse facendo clic e trascinando. La selezione corrente può essere estesa tenendo premuto il tasto <keycap>Maiusc</keycap> e muovendo il cursore facendo clic con il puntatore del mouse o premendo uno qualsiasi tra i <keycap>tasti freccia</keycap>, <keycap>home</keycap>, <keycap>fine</keycap>, <keycap>Pg_Su</keycap> o <keycap>Pg_Giù</keycap>. Le parole possono essere selezionate individualmente con un doppio clic sopra di esse con il puntatore del mouse. L'intera riga può essere selezionata con un triplo clic su di essa con il puntatore del mouse.</para>
+
+      <para>Modificare il testo digitando sulla tastiera. Le righe modificate verranno evidenziate in verde. Usare le voci di menu <menuchoice><guimenuitem>Annulla</guimenuitem></menuchoice> e <menuchoice><guimenuitem>Ripeti</guimenuitem></menuchoice> per annullare e ripetere le operazioni effettuate.</para>
+
+      <para>Premere il tasto <keycap>Esc</keycap> o fare clic nell'area di testo di un altro file con il pulsante sinistro del mouse per abbandonare la modalità di modifica del testo.</para>
+    </sect1>
+
+    <sect1 id="file-comparison-merging">
+      <title>Unire</title>
+
+      <para>Usare i pulsanti delle differenze o le relative voci del menu per spostarsi tra i blocchi di differenze all'interno del file. <application>&app;</application> sposterà la selezione al gruppo di righe più vicino con differenze o modifiche.</para>
+
+      <para>Usare i pulsanti di unione o le relative voci di menu per copiare blocchi di testo nelle righe selezionate. Le voci di menu <menuchoice><guimenuitem>Annulla</guimenuitem></menuchoice> e <menuchoice><guimenuitem>Ripeti</guimenuitem></menuchoice> possono essere utilizzate per annullare e ripetere le operazioni effettuate in precedenza. Tutte le modifiche a un gruppo di righe possono essere annullate utilizzando la voce di menu <menuchoice><guimenuitem>Annulla modifiche</guimenuitem></menuchoice> indipendentemente dall'ordine con cui le modifiche sono state effettuate.</para>
+    </sect1>
+  </chapter>
+
+  <chapter id="version-control">
+    <title>Controllo di versione</title>
+
+    <para><application>&app;</application> è in grado di recuperare le revisioni dei file da diversi sistemi di controllo di versione attraverso la loro interfaccia da linea di comando. Il pacchetto di <application>&app;</application> compilato per Microsoft Windows è in grado di utilizzare sia Cygwin che le versioni native dei sistemi di controllo di versione supportati. Quando si utilizza <application>&app;</application> con Cygwin, assicurarsi che le preferenze di <application>&app;</application> relative a Cygwin descrivano correttamente il proprio sistema. Se la preferenza <guilabel>Aggiorna i percorsi per Cygwin</guilabel> esiste per un sistema di controllo di versione, deve essere abilitata per utilizzare la versione di Cygwin.</para>
+
+    <para>I sistemi di controllo di versione sono sensibili al percorso di sistema e ad altre impostazioni delle variabili di sistema. La preferenza <guilabel>Avvia dalla Bash di una shell di login</guilabel> può essere usata per impostare facilmente l'ambiente per i sistemi di controllo di versione Cygwin.</para>
+
+    <sect1 id="version-control-uncommitted-modifications">
+      <title>Visualizzare le modifiche non applicate</title>
+
+      <para>L'opzione <userinput>-m</userinput> farà aprire a <application>&app;</application> tante schede di confronto quanti sono i file con modifiche non applicate così come riportati dal sistema di controllo di versione. Questo è utile per controllare tutti i cambiamenti prima di effettuare il "commit" o di risolvere i conflitti di unione. Se non vengono specificati dei percorsi, verrà utilizzata la cartella di lavoro corrente. Per esempio, visualizzare tutte le proprie modifiche non applicate con il seguente comando:</para>
+
+      <para>
+        <screen><prompt>$</prompt> <userinput>diffuse -m</userinput></screen>
+      </para>
+
+      <para>La revisione predefinita di un file verrà usata per il confronto se viene specificato un solo file. Per esempio, il seguente comando visualizzerà un'unione a due file tra la revisione predefinita del file <filename>foo.C</filename> e la copia locale dello stesso file:</para>
+
+      <para>
+        <screen><prompt>$</prompt> <userinput>diffuse foo.C</userinput></screen>
+      </para>
+    </sect1>
+
+    <sect1 id="version-control-specifying-revisions">
+      <title>Specificare le revisioni</title>
+
+      <para>L'opzione<userinput>-r</userinput> può essere usata per specificare esplicitamente una particolare revisione di un file. Può essere utilizzato un qualsiasi identificatore della revisione riconosciuto dal sistema di controllo di versione. Se viene specificata un'unica revisione, il confronto verrà fatto rispetto al file locale. Per esempio, il seguente comando visualizzerà una unione a 2 file tra la revisione 123 del file <filename>foo.C</filename> e la copia locale dello stesso file:</para>
+
+      <para>
+        <screen><prompt>$</prompt> <userinput>diffuse -r 123 foo.C</userinput></screen>
+      </para>
+
+      <para>Diverse revisioni dello stesso file possono essere confrontate specificando più opzioni <userinput>-r</userinput>. Per esempio, il seguente comando visualizzerà una unione a due file tra la revisione 123 del file <filename>foo.C</filename> e la revisione 321 dello stesso file:</para>
+
+      <para>
+        <screen><prompt>$</prompt> <userinput>diffuse -r 123 -r 321 foo.C</userinput></screen>
+      </para>
+
+      <para>I file locali possono essere combinati con file dal controllo di versione. Per esempio, il seguente comando visualizzerà una unione a 3 file tra la revisione MERGE_HEAD del file <filename>foo.C</filename>, il file locale <filename>foo.C</filename> e la revisione HEAD dello stesso file:</para>
+
+      <para>
+        <screen><prompt>$</prompt> <userinput>diffuse -r MERGE_HEAD foo.C foo.C -r HEAD foo.C</userinput></screen>
+      </para>
+
+      <para>L'opzione <userinput>-c</userinput> può essere usata per specificare facilmente una coppia di revisioni con numerazioni successive. Per esempio, questo comando visualizzerà una unione a 2 file tra la revisione 1.2.2 del file <filename>foo.C</filename> e la revisione 1.2.3 dello stesso file:</para>
+
+      <para>
+        <screen><prompt>$</prompt> <userinput>diffuse -c 1.2.3 foo.C</userinput></screen>
+      </para>
+
+      <para><application>&app;</application> non limita il numero di riquadri che possono essere usati per confrontare i file. Gli input a una unione Git a più direzioni possono essere visualizzati con un comando di questo tipo:</para>
+
+      <para>
+        <screen><prompt>$</prompt> <userinput>diffuse -r HEAD^1 -r HEAD^2 -r HEAD^3 -r HEAD^4 -r HEAD^5 foo.C</userinput></screen>
+      </para>
+    </sect1>
+  </chapter>
+
+  <chapter id="resources">
+    <title>Risorse</title>
+
+    <para>Le risorse possono essere utilizzate per personalizzare vari parametri dell'aspetto e del comportamento di <application>&app;</application>. È possibile infatti modificare i colori utilizzati nell'interfaccia, personalizzare le scorciatoie da tastiera, aggiungere o sostituire regole per il riconoscimento della sintassi o modificare la mappatura tra estensione del file e regole di riconoscimento della sintassi.</para>
+
+    <para>Quando <application>&app;</application> viene avviato, legge i comandi dal file di inizializzazione del sistema <filename>/etc/diffuserc</filename> (<filename>%CARTELLA_DI_INSTALLAZIONE%\diffuserc</filename> su Microsoft Windows) e in seguito il file di inizializzazione personale <filename>~/.config/diffuse/diffuserc</filename> (<filename>%HOME%\.config\diffuse\diffuserc</filename> su Microsoft Windows). Questo comportamento può essere modificato con le opzioni di configurazione <userinput>--no-rcfile</userinput> e <userinput>--rcfile</userinput>. Un analizzatore di lessico simile alla Bourne shell è utilizzato per analizzare i comandi di inizializzazione. I commenti e i caratteri speciali possono essere inseriti utilizzando lo stesso stile di "escaping" utilizzato per gli script della Bourne shell.</para>
+
+    <sect1 id="resources-general">
+      <title>Generali</title>
+
+      <variablelist>
+        <varlistentry>
+          <term><userinput>import <replaceable>file</replaceable></userinput></term>
+          <listitem>
+            <para>Elabora i comandi di inizializzazione dal file <replaceable>file</replaceable>. Il file di inizializzazione viene elaborato una sola volta.</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </sect1> 
+
+    <sect1 id="resources-keybindings">
+      <title>Keybinding</title>
+
+      <variablelist>
+        <varlistentry>
+          <term><userinput>keybinding <replaceable>contesto</replaceable> <replaceable>azione</replaceable> <replaceable>combinazione_tasti</replaceable></userinput></term>
+          <listitem>
+            <para>Collega una combinazione di tasti a <replaceable>azione</replaceable> quando è utilizzata in <replaceable>contesto</replaceable>. Specificare i modificatori <keycap>Maiusc</keycap> e <keycap>Control</keycap> precedendo rispettivamente <userinput>Maiusc+</userinput> e <userinput>Ctrl+</userinput> a <replaceable>combinazione_tasti</replaceable>. I tasti normalmente modificati da <keycap>Maiusc</keycap> dovrebbero essere specificati utilizzando il loro valore modificato se <replaceable>combinazione_tasti</replaceable> comprende il tasto <keycap>Maiusc</keycap>; per esempio <userinput>Ctrl+g</userinput> e <userinput>Maiusc+Ctrl+G</userinput>. Rimuovere i collegamenti per <replaceable>combinazione_tasti</replaceable> specificando <userinput>None</userinput> come <replaceable>azione</replaceable>.</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+
+      <sect2 id="resources-keybindings-menu">
+        <title>Keybinding delle voci di menu</title>
+
+        <para>Usare <userinput>menu</userinput> come <replaceable>contesto</replaceable> per definire i keybinding per le voci dei menu. I seguenti valori sono validi per il campo <replaceable>azione</replaceable>:</para>
+
+        <variablelist>
+          <varlistentry>
+            <term><userinput>open_file</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>File</guimenu><guimenuitem>Apri file</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Ctrl+o</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>open_file_in_new_tab</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>File</guimenu><guimenuitem>Apri file in una nuova scheda...</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Ctrl+t</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>open_modified_files</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>File</guimenu><guimenuitem>Apri file modificati...</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Shift+Ctrl+O</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>reload_file</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>File</guimenu><guimenuitem>Ricarica file</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Shift+Ctrl+R</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>save_file</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>File</guimenu><guimenuitem>Salva file</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Ctrl+s</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>save_file_as</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>File</guimenu><guimenuitem>Salva con nome...</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Shift+Ctrl+A</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>save_all</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>File</guimenu><guimenuitem>Salva tutti</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Shift+Ctrl+S</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>new_2_way_file_merge</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>File</guimenu><guimenuitem>Nuova unione a 2 file</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Ctrl+2</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>new_3_way_file_merge</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>File</guimenu><guimenuitem>Nuova unione a 3 file</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Ctrl+3</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>close_tab</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>File</guimenu><guimenuitem>Chiudi scheda</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Ctrl+w</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>undo_close_tab</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>File</guimenu><guimenuitem>Annulla chiusura scheda</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Shift+Ctrl+w</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>quit</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>File</guimenu><guimenuitem>Esci.</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Ctrl+q</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>undo</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Modifica</guimenu><guimenuitem>Annulla</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Ctrl+z</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>redo</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Modifica</guimenu><guimenuitem>Ripeti</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Shift+Ctrl+Z</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>cut</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Modifica</guimenu><guimenuitem>Taglia</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Ctrl+x</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>copy</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Modifica</guimenu><guimenuitem>Copia</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Ctrl+c</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>paste</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Modifica</guimenu><guimenuitem>Incolla</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Ctrl+v</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>select_all</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Modifica</guimenu><guimenuitem>Seleziona tutto</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Ctrl+a</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>clear_edits</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Modifica</guimenu><guimenuitem>Annulla modifiche</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Ctrl+r</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>dismiss_all_edits</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Modifica</guimenu><guimenuitem>Scarta tutte le modifiche</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Ctrl+d</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>find</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Modifica</guimenu><guimenuitem>Trova...</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Ctrl+f</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>find_next</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Modifica</guimenu><guimenuitem>Trova successivo</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Ctrl+g</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>find_previous</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Modifica</guimenu><guimenuitem>Trova precedente</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Shift+Ctrl+G</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>go_to_line</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Modifica</guimenu><guimenuitem>Vai alla riga...</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Shift+Ctrl+L</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>preferences</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Modifica</guimenu><guimenuitem>Preferenze</guimenuitem></menuchoice></para>
+              <para>Predefinito: Nessuno</para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>no_syntax_highlighting</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Visualizza</guimenu><guisubmenu>Sintassi</guisubmenu><guimenuitem>Nessuna</guimenuitem></menuchoice></para>
+              <para>Predefinito: Nessuno</para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>syntax_highlighting_<replaceable>sintassi</replaceable></userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Visualizza</guimenu><guisubmenu>Sintassi</guisubmenu><guimenuitem><replaceable>syntax</replaceable></guimenuitem></menuchoice></para>
+              <para>Predefinito: Nessuno</para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>realign_all</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Visualizza</guimenu><guimenuitem>Riallinea tutto</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Ctrl+l</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>isolate</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Visualizza</guimenu><guimenuitem>isola</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Ctrl+i</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>first_difference</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Visualizza</guimenu><guimenuitem>Prima differenza</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Shift+Ctrl+Up</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>previous_difference</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Visualizza</guimenu><guimenuitem>Differenza precedente</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Ctrl+Up</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>next_difference</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Visualizza</guimenu><guimenuitem>Differenza successiva</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Ctrl+Down</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>last_difference</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Visualizza</guimenu><guimenuitem>Ultima differenza</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Shift+Ctrl+Down</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>first_tab</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Visualizza</guimenu><guimenuitem>Prima scheda</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Shift+Ctrl+Page_Up</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>previous_tab</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Visualizza</guimenu><guimenuitem>Scheda precedente</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Ctrl+Page_Up</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>next_tab</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Visualizza</guimenu><guimenuitem>Scheda successiva</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Ctrl+Page_Down</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>last_tab</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Visualizza</guimenu><guimenuitem>Ultima scheda</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Shift+Ctrl+Page_Down</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>shift_pane_right</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Visualizza</guimenu><guimenuitem>Sposta riquadro a destra</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Shift+Ctrl+parenleft</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>shift_pane_left</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Visualizza</guimenu><guimenuitem>Sposta riquadro a sinistra</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Shift+Ctrl+parenright</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>convert_to_upper_case</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Formato</guimenu><guimenuitem>Converti in MAIUSCOLO</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Ctrl+u</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>convert_to_lower_case</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Formato</guimenu><guimenuitem>Converti in minuscolo</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Shift+Ctrl+U</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>sort_lines_in_ascending_order</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Formato</guimenu><guimenuitem>Disponi le righe in ordine ascendente</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Ctrl+y</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>sort_lines_in_descending_order</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Formato</guimenu><guimenuitem>Disponi le righe in ordine discendente</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Shift+Ctrl+Y</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>remove_trailing_white_space</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Formato</guimenu><guimenuitem>Rimuovi gli spazi vuoti alla fine della riga</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Ctrl+k</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>convert_tabs_to_spaces</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Formato</guimenu><guimenuitem>Converti le tabulazioni in spazi</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Ctrl+b</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>convert_leading_spaces_to_tabs</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Formato</guimenu><guimenuitem>Converti gli spazi iniziali in tabulazioni</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Shift+Ctrl+B</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>increase_indenting</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Formato</guimenu><guimenuitem>Aumenta indentazione</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Shift+Ctrl+greater</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>decrease_indenting</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Formato</guimenu><guimenuitem>Diminuisci indentazione</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Shift+Ctrl+less</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>convert_to_dos</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Formato</guimenu><guimenuitem>Converti nel formato DOS</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Shift+Ctrl+E</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>convert_to_mac</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Formato</guimenu><guimenuitem>Converti nel formato MAC</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Shift+Ctrl+C</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>convert_to_unix</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Formato</guimenu><guimenuitem>Converti nel formato Unix</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Ctrl+e</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>copy_selection_right</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Unione</guimenu><guimenuitem>Copia selezione a destra</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Shift+Ctrl+Right</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>copy_selection_left</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Unione</guimenu><guimenuitem>Copia selezione a sinistra</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Shift+Ctrl+Left</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>copy_left_into_selection</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Unione</guimenu><guimenuitem>Copia sinistra nella selezione</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Ctrl+Right</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>copy_right_into_selection</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Unione</guimenu><guimenuitem>Copia destra nella selezione</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Ctrl+Left</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>merge_from_left_then_right</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Unione</guimenu><guimenuitem>Unisci sinistra poi destra</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Ctrl+m</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>merge_from_right_then_left</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Unione</guimenu><guimenuitem>Unisci destra poi sinistra</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>Shift+Ctrl+M</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>help_contents</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Aiuto</guimenu><guimenuitem>Sommario</guimenuitem></menuchoice></para>
+              <para>Predefinito: <literal>F1</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>about</userinput></term>
+            <listitem>
+              <para>Voce di menu <menuchoice><guimenu>Aiuto</guimenu><guimenuitem>Informazioni</guimenuitem></menuchoice></para>
+              <para>Predefinito: Nessuno</para>
+            </listitem>
+          </varlistentry>
+        </variablelist>
+      </sect2>
+
+      <sect2 id="resources-keybindings-line_mode">
+        <title>Keybinding per la modalità di modifica delle righe</title>
+
+        <para>Usare <userinput>line_mode</userinput> come <replaceable>contesto</replaceable> per definire i keybinding per la modalità di modifica delle righe. I seguenti valori sono validi per il campo <replaceable>azione</replaceable>:</para>
+
+        <variablelist>
+          <varlistentry>
+            <term><userinput>enter_align_mode</userinput></term>
+            <listitem>
+              <para>Passa alla modalità di modifica dell'allineamento</para>
+              <para>Predefinito: <literal>space</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>enter_character_mode</userinput></term>
+            <listitem>
+              <para>Passa alla modalità di modifica del testo</para>
+              <para>Predefiniti: <literal>Return</literal>, <literal>KP_Enter</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>first_line</userinput></term>
+            <listitem>
+              <para>Sposta il cursore alla prima riga</para>
+              <para>Predefiniti: <literal>Home</literal>, <literal>g</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>extend_first_line</userinput></term>
+            <listitem>
+              <para>Sposta il cursore alla prima riga, estendendo la selezione </para>
+              <para>Predefinito: <literal>Shift+Home</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>last_line</userinput></term>
+            <listitem>
+              <para>Sposta il cursore all'ultima riga</para>
+              <para>Predefiniti: <literal>End</literal>, <literal>Shift+G</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>extend_last_line</userinput></term>
+            <listitem>
+              <para>Sposta il cursore all'ultima riga, estendendo la selezione</para>
+              <para>Predefinito: <literal>Shift+End</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>up</userinput></term>
+            <listitem>
+              <para>Sposta il cursore alla riga superiore</para>
+              <para>Predefiniti: <literal>Up</literal>, <literal>k</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>extend_up</userinput></term>
+            <listitem>
+              <para>Sposta il cursore alla riga superiore, estendendo la selezione</para>
+              <para>Predefiniti: <literal>Shift+Up</literal>, <literal>Shift+K</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>down</userinput></term>
+            <listitem>
+              <para>Sposta il cursore alla riga inferiore</para>
+              <para>Predefiniti: <literal>Down</literal>, <literal>j</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>extend_down</userinput></term>
+            <listitem>
+              <para>Sposta il cursore alla riga inferiore, estendendo la selezione</para>
+              <para>Predefiniti: <literal>Shift+Down</literal>, <literal>Shift+J</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>left</userinput></term>
+            <listitem>
+              <para>Sposta il cursore sinistra di un file</para>
+              <para>Predefiniti: <literal>Left</literal>, <literal>h</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>extend_left</userinput></term>
+            <listitem>
+              <para>Sposta il cursore a sinistra di un file, estendendo la selezione</para>
+              <para>Predefinito: <literal>Shift+Left</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>right</userinput></term>
+            <listitem>
+              <para>Sposta il cursore a destra di un file</para>
+              <para>Predefiniti: <literal>Right</literal>, <literal>l</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>extend_right</userinput></term>
+            <listitem>
+              <para>Sposta il cursore a destra di un file, estendendo la selezione</para>
+              <para>Predefinito: <literal>Shift+Right</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>page_up</userinput></term>
+            <listitem>
+              <para>Sposta il cursore alla pagina superiore</para>
+              <para>Predefiniti: <literal>Page_Up</literal>, <literal>Ctrl+u</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>extend_page_up</userinput></term>
+            <listitem>
+              <para>Sposta il cursore alla pagina superiore, estendendo la selezione</para>
+              <para>Predefiniti: <literal>Shift+Page_Up</literal>, <literal>Shift+Ctrl+u</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>page_down</userinput></term>
+            <listitem>
+              <para>Sposta il cursore alla pagina inferiore</para>
+              <para>Predefiniti: <literal>Page_Down</literal>, <literal>Ctrl+d</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>extend_page_down</userinput></term>
+            <listitem>
+              <para>Sposta il cursore alla pagina inferiore, estendendo la selezione</para>
+              <para>Predefiniti: <literal>Shift+Page_Down</literal>, <literal>Shift+Ctrl+d</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>delete_text</userinput></term>
+            <listitem>
+              <para>Cancella il testo selezionato</para>
+              <para>Predefiniti: <literal>BackSpace</literal>, <literal>Delete</literal>, <literal>x</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>first_difference</userinput></term>
+            <listitem>
+              <para>Seleziona la prima differenza</para>
+              <para>Predefiniti: <literal>Ctrl+Home</literal>, <literal>Shift+P</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>previous_difference</userinput></term>
+            <listitem>
+              <para>Seleziona la differenza precedente</para>
+              <para>Predefinito: <literal>p</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>next_difference</userinput></term>
+            <listitem>
+              <para>Seleziona la differenza successiva</para>
+              <para>Predefinito: <literal>n</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>last_difference</userinput></term>
+            <listitem>
+              <para>Seleziona l'ultima differenza</para>
+              <para>Predefiniti: <literal>Ctrl+End</literal>, <literal>Shift+N</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>clear_edits</userinput></term>
+            <listitem>
+              <para>Annulla tutte le modifiche alle righe selezionate</para>
+              <para>Predefinito: <literal>r</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>copy_left_into_selection</userinput></term>
+            <listitem>
+              <para>Copia le righe dal file a sinistra nella selezione</para>
+              <para>Predefinito: <literal>Shift+L</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>copy_right_into_selection</userinput></term>
+            <listitem>
+              <para>Copia le righe dal file a destra nella selezione</para>
+              <para>Predefinito: <literal>Shift+H</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>merge_from_left_then_right</userinput></term>
+            <listitem>
+              <para>Unisce le righe dal file a sinistra poi da quello a destra</para>
+              <para>Predefinito: <literal>m</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>merge_from_right_then_left</userinput></term>
+            <listitem>
+              <para>Unisce le righe dal file a destra poi da quello a sinistra</para>
+              <para>Predefinito: <literal>Shift+M</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>isolate</userinput></term>
+            <listitem>
+              <para>Isola le righe selezionate</para>
+              <para>Predefinito: <literal>i</literal></para>
+            </listitem>
+          </varlistentry>
+        </variablelist>
+      </sect2>
+
+      <sect2 id="resources-keybindings-align_mode">
+        <title>Keybinding per la modalità di modifica dell'allineamento</title>
+
+        <para>Usare <userinput>align_mode</userinput> come <replaceable>contesto</replaceable> per definire i keybinding per la modalità di modifica dell'allineamento. I seguenti valori sono validi per il campo <replaceable>azione</replaceable>:</para>
+
+        <variablelist>
+          <varlistentry>
+            <term><userinput>enter_line_mode</userinput></term>
+            <listitem>
+              <para>Passa alla modalità di modifica riga</para>
+              <para>Predefinito: <literal>Escape</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>enter_character_mode</userinput></term>
+            <listitem>
+              <para>Passa alla modalità di modifica del testo</para>
+              <para>Predefiniti: <literal>Return</literal>, <literal>KP_Enter</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>first_line</userinput></term>
+            <listitem>
+              <para>Sposta il cursore alla prima riga</para>
+              <para>Predefinito: <literal>g</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>last_line</userinput></term>
+            <listitem>
+              <para>Sposta il cursore all'ultima riga</para>
+              <para>Predefinito: <literal>Shift+G</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>up</userinput></term>
+            <listitem>
+              <para>Sposta il cursore alla riga superiore</para>
+              <para>Predefiniti: <literal>Up</literal>, <literal>k</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>down</userinput></term>
+            <listitem>
+              <para>Sposta il cursore alla riga inferiore</para>
+              <para>Predefiniti: <literal>Down</literal>, <literal>j</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>left</userinput></term>
+            <listitem>
+              <para>Sposta il cursore sinistra di un file</para>
+              <para>Predefiniti: <literal>Left</literal>, <literal>h</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>right</userinput></term>
+            <listitem>
+              <para>Sposta il cursore a destra di un file</para>
+              <para>Predefiniti: <literal>Right</literal>, <literal>l</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>page_up</userinput></term>
+            <listitem>
+              <para>Sposta il cursore alla pagina superiore</para>
+              <para>Predefiniti: <literal>Page_Up</literal>, <literal>Ctrl+u</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>page_down</userinput></term>
+            <listitem>
+              <para>Sposta il cursore alla pagina inferiore</para>
+              <para>Predefiniti: <literal>Page_Down</literal>, <literal>Ctrl+d</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>align</userinput></term>
+            <listitem>
+              <para>Allinea le righe selezionate alla posizione del cursore</para>
+              <para>Predefinito: <literal>space</literal></para>
+            </listitem>
+          </varlistentry>
+        </variablelist>
+      </sect2>
+
+      <sect2 id="resources-keybindings-character_mode">
+        <title>Keybinding della modalità di modifica testo</title>
+
+        <para>Usare <userinput>character_mode</userinput> come <replaceable>contesto</replaceable> per definire i keybinding per la modalità di modifica testo. I seguenti valori sono validi per il campo <replaceable>azione</replaceable>:</para>
+
+        <variablelist>
+          <varlistentry>
+            <term><userinput>enter_line_mode</userinput></term>
+            <listitem>
+              <para>Passa alla modalità di modifica riga</para>
+              <para>Predefinito: <literal>Escape</literal></para>
+            </listitem>
+          </varlistentry>
+        </variablelist>
+      </sect2>
+    </sect1>
+
+    <sect1 id="resources-strings">
+      <title>Stringhe</title>
+
+      <variablelist>
+        <varlistentry>
+          <term><userinput>stringa <replaceable>nome</replaceable> <replaceable>valore</replaceable></userinput></term>
+          <listitem>
+            <para>Dichiara una stringa chiamata <replaceable>nome</replaceable> con valore <replaceable>valore</replaceable>.</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+
+      <sect2 id="resources-strings-used">
+        <title>Risorse stringa utilizzate</title>
+
+        <para><application>&app;</application> utilizza le seguenti stringhe come risorse:</para>
+
+        <variablelist>
+          <varlistentry>
+            <term><userinput>difference_colours</userinput></term>
+            <listitem>
+              <para>un elenco di risorse colore utilizzate per evidenziare le differenze</para>
+              <para>Predefinito: <literal>difference_1 difference_2 difference_3</literal></para>
+            </listitem>
+          </varlistentry>
+        </variablelist>
+      </sect2> 
+    </sect1> 
+
+    <sect1 id="resources-colours">
+      <title>Colori</title>
+
+      <variablelist>
+        <varlistentry>
+          <term><userinput>[ colour | color ] <replaceable>nome</replaceable> <replaceable>rosso</replaceable> <replaceable>verde</replaceable> <replaceable>blu</replaceable></userinput></term>
+          <listitem>
+            <para>Dichiara una risorsa colore chiamata <replaceable>nome</replaceable>. Le singole componenti del colore devono essere espresse come valori compresi tra 0 e 1.</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+
+      <sect2 id="resources-colours-used">
+        <title>Risorse colori utilizzati</title>
+
+        <para><application>&app;</application> utilizza le seguenti risorse colore:</para>
+
+        <variablelist>
+
+          <varlistentry>
+            <term><userinput>alignment</userinput></term>
+            <listitem>
+              <para>Colore utilizzato per indicare una riga selezionata per l'allineamento manuale.</para>
+              <para>Predefinito: <literal>1 1 0</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>character_selection</userinput></term>
+            <listitem>
+              <para>Colore usato per evidenziare i caratteri selezionati.</para>
+              <para>Predefinito: <literal>0.7 0.7 1</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>cursor</userinput></term>
+            <listitem>
+              <para>Colore utilizzato per il cursore.</para>
+              <para>Predefinito: <literal>0 0 0</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>difference_1</userinput></term>
+            <listitem>
+              <para>Colore usato per evidenziare le differenze nella prima coppia di file.</para>
+              <para>Predefinito: <literal>1 0.625 0.625</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>difference_2</userinput></term>
+            <listitem>
+              <para>Colore usato per evidenziare le differenze nella seconda coppia di file.</para>
+              <para>Predefinito: <literal>0.85 0.625 0.775</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>difference_3</userinput></term>
+            <listitem>
+              <para>Colore usato per evidenziare le differenze nella terza coppia di file.</para>
+              <para>Predefinito: <literal>0.85 0.775 0.625</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>edited</userinput></term>
+            <listitem>
+              <para>Colore usato per evidenziare le righe modificate.</para>
+              <para>Predefinito: <literal>0.5 1 0.5</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>hatch</userinput></term>
+            <listitem>
+              <para>Colore usato per evidenziare delle discrepanze nell'allineamento.</para>
+              <para>Predefinito: <literal>0.8 0.8 0.8</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>line_number</userinput></term>
+            <listitem>
+              <para>Colore usato per i numeri di riga.</para>
+              <para>Predefinito: <literal>0 0 0</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>line_number_background</userinput></term>
+            <listitem>
+              <para>Colore di sfondo per l'area del numero di riga.</para>
+              <para>Predefinito: <literal>0.75 0.75 0.75</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>line_selection</userinput></term>
+            <listitem>
+              <para>Colore usato per evidenziare le linee selezionate.</para>
+              <para>Predefinito: <literal>0.7 0.7 1</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>map_background</userinput></term>
+            <listitem>
+              <para>Colore di sfondo per l'area di mappatura.</para>
+              <para>Predefinito: <literal>0.6 0.6 0.6</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>margin</userinput></term>
+            <listitem>
+              <para>Colore usato per indicare il margine destro.</para>
+              <para>Predefinito: <literal>0.8 0.8 0.8</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>preedit</userinput></term>
+            <listitem>
+              <para>Colore del testo prima delle modifiche.</para>
+              <para>Predefinito: <literal>0 0 0</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>text</userinput></term>
+            <listitem>
+              <para>Colore del testo regolare.</para>
+              <para>Predefinito: <literal>0 0 0</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>text_background</userinput></term>
+            <listitem>
+              <para>Colore di sfondo per l'area di testo.</para>
+              <para>Predefinito: <literal>1 1 1</literal></para>
+            </listitem>
+          </varlistentry>
+
+        </variablelist>
+      </sect2> 
+    </sect1> 
+
+    <sect1 id="resources-floats">
+      <title>Valori a virgola mobile</title>
+
+      <variablelist>
+        <varlistentry>
+          <term><userinput>float <replaceable>nome</replaceable> <replaceable>valore</replaceable></userinput></term>
+          <listitem>
+            <para>Dichiara una risorsa a virgola mobile chiamata <replaceable>nome</replaceable> con valore <replaceable>valore</replaceable>.</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+
+      <sect2 id="resources-floats-used">
+        <title>Risorse a virgola mobile utilizzate</title>
+
+        <para><application>&app;</application> utilizza le seguenti risorse a virgola mobile:</para>
+
+        <variablelist>
+
+          <varlistentry>
+            <term><userinput>alignment_opacity</userinput></term>
+            <listitem>
+              <para>Opacità utilizzata durante la composizione del colore per l'allineamento manuale</para>
+              <para>Predefinito: <literal>1</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>character_difference_opacity</userinput></term>
+            <listitem>
+              <para>Opacità utilizzata durante la composizione del colore per le differenze di testo</para>
+              <para>Predefinito: <literal>0.4</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>character_selection_opacity</userinput></term>
+            <listitem>
+              <para>Opacità utilizzata durante la composizione del colore per il testo selezionato</para>
+              <para>Predefinito: <literal>0.4</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>edited_opacity</userinput></term>
+            <listitem>
+              <para>Opacità utilizzata durante la composizione del colore per le righe modificate</para>
+              <para>Predefinito: <literal>0.4</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>line_difference_alpha</userinput></term>
+            <listitem>
+              <para>Valore di trasparenza utilizzato durante la composizione del colore per le differenze di riga</para>
+              <para>Predefinito: <literal>0.3</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>line_selection_opacity</userinput></term>
+            <listitem>
+              <para>Opacità utilizzata durante la composizione del colore per la riga selezionata</para>
+              <para>Predefinito: <literal>0.4</literal></para>
+            </listitem>
+          </varlistentry>
+
+        </variablelist>
+      </sect2> 
+    </sect1> 
+
+    <sect1 id="resources-syntax-highlighting">
+      <title>Riconoscimento della sintassi</title>
+
+      <variablelist>
+
+        <varlistentry>
+          <term><userinput>syntax <replaceable>nome</replaceable> <optional><replaceable>stato_iniziale</replaceable> <replaceable>default_tag</replaceable></optional></userinput></term>
+          <listitem>
+            <para>Dichiara un nuovo stile di sintassi chiamato <replaceable>nome</replaceable>. Il riconoscimento della sintassi utilizza una semplice macchina di stato che cambia di stato nel momento in cui alcuni schemi risultano corrispondenti. Lo stato iniziale per la macchina sarà <replaceable>stato_iniziale</replaceable>. Tutti i caratteri che non corrispondono ad alcuno schema verranno marcati come <replaceable>default_tag</replaceable> per il riconoscimento. Lo stile di sintassi chiamato <replaceable>nome</replaceable> può essere rimosso omettendo <replaceable>stato_iniziale</replaceable> e <replaceable>default_tag</replaceable>.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><userinput>syntax_files <replaceable>nome</replaceable> <optional><replaceable>schema</replaceable></optional></userinput></term>
+          <listitem>
+            <para>Specifica che i file con un nome corrispondente a <replaceable>schema</replaceable> devono essere evidenziati utilizzando lo stile di sintassi chiamato <replaceable>nome</replaceable>. Gli schemi usati per far corrispondere i file utilizzati con lo stile di sintassi chiamato <replaceable>nome</replaceable> possono essere rimossi omettendo <replaceable>schema</replaceable>.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><userinput>syntax_magic <replaceable>nome</replaceable> <optional><replaceable>schema</replaceable> <optional>ignorecase</optional></optional></userinput></term>
+          <listitem>
+            <para>Specifica che i file con una prima riga corrispondente a <replaceable>schema</replaceable> devono essere evidenziati utilizzando lo stile di sintassi chiamato <replaceable>nome</replaceable>. Gli schemi usati per far corrispondere i file utilizzati con lo stile di sintassi chiamato <replaceable>nome</replaceable> possono essere rimossi omettendo <replaceable>schema</replaceable>.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><userinput>syntax_pattern <replaceable>nome</replaceable> <replaceable>stato_iniziale</replaceable> <replaceable>stato_finale</replaceable> <replaceable>tag</replaceable> <replaceable>schema</replaceable> <optional>ignorecase</optional></userinput></term>
+          <listitem>
+            <para>Aggiunge uno schema allo stile di sintassi dichiarato precedentemente.Gli schemi sono analizzati uno alla volta nell'ordine dichiarato fino a quando non viene trovata una corrispondenza. Uno schema sarà utilizzato per far corrispondere dei caratteri solamente se la macchina di stato si trova nello stato <replaceable>stato_iniziale</replaceable>. La macchina di stato si sposterà sullo <replaceable>stato_finale</replaceable> se lo schema definito da <replaceable>schema</replaceable> verrà corrisposto. La corrispondenza dello schema ignorerà le differenze tra maiuscole e minuscole se è specificata l'opzione <userinput>ignorecase</userinput>. Tutti i caratteri per cui è stata trovata una corrispondenza verranno identificati con <replaceable>tag</replaceable> per evidenziarli.</para>
+          </listitem>
+        </varlistentry>
+
+      </variablelist>
+    </sect1> 
+  </chapter>
+
+  <chapter id="files">
+    <title>File</title>
+    <para><application>&app;</application> utilizza i seguenti file:</para>
+
+    <variablelist>
+      <varlistentry>
+        <term><filename>/etc/diffuserc</filename></term>
+        <listitem>
+          <para>Inizializzazioni a livello di tutto il sistema (<filename>%CARTELLA_DI_INSTALLAZIONE%\diffuserc</filename> su Microsoft Windows)</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><filename>/usr/share/diffuse/syntax/*.syntax</filename></term>
+        <listitem>
+          <para>File di sintassi per i vari linguaggi (<filename>%CARTELLA_DI_INSTALLAZIONE%\syntax\*.syntax</filename> su Microsoft Windows)</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+          <term><filename>~/.config/diffuse/diffuserc</filename></term>
+        <listitem>
+          <para>Le proprie inizializzazioni (<filename>%HOME%\.config\diffuse\diffuserc</filename> su Microsoft Windows)</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><filename>~/.config/diffuse/prefs</filename></term>
+        <listitem>
+          <para>Le proprie preferenze salvate (<filename>%HOME%\.config\diffuse\prefs</filename> su Microsoft Windows)</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><filename>~/.config/diffuse/state</filename></term>
+        <listitem>
+          <para>Dati persistenti tra le sessioni (<filename>%HOME%\.config\diffuse\state</filename> su Microsoft Windows)</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </chapter>
+</book>
diff -Nru diffuse-0.4.4/src/usr/share/gnome/help/diffuse/ru/diffuse.xml diffuse-0.4.5/src/usr/share/gnome/help/diffuse/ru/diffuse.xml
--- diffuse-0.4.4/src/usr/share/gnome/help/diffuse/ru/diffuse.xml	2010-10-21 01:58:02.000000000 +0000
+++ diffuse-0.4.5/src/usr/share/gnome/help/diffuse/ru/diffuse.xml	2011-07-13 09:18:33.000000000 +0000
@@ -2,14 +2,14 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
   <!ENTITY app "Diffuse">
-  <!ENTITY app-version "0.4.4">
+  <!ENTITY app-version "0.4.5">
 ]>
-<book id="index" lang="en">
-  <title>Руководство Пользователя &app;</title>
+<book id="index" lang="ru">
+  <title>Руководство Пользователя <application>&app;</application></title>
 
   <bookinfo>
     <copyright>
-      <year>2009-2010</year>
+      <year>2009-2011</year>
       <holder>Derrick Moser</holder>
     </copyright>
 
@@ -27,17 +27,17 @@
       </othercredit>
     </authorgroup>
 
-    <releaseinfo>Это руководство описывает версию &app-version; программы &app;.</releaseinfo>
+    <releaseinfo>Это руководство описывает версию &app-version; программы <application>&app;</application>.</releaseinfo>
   </bookinfo>
 
   <chapter id="introduction">
     <title>Введение</title>
 
     <para>
-      Программа &app; является графическим инструментом для слияния и сравнения
+      Программа <application>&app;</application> является графическим инструментом для слияния и сравнения
       текстовых файлов. Она может сравнить произвольное число файлов в
       представлении бок о бок, предоставляет пользователям возможность вручную
-      корректировать соответствие строк и редактировать файлы напрямую.  &app;
+      корректировать соответствие строк и редактировать файлы напрямую.  <application>&app;</application>
       может также извлекать ревизии файлов из Bazaar, CVS, Darcs, Git,
       Mercurial, Monotone, RCS, Subversion и SVK репозиториев для их сравнения
       и слияния.
@@ -46,30 +46,30 @@
     <sect1 id="introduction-about">
       <title>О программе</title>
       <para>
-        Программа &app; написана Derrick Moser <email>derrick_moser@yahoo.com</email>.
+        Программа <application>&app;</application> написана Derrick Moser <email>derrick_moser@yahoo.com</email>.
       </para>
-      <para>&copy; 2006-2010 Derrick Moser. Все Права Защищены.</para>
+      <para>&copy; 2006-2011 Derrick Moser. Все Права Защищены.</para>
       <para>Русификация (diffuse.mo; ru.po): О.Ю.Пахтусов <email>oupakhtusov@gmail.com</email></para>
     </sect1>
 
     <sect1 id="introduction-licence">
       <title>Лицензия</title>
       <para>
-        &app; является бесплатным Программным Обеспечением (ПО); можно
+        <application>&app;</application> является бесплатным Программным Обеспечением (ПО); можно
         распространять программу и/или изменять ее в соответствии с
         <citetitle>GNU General Public License</citetitle>, как опубликовано
         Free Software Foundation; либо версия 2 лицензии, либо (по вашему
         выбору) любая более поздняя версия. 
       </para>
       <para>
-        Программа &app; распространяется в надежде, что она будет полезна, но
+        Программа <application>&app;</application> распространяется в надежде, что она будет полезна, но
         БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ; без даже подразумеваемой гарантии ТОВАРНОГО
         СОСТОЯНИЯ или ПРИГОДНОСТИ ДЛЯ КОНКРЕТНОЙ ЦЕЛИ. Смотрите <citetitle>GNU
         General Public License</citetitle> для дополнительных подробностей.
       </para>
       <para>
         Вам следует получить копию <citetitle>GNU General Public
-        License</citetitle> вместе с программой &app;. Можно также получить
+        License</citetitle> вместе с программой <application>&app;</application>. Можно также получить
         копию <citetitle>GNU General Public License</citetitle> от Free
         Software Foundation, посетив
         <ulink type="http" url="http://www.fsf.org/">их web-сайт</ulink> или
@@ -90,7 +90,7 @@
         <varlistentry>
           <term><userinput>diffuse [ -h | -? | --help | -v | --version ]</userinput></term>
           <listitem>
-            <para>Отобразить информацию о программе &app;.</para>
+            <para>Отобразить информацию о программе <application>&app;</application>.</para>
           </listitem>
         </varlistentry>
 
@@ -107,7 +107,7 @@
 
         <para>
           Если опция справки определена, только параметр должен быть указан в
-          командной строке. Программа &app; немедленно закроется после
+          командной строке. Программа <application>&app;</application> немедленно закроется после
           отображения справочной информации. 
         </para>
 
@@ -192,6 +192,15 @@
           </varlistentry>
 
           <varlistentry>
+            <term><userinput>-L</userinput>, <userinput>--label</userinput> <replaceable>label</replaceable></term>
+            <listitem>
+              <para>
+                Отображать <replaceable>label</replaceable> ярлык вместо имени файла.
+              </para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
             <term><userinput>-m</userinput>, <userinput>--modified</userinput></term>
             <listitem>
               <para>
@@ -234,6 +243,15 @@
           </varlistentry>
 
           <varlistentry>
+            <term><userinput>--line <replaceable>line</replaceable></userinput></term>
+            <listitem>
+              <para>
+                Начать с выбранной <replaceable>line</replaceable> строки.
+              </para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
             <term><userinput>--null-file</userinput></term>
             <listitem>
               <para>
@@ -313,12 +331,12 @@
       <menuchoice><guimenu>Файл</guimenu><guimenuitem>Новое 3-Оконное Слияние
       Файлов</guimenuitem></menuchoice>, чтобы создать дополнительные вкладки
       для сравнения текстовых файлов. Имена файлов и ревизий могут быть указаны
-      либо в параметрах командной строки, используемых для вызова &app;, либо в
+      либо в параметрах командной строки, используемых для вызова <application>&app;</application>, либо в
       полях диалога Открыть Файл.
     </para>
 
     <para>
-      Программа &app; отображает файлы бок о бок, вставляя разрывы для
+      Программа <application>&app;</application> отображает файлы бок о бок, вставляя разрывы для
       выравнивания подобных строк текста. Различия выделяются отличным цветом
       фона. 
     </para>
@@ -361,18 +379,18 @@
         (подгонки) строк текста вручную в смежных файлах. Чтобы выровнять
         (подогнать) строки текста указателем мыши, выберите строку текста левой
         кнопкой мыши, щелкните правой кнопкой мыши по строке текста в смежном
-        файле и выберите пункт всплывающего меню <menuchoice><guimenu>Выровнять
-        с Выборкой</guimenu></menuchoice>. Чтобы выровнять строки текста с
+        файле и выберите пункт всплывающего меню <menuchoice><guimenuitem>Выровнять
+        с Выборкой</guimenuitem></menuchoice>. Чтобы выровнять строки текста с
         клавиатуры, переместите выбор клавишами управления курсором, нажмите
         клавишу Space (Пробел), чтобы выбрать текущую строку текста, затем
         переместите выбор клавишами управления курсором на строку текста в
         смежном файле и нажмите клавишу Space (Пробел), чтобы выбрать целевую
-        строку текста. Нажатие клавиши Еscape отменит эту операцию.
+        строку текста. Нажатие клавиши <keycap>Escape</keycap> отменит эту операцию.
       </para>
 
       <para>
         Используйте пункт меню
-        <menuchoice><guimenu>Изолировать</guimenu></menuchoice> для
+        <menuchoice><guimenuitem>Изолировать</guimenuitem></menuchoice> для
         предотвращения того, чтобы выбранные строки сопоставлялись любым
         строкам из смежных файлов.
       </para>
@@ -382,7 +400,7 @@
       <title>Редактирование</title>
 
       <para>
-        Нажатие клавиши Enter или двойной щелчок на области текста для ввода
+        Нажатие клавиши <keycap>Enter</keycap> или двойной щелчок на области текста для ввода
         режима редактирования текста. Курсор изменится, чтобы указать на
         включение режима редактирования текста, а строка состояния внизу окна
         отобразит номер столбца/колонки, где находится курсор (т.е. по сути,
@@ -404,13 +422,13 @@
       <para>
         Изменяйте текст, вводя с клавиатуры. Измененные строки будут выделены
         зеленым цветом. Используйте пункты меню
-        <menuchoice><guimenu>Отменить</guimenu></menuchoice> и
-        <menuchoice><guimenu>Вернуть</guimenu></menuchoice>, чтобы отменить и
+        <menuchoice><guimenuitem>Отменить</guimenuitem></menuchoice> и
+        <menuchoice><guimenuitem>Вернуть</guimenuitem></menuchoice>, чтобы отменить и
         восстановить ранее выполненные операции.
       </para>
 
       <para>
-        Нажмите клавишу Еscape или щелкните левой кнопкой мыши на области
+        Нажмите клавишу <keycap>Еscape</keycap> или щелкните левой кнопкой мыши на области
         текста в другом файле, чтобы выйти из режима редактирования.
       </para>
     </sect1>
@@ -420,7 +438,7 @@
 
       <para>
         Используйте различные кнопки или пункты меню для перемещения между
-        блоками различий в пределах файла. На навигации, &app; переместит
+        блоками различий в пределах файла. На навигации, <application>&app;</application> переместит
         указатель мыши в следующий сплошной набор строк с различиями или
         редактированиями.
       </para>
@@ -428,12 +446,12 @@
       <para>
         Используйте кнопки слияния или пункты меню, чтобы скопировать блоки
         текста в выбранный диапазон строк. Пункты меню
-        <menuchoice><guimenu>Отменить</guimenu></menuchoice> и
-        <menuchoice><guimenu>Вернуть</guimenu></menuchoice> могут
+        <menuchoice><guimenuitem>Отменить</guimenuitem></menuchoice> и
+        <menuchoice><guimenuitem>Вернуть</guimenuitem></menuchoice> могут
         использоваться для отмены и восстановления ранее выполненных операций.
         Все изменения к набору строк могут быть возвращены к исходному
-        состоянию, используя пункт меню <menuchoice><guimenu>Очистить
-        Правки</guimenu></menuchoice> независимо от порядка выполнения
+        состоянию, используя пункт меню <menuchoice><guimenuitem>Очистить
+        Правки</guimenuitem></menuchoice> независимо от порядка выполнения
         редактирований.
       </para>
     </sect1>
@@ -443,11 +461,11 @@
     <title>Контроль Версий</title>
 
     <para>
-      &app; может извлекать ревизии файла из нескольких систем управления
+      <application>&app;</application> может извлекать ревизии файла из нескольких систем управления
       версиями через их интерфейс командной строки. Microsoft Windows сборка
-      &app; способна использовать как Cygwin, так и собственные версии
-      поддерживаемых систем управления версиями. При использовании &app; с
-      Cygwin, убедитесь, что предпочтения Cygwin программы &app; правильно
+      <application>&app;</application> способна использовать как Cygwin, так и собственные версии
+      поддерживаемых систем управления версиями. При использовании <application>&app;</application> с
+      Cygwin, убедитесь, что предпочтения Cygwin программы <application>&app;</application> правильно
       описывают вашу систему. Если пункт предпочтений <guilabel>Обновлять пути
       для Cygwin</guilabel> существует для данной системы управления версиями,
       он должен быть задействован для использования версии Cygwin.
@@ -464,7 +482,7 @@
       <title>Просмотр Незафиксированных Модификаций</title>
 
       <para>
-        Опция <userinput>-m</userinput> заставит &app; открывать вкладки
+        Опция <userinput>-m</userinput> заставит <application>&app;</application> открывать вкладки
         сравнения для каждого файла, на который указывает система управления
         версиями, как на имеющий незафиксированные (несвязанные) модификации.
         Это удобно для просмотра всех изменений перед фиксацией транзакции или
@@ -543,7 +561,7 @@
       </para>
 
       <para>
-        Программа &app; не ограничивает количество субокон, используемых для
+        Программа <application>&app;</application> не ограничивает количество субокон, используемых для
         сравнения файлов. Вводы к Git octopus слиянию могли бы быть просмотрены
         с командной строкой, как ниже:
       </para>
@@ -559,14 +577,14 @@
 
     <para>
       Ресурсы могут использоваться для индивидуализации некоторых аспектов
-      внешнего вида программы &app; и ее поведения, например, изменение
+      внешнего вида программы <application>&app;</application> и ее поведения, например, изменение
       используемых в интерфейсе пользователя цветов, настройки клавиатурных
       комбинаций вызова, добавление или замена правил подсветки синтаксиса или
       изменение отображения от расширений файла до правил подсветки синтаксиса.
     </para>
 
     <para>
-      Когда программа &app; запускается, она считает команды из файла
+      Когда программа <application>&app;</application> запускается, она считает команды из файла
       общесистемной инициализации <filename>/etc/diffuserc</filename>
       (<filename>%INSTALL_DIR%\diffuserc</filename> на Microsoft Windows), а
       затем считывает персональный файл инициализации
@@ -641,7 +659,7 @@
             <term><userinput>open_file</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Файл</guimenu> пункт меню <guimenuitem>Открыть Файл...</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Ctrl+o</para>
+              <para>По умолчанию: <literal>Ctrl+o</literal></para>
             </listitem>
           </varlistentry>
 
@@ -649,7 +667,7 @@
             <term><userinput>open_file_in_new_tab</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Файл</guimenu><guimenuitem>Открыть Файл в Новой Вкладке...</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Ctrl+t</para>
+              <para>По умолчанию: <literal>Ctrl+t</literal></para>
             </listitem>
           </varlistentry>
 
@@ -657,7 +675,7 @@
             <term><userinput>open_modified_files</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Файл</guimenu><guimenuitem>Открыть Измененные Файлы...</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Shift+Ctrl+O</para>
+              <para>По умолчанию: <literal>Shift+Ctrl+O</literal></para>
             </listitem>
           </varlistentry>
 
@@ -665,7 +683,7 @@
             <term><userinput>reload_file</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Файл</guimenu><guimenuitem>Перезагрузить Файл</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Shift+Ctrl+R</para>
+              <para>По умолчанию: <literal>Shift+Ctrl+R</literal></para>
             </listitem>
           </varlistentry>
 
@@ -673,7 +691,7 @@
             <term><userinput>save_file</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Файл</guimenu><guimenuitem>Сохранить Файл</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Ctrl+s</para>
+              <para>По умолчанию: <literal>Ctrl+s</literal></para>
             </listitem>
           </varlistentry>
 
@@ -681,7 +699,7 @@
             <term><userinput>save_file_as</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Файл</guimenu><guimenuitem>Сохранить Файл Как...</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Shift+Ctrl+A</para>
+              <para>По умолчанию: <literal>Shift+Ctrl+A</literal></para>
             </listitem>
           </varlistentry>
 
@@ -689,7 +707,7 @@
             <term><userinput>save_all</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Файл</guimenu><guimenuitem>Сохранить Все</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Shift+Ctrl+S</para>
+              <para>По умолчанию: <literal>Shift+Ctrl+S</literal></para>
             </listitem>
           </varlistentry>
 
@@ -697,7 +715,7 @@
             <term><userinput>new_2_way_file_merge</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Файл</guimenu><guimenuitem>Новое 2-Оконное Слияние Файлов</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Ctrl+2</para>
+              <para>По умолчанию: <literal>Ctrl+2</literal></para>
             </listitem>
           </varlistentry>
 
@@ -705,7 +723,7 @@
             <term><userinput>new_3_way_file_merge</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Файл</guimenu><guimenuitem>Новое 3-Оконное Слияние Файлов</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Ctrl+3</para>
+              <para>По умолчанию: <literal>Ctrl+3</literal></para>
             </listitem>
           </varlistentry>
 
@@ -713,7 +731,7 @@
             <term><userinput>close_tab</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Файл</guimenu><guimenuitem>Закрыть Вкладку</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Ctrl+w</para>
+              <para>По умолчанию: <literal>Ctrl+w</literal></para>
             </listitem>
           </varlistentry>
 
@@ -721,7 +739,7 @@
             <term><userinput>undo_close_tab</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Файл</guimenu><guimenuitem>Отменить Закрытие Вкладки</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Shift+Ctrl+w</para>
+              <para>По умолчанию: <literal>Shift+Ctrl+w</literal></para>
             </listitem>
           </varlistentry>
 
@@ -729,7 +747,7 @@
             <term><userinput>quit</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Файл</guimenu><guimenuitem>Bыход</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Ctrl+q</para>
+              <para>По умолчанию: <literal>Ctrl+q</literal></para>
             </listitem>
           </varlistentry>
 
@@ -737,7 +755,7 @@
             <term><userinput>undo</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Правка</guimenu><guimenuitem>Отменить</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Ctrl+z</para>
+              <para>По умолчанию: <literal>Ctrl+z</literal></para>
             </listitem>
           </varlistentry>
 
@@ -745,7 +763,7 @@
             <term><userinput>redo</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Правка</guimenu><guimenuitem>Вернуть</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Shift+Ctrl+Z</para>
+              <para>По умолчанию: <literal>Shift+Ctrl+Z</literal></para>
             </listitem>
           </varlistentry>
 
@@ -753,7 +771,7 @@
             <term><userinput>cut</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Правка</guimenu><guimenuitem>Вырезать</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Ctrl+x</para>
+              <para>По умолчанию: <literal>Ctrl+x</literal></para>
             </listitem>
           </varlistentry>
 
@@ -761,7 +779,7 @@
             <term><userinput>copy</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Правка</guimenu><guimenuitem>Копировать</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Ctrl+c</para>
+              <para>По умолчанию: <literal>Ctrl+c</literal></para>
             </listitem>
           </varlistentry>
 
@@ -769,7 +787,7 @@
             <term><userinput>paste</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Правка</guimenu><guimenuitem>Вставить</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Ctrl+v</para>
+              <para>По умолчанию: <literal>Ctrl+v</literal></para>
             </listitem>
           </varlistentry>
 
@@ -777,7 +795,7 @@
             <term><userinput>select_all</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Правка</guimenu><guimenuitem>Выбрать Все</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Ctrl+a</para>
+              <para>По умолчанию: <literal>Ctrl+a</literal></para>
             </listitem>
           </varlistentry>
 
@@ -785,7 +803,7 @@
             <term><userinput>clear_edits</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Правка</guimenu><guimenuitem>Очистить Правки</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Ctrl+r</para>
+              <para>По умолчанию: <literal>Ctrl+r</literal></para>
             </listitem>
           </varlistentry>
 
@@ -793,7 +811,7 @@
             <term><userinput>dismiss_all_edits</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Правка</guimenu><guimenuitem>Сбросить Все Правки</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Ctrl+d</para>
+              <para>По умолчанию: <literal>Ctrl+d</literal></para>
             </listitem>
           </varlistentry>
 
@@ -801,7 +819,7 @@
             <term><userinput>find</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Правка</guimenu><guimenuitem>Найти...</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Ctrl+f</para>
+              <para>По умолчанию: <literal>Ctrl+f</literal></para>
             </listitem>
           </varlistentry>
 
@@ -809,7 +827,7 @@
             <term><userinput>find_next</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Правка</guimenu><guimenuitem>Найти Следующее</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Ctrl+g</para>
+              <para>По умолчанию: <literal>Ctrl+g</literal></para>
             </listitem>
           </varlistentry>
 
@@ -817,7 +835,7 @@
             <term><userinput>find_previous</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Правка</guimenu><guimenuitem>Найти Предыдущее</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Shift+Ctrl+G</para>
+              <para>По умолчанию: <literal>Shift+Ctrl+G</literal></para>
             </listitem>
           </varlistentry>
 
@@ -825,7 +843,7 @@
             <term><userinput>go_to_line</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Правка</guimenu><guimenuitem>Перейти на Строку...</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Shift+Ctrl+L</para>
+              <para>По умолчанию: <literal>Shift+Ctrl+L</literal></para>
             </listitem>
           </varlistentry>
 
@@ -840,7 +858,7 @@
           <varlistentry>
             <term><userinput>no_syntax_highlighting</userinput></term>
             <listitem>
-              <para><menuchoice><guimenu>Вид</guimenu><guimenuitem>Подсветка Синтаксиса</guimenuitem><guimenuitem>Нет</guimenuitem></menuchoice></para>
+              <para><menuchoice><guimenu>Вид</guimenu><guisubmenu>Подсветка Синтаксиса</guisubmenu><guimenuitem>Нет</guimenuitem></menuchoice></para>
               <para>По умолчанию: Нет</para>
             </listitem>
           </varlistentry>
@@ -848,7 +866,7 @@
           <varlistentry>
             <term><userinput>syntax_highlighting_<replaceable>syntax</replaceable></userinput></term>
             <listitem>
-              <para><menuchoice><guimenu>Вид</guimenu><guimenuitem>Подсветка Синтаксиса</guimenuitem><guimenuitem><replaceable>syntax</replaceable></guimenuitem></menuchoice></para>
+              <para><menuchoice><guimenu>Вид</guimenu><guisubmenu>Подсветка Синтаксиса</guisubmenu><guimenuitem><replaceable>syntax</replaceable></guimenuitem></menuchoice></para>
               <para>По умолчанию: Нет</para>
             </listitem>
           </varlistentry>
@@ -857,7 +875,7 @@
             <term><userinput>realign_all</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Вид</guimenu><guimenuitem>Перестроить Все</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Ctrl+l</para>
+              <para>По умолчанию: <literal>Ctrl+l</literal></para>
             </listitem>
           </varlistentry>
 
@@ -865,7 +883,7 @@
             <term><userinput>isolate</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Вид</guimenu><guimenuitem>Изолировать</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Ctrl+i</para>
+              <para>По умолчанию: <literal>Ctrl+i</literal></para>
             </listitem>
           </varlistentry>
 
@@ -873,7 +891,7 @@
             <term><userinput>first_difference</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Вид</guimenu><guimenuitem>Первое Различие</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Shift+Ctrl+Up</para>
+              <para>По умолчанию: <literal>Shift+Ctrl+Up</literal></para>
             </listitem>
           </varlistentry>
 
@@ -881,7 +899,7 @@
             <term><userinput>previous_difference</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Вид</guimenu><guimenuitem>Предыдущее Различие</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Ctrl+Up</para>
+              <para>По умолчанию: <literal>Ctrl+Up</literal></para>
             </listitem>
           </varlistentry>
 
@@ -889,7 +907,7 @@
             <term><userinput>next_difference</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Вид</guimenu><guimenuitem>Следующее Различие</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Ctrl+Down</para>
+              <para>По умолчанию: <literal>Ctrl+Down</literal></para>
             </listitem>
           </varlistentry>
 
@@ -897,7 +915,15 @@
             <term><userinput>last_difference</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Вид</guimenu><guimenuitem>Последнее Различие</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Shift+Ctrl+Down</para>
+              <para>По умолчанию: <literal>Shift+Ctrl+Down</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>first_tab</userinput></term>
+            <listitem>
+              <para><menuchoice><guimenu>Вид</guimenu><guimenuitem>Первая Вкладка</guimenuitem></menuchoice></para>
+              <para>По умолчанию: <literal>Shift+Ctrl+Page_Up</literal></para>
             </listitem>
           </varlistentry>
 
@@ -905,7 +931,7 @@
             <term><userinput>previous_tab</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Вид</guimenu><guimenuitem>Предыдущая Вкладка</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Ctrl+Page_Up</para>
+              <para>По умолчанию: <literal>Ctrl+Page_Up</literal></para>
             </listitem>
           </varlistentry>
 
@@ -913,7 +939,15 @@
             <term><userinput>next_tab</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Вид</guimenu><guimenuitem>Следующая Вкладка</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Ctrl+Page_Down</para>
+              <para>По умолчанию: <literal>Ctrl+Page_Down</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>last_tab</userinput></term>
+            <listitem>
+              <para><menuchoice><guimenu>Вид</guimenu><guimenuitem>Последняя Вкладка</guimenuitem></menuchoice></para>
+              <para>По умолчанию: <literal>Shift+Ctrl+Page_Down</literal></para>
             </listitem>
           </varlistentry>
 
@@ -921,7 +955,7 @@
             <term><userinput>shift_pane_right</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Вид</guimenu><guimenuitem>Переместить Субокно Вправо</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Shift+Ctrl+parenleft</para>
+              <para>По умолчанию: <literal>Shift+Ctrl+parenleft</literal></para>
             </listitem>
           </varlistentry>
 
@@ -929,7 +963,7 @@
             <term><userinput>shift_pane_left</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Вид</guimenu><guimenuitem>сместить выбранное субокно влево</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Shift+Ctrl+parenright</para>
+              <para>По умолчанию: <literal>Shift+Ctrl+parenright</literal></para>
             </listitem>
           </varlistentry>
 
@@ -937,7 +971,7 @@
             <term><userinput>convert_to_upper_case</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Формат</guimenu><guimenuitem>Преобразовать в Верхний Регистр</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Ctrl+u</para>
+              <para>По умолчанию: <literal>Ctrl+u</literal></para>
             </listitem>
           </varlistentry>
 
@@ -945,7 +979,7 @@
             <term><userinput>convert_to_lower_case</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Формат</guimenu><guimenuitem>Преобразовать в Нижний Регистр</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Shift+Ctrl+U</para>
+              <para>По умолчанию: <literal>Shift+Ctrl+U</literal></para>
             </listitem>
           </varlistentry>
 
@@ -953,7 +987,7 @@
             <term><userinput>sort_lines_in_ascending_order</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Формат</guimenu><guimenuitem>Сортировать Строки в Порядке Возрастания</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Ctrl+y</para>
+              <para>По умолчанию: <literal>Ctrl+y</literal></para>
             </listitem>
           </varlistentry>
 
@@ -961,7 +995,7 @@
             <term><userinput>sort_lines_in_descending_order</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Формат</guimenu><guimenuitem>Сортировать Строки в Порядке Убывания</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Shift+Ctrl+Y</para>
+              <para>По умолчанию: <literal>Shift+Ctrl+Y</literal></para>
             </listitem>
           </varlistentry>
 
@@ -969,7 +1003,7 @@
             <term><userinput>remove_trailing_white_space</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Формат</guimenu><guimenuitem>Удалить Замыкающие Пробелы</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Ctrl+k</para>
+              <para>По умолчанию: <literal>Ctrl+k</literal></para>
             </listitem>
           </varlistentry>
 
@@ -977,7 +1011,7 @@
             <term><userinput>convert_tabs_to_spaces</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Формат</guimenu><guimenuitem>Преобразовать Табуляторы в Пробелы</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Ctrl+b</para>
+              <para>По умолчанию: <literal>Ctrl+b</literal></para>
             </listitem>
           </varlistentry>
 
@@ -985,7 +1019,7 @@
             <term><userinput>convert_leading_spaces_to_tabs</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Формат</guimenu><guimenuitem>Преобразовать Вводные Пробелы в Табуляторы</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Shift+Ctrl+B</para>
+              <para>По умолчанию: <literal>Shift+Ctrl+B</literal></para>
             </listitem>
           </varlistentry>
 
@@ -993,7 +1027,7 @@
             <term><userinput>increase_indenting</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Формат</guimenu><guimenuitem>Увеличить Отступ</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Shift+Ctrl+&gt;</para>
+              <para>По умолчанию: <literal>Shift+Ctrl+greater</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1001,7 +1035,7 @@
             <term><userinput>decrease_indenting</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Формат</guimenu><guimenuitem>Уменьшить Отступ</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Shift+Ctrl+&lt;</para>
+              <para>По умолчанию: <literal>Shift+Ctrl+less</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1009,7 +1043,7 @@
             <term><userinput>convert_to_dos</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Формат</guimenu><guimenuitem>Преобразовать в DOS Формат</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Shift+Ctrl+E</para>
+              <para>По умолчанию: <literal>Shift+Ctrl+E</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1017,7 +1051,7 @@
             <term><userinput>convert_to_mac</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Формат</guimenu><guimenuitem>Преобразовать в Maс Формат</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Shift+Ctrl+C</para>
+              <para>По умолчанию: <literal>Shift+Ctrl+C</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1025,7 +1059,7 @@
             <term><userinput>convert_to_unix</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Формат</guimenu><guimenuitem>Преобразовать в Uniх Формат</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Ctrl+e</para>
+              <para>По умолчанию: <literal>Ctrl+e</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1033,7 +1067,7 @@
             <term><userinput>copy_selection_right</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Слияние</guimenu><guimenuitem>Копировать Выборку Вправо</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Shift+Ctrl+Right</para>
+              <para>По умолчанию: <literal>Shift+Ctrl+Right</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1041,7 +1075,7 @@
             <term><userinput>copy_selection_left</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Слияние</guimenu><guimenuitem>Копировать Выборку Влево</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Shift+Ctrl+Left</para>
+              <para>По умолчанию: <literal>Shift+Ctrl+Left</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1049,7 +1083,7 @@
             <term><userinput>copy_left_into_selection</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Слияние</guimenu><guimenuitem>Копировать Слева в Выборку</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Ctrl+Right</para>
+              <para>По умолчанию: <literal>Ctrl+Right</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1057,7 +1091,7 @@
             <term><userinput>copy_right_into_selection</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Слияние</guimenu><guimenuitem>Копировать Справа в Выборку</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Ctrl+Left</para>
+              <para>По умолчанию: <literal>Ctrl+Left</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1065,7 +1099,7 @@
             <term><userinput>merge_from_left_then_right</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Слияние</guimenu><guimenuitem>Слияние Слева Затем Справа</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Ctrl+m</para>
+              <para>По умолчанию: <literal>Ctrl+m</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1073,7 +1107,7 @@
             <term><userinput>merge_from_right_then_left</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Слияние</guimenu><guimenuitem>Слияние Справа Затем Слева</guimenuitem></menuchoice></para>
-              <para>По умолчанию: Shift+Ctrl+M</para>
+              <para>По умолчанию: <literal>Shift+Ctrl+M</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1081,7 +1115,7 @@
             <term><userinput>help_contents</userinput></term>
             <listitem>
               <para><menuchoice><guimenu>Справка</guimenu><guimenuitem>Содержание Справки...</guimenuitem></menuchoice></para>
-              <para>По умолчанию: F1</para>
+              <para>По умолчанию: <literal>F1</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1110,7 +1144,7 @@
             <term><userinput>enter_align_mode</userinput></term>
             <listitem>
               <para>ввести режим редактирования выравнивания</para>
-              <para>По умолчанию: space</para>
+              <para>По умолчанию: <literal>space</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1118,7 +1152,7 @@
             <term><userinput>enter_character_mode</userinput></term>
             <listitem>
               <para>ввести режим редактирования символов</para>
-              <para>По умолчанию: Return, KP_Enter</para>
+              <para>По умолчаниям: <literal>Return</literal>, <literal>KP_Enter</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1126,7 +1160,7 @@
             <term><userinput>first_line</userinput></term>
             <listitem>
               <para>переместить курсор на первую строку</para>
-              <para>По умолчаниям: Home, g</para>
+              <para>По умолчаниям: <literal>Home</literal>, <literal>g</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1134,7 +1168,7 @@
             <term><userinput>extend_first_line</userinput></term>
             <listitem>
               <para>переместить курсор на первую строку, расширение выборки</para>
-              <para>По умолчанию: Shift+Home</para>
+              <para>По умолчанию: <literal>Shift+Home</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1142,7 +1176,7 @@
             <term><userinput>last_line</userinput></term>
             <listitem>
               <para>переместить курсор на последнюю строку</para>
-              <para>По умолчаниям: End, Shift+G</para>
+              <para>По умолчаниям: <literal>End</literal>, <literal>Shift+G</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1150,7 +1184,7 @@
             <term><userinput>extend_last_line</userinput></term>
             <listitem>
               <para>переместить курсор на последнюю строку, расширение выборки</para>
-              <para>По умолчанию: Shift+End</para>
+              <para>По умолчанию: <literal>Shift+End</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1158,7 +1192,7 @@
             <term><userinput>up</userinput></term>
             <listitem>
               <para>переместить курсор на одну строку вверх</para>
-              <para>По умолчаниям: Up, k</para>
+              <para>По умолчаниям: <literal>Up</literal>, <literal>k</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1166,7 +1200,7 @@
             <term><userinput>extend_up</userinput></term>
             <listitem>
               <para>переместить курсор на одну строку вверх, расширение выборки</para>
-              <para>По умолчаниям: Shift+Up, Shift+K</para>
+              <para>По умолчаниям: <literal>Shift+Up</literal>, <literal>Shift+K</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1174,7 +1208,7 @@
             <term><userinput>down</userinput></term>
             <listitem>
               <para>переместить курсор на одну строку вниз</para>
-              <para>По умолчаниям: Down, j</para>
+              <para>По умолчаниям: <literal>Down</literal>, <literal>j</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1182,7 +1216,7 @@
             <term><userinput>extend_down</userinput></term>
             <listitem>
               <para>переместить курсор на одну строку вниз, расширение выборки</para>
-              <para>По умолчаниям: Shift+Down, Shift+J</para>
+              <para>По умолчаниям: <literal>Shift+Down</literal>, <literal>Shift+J</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1190,7 +1224,7 @@
             <term><userinput>left</userinput></term>
             <listitem>
               <para>переместить курсор влево на один файл</para>
-              <para>По умолчаниям: Left, h</para>
+              <para>По умолчаниям: <literal>Left</literal>, <literal>h</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1198,7 +1232,7 @@
             <term><userinput>extend_left</userinput></term>
             <listitem>
               <para>переместить курсор влево на один файл, расширение выборки</para>
-              <para>По умолчанию: Shift+Left</para>
+              <para>По умолчанию: <literal>Shift+Left</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1206,7 +1240,7 @@
             <term><userinput>right</userinput></term>
             <listitem>
               <para>переместить курсор вправо на один файл</para>
-              <para>По умолчаниям: Right, l</para>
+              <para>По умолчаниям: <literal>Right</literal>, <literal>l</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1214,7 +1248,7 @@
             <term><userinput>extend_right</userinput></term>
             <listitem>
               <para>переместить курсор вправо на один файл, расширение выборки</para>
-              <para>По умолчанию: Shift+Right</para>
+              <para>По умолчанию: <literal>Shift+Right</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1222,7 +1256,7 @@
             <term><userinput>page_up</userinput></term>
             <listitem>
               <para>переместить курсор на одну страницу вверх</para>
-              <para>По умолчаниям: Page_Up, Ctrl+u</para>
+              <para>По умолчаниям: <literal>Page_Up</literal>, <literal>Ctrl+u</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1230,7 +1264,7 @@
             <term><userinput>extend_page_up</userinput></term>
             <listitem>
               <para>переместить курсор на одну страницу вверх, расширение выборки</para>
-              <para>По умолчаниям: Shift+Page_Up, Shift+Ctrl+u</para>
+              <para>По умолчаниям: <literal>Shift+Page_Up</literal>, <literal>Shift+Ctrl+u</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1238,7 +1272,7 @@
             <term><userinput>page_down</userinput></term>
             <listitem>
               <para>переместить курсор на одну страницу вниз</para>
-              <para>По умолчаниям: Page_Down, Ctrl+d</para>
+              <para>По умолчаниям: <literal>Page_Down</literal>, <literal>Ctrl+d</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1246,7 +1280,7 @@
             <term><userinput>extend_page_down</userinput></term>
             <listitem>
               <para>переместить курсор на одну страницу вниз, расширение выборки</para>
-              <para>По умолчаниям: Shift+Page_Down, Shift+Ctrl+d</para>
+              <para>По умолчаниям: <literal>Shift+Page_Down</literal>, <literal>Shift+Ctrl+d</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1254,7 +1288,7 @@
             <term><userinput>delete_text</userinput></term>
             <listitem>
               <para>удалить выбранный текст</para>
-              <para>По умолчаниям: BackSpace, Delete, x</para>
+              <para>По умолчаниям: <literal>BackSpace</literal>, <literal>Delete</literal>, <literal>x</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1262,7 +1296,7 @@
             <term><userinput>first_difference</userinput></term>
             <listitem>
               <para>выбрать первое различие</para>
-              <para>По умолчаниям: Ctrl+Home, Shift+P</para>
+              <para>По умолчаниям: <literal>Ctrl+Home</literal>, <literal>Shift+P</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1270,7 +1304,7 @@
             <term><userinput>previous_difference</userinput></term>
             <listitem>
               <para>выбрать предыдущее различие</para>
-              <para>По умолчанию: p</para>
+              <para>По умолчанию: <literal>p</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1278,7 +1312,7 @@
             <term><userinput>next_difference</userinput></term>
             <listitem>
               <para>выбрать следующее различие</para>
-              <para>По умолчанию: n</para>
+              <para>По умолчанию: <literal>n</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1286,7 +1320,7 @@
             <term><userinput>last_difference</userinput></term>
             <listitem>
               <para>выбрать последнее различие</para>
-              <para>По умолчаниям: Ctrl+End, Shift+N</para>
+              <para>По умолчаниям: <literal>Ctrl+End</literal>, <literal>Shift+N</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1294,7 +1328,7 @@
             <term><userinput>clear_edits</userinput></term>
             <listitem>
               <para>очистить все редактирования в выбранных строках</para>
-              <para>По умолчанию: r</para>
+              <para>По умолчанию: <literal>r</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1302,7 +1336,7 @@
             <term><userinput>copy_left_into_selection</userinput></term>
             <listitem>
               <para>копировать строки из файла слева в выборку</para>
-              <para>По умолчанию: Shift+L</para>
+              <para>По умолчанию: <literal>Shift+L</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1310,7 +1344,7 @@
             <term><userinput>copy_right_into_selection</userinput></term>
             <listitem>
               <para>копировать строки из файла справа в выборку</para>
-              <para>По умолчанию: Shift+H</para>
+              <para>По умолчанию: <literal>Shift+H</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1318,7 +1352,7 @@
             <term><userinput>merge_from_left_then_right</userinput></term>
             <listitem>
               <para>объединить строки из файла слева, затем из файла справа</para>
-              <para>По умолчанию: m</para>
+              <para>По умолчанию: <literal>m</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1326,7 +1360,7 @@
             <term><userinput>merge_from_right_then_left</userinput></term>
             <listitem>
               <para>объединить строки из файла справа, затем из файла слева</para>
-              <para>По умолчанию: Shift+M</para>
+              <para>По умолчанию: <literal>Shift+M</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1334,7 +1368,7 @@
             <term><userinput>isolate</userinput></term>
             <listitem>
               <para>изолировать выбранные строки</para>
-              <para>По умолчанию: i</para>
+              <para>По умолчанию: <literal>i</literal></para>
             </listitem>
           </varlistentry>
         </variablelist>
@@ -1355,7 +1389,7 @@
             <term><userinput>enter_line_mode</userinput></term>
             <listitem>
               <para>ввести режим редактирования строк</para>
-              <para>По умолчанию: Escape</para>
+              <para>По умолчанию: <literal>Escape</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1363,7 +1397,7 @@
             <term><userinput>enter_character_mode</userinput></term>
             <listitem>
               <para>ввести режим редактирования символов</para>
-              <para>По умолчанию: Return, KP_Enter</para>
+              <para>По умолчаниям: <literal>Return</literal>, <literal>KP_Enter</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1371,7 +1405,7 @@
             <term><userinput>first_line</userinput></term>
             <listitem>
               <para>переместить курсор на первую строку</para>
-              <para>По умолчанию: g</para>
+              <para>По умолчанию: <literal>g</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1379,7 +1413,7 @@
             <term><userinput>last_line</userinput></term>
             <listitem>
               <para>переместить курсор на последнюю строку</para>
-              <para>По умолчанию: Shift+G</para>
+              <para>По умолчанию: <literal>Shift+G</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1387,7 +1421,7 @@
             <term><userinput>up</userinput></term>
             <listitem>
               <para>переместить курсор на одну строку вверх</para>
-              <para>По умолчаниям: Up, k</para>
+              <para>По умолчаниям: <literal>Up</literal>, <literal>k</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1395,7 +1429,7 @@
             <term><userinput>down</userinput></term>
             <listitem>
               <para>переместить курсор на одну строку вниз</para>
-              <para>По умолчаниям: Down, j</para>
+              <para>По умолчаниям: <literal>Down</literal>, <literal>j</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1403,7 +1437,7 @@
             <term><userinput>left</userinput></term>
             <listitem>
               <para>переместить курсор влево на один файл</para>
-              <para>По умолчаниям: Left, h</para>
+              <para>По умолчаниям: <literal>Left</literal>, <literal>h</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1411,7 +1445,7 @@
             <term><userinput>right</userinput></term>
             <listitem>
               <para>переместить курсор вправо на один файл</para>
-              <para>По умолчаниям: Right, l</para>
+              <para>По умолчаниям: <literal>Right</literal>, <literal>l</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1419,7 +1453,7 @@
             <term><userinput>page_up</userinput></term>
             <listitem>
               <para>переместить курсор на одну страницу вверх</para>
-              <para>По умолчаниям: Page_Up, Ctrl+u</para>
+              <para>По умолчаниям: <literal>Page_Up</literal>, <literal>Ctrl+u</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1427,7 +1461,7 @@
             <term><userinput>page_down</userinput></term>
             <listitem>
               <para>переместить курсор на одну страницу вниз</para>
-              <para>По умолчаниям: Page_Down, Ctrl+d</para>
+              <para>По умолчаниям: <literal>Page_Down</literal>, <literal>Ctrl+d</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1435,7 +1469,7 @@
             <term><userinput>align</userinput></term>
             <listitem>
               <para>выровнять выбранную строку к позиции курсора</para>
-              <para>По умолчанию: Space</para>
+              <para>По умолчанию: <literal>space</literal></para>
             </listitem>
           </varlistentry>
         </variablelist>
@@ -1456,7 +1490,7 @@
             <term><userinput>enter_line_mode</userinput></term>
             <listitem>
               <para>ввести режим редактирования строк</para>
-              <para>По умолчанию: Escape</para>
+              <para>По умолчанию: <literal>Escape</literal></para>
             </listitem>
           </varlistentry>
         </variablelist>
@@ -1482,13 +1516,14 @@
       <sect2 id="resources-strings-used">
         <title>Используемые Строковые Ресурсы</title>
 
-        <para>Следующие строковые ресурсы используются программой &app;:</para>
+        <para>Следующие строковые ресурсы используются программой <application>&app;</application>:</para>
 
         <variablelist>
           <varlistentry>
             <term><userinput>difference_colours</userinput></term>
             <listitem>
               <para>список ресурсов цвета, используемых для индикации различий</para>
+              <para>По умолчанию: <literal>difference_1 difference_2 difference_3</literal></para>
             </listitem>
           </varlistentry>
         </variablelist>
@@ -1514,7 +1549,7 @@
       <sect2 id="resources-colours-used">
         <title>Используемые Цветовые Ресурсы</title>
 
-        <para>Следующие ресурсы цвета используются программой &app;:</para>
+        <para>Следующие ресурсы цвета используются программой <application>&app;</application>:</para>
 
         <variablelist>
 
@@ -1522,6 +1557,7 @@
             <term><userinput>alignment</userinput></term>
             <listitem>
               <para>цвет, используемый для индикации строки, выбранной для ручного выравнивания</para>
+              <para>По умолчанию: <literal>1 1 0</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1529,6 +1565,7 @@
             <term><userinput>character_selection</userinput></term>
             <listitem>
               <para>цвет, используемый для индикации выбранных символов</para>
+              <para>По умолчанию: <literal>0.7 0.7 1</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1536,6 +1573,7 @@
             <term><userinput>cursor</userinput></term>
             <listitem>
               <para>цвет, используемый для курсора</para>
+              <para>По умолчанию: <literal>0 0 0</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1543,6 +1581,7 @@
             <term><userinput>difference_1</userinput></term>
             <listitem>
               <para>цвет, используемый для обозначения различий между первой парой файлов</para>
+              <para>По умолчанию: <literal>1 0.625 0.625</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1550,6 +1589,7 @@
             <term><userinput>difference_2</userinput></term>
             <listitem>
               <para>цвет, используемый для обозначения различий между второй парой файлов</para>
+              <para>По умолчанию: <literal>0.85 0.625 0.775</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1557,6 +1597,7 @@
             <term><userinput>difference_3</userinput></term>
             <listitem>
               <para>цвет, используемый для обозначения различий между третьей парой файлов</para>
+              <para>По умолчанию: <literal>0.85 0.775 0.625</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1564,6 +1605,7 @@
             <term><userinput>edited</userinput></term>
             <listitem>
               <para>цвет, используемый для индикации отредактированных строк</para>
+              <para>По умолчанию: <literal>0.5 1 0.5</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1571,6 +1613,7 @@
             <term><userinput>hatch</userinput></term>
             <listitem>
               <para>цвет, используемый для индикации разрывов выравнивания</para>
+              <para>По умолчанию: <literal>0.8 0.8 0.8</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1578,6 +1621,7 @@
             <term><userinput>line_number</userinput></term>
             <listitem>
               <para>цвет, используемый для номеров строк</para>
+              <para>По умолчанию: <literal>0 0 0</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1585,6 +1629,7 @@
             <term><userinput>line_number_background</userinput></term>
             <listitem>
               <para>цвет фона для области номера строки</para>
+              <para>По умолчанию: <literal>0.75 0.75 0.75</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1592,6 +1637,7 @@
             <term><userinput>line_selection</userinput></term>
             <listitem>
               <para>цвет, используемый для индикации выбранных строк</para>
+              <para>По умолчанию: <literal>0.7 0.7 1</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1599,6 +1645,15 @@
             <term><userinput>map_background</userinput></term>
             <listitem>
               <para>цвет фона для области отображения</para>
+              <para>По умолчанию: <literal>0.6 0.6 0.6</literal></para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term><userinput>margin</userinput></term>
+            <listitem>
+              <para>цвет, используемый для индикации правого поля</para>
+              <para>По умолчанию: <literal>0.8 0.8 0.8</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1606,6 +1661,7 @@
             <term><userinput>preedit</userinput></term>
             <listitem>
               <para>цвет предредактируемого текста</para>
+              <para>По умолчанию: <literal>0 0 0</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1613,6 +1669,7 @@
             <term><userinput>text</userinput></term>
             <listitem>
               <para>цвет обычного текста</para>
+              <para>По умолчанию: <literal>0 0 0</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1620,6 +1677,7 @@
             <term><userinput>text_background</userinput></term>
             <listitem>
               <para>цвет фона для текстовой области</para>
+              <para>По умолчанию: <literal>1 1 1</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1646,7 +1704,7 @@
       <sect2 id="resources-floats-used">
         <title>Используемые Ресурсы с Плавающей Точкой</title>
 
-        <para>Следующие ресурсы с плавающей точкой используются программой &app;:</para>
+        <para>Следующие ресурсы с плавающей точкой используются программой <application>&app;</application>:</para>
 
         <variablelist>
 
@@ -1654,7 +1712,7 @@
             <term><userinput>alignment_opacity</userinput></term>
             <listitem>
               <para>непрозрачность, используемая при составлении цвета ручного выравнивания</para>
-              <para>По умолчаниям: 1</para>
+              <para>По умолчаниям: <literal>1</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1662,7 +1720,7 @@
             <term><userinput>character_difference_opacity</userinput></term>
             <listitem>
               <para>непрозрачность, используемая при составлении цветов различия символов</para>
-              <para>По умолчаниям: 0.4</para>
+              <para>По умолчаниям: <literal>0.4</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1670,7 +1728,7 @@
             <term><userinput>character_selection_opacity</userinput></term>
             <listitem>
               <para>непрозрачность, используемая при составлении цвета выбора символа</para>
-              <para>По умолчаниям: 0.4</para>
+              <para>По умолчаниям: <literal>0.4</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1678,7 +1736,7 @@
             <term><userinput>edited_opacity</userinput></term>
             <listitem>
               <para>непрозрачность, используемая при составлении цвета отредактированной строки</para>
-              <para>По умолчаниям: 0.4</para>
+              <para>По умолчаниям: <literal>0.4</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1686,7 +1744,7 @@
             <term><userinput>line_difference_alpha</userinput></term>
             <listitem>
               <para>значение альфы, используемое при составлении цветов различия строк</para>
-              <para>По умолчаниям: 0.3</para>
+              <para>По умолчаниям: <literal>0.3</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1694,7 +1752,7 @@
             <term><userinput>line_selection_opacity</userinput></term>
             <listitem>
               <para>непрозрачность, используемая при составлении цвета выбора строки</para>
-              <para>По умолчаниям: 0.4</para>
+              <para>По умолчаниям: <literal>0.4</literal></para>
             </listitem>
           </varlistentry>
 
@@ -1782,7 +1840,7 @@
 
   <chapter id="files">
     <title>Файлы</title>
-    <para>Следующие файлы используются программой &app;:</para>
+    <para>Следующие файлы используются программой <application>&app;</application>:</para>
 
     <variablelist>
       <varlistentry>
diff -Nru diffuse-0.4.4/src/usr/share/man/it/man1/diffuse.1 diffuse-0.4.5/src/usr/share/man/it/man1/diffuse.1
--- diffuse-0.4.4/src/usr/share/man/it/man1/diffuse.1	1970-01-01 00:00:00.000000000 +0000
+++ diffuse-0.4.5/src/usr/share/man/it/man1/diffuse.1	2011-07-13 09:18:33.000000000 +0000
@@ -0,0 +1,1694 @@
+'\" t
+.TH "DIFFUSE" "1" "2011\-07\-13" "diffuse 0\&.4\&.5" "Manuale di Diffuse"
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.nh
+.ad l
+.SH "NOME"
+diffuse \- strumento grafico per l'unione e il confronto di file
+.SH "SINOSSI"
+.HP \w'\fBdiffuse\fR\ 'u
+\fBdiffuse\fR [\fB\-h\fR | \fB\-?\fR | \fB\-\-help\fR | \fB\-v\fR | \fB\-\-version\fR]
+.HP \w'\fBdiffuse\fR\ 'u
+\fBdiffuse\fR [\fB\-\-no\-rcfile\fR | \fB\-\-rcfile\ \fR\fB\fIfile\fR\fR] [[\fIoption\fR...] | [\fIfile\fR...]...]
+.SH "DESCRIZIONE"
+.PP
+Diffuse
+è uno strumento grafico per l\*(Aqunione e il confronto di file di testo\&.
+Diffuse
+è in grado di confrontare uno a fianco all\*(Aqaltro un qualsiasi numero di file e fornisce all\*(Aqutente la possibilità di correggere manualmente la corrispondenza fra le righe e di modificare i file\&.
+Diffuse
+è anche in grado di recuperare le revisioni dei file dai repository Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, e SVK per confrontarle e unirle\&.
+.SH "OPZIONI"
+.SS "Opzioni di aiuto"
+.PP
+Se viene specificata una opzione di aiuto, questa deve essere l\*(Aqunico argomento inserito nella linea di comando\&.
+Diffuse
+uscirà subito dopo aver visualizzato le informazioni\&.
+.PP
+\fB\-h\fR, \fB\-?\fR, \fB\-\-help\fR
+.RS 4
+Mostra le informazioni di utilizzo\&.
+.RE
+.PP
+\fB\-v\fR, \fB\-\-version\fR
+.RS 4
+Mostra la versione e il copyright\&.
+.RE
+.SS "Opzioni di configurazione"
+.PP
+Se viene specificata una opzione di configurazione, questa deve essere il primo argomento indicato nella riga di comando\&.
+.PP
+\fB\-\-no\-rcfile\fR
+.RS 4
+Non legge alcun file di inizializzazione\&.
+.RE
+.PP
+\fB\-\-rcfile \fR\fB\fIfile\fR\fR
+.RS 4
+Legge i comandi di inizializzazione esclusivamente dal file
+\fIfile\fR\&.
+.RE
+.SS "Opzioni generali"
+.PP
+\fB\-c\fR, \fB\-\-commit\fR \fIrev\fR
+.RS 4
+Include in una scheda di confronto le revisioni
+\fIrev \- 1\fR
+e
+\fIrev\fR
+del file successivo indicato negli argomenti della linea di comando\&.
+.RE
+.PP
+\fB\-D\fR, \fB\-\-close\-if\-same\fR
+.RS 4
+Chiude tutte le schede senza differenze\&.
+.RE
+.PP
+\fB\-e\fR, \fB\-\-encoding\fR \fIcodec\fR
+.RS 4
+Usa
+\fIcodec\fR
+per leggere e scrivere i file\&.
+.RE
+.PP
+\fB\-L\fR, \fB\-\-label\fR \fIetichetta\fR
+.RS 4
+Visualizza
+\fIetichetta\fR
+invece del nome del file\&.
+.RE
+.PP
+\fB\-m\fR, \fB\-\-modified\fR
+.RS 4
+Apre tutti i file modificati dai restanti percorsi indicati tra gli argomenti della linea di comando in schede di confronto separate\&.
+.RE
+.PP
+\fB\-r\fR, \fB\-\-revision\fR \fIrev\fR
+.RS 4
+Include nella scheda di comparazione dei file la revisione
+\fIrev\fR
+del file successivo contenuto negli argomenti della linea di comando\&.
+.RE
+.PP
+\fB\-s\fR, \fB\-\-separate\fR
+.RS 4
+Apre tutti i restanti file specificati come argomento della linea di comando in schede di confronto separate\&.
+.RE
+.PP
+\fB\-t\fR, \fB\-\-tab\fR
+.RS 4
+Apre una nuova scheda per ogni altro file indicato come argomento della riga di comando\&.
+.RE
+.PP
+\fB\-\-line \fR\fB\fIlinea\fR\fR
+.RS 4
+Inizia con la
+\fIlinea\fR
+selezionata\&.
+.RE
+.PP
+\fB\-\-null\-file\fR
+.RS 4
+Crea un riquadro di confronto vuoto\&.
+.RE
+.SS "Opzioni di visualizzazione"
+.PP
+Le opzioni di visualizzazione indicate come argomenti della linea di comando hanno la precedenza sui valori salvati delle preferenze\&.
+.PP
+\fB\-b\fR, \fB\-\-ignore\-space\-change\fR
+.RS 4
+Ignora i cambiamenti del numero di spazi vuoti\&.
+.RE
+.PP
+\fB\-B\fR, \fB\-\-ignore\-blank\-lines\fR
+.RS 4
+Ignora i cambiamenti le cui righe sono tutte vuote\&.
+.RE
+.PP
+\fB\-E\fR, \fB\-\-ignore\-end\-of\-line\fR
+.RS 4
+Ignora le differenze alla fine della riga\&.
+.RE
+.PP
+\fB\-i\fR, \fB\-\-ignore\-case\fR
+.RS 4
+Ignora le differenze tra lettere maiuscole e minuscole nel contenuto del file\&.
+.RE
+.PP
+\fB\-w\fR, \fB\-\-ignore\-all\-space\fR
+.RS 4
+Ignora tutti gli spazi vuoti\&.
+.RE
+.SH "CONFRONTARE I FILE"
+.PP
+Usare le voci del menu
+File \(-> Nuova unione a 2 file
+e
+File \(-> Nuova unione a 3 file
+per creare ulteriori schede di confronto tra file di testo\&. I nomi dei file e le revisioni possono essere indicati sia come argomenti della linea di comando di
+Diffuse
+sia nei campi della finestra di apertura file\&.
+.PP
+Diffuse
+visualizza i file uno a fianco all\*(Aqaltro inserendo degli spazi per allineare le righe di testo simili\&. Le differenze sono evidenziate con diversi colori di sfondo\&.
+.SS "Sommario del confronto"
+.PP
+Nel margine destro della finestra è visibile un sommario del confronto dei file\&. Il sommario mostra dove sono stati inseriti degli spazi per allineare le righe di testo corrispondenti ed evidenzia le differenze usando i colori\&. Le modifiche manuali sono evidenziate in verde\&. Un cursore blu identifica la regione che si sta visualizzando\&. La regione visualizzata può essere cambiata facendo clic in un qualsiasi punto del sommario\&.
+.SS "Selezionare"
+.PP
+Le righe di testo possono essere selezionate utilizzando il mouse o la tastiera\&. Selezionare le righe di testo facendovi clic sopra con il puntatore del mouse\&. Fare clic e trascinare il puntatore per selezionare più righe\&. Mantenendo premuto
+Maiusc
+quando si fa clic la selezione corrente verrà estesa\&. Selezionare le righe con la tastiera premendo i tasti
+Pag_Su,
+Pag_Giù
+o le
+frecce\&. Tenere premuto
+Maiusc
+mentre si usano questi tasti per estendere la selezione\&. Spostare la selezione in un file adiacente utilizzando i tasti delle frecce sinistra e destra\&.
+.SS "Far corrispondere le righe"
+.PP
+Il puntatore del mouse o la tastiera possono essere usati per allineare manualmente le righe di testo con i file adiacenti\&. Per allineare le righe di testo usando il puntatore del mouse, selezionare una riga di testo con il pulsante sinistro del mouse, fare clic con il tasto destro del mouse su una riga di testo del file adiacente e scegliere
+Allinea con la selezione\&. Per allineare le righe di testo con la tastiera, spostare la selezione con i tasti freccia, premere la barra spaziatrice per selezionare la riga corrente di testo, spostare la selezione con i tasti freccia a una riga di testo nel file adiacente e premere di nuovo la barra spaziatrice per indicare la riga di destinazione del testo\&. Premere il tasto
+Esc
+in qualsiasi momento per annullare l\*(Aqoperazione\&.
+.PP
+Usare la voce di menu
+Isola
+per evitare che le righe selezionate vengano fatte corrispondere a una qualsiasi riga dei file adiacenti\&.
+.SS "Modificare"
+.PP
+Premere il tasto
+Invio
+o fare doppio clic nell\*(Aqarea di testo per avviare la modalità di modifica del testo\&. Il cursore cambierà e nella barra di stato verrà visualizzato il numero della colonna in cui il cursore è posizionato\&.
+.PP
+Nella modalità di modifica testo, il testo può essere selezionato con il puntatore del mouse facendo clic e trascinando\&. La selezione corrente può essere estesa tenendo premuto il tasto
+Maiusc
+e muovendo il cursore facendo clic con il puntatore del mouse o premendo uno qualsiasi tra i
+tasti freccia,
+home,
+fine,
+Pg_Su
+o
+Pg_Giù\&. Le parole possono essere selezionate individualmente con un doppio clic sopra di esse con il puntatore del mouse\&. L\*(Aqintera riga può essere selezionata con un triplo clic su di essa con il puntatore del mouse\&.
+.PP
+Modificare il testo digitando sulla tastiera\&. Le righe modificate verranno evidenziate in verde\&. Usare le voci di menu
+Annulla
+e
+Ripeti
+per annullare e ripetere le operazioni effettuate\&.
+.PP
+Premere il tasto
+Esc
+o fare clic nell\*(Aqarea di testo di un altro file con il pulsante sinistro del mouse per abbandonare la modalità di modifica del testo\&.
+.SS "Unire"
+.PP
+Usare i pulsanti delle differenze o le relative voci del menu per spostarsi tra i blocchi di differenze all\*(Aqinterno del file\&.
+Diffuse
+sposterà la selezione al gruppo di righe più vicino con differenze o modifiche\&.
+.PP
+Usare i pulsanti di unione o le relative voci di menu per copiare blocchi di testo nelle righe selezionate\&. Le voci di menu
+Annulla
+e
+Ripeti
+possono essere utilizzate per annullare e ripetere le operazioni effettuate in precedenza\&. Tutte le modifiche a un gruppo di righe possono essere annullate utilizzando la voce di menu
+Annulla modifiche
+indipendentemente dall\*(Aqordine con cui le modifiche sono state effettuate\&.
+.SH "CONTROLLO DI VERSIONE"
+.PP
+Diffuse
+è in grado di recuperare le revisioni dei file da diversi sistemi di controllo di versione attraverso la loro interfaccia da linea di comando\&. Il pacchetto di
+Diffuse
+compilato per Microsoft Windows è in grado di utilizzare sia Cygwin che le versioni native dei sistemi di controllo di versione supportati\&. Quando si utilizza
+Diffuse
+con Cygwin, assicurarsi che le preferenze di
+Diffuse
+relative a Cygwin descrivano correttamente il proprio sistema\&. Se la preferenza
+Aggiorna i percorsi per Cygwin
+esiste per un sistema di controllo di versione, deve essere abilitata per utilizzare la versione di Cygwin\&.
+.PP
+I sistemi di controllo di versione sono sensibili al percorso di sistema e ad altre impostazioni delle variabili di sistema\&. La preferenza
+Avvia dalla Bash di una shell di login
+può essere usata per impostare facilmente l\*(Aqambiente per i sistemi di controllo di versione Cygwin\&.
+.SS "Visualizzare le modifiche non applicate"
+.PP
+L\*(Aqopzione
+\fB\-m\fR
+farà aprire a
+Diffuse
+tante schede di confronto quanti sono i file con modifiche non applicate così come riportati dal sistema di controllo di versione\&. Questo è utile per controllare tutti i cambiamenti prima di effettuare il "commit" o di risolvere i conflitti di unione\&. Se non vengono specificati dei percorsi, verrà utilizzata la cartella di lavoro corrente\&. Per esempio, visualizzare tutte le proprie modifiche non applicate con il seguente comando:
+.PP
+
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+$ \fBdiffuse \-m\fR
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+La revisione predefinita di un file verrà usata per il confronto se viene specificato un solo file\&. Per esempio, il seguente comando visualizzerà un\*(Aqunione a due file tra la revisione predefinita del file
+foo\&.C
+e la copia locale dello stesso file:
+.PP
+
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+$ \fBdiffuse foo\&.C\fR
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+.SS "Specificare le revisioni"
+.PP
+L\*(Aqopzione\fB\-r\fR
+può essere usata per specificare esplicitamente una particolare revisione di un file\&. Può essere utilizzato un qualsiasi identificatore della revisione riconosciuto dal sistema di controllo di versione\&. Se viene specificata un\*(Aqunica revisione, il confronto verrà fatto rispetto al file locale\&. Per esempio, il seguente comando visualizzerà una unione a 2 file tra la revisione 123 del file
+foo\&.C
+e la copia locale dello stesso file:
+.PP
+
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+$ \fBdiffuse \-r 123 foo\&.C\fR
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+Diverse revisioni dello stesso file possono essere confrontate specificando più opzioni
+\fB\-r\fR\&. Per esempio, il seguente comando visualizzerà una unione a due file tra la revisione 123 del file
+foo\&.C
+e la revisione 321 dello stesso file:
+.PP
+
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+$ \fBdiffuse \-r 123 \-r 321 foo\&.C\fR
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+I file locali possono essere combinati con file dal controllo di versione\&. Per esempio, il seguente comando visualizzerà una unione a 3 file tra la revisione MERGE_HEAD del file
+foo\&.C, il file locale
+foo\&.C
+e la revisione HEAD dello stesso file:
+.PP
+
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+$ \fBdiffuse \-r MERGE_HEAD foo\&.C foo\&.C \-r HEAD foo\&.C\fR
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+L\*(Aqopzione
+\fB\-c\fR
+può essere usata per specificare facilmente una coppia di revisioni con numerazioni successive\&. Per esempio, questo comando visualizzerà una unione a 2 file tra la revisione 1\&.2\&.2 del file
+foo\&.C
+e la revisione 1\&.2\&.3 dello stesso file:
+.PP
+
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+$ \fBdiffuse \-c 1\&.2\&.3 foo\&.C\fR
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+Diffuse
+non limita il numero di riquadri che possono essere usati per confrontare i file\&. Gli input a una unione Git a più direzioni possono essere visualizzati con un comando di questo tipo:
+.PP
+
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+$ \fBdiffuse \-r HEAD^1 \-r HEAD^2 \-r HEAD^3 \-r HEAD^4 \-r HEAD^5 foo\&.C\fR
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+.SH "RISORSE"
+.PP
+Le risorse possono essere utilizzate per personalizzare vari parametri dell\*(Aqaspetto e del comportamento di
+Diffuse\&. È possibile infatti modificare i colori utilizzati nell\*(Aqinterfaccia, personalizzare le scorciatoie da tastiera, aggiungere o sostituire regole per il riconoscimento della sintassi o modificare la mappatura tra estensione del file e regole di riconoscimento della sintassi\&.
+.PP
+Quando
+Diffuse
+viene avviato, legge i comandi dal file di inizializzazione del sistema
+/etc/diffuserc
+(%CARTELLA_DI_INSTALLAZIONE%\ediffuserc
+su Microsoft Windows) e in seguito il file di inizializzazione personale
+~/\&.config/diffuse/diffuserc
+(%HOME%\e\&.config\ediffuse\ediffuserc
+su Microsoft Windows)\&. Questo comportamento può essere modificato con le opzioni di configurazione
+\fB\-\-no\-rcfile\fR
+e
+\fB\-\-rcfile\fR\&. Un analizzatore di lessico simile alla Bourne shell è utilizzato per analizzare i comandi di inizializzazione\&. I commenti e i caratteri speciali possono essere inseriti utilizzando lo stesso stile di "escaping" utilizzato per gli script della Bourne shell\&.
+.SS "Generali"
+.PP
+\fBimport \fR\fB\fIfile\fR\fR
+.RS 4
+Elabora i comandi di inizializzazione dal file
+\fIfile\fR\&. Il file di inizializzazione viene elaborato una sola volta\&.
+.RE
+.SS "Keybinding"
+.PP
+\fBkeybinding \fR\fB\fIcontesto\fR\fR\fB \fR\fB\fIazione\fR\fR\fB \fR\fB\fIcombinazione_tasti\fR\fR
+.RS 4
+Collega una combinazione di tasti a
+\fIazione\fR
+quando è utilizzata in
+\fIcontesto\fR\&. Specificare i modificatori
+Maiusc
+e
+Control
+precedendo rispettivamente
+\fBMaiusc+\fR
+e
+\fBCtrl+\fR
+a
+\fIcombinazione_tasti\fR\&. I tasti normalmente modificati da
+Maiusc
+dovrebbero essere specificati utilizzando il loro valore modificato se
+\fIcombinazione_tasti\fR
+comprende il tasto
+Maiusc; per esempio
+\fBCtrl+g\fR
+e
+\fBMaiusc+Ctrl+G\fR\&. Rimuovere i collegamenti per
+\fIcombinazione_tasti\fR
+specificando
+\fBNone\fR
+come
+\fIazione\fR\&.
+.RE
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBKeybinding delle voci di menu\fR
+.RS 4
+.PP
+Usare
+\fBmenu\fR
+come
+\fIcontesto\fR
+per definire i keybinding per le voci dei menu\&. I seguenti valori sono validi per il campo
+\fIazione\fR:
+.PP
+\fBopen_file\fR
+.RS 4
+Voce di menu
+File \(-> Apri file
+.sp
+Predefinito:
+Ctrl+o
+.RE
+.PP
+\fBopen_file_in_new_tab\fR
+.RS 4
+Voce di menu
+File \(-> Apri file in una nuova scheda\&.\&.\&.
+.sp
+Predefinito:
+Ctrl+t
+.RE
+.PP
+\fBopen_modified_files\fR
+.RS 4
+Voce di menu
+File \(-> Apri file modificati\&.\&.\&.
+.sp
+Predefinito:
+Shift+Ctrl+O
+.RE
+.PP
+\fBreload_file\fR
+.RS 4
+Voce di menu
+File \(-> Ricarica file
+.sp
+Predefinito:
+Shift+Ctrl+R
+.RE
+.PP
+\fBsave_file\fR
+.RS 4
+Voce di menu
+File \(-> Salva file
+.sp
+Predefinito:
+Ctrl+s
+.RE
+.PP
+\fBsave_file_as\fR
+.RS 4
+Voce di menu
+File \(-> Salva con nome\&.\&.\&.
+.sp
+Predefinito:
+Shift+Ctrl+A
+.RE
+.PP
+\fBsave_all\fR
+.RS 4
+Voce di menu
+File \(-> Salva tutti
+.sp
+Predefinito:
+Shift+Ctrl+S
+.RE
+.PP
+\fBnew_2_way_file_merge\fR
+.RS 4
+Voce di menu
+File \(-> Nuova unione a 2 file
+.sp
+Predefinito:
+Ctrl+2
+.RE
+.PP
+\fBnew_3_way_file_merge\fR
+.RS 4
+Voce di menu
+File \(-> Nuova unione a 3 file
+.sp
+Predefinito:
+Ctrl+3
+.RE
+.PP
+\fBclose_tab\fR
+.RS 4
+Voce di menu
+File \(-> Chiudi scheda
+.sp
+Predefinito:
+Ctrl+w
+.RE
+.PP
+\fBundo_close_tab\fR
+.RS 4
+Voce di menu
+File \(-> Annulla chiusura scheda
+.sp
+Predefinito:
+Shift+Ctrl+w
+.RE
+.PP
+\fBquit\fR
+.RS 4
+Voce di menu
+File \(-> Esci\&.
+.sp
+Predefinito:
+Ctrl+q
+.RE
+.PP
+\fBundo\fR
+.RS 4
+Voce di menu
+Modifica \(-> Annulla
+.sp
+Predefinito:
+Ctrl+z
+.RE
+.PP
+\fBredo\fR
+.RS 4
+Voce di menu
+Modifica \(-> Ripeti
+.sp
+Predefinito:
+Shift+Ctrl+Z
+.RE
+.PP
+\fBcut\fR
+.RS 4
+Voce di menu
+Modifica \(-> Taglia
+.sp
+Predefinito:
+Ctrl+x
+.RE
+.PP
+\fBcopy\fR
+.RS 4
+Voce di menu
+Modifica \(-> Copia
+.sp
+Predefinito:
+Ctrl+c
+.RE
+.PP
+\fBpaste\fR
+.RS 4
+Voce di menu
+Modifica \(-> Incolla
+.sp
+Predefinito:
+Ctrl+v
+.RE
+.PP
+\fBselect_all\fR
+.RS 4
+Voce di menu
+Modifica \(-> Seleziona tutto
+.sp
+Predefinito:
+Ctrl+a
+.RE
+.PP
+\fBclear_edits\fR
+.RS 4
+Voce di menu
+Modifica \(-> Annulla modifiche
+.sp
+Predefinito:
+Ctrl+r
+.RE
+.PP
+\fBdismiss_all_edits\fR
+.RS 4
+Voce di menu
+Modifica \(-> Scarta tutte le modifiche
+.sp
+Predefinito:
+Ctrl+d
+.RE
+.PP
+\fBfind\fR
+.RS 4
+Voce di menu
+Modifica \(-> Trova\&.\&.\&.
+.sp
+Predefinito:
+Ctrl+f
+.RE
+.PP
+\fBfind_next\fR
+.RS 4
+Voce di menu
+Modifica \(-> Trova successivo
+.sp
+Predefinito:
+Ctrl+g
+.RE
+.PP
+\fBfind_previous\fR
+.RS 4
+Voce di menu
+Modifica \(-> Trova precedente
+.sp
+Predefinito:
+Shift+Ctrl+G
+.RE
+.PP
+\fBgo_to_line\fR
+.RS 4
+Voce di menu
+Modifica \(-> Vai alla riga\&.\&.\&.
+.sp
+Predefinito:
+Shift+Ctrl+L
+.RE
+.PP
+\fBpreferences\fR
+.RS 4
+Voce di menu
+Modifica \(-> Preferenze
+.sp
+Predefinito: Nessuno
+.RE
+.PP
+\fBno_syntax_highlighting\fR
+.RS 4
+Voce di menu
+Visualizza \(-> Sintassi \(-> Nessuna
+.sp
+Predefinito: Nessuno
+.RE
+.PP
+\fBsyntax_highlighting_\fR\fB\fIsintassi\fR\fR
+.RS 4
+Voce di menu
+Visualizza \(-> Sintassi \(-> \fIsyntax\fR
+.sp
+Predefinito: Nessuno
+.RE
+.PP
+\fBrealign_all\fR
+.RS 4
+Voce di menu
+Visualizza \(-> Riallinea tutto
+.sp
+Predefinito:
+Ctrl+l
+.RE
+.PP
+\fBisolate\fR
+.RS 4
+Voce di menu
+Visualizza \(-> isola
+.sp
+Predefinito:
+Ctrl+i
+.RE
+.PP
+\fBfirst_difference\fR
+.RS 4
+Voce di menu
+Visualizza \(-> Prima differenza
+.sp
+Predefinito:
+Shift+Ctrl+Up
+.RE
+.PP
+\fBprevious_difference\fR
+.RS 4
+Voce di menu
+Visualizza \(-> Differenza precedente
+.sp
+Predefinito:
+Ctrl+Up
+.RE
+.PP
+\fBnext_difference\fR
+.RS 4
+Voce di menu
+Visualizza \(-> Differenza successiva
+.sp
+Predefinito:
+Ctrl+Down
+.RE
+.PP
+\fBlast_difference\fR
+.RS 4
+Voce di menu
+Visualizza \(-> Ultima differenza
+.sp
+Predefinito:
+Shift+Ctrl+Down
+.RE
+.PP
+\fBfirst_tab\fR
+.RS 4
+Voce di menu
+Visualizza \(-> Prima scheda
+.sp
+Predefinito:
+Shift+Ctrl+Page_Up
+.RE
+.PP
+\fBprevious_tab\fR
+.RS 4
+Voce di menu
+Visualizza \(-> Scheda precedente
+.sp
+Predefinito:
+Ctrl+Page_Up
+.RE
+.PP
+\fBnext_tab\fR
+.RS 4
+Voce di menu
+Visualizza \(-> Scheda successiva
+.sp
+Predefinito:
+Ctrl+Page_Down
+.RE
+.PP
+\fBlast_tab\fR
+.RS 4
+Voce di menu
+Visualizza \(-> Ultima scheda
+.sp
+Predefinito:
+Shift+Ctrl+Page_Down
+.RE
+.PP
+\fBshift_pane_right\fR
+.RS 4
+Voce di menu
+Visualizza \(-> Sposta riquadro a destra
+.sp
+Predefinito:
+Shift+Ctrl+parenleft
+.RE
+.PP
+\fBshift_pane_left\fR
+.RS 4
+Voce di menu
+Visualizza \(-> Sposta riquadro a sinistra
+.sp
+Predefinito:
+Shift+Ctrl+parenright
+.RE
+.PP
+\fBconvert_to_upper_case\fR
+.RS 4
+Voce di menu
+Formato \(-> Converti in MAIUSCOLO
+.sp
+Predefinito:
+Ctrl+u
+.RE
+.PP
+\fBconvert_to_lower_case\fR
+.RS 4
+Voce di menu
+Formato \(-> Converti in minuscolo
+.sp
+Predefinito:
+Shift+Ctrl+U
+.RE
+.PP
+\fBsort_lines_in_ascending_order\fR
+.RS 4
+Voce di menu
+Formato \(-> Disponi le righe in ordine ascendente
+.sp
+Predefinito:
+Ctrl+y
+.RE
+.PP
+\fBsort_lines_in_descending_order\fR
+.RS 4
+Voce di menu
+Formato \(-> Disponi le righe in ordine discendente
+.sp
+Predefinito:
+Shift+Ctrl+Y
+.RE
+.PP
+\fBremove_trailing_white_space\fR
+.RS 4
+Voce di menu
+Formato \(-> Rimuovi gli spazi vuoti alla fine della riga
+.sp
+Predefinito:
+Ctrl+k
+.RE
+.PP
+\fBconvert_tabs_to_spaces\fR
+.RS 4
+Voce di menu
+Formato \(-> Converti le tabulazioni in spazi
+.sp
+Predefinito:
+Ctrl+b
+.RE
+.PP
+\fBconvert_leading_spaces_to_tabs\fR
+.RS 4
+Voce di menu
+Formato \(-> Converti gli spazi iniziali in tabulazioni
+.sp
+Predefinito:
+Shift+Ctrl+B
+.RE
+.PP
+\fBincrease_indenting\fR
+.RS 4
+Voce di menu
+Formato \(-> Aumenta indentazione
+.sp
+Predefinito:
+Shift+Ctrl+greater
+.RE
+.PP
+\fBdecrease_indenting\fR
+.RS 4
+Voce di menu
+Formato \(-> Diminuisci indentazione
+.sp
+Predefinito:
+Shift+Ctrl+less
+.RE
+.PP
+\fBconvert_to_dos\fR
+.RS 4
+Voce di menu
+Formato \(-> Converti nel formato DOS
+.sp
+Predefinito:
+Shift+Ctrl+E
+.RE
+.PP
+\fBconvert_to_mac\fR
+.RS 4
+Voce di menu
+Formato \(-> Converti nel formato MAC
+.sp
+Predefinito:
+Shift+Ctrl+C
+.RE
+.PP
+\fBconvert_to_unix\fR
+.RS 4
+Voce di menu
+Formato \(-> Converti nel formato Unix
+.sp
+Predefinito:
+Ctrl+e
+.RE
+.PP
+\fBcopy_selection_right\fR
+.RS 4
+Voce di menu
+Unione \(-> Copia selezione a destra
+.sp
+Predefinito:
+Shift+Ctrl+Right
+.RE
+.PP
+\fBcopy_selection_left\fR
+.RS 4
+Voce di menu
+Unione \(-> Copia selezione a sinistra
+.sp
+Predefinito:
+Shift+Ctrl+Left
+.RE
+.PP
+\fBcopy_left_into_selection\fR
+.RS 4
+Voce di menu
+Unione \(-> Copia sinistra nella selezione
+.sp
+Predefinito:
+Ctrl+Right
+.RE
+.PP
+\fBcopy_right_into_selection\fR
+.RS 4
+Voce di menu
+Unione \(-> Copia destra nella selezione
+.sp
+Predefinito:
+Ctrl+Left
+.RE
+.PP
+\fBmerge_from_left_then_right\fR
+.RS 4
+Voce di menu
+Unione \(-> Unisci sinistra poi destra
+.sp
+Predefinito:
+Ctrl+m
+.RE
+.PP
+\fBmerge_from_right_then_left\fR
+.RS 4
+Voce di menu
+Unione \(-> Unisci destra poi sinistra
+.sp
+Predefinito:
+Shift+Ctrl+M
+.RE
+.PP
+\fBhelp_contents\fR
+.RS 4
+Voce di menu
+Aiuto \(-> Sommario
+.sp
+Predefinito:
+F1
+.RE
+.PP
+\fBabout\fR
+.RS 4
+Voce di menu
+Aiuto \(-> Informazioni
+.sp
+Predefinito: Nessuno
+.RE
+.RE
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBKeybinding per la modalità di modifica delle righe\fR
+.RS 4
+.PP
+Usare
+\fBline_mode\fR
+come
+\fIcontesto\fR
+per definire i keybinding per la modalità di modifica delle righe\&. I seguenti valori sono validi per il campo
+\fIazione\fR:
+.PP
+\fBenter_align_mode\fR
+.RS 4
+Passa alla modalità di modifica dell\*(Aqallineamento
+.sp
+Predefinito:
+space
+.RE
+.PP
+\fBenter_character_mode\fR
+.RS 4
+Passa alla modalità di modifica del testo
+.sp
+Predefiniti:
+Return,
+KP_Enter
+.RE
+.PP
+\fBfirst_line\fR
+.RS 4
+Sposta il cursore alla prima riga
+.sp
+Predefiniti:
+Home,
+g
+.RE
+.PP
+\fBextend_first_line\fR
+.RS 4
+Sposta il cursore alla prima riga, estendendo la selezione
+.sp
+Predefinito:
+Shift+Home
+.RE
+.PP
+\fBlast_line\fR
+.RS 4
+Sposta il cursore all\*(Aqultima riga
+.sp
+Predefiniti:
+End,
+Shift+G
+.RE
+.PP
+\fBextend_last_line\fR
+.RS 4
+Sposta il cursore all\*(Aqultima riga, estendendo la selezione
+.sp
+Predefinito:
+Shift+End
+.RE
+.PP
+\fBup\fR
+.RS 4
+Sposta il cursore alla riga superiore
+.sp
+Predefiniti:
+Up,
+k
+.RE
+.PP
+\fBextend_up\fR
+.RS 4
+Sposta il cursore alla riga superiore, estendendo la selezione
+.sp
+Predefiniti:
+Shift+Up,
+Shift+K
+.RE
+.PP
+\fBdown\fR
+.RS 4
+Sposta il cursore alla riga inferiore
+.sp
+Predefiniti:
+Down,
+j
+.RE
+.PP
+\fBextend_down\fR
+.RS 4
+Sposta il cursore alla riga inferiore, estendendo la selezione
+.sp
+Predefiniti:
+Shift+Down,
+Shift+J
+.RE
+.PP
+\fBleft\fR
+.RS 4
+Sposta il cursore sinistra di un file
+.sp
+Predefiniti:
+Left,
+h
+.RE
+.PP
+\fBextend_left\fR
+.RS 4
+Sposta il cursore a sinistra di un file, estendendo la selezione
+.sp
+Predefinito:
+Shift+Left
+.RE
+.PP
+\fBright\fR
+.RS 4
+Sposta il cursore a destra di un file
+.sp
+Predefiniti:
+Right,
+l
+.RE
+.PP
+\fBextend_right\fR
+.RS 4
+Sposta il cursore a destra di un file, estendendo la selezione
+.sp
+Predefinito:
+Shift+Right
+.RE
+.PP
+\fBpage_up\fR
+.RS 4
+Sposta il cursore alla pagina superiore
+.sp
+Predefiniti:
+Page_Up,
+Ctrl+u
+.RE
+.PP
+\fBextend_page_up\fR
+.RS 4
+Sposta il cursore alla pagina superiore, estendendo la selezione
+.sp
+Predefiniti:
+Shift+Page_Up,
+Shift+Ctrl+u
+.RE
+.PP
+\fBpage_down\fR
+.RS 4
+Sposta il cursore alla pagina inferiore
+.sp
+Predefiniti:
+Page_Down,
+Ctrl+d
+.RE
+.PP
+\fBextend_page_down\fR
+.RS 4
+Sposta il cursore alla pagina inferiore, estendendo la selezione
+.sp
+Predefiniti:
+Shift+Page_Down,
+Shift+Ctrl+d
+.RE
+.PP
+\fBdelete_text\fR
+.RS 4
+Cancella il testo selezionato
+.sp
+Predefiniti:
+BackSpace,
+Delete,
+x
+.RE
+.PP
+\fBfirst_difference\fR
+.RS 4
+Seleziona la prima differenza
+.sp
+Predefiniti:
+Ctrl+Home,
+Shift+P
+.RE
+.PP
+\fBprevious_difference\fR
+.RS 4
+Seleziona la differenza precedente
+.sp
+Predefinito:
+p
+.RE
+.PP
+\fBnext_difference\fR
+.RS 4
+Seleziona la differenza successiva
+.sp
+Predefinito:
+n
+.RE
+.PP
+\fBlast_difference\fR
+.RS 4
+Seleziona l\*(Aqultima differenza
+.sp
+Predefiniti:
+Ctrl+End,
+Shift+N
+.RE
+.PP
+\fBclear_edits\fR
+.RS 4
+Annulla tutte le modifiche alle righe selezionate
+.sp
+Predefinito:
+r
+.RE
+.PP
+\fBcopy_left_into_selection\fR
+.RS 4
+Copia le righe dal file a sinistra nella selezione
+.sp
+Predefinito:
+Shift+L
+.RE
+.PP
+\fBcopy_right_into_selection\fR
+.RS 4
+Copia le righe dal file a destra nella selezione
+.sp
+Predefinito:
+Shift+H
+.RE
+.PP
+\fBmerge_from_left_then_right\fR
+.RS 4
+Unisce le righe dal file a sinistra poi da quello a destra
+.sp
+Predefinito:
+m
+.RE
+.PP
+\fBmerge_from_right_then_left\fR
+.RS 4
+Unisce le righe dal file a destra poi da quello a sinistra
+.sp
+Predefinito:
+Shift+M
+.RE
+.PP
+\fBisolate\fR
+.RS 4
+Isola le righe selezionate
+.sp
+Predefinito:
+i
+.RE
+.RE
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBKeybinding per la modalità di modifica dell'allineamento\fR
+.RS 4
+.PP
+Usare
+\fBalign_mode\fR
+come
+\fIcontesto\fR
+per definire i keybinding per la modalità di modifica dell\*(Aqallineamento\&. I seguenti valori sono validi per il campo
+\fIazione\fR:
+.PP
+\fBenter_line_mode\fR
+.RS 4
+Passa alla modalità di modifica riga
+.sp
+Predefinito:
+Escape
+.RE
+.PP
+\fBenter_character_mode\fR
+.RS 4
+Passa alla modalità di modifica del testo
+.sp
+Predefiniti:
+Return,
+KP_Enter
+.RE
+.PP
+\fBfirst_line\fR
+.RS 4
+Sposta il cursore alla prima riga
+.sp
+Predefinito:
+g
+.RE
+.PP
+\fBlast_line\fR
+.RS 4
+Sposta il cursore all\*(Aqultima riga
+.sp
+Predefinito:
+Shift+G
+.RE
+.PP
+\fBup\fR
+.RS 4
+Sposta il cursore alla riga superiore
+.sp
+Predefiniti:
+Up,
+k
+.RE
+.PP
+\fBdown\fR
+.RS 4
+Sposta il cursore alla riga inferiore
+.sp
+Predefiniti:
+Down,
+j
+.RE
+.PP
+\fBleft\fR
+.RS 4
+Sposta il cursore sinistra di un file
+.sp
+Predefiniti:
+Left,
+h
+.RE
+.PP
+\fBright\fR
+.RS 4
+Sposta il cursore a destra di un file
+.sp
+Predefiniti:
+Right,
+l
+.RE
+.PP
+\fBpage_up\fR
+.RS 4
+Sposta il cursore alla pagina superiore
+.sp
+Predefiniti:
+Page_Up,
+Ctrl+u
+.RE
+.PP
+\fBpage_down\fR
+.RS 4
+Sposta il cursore alla pagina inferiore
+.sp
+Predefiniti:
+Page_Down,
+Ctrl+d
+.RE
+.PP
+\fBalign\fR
+.RS 4
+Allinea le righe selezionate alla posizione del cursore
+.sp
+Predefinito:
+space
+.RE
+.RE
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBKeybinding della modalità di modifica testo\fR
+.RS 4
+.PP
+Usare
+\fBcharacter_mode\fR
+come
+\fIcontesto\fR
+per definire i keybinding per la modalità di modifica testo\&. I seguenti valori sono validi per il campo
+\fIazione\fR:
+.PP
+\fBenter_line_mode\fR
+.RS 4
+Passa alla modalità di modifica riga
+.sp
+Predefinito:
+Escape
+.RE
+.RE
+.SS "Stringhe"
+.PP
+\fBstringa \fR\fB\fInome\fR\fR\fB \fR\fB\fIvalore\fR\fR
+.RS 4
+Dichiara una stringa chiamata
+\fInome\fR
+con valore
+\fIvalore\fR\&.
+.RE
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBRisorse stringa utilizzate\fR
+.RS 4
+.PP
+Diffuse
+utilizza le seguenti stringhe come risorse:
+.PP
+\fBdifference_colours\fR
+.RS 4
+un elenco di risorse colore utilizzate per evidenziare le differenze
+.sp
+Predefinito:
+difference_1 difference_2 difference_3
+.RE
+.RE
+.SS "Colori"
+.PP
+\fB[ colour | color ] \fR\fB\fInome\fR\fR\fB \fR\fB\fIrosso\fR\fR\fB \fR\fB\fIverde\fR\fR\fB \fR\fB\fIblu\fR\fR
+.RS 4
+Dichiara una risorsa colore chiamata
+\fInome\fR\&. Le singole componenti del colore devono essere espresse come valori compresi tra 0 e 1\&.
+.RE
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBRisorse colori utilizzati\fR
+.RS 4
+.PP
+Diffuse
+utilizza le seguenti risorse colore:
+.PP
+\fBalignment\fR
+.RS 4
+Colore utilizzato per indicare una riga selezionata per l\*(Aqallineamento manuale\&.
+.sp
+Predefinito:
+1 1 0
+.RE
+.PP
+\fBcharacter_selection\fR
+.RS 4
+Colore usato per evidenziare i caratteri selezionati\&.
+.sp
+Predefinito:
+0\&.7 0\&.7 1
+.RE
+.PP
+\fBcursor\fR
+.RS 4
+Colore utilizzato per il cursore\&.
+.sp
+Predefinito:
+0 0 0
+.RE
+.PP
+\fBdifference_1\fR
+.RS 4
+Colore usato per evidenziare le differenze nella prima coppia di file\&.
+.sp
+Predefinito:
+1 0\&.625 0\&.625
+.RE
+.PP
+\fBdifference_2\fR
+.RS 4
+Colore usato per evidenziare le differenze nella seconda coppia di file\&.
+.sp
+Predefinito:
+0\&.85 0\&.625 0\&.775
+.RE
+.PP
+\fBdifference_3\fR
+.RS 4
+Colore usato per evidenziare le differenze nella terza coppia di file\&.
+.sp
+Predefinito:
+0\&.85 0\&.775 0\&.625
+.RE
+.PP
+\fBedited\fR
+.RS 4
+Colore usato per evidenziare le righe modificate\&.
+.sp
+Predefinito:
+0\&.5 1 0\&.5
+.RE
+.PP
+\fBhatch\fR
+.RS 4
+Colore usato per evidenziare delle discrepanze nell\*(Aqallineamento\&.
+.sp
+Predefinito:
+0\&.8 0\&.8 0\&.8
+.RE
+.PP
+\fBline_number\fR
+.RS 4
+Colore usato per i numeri di riga\&.
+.sp
+Predefinito:
+0 0 0
+.RE
+.PP
+\fBline_number_background\fR
+.RS 4
+Colore di sfondo per l\*(Aqarea del numero di riga\&.
+.sp
+Predefinito:
+0\&.75 0\&.75 0\&.75
+.RE
+.PP
+\fBline_selection\fR
+.RS 4
+Colore usato per evidenziare le linee selezionate\&.
+.sp
+Predefinito:
+0\&.7 0\&.7 1
+.RE
+.PP
+\fBmap_background\fR
+.RS 4
+Colore di sfondo per l\*(Aqarea di mappatura\&.
+.sp
+Predefinito:
+0\&.6 0\&.6 0\&.6
+.RE
+.PP
+\fBmargin\fR
+.RS 4
+Colore usato per indicare il margine destro\&.
+.sp
+Predefinito:
+0\&.8 0\&.8 0\&.8
+.RE
+.PP
+\fBpreedit\fR
+.RS 4
+Colore del testo prima delle modifiche\&.
+.sp
+Predefinito:
+0 0 0
+.RE
+.PP
+\fBtext\fR
+.RS 4
+Colore del testo regolare\&.
+.sp
+Predefinito:
+0 0 0
+.RE
+.PP
+\fBtext_background\fR
+.RS 4
+Colore di sfondo per l\*(Aqarea di testo\&.
+.sp
+Predefinito:
+1 1 1
+.RE
+.RE
+.SS "Valori a virgola mobile"
+.PP
+\fBfloat \fR\fB\fInome\fR\fR\fB \fR\fB\fIvalore\fR\fR
+.RS 4
+Dichiara una risorsa a virgola mobile chiamata
+\fInome\fR
+con valore
+\fIvalore\fR\&.
+.RE
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBRisorse a virgola mobile utilizzate\fR
+.RS 4
+.PP
+Diffuse
+utilizza le seguenti risorse a virgola mobile:
+.PP
+\fBalignment_opacity\fR
+.RS 4
+Opacità utilizzata durante la composizione del colore per l\*(Aqallineamento manuale
+.sp
+Predefinito:
+1
+.RE
+.PP
+\fBcharacter_difference_opacity\fR
+.RS 4
+Opacità utilizzata durante la composizione del colore per le differenze di testo
+.sp
+Predefinito:
+0\&.4
+.RE
+.PP
+\fBcharacter_selection_opacity\fR
+.RS 4
+Opacità utilizzata durante la composizione del colore per il testo selezionato
+.sp
+Predefinito:
+0\&.4
+.RE
+.PP
+\fBedited_opacity\fR
+.RS 4
+Opacità utilizzata durante la composizione del colore per le righe modificate
+.sp
+Predefinito:
+0\&.4
+.RE
+.PP
+\fBline_difference_alpha\fR
+.RS 4
+Valore di trasparenza utilizzato durante la composizione del colore per le differenze di riga
+.sp
+Predefinito:
+0\&.3
+.RE
+.PP
+\fBline_selection_opacity\fR
+.RS 4
+Opacità utilizzata durante la composizione del colore per la riga selezionata
+.sp
+Predefinito:
+0\&.4
+.RE
+.RE
+.SS "Riconoscimento della sintassi"
+.PP
+\fBsyntax \fR\fB\fInome\fR\fR\fB \fR\fB[\fIstato_iniziale\fR \fIdefault_tag\fR]\fR
+.RS 4
+Dichiara un nuovo stile di sintassi chiamato
+\fInome\fR\&. Il riconoscimento della sintassi utilizza una semplice macchina di stato che cambia di stato nel momento in cui alcuni schemi risultano corrispondenti\&. Lo stato iniziale per la macchina sarà
+\fIstato_iniziale\fR\&. Tutti i caratteri che non corrispondono ad alcuno schema verranno marcati come
+\fIdefault_tag\fR
+per il riconoscimento\&. Lo stile di sintassi chiamato
+\fInome\fR
+può essere rimosso omettendo
+\fIstato_iniziale\fR
+e
+\fIdefault_tag\fR\&.
+.RE
+.PP
+\fBsyntax_files \fR\fB\fInome\fR\fR\fB \fR\fB[\fIschema\fR]\fR
+.RS 4
+Specifica che i file con un nome corrispondente a
+\fIschema\fR
+devono essere evidenziati utilizzando lo stile di sintassi chiamato
+\fInome\fR\&. Gli schemi usati per far corrispondere i file utilizzati con lo stile di sintassi chiamato
+\fInome\fR
+possono essere rimossi omettendo
+\fIschema\fR\&.
+.RE
+.PP
+\fBsyntax_magic \fR\fB\fInome\fR\fR\fB \fR\fB[\fIschema\fR [ignorecase]]\fR
+.RS 4
+Specifica che i file con una prima riga corrispondente a
+\fIschema\fR
+devono essere evidenziati utilizzando lo stile di sintassi chiamato
+\fInome\fR\&. Gli schemi usati per far corrispondere i file utilizzati con lo stile di sintassi chiamato
+\fInome\fR
+possono essere rimossi omettendo
+\fIschema\fR\&.
+.RE
+.PP
+\fBsyntax_pattern \fR\fB\fInome\fR\fR\fB \fR\fB\fIstato_iniziale\fR\fR\fB \fR\fB\fIstato_finale\fR\fR\fB \fR\fB\fItag\fR\fR\fB \fR\fB\fIschema\fR\fR\fB \fR\fB[ignorecase]\fR
+.RS 4
+Aggiunge uno schema allo stile di sintassi dichiarato precedentemente\&.Gli schemi sono analizzati uno alla volta nell\*(Aqordine dichiarato fino a quando non viene trovata una corrispondenza\&. Uno schema sarà utilizzato per far corrispondere dei caratteri solamente se la macchina di stato si trova nello stato
+\fIstato_iniziale\fR\&. La macchina di stato si sposterà sullo
+\fIstato_finale\fR
+se lo schema definito da
+\fIschema\fR
+verrà corrisposto\&. La corrispondenza dello schema ignorerà le differenze tra maiuscole e minuscole se è specificata l\*(Aqopzione
+\fBignorecase\fR\&. Tutti i caratteri per cui è stata trovata una corrispondenza verranno identificati con
+\fItag\fR
+per evidenziarli\&.
+.RE
+.SH "FILE"
+.PP
+Diffuse
+utilizza i seguenti file:
+.PP
+/etc/diffuserc
+.RS 4
+Inizializzazioni a livello di tutto il sistema (%CARTELLA_DI_INSTALLAZIONE%\ediffuserc
+su Microsoft Windows)
+.RE
+.PP
+/usr/share/diffuse/syntax/*\&.syntax
+.RS 4
+File di sintassi per i vari linguaggi (%CARTELLA_DI_INSTALLAZIONE%\esyntax\e*\&.syntax
+su Microsoft Windows)
+.RE
+.PP
+~/\&.config/diffuse/diffuserc
+.RS 4
+Le proprie inizializzazioni (%HOME%\e\&.config\ediffuse\ediffuserc
+su Microsoft Windows)
+.RE
+.PP
+~/\&.config/diffuse/prefs
+.RS 4
+Le proprie preferenze salvate (%HOME%\e\&.config\ediffuse\eprefs
+su Microsoft Windows)
+.RE
+.PP
+~/\&.config/diffuse/state
+.RS 4
+Dati persistenti tra le sessioni (%HOME%\e\&.config\ediffuse\estate
+su Microsoft Windows)
+.RE
+.SH "AUTORE"
+.PP
+Diffuse
+è stato scritto da Derrick Moser
+derrick_moser@yahoo\&.com\&.
+.PP
+\(co 2006\-2011 Derrick Moser\&. Tutti i diritti riservati\&.
+.SH "COPIA"
+.PP
+Diffuse
+è software libero; è possibile ridistribuirlo e modificarlo nel rispetto dei termini della
+GNU General Public License
+come pubblicata dalla Free Software Foundation sia essa nella versione 2 o (a propria scelta) qualsiasi versione successiva\&.
diff -Nru diffuse-0.4.4/src/usr/share/man/man1/diffuse.1 diffuse-0.4.5/src/usr/share/man/man1/diffuse.1
--- diffuse-0.4.4/src/usr/share/man/man1/diffuse.1	2010-10-21 01:58:02.000000000 +0000
+++ diffuse-0.4.5/src/usr/share/man/man1/diffuse.1	2011-07-13 09:18:33.000000000 +0000
@@ -1,5 +1,5 @@
 '\" t
-.TH "DIFFUSE" "1" "2010\-10\-21" "diffuse 0\&.4\&.4" "Diffuse Manual"
+.TH "DIFFUSE" "1" "2011\-07\-13" "diffuse 0\&.4\&.5" "Diffuse Manual"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .nh
@@ -13,11 +13,19 @@
 \fBdiffuse\fR [\fB\-\-no\-rcfile\fR | \fB\-\-rcfile\ \fR\fB\fIfile\fR\fR] [[\fIoption\fR...] | [\fIfile\fR...]...]
 .SH "DESCRIPTION"
 .PP
-Diffuse is a graphical tool for merging and comparing text files\&. Diffuse is able to compare an arbitrary number of files side\-by\-side and gives users the ability to manually adjust line matching and directly edit files\&. Diffuse can also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK repositories for comparison and merging\&.
+
+Diffuse
+is a graphical tool for merging and comparing text files\&.
+Diffuse
+is able to compare an arbitrary number of files side\-by\-side and gives users the ability to manually adjust line matching and directly edit files\&.
+Diffuse
+can also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK repositories for comparison and merging\&.
 .SH "OPTIONS"
 .SS "Help Options"
 .PP
-If a help option is specified, it must be the only argument specified on the command line\&. Diffuse will immediately quit after displaying the help information\&.
+If a help option is specified, it must be the only argument specified on the command line\&.
+Diffuse
+will immediately quit after displaying the help information\&.
 .PP
 \fB\-h\fR, \fB\-?\fR, \fB\-\-help\fR
 .RS 4
@@ -65,6 +73,13 @@
 to read and write files\&.
 .RE
 .PP
+\fB\-L\fR, \fB\-\-label\fR \fIlabel\fR
+.RS 4
+Display
+\fIlabel\fR
+instead of the file name\&.
+.RE
+.PP
 \fB\-m\fR, \fB\-\-modified\fR
 .RS 4
 Open all modified files from the remaining paths specified in the command line arguments in separate file comparison tabs\&.
@@ -87,6 +102,13 @@
 Start a new tab for any remaining files named in the command line arguments\&.
 .RE
 .PP
+\fB\-\-line \fR\fB\fIline\fR\fR
+.RS 4
+Start with line
+\fIline\fR
+selected\&.
+.RE
+.PP
 \fB\-\-null\-file\fR
 .RS 4
 Create a blank file comparison pane\&.
@@ -125,9 +147,13 @@
 File \(-> New 2\-Way File Merge
 and
 File \(-> New 3\-Way File Merge
-menu items to create additional tabs for comparing text files\&. File names and revisions can be specified either in the command line arguments used to invoke Diffuse or in fields on the Open File dialogue\&.
+menu items to create additional tabs for comparing text files\&. File names and revisions can be specified either in the command line arguments used to invoke
+Diffuse
+or in fields on the Open File dialogue\&.
 .PP
-Diffuse displays files side\-by\-side inserting gaps to align similar lines of text\&. Differences are highlighted with a different background colour\&.
+
+Diffuse
+displays files side\-by\-side inserting gaps to align similar lines of text\&. Differences are highlighted with a different background colour\&.
 .SS "Comparison Summary"
 .PP
 A summary of the compared files is located in the far right margin\&. The summary illustrates where gaps have been inserted to align matching lines of text and highlights differences using colour\&. Manual edits are also highlighted in green\&. A blue cursor identifies the region currently being viewed\&. The viewed region can be changed by clicking anywhere on the summary\&.
@@ -137,14 +163,18 @@
 .SS "Matching Lines"
 .PP
 The mouse pointer or keyboard can be used to manually align lines of text with adjacent files\&. To aligning lines of text using the mouse pointer, select a line of text with the left mouse button, right click on a line of text from an adjacent file, and choose
-Align with Selection\&. To align lines of text using the keyboard, move the selection with the cursor keys, press the space bar to pick the current line of text, move the selection with the cursor keys to a line of text in an adjacent file, and press the space bar to pick the target line of text\&. Pressing the escape key will cancel the operation\&.
+Align with Selection\&. To align lines of text using the keyboard, move the selection with the cursor keys, press the space bar to pick the current line of text, move the selection with the cursor keys to a line of text in an adjacent file, and press the space bar to pick the target line of text\&. Pressing the
+Escape
+key will cancel the operation\&.
 .PP
 Use the
 Isolate
 menu item to prevent the selected lines from being matched with any lines from the adjacent files\&.
 .SS "Editing"
 .PP
-Press the enter key or double\-click on a text area to enter text editing mode\&. The cursor will change to indicate text editing mode and the status bar at the bottom of the window will display the cursor\*(Aqs column position\&.
+Press the
+Enter
+key or double\-click on a text area to enter text editing mode\&. The cursor will change to indicate text editing mode and the status bar at the bottom of the window will display the cursor\*(Aqs column position\&.
 .PP
 In text editing mode, text can be selected with the mouse pointer by click and dragging\&. The current selection can be extended by holding down the shift key and moving the cursor by clicking with the mouse pointer or pressing any of the arrow, home, end or page up/down keys\&. Individual words can be selected by double\-clicking on them with the mouse pointer\&. Whole lines can be selected by triple\-clicking on them with the mouse pointer\&.
 .PP
@@ -154,10 +184,14 @@
 Redo
 menu items to undo and redo the previously preformed operations\&.
 .PP
-Press the escape key or click on another file\*(Aqs text area using the left mouse button to leave editing mode\&.
+Press the
+Escape
+key or click on another file\*(Aqs text area using the left mouse button to leave editing mode\&.
 .SS "Merging"
 .PP
-Use the difference buttons or menu items to navigate between blocks of differences within a file\&. When navigating, Diffuse will move the selection to the next continuous set of lines with differences or edits\&.
+Use the difference buttons or menu items to navigate between blocks of differences within a file\&. When navigating,
+Diffuse
+will move the selection to the next continuous set of lines with differences or edits\&.
 .PP
 Use the merge buttons or menu items to copy blocks of text into the selected range of lines\&. The
 Undo
@@ -168,7 +202,14 @@
 menu item regardless of the order the edits were performed\&.
 .SH "VERSION CONTROL"
 .PP
-Diffuse can retrieve file revisions from several version control systems via their command line interface\&. The Microsoft Windows build of Diffuse is able to use both the Cygwin and native versions of the supported version control systems\&. When using Diffuse with Cygwin, ensure Diffuse\*(Aqs Cygwin preferences correctly describe your system\&. If the
+
+Diffuse
+can retrieve file revisions from several version control systems via their command line interface\&. The Microsoft Windows build of
+Diffuse
+is able to use both the Cygwin and native versions of the supported version control systems\&. When using
+Diffuse
+with Cygwin, ensure
+Diffuse\*(Aqs Cygwin preferences correctly describe your system\&. If the
 Update paths for Cygwin
 preference exists for a version control system, it must be enabled to use the Cygwin version\&.
 .PP
@@ -179,7 +220,9 @@
 .PP
 The
 \fB\-m\fR
-option will cause Diffuse to open comparison tabs for each file the version control system indicates has uncommitted modifications\&. This is convenient for reviewing all changes before committing or resolving a merge conflict\&. If no paths are specified the current working directory will be used\&. For example, view all of your uncommitted modifications with this command line:
+option will cause
+Diffuse
+to open comparison tabs for each file the version control system indicates has uncommitted modifications\&. This is convenient for reviewing all changes before committing or resolving a merge conflict\&. If no paths are specified the current working directory will be used\&. For example, view all of your uncommitted modifications with this command line:
 .PP
 
 .sp
@@ -289,7 +332,9 @@
 .RE
 .\}
 .PP
-Diffuse does not limit the number of panes that can be used for comparing files\&. The inputs to a Git octopus merge could be viewed with a command line like this:
+
+Diffuse
+does not limit the number of panes that can be used for comparing files\&. The inputs to a Git octopus merge could be viewed with a command line like this:
 .PP
 
 .sp
@@ -305,9 +350,12 @@
 .sp
 .SH "RESOURCES"
 .PP
-Resources can be used to customise several aspects of Diffuse\*(Aqs appearance and behaviour such as changing the colours used in the user interface, customising the keyboard shortcuts, adding or replacing syntax highlighting rules, or changing the mapping from file extensions to syntax highlighting rules\&.
+Resources can be used to customise several aspects of
+Diffuse\*(Aqs appearance and behaviour such as changing the colours used in the user interface, customising the keyboard shortcuts, adding or replacing syntax highlighting rules, or changing the mapping from file extensions to syntax highlighting rules\&.
 .PP
-When Diffuse is started, it will read commands from the system wide initialisation file
+When
+Diffuse
+is started, it will read commands from the system wide initialisation file
 /etc/diffuserc
 (%INSTALL_DIR%\ediffuserc
 on Microsoft Windows) and then the personal initialisation file
@@ -379,7 +427,8 @@
 File \(-> Open File\&.\&.\&.
 menu item
 .sp
-Default: Ctrl+o
+Default:
+Ctrl+o
 .RE
 .PP
 \fBopen_file_in_new_tab\fR
@@ -387,7 +436,8 @@
 File \(-> Open File In New Tab\&.\&.\&.
 menu item
 .sp
-Default: Ctrl+t
+Default:
+Ctrl+t
 .RE
 .PP
 \fBopen_modified_files\fR
@@ -395,7 +445,8 @@
 File \(-> Open Modified Files\&.\&.\&.
 menu item
 .sp
-Default: Shift+Ctrl+O
+Default:
+Shift+Ctrl+O
 .RE
 .PP
 \fBreload_file\fR
@@ -403,7 +454,8 @@
 File \(-> Reload File
 menu item
 .sp
-Default: Shift+Ctrl+R
+Default:
+Shift+Ctrl+R
 .RE
 .PP
 \fBsave_file\fR
@@ -411,7 +463,8 @@
 File \(-> Save File
 menu item
 .sp
-Default: Ctrl+s
+Default:
+Ctrl+s
 .RE
 .PP
 \fBsave_file_as\fR
@@ -419,7 +472,8 @@
 File \(-> Save File As\&.\&.\&.
 menu item
 .sp
-Default: Shift+Ctrl+A
+Default:
+Shift+Ctrl+A
 .RE
 .PP
 \fBsave_all\fR
@@ -427,7 +481,8 @@
 File \(-> Save All
 menu item
 .sp
-Default: Shift+Ctrl+S
+Default:
+Shift+Ctrl+S
 .RE
 .PP
 \fBnew_2_way_file_merge\fR
@@ -435,7 +490,8 @@
 File \(-> New 2\-Way File Merge
 menu item
 .sp
-Default: Ctrl+2
+Default:
+Ctrl+2
 .RE
 .PP
 \fBnew_3_way_file_merge\fR
@@ -443,7 +499,8 @@
 File \(-> New 3\-Way File Merge
 menu item
 .sp
-Default: Ctrl+3
+Default:
+Ctrl+3
 .RE
 .PP
 \fBclose_tab\fR
@@ -451,7 +508,8 @@
 File \(-> Close Tab
 menu item
 .sp
-Default: Ctrl+w
+Default:
+Ctrl+w
 .RE
 .PP
 \fBundo_close_tab\fR
@@ -459,7 +517,8 @@
 File \(-> Undo Close Tab
 menu item
 .sp
-Default: Shift+Ctrl+w
+Default:
+Shift+Ctrl+w
 .RE
 .PP
 \fBquit\fR
@@ -467,7 +526,8 @@
 File \(-> Quit
 menu item
 .sp
-Default: Ctrl+q
+Default:
+Ctrl+q
 .RE
 .PP
 \fBundo\fR
@@ -475,7 +535,8 @@
 Edit \(-> Undo
 menu item
 .sp
-Default: Ctrl+z
+Default:
+Ctrl+z
 .RE
 .PP
 \fBredo\fR
@@ -483,7 +544,8 @@
 Edit \(-> Redo
 menu item
 .sp
-Default: Shift+Ctrl+Z
+Default:
+Shift+Ctrl+Z
 .RE
 .PP
 \fBcut\fR
@@ -491,7 +553,8 @@
 Edit \(-> Cut
 menu item
 .sp
-Default: Ctrl+x
+Default:
+Ctrl+x
 .RE
 .PP
 \fBcopy\fR
@@ -499,7 +562,8 @@
 Edit \(-> Copy
 menu item
 .sp
-Default: Ctrl+c
+Default:
+Ctrl+c
 .RE
 .PP
 \fBpaste\fR
@@ -507,7 +571,8 @@
 Edit \(-> Paste
 menu item
 .sp
-Default: Ctrl+v
+Default:
+Ctrl+v
 .RE
 .PP
 \fBselect_all\fR
@@ -515,7 +580,8 @@
 Edit \(-> Select All
 menu item
 .sp
-Default: Ctrl+a
+Default:
+Ctrl+a
 .RE
 .PP
 \fBclear_edits\fR
@@ -523,7 +589,8 @@
 Edit \(-> Clear Edits
 menu item
 .sp
-Default: Ctrl+r
+Default:
+Ctrl+r
 .RE
 .PP
 \fBdismiss_all_edits\fR
@@ -531,7 +598,8 @@
 Edit \(-> Dismiss All Edits
 menu item
 .sp
-Default: Ctrl+d
+Default:
+Ctrl+d
 .RE
 .PP
 \fBfind\fR
@@ -539,7 +607,8 @@
 Edit \(-> Find\&.\&.\&.
 menu item
 .sp
-Default: Ctrl+f
+Default:
+Ctrl+f
 .RE
 .PP
 \fBfind_next\fR
@@ -547,7 +616,8 @@
 Edit \(-> Find Next
 menu item
 .sp
-Default: Ctrl+g
+Default:
+Ctrl+g
 .RE
 .PP
 \fBfind_previous\fR
@@ -555,7 +625,8 @@
 Edit \(-> Find Previous
 menu item
 .sp
-Default: Shift+Ctrl+G
+Default:
+Shift+Ctrl+G
 .RE
 .PP
 \fBgo_to_line\fR
@@ -563,7 +634,8 @@
 Edit \(-> Go To Line\&.\&.\&.
 menu item
 .sp
-Default: Shift+Ctrl+L
+Default:
+Shift+Ctrl+L
 .RE
 .PP
 \fBpreferences\fR
@@ -595,7 +667,8 @@
 View \(-> Realign All
 menu item
 .sp
-Default: Ctrl+l
+Default:
+Ctrl+l
 .RE
 .PP
 \fBisolate\fR
@@ -603,7 +676,8 @@
 View \(-> Isolate
 menu item
 .sp
-Default: Ctrl+i
+Default:
+Ctrl+i
 .RE
 .PP
 \fBfirst_difference\fR
@@ -611,7 +685,8 @@
 View \(-> First Difference
 menu item
 .sp
-Default: Shift+Ctrl+Up
+Default:
+Shift+Ctrl+Up
 .RE
 .PP
 \fBprevious_difference\fR
@@ -619,7 +694,8 @@
 View \(-> Previous Difference
 menu item
 .sp
-Default: Ctrl+Up
+Default:
+Ctrl+Up
 .RE
 .PP
 \fBnext_difference\fR
@@ -627,7 +703,8 @@
 View \(-> Next Difference
 menu item
 .sp
-Default: Ctrl+Down
+Default:
+Ctrl+Down
 .RE
 .PP
 \fBlast_difference\fR
@@ -635,7 +712,17 @@
 View \(-> Last Difference
 menu item
 .sp
-Default: Shift+Ctrl+Down
+Default:
+Shift+Ctrl+Down
+.RE
+.PP
+\fBfirst_tab\fR
+.RS 4
+View \(-> First Tab
+menu item
+.sp
+Default:
+Shift+Ctrl+Page_Up
 .RE
 .PP
 \fBprevious_tab\fR
@@ -643,7 +730,8 @@
 View \(-> Previous Tab
 menu item
 .sp
-Default: Ctrl+Page_Up
+Default:
+Ctrl+Page_Up
 .RE
 .PP
 \fBnext_tab\fR
@@ -651,7 +739,17 @@
 View \(-> Next Tab
 menu item
 .sp
-Default: Ctrl+Page_Down
+Default:
+Ctrl+Page_Down
+.RE
+.PP
+\fBlast_tab\fR
+.RS 4
+View \(-> Last Tab
+menu item
+.sp
+Default:
+Shift+Ctrl+Page_Down
 .RE
 .PP
 \fBshift_pane_right\fR
@@ -659,7 +757,8 @@
 View \(-> Shift Pane Right
 menu item
 .sp
-Default: Shift+Ctrl+parenleft
+Default:
+Shift+Ctrl+parenleft
 .RE
 .PP
 \fBshift_pane_left\fR
@@ -667,7 +766,8 @@
 View \(-> Shift Pane Left
 menu item
 .sp
-Default: Shift+Ctrl+parenright
+Default:
+Shift+Ctrl+parenright
 .RE
 .PP
 \fBconvert_to_upper_case\fR
@@ -675,7 +775,8 @@
 Format \(-> Convert To Upper Case
 menu item
 .sp
-Default: Ctrl+u
+Default:
+Ctrl+u
 .RE
 .PP
 \fBconvert_to_lower_case\fR
@@ -683,7 +784,8 @@
 Format \(-> Convert To Lower Case
 menu item
 .sp
-Default: Shift+Ctrl+U
+Default:
+Shift+Ctrl+U
 .RE
 .PP
 \fBsort_lines_in_ascending_order\fR
@@ -691,7 +793,8 @@
 Format \(-> Sort Lines In Ascending Order
 menu item
 .sp
-Default: Ctrl+y
+Default:
+Ctrl+y
 .RE
 .PP
 \fBsort_lines_in_descending_order\fR
@@ -699,7 +802,8 @@
 Format \(-> Sort Lines In Descending Order
 menu item
 .sp
-Default: Shift+Ctrl+Y
+Default:
+Shift+Ctrl+Y
 .RE
 .PP
 \fBremove_trailing_white_space\fR
@@ -707,7 +811,8 @@
 Format \(-> Remove Trailing White Space
 menu item
 .sp
-Default: Ctrl+k
+Default:
+Ctrl+k
 .RE
 .PP
 \fBconvert_tabs_to_spaces\fR
@@ -715,7 +820,8 @@
 Format \(-> Convert Tabs To Spaces
 menu item
 .sp
-Default: Ctrl+b
+Default:
+Ctrl+b
 .RE
 .PP
 \fBconvert_leading_spaces_to_tabs\fR
@@ -723,7 +829,8 @@
 Format \(-> Convert Leading Spaces To Tabs
 menu item
 .sp
-Default: Shift+Ctrl+B
+Default:
+Shift+Ctrl+B
 .RE
 .PP
 \fBincrease_indenting\fR
@@ -731,7 +838,8 @@
 Format \(-> Increase Indenting
 menu item
 .sp
-Default: Shift+Ctrl+>
+Default:
+Shift+Ctrl+greater
 .RE
 .PP
 \fBdecrease_indenting\fR
@@ -739,7 +847,8 @@
 Format \(-> Decrease Indenting
 menu item
 .sp
-Default: Shift+Ctrl+<
+Default:
+Shift+Ctrl+less
 .RE
 .PP
 \fBconvert_to_dos\fR
@@ -747,7 +856,8 @@
 Format \(-> Convert To DOS Format
 menu item
 .sp
-Default: Shift+Ctrl+E
+Default:
+Shift+Ctrl+E
 .RE
 .PP
 \fBconvert_to_mac\fR
@@ -755,7 +865,8 @@
 Format \(-> Convert To Mac Format
 menu item
 .sp
-Default: Shift+Ctrl+C
+Default:
+Shift+Ctrl+C
 .RE
 .PP
 \fBconvert_to_unix\fR
@@ -763,7 +874,8 @@
 Format \(-> Convert To Unix Format
 menu item
 .sp
-Default: Ctrl+e
+Default:
+Ctrl+e
 .RE
 .PP
 \fBcopy_selection_right\fR
@@ -771,7 +883,8 @@
 Merge \(-> Copy Selection Right
 menu item
 .sp
-Default: Shift+Ctrl+Right
+Default:
+Shift+Ctrl+Right
 .RE
 .PP
 \fBcopy_selection_left\fR
@@ -779,7 +892,8 @@
 Merge \(-> Copy Selection Left
 menu item
 .sp
-Default: Shift+Ctrl+Left
+Default:
+Shift+Ctrl+Left
 .RE
 .PP
 \fBcopy_left_into_selection\fR
@@ -787,7 +901,8 @@
 Merge \(-> Copy Left Into Selection
 menu item
 .sp
-Default: Ctrl+Right
+Default:
+Ctrl+Right
 .RE
 .PP
 \fBcopy_right_into_selection\fR
@@ -795,7 +910,8 @@
 Merge \(-> Copy Right Into Selection
 menu item
 .sp
-Default: Ctrl+Left
+Default:
+Ctrl+Left
 .RE
 .PP
 \fBmerge_from_left_then_right\fR
@@ -803,7 +919,8 @@
 Merge \(-> Merge From Left Then Right
 menu item
 .sp
-Default: Ctrl+m
+Default:
+Ctrl+m
 .RE
 .PP
 \fBmerge_from_right_then_left\fR
@@ -811,7 +928,8 @@
 Merge \(-> Merge From Right Then Left
 menu item
 .sp
-Default: Shift+Ctrl+M
+Default:
+Shift+Ctrl+M
 .RE
 .PP
 \fBhelp_contents\fR
@@ -819,7 +937,8 @@
 Help \(-> Help Contents
 menu item
 .sp
-Default: F1
+Default:
+F1
 .RE
 .PP
 \fBabout\fR
@@ -850,203 +969,249 @@
 .RS 4
 enter alignment editing mode
 .sp
-Default: space
+Default:
+space
 .RE
 .PP
 \fBenter_character_mode\fR
 .RS 4
 enter character editing mode
 .sp
-Default: Return, KP_Enter
+Defaults:
+Return,
+KP_Enter
 .RE
 .PP
 \fBfirst_line\fR
 .RS 4
 move cursor to the first line
 .sp
-Defaults: Home, g
+Defaults:
+Home,
+g
 .RE
 .PP
 \fBextend_first_line\fR
 .RS 4
 move cursor to the first line, extending the selection
 .sp
-Default: Shift+Home
+Default:
+Shift+Home
 .RE
 .PP
 \fBlast_line\fR
 .RS 4
 move cursor to the last line
 .sp
-Defaults: End, Shift+G
+Defaults:
+End,
+Shift+G
 .RE
 .PP
 \fBextend_last_line\fR
 .RS 4
 move cursor to the last line, extending the selection
 .sp
-Default: Shift+End
+Default:
+Shift+End
 .RE
 .PP
 \fBup\fR
 .RS 4
 move cursor up one line
 .sp
-Defaults: Up, k
+Defaults:
+Up,
+k
 .RE
 .PP
 \fBextend_up\fR
 .RS 4
 move cursor up one line, extending the selection
 .sp
-Defaults: Shift+Up, Shift+K
+Defaults:
+Shift+Up,
+Shift+K
 .RE
 .PP
 \fBdown\fR
 .RS 4
 move cursor down one line
 .sp
-Defaults: Down, j
+Defaults:
+Down,
+j
 .RE
 .PP
 \fBextend_down\fR
 .RS 4
 move cursor down one line, extending the selection
 .sp
-Defaults: Shift+Down, Shift+J
+Defaults:
+Shift+Down,
+Shift+J
 .RE
 .PP
 \fBleft\fR
 .RS 4
 move cursor left one file
 .sp
-Defaults: Left, h
+Defaults:
+Left,
+h
 .RE
 .PP
 \fBextend_left\fR
 .RS 4
 move cursor left one file, extending the selection
 .sp
-Default: Shift+Left
+Default:
+Shift+Left
 .RE
 .PP
 \fBright\fR
 .RS 4
 move cursor right one file
 .sp
-Defaults: Right, l
+Defaults:
+Right,
+l
 .RE
 .PP
 \fBextend_right\fR
 .RS 4
 move cursor right one file, extending the selection
 .sp
-Default: Shift+Right
+Default:
+Shift+Right
 .RE
 .PP
 \fBpage_up\fR
 .RS 4
 move cursor up one page
 .sp
-Defaults: Page_Up, Ctrl+u
+Defaults:
+Page_Up,
+Ctrl+u
 .RE
 .PP
 \fBextend_page_up\fR
 .RS 4
 move cursor up one page, extending the selection
 .sp
-Defaults: Shift+Page_Up, Shift+Ctrl+u
+Defaults:
+Shift+Page_Up,
+Shift+Ctrl+u
 .RE
 .PP
 \fBpage_down\fR
 .RS 4
 move cursor down one page
 .sp
-Defaults: Page_Down, Ctrl+d
+Defaults:
+Page_Down,
+Ctrl+d
 .RE
 .PP
 \fBextend_page_down\fR
 .RS 4
 move cursor down one page, extending the selection
 .sp
-Defaults: Shift+Page_Down, Shift+Ctrl+d
+Defaults:
+Shift+Page_Down,
+Shift+Ctrl+d
 .RE
 .PP
 \fBdelete_text\fR
 .RS 4
 delete the selected text
 .sp
-Defaults: BackSpace, Delete, x
+Defaults:
+BackSpace,
+Delete,
+x
 .RE
 .PP
 \fBfirst_difference\fR
 .RS 4
 select the first difference
 .sp
-Defaults: Ctrl+Home, Shift+P
+Defaults:
+Ctrl+Home,
+Shift+P
 .RE
 .PP
 \fBprevious_difference\fR
 .RS 4
 select the previous difference
 .sp
-Default: p
+Default:
+p
 .RE
 .PP
 \fBnext_difference\fR
 .RS 4
 select the next difference
 .sp
-Default: n
+Default:
+n
 .RE
 .PP
 \fBlast_difference\fR
 .RS 4
 select the last difference
 .sp
-Defaults: Ctrl+End, Shift+N
+Defaults:
+Ctrl+End,
+Shift+N
 .RE
 .PP
 \fBclear_edits\fR
 .RS 4
 clear all edits from the selected lines
 .sp
-Default: r
+Default:
+r
 .RE
 .PP
 \fBcopy_left_into_selection\fR
 .RS 4
 copy lines from the file on the left into the selection
 .sp
-Default: Shift+L
+Default:
+Shift+L
 .RE
 .PP
 \fBcopy_right_into_selection\fR
 .RS 4
 copy lines from the file on the right into the selection
 .sp
-Default: Shift+H
+Default:
+Shift+H
 .RE
 .PP
 \fBmerge_from_left_then_right\fR
 .RS 4
 merge lines from file on the left then file on the right
 .sp
-Default: m
+Default:
+m
 .RE
 .PP
 \fBmerge_from_right_then_left\fR
 .RS 4
 merge lines from file on the right then file on the left
 .sp
-Default: Shift+M
+Default:
+Shift+M
 .RE
 .PP
 \fBisolate\fR
 .RS 4
 isolate the selected lines
 .sp
-Default: i
+Default:
+i
 .RE
 .RE
 .sp
@@ -1069,77 +1234,95 @@
 .RS 4
 enter line editing mode
 .sp
-Default: Escape
+Default:
+Escape
 .RE
 .PP
 \fBenter_character_mode\fR
 .RS 4
 enter character editing mode
 .sp
-Default: Return, KP_Enter
+Defaults:
+Return,
+KP_Enter
 .RE
 .PP
 \fBfirst_line\fR
 .RS 4
 move cursor to the first line
 .sp
-Default: g
+Default:
+g
 .RE
 .PP
 \fBlast_line\fR
 .RS 4
 move cursor to the last line
 .sp
-Default: Shift+G
+Default:
+Shift+G
 .RE
 .PP
 \fBup\fR
 .RS 4
 move cursor up one line
 .sp
-Defaults: Up, k
+Defaults:
+Up,
+k
 .RE
 .PP
 \fBdown\fR
 .RS 4
 move cursor down one line
 .sp
-Defaults: Down, j
+Defaults:
+Down,
+j
 .RE
 .PP
 \fBleft\fR
 .RS 4
 move cursor left one file
 .sp
-Defaults: Left, h
+Defaults:
+Left,
+h
 .RE
 .PP
 \fBright\fR
 .RS 4
 move cursor right one file
 .sp
-Defaults: Right, l
+Defaults:
+Right,
+l
 .RE
 .PP
 \fBpage_up\fR
 .RS 4
 move cursor up one page
 .sp
-Defaults: Page_Up, Ctrl+u
+Defaults:
+Page_Up,
+Ctrl+u
 .RE
 .PP
 \fBpage_down\fR
 .RS 4
 move cursor down one page
 .sp
-Defaults: Page_Down, Ctrl+d
+Defaults:
+Page_Down,
+Ctrl+d
 .RE
 .PP
 \fBalign\fR
 .RS 4
 align the selected line to the cursor position
 .sp
-Default: space
+Default:
+space
 .RE
 .RE
 .sp
@@ -1162,7 +1345,8 @@
 .RS 4
 enter line editing mode
 .sp
-Default: Escape
+Default:
+Escape
 .RE
 .RE
 .SS "Strings"
@@ -1183,11 +1367,15 @@
 \fBUsed String Resources\fR
 .RS 4
 .PP
-The following string resources are used by Diffuse:
+The following string resources are used by
+Diffuse:
 .PP
 \fBdifference_colours\fR
 .RS 4
 a list of colour resources used to indicate differences
+.sp
+Default:
+difference_1 difference_2 difference_3
 .RE
 .RE
 .SS "Colours"
@@ -1206,81 +1394,135 @@
 \fBUsed Colour Resources\fR
 .RS 4
 .PP
-The following colour resources are used by Diffuse:
+The following colour resources are used by
+Diffuse:
 .PP
 \fBalignment\fR
 .RS 4
 colour used to indicate a line picked for manual alignment
+.sp
+Default:
+1 1 0
 .RE
 .PP
 \fBcharacter_selection\fR
 .RS 4
 colour used to indicate selected characters
+.sp
+Default:
+0\&.7 0\&.7 1
 .RE
 .PP
 \fBcursor\fR
 .RS 4
 colour used for the cursor
+.sp
+Default:
+0 0 0
 .RE
 .PP
 \fBdifference_1\fR
 .RS 4
 colour used to identify differences between the first pair of files
+.sp
+Default:
+1 0\&.625 0\&.625
 .RE
 .PP
 \fBdifference_2\fR
 .RS 4
 colour used to identify differences between the second pair of files
+.sp
+Default:
+0\&.85 0\&.625 0\&.775
 .RE
 .PP
 \fBdifference_3\fR
 .RS 4
 colour used to identify differences between the third pair of files
+.sp
+Default:
+0\&.85 0\&.775 0\&.625
 .RE
 .PP
 \fBedited\fR
 .RS 4
 colour used to indicate edited lines
+.sp
+Default:
+0\&.5 1 0\&.5
 .RE
 .PP
 \fBhatch\fR
 .RS 4
 colour used for indicating alignment gaps
+.sp
+Default:
+0\&.8 0\&.8 0\&.8
 .RE
 .PP
 \fBline_number\fR
 .RS 4
 colour used for line numbers
+.sp
+Default:
+0 0 0
 .RE
 .PP
 \fBline_number_background\fR
 .RS 4
 background colour for the line number area
+.sp
+Default:
+0\&.75 0\&.75 0\&.75
 .RE
 .PP
 \fBline_selection\fR
 .RS 4
 colour used to indicate selected lines
+.sp
+Default:
+0\&.7 0\&.7 1
 .RE
 .PP
 \fBmap_background\fR
 .RS 4
 background colour for the map area
+.sp
+Default:
+0\&.6 0\&.6 0\&.6
+.RE
+.PP
+\fBmargin\fR
+.RS 4
+colour used to indicate the right margin
+.sp
+Default:
+0\&.8 0\&.8 0\&.8
 .RE
 .PP
 \fBpreedit\fR
 .RS 4
 pre\-edit text colour
+.sp
+Default:
+0 0 0
 .RE
 .PP
 \fBtext\fR
 .RS 4
 regular text colour
+.sp
+Default:
+0 0 0
 .RE
 .PP
 \fBtext_background\fR
 .RS 4
 background colour for the text area
+.sp
+Default:
+1 1 1
 .RE
 .RE
 .SS "Floating Point Values"
@@ -1301,48 +1543,55 @@
 \fBUsed Floating Point Resources\fR
 .RS 4
 .PP
-The following floating point resources are used by Diffuse:
+The following floating point resources are used by
+Diffuse:
 .PP
 \fBalignment_opacity\fR
 .RS 4
 opacity used when compositing the manual alignment colour
 .sp
-Defaults: 1
+Defaults:
+1
 .RE
 .PP
 \fBcharacter_difference_opacity\fR
 .RS 4
 opacity used when compositing character difference colours
 .sp
-Defaults: 0\&.4
+Defaults:
+0\&.4
 .RE
 .PP
 \fBcharacter_selection_opacity\fR
 .RS 4
 opacity used when compositing the character selection colour
 .sp
-Defaults: 0\&.4
+Defaults:
+0\&.4
 .RE
 .PP
 \fBedited_opacity\fR
 .RS 4
 opacity used when compositing the edited line colour
 .sp
-Defaults: 0\&.4
+Defaults:
+0\&.4
 .RE
 .PP
 \fBline_difference_alpha\fR
 .RS 4
 alpha value used when compositing line difference colours
 .sp
-Defaults: 0\&.3
+Defaults:
+0\&.3
 .RE
 .PP
 \fBline_selection_opacity\fR
 .RS 4
 opacity used when compositing the line selection colour
 .sp
-Defaults: 0\&.4
+Defaults:
+0\&.4
 .RE
 .RE
 .SS "Syntax Highlighting"
@@ -1398,7 +1647,8 @@
 .RE
 .SH "FILES"
 .PP
-The following files are used by Diffuse:
+The following files are used by
+Diffuse:
 .PP
 /etc/diffuserc
 .RS 4
@@ -1431,12 +1681,16 @@
 .RE
 .SH "AUTHOR"
 .PP
-Diffuse was written by Derrick Moser
+
+Diffuse
+was written by Derrick Moser
 derrick_moser@yahoo\&.com\&.
 .PP
-\(co 2006\-2010 Derrick Moser\&. All Rights Reserved\&.
+\(co 2006\-2011 Derrick Moser\&. All Rights Reserved\&.
 .SH "COPYING"
 .PP
-Diffuse is free software; you may redistribute it and/or modify it under the terms of the
+
+Diffuse
+is free software; you may redistribute it and/or modify it under the terms of the
 GNU General Public License
 as published by the Free Software Foundation; either version 2 of the licence, or (at your option) any later version\&.
diff -Nru diffuse-0.4.4/src/usr/share/man/ru/man1/diffuse.1 diffuse-0.4.5/src/usr/share/man/ru/man1/diffuse.1
--- diffuse-0.4.4/src/usr/share/man/ru/man1/diffuse.1	2010-10-21 01:58:02.000000000 +0000
+++ diffuse-0.4.5/src/usr/share/man/ru/man1/diffuse.1	2011-07-13 09:18:33.000000000 +0000
@@ -1,5 +1,5 @@
 '\" t
-.TH "DIFFUSE" "1" "2010\-10\-21" "diffuse 0\&.4\&.4" "Руководство по Diffuse"
+.TH "DIFFUSE" "1" "2011\-07\-13" "diffuse 0\&.4\&.5" "Руководство по Diffuse"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .nh
@@ -13,11 +13,17 @@
 \fBdiffuse\fR [\fB\-\-no\-rcfile\fR | \fB\-\-rcfile\ \fR\fB\fIfile\fR\fR] [[\fIoption\fR...] | [\fIfile\fR...]...]
 .SH "ОПИСАНИЕ"
 .PP
-Программа Diffuse является графическим инструментом для слияния и сравнения текстовых файлов\&. Она может сравнить произвольное число файлов в представлении бок о бок, предоставляет пользователям возможность вручную корректировать соответствие строк и редактировать файлы напрямую\&. Diffuse может также извлекать ревизии файлов из Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion и SVK репозиториев для их сравнения и слияния\&.
+Программа
+Diffuse
+является графическим инструментом для слияния и сравнения текстовых файлов\&. Она может сравнить произвольное число файлов в представлении бок о бок, предоставляет пользователям возможность вручную корректировать соответствие строк и редактировать файлы напрямую\&.
+Diffuse
+может также извлекать ревизии файлов из Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion и SVK репозиториев для их сравнения и слияния\&.
 .SH "ОПЦИИ"
 .SS "Параметры Справки"
 .PP
-Если опция справки определена, только параметр должен быть указан в командной строке\&. Программа Diffuse немедленно закроется после отображения справочной информации\&.
+Если опция справки определена, только параметр должен быть указан в командной строке\&. Программа
+Diffuse
+немедленно закроется после отображения справочной информации\&.
 .PP
 \fB\-h\fR, \fB\-?\fR, \fB\-\-help\fR
 .RS 4
@@ -65,6 +71,13 @@
 (кодек) для чтения и записи файлов\&.
 .RE
 .PP
+\fB\-L\fR, \fB\-\-label\fR \fIlabel\fR
+.RS 4
+Отображать
+\fIlabel\fR
+ярлык вместо имени файла\&.
+.RE
+.PP
 \fB\-m\fR, \fB\-\-modified\fR
 .RS 4
 Открыть все модифицированные файлы из остающихся путей, определенных в параметрах командной строки, на отдельных вкладках сравнения файлов\&.
@@ -87,6 +100,13 @@
 Запустить новую вкладку для любых остающихся файлов, названных в параметрах командной строки\&.
 .RE
 .PP
+\fB\-\-line \fR\fB\fIline\fR\fR
+.RS 4
+Начать с выбранной
+\fIline\fR
+строки\&.
+.RE
+.PP
 \fB\-\-null\-file\fR
 .RS 4
 Создать пустое субокно сравнения файла\&.
@@ -124,9 +144,12 @@
 Используйте пункты меню
 Файл \(-> Новое 2\-Оконное Слияние Файлов
 и
-Файл \(-> Новое 3\-Оконное Слияние Файлов, чтобы создать дополнительные вкладки для сравнения текстовых файлов\&. Имена файлов и ревизий могут быть указаны либо в параметрах командной строки, используемых для вызова Diffuse, либо в полях диалога Открыть Файл\&.
+Файл \(-> Новое 3\-Оконное Слияние Файлов, чтобы создать дополнительные вкладки для сравнения текстовых файлов\&. Имена файлов и ревизий могут быть указаны либо в параметрах командной строки, используемых для вызова
+Diffuse, либо в полях диалога Открыть Файл\&.
 .PP
-Программа Diffuse отображает файлы бок о бок, вставляя разрывы для выравнивания подобных строк текста\&. Различия выделяются отличным цветом фона\&.
+Программа
+Diffuse
+отображает файлы бок о бок, вставляя разрывы для выравнивания подобных строк текста\&. Различия выделяются отличным цветом фона\&.
 .SS "Сводка Сравнения"
 .PP
 Сводка сравненных файлов располагается в дальнем правом поле\&. Сводка иллюстрирует, где были вставлены разрывы для выравнивания соответствующих строк текста и подсветку различий, используя цвет\&. Ручные редактирования также выделяются зеленым цветом\&. Синий курсор идентифицирует в настоящий момент просматриваемую область\&. Просматриваемая область может быть изменена щелками где угодно на сводке\&.
@@ -136,14 +159,18 @@
 .SS "Соответствие Строк"
 .PP
 Указатель мыши или клавиатура могут использоваться для выравнивания (подгонки) строк текста вручную в смежных файлах\&. Чтобы выровнять (подогнать) строки текста указателем мыши, выберите строку текста левой кнопкой мыши, щелкните правой кнопкой мыши по строке текста в смежном файле и выберите пункт всплывающего меню
-Выровнять с Выборкой\&. Чтобы выровнять строки текста с клавиатуры, переместите выбор клавишами управления курсором, нажмите клавишу Space (Пробел), чтобы выбрать текущую строку текста, затем переместите выбор клавишами управления курсором на строку текста в смежном файле и нажмите клавишу Space (Пробел), чтобы выбрать целевую строку текста\&. Нажатие клавиши Еscape отменит эту операцию\&.
+Выровнять с Выборкой\&. Чтобы выровнять строки текста с клавиатуры, переместите выбор клавишами управления курсором, нажмите клавишу Space (Пробел), чтобы выбрать текущую строку текста, затем переместите выбор клавишами управления курсором на строку текста в смежном файле и нажмите клавишу Space (Пробел), чтобы выбрать целевую строку текста\&. Нажатие клавиши
+Escape
+отменит эту операцию\&.
 .PP
 Используйте пункт меню
 Изолировать
 для предотвращения того, чтобы выбранные строки сопоставлялись любым строкам из смежных файлов\&.
 .SS "Редактирование"
 .PP
-Нажатие клавиши Enter или двойной щелчок на области текста для ввода режима редактирования текста\&. Курсор изменится, чтобы указать на включение режима редактирования текста, а строка состояния внизу окна отобразит номер столбца/колонки, где находится курсор (т\&.е\&. по сути, отображается номер символа, находящегося слева от курсора, в текущей строке с учетом пробелов)\&.
+Нажатие клавиши
+Enter
+или двойной щелчок на области текста для ввода режима редактирования текста\&. Курсор изменится, чтобы указать на включение режима редактирования текста, а строка состояния внизу окна отобразит номер столбца/колонки, где находится курсор (т\&.е\&. по сути, отображается номер символа, находящегося слева от курсора, в текущей строке с учетом пробелов)\&.
 .PP
 В режиме редактирования текста, текст может быть выбран указателем мыши, щелчком и перетаскиванием курсора\&. Текущий выбор может быть расширен удержанием клавиши Shift и перемещением указателя мыши (т\&.е\&. щелчок в начале требуемого \- нажатие и удержание Shift \- щелчок в конце требуемого) или нажатием любой клавиши\-стрелки, Нome, End или страница вверх/страница вниз\&. Отдельные слова могут быть выбраны двойным щелчком указателя мыши по ним\&. Целые строки могут быть выбраны тройным щелчком указателя мыши по ним\&.
 .PP
@@ -152,10 +179,14 @@
 и
 Вернуть, чтобы отменить и восстановить ранее выполненные операции\&.
 .PP
-Нажмите клавишу Еscape или щелкните левой кнопкой мыши на области текста в другом файле, чтобы выйти из режима редактирования\&.
+Нажмите клавишу
+Еscape
+или щелкните левой кнопкой мыши на области текста в другом файле, чтобы выйти из режима редактирования\&.
 .SS "Слияние"
 .PP
-Используйте различные кнопки или пункты меню для перемещения между блоками различий в пределах файла\&. На навигации, Diffuse переместит указатель мыши в следующий сплошной набор строк с различиями или редактированиями\&.
+Используйте различные кнопки или пункты меню для перемещения между блоками различий в пределах файла\&. На навигации,
+Diffuse
+переместит указатель мыши в следующий сплошной набор строк с различиями или редактированиями\&.
 .PP
 Используйте кнопки слияния или пункты меню, чтобы скопировать блоки текста в выбранный диапазон строк\&. Пункты меню
 Отменить
@@ -166,7 +197,15 @@
 независимо от порядка выполнения редактирований\&.
 .SH "КОНТРОЛЬ ВЕРСИЙ"
 .PP
-Diffuse может извлекать ревизии файла из нескольких систем управления версиями через их интерфейс командной строки\&. Microsoft Windows сборка Diffuse способна использовать как Cygwin, так и собственные версии поддерживаемых систем управления версиями\&. При использовании Diffuse с Cygwin, убедитесь, что предпочтения Cygwin программы Diffuse правильно описывают вашу систему\&. Если пункт предпочтений
+
+Diffuse
+может извлекать ревизии файла из нескольких систем управления версиями через их интерфейс командной строки\&. Microsoft Windows сборка
+Diffuse
+способна использовать как Cygwin, так и собственные версии поддерживаемых систем управления версиями\&. При использовании
+Diffuse
+с Cygwin, убедитесь, что предпочтения Cygwin программы
+Diffuse
+правильно описывают вашу систему\&. Если пункт предпочтений
 Обновлять пути для Cygwin
 существует для данной системы управления версиями, он должен быть задействован для использования версии Cygwin\&.
 .PP
@@ -177,7 +216,9 @@
 .PP
 Опция
 \fB\-m\fR
-заставит Diffuse открывать вкладки сравнения для каждого файла, на который указывает система управления версиями, как на имеющий незафиксированные (несвязанные) модификации\&. Это удобно для просмотра всех изменений перед фиксацией транзакции или разрешением конфликта слияния\&. Если никакие пути не будут определены, то текущий рабочий каталог будет использоваться\&. Например, можно просмотреть все свои незафиксированные модификации с этой командной строкой:
+заставит
+Diffuse
+открывать вкладки сравнения для каждого файла, на который указывает система управления версиями, как на имеющий незафиксированные (несвязанные) модификации\&. Это удобно для просмотра всех изменений перед фиксацией транзакции или разрешением конфликта слияния\&. Если никакие пути не будут определены, то текущий рабочий каталог будет использоваться\&. Например, можно просмотреть все свои незафиксированные модификации с этой командной строкой:
 .PP
 
 .sp
@@ -285,7 +326,9 @@
 .RE
 .\}
 .PP
-Программа Diffuse не ограничивает количество субокон, используемых для сравнения файлов\&. Вводы к Git octopus слиянию могли бы быть просмотрены с командной строкой, как ниже:
+Программа
+Diffuse
+не ограничивает количество субокон, используемых для сравнения файлов\&. Вводы к Git octopus слиянию могли бы быть просмотрены с командной строкой, как ниже:
 .PP
 
 .sp
@@ -301,9 +344,13 @@
 .sp
 .SH "РЕСУРСЫ"
 .PP
-Ресурсы могут использоваться для индивидуализации некоторых аспектов внешнего вида программы Diffuse и ее поведения, например, изменение используемых в интерфейсе пользователя цветов, настройки клавиатурных комбинаций вызова, добавление или замена правил подсветки синтаксиса или изменение отображения от расширений файла до правил подсветки синтаксиса\&.
-.PP
-Когда программа Diffuse запускается, она считает команды из файла общесистемной инициализации
+Ресурсы могут использоваться для индивидуализации некоторых аспектов внешнего вида программы
+Diffuse
+и ее поведения, например, изменение используемых в интерфейсе пользователя цветов, настройки клавиатурных комбинаций вызова, добавление или замена правил подсветки синтаксиса или изменение отображения от расширений файла до правил подсветки синтаксиса\&.
+.PP
+Когда программа
+Diffuse
+запускается, она считает команды из файла общесистемной инициализации
 /etc/diffuserc
 (%INSTALL_DIR%\ediffuserc
 на Microsoft Windows), а затем считывает персональный файл инициализации
@@ -368,168 +415,192 @@
 .RS 4
 Файл \(-> Открыть Файл\&.\&.\&.
 .sp
-По умолчанию: Ctrl+o
+По умолчанию:
+Ctrl+o
 .RE
 .PP
 \fBopen_file_in_new_tab\fR
 .RS 4
 Файл \(-> Открыть Файл в Новой Вкладке\&.\&.\&.
 .sp
-По умолчанию: Ctrl+t
+По умолчанию:
+Ctrl+t
 .RE
 .PP
 \fBopen_modified_files\fR
 .RS 4
 Файл \(-> Открыть Измененные Файлы\&.\&.\&.
 .sp
-По умолчанию: Shift+Ctrl+O
+По умолчанию:
+Shift+Ctrl+O
 .RE
 .PP
 \fBreload_file\fR
 .RS 4
 Файл \(-> Перезагрузить Файл
 .sp
-По умолчанию: Shift+Ctrl+R
+По умолчанию:
+Shift+Ctrl+R
 .RE
 .PP
 \fBsave_file\fR
 .RS 4
 Файл \(-> Сохранить Файл
 .sp
-По умолчанию: Ctrl+s
+По умолчанию:
+Ctrl+s
 .RE
 .PP
 \fBsave_file_as\fR
 .RS 4
 Файл \(-> Сохранить Файл Как\&.\&.\&.
 .sp
-По умолчанию: Shift+Ctrl+A
+По умолчанию:
+Shift+Ctrl+A
 .RE
 .PP
 \fBsave_all\fR
 .RS 4
 Файл \(-> Сохранить Все
 .sp
-По умолчанию: Shift+Ctrl+S
+По умолчанию:
+Shift+Ctrl+S
 .RE
 .PP
 \fBnew_2_way_file_merge\fR
 .RS 4
 Файл \(-> Новое 2\-Оконное Слияние Файлов
 .sp
-По умолчанию: Ctrl+2
+По умолчанию:
+Ctrl+2
 .RE
 .PP
 \fBnew_3_way_file_merge\fR
 .RS 4
 Файл \(-> Новое 3\-Оконное Слияние Файлов
 .sp
-По умолчанию: Ctrl+3
+По умолчанию:
+Ctrl+3
 .RE
 .PP
 \fBclose_tab\fR
 .RS 4
 Файл \(-> Закрыть Вкладку
 .sp
-По умолчанию: Ctrl+w
+По умолчанию:
+Ctrl+w
 .RE
 .PP
 \fBundo_close_tab\fR
 .RS 4
 Файл \(-> Отменить Закрытие Вкладки
 .sp
-По умолчанию: Shift+Ctrl+w
+По умолчанию:
+Shift+Ctrl+w
 .RE
 .PP
 \fBquit\fR
 .RS 4
 Файл \(-> Bыход
 .sp
-По умолчанию: Ctrl+q
+По умолчанию:
+Ctrl+q
 .RE
 .PP
 \fBundo\fR
 .RS 4
 Правка \(-> Отменить
 .sp
-По умолчанию: Ctrl+z
+По умолчанию:
+Ctrl+z
 .RE
 .PP
 \fBredo\fR
 .RS 4
 Правка \(-> Вернуть
 .sp
-По умолчанию: Shift+Ctrl+Z
+По умолчанию:
+Shift+Ctrl+Z
 .RE
 .PP
 \fBcut\fR
 .RS 4
 Правка \(-> Вырезать
 .sp
-По умолчанию: Ctrl+x
+По умолчанию:
+Ctrl+x
 .RE
 .PP
 \fBcopy\fR
 .RS 4
 Правка \(-> Копировать
 .sp
-По умолчанию: Ctrl+c
+По умолчанию:
+Ctrl+c
 .RE
 .PP
 \fBpaste\fR
 .RS 4
 Правка \(-> Вставить
 .sp
-По умолчанию: Ctrl+v
+По умолчанию:
+Ctrl+v
 .RE
 .PP
 \fBselect_all\fR
 .RS 4
 Правка \(-> Выбрать Все
 .sp
-По умолчанию: Ctrl+a
+По умолчанию:
+Ctrl+a
 .RE
 .PP
 \fBclear_edits\fR
 .RS 4
 Правка \(-> Очистить Правки
 .sp
-По умолчанию: Ctrl+r
+По умолчанию:
+Ctrl+r
 .RE
 .PP
 \fBdismiss_all_edits\fR
 .RS 4
 Правка \(-> Сбросить Все Правки
 .sp
-По умолчанию: Ctrl+d
+По умолчанию:
+Ctrl+d
 .RE
 .PP
 \fBfind\fR
 .RS 4
 Правка \(-> Найти\&.\&.\&.
 .sp
-По умолчанию: Ctrl+f
+По умолчанию:
+Ctrl+f
 .RE
 .PP
 \fBfind_next\fR
 .RS 4
 Правка \(-> Найти Следующее
 .sp
-По умолчанию: Ctrl+g
+По умолчанию:
+Ctrl+g
 .RE
 .PP
 \fBfind_previous\fR
 .RS 4
 Правка \(-> Найти Предыдущее
 .sp
-По умолчанию: Shift+Ctrl+G
+По умолчанию:
+Shift+Ctrl+G
 .RE
 .PP
 \fBgo_to_line\fR
 .RS 4
 Правка \(-> Перейти на Строку\&.\&.\&.
 .sp
-По умолчанию: Shift+Ctrl+L
+По умолчанию:
+Shift+Ctrl+L
 .RE
 .PP
 \fBpreferences\fR
@@ -557,203 +628,248 @@
 .RS 4
 Вид \(-> Перестроить Все
 .sp
-По умолчанию: Ctrl+l
+По умолчанию:
+Ctrl+l
 .RE
 .PP
 \fBisolate\fR
 .RS 4
 Вид \(-> Изолировать
 .sp
-По умолчанию: Ctrl+i
+По умолчанию:
+Ctrl+i
 .RE
 .PP
 \fBfirst_difference\fR
 .RS 4
 Вид \(-> Первое Различие
 .sp
-По умолчанию: Shift+Ctrl+Up
+По умолчанию:
+Shift+Ctrl+Up
 .RE
 .PP
 \fBprevious_difference\fR
 .RS 4
 Вид \(-> Предыдущее Различие
 .sp
-По умолчанию: Ctrl+Up
+По умолчанию:
+Ctrl+Up
 .RE
 .PP
 \fBnext_difference\fR
 .RS 4
 Вид \(-> Следующее Различие
 .sp
-По умолчанию: Ctrl+Down
+По умолчанию:
+Ctrl+Down
 .RE
 .PP
 \fBlast_difference\fR
 .RS 4
 Вид \(-> Последнее Различие
 .sp
-По умолчанию: Shift+Ctrl+Down
+По умолчанию:
+Shift+Ctrl+Down
+.RE
+.PP
+\fBfirst_tab\fR
+.RS 4
+Вид \(-> Первая Вкладка
+.sp
+По умолчанию:
+Shift+Ctrl+Page_Up
 .RE
 .PP
 \fBprevious_tab\fR
 .RS 4
 Вид \(-> Предыдущая Вкладка
 .sp
-По умолчанию: Ctrl+Page_Up
+По умолчанию:
+Ctrl+Page_Up
 .RE
 .PP
 \fBnext_tab\fR
 .RS 4
 Вид \(-> Следующая Вкладка
 .sp
-По умолчанию: Ctrl+Page_Down
+По умолчанию:
+Ctrl+Page_Down
+.RE
+.PP
+\fBlast_tab\fR
+.RS 4
+Вид \(-> Последняя Вкладка
+.sp
+По умолчанию:
+Shift+Ctrl+Page_Down
 .RE
 .PP
 \fBshift_pane_right\fR
 .RS 4
 Вид \(-> Переместить Субокно Вправо
 .sp
-По умолчанию: Shift+Ctrl+parenleft
+По умолчанию:
+Shift+Ctrl+parenleft
 .RE
 .PP
 \fBshift_pane_left\fR
 .RS 4
 Вид \(-> сместить выбранное субокно влево
 .sp
-По умолчанию: Shift+Ctrl+parenright
+По умолчанию:
+Shift+Ctrl+parenright
 .RE
 .PP
 \fBconvert_to_upper_case\fR
 .RS 4
 Формат \(-> Преобразовать в Верхний Регистр
 .sp
-По умолчанию: Ctrl+u
+По умолчанию:
+Ctrl+u
 .RE
 .PP
 \fBconvert_to_lower_case\fR
 .RS 4
 Формат \(-> Преобразовать в Нижний Регистр
 .sp
-По умолчанию: Shift+Ctrl+U
+По умолчанию:
+Shift+Ctrl+U
 .RE
 .PP
 \fBsort_lines_in_ascending_order\fR
 .RS 4
 Формат \(-> Сортировать Строки в Порядке Возрастания
 .sp
-По умолчанию: Ctrl+y
+По умолчанию:
+Ctrl+y
 .RE
 .PP
 \fBsort_lines_in_descending_order\fR
 .RS 4
 Формат \(-> Сортировать Строки в Порядке Убывания
 .sp
-По умолчанию: Shift+Ctrl+Y
+По умолчанию:
+Shift+Ctrl+Y
 .RE
 .PP
 \fBremove_trailing_white_space\fR
 .RS 4
 Формат \(-> Удалить Замыкающие Пробелы
 .sp
-По умолчанию: Ctrl+k
+По умолчанию:
+Ctrl+k
 .RE
 .PP
 \fBconvert_tabs_to_spaces\fR
 .RS 4
 Формат \(-> Преобразовать Табуляторы в Пробелы
 .sp
-По умолчанию: Ctrl+b
+По умолчанию:
+Ctrl+b
 .RE
 .PP
 \fBconvert_leading_spaces_to_tabs\fR
 .RS 4
 Формат \(-> Преобразовать Вводные Пробелы в Табуляторы
 .sp
-По умолчанию: Shift+Ctrl+B
+По умолчанию:
+Shift+Ctrl+B
 .RE
 .PP
 \fBincrease_indenting\fR
 .RS 4
 Формат \(-> Увеличить Отступ
 .sp
-По умолчанию: Shift+Ctrl+>
+По умолчанию:
+Shift+Ctrl+greater
 .RE
 .PP
 \fBdecrease_indenting\fR
 .RS 4
 Формат \(-> Уменьшить Отступ
 .sp
-По умолчанию: Shift+Ctrl+<
+По умолчанию:
+Shift+Ctrl+less
 .RE
 .PP
 \fBconvert_to_dos\fR
 .RS 4
 Формат \(-> Преобразовать в DOS Формат
 .sp
-По умолчанию: Shift+Ctrl+E
+По умолчанию:
+Shift+Ctrl+E
 .RE
 .PP
 \fBconvert_to_mac\fR
 .RS 4
 Формат \(-> Преобразовать в Maс Формат
 .sp
-По умолчанию: Shift+Ctrl+C
+По умолчанию:
+Shift+Ctrl+C
 .RE
 .PP
 \fBconvert_to_unix\fR
 .RS 4
 Формат \(-> Преобразовать в Uniх Формат
 .sp
-По умолчанию: Ctrl+e
+По умолчанию:
+Ctrl+e
 .RE
 .PP
 \fBcopy_selection_right\fR
 .RS 4
 Слияние \(-> Копировать Выборку Вправо
 .sp
-По умолчанию: Shift+Ctrl+Right
+По умолчанию:
+Shift+Ctrl+Right
 .RE
 .PP
 \fBcopy_selection_left\fR
 .RS 4
 Слияние \(-> Копировать Выборку Влево
 .sp
-По умолчанию: Shift+Ctrl+Left
+По умолчанию:
+Shift+Ctrl+Left
 .RE
 .PP
 \fBcopy_left_into_selection\fR
 .RS 4
 Слияние \(-> Копировать Слева в Выборку
 .sp
-По умолчанию: Ctrl+Right
+По умолчанию:
+Ctrl+Right
 .RE
 .PP
 \fBcopy_right_into_selection\fR
 .RS 4
 Слияние \(-> Копировать Справа в Выборку
 .sp
-По умолчанию: Ctrl+Left
+По умолчанию:
+Ctrl+Left
 .RE
 .PP
 \fBmerge_from_left_then_right\fR
 .RS 4
 Слияние \(-> Слияние Слева Затем Справа
 .sp
-По умолчанию: Ctrl+m
+По умолчанию:
+Ctrl+m
 .RE
 .PP
 \fBmerge_from_right_then_left\fR
 .RS 4
 Слияние \(-> Слияние Справа Затем Слева
 .sp
-По умолчанию: Shift+Ctrl+M
+По умолчанию:
+Shift+Ctrl+M
 .RE
 .PP
 \fBhelp_contents\fR
 .RS 4
 Справка \(-> Содержание Справки\&.\&.\&.
 .sp
-По умолчанию: F1
+По умолчанию:
+F1
 .RE
 .PP
 \fBabout\fR
@@ -782,203 +898,249 @@
 .RS 4
 ввести режим редактирования выравнивания
 .sp
-По умолчанию: space
+По умолчанию:
+space
 .RE
 .PP
 \fBenter_character_mode\fR
 .RS 4
 ввести режим редактирования символов
 .sp
-По умолчанию: Return, KP_Enter
+По умолчаниям:
+Return,
+KP_Enter
 .RE
 .PP
 \fBfirst_line\fR
 .RS 4
 переместить курсор на первую строку
 .sp
-По умолчаниям: Home, g
+По умолчаниям:
+Home,
+g
 .RE
 .PP
 \fBextend_first_line\fR
 .RS 4
 переместить курсор на первую строку, расширение выборки
 .sp
-По умолчанию: Shift+Home
+По умолчанию:
+Shift+Home
 .RE
 .PP
 \fBlast_line\fR
 .RS 4
 переместить курсор на последнюю строку
 .sp
-По умолчаниям: End, Shift+G
+По умолчаниям:
+End,
+Shift+G
 .RE
 .PP
 \fBextend_last_line\fR
 .RS 4
 переместить курсор на последнюю строку, расширение выборки
 .sp
-По умолчанию: Shift+End
+По умолчанию:
+Shift+End
 .RE
 .PP
 \fBup\fR
 .RS 4
 переместить курсор на одну строку вверх
 .sp
-По умолчаниям: Up, k
+По умолчаниям:
+Up,
+k
 .RE
 .PP
 \fBextend_up\fR
 .RS 4
 переместить курсор на одну строку вверх, расширение выборки
 .sp
-По умолчаниям: Shift+Up, Shift+K
+По умолчаниям:
+Shift+Up,
+Shift+K
 .RE
 .PP
 \fBdown\fR
 .RS 4
 переместить курсор на одну строку вниз
 .sp
-По умолчаниям: Down, j
+По умолчаниям:
+Down,
+j
 .RE
 .PP
 \fBextend_down\fR
 .RS 4
 переместить курсор на одну строку вниз, расширение выборки
 .sp
-По умолчаниям: Shift+Down, Shift+J
+По умолчаниям:
+Shift+Down,
+Shift+J
 .RE
 .PP
 \fBleft\fR
 .RS 4
 переместить курсор влево на один файл
 .sp
-По умолчаниям: Left, h
+По умолчаниям:
+Left,
+h
 .RE
 .PP
 \fBextend_left\fR
 .RS 4
 переместить курсор влево на один файл, расширение выборки
 .sp
-По умолчанию: Shift+Left
+По умолчанию:
+Shift+Left
 .RE
 .PP
 \fBright\fR
 .RS 4
 переместить курсор вправо на один файл
 .sp
-По умолчаниям: Right, l
+По умолчаниям:
+Right,
+l
 .RE
 .PP
 \fBextend_right\fR
 .RS 4
 переместить курсор вправо на один файл, расширение выборки
 .sp
-По умолчанию: Shift+Right
+По умолчанию:
+Shift+Right
 .RE
 .PP
 \fBpage_up\fR
 .RS 4
 переместить курсор на одну страницу вверх
 .sp
-По умолчаниям: Page_Up, Ctrl+u
+По умолчаниям:
+Page_Up,
+Ctrl+u
 .RE
 .PP
 \fBextend_page_up\fR
 .RS 4
 переместить курсор на одну страницу вверх, расширение выборки
 .sp
-По умолчаниям: Shift+Page_Up, Shift+Ctrl+u
+По умолчаниям:
+Shift+Page_Up,
+Shift+Ctrl+u
 .RE
 .PP
 \fBpage_down\fR
 .RS 4
 переместить курсор на одну страницу вниз
 .sp
-По умолчаниям: Page_Down, Ctrl+d
+По умолчаниям:
+Page_Down,
+Ctrl+d
 .RE
 .PP
 \fBextend_page_down\fR
 .RS 4
 переместить курсор на одну страницу вниз, расширение выборки
 .sp
-По умолчаниям: Shift+Page_Down, Shift+Ctrl+d
+По умолчаниям:
+Shift+Page_Down,
+Shift+Ctrl+d
 .RE
 .PP
 \fBdelete_text\fR
 .RS 4
 удалить выбранный текст
 .sp
-По умолчаниям: BackSpace, Delete, x
+По умолчаниям:
+BackSpace,
+Delete,
+x
 .RE
 .PP
 \fBfirst_difference\fR
 .RS 4
 выбрать первое различие
 .sp
-По умолчаниям: Ctrl+Home, Shift+P
+По умолчаниям:
+Ctrl+Home,
+Shift+P
 .RE
 .PP
 \fBprevious_difference\fR
 .RS 4
 выбрать предыдущее различие
 .sp
-По умолчанию: p
+По умолчанию:
+p
 .RE
 .PP
 \fBnext_difference\fR
 .RS 4
 выбрать следующее различие
 .sp
-По умолчанию: n
+По умолчанию:
+n
 .RE
 .PP
 \fBlast_difference\fR
 .RS 4
 выбрать последнее различие
 .sp
-По умолчаниям: Ctrl+End, Shift+N
+По умолчаниям:
+Ctrl+End,
+Shift+N
 .RE
 .PP
 \fBclear_edits\fR
 .RS 4
 очистить все редактирования в выбранных строках
 .sp
-По умолчанию: r
+По умолчанию:
+r
 .RE
 .PP
 \fBcopy_left_into_selection\fR
 .RS 4
 копировать строки из файла слева в выборку
 .sp
-По умолчанию: Shift+L
+По умолчанию:
+Shift+L
 .RE
 .PP
 \fBcopy_right_into_selection\fR
 .RS 4
 копировать строки из файла справа в выборку
 .sp
-По умолчанию: Shift+H
+По умолчанию:
+Shift+H
 .RE
 .PP
 \fBmerge_from_left_then_right\fR
 .RS 4
 объединить строки из файла слева, затем из файла справа
 .sp
-По умолчанию: m
+По умолчанию:
+m
 .RE
 .PP
 \fBmerge_from_right_then_left\fR
 .RS 4
 объединить строки из файла справа, затем из файла слева
 .sp
-По умолчанию: Shift+M
+По умолчанию:
+Shift+M
 .RE
 .PP
 \fBisolate\fR
 .RS 4
 изолировать выбранные строки
 .sp
-По умолчанию: i
+По умолчанию:
+i
 .RE
 .RE
 .sp
@@ -1000,77 +1162,95 @@
 .RS 4
 ввести режим редактирования строк
 .sp
-По умолчанию: Escape
+По умолчанию:
+Escape
 .RE
 .PP
 \fBenter_character_mode\fR
 .RS 4
 ввести режим редактирования символов
 .sp
-По умолчанию: Return, KP_Enter
+По умолчаниям:
+Return,
+KP_Enter
 .RE
 .PP
 \fBfirst_line\fR
 .RS 4
 переместить курсор на первую строку
 .sp
-По умолчанию: g
+По умолчанию:
+g
 .RE
 .PP
 \fBlast_line\fR
 .RS 4
 переместить курсор на последнюю строку
 .sp
-По умолчанию: Shift+G
+По умолчанию:
+Shift+G
 .RE
 .PP
 \fBup\fR
 .RS 4
 переместить курсор на одну строку вверх
 .sp
-По умолчаниям: Up, k
+По умолчаниям:
+Up,
+k
 .RE
 .PP
 \fBdown\fR
 .RS 4
 переместить курсор на одну строку вниз
 .sp
-По умолчаниям: Down, j
+По умолчаниям:
+Down,
+j
 .RE
 .PP
 \fBleft\fR
 .RS 4
 переместить курсор влево на один файл
 .sp
-По умолчаниям: Left, h
+По умолчаниям:
+Left,
+h
 .RE
 .PP
 \fBright\fR
 .RS 4
 переместить курсор вправо на один файл
 .sp
-По умолчаниям: Right, l
+По умолчаниям:
+Right,
+l
 .RE
 .PP
 \fBpage_up\fR
 .RS 4
 переместить курсор на одну страницу вверх
 .sp
-По умолчаниям: Page_Up, Ctrl+u
+По умолчаниям:
+Page_Up,
+Ctrl+u
 .RE
 .PP
 \fBpage_down\fR
 .RS 4
 переместить курсор на одну страницу вниз
 .sp
-По умолчаниям: Page_Down, Ctrl+d
+По умолчаниям:
+Page_Down,
+Ctrl+d
 .RE
 .PP
 \fBalign\fR
 .RS 4
 выровнять выбранную строку к позиции курсора
 .sp
-По умолчанию: Space
+По умолчанию:
+space
 .RE
 .RE
 .sp
@@ -1092,7 +1272,8 @@
 .RS 4
 ввести режим редактирования строк
 .sp
-По умолчанию: Escape
+По умолчанию:
+Escape
 .RE
 .RE
 .SS "Строки"
@@ -1113,11 +1294,15 @@
 \fBИспользуемые Строковые Ресурсы\fR
 .RS 4
 .PP
-Следующие строковые ресурсы используются программой Diffuse:
+Следующие строковые ресурсы используются программой
+Diffuse:
 .PP
 \fBdifference_colours\fR
 .RS 4
 список ресурсов цвета, используемых для индикации различий
+.sp
+По умолчанию:
+difference_1 difference_2 difference_3
 .RE
 .RE
 .SS "Цвета"
@@ -1136,81 +1321,135 @@
 \fBИспользуемые Цветовые Ресурсы\fR
 .RS 4
 .PP
-Следующие ресурсы цвета используются программой Diffuse:
+Следующие ресурсы цвета используются программой
+Diffuse:
 .PP
 \fBalignment\fR
 .RS 4
 цвет, используемый для индикации строки, выбранной для ручного выравнивания
+.sp
+По умолчанию:
+1 1 0
 .RE
 .PP
 \fBcharacter_selection\fR
 .RS 4
 цвет, используемый для индикации выбранных символов
+.sp
+По умолчанию:
+0\&.7 0\&.7 1
 .RE
 .PP
 \fBcursor\fR
 .RS 4
 цвет, используемый для курсора
+.sp
+По умолчанию:
+0 0 0
 .RE
 .PP
 \fBdifference_1\fR
 .RS 4
 цвет, используемый для обозначения различий между первой парой файлов
+.sp
+По умолчанию:
+1 0\&.625 0\&.625
 .RE
 .PP
 \fBdifference_2\fR
 .RS 4
 цвет, используемый для обозначения различий между второй парой файлов
+.sp
+По умолчанию:
+0\&.85 0\&.625 0\&.775
 .RE
 .PP
 \fBdifference_3\fR
 .RS 4
 цвет, используемый для обозначения различий между третьей парой файлов
+.sp
+По умолчанию:
+0\&.85 0\&.775 0\&.625
 .RE
 .PP
 \fBedited\fR
 .RS 4
 цвет, используемый для индикации отредактированных строк
+.sp
+По умолчанию:
+0\&.5 1 0\&.5
 .RE
 .PP
 \fBhatch\fR
 .RS 4
 цвет, используемый для индикации разрывов выравнивания
+.sp
+По умолчанию:
+0\&.8 0\&.8 0\&.8
 .RE
 .PP
 \fBline_number\fR
 .RS 4
 цвет, используемый для номеров строк
+.sp
+По умолчанию:
+0 0 0
 .RE
 .PP
 \fBline_number_background\fR
 .RS 4
 цвет фона для области номера строки
+.sp
+По умолчанию:
+0\&.75 0\&.75 0\&.75
 .RE
 .PP
 \fBline_selection\fR
 .RS 4
 цвет, используемый для индикации выбранных строк
+.sp
+По умолчанию:
+0\&.7 0\&.7 1
 .RE
 .PP
 \fBmap_background\fR
 .RS 4
 цвет фона для области отображения
+.sp
+По умолчанию:
+0\&.6 0\&.6 0\&.6
+.RE
+.PP
+\fBmargin\fR
+.RS 4
+цвет, используемый для индикации правого поля
+.sp
+По умолчанию:
+0\&.8 0\&.8 0\&.8
 .RE
 .PP
 \fBpreedit\fR
 .RS 4
 цвет предредактируемого текста
+.sp
+По умолчанию:
+0 0 0
 .RE
 .PP
 \fBtext\fR
 .RS 4
 цвет обычного текста
+.sp
+По умолчанию:
+0 0 0
 .RE
 .PP
 \fBtext_background\fR
 .RS 4
 цвет фона для текстовой области
+.sp
+По умолчанию:
+1 1 1
 .RE
 .RE
 .SS "Значения с Плавающей Точкой"
@@ -1231,48 +1470,55 @@
 \fBИспользуемые Ресурсы с Плавающей Точкой\fR
 .RS 4
 .PP
-Следующие ресурсы с плавающей точкой используются программой Diffuse:
+Следующие ресурсы с плавающей точкой используются программой
+Diffuse:
 .PP
 \fBalignment_opacity\fR
 .RS 4
 непрозрачность, используемая при составлении цвета ручного выравнивания
 .sp
-По умолчаниям: 1
+По умолчаниям:
+1
 .RE
 .PP
 \fBcharacter_difference_opacity\fR
 .RS 4
 непрозрачность, используемая при составлении цветов различия символов
 .sp
-По умолчаниям: 0\&.4
+По умолчаниям:
+0\&.4
 .RE
 .PP
 \fBcharacter_selection_opacity\fR
 .RS 4
 непрозрачность, используемая при составлении цвета выбора символа
 .sp
-По умолчаниям: 0\&.4
+По умолчаниям:
+0\&.4
 .RE
 .PP
 \fBedited_opacity\fR
 .RS 4
 непрозрачность, используемая при составлении цвета отредактированной строки
 .sp
-По умолчаниям: 0\&.4
+По умолчаниям:
+0\&.4
 .RE
 .PP
 \fBline_difference_alpha\fR
 .RS 4
 значение альфы, используемое при составлении цветов различия строк
 .sp
-По умолчаниям: 0\&.3
+По умолчаниям:
+0\&.3
 .RE
 .PP
 \fBline_selection_opacity\fR
 .RS 4
 непрозрачность, используемая при составлении цвета выбора строки
 .sp
-По умолчаниям: 0\&.4
+По умолчаниям:
+0\&.4
 .RE
 .RE
 .SS "Подсветка Синтаксиса"
@@ -1320,7 +1566,8 @@
 .RE
 .SH "ФАЙЛЫ"
 .PP
-Следующие файлы используются программой Diffuse:
+Следующие файлы используются программой
+Diffuse:
 .PP
 /etc/diffuserc
 .RS 4
@@ -1353,14 +1600,18 @@
 .RE
 .SH "АВТОРЫ"
 .PP
-Программа Diffuse написана Derrick Moser
+Программа
+Diffuse
+написана Derrick Moser
 derrick_moser@yahoo\&.com\&.
 .PP
-\(co 2006\-2010 Derrick Moser\&. Все Права Защищены\&.
+\(co 2006\-2011 Derrick Moser\&. Все Права Защищены\&.
 .PP
 Русификация (diffuse\&.mo; ru\&.po): О\&.Ю\&.Пахтусов
 oupakhtusov@gmail\&.com
 .SH "КОПИРОВАНИЕ"
 .PP
-Diffuse является бесплатным Программным Обеспечением (ПО); можно распространять программу и/или изменять ее в соответствии с
+
+Diffuse
+является бесплатным Программным Обеспечением (ПО); можно распространять программу и/или изменять ее в соответствии с
 GNU General Public License, как опубликовано Free Software Foundation; либо версия 2 лицензии, либо (по вашему выбору) любая более поздняя версия\&.
diff -Nru diffuse-0.4.4/src/usr/share/omf/diffuse/diffuse-C.omf diffuse-0.4.5/src/usr/share/omf/diffuse/diffuse-C.omf
--- diffuse-0.4.4/src/usr/share/omf/diffuse/diffuse-C.omf	2010-10-21 01:58:02.000000000 +0000
+++ diffuse-0.4.5/src/usr/share/omf/diffuse/diffuse-C.omf	2011-07-13 09:18:33.000000000 +0000
@@ -4,8 +4,8 @@
     <creator>Derrick Moser</creator>
     <maintainer>Derrick Moser</maintainer>
     <title>Diffuse User's Manual</title>
-    <date>2010-10-21</date>
-    <version identifier="0.4.4" date="2010-10-21"/>
+    <date>2011-07-13</date>
+    <version identifier="0.4.5" date="2011-07-13"/>
     <subject category="GNOME|Development|Applications"/>
     <description>Diffuse is a graphical tool for merging and comparing text files.</description>
     <type>manual</type>
diff -Nru diffuse-0.4.4/src/usr/share/omf/diffuse/diffuse-it.omf diffuse-0.4.5/src/usr/share/omf/diffuse/diffuse-it.omf
--- diffuse-0.4.4/src/usr/share/omf/diffuse/diffuse-it.omf	1970-01-01 00:00:00.000000000 +0000
+++ diffuse-0.4.5/src/usr/share/omf/diffuse/diffuse-it.omf	2011-07-13 09:18:33.000000000 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<omf>
+  <resource>
+    <creator>Derrick Moser</creator>
+    <maintainer>Derrick Moser</maintainer>
+    <title>Manuale utente di Diffuse</title>
+    <date>2011-07-13</date>
+    <version identifier="0.4.5" date="2011-07-13"/>
+    <subject category="GNOME|Development|Applications"/>
+    <description>Diffuse è uno strumento grafico per l'unione e il confronto di file di testo.</description>
+    <type>manual</type>
+    <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.2//EN"/>
+    <identifier url="file:///usr/share/gnome/help/diffuse/it/diffuse.xml"/>
+    <language code="it"/>
+    <relation seriesid="0f102352-c827-b1a8-b28a-d657ef9b98a9a0"/>
+    <rights type="GNU FDL" license.version="1.1" license="http://www.gnu.org/licenses/fdl.html" holder="Derrick Moser"/>
+  </resource>
+</omf>
diff -Nru diffuse-0.4.4/src/usr/share/omf/diffuse/diffuse-ru.omf diffuse-0.4.5/src/usr/share/omf/diffuse/diffuse-ru.omf
--- diffuse-0.4.4/src/usr/share/omf/diffuse/diffuse-ru.omf	2010-10-21 01:58:02.000000000 +0000
+++ diffuse-0.4.5/src/usr/share/omf/diffuse/diffuse-ru.omf	2011-07-13 09:18:33.000000000 +0000
@@ -4,8 +4,8 @@
     <creator>Derrick Moser</creator>
     <maintainer>Derrick Moser</maintainer>
     <title>Руководство Пользователя Diffuse</title>
-    <date>2010-10-21</date>
-    <version identifier="0.4.4" date="2010-10-21"/>
+    <date>2011-07-13</date>
+    <version identifier="0.4.5" date="2011-07-13"/>
     <subject category="GNOME|Development|Applications"/>
     <description>Программа Diffuse является графическим инструментом для слияния и сравнения текстовых файлов.</description>
     <type>manual</type>
diff -Nru diffuse-0.4.4/translations/de.po diffuse-0.4.5/translations/de.po
--- diffuse-0.4.4/translations/de.po	2010-10-21 01:58:01.000000000 +0000
+++ diffuse-0.4.5/translations/de.po	2011-07-13 09:18:32.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: diffuse-svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-03 20:12+0200\n"
+"POT-Creation-Date: 2011-06-11 22:29+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Henri Menke <henrimenke4@aim.com>\n"
 "Language-Team: German <henrimenke4@aim.com>\n"
@@ -21,651 +21,645 @@
 "X-Poedit-Country: GERMANY\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../diffuse/src/usr/bin/diffuse:851
+#: ../../diffuse/src/usr/bin/diffuse:894
 msgid "\"co\" command"
 msgstr "\"co\" Befehl"
 
-#: ../diffuse/src/usr/bin/diffuse:852
+#: ../../diffuse/src/usr/bin/diffuse:895
 msgid "\"rlog\" command"
 msgstr "\"rlog\" Befehl"
 
-#: ../diffuse/src/usr/bin/diffuse:6802
+#: ../../diffuse/src/usr/bin/diffuse:7138
 #, python-format
 msgid "%(title)s Pane %(pane)d"
 msgstr "%(title)s Fenster %(pane)d"
 
-#: ../diffuse/src/usr/bin/diffuse:6350
+#: ../../diffuse/src/usr/bin/diffuse:6684
 #, python-format
 msgid "A file named %s already exists.  Do you want to overwrite it?"
 msgstr "Eine Datei mit dem Namen %s existiert bereits. Überschreiben?"
 
-#: ../diffuse/src/usr/bin/diffuse:3944
+#: ../../diffuse/src/usr/bin/diffuse:4240
 msgid "Align with Selection"
 msgstr "Ausrichten an der Auswahl"
 
-#: ../diffuse/src/usr/bin/diffuse:796
+#: ../../diffuse/src/usr/bin/diffuse:828
 msgid "Alignment"
 msgstr "Ausrichtung"
 
-#: ../diffuse/src/usr/bin/diffuse:813
+#: ../../diffuse/src/usr/bin/diffuse:845
 msgid "Always show the tab bar"
 msgstr "Reiter-Leiste immer anzeigen"
 
-#: ../diffuse/src/usr/bin/diffuse:5823
+#: ../../diffuse/src/usr/bin/diffuse:718
 msgid "Auto Detect"
 msgstr "Automatische Erkennung"
 
-#: ../diffuse/src/usr/bin/diffuse:808
+#: ../../diffuse/src/usr/bin/diffuse:838
 msgid "Auto indent"
 msgstr "Automatischer Einzug"
 
-#: ../diffuse/src/usr/bin/diffuse:6592
+#: ../../diffuse/src/usr/bin/diffuse:6926
 msgid "C_lear Edits"
 msgstr "Alle _Änderungen rückgängig"
 
-#: ../diffuse/src/usr/bin/diffuse:7061
+#: ../../diffuse/src/usr/bin/diffuse:7407
 msgid "Choose Folder With Modified Files"
 msgstr "Ordner mit bearbeiteten Dateien auswählen"
 
-#: ../diffuse/src/usr/bin/diffuse:3953 ../diffuse/src/usr/bin/diffuse:6692
+#: ../../diffuse/src/usr/bin/diffuse:4249
+#: ../../diffuse/src/usr/bin/diffuse:7028
 msgid "Clear Edits"
 msgstr "Alle Änderungen rückgängig"
 
-#: ../diffuse/src/usr/bin/diffuse:5934
+#: ../../diffuse/src/usr/bin/diffuse:6232
 msgid "Close Tab"
 msgstr "Reiter schließen"
 
-#: ../diffuse/src/usr/bin/diffuse:6811
+#: ../../diffuse/src/usr/bin/diffuse:7147
 msgid "Close _Without Saving"
 msgstr "Ohne speichern schließen"
 
-#: ../diffuse/src/usr/bin/diffuse:5801
+#: ../../diffuse/src/usr/bin/diffuse:6108
 #, python-format
 msgid "Closing this tab will quit %s."
 msgstr "Schließen des letzten Tabs beendet %s."
 
-#: ../diffuse/src/usr/bin/diffuse:6054
+#: ../../diffuse/src/usr/bin/diffuse:6370
 #, python-format
 msgid "Column %d"
 msgstr "Spalte %d"
 
-#: ../diffuse/src/usr/bin/diffuse:854
+#: ../../diffuse/src/usr/bin/diffuse:897
 msgid "Command"
 msgstr "Befehl"
 
-#: ../diffuse/src/usr/bin/diffuse:6636
+#: ../../diffuse/src/usr/bin/diffuse:6972
 msgid "Convert Leading Spaces To _Tabs"
 msgstr "Vorangestellte Leerzeichen in _Tabulatoren konvertieren"
 
-#: ../diffuse/src/usr/bin/diffuse:6635
+#: ../../diffuse/src/usr/bin/diffuse:6971
 msgid "Convert Tabs To _Spaces"
 msgstr "Tabulatoren in Leer_zeichen konvertieren"
 
-#: ../diffuse/src/usr/bin/diffuse:6643
+#: ../../diffuse/src/usr/bin/diffuse:6979
 msgid "Convert To Uni_x Format"
 msgstr "Ins Uni_x Format konvertieren"
 
-#: ../diffuse/src/usr/bin/diffuse:6641
+#: ../../diffuse/src/usr/bin/diffuse:6977
 msgid "Convert To _DOS Format"
 msgstr "Ins _DOS Format konvertieren"
 
-#: ../diffuse/src/usr/bin/diffuse:6629
+#: ../../diffuse/src/usr/bin/diffuse:6965
 msgid "Convert To _Lower Case"
 msgstr "In K_leinbuchstaben konvertieren"
 
-#: ../diffuse/src/usr/bin/diffuse:6642
+#: ../../diffuse/src/usr/bin/diffuse:6978
 msgid "Convert To _Mac Format"
 msgstr "Ins _Mac Format konvertieren"
 
-#: ../diffuse/src/usr/bin/diffuse:6628
+#: ../../diffuse/src/usr/bin/diffuse:6964
 msgid "Convert To _Upper Case"
 msgstr "In Großb_uchstaben konvertieren"
 
-#: ../diffuse/src/usr/bin/diffuse:3949 ../diffuse/src/usr/bin/diffuse:6690
+#: ../../diffuse/src/usr/bin/diffuse:4245
+#: ../../diffuse/src/usr/bin/diffuse:7026
 msgid "Copy"
 msgstr "Kopieren"
 
-#: ../diffuse/src/usr/bin/diffuse:6682
+#: ../../diffuse/src/usr/bin/diffuse:7018
 msgid "Copy Left Into Selection"
 msgstr "Von links in die Auswahl kopieren"
 
-#: ../diffuse/src/usr/bin/diffuse:6649
+#: ../../diffuse/src/usr/bin/diffuse:6985
 msgid "Copy Left _Into Selection"
 msgstr "Von links _in die Auswahl kopieren"
 
-#: ../diffuse/src/usr/bin/diffuse:6650
+#: ../../diffuse/src/usr/bin/diffuse:6986
 msgid "Copy Right I_nto Selection"
 msgstr "Von rechts i_n die Auswahl kopieren"
 
-#: ../diffuse/src/usr/bin/diffuse:6683
+#: ../../diffuse/src/usr/bin/diffuse:7019
 msgid "Copy Right Into Selection"
 msgstr "Von rechts in die Auswahl kopieren"
 
-#: ../diffuse/src/usr/bin/diffuse:6681
+#: ../../diffuse/src/usr/bin/diffuse:7017
 msgid "Copy Selection Left"
 msgstr "Auswahl nach links kopieren"
 
-#: ../diffuse/src/usr/bin/diffuse:6680
+#: ../../diffuse/src/usr/bin/diffuse:7016
 msgid "Copy Selection Right"
 msgstr "Auswahl nach rechts kopieren"
 
-#: ../diffuse/src/usr/bin/diffuse:6647
+#: ../../diffuse/src/usr/bin/diffuse:6983
 msgid "Copy Selection _Left"
 msgstr "Auswahl nach _links kopieren"
 
-#: ../diffuse/src/usr/bin/diffuse:6646
+#: ../../diffuse/src/usr/bin/diffuse:6982
 msgid "Copy Selection _Right"
 msgstr "Auswahl nach _rechts kopieren"
 
-#: ../diffuse/src/usr/bin/diffuse:67
-msgid "Copyright © 2006-2010 Derrick Moser"
-msgstr "Copyright © 2006-2010 Derrick Moser"
+#: ../../diffuse/src/usr/bin/diffuse:67
+msgid "Copyright © 2006-2011 Derrick Moser"
+msgstr "Copyright © 2006-2011 Derrick Moser"
 
-#: ../diffuse/src/usr/bin/diffuse:6587
+#: ../../diffuse/src/usr/bin/diffuse:6921
 msgid "Cu_t"
 msgstr "_Ausschneiden"
 
-#: ../diffuse/src/usr/bin/diffuse:3948 ../diffuse/src/usr/bin/diffuse:6689
+#: ../../diffuse/src/usr/bin/diffuse:4244
+#: ../../diffuse/src/usr/bin/diffuse:7025
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: ../diffuse/src/usr/bin/diffuse:831
+#: ../../diffuse/src/usr/bin/diffuse:874
 msgid "Cygdrive prefix"
 msgstr "Cygdrive Präfix"
 
-#: ../diffuse/src/usr/bin/diffuse:828
+#: ../../diffuse/src/usr/bin/diffuse:871
 msgid "Cygwin"
 msgstr "Cygwin"
 
-#: ../diffuse/src/usr/bin/diffuse:6639
+#: ../../diffuse/src/usr/bin/diffuse:6975
 msgid "De_crease Indenting"
 msgstr "Einzug _vermindern"
 
-#: ../diffuse/src/usr/bin/diffuse:812
+#: ../../diffuse/src/usr/bin/diffuse:850
+msgid "Default codec"
+msgstr "Standardkodierung"
+
+#: ../../diffuse/src/usr/bin/diffuse:844
 msgid "Default panes"
 msgstr "Standard Fenstere"
 
-#: ../diffuse/src/usr/bin/diffuse:855
+#: ../../diffuse/src/usr/bin/diffuse:898
 msgid "Default revision"
 msgstr "Standard Revision"
 
-#: ../diffuse/src/usr/bin/diffuse:5896
+#: ../../diffuse/src/usr/bin/diffuse:6194
 msgid "Derrick Moser <derrick_moser@yahoo.com>"
 msgstr "Derrick Moser <derrick_moser@yahoo.com>"
 
-#: ../diffuse/src/usr/bin/diffuse:5893
+#: ../../diffuse/src/usr/bin/diffuse:6191
 msgid "Diffuse is a graphical tool for merging and comparing text files."
-msgstr ""
-"Diffuse ist ein graphisches Werzeug zum Zusammenführen und Vergleichen von "
-"Textdateien."
+msgstr "Diffuse ist ein graphisches Werzeug zum Zusammenführen und Vergleichen von Textdateien."
 
-#: ../diffuse/src/usr/bin/diffuse:784
+#: ../../diffuse/src/usr/bin/diffuse:814
 msgid "Display"
 msgstr "Anzeige"
 
-#: ../diffuse/src/usr/bin/diffuse:804
+#: ../../diffuse/src/usr/bin/diffuse:836
 msgid "Editor"
 msgstr "Editor"
 
-#: ../diffuse/src/usr/bin/diffuse:5813
+#: ../../diffuse/src/usr/bin/diffuse:6120
 msgid "Encoding: "
 msgstr "Kodierung: "
 
-#: ../diffuse/src/usr/bin/diffuse:6397
+#: ../../diffuse/src/usr/bin/diffuse:6731
 #, python-format
 msgid "Error encoding to %s."
 msgstr "Fehler bei der Kodierung nach %s."
 
-#: ../diffuse/src/usr/bin/diffuse:1930
+#: ../../diffuse/src/usr/bin/diffuse:2002
 #, python-format
 msgid "Error parsing %s."
 msgstr "Fehler bei der Analyse %s."
 
-#: ../diffuse/src/usr/bin/diffuse:6439
+#: ../../diffuse/src/usr/bin/diffuse:6773
+#: ../../diffuse/src/usr/bin/diffuse:7779
 msgid "Error parsing line number."
 msgstr "Fehler bei der Analyse der Zeilennummer."
 
-#: ../diffuse/src/usr/bin/diffuse:7358
+#: ../../diffuse/src/usr/bin/diffuse:7724
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "Fehler bei der Analyse der Revision %s."
 
-#: ../diffuse/src/usr/bin/diffuse:7421
+#: ../../diffuse/src/usr/bin/diffuse:7796
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
-msgstr ""
-"Fehler beim Verarbeiten des Arguments \"%s\".  Unerwartetes Verzeichnis."
+msgstr "Fehler beim Verarbeiten des Arguments \"%s\".  Unerwartetes Verzeichnis."
 
-#: ../diffuse/src/usr/bin/diffuse:704
+#: ../../diffuse/src/usr/bin/diffuse:690
 #, python-format
 msgid "Error processing line %(line)d of %(file)s."
 msgstr "Fehler bei der Analyse der Zeilen %(line)d von %(file)s."
 
-#: ../diffuse/src/usr/bin/diffuse:6244 ../diffuse/src/usr/bin/diffuse:7330
+#: ../../diffuse/src/usr/bin/diffuse:6565
+#: ../../diffuse/src/usr/bin/diffuse:7696
 #, python-format
 msgid "Error reading %s."
 msgstr "Fehler beim Lesen von %s."
 
-#: ../diffuse/src/usr/bin/diffuse:6242
+#: ../../diffuse/src/usr/bin/diffuse:6563
 #, python-format
 msgid "Error reading revision %(rev)s of %(file)s."
 msgstr "Fehler beim lesen der Revision %(rev)s von %(file)s."
 
-#: ../diffuse/src/usr/bin/diffuse:7012
+#: ../../diffuse/src/usr/bin/diffuse:7358
 #, python-format
 msgid "Error retrieving modifications for %s."
 msgstr "Fehler beim Empfangen der Bearbeitungen von %s."
 
-#: ../diffuse/src/usr/bin/diffuse:938 ../diffuse/src/usr/bin/diffuse:6401
+#: ../../diffuse/src/usr/bin/diffuse:995
+#: ../../diffuse/src/usr/bin/diffuse:6735
 #, python-format
 msgid "Error writing %s."
 msgstr "Fehler beim Schreiben von %s."
 
-#: ../diffuse/src/usr/bin/diffuse:807
+#: ../../diffuse/src/usr/bin/diffuse:839
 msgid "Expand tabs to spaces"
 msgstr "Tabulatoren zu Leerzeichen erweitern"
 
-#: ../diffuse/src/usr/bin/diffuse:6627
+#: ../../diffuse/src/usr/bin/diffuse:6963
 msgid "F_ormat"
 msgstr "F_ormat"
 
-#: ../diffuse/src/usr/bin/diffuse:6919
+#: ../../diffuse/src/usr/bin/diffuse:7255
 #, python-format
 msgid "File Merge %d"
 msgstr "Dateien zusammenführen %d"
 
-#: ../diffuse/src/usr/bin/diffuse:6597
+#: ../../diffuse/src/usr/bin/diffuse:6931
 msgid "Find Pre_vious"
 msgstr "_Rückwärts suchen"
 
-#: ../diffuse/src/usr/bin/diffuse:6596
+#: ../../diffuse/src/usr/bin/diffuse:6930
 msgid "Find _Next"
 msgstr "_Nächstes suchen"
 
-#: ../diffuse/src/usr/bin/diffuse:5751
+#: ../../diffuse/src/usr/bin/diffuse:6058
 msgid "Find..."
 msgstr "Suchen..."
 
-#: ../diffuse/src/usr/bin/diffuse:6675
+#: ../../diffuse/src/usr/bin/diffuse:6955
+msgid "Fir_st Tab"
+msgstr "Er_ster Reiter"
+
+#: ../../diffuse/src/usr/bin/diffuse:7011
 msgid "First Difference"
 msgstr "Erster Unterschied"
 
-#: ../diffuse/src/usr/bin/diffuse:786
+#: ../../diffuse/src/usr/bin/diffuse:816
 msgid "Font"
 msgstr "Schriftart"
 
-#: ../diffuse/src/usr/bin/diffuse:5856
+#: ../../diffuse/src/usr/bin/diffuse:6154
 msgid "Go To Line..."
 msgstr "Gehe zu Zeile..."
 
-#: ../diffuse/src/usr/bin/diffuse:792
+#: ../../diffuse/src/usr/bin/diffuse:825
 msgid "Ignore blank line differences"
 msgstr "Unterschiede bei leeren Zeilen ignorieren"
 
-#: ../diffuse/src/usr/bin/diffuse:800
+#: ../../diffuse/src/usr/bin/diffuse:833
 msgid "Ignore blank lines"
 msgstr "Leere Zeilen ignorieren"
 
-#: ../diffuse/src/usr/bin/diffuse:802
+#: ../../diffuse/src/usr/bin/diffuse:830
 msgid "Ignore case"
 msgstr "Groß- und Kleinschreibung ignorieren"
 
-#: ../diffuse/src/usr/bin/diffuse:793
+#: ../../diffuse/src/usr/bin/diffuse:822
 msgid "Ignore case differences"
 msgstr "Unterschiede bei Groß- und Kleinschreibung ignorieren"
 
-#: ../diffuse/src/usr/bin/diffuse:791 ../diffuse/src/usr/bin/diffuse:799
+#: ../../diffuse/src/usr/bin/diffuse:824
+#: ../../diffuse/src/usr/bin/diffuse:832
 msgid "Ignore changes to white space"
 msgstr "Änderungen an Leerzeichen ignorieren"
 
-#: ../diffuse/src/usr/bin/diffuse:801
+#: ../../diffuse/src/usr/bin/diffuse:834
 msgid "Ignore end of line characters"
 msgstr "Zeilenumbrüche ignorieren"
 
-#: ../diffuse/src/usr/bin/diffuse:794
+#: ../../diffuse/src/usr/bin/diffuse:826
 msgid "Ignore end of line differences"
 msgstr "Unterschiede bei Zeilenumbrüchen ignorieren"
 
-#: ../diffuse/src/usr/bin/diffuse:798
+#: ../../diffuse/src/usr/bin/diffuse:831
 msgid "Ignore white space"
 msgstr "Leerzeichen ignorieren"
 
-#: ../diffuse/src/usr/bin/diffuse:790
+#: ../../diffuse/src/usr/bin/diffuse:823
 msgid "Ignore white space differences"
 msgstr "Unterschiede bei Leerzeichen ignorieren"
 
-#: ../diffuse/src/usr/bin/diffuse:3945
+#: ../../diffuse/src/usr/bin/diffuse:4241
 msgid "Isolate"
 msgstr "Isolieren"
 
-#: ../diffuse/src/usr/bin/diffuse:6678
+#: ../../diffuse/src/usr/bin/diffuse:6958
+msgid "Las_t Tab"
+msgstr "Letz_ter Reiter"
+
+#: ../../diffuse/src/usr/bin/diffuse:7014
 msgid "Last Difference"
 msgstr "Letzter Unterschied"
 
-#: ../diffuse/src/usr/bin/diffuse:857
+#: ../../diffuse/src/usr/bin/diffuse:900
 msgid "Launch from a Bash login shell"
 msgstr "Aus einer Bash login shell starten"
 
-#: ../diffuse/src/usr/bin/diffuse:5862
+#: ../../diffuse/src/usr/bin/diffuse:6160
 msgid "Line Number: "
 msgstr "Zeilennummer: "
 
-#: ../diffuse/src/usr/bin/diffuse:6652
+#: ../../diffuse/src/usr/bin/diffuse:6988
 msgid "M_erge From Right Then Left"
 msgstr "Zusammenführen von rechts, dann von links"
 
-#: ../diffuse/src/usr/bin/diffuse:5782
+#: ../../diffuse/src/usr/bin/diffuse:6089
 msgid "Match Case"
 msgstr "Übereinstimmen von Groß- und Kleinschreibung"
 
-#: ../diffuse/src/usr/bin/diffuse:6684
+#: ../../diffuse/src/usr/bin/diffuse:7020
 msgid "Merge From Left Then Right"
 msgstr "Zusammenführen von links, dann von rechts"
 
-#: ../diffuse/src/usr/bin/diffuse:6685
+#: ../../diffuse/src/usr/bin/diffuse:7021
 msgid "Merge From Right Then Left"
 msgstr "Zusammenführen von rechts, dann von links"
 
-#: ../diffuse/src/usr/bin/diffuse:3946
+#: ../../diffuse/src/usr/bin/diffuse:4242
 msgid "Merge Selection"
 msgstr "Auswahl zusammenführen"
 
-#: ../diffuse/src/usr/bin/diffuse:6671
+#: ../../diffuse/src/usr/bin/diffuse:7007
 msgid "New 2-Way File Merge"
 msgstr "Neues 2-Wege-Datei-Zusammenführen"
 
-#: ../diffuse/src/usr/bin/diffuse:6672
+#: ../../diffuse/src/usr/bin/diffuse:7008
 msgid "New 3-Way File Merge"
 msgstr "Neues 3-Wege-Datei-Zusammenführen"
 
-#: ../diffuse/src/usr/bin/diffuse:6576
+#: ../../diffuse/src/usr/bin/diffuse:6910
 msgid "New _2-Way File Merge"
 msgstr "Neues _2-Wege-Datei-Zusammenführen"
 
-#: ../diffuse/src/usr/bin/diffuse:6577
+#: ../../diffuse/src/usr/bin/diffuse:6911
 msgid "New _3-Way File Merge"
 msgstr "Neues _3-Wege-Datei-Zusammenführen"
 
-#: ../diffuse/src/usr/bin/diffuse:6677
+#: ../../diffuse/src/usr/bin/diffuse:7013
 msgid "Next Difference"
 msgstr "Nächster Unterschied"
 
-#: ../diffuse/src/usr/bin/diffuse:6622
+#: ../../diffuse/src/usr/bin/diffuse:6957
 msgid "Next _Tab"
 msgstr "N_ächster Reiter"
 
-#: ../diffuse/src/usr/bin/diffuse:7074
+#: ../../diffuse/src/usr/bin/diffuse:7420
 msgid "No modified files found."
 msgstr "Keine bearbeiteten Dateien gefunden."
 
-#: ../diffuse/src/usr/bin/diffuse:6602
+#: ../../diffuse/src/usr/bin/diffuse:6936
 msgid "None"
 msgstr "Keine"
 
-#: ../diffuse/src/usr/bin/diffuse:6267
+#: ../../diffuse/src/usr/bin/diffuse:6588
 msgid "Open File"
 msgstr "Datei öffnen"
 
-#: ../diffuse/src/usr/bin/diffuse:7045
+#: ../../diffuse/src/usr/bin/diffuse:7391
 msgid "Open File In New Tab"
 msgstr "Datei in neuem Reiter öffnen"
 
-#: ../diffuse/src/usr/bin/diffuse:6568
+#: ../../diffuse/src/usr/bin/diffuse:6902
 msgid "Open File In New _Tab..."
 msgstr "Datei _in neuem Reiter öffnen..."
 
-#: ../diffuse/src/usr/bin/diffuse:5975
+#: ../../diffuse/src/usr/bin/diffuse:6287
 msgid "Open File..."
 msgstr "Datei öffnen..."
 
-#: ../diffuse/src/usr/bin/diffuse:6569
+#: ../../diffuse/src/usr/bin/diffuse:6903
 msgid "Open _Modified Files..."
 msgstr "_Bearbeitete Dateien öffnen..."
 
-#: ../diffuse/src/usr/bin/diffuse:818
+#: ../../diffuse/src/usr/bin/diffuse:851
 msgid "Order of codecs used to identify encoding"
 msgstr "Reihenfolge der Chiffren um die Kodierung zu erkennen"
 
-#: ../diffuse/src/usr/bin/diffuse:3950 ../diffuse/src/usr/bin/diffuse:6691
+#: ../../diffuse/src/usr/bin/diffuse:4246
+#: ../../diffuse/src/usr/bin/diffuse:7027
 msgid "Paste"
 msgstr "Einfügen"
 
-#: ../diffuse/src/usr/bin/diffuse:7158
+#: ../../diffuse/src/usr/bin/diffuse:7509
 msgid "Phrase not found.  Continue from the end of the file?"
 msgstr "Ausdruck nicht gefunden.  Am Ende der Datei fortsetzen?"
 
-#: ../diffuse/src/usr/bin/diffuse:7160
+#: ../../diffuse/src/usr/bin/diffuse:7511
 msgid "Phrase not found.  Continue from the start of the file?"
 msgstr "Ausdruck nicht gefunden.  Am Anfang der Datei fortsetzen?"
 
-#: ../diffuse/src/usr/bin/diffuse:6600
+#: ../../diffuse/src/usr/bin/diffuse:6934
 msgid "Pr_eferences..."
 msgstr "_Einstellungen..."
 
-#: ../diffuse/src/usr/bin/diffuse:6621
+#: ../../diffuse/src/usr/bin/diffuse:6956
 msgid "Pre_vious Tab"
 msgstr "V_origer Reiter"
 
-#: ../diffuse/src/usr/bin/diffuse:914
+#: ../../diffuse/src/usr/bin/diffuse:966
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../diffuse/src/usr/bin/diffuse:6462
-msgid ""
-"Press the enter key or double click to edit.  Press the space bar or use the "
-"RMB menu to manually align."
-msgstr ""
-"Enter drücken, oder Doppelklicken zum editieren.  Drücken Sie die Leertaste, "
-"oder nutzen sie das RMB Menü zum manuellen Ausrichten."
+#: ../../diffuse/src/usr/bin/diffuse:6796
+msgid "Press the enter key or double click to edit.  Press the space bar or use the RMB menu to manually align."
+msgstr "Enter drücken, oder Doppelklicken zum editieren.  Drücken Sie die Leertaste, oder nutzen sie das RMB Menü zum manuellen Ausrichten."
 
-#: ../diffuse/src/usr/bin/diffuse:6464
+#: ../../diffuse/src/usr/bin/diffuse:6798
 msgid "Press the escape key to finish editing."
 msgstr "Drücken Sie die Escape Taste um die Bearbeitung zu beenden."
 
-#: ../diffuse/src/usr/bin/diffuse:6676
+#: ../../diffuse/src/usr/bin/diffuse:7012
 msgid "Previous Difference"
 msgstr "Voriger Unterschied"
 
-#: ../diffuse/src/usr/bin/diffuse:6613
+#: ../../diffuse/src/usr/bin/diffuse:6947
 msgid "Re_align All"
 msgstr "Alle neu _ausrichten"
 
-#: ../diffuse/src/usr/bin/diffuse:6674
+#: ../../diffuse/src/usr/bin/diffuse:7010
 msgid "Realign All"
 msgstr "Alle neu ausrichten"
 
-#: ../diffuse/src/usr/bin/diffuse:6688
+#: ../../diffuse/src/usr/bin/diffuse:7024
 msgid "Redo"
 msgstr "Wiederholen"
 
-#: ../diffuse/src/usr/bin/diffuse:816
+#: ../../diffuse/src/usr/bin/diffuse:848
 msgid "Regional Settings"
 msgstr "Lokalisierung"
 
-#: ../diffuse/src/usr/bin/diffuse:5976
+#: ../../diffuse/src/usr/bin/diffuse:6288
 msgid "Reload File"
 msgstr "Datei neu laden"
 
-#: ../diffuse/src/usr/bin/diffuse:6634
+#: ../../diffuse/src/usr/bin/diffuse:6970
 msgid "Remove Trailing _White Space"
 msgstr "Entferne angehängte _Leerzeichen"
 
-#: ../diffuse/src/usr/bin/diffuse:5831
+#: ../../diffuse/src/usr/bin/diffuse:6130
 msgid "Revision: "
 msgstr "Revision: "
 
-#: ../diffuse/src/usr/bin/diffuse:830
+#: ../../diffuse/src/usr/bin/diffuse:819
+msgid "Right margin"
+msgstr "Rechter Rand"
+
+#: ../../diffuse/src/usr/bin/diffuse:873
 msgid "Root directory"
 msgstr "Hauptverzeichnis"
 
-#: ../diffuse/src/usr/bin/diffuse:6333
+#: ../../diffuse/src/usr/bin/diffuse:6658
 #, python-format
 msgid "Save %(title)s Pane %(pane)d"
 msgstr "Speichern %(title)s Fenster %(pane)d"
 
-#: ../diffuse/src/usr/bin/diffuse:6574
+#: ../../diffuse/src/usr/bin/diffuse:6908
 msgid "Save A_ll"
 msgstr "_Alle speichern"
 
-#: ../diffuse/src/usr/bin/diffuse:5977
+#: ../../diffuse/src/usr/bin/diffuse:6289
 msgid "Save File"
 msgstr "Datei speichern"
 
-#: ../diffuse/src/usr/bin/diffuse:5978
+#: ../../diffuse/src/usr/bin/diffuse:6290
 msgid "Save File As..."
 msgstr "Datei speichern unter..."
 
-#: ../diffuse/src/usr/bin/diffuse:6573
+#: ../../diffuse/src/usr/bin/diffuse:6907
 msgid "Save File _As..."
 msgstr "Datei speichern _unter..."
 
-#: ../diffuse/src/usr/bin/diffuse:6119
+#: ../../diffuse/src/usr/bin/diffuse:6435
 msgid "Save changes before loading the new file?"
 msgstr "Änderungen speichern vor dem Laden der neuen Datei?"
 
-#: ../diffuse/src/usr/bin/diffuse:5787
+#: ../../diffuse/src/usr/bin/diffuse:6094
 msgid "Search Backwards"
 msgstr "Rückwärts suchen"
 
-#: ../diffuse/src/usr/bin/diffuse:5757
+#: ../../diffuse/src/usr/bin/diffuse:6064
 msgid "Search For: "
 msgstr "Suchen nach: "
 
-#: ../diffuse/src/usr/bin/diffuse:3952
+#: ../../diffuse/src/usr/bin/diffuse:4248
 msgid "Select All"
 msgstr "Alles auswählen"
 
-#: ../diffuse/src/usr/bin/diffuse:6591
+#: ../../diffuse/src/usr/bin/diffuse:6925
 msgid "Select _All"
 msgstr "_Alles auswählen"
 
-#: ../diffuse/src/usr/bin/diffuse:6466
-msgid ""
-"Select target line and press the space bar to align.  Press the escape key "
-"to cancel."
-msgstr ""
-"Zeile auswählen und Leertaste drücken zum Ausrichten.  Drücken Sie die "
-"Escape Taste zum Abbrechen."
+#: ../../diffuse/src/usr/bin/diffuse:6800
+msgid "Select target line and press the space bar to align.  Press the escape key to cancel."
+msgstr "Zeile auswählen und Leertaste drücken zum Ausrichten.  Drücken Sie die Escape Taste zum Abbrechen."
 
-#: ../diffuse/src/usr/bin/diffuse:6625
+#: ../../diffuse/src/usr/bin/diffuse:6961
 msgid "Shift Pane _Left"
 msgstr "Fenster nach _links verschieben"
 
-#: ../diffuse/src/usr/bin/diffuse:6624
+#: ../../diffuse/src/usr/bin/diffuse:6960
 msgid "Shift Pane _Right"
 msgstr "Fenster nach _rechts verschieben"
 
-#: ../diffuse/src/usr/bin/diffuse:788
+#: ../../diffuse/src/usr/bin/diffuse:820
 msgid "Show line numbers"
 msgstr "Zeige Zeilennummern"
 
-#: ../diffuse/src/usr/bin/diffuse:789
+#: ../../diffuse/src/usr/bin/diffuse:818
+msgid "Show right margin"
+msgstr "Zeige rechten Rand"
+
+#: ../../diffuse/src/usr/bin/diffuse:821
 msgid "Show white space characters"
 msgstr "Leerzeichen anzeigen"
 
-#: ../diffuse/src/usr/bin/diffuse:7414
+#: ../../diffuse/src/usr/bin/diffuse:7789
 #, python-format
 msgid "Skipping unknown argument \"%s\"."
 msgstr "Übergehe unbekannten Parameter \"%s\"."
 
-#: ../diffuse/src/usr/bin/diffuse:806
+#: ../../diffuse/src/usr/bin/diffuse:840
 msgid "Soft tab width"
 msgstr "Weiche Tabulatorweite"
 
-#: ../diffuse/src/usr/bin/diffuse:6796
-msgid ""
-"Some files have unsaved changes.  Select the files to save before closing."
-msgstr ""
-"Einige Dateien haben ungespeicherte Änderungen. Wählen Sie die Dateien zum "
-"speichern aus, bevor Sie beenden."
+#: ../../diffuse/src/usr/bin/diffuse:7132
+msgid "Some files have unsaved changes.  Select the files to save before closing."
+msgstr "Einige Dateien haben ungespeicherte Änderungen. Wählen Sie die Dateien zum speichern aus, bevor Sie beenden."
 
-#: ../diffuse/src/usr/bin/diffuse:6632
+#: ../../diffuse/src/usr/bin/diffuse:6968
 msgid "Sort Lines In D_escending Order"
 msgstr "Zeile in abst_eigender Reihenfolge sortieren"
 
-#: ../diffuse/src/usr/bin/diffuse:6631
+#: ../../diffuse/src/usr/bin/diffuse:6967
 msgid "Sort Lines In _Ascending Order"
 msgstr "Zeile in _aufsteigender Reihenfolge sortieren"
 
-#: ../diffuse/src/usr/bin/diffuse:3955
+#: ../../diffuse/src/usr/bin/diffuse:4251
 msgid "Swap with Selected Pane"
 msgstr "Mit ausgewähltem Fenster tauschen"
 
-#: ../diffuse/src/usr/bin/diffuse:787
+#: ../../diffuse/src/usr/bin/diffuse:817
 msgid "Tab width"
 msgstr "Tabulatorweite"
 
-#: ../diffuse/src/usr/bin/diffuse:810
+#: ../../diffuse/src/usr/bin/diffuse:842
 msgid "Tabs"
 msgstr "Reiter"
 
-#: ../diffuse/src/usr/bin/diffuse:6313
+#: ../../diffuse/src/usr/bin/diffuse:6638
 #, python-format
 msgid "The file %s changed on disk.  Do you want to reload the file?"
 msgstr "Die Datei %s wurde auf geändert.  Wollen Sie die Datei neu laden?"
 
-#: ../diffuse/src/usr/bin/diffuse:6355
+#: ../../diffuse/src/usr/bin/diffuse:6689
 #, python-format
-msgid ""
-"The file %s has been modified by another process since reading it.  If you "
-"save, all the external changes could be lost.  Save anyways?"
-msgstr ""
-"Die Datei %s wurde seit dem letzten Mal von einem anderen Prozess verändert. "
-"Wenn Sie speichern werden alle externen Änderungen verloren gehen.  Trotzdem "
-"Speichern?"
+msgid "The file %s has been modified by another process since reading it.  If you save, all the external changes could be lost.  Save anyways?"
+msgstr "Die Datei %s wurde seit dem letzten Mal von einem anderen Prozess verändert. Wenn Sie speichern werden alle externen Änderungen verloren gehen.  Trotzdem Speichern?"
 
-#: ../diffuse/src/usr/bin/diffuse:5900
+#: ../../diffuse/src/usr/bin/diffuse:6198
 msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the licence, or (at your option) "
-"any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program.  You may also obtain a copy of the GNU General Public License "
-"from the Free Software Foundation by visiting their web site (http://www.fsf."
-"org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, "
-"Fifth Floor, Boston, MA  02110-1301  USA\n"
+"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the licence, or (at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with this program.  You may also obtain a copy of the GNU General Public License from the Free Software Foundation by visiting their web site (http://www.fsf.org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
 msgstr ""
-
 "Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation veröffentlicht, weitergeben und/oder modifizieren, entweder gemäß Version 3 der Lizenz oder (nach Ihrer Option) jeder späteren Version.\n"
 "\n"
 "Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, daß es Ihnen von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK. Details finden Sie in der GNU General Public License.\n"
 "\n"
 "Sie sollten ein Exemplar der GNU General Public License zusammen mit diesem Programm erhalten haben. Falls nicht, siehe <http://www.gnu.org/licenses/>.\n"
 
-#: ../diffuse/src/usr/bin/diffuse:6687
+#: ../../diffuse/src/usr/bin/diffuse:7023
 msgid "Undo"
 msgstr "Rückgängig"
 
-#: ../diffuse/src/usr/bin/diffuse:859
+#: ../../diffuse/src/usr/bin/diffuse:902
 msgid "Update paths for Cygwin"
 msgstr "Pfade für Cygwin aktualisieren"
 
-#: ../diffuse/src/usr/bin/diffuse:78
+#: ../../diffuse/src/usr/bin/diffuse:78
 msgid ""
 "Usage:\n"
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
 "    diffuse ( -h | -? | --help | -v | --version )\n"
 "\n"
-"Diffuse is a graphical tool for merging and comparing text files.  Diffuse "
-"is\n"
-"able to compare an arbitrary number of files side-by-side and gives users "
-"the\n"
-"ability to manually adjust line matching and directly edit files.  Diffuse "
-"can\n"
+"Diffuse is a graphical tool for merging and comparing text files.  Diffuse is\n"
+"able to compare an arbitrary number of files side-by-side and gives users the\n"
+"ability to manually adjust line matching and directly edit files.  Diffuse can\n"
 "also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,\n"
 "Monotone, RCS, Subversion, and SVK repositories for comparison and merging.\n"
 "\n"
 "Help Options:\n"
 "  ( -h | -? | --help )             Display this usage information\n"
-"  ( -v | --version )               Display version and copyright "
-"information\n"
+"  ( -v | --version )               Display version and copyright information\n"
 "\n"
 "Configuration Options:\n"
 "  --no-rcfile                      Do not read any resource files\n"
@@ -675,10 +669,12 @@
 "  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
 "  ( -D | --close-if-same )         Close all tabs with no differences\n"
 "  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
+"  ( -L | --label ) <label>         Display <label> instead of the file name\n"
 "  ( -m | --modified )              Create a new tab for each modified file\n"
 "  ( -r | --revision ) <rev>        File revision <rev>\n"
 "  ( -s | --separate )              Create a new tab for each file\n"
 "  ( -t | --tab )                   Start a new tab\n"
+"  --line <line>                    Start with line <line> selected\n"
 "  --null-file                      Create a blank file comparison pane\n"
 "\n"
 "Display Options:\n"
@@ -692,15 +688,12 @@
 "    diffuse [ [OPTION...] [DATEI...] ]...\n"
 "    diffuse ( -h | -? | --help | -v | --version )\n"
 "\n"
-"Diffuse ist ein graphisches Werzeug zum Zusammenführen und Vergleichen von "
-"Textdateien.\n"
-"Diffuse ist in der Lage eine beliebige Anzahl von Dateien direkt zu "
-"vergleichen und gibt\n"
-"Nutzern die Möglichkeit manuell die Übereinstimmung anzupassen und Dateien "
-"direkt zu bearbeiten.\n"
-"Diffuse kann ebenfalls Revisionen von Bazaar, CVS, Darcs, Git und Mercurial, "
-"Monotone, RCS,\n"
-"Subversion und SVK Depots empfangen um sie zu Vergleichen und zusammenzuführen\n"
+"Diffuse ist ein graphisches Werzeug zum Zusammenführen und Vergleichen von\n"
+"Textdateien.  Diffuse ist in der Lage eine beliebige Anzahl von Dateien direkt\n"
+"zu vergleichen und gibt Nutzern die Möglichkeit manuell die Übereinstimmung\n"
+"anzupassen und Dateien direkt zu bearbeiten.  Diffuse kann ebenfalls Revisionen\n"
+"von Bazaar, CVS, Darcs, Git und Mercurial, Monotone, RCS, Subversion und SVK\n"
+"Depots empfangen um sie zu Vergleichen und zusammenzuführen.\n"
 "\n"
 "Hilfe Optionen:\n"
 "  ( -h | -? | --help )             Diese Information anzeigen\n"
@@ -713,162 +706,160 @@
 "Generelle Optionen:\n"
 "  ( -c | --commit ) <rev>          Datei Revisionen <rev-1> und <rev>\n"
 "  ( -D | --close-if-same )         Alle Reiter ohne Unterschiede schließen\n"
-"  ( -e | --encoding ) <codec>      <codec> verwenden zum Lesen und Schreiben "
-"von Dateien\n"
-"  ( -m | --modified )              Neuen Reiter für jede modifizierte Datei "
-"öffnen\n"
+"  ( -e | --encoding ) <codec>      <codec> verwenden zum Lesen und Schreiben von Dateien\n"
+"  ( -L | --label ) <label>         <label> anstatt des Dateinamens anzeigen\n"
+"  ( -m | --modified )              Neuen Reiter für jede modifizierte Datei öffnen\n"
 "  ( -r | --revision ) <rev>        Datei Revision <rev>\n"
 "  ( -s | --separate )              Neuen Reiter für jede Datei erstellen\n"
 "  ( -t | --tab )                   Neuen Reiter öffnen\n"
-"  --null-file                      Starte mit leerem Datei-"
-"Vergleichsfenster\n"
+"  --line <line>                    Beim Starten Zeile <line> markieren\n"
+"  --null-file                      Starte mit leerem Datei-Vergleichsfenster\n"
 "\n"
 "Anzeige Optionen:\n"
 "  ( -b | --ignore-space-change )   Änderungen an Leerzeichen ignorieren\n"
 "  ( -B | --ignore-blank-lines )    Änderungen an leeren Zeilen ignorieren\n"
-"  ( -E | --ignore-end-of-line )    Unterschiede an Zeilenumbrüchen "
-"ignorieren\n"
-"  ( -i | --ignore-case )           Unterschiede an Groß- und Kleinschreibung "
-"ignorieren\n"
+"  ( -E | --ignore-end-of-line )    Unterschiede an Zeilenumbrüchen ignorieren\n"
+"  ( -i | --ignore-case )           Unterschiede an Groß- und Kleinschreibung ignorieren\n"
 "  ( -w | --ignore-all-space )      Unterschiede an Leerzeichen ignorieren"
 
-#: ../diffuse/src/usr/bin/diffuse:862
+#: ../../diffuse/src/usr/bin/diffuse:905
 msgid "Version Control"
 msgstr "Versionsverwaltung"
 
-#: ../diffuse/src/usr/bin/diffuse:814
+#: ../../diffuse/src/usr/bin/diffuse:846
 #, python-format
 msgid "Warn me when closing a tab will quit %s"
 msgstr "Warnen, wenn schließen des Tabs %s beendet"
 
-#: ../diffuse/src/usr/bin/diffuse:548
+#: ../../diffuse/src/usr/bin/diffuse:536
 #, python-format
 msgid "Warning: unknown colour \"%s\""
 msgstr "Warnung: Unbekannte Farbe \"%s\""
 
-#: ../diffuse/src/usr/bin/diffuse:557
+#: ../../diffuse/src/usr/bin/diffuse:545
 #, python-format
 msgid "Warning: unknown float \"%s\""
 msgstr "Warnung: Unbekannter Gleitkommawert \"%s\""
 
-#: ../diffuse/src/usr/bin/diffuse:566
+#: ../../diffuse/src/usr/bin/diffuse:554
 #, python-format
 msgid "Warning: unknown string \"%s\""
 msgstr "Warnung: Unbekannte Zeichenkette \"%s\""
 
-#: ../diffuse/src/usr/bin/diffuse:6657
+#: ../../diffuse/src/usr/bin/diffuse:6993
 #, python-format
 msgid "_About %s..."
 msgstr "_Über %s..."
 
-#: ../diffuse/src/usr/bin/diffuse:6579
+#: ../../diffuse/src/usr/bin/diffuse:6913
 msgid "_Close Tab"
 msgstr "_Reiter schließen"
 
-#: ../diffuse/src/usr/bin/diffuse:6588
+#: ../../diffuse/src/usr/bin/diffuse:6922
 msgid "_Copy"
 msgstr "_Kopieren"
 
-#: ../diffuse/src/usr/bin/diffuse:6593
+#: ../../diffuse/src/usr/bin/diffuse:6927
 msgid "_Dismiss All Edits"
 msgstr "Alle Än_derungen verwerfen"
 
-#: ../diffuse/src/usr/bin/diffuse:6583
+#: ../../diffuse/src/usr/bin/diffuse:6917
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: ../diffuse/src/usr/bin/diffuse:6566
+#: ../../diffuse/src/usr/bin/diffuse:6900
 msgid "_File"
 msgstr "_Datei"
 
-#: ../diffuse/src/usr/bin/diffuse:6595
+#: ../../diffuse/src/usr/bin/diffuse:6929
 msgid "_Find..."
 msgstr "_Suchen..."
 
-#: ../diffuse/src/usr/bin/diffuse:6616
+#: ../../diffuse/src/usr/bin/diffuse:6950
 msgid "_First Difference"
 msgstr "_Erster Unterschied"
 
-#: ../diffuse/src/usr/bin/diffuse:6598
+#: ../../diffuse/src/usr/bin/diffuse:6932
 msgid "_Go To Line..."
 msgstr "_Gehe zu Zeile..."
 
-#: ../diffuse/src/usr/bin/diffuse:6654
+#: ../../diffuse/src/usr/bin/diffuse:6990
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../diffuse/src/usr/bin/diffuse:6655
+#: ../../diffuse/src/usr/bin/diffuse:6991
 msgid "_Help Contents..."
 msgstr "_Inhalt..."
 
-#: ../diffuse/src/usr/bin/diffuse:6638
+#: ../../diffuse/src/usr/bin/diffuse:6974
 msgid "_Increase Indenting"
 msgstr "Einzug er_höhen"
 
-#: ../diffuse/src/usr/bin/diffuse:6614
+#: ../../diffuse/src/usr/bin/diffuse:6948
 msgid "_Isolate"
 msgstr "_Isolieren"
 
-#: ../diffuse/src/usr/bin/diffuse:6619
+#: ../../diffuse/src/usr/bin/diffuse:6953
 msgid "_Last Difference"
 msgstr "_Letzter Unterschied"
 
-#: ../diffuse/src/usr/bin/diffuse:6645
+#: ../../diffuse/src/usr/bin/diffuse:6981
 msgid "_Merge"
 msgstr "_Zusammenführen"
 
-#: ../diffuse/src/usr/bin/diffuse:6651
+#: ../../diffuse/src/usr/bin/diffuse:6987
 msgid "_Merge From Left Then Right"
 msgstr "Zusammenführen von links, dann von rechts"
 
-#: ../diffuse/src/usr/bin/diffuse:6618
+#: ../../diffuse/src/usr/bin/diffuse:6952
 msgid "_Next Difference"
 msgstr "_Nächster Unterschied"
 
-#: ../diffuse/src/usr/bin/diffuse:6567
+#: ../../diffuse/src/usr/bin/diffuse:6901
 msgid "_Open File..."
 msgstr "Datei _öffnen"
 
-#: ../diffuse/src/usr/bin/diffuse:6589
+#: ../../diffuse/src/usr/bin/diffuse:6923
 msgid "_Paste"
 msgstr "_Einfügen"
 
-#: ../diffuse/src/usr/bin/diffuse:6617
+#: ../../diffuse/src/usr/bin/diffuse:6951
 msgid "_Previous Difference"
 msgstr "_Voriger Unterschied"
 
-#: ../diffuse/src/usr/bin/diffuse:6581
+#: ../../diffuse/src/usr/bin/diffuse:6915
 msgid "_Quit"
 msgstr "_Beenden"
 
-#: ../diffuse/src/usr/bin/diffuse:6585
+#: ../../diffuse/src/usr/bin/diffuse:6919
 msgid "_Redo"
 msgstr "_Wiederholen"
 
-#: ../diffuse/src/usr/bin/diffuse:6570
+#: ../../diffuse/src/usr/bin/diffuse:6904
 msgid "_Reload File"
 msgstr "Datei _neu laden"
 
-#: ../diffuse/src/usr/bin/diffuse:6572
+#: ../../diffuse/src/usr/bin/diffuse:6906
 msgid "_Save File"
 msgstr "Datei _speichern"
 
-#: ../diffuse/src/usr/bin/diffuse:6611
+#: ../../diffuse/src/usr/bin/diffuse:6945
 msgid "_Syntax Highlighting"
 msgstr "_Syntax Hervorhebung"
 
-#: ../diffuse/src/usr/bin/diffuse:6584
+#: ../../diffuse/src/usr/bin/diffuse:6918
 msgid "_Undo"
 msgstr "_Rückgängig"
 
-#: ../diffuse/src/usr/bin/diffuse:6580
+#: ../../diffuse/src/usr/bin/diffuse:6914
 msgid "_Undo Close Tab"
 msgstr "_Reiter schließen rückgängig"
 
-#: ../diffuse/src/usr/bin/diffuse:6610
+#: ../../diffuse/src/usr/bin/diffuse:6944
 msgid "_View"
 msgstr "_Ansicht"
 
-#: ../diffuse/src/usr/bin/diffuse:5897
+#: ../../diffuse/src/usr/bin/diffuse:6195
 msgid "translator-credits"
 msgstr "Henri Menke <henrimenke4@aim.com>"
+
diff -Nru diffuse-0.4.4/translations/es.po diffuse-0.4.5/translations/es.po
--- diffuse-0.4.4/translations/es.po	2010-10-21 01:58:01.000000000 +0000
+++ diffuse-0.4.5/translations/es.po	2011-07-13 09:18:32.000000000 +0000
@@ -8,597 +8,619 @@
 msgstr ""
 "Project-Id-Version: diffuse-svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-04 19:41+0200\n"
+"POT-Creation-Date: 2011-06-11 22:29+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Henri Menke <henrimenke4@aim.com>\n"
 "Language-Team: Spanish <henrimenke4@aim.com>\n"
+"Language: es\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"
 
-#: ../src/usr/bin/diffuse:857
+#: ../../diffuse/src/usr/bin/diffuse:894
 msgid "\"co\" command"
 msgstr "Comando \"co\""
 
-#: ../src/usr/bin/diffuse:858
+#: ../../diffuse/src/usr/bin/diffuse:895
 msgid "\"rlog\" command"
 msgstr "Comando \"rlog\""
 
-#: ../src/usr/bin/diffuse:6775
+#: ../../diffuse/src/usr/bin/diffuse:7138
 #, python-format
 msgid "%(title)s Pane %(pane)d"
 msgstr "Guardar %(title)s pantalla %(pane)d"
 
-#: ../src/usr/bin/diffuse:6323
+#: ../../diffuse/src/usr/bin/diffuse:6684
 #, python-format
 msgid "A file named %s already exists.  Do you want to overwrite it?"
 msgstr "Ya existe un archivo llamado %s. ¿Quiere reemplazarlo?"
 
-#: ../src/usr/bin/diffuse:3921
+#: ../../diffuse/src/usr/bin/diffuse:4240
 msgid "Align with Selection"
 msgstr "Alinear en la selección."
 
-#: ../src/usr/bin/diffuse:801
+#: ../../diffuse/src/usr/bin/diffuse:828
 msgid "Alignment"
 msgstr "Alineamiento"
 
-#: ../src/usr/bin/diffuse:818
+#: ../../diffuse/src/usr/bin/diffuse:845
 msgid "Always show the tab bar"
 msgstr "Siempre mostrar lista de solapas"
 
-#: ../src/usr/bin/diffuse:5798
+#: ../../diffuse/src/usr/bin/diffuse:718
 msgid "Auto Detect"
 msgstr "Reconocimiento automático"
 
-#: ../src/usr/bin/diffuse:813
+#: ../../diffuse/src/usr/bin/diffuse:838
 msgid "Auto indent"
 msgstr "Sangría automática"
 
-#: ../src/usr/bin/diffuse:6565
+#: ../../diffuse/src/usr/bin/diffuse:6926
 msgid "C_lear Edits"
 msgstr "_Deshacer todo"
 
-#: ../src/usr/bin/diffuse:7030
+#: ../../diffuse/src/usr/bin/diffuse:7407
 msgid "Choose Folder With Modified Files"
 msgstr "Seleccionar carpeta con archivos modificados"
 
-#: ../src/usr/bin/diffuse:3930
-#: ../src/usr/bin/diffuse:6665
+#: ../../diffuse/src/usr/bin/diffuse:4249
+#: ../../diffuse/src/usr/bin/diffuse:7028
 msgid "Clear Edits"
 msgstr "Deshacer todo"
 
-#: ../src/usr/bin/diffuse:5909
+#: ../../diffuse/src/usr/bin/diffuse:6232
 msgid "Close Tab"
 msgstr "Cerrar solapa"
 
-#: ../src/usr/bin/diffuse:6784
+#: ../../diffuse/src/usr/bin/diffuse:7147
 msgid "Close _Without Saving"
 msgstr "Cerrar _sin guardar"
 
-#: ../src/usr/bin/diffuse:5776
+#: ../../diffuse/src/usr/bin/diffuse:6108
 #, python-format
 msgid "Closing this tab will quit %s."
 msgstr "Cerrar de la ultima solapa acaba %s"
 
-#: ../src/usr/bin/diffuse:6027
+#: ../../diffuse/src/usr/bin/diffuse:6370
 #, python-format
 msgid "Column %d"
 msgstr "Columna %d"
 
-#: ../src/usr/bin/diffuse:860
+#: ../../diffuse/src/usr/bin/diffuse:897
 msgid "Command"
 msgstr "Comando"
 
-#: ../src/usr/bin/diffuse:6609
+#: ../../diffuse/src/usr/bin/diffuse:6972
 msgid "Convert Leading Spaces To _Tabs"
 msgstr "Convertir espacios antepuestos en _tabuladores"
 
-#: ../src/usr/bin/diffuse:6608
+#: ../../diffuse/src/usr/bin/diffuse:6971
 msgid "Convert Tabs To _Spaces"
 msgstr "Convertir tabuladores en e_spacios"
 
-#: ../src/usr/bin/diffuse:6616
+#: ../../diffuse/src/usr/bin/diffuse:6979
 msgid "Convert To Uni_x Format"
 msgstr "Convertir en la formato Uni_x"
 
-#: ../src/usr/bin/diffuse:6614
+#: ../../diffuse/src/usr/bin/diffuse:6977
 msgid "Convert To _DOS Format"
 msgstr "Convertir en la formato _DOS"
 
-#: ../src/usr/bin/diffuse:6602
+#: ../../diffuse/src/usr/bin/diffuse:6965
 msgid "Convert To _Lower Case"
 msgstr "Convertir en letras minúsculas"
 
-#: ../src/usr/bin/diffuse:6615
+#: ../../diffuse/src/usr/bin/diffuse:6978
 msgid "Convert To _Mac Format"
 msgstr "Convertir en la formato _Mac"
 
-#: ../src/usr/bin/diffuse:6601
+#: ../../diffuse/src/usr/bin/diffuse:6964
 msgid "Convert To _Upper Case"
 msgstr "Convertir en letras mayúsculas"
 
-#: ../src/usr/bin/diffuse:3926
-#: ../src/usr/bin/diffuse:6663
+#: ../../diffuse/src/usr/bin/diffuse:4245
+#: ../../diffuse/src/usr/bin/diffuse:7026
 msgid "Copy"
 msgstr "Copiar"
 
-#: ../src/usr/bin/diffuse:6655
+#: ../../diffuse/src/usr/bin/diffuse:7018
 msgid "Copy Left Into Selection"
 msgstr "Copiar de izquierda a la selección"
 
-#: ../src/usr/bin/diffuse:6622
+#: ../../diffuse/src/usr/bin/diffuse:6985
 msgid "Copy Left _Into Selection"
 msgstr "Copiar de _izquierda a la selección"
 
-#: ../src/usr/bin/diffuse:6623
+#: ../../diffuse/src/usr/bin/diffuse:6986
 msgid "Copy Right I_nto Selection"
 msgstr "Copiar de de_recha a la selección"
 
-#: ../src/usr/bin/diffuse:6656
+#: ../../diffuse/src/usr/bin/diffuse:7019
 msgid "Copy Right Into Selection"
 msgstr "Copiar de derecha a la selección"
 
-#: ../src/usr/bin/diffuse:6654
+#: ../../diffuse/src/usr/bin/diffuse:7017
 msgid "Copy Selection Left"
 msgstr "Copiar selección a la izquierda"
 
-#: ../src/usr/bin/diffuse:6653
+#: ../../diffuse/src/usr/bin/diffuse:7016
 msgid "Copy Selection Right"
 msgstr "Copiar selección a la derecha"
 
-#: ../src/usr/bin/diffuse:6620
+#: ../../diffuse/src/usr/bin/diffuse:6983
 msgid "Copy Selection _Left"
 msgstr "Copiar selección a la i_zquierda"
 
-#: ../src/usr/bin/diffuse:6619
+#: ../../diffuse/src/usr/bin/diffuse:6982
 msgid "Copy Selection _Right"
 msgstr "Copiar selección a la de_recha"
 
-#: ../src/usr/bin/diffuse:67
-msgid "Copyright © 2006-2010 Derrick Moser"
-msgstr "Copyright © 2006-2010 Derrick Moser"
+#: ../../diffuse/src/usr/bin/diffuse:67
+msgid "Copyright © 2006-2011 Derrick Moser"
+msgstr "Copyright © 2006-2011 Derrick Moser"
 
-#: ../src/usr/bin/diffuse:6560
+#: ../../diffuse/src/usr/bin/diffuse:6921
 msgid "Cu_t"
 msgstr "Cor_tar"
 
-#: ../src/usr/bin/diffuse:3925
-#: ../src/usr/bin/diffuse:6662
+#: ../../diffuse/src/usr/bin/diffuse:4244
+#: ../../diffuse/src/usr/bin/diffuse:7025
 msgid "Cut"
 msgstr "Cortar"
 
-#: ../src/usr/bin/diffuse:837
+#: ../../diffuse/src/usr/bin/diffuse:874
 msgid "Cygdrive prefix"
 msgstr "Prefijo del Cygdrive"
 
-#: ../src/usr/bin/diffuse:834
+#: ../../diffuse/src/usr/bin/diffuse:871
 msgid "Cygwin"
 msgstr "Cygwin"
 
-#: ../src/usr/bin/diffuse:6612
+#: ../../diffuse/src/usr/bin/diffuse:6975
 msgid "De_crease Indenting"
 msgstr "Quitar sangría"
 
-#: ../src/usr/bin/diffuse:817
+#: ../../diffuse/src/usr/bin/diffuse:850
+msgid "Default codec"
+msgstr "Cifra estándar"
+
+#: ../../diffuse/src/usr/bin/diffuse:844
 msgid "Default panes"
 msgstr "Pantalla estándar"
 
-#: ../src/usr/bin/diffuse:861
+#: ../../diffuse/src/usr/bin/diffuse:898
 msgid "Default revision"
 msgstr "Revisión estándar"
 
-#: ../src/usr/bin/diffuse:5871
+#: ../../diffuse/src/usr/bin/diffuse:6194
 msgid "Derrick Moser <derrick_moser@yahoo.com>"
 msgstr "Derrick Moser <derrick_moser@yahoo.com>"
 
-#: ../src/usr/bin/diffuse:5868
+#: ../../diffuse/src/usr/bin/diffuse:6191
 msgid "Diffuse is a graphical tool for merging and comparing text files."
 msgstr "Diffuse es un utillaje para juntar y comparar archivos de texto."
 
-#: ../src/usr/bin/diffuse:789
+#: ../../diffuse/src/usr/bin/diffuse:814
 msgid "Display"
 msgstr "Display"
 
-#: ../src/usr/bin/diffuse:809
+#: ../../diffuse/src/usr/bin/diffuse:836
 msgid "Editor"
 msgstr "Editor"
 
-#: ../src/usr/bin/diffuse:5788
+#: ../../diffuse/src/usr/bin/diffuse:6120
 msgid "Encoding: "
 msgstr "Codificación:"
 
-#: ../src/usr/bin/diffuse:6370
+#: ../../diffuse/src/usr/bin/diffuse:6731
 #, python-format
 msgid "Error encoding to %s."
 msgstr "Error codificando a %s."
 
-#: ../src/usr/bin/diffuse:1932
+#: ../../diffuse/src/usr/bin/diffuse:2002
 #, python-format
 msgid "Error parsing %s."
 msgstr "Error analizando %s."
 
-#: ../src/usr/bin/diffuse:6412
+#: ../../diffuse/src/usr/bin/diffuse:6773
+#: ../../diffuse/src/usr/bin/diffuse:7779
 msgid "Error parsing line number."
 msgstr "Error analizando número de líneas."
 
-#: ../src/usr/bin/diffuse:7327
+#: ../../diffuse/src/usr/bin/diffuse:7724
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "Error analizando revisión %s."
 
-#: ../src/usr/bin/diffuse:7391
+#: ../../diffuse/src/usr/bin/diffuse:7796
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "Falla processando parámetro \"%s\".  No he esperado a un directorio."
 
-#: ../src/usr/bin/diffuse:706
+#: ../../diffuse/src/usr/bin/diffuse:690
 #, python-format
 msgid "Error processing line %(line)d of %(file)s."
 msgstr "Error analizando líneas %(line)d de %(file)s."
 
-#: ../src/usr/bin/diffuse:6217
-#: ../src/usr/bin/diffuse:7299
+#: ../../diffuse/src/usr/bin/diffuse:6565
+#: ../../diffuse/src/usr/bin/diffuse:7696
 #, python-format
 msgid "Error reading %s."
 msgstr "Error leyendo %s."
 
-#: ../src/usr/bin/diffuse:6215
+#: ../../diffuse/src/usr/bin/diffuse:6563
 #, python-format
 msgid "Error reading revision %(rev)s of %(file)s."
 msgstr "Error leyendo revisión %(rev)s de %(file)s."
 
-#: ../src/usr/bin/diffuse:6981
+#: ../../diffuse/src/usr/bin/diffuse:7358
 #, python-format
 msgid "Error retrieving modifications for %s."
 msgstr "Error recibiendo cambios de %s."
 
-#: ../src/usr/bin/diffuse:944
-#: ../src/usr/bin/diffuse:6374
+#: ../../diffuse/src/usr/bin/diffuse:995
+#: ../../diffuse/src/usr/bin/diffuse:6735
 #, python-format
 msgid "Error writing %s."
 msgstr "Error guardando %s."
 
-#: ../src/usr/bin/diffuse:812
+#: ../../diffuse/src/usr/bin/diffuse:839
 msgid "Expand tabs to spaces"
 msgstr "Ampliar tabuladores a espacios"
 
-#: ../src/usr/bin/diffuse:6600
+#: ../../diffuse/src/usr/bin/diffuse:6963
 msgid "F_ormat"
 msgstr "F_ormato"
 
-#: ../src/usr/bin/diffuse:6891
+#: ../../diffuse/src/usr/bin/diffuse:7255
 #, python-format
 msgid "File Merge %d"
 msgstr "Mezclar archivos %d"
 
-#: ../src/usr/bin/diffuse:6570
+#: ../../diffuse/src/usr/bin/diffuse:6931
 msgid "Find Pre_vious"
 msgstr "Buscar an_terior"
 
-#: ../src/usr/bin/diffuse:6569
+#: ../../diffuse/src/usr/bin/diffuse:6930
 msgid "Find _Next"
 msgstr "Buscar siguie_nte"
 
-#: ../src/usr/bin/diffuse:5726
+#: ../../diffuse/src/usr/bin/diffuse:6058
 msgid "Find..."
 msgstr "Buscar..."
 
-#: ../src/usr/bin/diffuse:6648
+#: ../../diffuse/src/usr/bin/diffuse:6955
+msgid "Fir_st Tab"
+msgstr "Prime_ra solapa"
+
+#: ../../diffuse/src/usr/bin/diffuse:7011
 msgid "First Difference"
 msgstr "Diferencía primera"
 
-#: ../src/usr/bin/diffuse:791
+#: ../../diffuse/src/usr/bin/diffuse:816
 msgid "Font"
 msgstr "Fuente"
 
-#: ../src/usr/bin/diffuse:5831
+#: ../../diffuse/src/usr/bin/diffuse:6154
 msgid "Go To Line..."
 msgstr "Ir a la línea..."
 
-#: ../src/usr/bin/diffuse:797
+#: ../../diffuse/src/usr/bin/diffuse:825
 msgid "Ignore blank line differences"
 msgstr "Ignorar diferencías de líneas vacías"
 
-#: ../src/usr/bin/diffuse:805
+#: ../../diffuse/src/usr/bin/diffuse:833
 msgid "Ignore blank lines"
 msgstr "Ignorar líneas vacías"
 
-#: ../src/usr/bin/diffuse:807
+#: ../../diffuse/src/usr/bin/diffuse:830
 msgid "Ignore case"
 msgstr "Ignorar registro alto y empleo de minúsculas"
 
-#: ../src/usr/bin/diffuse:798
+#: ../../diffuse/src/usr/bin/diffuse:822
 msgid "Ignore case differences"
 msgstr "Ignorar diferencías de registro alto y empleo de minúsculas"
 
-#: ../src/usr/bin/diffuse:796
-#: ../src/usr/bin/diffuse:804
+#: ../../diffuse/src/usr/bin/diffuse:824
+#: ../../diffuse/src/usr/bin/diffuse:832
 msgid "Ignore changes to white space"
 msgstr "Ignorar cambios de espacios"
 
-#: ../src/usr/bin/diffuse:806
+#: ../../diffuse/src/usr/bin/diffuse:834
 msgid "Ignore end of line characters"
 msgstr "Ignorar revoluciónes de líneas"
 
-#: ../src/usr/bin/diffuse:799
+#: ../../diffuse/src/usr/bin/diffuse:826
 msgid "Ignore end of line differences"
 msgstr "Ignorar diferencías de revoluciónes de líneas"
 
-#: ../src/usr/bin/diffuse:803
+#: ../../diffuse/src/usr/bin/diffuse:831
 msgid "Ignore white space"
 msgstr "Ignorar espacios"
 
-#: ../src/usr/bin/diffuse:795
+#: ../../diffuse/src/usr/bin/diffuse:823
 msgid "Ignore white space differences"
 msgstr "Ignorar diferencías de espacios"
 
-#: ../src/usr/bin/diffuse:3922
+#: ../../diffuse/src/usr/bin/diffuse:4241
 msgid "Isolate"
 msgstr "Aislar"
 
-#: ../src/usr/bin/diffuse:6651
+#: ../../diffuse/src/usr/bin/diffuse:6958
+msgid "Las_t Tab"
+msgstr "Ul_tima solapa"
+
+#: ../../diffuse/src/usr/bin/diffuse:7014
 msgid "Last Difference"
 msgstr "Diferencía ultima"
 
-#: ../src/usr/bin/diffuse:863
+#: ../../diffuse/src/usr/bin/diffuse:900
 msgid "Launch from a Bash login shell"
 msgstr "Ejecutar de una Bash login shell"
 
-#: ../src/usr/bin/diffuse:5837
+#: ../../diffuse/src/usr/bin/diffuse:6160
 msgid "Line Number: "
 msgstr "Número de líneas: "
 
-#: ../src/usr/bin/diffuse:6625
+#: ../../diffuse/src/usr/bin/diffuse:6988
 msgid "M_erge From Right Then Left"
 msgstr "Juntar del d_erecho, después de la izquierda"
 
-#: ../src/usr/bin/diffuse:5757
+#: ../../diffuse/src/usr/bin/diffuse:6089
 msgid "Match Case"
 msgstr "Concordancia del registro alto y empleo de minúsculas."
 
-#: ../src/usr/bin/diffuse:6657
+#: ../../diffuse/src/usr/bin/diffuse:7020
 msgid "Merge From Left Then Right"
 msgstr "Juntar de la izquierda, después del derecho"
 
-#: ../src/usr/bin/diffuse:6658
+#: ../../diffuse/src/usr/bin/diffuse:7021
 msgid "Merge From Right Then Left"
 msgstr "Juntar del derecho, después de la izquierda"
 
-#: ../src/usr/bin/diffuse:3923
+#: ../../diffuse/src/usr/bin/diffuse:4242
 msgid "Merge Selection"
 msgstr "Juntar selección"
 
-#: ../src/usr/bin/diffuse:6644
+#: ../../diffuse/src/usr/bin/diffuse:7007
 msgid "New 2-Way File Merge"
 msgstr "Nuevo juntar en 2 direcciónes"
 
-#: ../src/usr/bin/diffuse:6645
+#: ../../diffuse/src/usr/bin/diffuse:7008
 msgid "New 3-Way File Merge"
 msgstr "Nuevo juntar en 3 direcciónes"
 
-#: ../src/usr/bin/diffuse:6549
+#: ../../diffuse/src/usr/bin/diffuse:6910
 msgid "New _2-Way File Merge"
 msgstr "Nuevo juntar en _2 direcciónes"
 
-#: ../src/usr/bin/diffuse:6550
+#: ../../diffuse/src/usr/bin/diffuse:6911
 msgid "New _3-Way File Merge"
 msgstr "Nuevo juntar en _3 direcciónes"
 
-#: ../src/usr/bin/diffuse:6650
+#: ../../diffuse/src/usr/bin/diffuse:7013
 msgid "Next Difference"
 msgstr "Diferencía próxima"
 
-#: ../src/usr/bin/diffuse:6595
+#: ../../diffuse/src/usr/bin/diffuse:6957
 msgid "Next _Tab"
 msgstr "Solapa  próxima"
 
-#: ../src/usr/bin/diffuse:7043
+#: ../../diffuse/src/usr/bin/diffuse:7420
 msgid "No modified files found."
 msgstr "No archivos modificados encontrado."
 
-#: ../src/usr/bin/diffuse:6575
+#: ../../diffuse/src/usr/bin/diffuse:6936
 msgid "None"
 msgstr "Ningún"
 
-#: ../src/usr/bin/diffuse:6240
+#: ../../diffuse/src/usr/bin/diffuse:6588
 msgid "Open File"
 msgstr "Abrir archivo"
 
-#: ../src/usr/bin/diffuse:7014
+#: ../../diffuse/src/usr/bin/diffuse:7391
 msgid "Open File In New Tab"
 msgstr "Abrir archivo en solapa nueva"
 
-#: ../src/usr/bin/diffuse:6541
+#: ../../diffuse/src/usr/bin/diffuse:6902
 msgid "Open File In New _Tab..."
 msgstr "Abrir archivo en _solapa nueva..."
 
-#: ../src/usr/bin/diffuse:5950
+#: ../../diffuse/src/usr/bin/diffuse:6287
 msgid "Open File..."
 msgstr "Abrir archivo..."
 
-#: ../src/usr/bin/diffuse:6542
+#: ../../diffuse/src/usr/bin/diffuse:6903
 msgid "Open _Modified Files..."
 msgstr "Abrir archivos _modificados"
 
-#: ../src/usr/bin/diffuse:823
+#: ../../diffuse/src/usr/bin/diffuse:851
 msgid "Order of codecs used to identify encoding"
-msgstr "Reihenfolge der Chiffren um die Kodierung zu erkennen"
+msgstr "Secuencia de cifras para identificar la codificación."
 
-#: ../src/usr/bin/diffuse:3927
-#: ../src/usr/bin/diffuse:6664
+#: ../../diffuse/src/usr/bin/diffuse:4246
+#: ../../diffuse/src/usr/bin/diffuse:7027
 msgid "Paste"
 msgstr "Pegar"
 
-#: ../src/usr/bin/diffuse:7127
+#: ../../diffuse/src/usr/bin/diffuse:7509
 msgid "Phrase not found.  Continue from the end of the file?"
 msgstr "Listado no encontrado. Continuar al final del archivo?"
 
-#: ../src/usr/bin/diffuse:7129
+#: ../../diffuse/src/usr/bin/diffuse:7511
 msgid "Phrase not found.  Continue from the start of the file?"
 msgstr "Listado no encontrado. Continuar al principio del archivo?"
 
-#: ../src/usr/bin/diffuse:6573
+#: ../../diffuse/src/usr/bin/diffuse:6934
 msgid "Pr_eferences..."
 msgstr "Pr_eferencias..."
 
-#: ../src/usr/bin/diffuse:6594
+#: ../../diffuse/src/usr/bin/diffuse:6956
 msgid "Pre_vious Tab"
 msgstr "Solapa pre_via"
 
-#: ../src/usr/bin/diffuse:920
+#: ../../diffuse/src/usr/bin/diffuse:966
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../src/usr/bin/diffuse:6435
+#: ../../diffuse/src/usr/bin/diffuse:6796
 msgid "Press the enter key or double click to edit.  Press the space bar or use the RMB menu to manually align."
 msgstr "Pulse Enter o clic dos veces para editar.  Pulse espacidor o use el menú RMB para sangría manual."
 
-#: ../src/usr/bin/diffuse:6437
+#: ../../diffuse/src/usr/bin/diffuse:6798
 msgid "Press the escape key to finish editing."
 msgstr "Pulse Escape para finalizar editar"
 
-#: ../src/usr/bin/diffuse:6649
+#: ../../diffuse/src/usr/bin/diffuse:7012
 msgid "Previous Difference"
 msgstr "Diferencía previa"
 
-#: ../src/usr/bin/diffuse:6586
+#: ../../diffuse/src/usr/bin/diffuse:6947
 msgid "Re_align All"
 msgstr "S_angrar todo de nuevo"
 
-#: ../src/usr/bin/diffuse:6647
+#: ../../diffuse/src/usr/bin/diffuse:7010
 msgid "Realign All"
 msgstr "Sangrar todo de nuevo"
 
-#: ../src/usr/bin/diffuse:6661
+#: ../../diffuse/src/usr/bin/diffuse:7024
 msgid "Redo"
 msgstr "Rehacer"
 
-#: ../src/usr/bin/diffuse:821
+#: ../../diffuse/src/usr/bin/diffuse:848
 msgid "Regional Settings"
 msgstr "Localisación"
 
-#: ../src/usr/bin/diffuse:5951
+#: ../../diffuse/src/usr/bin/diffuse:6288
 msgid "Reload File"
 msgstr "Revertir"
 
-#: ../src/usr/bin/diffuse:6607
+#: ../../diffuse/src/usr/bin/diffuse:6970
 msgid "Remove Trailing _White Space"
 msgstr "Quitar espacios adjuntos"
 
-#: ../src/usr/bin/diffuse:5806
+#: ../../diffuse/src/usr/bin/diffuse:6130
 msgid "Revision: "
 msgstr "Revision: "
 
-#: ../src/usr/bin/diffuse:836
+#: ../../diffuse/src/usr/bin/diffuse:819
+msgid "Right margin"
+msgstr "Margen derecho"
+
+#: ../../diffuse/src/usr/bin/diffuse:873
 msgid "Root directory"
 msgstr "Sistema de archivos"
 
-#: ../src/usr/bin/diffuse:6306
+#: ../../diffuse/src/usr/bin/diffuse:6658
 #, python-format
 msgid "Save %(title)s Pane %(pane)d"
 msgstr "Save %(title)s Pane %(pane)d"
 
-#: ../src/usr/bin/diffuse:6547
+#: ../../diffuse/src/usr/bin/diffuse:6908
 msgid "Save A_ll"
 msgstr "Gu_ardar todos"
 
-#: ../src/usr/bin/diffuse:5952
+#: ../../diffuse/src/usr/bin/diffuse:6289
 msgid "Save File"
 msgstr "Guardar archivo"
 
-#: ../src/usr/bin/diffuse:5953
+#: ../../diffuse/src/usr/bin/diffuse:6290
 msgid "Save File As..."
 msgstr "Guardar archivo como..."
 
-#: ../src/usr/bin/diffuse:6546
+#: ../../diffuse/src/usr/bin/diffuse:6907
 msgid "Save File _As..."
 msgstr "Guardar _archivo como..."
 
-#: ../src/usr/bin/diffuse:6092
+#: ../../diffuse/src/usr/bin/diffuse:6435
 msgid "Save changes before loading the new file?"
 msgstr "¿Guardar cambios antes de abrir un archivo nuevo?"
 
-#: ../src/usr/bin/diffuse:5762
+#: ../../diffuse/src/usr/bin/diffuse:6094
 msgid "Search Backwards"
 msgstr "Buscar atrás"
 
-#: ../src/usr/bin/diffuse:5732
+#: ../../diffuse/src/usr/bin/diffuse:6064
 msgid "Search For: "
 msgstr "Buscar a: "
 
-#: ../src/usr/bin/diffuse:3929
+#: ../../diffuse/src/usr/bin/diffuse:4248
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: ../src/usr/bin/diffuse:6564
+#: ../../diffuse/src/usr/bin/diffuse:6925
 msgid "Select _All"
 msgstr "Seleccion_ar todo"
 
-#: ../src/usr/bin/diffuse:6439
+#: ../../diffuse/src/usr/bin/diffuse:6800
 msgid "Select target line and press the space bar to align.  Press the escape key to cancel."
 msgstr "Selecciona la línea y aprieta el espaciador para alinear.  Aprieta escape para cancelar."
 
-#: ../src/usr/bin/diffuse:6598
+#: ../../diffuse/src/usr/bin/diffuse:6961
 msgid "Shift Pane _Left"
 msgstr "Mover pantalla a _la izquierda"
 
-#: ../src/usr/bin/diffuse:6597
+#: ../../diffuse/src/usr/bin/diffuse:6960
 msgid "Shift Pane _Right"
 msgstr "Mover pantalla a la de_recha"
 
-#: ../src/usr/bin/diffuse:793
+#: ../../diffuse/src/usr/bin/diffuse:820
 msgid "Show line numbers"
 msgstr "Mostrar número de líneas"
 
-#: ../src/usr/bin/diffuse:794
+#: ../../diffuse/src/usr/bin/diffuse:818
+msgid "Show right margin"
+msgstr "Mostrar margen derecho"
+
+#: ../../diffuse/src/usr/bin/diffuse:821
 msgid "Show white space characters"
 msgstr "Mostrar espacios"
 
-#: ../src/usr/bin/diffuse:7384
+#: ../../diffuse/src/usr/bin/diffuse:7789
 #, python-format
 msgid "Skipping unknown argument \"%s\"."
 msgstr "Omitiendo argumento desconocido \"%s\"."
 
-#: ../src/usr/bin/diffuse:811
+#: ../../diffuse/src/usr/bin/diffuse:840
 msgid "Soft tab width"
 msgstr "Tabuladores blandos"
 
-#: ../src/usr/bin/diffuse:6769
+#: ../../diffuse/src/usr/bin/diffuse:7132
 msgid "Some files have unsaved changes.  Select the files to save before closing."
 msgstr "Unos archivos tienen cambios. Elige los archivos para guardar antes de salir."
 
-#: ../src/usr/bin/diffuse:6605
+#: ../../diffuse/src/usr/bin/diffuse:6968
 msgid "Sort Lines In D_escending Order"
 msgstr "Ordenar lineas in orden descendente"
 
-#: ../src/usr/bin/diffuse:6604
+#: ../../diffuse/src/usr/bin/diffuse:6967
 msgid "Sort Lines In _Ascending Order"
 msgstr "Ordenar lineas in orden ascendente"
 
-#: ../src/usr/bin/diffuse:3932
+#: ../../diffuse/src/usr/bin/diffuse:4251
 msgid "Swap with Selected Pane"
 msgstr "Canjear con pantalla seleccionada"
 
-#: ../src/usr/bin/diffuse:792
+#: ../../diffuse/src/usr/bin/diffuse:817
 msgid "Tab width"
 msgstr "Amplitud de tabulador"
 
-#: ../src/usr/bin/diffuse:815
+#: ../../diffuse/src/usr/bin/diffuse:842
 msgid "Tabs"
 msgstr "Solapas"
 
-#: ../src/usr/bin/diffuse:6286
+#: ../../diffuse/src/usr/bin/diffuse:6638
 #, python-format
 msgid "The file %s changed on disk.  Do you want to reload the file?"
 msgstr "El archivo %s ha cambiado.  Quieres recargar?"
 
-#: ../src/usr/bin/diffuse:6328
+#: ../../diffuse/src/usr/bin/diffuse:6689
 #, python-format
 msgid "The file %s has been modified by another process since reading it.  If you save, all the external changes could be lost.  Save anyways?"
 msgstr "El archivo %s ha cambiado por otro proceso. Sí guardas todos los cambios externos son rechazados.  Guardar sin embargo?"
 
-#: ../src/usr/bin/diffuse:5875
+#: ../../diffuse/src/usr/bin/diffuse:6198
 msgid ""
 "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the licence, or (at your option) any later version.\n"
 "\n"
@@ -612,15 +634,16 @@
 "\n"
 "You should have received a copy of the GNU General Public License along with this program.  You may also obtain a copy of the GNU General Public License from the Free Software Foundation by visiting their web site (http://www.fsf.org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
 
-#: ../src/usr/bin/diffuse:6660
+#: ../../diffuse/src/usr/bin/diffuse:7023
 msgid "Undo"
 msgstr "Deshacer"
 
-#: ../src/usr/bin/diffuse:865
+#: ../../diffuse/src/usr/bin/diffuse:902
 msgid "Update paths for Cygwin"
 msgstr "Actualizar caminos para Cygwin"
 
-#: ../src/usr/bin/diffuse:78
+#: ../../diffuse/src/usr/bin/diffuse:78
+#, fuzzy
 msgid ""
 "Usage:\n"
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
@@ -644,10 +667,12 @@
 "  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
 "  ( -D | --close-if-same )         Close all tabs with no differences\n"
 "  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
+"  ( -L | --label ) <label>         Display <label> instead of the file name\n"
 "  ( -m | --modified )              Create a new tab for each modified file\n"
 "  ( -r | --revision ) <rev>        File revision <rev>\n"
 "  ( -s | --separate )              Create a new tab for each file\n"
 "  ( -t | --tab )                   Start a new tab\n"
+"  --line <line>                    Start with line <line> selected\n"
 "  --null-file                      Create a blank file comparison pane\n"
 "\n"
 "Display Options:\n"
@@ -692,151 +717,145 @@
 "  ( -i | --ignore-case )           Ignore case differences\n"
 "  ( -w | --ignore-all-space )      Ignore white space differences"
 
-#: ../src/usr/bin/diffuse:868
+#: ../../diffuse/src/usr/bin/diffuse:905
 msgid "Version Control"
 msgstr "Control de versión"
 
-#: ../src/usr/bin/diffuse:819
+#: ../../diffuse/src/usr/bin/diffuse:846
 #, python-format
 msgid "Warn me when closing a tab will quit %s"
 msgstr "Avísame sí cerrar la ultima solapa cierres la aplicación %s"
 
-#: ../src/usr/bin/diffuse:549
+#: ../../diffuse/src/usr/bin/diffuse:536
 #, python-format
 msgid "Warning: unknown colour \"%s\""
 msgstr "Advertencia: color desconocido \"%s\""
 
-#: ../src/usr/bin/diffuse:558
+#: ../../diffuse/src/usr/bin/diffuse:545
 #, python-format
 msgid "Warning: unknown float \"%s\""
 msgstr "Advertencia: coma flotante desconocido \"%s\""
 
-#: ../src/usr/bin/diffuse:567
+#: ../../diffuse/src/usr/bin/diffuse:554
 #, python-format
 msgid "Warning: unknown string \"%s\""
 msgstr "Advertencia: frase desconocido \"%s\""
 
-#: ../src/usr/bin/diffuse:6630
+#: ../../diffuse/src/usr/bin/diffuse:6993
 #, python-format
 msgid "_About %s..."
 msgstr "_Acerca de %s..."
 
-#: ../src/usr/bin/diffuse:6552
+#: ../../diffuse/src/usr/bin/diffuse:6913
 msgid "_Close Tab"
 msgstr "_cerrar solapa"
 
-#: ../src/usr/bin/diffuse:6561
+#: ../../diffuse/src/usr/bin/diffuse:6922
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: ../src/usr/bin/diffuse:6566
+#: ../../diffuse/src/usr/bin/diffuse:6927
 msgid "_Dismiss All Edits"
 msgstr "_Deshacer todo"
 
-#: ../src/usr/bin/diffuse:6556
+#: ../../diffuse/src/usr/bin/diffuse:6917
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/usr/bin/diffuse:6539
+#: ../../diffuse/src/usr/bin/diffuse:6900
 msgid "_File"
 msgstr "_Archivo"
 
-#: ../src/usr/bin/diffuse:6568
+#: ../../diffuse/src/usr/bin/diffuse:6929
 msgid "_Find..."
 msgstr "_Buscar..."
 
-#: ../src/usr/bin/diffuse:6589
+#: ../../diffuse/src/usr/bin/diffuse:6950
 msgid "_First Difference"
 msgstr "Primer di_ferencia"
 
-#: ../src/usr/bin/diffuse:6571
+#: ../../diffuse/src/usr/bin/diffuse:6932
 msgid "_Go To Line..."
 msgstr "_Ir a la línea..."
 
-#: ../src/usr/bin/diffuse:6627
+#: ../../diffuse/src/usr/bin/diffuse:6990
 msgid "_Help"
 msgstr "_Ayuda"
 
-#: ../src/usr/bin/diffuse:6628
+#: ../../diffuse/src/usr/bin/diffuse:6991
 msgid "_Help Contents..."
 msgstr "Índ_ice..."
 
-#: ../src/usr/bin/diffuse:6611
+#: ../../diffuse/src/usr/bin/diffuse:6974
 msgid "_Increase Indenting"
 msgstr "Sangr_ía"
 
-#: ../src/usr/bin/diffuse:6587
+#: ../../diffuse/src/usr/bin/diffuse:6948
 msgid "_Isolate"
 msgstr "A_islar"
 
-#: ../src/usr/bin/diffuse:6592
+#: ../../diffuse/src/usr/bin/diffuse:6953
 msgid "_Last Difference"
 msgstr "U_ltima diferencia"
 
-#: ../src/usr/bin/diffuse:6618
+#: ../../diffuse/src/usr/bin/diffuse:6981
 msgid "_Merge"
 msgstr "_Juntar"
 
-#: ../src/usr/bin/diffuse:6624
+#: ../../diffuse/src/usr/bin/diffuse:6987
 msgid "_Merge From Left Then Right"
 msgstr "_Juntar de la izquierda, después del derecho"
 
-#: ../src/usr/bin/diffuse:6591
+#: ../../diffuse/src/usr/bin/diffuse:6952
 msgid "_Next Difference"
 msgstr "Diferencia siguie_nte"
 
-#: ../src/usr/bin/diffuse:6540
+#: ../../diffuse/src/usr/bin/diffuse:6901
 msgid "_Open File..."
 msgstr "Abrir archiv_o"
 
-#: ../src/usr/bin/diffuse:6562
+#: ../../diffuse/src/usr/bin/diffuse:6923
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: ../src/usr/bin/diffuse:6590
+#: ../../diffuse/src/usr/bin/diffuse:6951
 msgid "_Previous Difference"
 msgstr "Diferencia an_terior"
 
-#: ../src/usr/bin/diffuse:6554
+#: ../../diffuse/src/usr/bin/diffuse:6915
 msgid "_Quit"
 msgstr "_Salir"
 
-#: ../src/usr/bin/diffuse:6558
+#: ../../diffuse/src/usr/bin/diffuse:6919
 msgid "_Redo"
 msgstr "_Rehacer"
 
-#: ../src/usr/bin/diffuse:6543
+#: ../../diffuse/src/usr/bin/diffuse:6904
 msgid "_Reload File"
 msgstr "_Recargar"
 
-#: ../src/usr/bin/diffuse:6545
+#: ../../diffuse/src/usr/bin/diffuse:6906
 msgid "_Save File"
 msgstr "_Guardar"
 
-#: ../src/usr/bin/diffuse:6584
+#: ../../diffuse/src/usr/bin/diffuse:6945
 msgid "_Syntax Highlighting"
 msgstr "Acentuación _sintáctico"
 
-#: ../src/usr/bin/diffuse:6557
+#: ../../diffuse/src/usr/bin/diffuse:6918
 msgid "_Undo"
 msgstr "_Deshacer"
 
-#: ../src/usr/bin/diffuse:6553
+#: ../../diffuse/src/usr/bin/diffuse:6914
 msgid "_Undo Close Tab"
 msgstr "_Deshacer cerrar solapa"
 
-#: ../src/usr/bin/diffuse:6583
+#: ../../diffuse/src/usr/bin/diffuse:6944
 msgid "_View"
 msgstr "_Ver"
 
-#: ../src/usr/bin/diffuse:5872
+#: ../../diffuse/src/usr/bin/diffuse:6195
 msgid "translator-credits"
 msgstr ""
 "Henri Menke <henrimenke4@aim.com>\n"
 "Por favor, haga una traducción española mejor porque no soy hablante nativo."
-
-#~ msgid "Henri Menke <henrimenke4@aim.com> (German)"
-#~ msgstr "Henri Menke <henrimenke4@aim.com> (Deutsch)"
-#~ msgid "Unexpected directory %s."
-#~ msgstr "Directorio inesperado %s."
-
diff -Nru diffuse-0.4.4/translations/it.po diffuse-0.4.5/translations/it.po
--- diffuse-0.4.4/translations/it.po	1970-01-01 00:00:00.000000000 +0000
+++ diffuse-0.4.5/translations/it.po	2011-07-13 09:18:32.000000000 +0000
@@ -0,0 +1,898 @@
+# Italian translations for Diffuse package.
+# Copyright (C) 2010 THE Diffuse'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the Diffuse package.
+# Cristian Marchi <cri.penta@gmail.com>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Diffuse 0.4.4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-06-22 21:45+0200\n"
+"PO-Revision-Date: 2011-06-18 08:42+0100\n"
+"Last-Translator: Cristian Marchi <cri.penta@gmail.com>\n"
+"Language-Team: Italian\n"
+"Language: \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"
+
+#: ../src/usr/bin/diffuse:894
+msgid "\"co\" command"
+msgstr "Comando \"co\""
+
+#: ../src/usr/bin/diffuse:895
+msgid "\"rlog\" command"
+msgstr "Comando \"rlog\""
+
+#: ../src/usr/bin/diffuse:7138
+#, python-format
+msgid "%(title)s Pane %(pane)d"
+msgstr "%(title)s riquadro %(pane)d"
+
+#: ../src/usr/bin/diffuse:6684
+#, python-format
+msgid "A file named %s already exists.  Do you want to overwrite it?"
+msgstr "Il file «%s» esiste già. Sovrascrivere?"
+
+#: ../src/usr/bin/diffuse:4240
+msgid "Align with Selection"
+msgstr "Allinea con la selezione"
+
+#: ../src/usr/bin/diffuse:828
+msgid "Alignment"
+msgstr "Allineamento"
+
+#: ../src/usr/bin/diffuse:845
+msgid "Always show the tab bar"
+msgstr "Mostra sempre la barra delle schede"
+
+#: ../src/usr/bin/diffuse:718
+msgid "Auto Detect"
+msgstr "Automatico"
+
+#: ../src/usr/bin/diffuse:838
+msgid "Auto indent"
+msgstr "Indentazione automatica"
+
+#: ../src/usr/bin/diffuse:6926
+msgid "C_lear Edits"
+msgstr "Annulla _modifiche"
+
+#: ../src/usr/bin/diffuse:7407
+msgid "Choose Folder With Modified Files"
+msgstr "Selezionare la cartella con i file modificati"
+
+#: ../src/usr/bin/diffuse:4249 ../src/usr/bin/diffuse:7028
+msgid "Clear Edits"
+msgstr "Annulla le modifiche"
+
+#: ../src/usr/bin/diffuse:6232
+msgid "Close Tab"
+msgstr "Chiudi scheda"
+
+#: ../src/usr/bin/diffuse:7147
+msgid "Close _Without Saving"
+msgstr "_Chiudi senza salvare"
+
+#: ../src/usr/bin/diffuse:6108
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr "Chiudendo questa scheda %s verrà chiuso."
+
+#: ../src/usr/bin/diffuse:6370
+#, python-format
+msgid "Column %d"
+msgstr "Colonna %d"
+
+#: ../src/usr/bin/diffuse:897
+msgid "Command"
+msgstr "Comando"
+
+#: ../src/usr/bin/diffuse:6972
+msgid "Convert Leading Spaces To _Tabs"
+msgstr "Converti gli spa_zi iniziali in tabulazioni"
+
+#: ../src/usr/bin/diffuse:6971
+msgid "Convert Tabs To _Spaces"
+msgstr "Converti le _tabulazioni in spazi"
+
+#: ../src/usr/bin/diffuse:6979
+msgid "Convert To Uni_x Format"
+msgstr "Converti nel formato Uni_x"
+
+#: ../src/usr/bin/diffuse:6977
+msgid "Convert To _DOS Format"
+msgstr "Converti nel formato D_OS"
+
+#: ../src/usr/bin/diffuse:6965
+msgid "Convert To _Lower Case"
+msgstr "Converti in m_inuscolo"
+
+#: ../src/usr/bin/diffuse:6978
+msgid "Convert To _Mac Format"
+msgstr "Converti nel formato MA_C"
+
+#: ../src/usr/bin/diffuse:6964
+msgid "Convert To _Upper Case"
+msgstr "Converti in M_AIUSCOLO"
+
+#: ../src/usr/bin/diffuse:4245 ../src/usr/bin/diffuse:7026
+msgid "Copy"
+msgstr "Copia"
+
+#: ../src/usr/bin/diffuse:7018
+msgid "Copy Left Into Selection"
+msgstr "Copia sinistra nella selezione"
+
+#: ../src/usr/bin/diffuse:6985
+msgid "Copy Left _Into Selection"
+msgstr "Copia s_inistra nella selezione"
+
+#: ../src/usr/bin/diffuse:6986
+msgid "Copy Right I_nto Selection"
+msgstr "Copia d_estra nella selezione"
+
+#: ../src/usr/bin/diffuse:7019
+msgid "Copy Right Into Selection"
+msgstr "Copia destra nella selezione"
+
+#: ../src/usr/bin/diffuse:7017
+msgid "Copy Selection Left"
+msgstr "Copia la selezione a sinistra"
+
+#: ../src/usr/bin/diffuse:7016
+msgid "Copy Selection Right"
+msgstr "Copia la selezione a destra"
+
+#: ../src/usr/bin/diffuse:6983
+msgid "Copy Selection _Left"
+msgstr "Copia selezione a _sinistra"
+
+#: ../src/usr/bin/diffuse:6982
+msgid "Copy Selection _Right"
+msgstr "Copia selezione a _destra"
+
+#: ../src/usr/bin/diffuse:67
+msgid "Copyright © 2006-2011 Derrick Moser"
+msgstr "Copyright © 2006-2011 Derrick Moser"
+
+#: ../src/usr/bin/diffuse:6921
+msgid "Cu_t"
+msgstr "_Taglia"
+
+#: ../src/usr/bin/diffuse:4244 ../src/usr/bin/diffuse:7025
+msgid "Cut"
+msgstr "Taglia"
+
+#: ../src/usr/bin/diffuse:874
+msgid "Cygdrive prefix"
+msgstr "Prefisso Cygdrive"
+
+#: ../src/usr/bin/diffuse:871
+msgid "Cygwin"
+msgstr "Cygwin"
+
+#: ../src/usr/bin/diffuse:6975
+msgid "De_crease Indenting"
+msgstr "Dimi_nuisci indentazione"
+
+#: ../src/usr/bin/diffuse:850
+msgid "Default codec"
+msgstr "Codec predefinito"
+
+#: ../src/usr/bin/diffuse:844
+msgid "Default panes"
+msgstr "Riquadri predefiniti"
+
+#: ../src/usr/bin/diffuse:898
+msgid "Default revision"
+msgstr "Revisione predefinita"
+
+#: ../src/usr/bin/diffuse:6194
+msgid "Derrick Moser <derrick_moser@yahoo.com>"
+msgstr "Derrick Moser <derrick_moser@yahoo.com>"
+
+#: ../src/usr/bin/diffuse:6191
+msgid "Diffuse is a graphical tool for merging and comparing text files."
+msgstr ""
+"Diffuse è uno strumento grafico per l'unione e la comparazione di file di "
+"testo."
+
+#: ../src/usr/bin/diffuse:814
+msgid "Display"
+msgstr "Visualizzazione"
+
+#: ../src/usr/bin/diffuse:836
+msgid "Editor"
+msgstr "Editor"
+
+#: ../src/usr/bin/diffuse:6120
+msgid "Encoding: "
+msgstr "Codifica:"
+
+#: ../src/usr/bin/diffuse:6731
+#, python-format
+msgid "Error encoding to %s."
+msgstr "Errore codificando %s"
+
+#: ../src/usr/bin/diffuse:2002
+#, python-format
+msgid "Error parsing %s."
+msgstr "Errore analizzando %s."
+
+#: ../src/usr/bin/diffuse:6773 ../src/usr/bin/diffuse:7779
+msgid "Error parsing line number."
+msgstr "Errore nell'analizzare il numero di riga."
+
+#: ../src/usr/bin/diffuse:7724
+#, python-format
+msgid "Error parsing revision %s."
+msgstr "Eroore analizzando la revisione %s."
+
+#: ../src/usr/bin/diffuse:7796
+#, python-format
+msgid "Error processing argument \"%s\".  Directory not expected."
+msgstr "Errore nell'elaborazione dell'argomento \"%s\". Cartella non attesa."
+
+#: ../src/usr/bin/diffuse:690
+#, python-format
+msgid "Error processing line %(line)d of %(file)s."
+msgstr "Errore nell'elaborare la riga  %(line)d di «%(file)s»."
+
+#: ../src/usr/bin/diffuse:6565 ../src/usr/bin/diffuse:7696
+#, python-format
+msgid "Error reading %s."
+msgstr "Errore leggendo il %s."
+
+#: ../src/usr/bin/diffuse:6563
+#, python-format
+msgid "Error reading revision %(rev)s of %(file)s."
+msgstr "Errore durante la lettura della revisione \"%(rev)s\" di «%(file)s»."
+
+#: ../src/usr/bin/diffuse:7358
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr "Errore nel recupero delle modifiche per «%s»"
+
+#: ../src/usr/bin/diffuse:995 ../src/usr/bin/diffuse:6735
+#, python-format
+msgid "Error writing %s."
+msgstr "Errore scrivendo il %s."
+
+#: ../src/usr/bin/diffuse:839
+msgid "Expand tabs to spaces"
+msgstr "Espandi le tabulazioni in spazi"
+
+#: ../src/usr/bin/diffuse:6963
+msgid "F_ormat"
+msgstr "F_ormato"
+
+#: ../src/usr/bin/diffuse:7255
+#, python-format
+msgid "File Merge %d"
+msgstr "Unione file # %d"
+
+#: ../src/usr/bin/diffuse:6931
+msgid "Find Pre_vious"
+msgstr "Trova _precedente"
+
+#: ../src/usr/bin/diffuse:6930
+msgid "Find _Next"
+msgstr "Trova _successivo"
+
+#: ../src/usr/bin/diffuse:6058
+msgid "Find..."
+msgstr "Trova..."
+
+#: ../src/usr/bin/diffuse:6955
+msgid "Fir_st Tab"
+msgstr "Prim_a scheda"
+
+#: ../src/usr/bin/diffuse:7011
+msgid "First Difference"
+msgstr "Prima differenza"
+
+#: ../src/usr/bin/diffuse:816
+msgid "Font"
+msgstr "Carattere"
+
+#: ../src/usr/bin/diffuse:6154
+msgid "Go To Line..."
+msgstr "Vai alla linea..."
+
+#: ../src/usr/bin/diffuse:825
+msgid "Ignore blank line differences"
+msgstr "Ignora le differenze tra le righe vuote"
+
+#: ../src/usr/bin/diffuse:833
+msgid "Ignore blank lines"
+msgstr "Ignora le righe vuote"
+
+#: ../src/usr/bin/diffuse:830
+msgid "Ignore case"
+msgstr "Ignora MAIUSCOLE/minuscole"
+
+#: ../src/usr/bin/diffuse:822
+msgid "Ignore case differences"
+msgstr "Ignora la differenza tra lettere maiuscole e minuscole"
+
+#: ../src/usr/bin/diffuse:824 ../src/usr/bin/diffuse:832
+msgid "Ignore changes to white space"
+msgstr "Ignora le modifiche agli spazi vuoti"
+
+#: ../src/usr/bin/diffuse:834
+msgid "Ignore end of line characters"
+msgstr "Ignora i caratteri di fine linea"
+
+#: ../src/usr/bin/diffuse:826
+msgid "Ignore end of line differences"
+msgstr "Ignora le differenze alla fine della riga"
+
+#: ../src/usr/bin/diffuse:831
+msgid "Ignore white space"
+msgstr "Ignora gli spazi vuoti"
+
+#: ../src/usr/bin/diffuse:823
+msgid "Ignore white space differences"
+msgstr "Ignora le differenze tra spazi vuoti"
+
+#: ../src/usr/bin/diffuse:4241
+msgid "Isolate"
+msgstr "Isola"
+
+#: ../src/usr/bin/diffuse:6958
+msgid "Las_t Tab"
+msgstr "Ul_tima scheda"
+
+#: ../src/usr/bin/diffuse:7014
+msgid "Last Difference"
+msgstr "Ultima differenza"
+
+#: ../src/usr/bin/diffuse:900
+msgid "Launch from a Bash login shell"
+msgstr "Avvia dalla Bash di una shell di login"
+
+#: ../src/usr/bin/diffuse:6160
+msgid "Line Number: "
+msgstr "Numero di riga:"
+
+#: ../src/usr/bin/diffuse:6988
+msgid "M_erge From Right Then Left"
+msgstr "U_nisci destra poi sinistra"
+
+#: ../src/usr/bin/diffuse:6089
+msgid "Match Case"
+msgstr "Distingui MAIUSCOLE/minuscole"
+
+#: ../src/usr/bin/diffuse:7020
+msgid "Merge From Left Then Right"
+msgstr "Unisce prima da sinistra poi da destra"
+
+#: ../src/usr/bin/diffuse:7021
+msgid "Merge From Right Then Left"
+msgstr "Unisce prima da destra poi da sinistra"
+
+#: ../src/usr/bin/diffuse:4242
+msgid "Merge Selection"
+msgstr "Unisci selezione"
+
+#: ../src/usr/bin/diffuse:7007
+msgid "New 2-Way File Merge"
+msgstr "Nuova unione a 2 file"
+
+#: ../src/usr/bin/diffuse:7008
+msgid "New 3-Way File Merge"
+msgstr "Nuova unione a 3 file"
+
+#: ../src/usr/bin/diffuse:6910
+msgid "New _2-Way File Merge"
+msgstr "Nuova unione a _2 file"
+
+#: ../src/usr/bin/diffuse:6911
+msgid "New _3-Way File Merge"
+msgstr "Nuova unione a _3 file"
+
+#: ../src/usr/bin/diffuse:7013
+msgid "Next Difference"
+msgstr "Differenza successiva"
+
+#: ../src/usr/bin/diffuse:6957
+msgid "Next _Tab"
+msgstr "Scheda su_ccessiva"
+
+#: ../src/usr/bin/diffuse:7420
+msgid "No modified files found."
+msgstr "Non sono stati trovati file modificati."
+
+#: ../src/usr/bin/diffuse:6936
+msgid "None"
+msgstr "Nessuna"
+
+#: ../src/usr/bin/diffuse:6588
+msgid "Open File"
+msgstr "Apertura file"
+
+#: ../src/usr/bin/diffuse:7391
+msgid "Open File In New Tab"
+msgstr "Apre ilo file in una nuova scheda"
+
+#: ../src/usr/bin/diffuse:6902
+msgid "Open File In New _Tab..."
+msgstr "Apri file in una nuova sc_heda..."
+
+#: ../src/usr/bin/diffuse:6287
+msgid "Open File..."
+msgstr "Apri file..."
+
+#: ../src/usr/bin/diffuse:6903
+msgid "Open _Modified Files..."
+msgstr "Apri file _modificati..."
+
+#: ../src/usr/bin/diffuse:851
+msgid "Order of codecs used to identify encoding"
+msgstr "Ordine dei codici utilizzati per identificare la codifica"
+
+#: ../src/usr/bin/diffuse:4246 ../src/usr/bin/diffuse:7027
+msgid "Paste"
+msgstr "Incolla"
+
+#: ../src/usr/bin/diffuse:7509
+msgid "Phrase not found.  Continue from the end of the file?"
+msgstr "Frase non trovata. Continuare dalla fine del file?"
+
+#: ../src/usr/bin/diffuse:7511
+msgid "Phrase not found.  Continue from the start of the file?"
+msgstr "Frase non trovata. Continuare dall'inizio del file?"
+
+#: ../src/usr/bin/diffuse:6934
+msgid "Pr_eferences..."
+msgstr "Pr_eferenze..."
+
+#: ../src/usr/bin/diffuse:6956
+msgid "Pre_vious Tab"
+msgstr "Scheda pr_ecedente"
+
+#: ../src/usr/bin/diffuse:966
+msgid "Preferences"
+msgstr "Preferenze"
+
+#: ../src/usr/bin/diffuse:6796
+msgid ""
+"Press the enter key or double click to edit.  Press the space bar or use the "
+"RMB menu to manually align."
+msgstr ""
+"Premere il tasto \"Invio\" o fare doppio clic per modificare. Premere "
+"\"spazio\" o usare il tasto destro del mouse per allineare manualmente."
+
+#: ../src/usr/bin/diffuse:6798
+msgid "Press the escape key to finish editing."
+msgstr "Premere il tasto \"Esc\" per terminare le modifiche"
+
+#: ../src/usr/bin/diffuse:7012
+msgid "Previous Difference"
+msgstr "Differenza precedente"
+
+#: ../src/usr/bin/diffuse:6947
+msgid "Re_align All"
+msgstr "Ria_llinea tutti"
+
+#: ../src/usr/bin/diffuse:7010
+msgid "Realign All"
+msgstr "Riallinea tutti"
+
+#: ../src/usr/bin/diffuse:7024
+msgid "Redo"
+msgstr "Ripeti"
+
+#: ../src/usr/bin/diffuse:848
+msgid "Regional Settings"
+msgstr "Impostazioni regionali"
+
+#: ../src/usr/bin/diffuse:6288
+msgid "Reload File"
+msgstr "Ricarica file"
+
+#: ../src/usr/bin/diffuse:6970
+msgid "Remove Trailing _White Space"
+msgstr "Rimuovi gli spazi _vuoti alla fine della riga"
+
+#: ../src/usr/bin/diffuse:6130
+msgid "Revision: "
+msgstr "Revisione:"
+
+#: ../src/usr/bin/diffuse:819
+msgid "Right margin"
+msgstr "Margine destro"
+
+#: ../src/usr/bin/diffuse:873
+msgid "Root directory"
+msgstr "Cartella radice"
+
+#: ../src/usr/bin/diffuse:6658
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr "Salva %(title)s riquadro %(pane)d"
+
+#: ../src/usr/bin/diffuse:6908
+msgid "Save A_ll"
+msgstr "Salva _tutti"
+
+#: ../src/usr/bin/diffuse:6289
+msgid "Save File"
+msgstr "Salva file"
+
+#: ../src/usr/bin/diffuse:6290
+msgid "Save File As..."
+msgstr "Salva con nome..."
+
+#: ../src/usr/bin/diffuse:6907
+msgid "Save File _As..."
+msgstr "S_alva con nome..."
+
+#: ../src/usr/bin/diffuse:6435
+msgid "Save changes before loading the new file?"
+msgstr "Salvare i cambiamenti prima di caricare il nuovo file?"
+
+#: ../src/usr/bin/diffuse:6094
+msgid "Search Backwards"
+msgstr "Cerca all'indietro"
+
+#: ../src/usr/bin/diffuse:6064
+msgid "Search For: "
+msgstr "Cerca: "
+
+#: ../src/usr/bin/diffuse:4248
+msgid "Select All"
+msgstr "Seleziona tutto"
+
+#: ../src/usr/bin/diffuse:6925
+msgid "Select _All"
+msgstr "Selezion_a tutto"
+
+#: ../src/usr/bin/diffuse:6800
+msgid ""
+"Select target line and press the space bar to align.  Press the escape key "
+"to cancel."
+msgstr ""
+"Selezionare la riga di destinazione e premere spazio per allineare. Premere "
+"\"Esc\" per annullare."
+
+#: ../src/usr/bin/diffuse:6961
+msgid "Shift Pane _Left"
+msgstr "Sposta riquadro a _sinistra"
+
+#: ../src/usr/bin/diffuse:6960
+msgid "Shift Pane _Right"
+msgstr "Sposta riquadro a _destra"
+
+#: ../src/usr/bin/diffuse:820
+msgid "Show line numbers"
+msgstr "Mostra i numeri di riga"
+
+#: ../src/usr/bin/diffuse:818
+msgid "Show right margin"
+msgstr "Mostra margine destro"
+
+#: ../src/usr/bin/diffuse:821
+msgid "Show white space characters"
+msgstr "Mostra i caratteri di spaziatura"
+
+#: ../src/usr/bin/diffuse:7789
+#, python-format
+msgid "Skipping unknown argument \"%s\"."
+msgstr "L'argomento sconosciuto \"%s\" verrà tralasciato"
+
+#: ../src/usr/bin/diffuse:840
+msgid "Soft tab width"
+msgstr "Larghezza scheda"
+
+#: ../src/usr/bin/diffuse:7132
+msgid ""
+"Some files have unsaved changes.  Select the files to save before closing."
+msgstr ""
+"Alcune modifiche ai file non sono ancora state salvate. Selezionare i file "
+"da salvare prima di uscire."
+
+#: ../src/usr/bin/diffuse:6968
+msgid "Sort Lines In D_escending Order"
+msgstr "Disponi le righe in ordine _discendente"
+
+#: ../src/usr/bin/diffuse:6967
+msgid "Sort Lines In _Ascending Order"
+msgstr "Disponi le righe in ordine a_scendente"
+
+#: ../src/usr/bin/diffuse:4251
+msgid "Swap with Selected Pane"
+msgstr "Scambia con il riquadro selezionato"
+
+#: ../src/usr/bin/diffuse:817
+msgid "Tab width"
+msgstr "Larghezza scheda"
+
+#: ../src/usr/bin/diffuse:842
+msgid "Tabs"
+msgstr "Schede"
+
+#: ../src/usr/bin/diffuse:6638
+#, python-format
+msgid "The file %s changed on disk.  Do you want to reload the file?"
+msgstr "Il file «%s» è cambiato sul disco. Ricaricarlo?"
+
+#: ../src/usr/bin/diffuse:6689
+#, python-format
+msgid ""
+"The file %s has been modified by another process since reading it.  If you "
+"save, all the external changes could be lost.  Save anyways?"
+msgstr ""
+"Il file «%s» è stato modificato da un'altro processo dopo la lettura. Se si "
+"salva, tutte le modifiche esterne potrebbero essere perdute. Salvare "
+"comunque?"
+
+#: ../src/usr/bin/diffuse:6198
+msgid ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the licence, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program.  You may also obtain a copy of the GNU General Public License "
+"from the Free Software Foundation by visiting their web site (http://www.fsf."
+"org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, "
+"Fifth Floor, Boston, MA  02110-1301  USA\n"
+msgstr ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the licence, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program.  You may also obtain a copy of the GNU General Public License "
+"from the Free Software Foundation by visiting their web site (http://www.fsf."
+"org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, "
+"Fifth Floor, Boston, MA  02110-1301  USA\n"
+
+#: ../src/usr/bin/diffuse:7023
+msgid "Undo"
+msgstr "Annulla"
+
+#: ../src/usr/bin/diffuse:902
+msgid "Update paths for Cygwin"
+msgstr "Aggiorna i percorsi per Cygwin"
+
+#: ../src/usr/bin/diffuse:78
+msgid ""
+"Usage:\n"
+"    diffuse [ [OPTION...] [FILE...] ]...\n"
+"    diffuse ( -h | -? | --help | -v | --version )\n"
+"\n"
+"Diffuse is a graphical tool for merging and comparing text files.  Diffuse "
+"is\n"
+"able to compare an arbitrary number of files side-by-side and gives users "
+"the\n"
+"ability to manually adjust line matching and directly edit files.  Diffuse "
+"can\n"
+"also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,\n"
+"Monotone, RCS, Subversion, and SVK repositories for comparison and merging.\n"
+"\n"
+"Help Options:\n"
+"  ( -h | -? | --help )             Display this usage information\n"
+"  ( -v | --version )               Display version and copyright "
+"information\n"
+"\n"
+"Configuration Options:\n"
+"  --no-rcfile                      Do not read any resource files\n"
+"  --rcfile <file>                  Specify explicit resource file\n"
+"\n"
+"General Options:\n"
+"  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
+"  ( -D | --close-if-same )         Close all tabs with no differences\n"
+"  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
+"  ( -L | --label ) <label>         Display <label> instead of the file name\n"
+"  ( -m | --modified )              Create a new tab for each modified file\n"
+"  ( -r | --revision ) <rev>        File revision <rev>\n"
+"  ( -s | --separate )              Create a new tab for each file\n"
+"  ( -t | --tab )                   Start a new tab\n"
+"  --line <line>                    Start with line <line> selected\n"
+"  --null-file                      Create a blank file comparison pane\n"
+"\n"
+"Display Options:\n"
+"  ( -b | --ignore-space-change )   Ignore changes to white space\n"
+"  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
+"  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
+"  ( -i | --ignore-case )           Ignore case differences\n"
+"  ( -w | --ignore-all-space )      Ignore white space differences"
+msgstr ""
+"Utilizzo:\n"
+"    diffuse [ [OPZIONE...] [FILE...] ]...\n"
+"    diffuse ( -h | -? | --help | -v | --version )\n"
+"\n"
+"Diffuse è uno strumento grafico per l'unione e il confronto di file di testo.\n"
+"Diffuse è in grado di confrontare uno a fianco dell'altro un qualsiasi numero\n"
+"di file e fornisce all'utente la possibilità di correggere manualmente la\n"
+"corrispondenza fra le righe e di modificare i file. Diffuse è anche in grado\n"
+"di recuperare le revisioni dei file dai repository Bazaar, CVS, Darcs, Git,\n"
+"Mercurial, Monotone, RCS, Subversion, e SVK per confrontarle e unirle.\n"
+"\n"
+"Opzioni di aiuto:\n"
+"  ( -h | -? | --help )             Mostra le informazioni di utilizzo\n"
+"  ( -v | --version )               Mostra la versione e il copyright\n"
+"\n"
+"Opzioni di configurazione:\n"
+"  --no-rcfile                      Non leggere alcun file risorsa\n"
+"  --rcfile <file>                  Specifica un file di risorsa\n"
+"\n"
+"Opzioni generali:\n"
+"  ( -c | --commit ) <rev>          Revisioni file <rev-1> e <rev>\n"
+"  ( -D | --close-if-same )         Chiude tutte le schede senza differenze\n"
+"  ( -e | --encoding ) <codec>      Usa <codec> per leggere e scrivere i "
+"file\n"
+"  ( -L | --label ) <etichetta>     Visualizza <etichetta> invece del nome "
+"del file\n"
+"  ( -m | --modified )              Crea una nuova scheda per ogni file "
+"modificato\n"
+"  ( -r | --revision ) <rev>        Revisione file <rev>\n"
+"  ( -s | --separate )              Crea una nuova scheda per ogni file\n"
+"  ( -t | --tab )                   Apre una nuova scheda\n"
+"  --line <linea>                   Inizia con la <linea> selezionata\n"
+"  --null-file                      Crea un riquadro di comparazione vuoto\n"
+"\n"
+"Opzioni di visualizzazione:\n"
+"  ( -b | --ignore-space-change )   Ignora le modifiche agli spazi vuoti\n"
+"  ( -B | --ignore-blank-lines )    Ignora le modifiche alle righe vuote\n"
+"  ( -E | --ignore-end-of-line )    Ignora le differenze di fine riga\n"
+"  ( -i | --ignore-case )           Ignora differenze tra MAIUSCOLE/"
+"minuscole\n"
+"  ( -w | --ignore-all-space )      Ignora le differenze tra spazi vuoti"
+
+#: ../src/usr/bin/diffuse:905
+msgid "Version Control"
+msgstr "Controllo di versione"
+
+#: ../src/usr/bin/diffuse:846
+#, python-format
+msgid "Warn me when closing a tab will quit %s"
+msgstr "Avvisami se chiudendo una scheda anche %s verrà chiuso"
+
+#: ../src/usr/bin/diffuse:536
+#, python-format
+msgid "Warning: unknown colour \"%s\""
+msgstr "Attenzione: colore \"%s\" sconosciuto"
+
+#: ../src/usr/bin/diffuse:545
+#, python-format
+msgid "Warning: unknown float \"%s\""
+msgstr "Attenzione: float \"%s\" sconosciuto"
+
+#: ../src/usr/bin/diffuse:554
+#, python-format
+msgid "Warning: unknown string \"%s\""
+msgstr "Attenzione: stringa \"%s\" sconosciuta"
+
+#: ../src/usr/bin/diffuse:6993
+#, python-format
+msgid "_About %s..."
+msgstr "I_nformazioni su %s"
+
+#: ../src/usr/bin/diffuse:6913
+msgid "_Close Tab"
+msgstr "_Chiudi scheda"
+
+#: ../src/usr/bin/diffuse:6922
+msgid "_Copy"
+msgstr "_Copia"
+
+#: ../src/usr/bin/diffuse:6927
+msgid "_Dismiss All Edits"
+msgstr "Scarta tutte le mo_difiche"
+
+#: ../src/usr/bin/diffuse:6917
+msgid "_Edit"
+msgstr "_Modifica"
+
+#: ../src/usr/bin/diffuse:6900
+msgid "_File"
+msgstr "_File"
+
+#: ../src/usr/bin/diffuse:6929
+msgid "_Find..."
+msgstr "Tr_ova..."
+
+#: ../src/usr/bin/diffuse:6950
+msgid "_First Difference"
+msgstr "_Prima differenza"
+
+#: ../src/usr/bin/diffuse:6932
+msgid "_Go To Line..."
+msgstr "_Vai alla riga..."
+
+#: ../src/usr/bin/diffuse:6990
+msgid "_Help"
+msgstr "A_iuto"
+
+#: ../src/usr/bin/diffuse:6991
+msgid "_Help Contents..."
+msgstr "_Sommario"
+
+#: ../src/usr/bin/diffuse:6974
+msgid "_Increase Indenting"
+msgstr "Au_menta indentazione"
+
+#: ../src/usr/bin/diffuse:6948
+msgid "_Isolate"
+msgstr "_Isola"
+
+#: ../src/usr/bin/diffuse:6953
+msgid "_Last Difference"
+msgstr "Ulti_ma differenza"
+
+#: ../src/usr/bin/diffuse:6981
+msgid "_Merge"
+msgstr "_Unione"
+
+#: ../src/usr/bin/diffuse:6987
+msgid "_Merge From Left Then Right"
+msgstr "_Unisci sinistra poi destra"
+
+#: ../src/usr/bin/diffuse:6952
+msgid "_Next Difference"
+msgstr "Differenza s_uccessiva"
+
+#: ../src/usr/bin/diffuse:6901
+msgid "_Open File..."
+msgstr "_Apri file"
+
+#: ../src/usr/bin/diffuse:6923
+msgid "_Paste"
+msgstr "_Incolla"
+
+#: ../src/usr/bin/diffuse:6951
+msgid "_Previous Difference"
+msgstr "Differenza p_recedente"
+
+#: ../src/usr/bin/diffuse:6915
+msgid "_Quit"
+msgstr "_Esci"
+
+#: ../src/usr/bin/diffuse:6919
+msgid "_Redo"
+msgstr "_Ripeti"
+
+#: ../src/usr/bin/diffuse:6904
+msgid "_Reload File"
+msgstr "_Ricarica file"
+
+#: ../src/usr/bin/diffuse:6906
+msgid "_Save File"
+msgstr "_Salva file"
+
+#: ../src/usr/bin/diffuse:6945
+msgid "_Syntax Highlighting"
+msgstr "Si_ntassi"
+
+#: ../src/usr/bin/diffuse:6918
+msgid "_Undo"
+msgstr "Ann_ulla"
+
+#: ../src/usr/bin/diffuse:6914
+msgid "_Undo Close Tab"
+msgstr "Annulla chi_usura scheda"
+
+#: ../src/usr/bin/diffuse:6944
+msgid "_View"
+msgstr "_Visualizza"
+
+#: ../src/usr/bin/diffuse:6195
+msgid "translator-credits"
+msgstr "Cristian Marchi <cri.penta@gmail.com>,  2011."
diff -Nru diffuse-0.4.4/translations/ja.po diffuse-0.4.5/translations/ja.po
--- diffuse-0.4.4/translations/ja.po	2010-10-21 01:58:01.000000000 +0000
+++ diffuse-0.4.5/translations/ja.po	2011-07-13 09:18:32.000000000 +0000
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: diffuse-svn r250\n"
+"Project-Id-Version: diffuse-svn r316\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-10 08:00-0400\n"
+"POT-Creation-Date: 2011-07-11 08:13-0400\n"
 "PO-Revision-Date: 2009-10-04 09:31-0400\n"
 "Last-Translator: Derrick Moser <derrick_moser@yahoo.com>\n"
 "Language-Team: Japanese\n"
@@ -16,437 +16,449 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../src/usr/bin/diffuse:854
+#: ../src/usr/bin/diffuse:900
 msgid "\"co\" command"
 msgstr "co というコマンド"
 
-#: ../src/usr/bin/diffuse:855
+#: ../src/usr/bin/diffuse:901
 msgid "\"rlog\" command"
 msgstr "rlog というコマンド"
 
-#: ../src/usr/bin/diffuse:6822
+#: ../src/usr/bin/diffuse:7164
 #, python-format
 msgid "%(title)s Pane %(pane)d"
 msgstr "%(title)s の%(pane)d番目の枠"
 
-#: ../src/usr/bin/diffuse:6370
+#: ../src/usr/bin/diffuse:6710
 #, python-format
 msgid "A file named %s already exists.  Do you want to overwrite it?"
 msgstr "%s というファイルは既に存在しています。それを上書きしますか？"
 
-#: ../src/usr/bin/diffuse:3966
+#: ../src/usr/bin/diffuse:4266
 msgid "Align with Selection"
 msgstr "選択と整列"
 
-#: ../src/usr/bin/diffuse:799
+#: ../src/usr/bin/diffuse:834
 msgid "Alignment"
 msgstr "整列"
 
-#: ../src/usr/bin/diffuse:816
+#: ../src/usr/bin/diffuse:851
 msgid "Always show the tab bar"
 msgstr "常にタブバーを表示"
 
-#: ../src/usr/bin/diffuse:5845
+#: ../src/usr/bin/diffuse:724
 msgid "Auto Detect"
 msgstr "自動検出"
 
-#: ../src/usr/bin/diffuse:811
+#: ../src/usr/bin/diffuse:844
 msgid "Auto indent"
 msgstr "自動インデント"
 
-#: ../src/usr/bin/diffuse:6612
+#: ../src/usr/bin/diffuse:6952
 msgid "C_lear Edits"
 msgstr "編集をクリア(_L)"
 
-#: ../src/usr/bin/diffuse:7081
+#: ../src/usr/bin/diffuse:7433
 msgid "Choose Folder With Modified Files"
 msgstr "変更なったファイルがあるフォルダを選択"
 
-#: ../src/usr/bin/diffuse:3975 ../src/usr/bin/diffuse:6712
+#: ../src/usr/bin/diffuse:4275 ../src/usr/bin/diffuse:7054
 msgid "Clear Edits"
 msgstr "編集をクリア"
 
-#: ../src/usr/bin/diffuse:5956
+#: ../src/usr/bin/diffuse:6258
 msgid "Close Tab"
 msgstr "タブを閉じる"
 
-#: ../src/usr/bin/diffuse:6831
+#: ../src/usr/bin/diffuse:7173
 msgid "Close _Without Saving"
 msgstr "保存せずに閉じる(_W)"
 
-#: ../src/usr/bin/diffuse:5823
+#: ../src/usr/bin/diffuse:6134
 #, python-format
 msgid "Closing this tab will quit %s."
 msgstr "このタブを閉じると、%sは終了します。"
 
-#: ../src/usr/bin/diffuse:6074
+#: ../src/usr/bin/diffuse:6396
 #, python-format
 msgid "Column %d"
 msgstr "%d列"
 
-#: ../src/usr/bin/diffuse:857
+#: ../src/usr/bin/diffuse:903
 msgid "Command"
 msgstr "コマンド"
 
-#: ../src/usr/bin/diffuse:6656
+#: ../src/usr/bin/diffuse:6998
 msgid "Convert Leading Spaces To _Tabs"
 msgstr "先頭のスペースをタブに変換(_T)"
 
-#: ../src/usr/bin/diffuse:6655
+#: ../src/usr/bin/diffuse:6997
 msgid "Convert Tabs To _Spaces"
 msgstr "タブをスペースに変換(_S)"
 
-#: ../src/usr/bin/diffuse:6663
+#: ../src/usr/bin/diffuse:7005
 msgid "Convert To Uni_x Format"
 msgstr "Unix 形式に変換(_X)"
 
-#: ../src/usr/bin/diffuse:6661
+#: ../src/usr/bin/diffuse:7003
 msgid "Convert To _DOS Format"
 msgstr "DOS 形式に変換(_D)"
 
-#: ../src/usr/bin/diffuse:6649
+#: ../src/usr/bin/diffuse:6991
 msgid "Convert To _Lower Case"
 msgstr "小文字に変換(_L)"
 
-#: ../src/usr/bin/diffuse:6662
+#: ../src/usr/bin/diffuse:7004
 msgid "Convert To _Mac Format"
 msgstr "Mac 形式に変換(_M)"
 
-#: ../src/usr/bin/diffuse:6648
+#: ../src/usr/bin/diffuse:6990
 msgid "Convert To _Upper Case"
 msgstr "大文字に変換(_U)"
 
-#: ../src/usr/bin/diffuse:3971 ../src/usr/bin/diffuse:6710
+#: ../src/usr/bin/diffuse:4271 ../src/usr/bin/diffuse:7052
 msgid "Copy"
 msgstr "コピー"
 
-#: ../src/usr/bin/diffuse:6702
+#: ../src/usr/bin/diffuse:7044
 msgid "Copy Left Into Selection"
 msgstr "左から選択枠にコピー"
 
-#: ../src/usr/bin/diffuse:6669
+#: ../src/usr/bin/diffuse:7011
 msgid "Copy Left _Into Selection"
 msgstr "左から選択枠にコピー(_I)"
 
-#: ../src/usr/bin/diffuse:6670
+#: ../src/usr/bin/diffuse:7012
 msgid "Copy Right I_nto Selection"
 msgstr "右から選択枠にコピー(_N)"
 
-#: ../src/usr/bin/diffuse:6703
+#: ../src/usr/bin/diffuse:7045
 msgid "Copy Right Into Selection"
 msgstr "右から選択枠にコピー"
 
-#: ../src/usr/bin/diffuse:6701
+#: ../src/usr/bin/diffuse:7043
 msgid "Copy Selection Left"
 msgstr "選択を左にコピー"
 
-#: ../src/usr/bin/diffuse:6700
+#: ../src/usr/bin/diffuse:7042
 msgid "Copy Selection Right"
 msgstr "選択を右にコピー"
 
-#: ../src/usr/bin/diffuse:6667
+#: ../src/usr/bin/diffuse:7009
 msgid "Copy Selection _Left"
 msgstr "選択を左にコピー(_L)"
 
-#: ../src/usr/bin/diffuse:6666
+#: ../src/usr/bin/diffuse:7008
 msgid "Copy Selection _Right"
 msgstr "選択を右にコピー(_R)"
 
-#: ../src/usr/bin/diffuse:67
-msgid "Copyright © 2006-2010 Derrick Moser"
-msgstr "Copyright © 2006-2010 Derrick Moser"
+#: ../src/usr/bin/diffuse:68
+msgid "Copyright © 2006-2011 Derrick Moser"
+msgstr "Copyright © 2006-2011 Derrick Moser"
 
-#: ../src/usr/bin/diffuse:6607
+#: ../src/usr/bin/diffuse:6947
 msgid "Cu_t"
 msgstr "切り取り(_T)"
 
-#: ../src/usr/bin/diffuse:3970 ../src/usr/bin/diffuse:6709
+#: ../src/usr/bin/diffuse:4270 ../src/usr/bin/diffuse:7051
 msgid "Cut"
 msgstr "切り取り"
 
-#: ../src/usr/bin/diffuse:834
+#: ../src/usr/bin/diffuse:880
 msgid "Cygdrive prefix"
 msgstr "Cygdrive 接頭辞"
 
-#: ../src/usr/bin/diffuse:831
+#: ../src/usr/bin/diffuse:877
 msgid "Cygwin"
 msgstr "Cygwin"
 
-#: ../src/usr/bin/diffuse:6659
+#: ../src/usr/bin/diffuse:7001
 msgid "De_crease Indenting"
 msgstr "インデントを減らす(_C)"
 
-#: ../src/usr/bin/diffuse:815
+#: ../src/usr/bin/diffuse:856
+msgid "Default codec"
+msgstr "デフォルトのコーデック"
+
+#: ../src/usr/bin/diffuse:850
 msgid "Default panes"
 msgstr "枠のデフォルトの数"
 
-#: ../src/usr/bin/diffuse:858
+#: ../src/usr/bin/diffuse:904
 msgid "Default revision"
 msgstr "デフォルトのリビジョン"
 
-#: ../src/usr/bin/diffuse:5918
+#: ../src/usr/bin/diffuse:6220
 msgid "Derrick Moser <derrick_moser@yahoo.com>"
 msgstr "Derrick Moser <derrick_moser@yahoo.com>"
 
-#: ../src/usr/bin/diffuse:5915
+#: ../src/usr/bin/diffuse:6217
 msgid "Diffuse is a graphical tool for merging and comparing text files."
 msgstr ""
 "Diffuse は、テキストファイルをマージして比較するためのグラフィックツールで"
 "す。"
 
-#: ../src/usr/bin/diffuse:787
+#: ../src/usr/bin/diffuse:820
 msgid "Display"
 msgstr "表示"
 
-#: ../src/usr/bin/diffuse:807
+#: ../src/usr/bin/diffuse:842
 msgid "Editor"
 msgstr "エディタ"
 
-#: ../src/usr/bin/diffuse:5835
+#: ../src/usr/bin/diffuse:6146
 msgid "Encoding: "
 msgstr "エンコーディング: "
 
-#: ../src/usr/bin/diffuse:6417
+#: ../src/usr/bin/diffuse:6757
 #, python-format
 msgid "Error encoding to %s."
 msgstr "%s に変える際にエラーが生じました。"
 
-#: ../src/usr/bin/diffuse:1929
+#: ../src/usr/bin/diffuse:2028
 #, python-format
 msgid "Error parsing %s."
 msgstr "%s をパースする際にエラーが生じました。"
 
-#: ../src/usr/bin/diffuse:6459
+#: ../src/usr/bin/diffuse:6799 ../src/usr/bin/diffuse:7805
 msgid "Error parsing line number."
 msgstr "行番号をパースする際にエラーが生じました。"
 
-#: ../src/usr/bin/diffuse:7378
+#: ../src/usr/bin/diffuse:7750
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "%s というリビジョンをパースする際にエラーが生じました。"
 
-#: ../src/usr/bin/diffuse:7441
+#: ../src/usr/bin/diffuse:7822
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr ""
 "%s の引数を処理しているときにエラーが生じました。ディレクトリは予測できません"
 "でした。"
 
-#: ../src/usr/bin/diffuse:704
+#: ../src/usr/bin/diffuse:696
 #, python-format
 msgid "Error processing line %(line)d of %(file)s."
 msgstr "%(file)s の %(line)d行 を処理しているときにエラーが生じました。"
 
-#: ../src/usr/bin/diffuse:6264 ../src/usr/bin/diffuse:7350
+#: ../src/usr/bin/diffuse:6591 ../src/usr/bin/diffuse:7722
 #, python-format
 msgid "Error reading %s."
 msgstr "%s を読み込む際にエラーが生じました。"
 
-#: ../src/usr/bin/diffuse:6262
+#: ../src/usr/bin/diffuse:6589
 #, python-format
 msgid "Error reading revision %(rev)s of %(file)s."
 msgstr "%(file)s の %(rev)s というリビジョンを読み込む際にエラーが生じました。"
 
-#: ../src/usr/bin/diffuse:7032
+#: ../src/usr/bin/diffuse:7384
 #, python-format
 msgid "Error retrieving modifications for %s."
 msgstr "%s の変更の取得中にエラーが生じました。"
 
-#: ../src/usr/bin/diffuse:941 ../src/usr/bin/diffuse:6421
+#: ../src/usr/bin/diffuse:1013 ../src/usr/bin/diffuse:6761
 #, python-format
 msgid "Error writing %s."
 msgstr "%s へ書き込む際にエラーが生じました。"
 
-#: ../src/usr/bin/diffuse:810
+#: ../src/usr/bin/diffuse:845
 msgid "Expand tabs to spaces"
 msgstr "タブの代わりに空白を挿入"
 
-#: ../src/usr/bin/diffuse:6647
+#: ../src/usr/bin/diffuse:6989
 msgid "F_ormat"
 msgstr "フォーマット(_O)"
 
-#: ../src/usr/bin/diffuse:6939
+#: ../src/usr/bin/diffuse:7281
 #, python-format
 msgid "File Merge %d"
 msgstr "ファイルマージ%d"
 
-#: ../src/usr/bin/diffuse:6617
+#: ../src/usr/bin/diffuse:6957
 msgid "Find Pre_vious"
 msgstr "前の検索(_V)"
 
-#: ../src/usr/bin/diffuse:6616
+#: ../src/usr/bin/diffuse:6956
 msgid "Find _Next"
 msgstr "次の検索(_N)"
 
-#: ../src/usr/bin/diffuse:5773
+#: ../src/usr/bin/diffuse:6084
 msgid "Find..."
 msgstr "検索..."
 
-#: ../src/usr/bin/diffuse:6695
+#: ../src/usr/bin/diffuse:6981
+msgid "Fir_st Tab"
+msgstr "最初のタブ(_S)"
+
+#: ../src/usr/bin/diffuse:7037
 msgid "First Difference"
 msgstr "最初の差分"
 
-#: ../src/usr/bin/diffuse:789
+#: ../src/usr/bin/diffuse:822
 msgid "Font"
 msgstr "フォント"
 
-#: ../src/usr/bin/diffuse:5878
+#: ../src/usr/bin/diffuse:6180
 msgid "Go To Line..."
 msgstr "指定行へジャンプ..."
 
-#: ../src/usr/bin/diffuse:795
+#: ../src/usr/bin/diffuse:831
 msgid "Ignore blank line differences"
 msgstr "空白行の違いを無視"
 
-#: ../src/usr/bin/diffuse:803
+#: ../src/usr/bin/diffuse:839
 msgid "Ignore blank lines"
 msgstr "空白行を無視"
 
-#: ../src/usr/bin/diffuse:805
+#: ../src/usr/bin/diffuse:836
 msgid "Ignore case"
 msgstr "大文字小文字を無視"
 
-#: ../src/usr/bin/diffuse:796
+#: ../src/usr/bin/diffuse:828
 msgid "Ignore case differences"
 msgstr "大文字小文字の違いを無視"
 
-#: ../src/usr/bin/diffuse:794 ../src/usr/bin/diffuse:802
+#: ../src/usr/bin/diffuse:830 ../src/usr/bin/diffuse:838
 msgid "Ignore changes to white space"
 msgstr "空白の変更を無視"
 
-#: ../src/usr/bin/diffuse:804
+#: ../src/usr/bin/diffuse:840
 msgid "Ignore end of line characters"
 msgstr "行の最後の文字を無視"
 
-#: ../src/usr/bin/diffuse:797
+#: ../src/usr/bin/diffuse:832
 msgid "Ignore end of line differences"
 msgstr "行の最後の違いを無視"
 
-#: ../src/usr/bin/diffuse:801
+#: ../src/usr/bin/diffuse:837
 msgid "Ignore white space"
 msgstr "空白を無視"
 
-#: ../src/usr/bin/diffuse:793
+#: ../src/usr/bin/diffuse:829
 msgid "Ignore white space differences"
 msgstr "空白の違いを無視"
 
-#: ../src/usr/bin/diffuse:3967
+#: ../src/usr/bin/diffuse:4267
 msgid "Isolate"
 msgstr "分離"
 
-#: ../src/usr/bin/diffuse:6698
+#: ../src/usr/bin/diffuse:6984
+msgid "Las_t Tab"
+msgstr "最後ののタブ(_T)"
+
+#: ../src/usr/bin/diffuse:7040
 msgid "Last Difference"
 msgstr "最後の差分"
 
-#: ../src/usr/bin/diffuse:860
+#: ../src/usr/bin/diffuse:906
 msgid "Launch from a Bash login shell"
 msgstr "Bashログインシェルから始める"
 
-#: ../src/usr/bin/diffuse:5884
+#: ../src/usr/bin/diffuse:6186
 msgid "Line Number: "
 msgstr "行番号: "
 
-#: ../src/usr/bin/diffuse:6672
+#: ../src/usr/bin/diffuse:7014
 msgid "M_erge From Right Then Left"
 msgstr "右からマージした後、左からマージ(_E)"
 
-#: ../src/usr/bin/diffuse:5804
+#: ../src/usr/bin/diffuse:6115
 msgid "Match Case"
 msgstr "大文字/小文字を区別"
 
-#: ../src/usr/bin/diffuse:6704
+#: ../src/usr/bin/diffuse:7046
 msgid "Merge From Left Then Right"
 msgstr "左からマージした後、右からマージ"
 
-#: ../src/usr/bin/diffuse:6705
+#: ../src/usr/bin/diffuse:7047
 msgid "Merge From Right Then Left"
 msgstr "右からマージした後、左からマージ"
 
-#: ../src/usr/bin/diffuse:3968
+#: ../src/usr/bin/diffuse:4268
 msgid "Merge Selection"
 msgstr "選択をマージ"
 
-#: ../src/usr/bin/diffuse:6691
+#: ../src/usr/bin/diffuse:7033
 msgid "New 2-Way File Merge"
 msgstr "新しい２つのファイルの比較"
 
-#: ../src/usr/bin/diffuse:6692
+#: ../src/usr/bin/diffuse:7034
 msgid "New 3-Way File Merge"
 msgstr "新しい３つのファイルの比較"
 
-#: ../src/usr/bin/diffuse:6596
+#: ../src/usr/bin/diffuse:6936
 msgid "New _2-Way File Merge"
 msgstr "新しい２つのファイルの比較(_2)"
 
-#: ../src/usr/bin/diffuse:6597
+#: ../src/usr/bin/diffuse:6937
 msgid "New _3-Way File Merge"
 msgstr "新しい３つのファイルの比較(_3)"
 
-#: ../src/usr/bin/diffuse:6697
+#: ../src/usr/bin/diffuse:7039
 msgid "Next Difference"
 msgstr "次の差分"
 
-#: ../src/usr/bin/diffuse:6642
+#: ../src/usr/bin/diffuse:6983
 msgid "Next _Tab"
 msgstr "次のタブ(_T)"
 
-#: ../src/usr/bin/diffuse:7094
+#: ../src/usr/bin/diffuse:7446
 msgid "No modified files found."
 msgstr "変更なったファイルが見つかりませんでした。"
 
-#: ../src/usr/bin/diffuse:6622
+#: ../src/usr/bin/diffuse:6962
 msgid "None"
 msgstr "なし"
 
-#: ../src/usr/bin/diffuse:6287
+#: ../src/usr/bin/diffuse:6614
 msgid "Open File"
 msgstr "ファイルを開く"
 
-#: ../src/usr/bin/diffuse:7065
+#: ../src/usr/bin/diffuse:7417
 msgid "Open File In New Tab"
 msgstr "新しいタブにファイルを開く"
 
-#: ../src/usr/bin/diffuse:6588
+#: ../src/usr/bin/diffuse:6928
 msgid "Open File In New _Tab..."
 msgstr "新しいタブにファイルを開く...(_T)"
 
-#: ../src/usr/bin/diffuse:5997
+#: ../src/usr/bin/diffuse:6313
 msgid "Open File..."
 msgstr "ファイルを開く..."
 
-#: ../src/usr/bin/diffuse:6589
+#: ../src/usr/bin/diffuse:6929
 msgid "Open _Modified Files..."
 msgstr "変更のあるファイルを開く...(_M)"
 
-#: ../src/usr/bin/diffuse:821
+#: ../src/usr/bin/diffuse:857
 msgid "Order of codecs used to identify encoding"
 msgstr "エンコーディングを特定するためのコーデックの注文"
 
-#: ../src/usr/bin/diffuse:3972 ../src/usr/bin/diffuse:6711
+#: ../src/usr/bin/diffuse:4272 ../src/usr/bin/diffuse:7053
 msgid "Paste"
 msgstr "貼り付け"
 
-#: ../src/usr/bin/diffuse:7178
+#: ../src/usr/bin/diffuse:7535
 msgid "Phrase not found.  Continue from the end of the file?"
 msgstr "文字列が見つかりませんでした。ファイルの終わりから続けますか。"
 
-#: ../src/usr/bin/diffuse:7180
+#: ../src/usr/bin/diffuse:7537
 msgid "Phrase not found.  Continue from the start of the file?"
 msgstr "文字列が見つかりませんでした。ファイルの始めから続けますか。"
 
-#: ../src/usr/bin/diffuse:6620
+#: ../src/usr/bin/diffuse:6960
 msgid "Pr_eferences..."
 msgstr "設定...(_E)"
 
-#: ../src/usr/bin/diffuse:6641
+#: ../src/usr/bin/diffuse:6982
 msgid "Pre_vious Tab"
 msgstr "前のタブ(_V)"
 
-#: ../src/usr/bin/diffuse:917
+#: ../src/usr/bin/diffuse:975
 msgid "Preferences"
 msgstr "設定"
 
-#: ../src/usr/bin/diffuse:6482
+#: ../src/usr/bin/diffuse:6822
 msgid ""
 "Press the enter key or double click to edit.  Press the space bar or use the "
 "RMB menu to manually align."
@@ -454,88 +466,92 @@
 "編集するためにエンターキーを押すか、ダブルクリックします。手動で整列させるた"
 "めにスペースバーを押すか、RMBを使います。"
 
-#: ../src/usr/bin/diffuse:6484
+#: ../src/usr/bin/diffuse:6824
 msgid "Press the escape key to finish editing."
 msgstr "ESCキーを押して、編集を終了します。"
 
-#: ../src/usr/bin/diffuse:6696
+#: ../src/usr/bin/diffuse:7038
 msgid "Previous Difference"
 msgstr "前の差分"
 
-#: ../src/usr/bin/diffuse:6633
+#: ../src/usr/bin/diffuse:6973
 msgid "Re_align All"
 msgstr "全て再整列(_A)"
 
-#: ../src/usr/bin/diffuse:6694
+#: ../src/usr/bin/diffuse:7036
 msgid "Realign All"
 msgstr "全て再整列"
 
-#: ../src/usr/bin/diffuse:6708
+#: ../src/usr/bin/diffuse:7050
 msgid "Redo"
 msgstr "やり直す"
 
-#: ../src/usr/bin/diffuse:819
+#: ../src/usr/bin/diffuse:854
 msgid "Regional Settings"
 msgstr "地域設定"
 
-#: ../src/usr/bin/diffuse:5998
+#: ../src/usr/bin/diffuse:6314
 msgid "Reload File"
 msgstr "ファイルを再読込み"
 
-#: ../src/usr/bin/diffuse:6654
+#: ../src/usr/bin/diffuse:6996
 msgid "Remove Trailing _White Space"
 msgstr "末尾の空白を削除(_W)"
 
-#: ../src/usr/bin/diffuse:5853
+#: ../src/usr/bin/diffuse:6156
 msgid "Revision: "
 msgstr "リビジョン: "
 
-#: ../src/usr/bin/diffuse:833
+#: ../src/usr/bin/diffuse:825
+msgid "Right margin"
+msgstr "右マージン"
+
+#: ../src/usr/bin/diffuse:879
 msgid "Root directory"
 msgstr "ルートディレクトリ"
 
-#: ../src/usr/bin/diffuse:6353
+#: ../src/usr/bin/diffuse:6684
 #, python-format
 msgid "Save %(title)s Pane %(pane)d"
 msgstr "%(title)s の%(pane)d番目の枠を保存"
 
-#: ../src/usr/bin/diffuse:6594
+#: ../src/usr/bin/diffuse:6934
 msgid "Save A_ll"
 msgstr "全て保存(_L)"
 
-#: ../src/usr/bin/diffuse:5999
+#: ../src/usr/bin/diffuse:6315
 msgid "Save File"
 msgstr "ファイルを保存"
 
-#: ../src/usr/bin/diffuse:6000
+#: ../src/usr/bin/diffuse:6316
 msgid "Save File As..."
 msgstr "ファイルとして保存..."
 
-#: ../src/usr/bin/diffuse:6593
+#: ../src/usr/bin/diffuse:6933
 msgid "Save File _As..."
 msgstr "ファイルとして保存...(_A)"
 
-#: ../src/usr/bin/diffuse:6139
+#: ../src/usr/bin/diffuse:6461
 msgid "Save changes before loading the new file?"
 msgstr "新しいファイルをロードする前に、変更したデータを保存しますか？"
 
-#: ../src/usr/bin/diffuse:5809
+#: ../src/usr/bin/diffuse:6120
 msgid "Search Backwards"
 msgstr "先頭に向かって検索"
 
-#: ../src/usr/bin/diffuse:5779
+#: ../src/usr/bin/diffuse:6090
 msgid "Search For: "
 msgstr "検索する文字列: "
 
-#: ../src/usr/bin/diffuse:3974
+#: ../src/usr/bin/diffuse:4274
 msgid "Select All"
 msgstr "全て選択"
 
-#: ../src/usr/bin/diffuse:6611
+#: ../src/usr/bin/diffuse:6951
 msgid "Select _All"
 msgstr "全て選択(_A)"
 
-#: ../src/usr/bin/diffuse:6486
+#: ../src/usr/bin/diffuse:6826
 msgid ""
 "Select target line and press the space bar to align.  Press the escape key "
 "to cancel."
@@ -543,64 +559,68 @@
 "目標行を選択してスペースバーを押すと整列します。取り消す場合は、ESCキーを押し"
 "ます。"
 
-#: ../src/usr/bin/diffuse:6645
+#: ../src/usr/bin/diffuse:6987
 msgid "Shift Pane _Left"
 msgstr "枠を左に動かす(_L)"
 
-#: ../src/usr/bin/diffuse:6644
+#: ../src/usr/bin/diffuse:6986
 msgid "Shift Pane _Right"
 msgstr "枠を右に動かす(_R)"
 
-#: ../src/usr/bin/diffuse:791
+#: ../src/usr/bin/diffuse:826
 msgid "Show line numbers"
 msgstr "行番号を表示"
 
-#: ../src/usr/bin/diffuse:792
+#: ../src/usr/bin/diffuse:824
+msgid "Show right margin"
+msgstr "右マージンを表示"
+
+#: ../src/usr/bin/diffuse:827
 msgid "Show white space characters"
 msgstr "空白文字を表示"
 
-#: ../src/usr/bin/diffuse:7434
+#: ../src/usr/bin/diffuse:7815
 #, python-format
 msgid "Skipping unknown argument \"%s\"."
 msgstr "未知の引数「%s」を飛ばします。"
 
-#: ../src/usr/bin/diffuse:809
+#: ../src/usr/bin/diffuse:846
 msgid "Soft tab width"
 msgstr "ソフトタブの幅"
 
-#: ../src/usr/bin/diffuse:6816
+#: ../src/usr/bin/diffuse:7158
 msgid ""
 "Some files have unsaved changes.  Select the files to save before closing."
 msgstr ""
 "変更が保存されていないファイルがあります。終了前に保存するファイルを選択しま"
 "す。"
 
-#: ../src/usr/bin/diffuse:6652
+#: ../src/usr/bin/diffuse:6994
 msgid "Sort Lines In D_escending Order"
 msgstr "行を降順に並べる(_E)"
 
-#: ../src/usr/bin/diffuse:6651
+#: ../src/usr/bin/diffuse:6993
 msgid "Sort Lines In _Ascending Order"
 msgstr "行を昇順に並べる(_A)"
 
-#: ../src/usr/bin/diffuse:3977
+#: ../src/usr/bin/diffuse:4277
 msgid "Swap with Selected Pane"
 msgstr "選択された枠と交換"
 
-#: ../src/usr/bin/diffuse:790
+#: ../src/usr/bin/diffuse:823
 msgid "Tab width"
 msgstr "タブの幅"
 
-#: ../src/usr/bin/diffuse:813
+#: ../src/usr/bin/diffuse:848
 msgid "Tabs"
 msgstr "タブ"
 
-#: ../src/usr/bin/diffuse:6333
+#: ../src/usr/bin/diffuse:6664
 #, python-format
 msgid "The file %s changed on disk.  Do you want to reload the file?"
 msgstr "ファイル %s が変更されたようです。 そのファイルを再読み込みしますか？"
 
-#: ../src/usr/bin/diffuse:6375
+#: ../src/usr/bin/diffuse:6715
 #, python-format
 msgid ""
 "The file %s has been modified by another process since reading it.  If you "
@@ -609,7 +629,7 @@
 "ファイル %s は、変更されています。保存する場合は、これらの変更が失われること"
 "があります。保存しますか?"
 
-#: ../src/usr/bin/diffuse:5922
+#: ../src/usr/bin/diffuse:6224
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -641,15 +661,15 @@
 "ください(宛先は the Free Software Foundation, Inc., 59 Temple Place, Suite "
 "330, Boston, MA 02111-1307 USA)。\n"
 
-#: ../src/usr/bin/diffuse:6707
+#: ../src/usr/bin/diffuse:7049
 msgid "Undo"
 msgstr "元に戻す"
 
-#: ../src/usr/bin/diffuse:862
+#: ../src/usr/bin/diffuse:908
 msgid "Update paths for Cygwin"
 msgstr "Cygwin のためにパスを更新"
 
-#: ../src/usr/bin/diffuse:78
+#: ../src/usr/bin/diffuse:86
 msgid ""
 "Usage:\n"
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
@@ -677,10 +697,12 @@
 "  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
 "  ( -D | --close-if-same )         Close all tabs with no differences\n"
 "  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
+"  ( -L | --label ) <label>         Display <label> instead of the file name\n"
 "  ( -m | --modified )              Create a new tab for each modified file\n"
 "  ( -r | --revision ) <rev>        File revision <rev>\n"
 "  ( -s | --separate )              Create a new tab for each file\n"
 "  ( -t | --tab )                   Start a new tab\n"
+"  --line <line>                    Start with line <line> selected\n"
 "  --null-file                      Create a blank file comparison pane\n"
 "\n"
 "Display Options:\n"
@@ -699,9 +721,8 @@
 "任意の数の並行なファイルを比較できます。ユーザは、手動で行を再整列し、\n"
 "ファイルを直接編集できます。また、Diffuse は比較やマージするためにBazaar、"
 "CVS、\n"
-"Darcs、Git、Mercurial、Monotone、RCS、Subversion、および SVK リポジトリから"
-"ファイル\n"
-"リビジョンを取得できます。\n"
+"Darcs、Git、Mercurial、Monotone、RCS、Subversion、および SVK リポジトリから\n"
+"ファイルリビジョンを取得できます。\n"
 "\n"
 "ヘルプオプション:\n"
 "  ( -h | -? | --help )             この使用方法の情報を表示\n"
@@ -716,11 +737,13 @@
 "ン\n"
 "  ( -D | --close-if-same )         差分がないタブを閉じる\n"
 "  ( -e | --encoding ) <codec>      <codec> でファイルを読み書き\n"
+"  ( -L | --label ) <label>         ファイル名の代わりに <label> を表示\n"
 "  ( -m | --modified )              変更になったファイルのために新しいタブを作"
 "る\n"
 "  ( -r | --revision ) <rev>        <rev> というファイルリビジョン\n"
 "  ( -s | --separate )              各ファイルのために新しいタブを作る\n"
 "  ( -t | --tab )                   新しいタブを始める\n"
+"  --line <line>                    初めに <line> 行を選択してから\n"
 "  --null-file                      空白のファイル比較枠を作る\n"
 "\n"
 "表示オプション:\n"
@@ -730,143 +753,143 @@
 "  ( -i | --ignore-case )           大文字小文字の違いを無視\n"
 "  ( -w | --ignore-all-space )      空白の違いを無視"
 
-#: ../src/usr/bin/diffuse:865
+#: ../src/usr/bin/diffuse:911
 msgid "Version Control"
 msgstr "バージョンコントロール"
 
-#: ../src/usr/bin/diffuse:817
+#: ../src/usr/bin/diffuse:852
 #, python-format
 msgid "Warn me when closing a tab will quit %s"
 msgstr "閉じるとき、タブが %s を終了すると警告"
 
-#: ../src/usr/bin/diffuse:548
+#: ../src/usr/bin/diffuse:542
 #, python-format
 msgid "Warning: unknown colour \"%s\""
 msgstr "警告: 未知の色「%s」"
 
-#: ../src/usr/bin/diffuse:557
+#: ../src/usr/bin/diffuse:551
 #, python-format
 msgid "Warning: unknown float \"%s\""
 msgstr "警告: 未知の浮動小数点数「%s」"
 
-#: ../src/usr/bin/diffuse:566
+#: ../src/usr/bin/diffuse:560
 #, python-format
 msgid "Warning: unknown string \"%s\""
 msgstr "警告: 未知の文字列「%s」"
 
-#: ../src/usr/bin/diffuse:6677
+#: ../src/usr/bin/diffuse:7019
 #, python-format
 msgid "_About %s..."
 msgstr "%s について...(_A)"
 
-#: ../src/usr/bin/diffuse:6599
+#: ../src/usr/bin/diffuse:6939
 msgid "_Close Tab"
 msgstr "タブを閉じる(_C)"
 
-#: ../src/usr/bin/diffuse:6608
+#: ../src/usr/bin/diffuse:6948
 msgid "_Copy"
 msgstr "コピー(_C)"
 
-#: ../src/usr/bin/diffuse:6613
+#: ../src/usr/bin/diffuse:6953
 msgid "_Dismiss All Edits"
 msgstr "全ての編集を破棄(_D)"
 
-#: ../src/usr/bin/diffuse:6603
+#: ../src/usr/bin/diffuse:6943
 msgid "_Edit"
 msgstr "編集(_E)"
 
-#: ../src/usr/bin/diffuse:6586
+#: ../src/usr/bin/diffuse:6926
 msgid "_File"
 msgstr "ファイル(_F)"
 
-#: ../src/usr/bin/diffuse:6615
+#: ../src/usr/bin/diffuse:6955
 msgid "_Find..."
 msgstr "検索...(_F)"
 
-#: ../src/usr/bin/diffuse:6636
+#: ../src/usr/bin/diffuse:6976
 msgid "_First Difference"
 msgstr "最初の差分(_F)"
 
-#: ../src/usr/bin/diffuse:6618
+#: ../src/usr/bin/diffuse:6958
 msgid "_Go To Line..."
 msgstr "指定行へジャンプ...(_G)"
 
-#: ../src/usr/bin/diffuse:6674
+#: ../src/usr/bin/diffuse:7016
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
-#: ../src/usr/bin/diffuse:6675
+#: ../src/usr/bin/diffuse:7017
 msgid "_Help Contents..."
 msgstr "ヘルプの目次...(_H)"
 
-#: ../src/usr/bin/diffuse:6658
+#: ../src/usr/bin/diffuse:7000
 msgid "_Increase Indenting"
 msgstr "インデントを増やす(_I)"
 
-#: ../src/usr/bin/diffuse:6634
+#: ../src/usr/bin/diffuse:6974
 msgid "_Isolate"
 msgstr "分離(_I)"
 
-#: ../src/usr/bin/diffuse:6639
+#: ../src/usr/bin/diffuse:6979
 msgid "_Last Difference"
 msgstr "最後の差分(_L)"
 
-#: ../src/usr/bin/diffuse:6665
+#: ../src/usr/bin/diffuse:7007
 msgid "_Merge"
 msgstr "マージ(_M)"
 
-#: ../src/usr/bin/diffuse:6671
+#: ../src/usr/bin/diffuse:7013
 msgid "_Merge From Left Then Right"
 msgstr "左からマージした後、右からマージ(_M)"
 
-#: ../src/usr/bin/diffuse:6638
+#: ../src/usr/bin/diffuse:6978
 msgid "_Next Difference"
 msgstr "次の差分(_N)"
 
-#: ../src/usr/bin/diffuse:6587
+#: ../src/usr/bin/diffuse:6927
 msgid "_Open File..."
 msgstr "ファイルを開く...(_O)"
 
-#: ../src/usr/bin/diffuse:6609
+#: ../src/usr/bin/diffuse:6949
 msgid "_Paste"
 msgstr "貼り付け(_P)"
 
-#: ../src/usr/bin/diffuse:6637
+#: ../src/usr/bin/diffuse:6977
 msgid "_Previous Difference"
 msgstr "前の差分(_P)"
 
-#: ../src/usr/bin/diffuse:6601
+#: ../src/usr/bin/diffuse:6941
 msgid "_Quit"
 msgstr "終了(_Q)"
 
-#: ../src/usr/bin/diffuse:6605
+#: ../src/usr/bin/diffuse:6945
 msgid "_Redo"
 msgstr "やり直す(_R)"
 
-#: ../src/usr/bin/diffuse:6590
+#: ../src/usr/bin/diffuse:6930
 msgid "_Reload File"
 msgstr "ファイルの再読込み(_R)"
 
-#: ../src/usr/bin/diffuse:6592
+#: ../src/usr/bin/diffuse:6932
 msgid "_Save File"
 msgstr "ファイルを保存(_S)"
 
-#: ../src/usr/bin/diffuse:6631
+#: ../src/usr/bin/diffuse:6971
 msgid "_Syntax Highlighting"
 msgstr "構文の強調表示(_S)"
 
-#: ../src/usr/bin/diffuse:6604
+#: ../src/usr/bin/diffuse:6944
 msgid "_Undo"
 msgstr "元に戻す(_U)"
 
-#: ../src/usr/bin/diffuse:6600
+#: ../src/usr/bin/diffuse:6940
 msgid "_Undo Close Tab"
 msgstr "タブを閉じて元に戻す(_U)"
 
-#: ../src/usr/bin/diffuse:6630
+#: ../src/usr/bin/diffuse:6970
 msgid "_View"
 msgstr "表示(_V)"
 
-#: ../src/usr/bin/diffuse:5919
+#: ../src/usr/bin/diffuse:6221
 msgid "translator-credits"
 msgstr "Derrick Moser <derrick_moser@yahoo.com>"
diff -Nru diffuse-0.4.4/translations/ko.po diffuse-0.4.5/translations/ko.po
--- diffuse-0.4.4/translations/ko.po	2010-10-21 01:58:01.000000000 +0000
+++ diffuse-0.4.5/translations/ko.po	2011-07-13 09:18:32.000000000 +0000
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: diffuse-svn r250\n"
+"Project-Id-Version: diffuse-svn r316\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-10 08:00-0400\n"
+"POT-Creation-Date: 2011-07-11 08:14-0400\n"
 "PO-Revision-Date: 2010-04-20 00:32+0900\n"
 "Last-Translator: Kang Bundo <bundo@bundo.biz>\n"
 "Language-Team: Korean\n"
@@ -16,624 +16,674 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../src/usr/bin/diffuse:854
+#: ../src/usr/bin/diffuse:900
 msgid "\"co\" command"
 msgstr "co 명령어"
 
-#: ../src/usr/bin/diffuse:855
+#: ../src/usr/bin/diffuse:901
 msgid "\"rlog\" command"
 msgstr "rlog 명령어"
 
-#: ../src/usr/bin/diffuse:6822
+#: ../src/usr/bin/diffuse:7164
 #, python-format
 msgid "%(title)s Pane %(pane)d"
 msgstr "%(title)s의 %(pane)d번째 패널"
 
-#: ../src/usr/bin/diffuse:6370
+#: ../src/usr/bin/diffuse:6710
 #, python-format
 msgid "A file named %s already exists.  Do you want to overwrite it?"
 msgstr "%s라는 파일이 이미 있습니다. 그것을 덮어 쓰시겠습니까?"
 
-#: ../src/usr/bin/diffuse:3966
+#: ../src/usr/bin/diffuse:4266
 msgid "Align with Selection"
 msgstr "선택 정렬"
 
-#: ../src/usr/bin/diffuse:799
+#: ../src/usr/bin/diffuse:834
 msgid "Alignment"
 msgstr "정렬"
 
-#: ../src/usr/bin/diffuse:816
+#: ../src/usr/bin/diffuse:851
 msgid "Always show the tab bar"
 msgstr "항상 탭 모음 표시"
 
-#: ../src/usr/bin/diffuse:5845
+#: ../src/usr/bin/diffuse:724
 msgid "Auto Detect"
 msgstr "자동추출"
 
-#: ../src/usr/bin/diffuse:811
+#: ../src/usr/bin/diffuse:844
 msgid "Auto indent"
 msgstr "자동 들여쓰기"
 
-#: ../src/usr/bin/diffuse:6612
+#: ../src/usr/bin/diffuse:6952
 msgid "C_lear Edits"
 msgstr "편집 삭제(_L)"
 
-#: ../src/usr/bin/diffuse:7081
+#: ../src/usr/bin/diffuse:7433
 msgid "Choose Folder With Modified Files"
 msgstr "변경 된 파일이 있는 폴더를 선택"
 
-#: ../src/usr/bin/diffuse:3975
-#: ../src/usr/bin/diffuse:6712
+#: ../src/usr/bin/diffuse:4275 ../src/usr/bin/diffuse:7054
 msgid "Clear Edits"
 msgstr "편집 삭제"
 
-#: ../src/usr/bin/diffuse:5956
+#: ../src/usr/bin/diffuse:6258
 msgid "Close Tab"
 msgstr "탭 닫기"
 
-#: ../src/usr/bin/diffuse:6831
+#: ../src/usr/bin/diffuse:7173
 msgid "Close _Without Saving"
 msgstr "저장하지 않고 닫기(_W)"
 
-#: ../src/usr/bin/diffuse:5823
+#: ../src/usr/bin/diffuse:6134
 #, python-format
 msgid "Closing this tab will quit %s."
 msgstr "이 탭을 닫으면, %s 종료합니다."
 
-#: ../src/usr/bin/diffuse:6074
+#: ../src/usr/bin/diffuse:6396
 #, python-format
 msgid "Column %d"
 msgstr "%d열"
 
-#: ../src/usr/bin/diffuse:857
+#: ../src/usr/bin/diffuse:903
 msgid "Command"
 msgstr "명령어"
 
-#: ../src/usr/bin/diffuse:6656
+#: ../src/usr/bin/diffuse:6998
 msgid "Convert Leading Spaces To _Tabs"
 msgstr "선행 공백을 탭으로 변환(_T)"
 
-#: ../src/usr/bin/diffuse:6655
+#: ../src/usr/bin/diffuse:6997
 msgid "Convert Tabs To _Spaces"
 msgstr "탭을 공백으로 변환(_S)"
 
-#: ../src/usr/bin/diffuse:6663
+#: ../src/usr/bin/diffuse:7005
 msgid "Convert To Uni_x Format"
 msgstr "Unix 형식으로 변환(_X)"
 
-#: ../src/usr/bin/diffuse:6661
+#: ../src/usr/bin/diffuse:7003
 msgid "Convert To _DOS Format"
 msgstr "DOS 형식으로 변환(_D)"
 
-#: ../src/usr/bin/diffuse:6649
+#: ../src/usr/bin/diffuse:6991
 msgid "Convert To _Lower Case"
 msgstr "소문자로 변환(_L)"
 
-#: ../src/usr/bin/diffuse:6662
+#: ../src/usr/bin/diffuse:7004
 msgid "Convert To _Mac Format"
 msgstr "Mac 형식으로 변환(_M)"
 
-#: ../src/usr/bin/diffuse:6648
+#: ../src/usr/bin/diffuse:6990
 msgid "Convert To _Upper Case"
 msgstr "대문자로 변환(_U)"
 
-#: ../src/usr/bin/diffuse:3971
-#: ../src/usr/bin/diffuse:6710
+#: ../src/usr/bin/diffuse:4271 ../src/usr/bin/diffuse:7052
 msgid "Copy"
 msgstr "복사"
 
-#: ../src/usr/bin/diffuse:6702
+#: ../src/usr/bin/diffuse:7044
 msgid "Copy Left Into Selection"
 msgstr "왼쪽에서 선택한 프레임에 복사"
 
-#: ../src/usr/bin/diffuse:6669
+#: ../src/usr/bin/diffuse:7011
 msgid "Copy Left _Into Selection"
 msgstr "왼쪽에서 선택한 프레임에 복사(_I)"
 
-#: ../src/usr/bin/diffuse:6670
+#: ../src/usr/bin/diffuse:7012
 msgid "Copy Right I_nto Selection"
 msgstr "오른쪽에서 선택한 프레임에 복사(_N)"
 
-#: ../src/usr/bin/diffuse:6703
+#: ../src/usr/bin/diffuse:7045
 msgid "Copy Right Into Selection"
 msgstr "오른쪽에서 선택한 프레임에 복사"
 
-#: ../src/usr/bin/diffuse:6701
+#: ../src/usr/bin/diffuse:7043
 msgid "Copy Selection Left"
 msgstr "선택을 왼쪽으로 복사"
 
-#: ../src/usr/bin/diffuse:6700
+#: ../src/usr/bin/diffuse:7042
 msgid "Copy Selection Right"
 msgstr "선택을 오른쪽으로 복사"
 
-#: ../src/usr/bin/diffuse:6667
+#: ../src/usr/bin/diffuse:7009
 msgid "Copy Selection _Left"
 msgstr "선택을 왼쪽으로 복사(_L)"
 
-#: ../src/usr/bin/diffuse:6666
+#: ../src/usr/bin/diffuse:7008
 msgid "Copy Selection _Right"
 msgstr "선택을 오른쪽으로 복사(_R)"
 
-#: ../src/usr/bin/diffuse:67
-msgid "Copyright © 2006-2010 Derrick Moser"
-msgstr "Copyright © 2006-2010 Derrick Moser"
+#: ../src/usr/bin/diffuse:68
+msgid "Copyright © 2006-2011 Derrick Moser"
+msgstr "Copyright © 2006-2011 Derrick Moser"
 
-#: ../src/usr/bin/diffuse:6607
+#: ../src/usr/bin/diffuse:6947
 msgid "Cu_t"
 msgstr "잘라내기(_T)"
 
-#: ../src/usr/bin/diffuse:3970
-#: ../src/usr/bin/diffuse:6709
+#: ../src/usr/bin/diffuse:4270 ../src/usr/bin/diffuse:7051
 msgid "Cut"
 msgstr "잘라내기"
 
-#: ../src/usr/bin/diffuse:834
+#: ../src/usr/bin/diffuse:880
 msgid "Cygdrive prefix"
 msgstr "Cygdrive 접두어"
 
-#: ../src/usr/bin/diffuse:831
+#: ../src/usr/bin/diffuse:877
 msgid "Cygwin"
 msgstr "Cygwin"
 
-#: ../src/usr/bin/diffuse:6659
+#: ../src/usr/bin/diffuse:7001
 msgid "De_crease Indenting"
 msgstr "내어 쓰기(_C)"
 
-#: ../src/usr/bin/diffuse:815
+#: ../src/usr/bin/diffuse:856
+msgid "Default codec"
+msgstr "기본 코덱"
+
+#: ../src/usr/bin/diffuse:850
 msgid "Default panes"
 msgstr "프레임의 기본 수"
 
-#: ../src/usr/bin/diffuse:858
+#: ../src/usr/bin/diffuse:904
 msgid "Default revision"
 msgstr "기본 수정"
 
-#: ../src/usr/bin/diffuse:5918
+#: ../src/usr/bin/diffuse:6220
 msgid "Derrick Moser <derrick_moser@yahoo.com>"
 msgstr "Derrick Moser <derrick_moser@yahoo.com>"
 
-#: ../src/usr/bin/diffuse:5915
+#: ../src/usr/bin/diffuse:6217
 msgid "Diffuse is a graphical tool for merging and comparing text files."
 msgstr "Diffuse는 텍스트 파일을 병합하고 비교하기 위한 그래픽 도구입니다."
 
-#: ../src/usr/bin/diffuse:787
+#: ../src/usr/bin/diffuse:820
 msgid "Display"
 msgstr "표시"
 
-#: ../src/usr/bin/diffuse:807
+#: ../src/usr/bin/diffuse:842
 msgid "Editor"
 msgstr "편집기"
 
-#: ../src/usr/bin/diffuse:5835
+#: ../src/usr/bin/diffuse:6146
 msgid "Encoding: "
 msgstr "인코딩: "
 
-#: ../src/usr/bin/diffuse:6417
+#: ../src/usr/bin/diffuse:6757
 #, python-format
 msgid "Error encoding to %s."
 msgstr "%s 바꾸는 데 오류가 발생했습니다."
 
-#: ../src/usr/bin/diffuse:1929
+#: ../src/usr/bin/diffuse:2028
 #, python-format
 msgid "Error parsing %s."
 msgstr "%s를 구문 분석하는 동안 오류가 발생했습니다."
 
-#: ../src/usr/bin/diffuse:6459
+#: ../src/usr/bin/diffuse:6799 ../src/usr/bin/diffuse:7805
 msgid "Error parsing line number."
 msgstr "줄 번호를 구문 분석하는 동안 오류가 발생했습니다。"
 
-#: ../src/usr/bin/diffuse:7378
+#: ../src/usr/bin/diffuse:7750
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "%s 버전을 구문 분석하는 동안 오류가 발생했습니다."
 
-#: ../src/usr/bin/diffuse:7441
+#: ../src/usr/bin/diffuse:7822
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
-msgstr "%s 인수를 처리하는 동안 오류가 발생했습니다. 디렉토리를 예측할 수 없습니다."
+msgstr ""
+"%s 인수를 처리하는 동안 오류가 발생했습니다. 디렉토리를 예측할 수 없습니다."
 
-#: ../src/usr/bin/diffuse:704
+#: ../src/usr/bin/diffuse:696
 #, python-format
 msgid "Error processing line %(line)d of %(file)s."
 msgstr "%(file)s %(line)d 행을 처리하는 도중 오류가 발생했습니다."
 
-#: ../src/usr/bin/diffuse:6264
-#: ../src/usr/bin/diffuse:7350
+#: ../src/usr/bin/diffuse:6591 ../src/usr/bin/diffuse:7722
 #, python-format
 msgid "Error reading %s."
 msgstr "%s를 읽어올 때 오류가 발생했습니다."
 
-#: ../src/usr/bin/diffuse:6262
+#: ../src/usr/bin/diffuse:6589
 #, python-format
 msgid "Error reading revision %(rev)s of %(file)s."
 msgstr "%(file)s %(rev)s는 수정된점을 가져올 때 오류가 발생했습니다."
 
-#: ../src/usr/bin/diffuse:7032
+#: ../src/usr/bin/diffuse:7384
 #, python-format
 msgid "Error retrieving modifications for %s."
 msgstr "%s의 변경을 가져오는 중 오류가 발생했습니다."
 
-#: ../src/usr/bin/diffuse:941
-#: ../src/usr/bin/diffuse:6421
+#: ../src/usr/bin/diffuse:1013 ../src/usr/bin/diffuse:6761
 #, python-format
 msgid "Error writing %s."
 msgstr "%s에 쓸 때 오류가 발생했습니다."
 
-#: ../src/usr/bin/diffuse:810
+#: ../src/usr/bin/diffuse:845
 msgid "Expand tabs to spaces"
 msgstr "탭 대신에 공백을 삽입"
 
-#: ../src/usr/bin/diffuse:6647
+#: ../src/usr/bin/diffuse:6989
 msgid "F_ormat"
 msgstr "형식(_O)"
 
-#: ../src/usr/bin/diffuse:6939
+#: ../src/usr/bin/diffuse:7281
 #, python-format
 msgid "File Merge %d"
 msgstr "파일 병합 %d"
 
-#: ../src/usr/bin/diffuse:6617
+#: ../src/usr/bin/diffuse:6957
 msgid "Find Pre_vious"
 msgstr "이전 찾기(_V)"
 
-#: ../src/usr/bin/diffuse:6616
+#: ../src/usr/bin/diffuse:6956
 msgid "Find _Next"
 msgstr "다음 찾기(_N)"
 
-#: ../src/usr/bin/diffuse:5773
+#: ../src/usr/bin/diffuse:6084
 msgid "Find..."
 msgstr "찾기..."
 
-#: ../src/usr/bin/diffuse:6695
+#: ../src/usr/bin/diffuse:6981
+msgid "Fir_st Tab"
+msgstr "첫번째 탭(_S)"
+
+#: ../src/usr/bin/diffuse:7037
 msgid "First Difference"
 msgstr "첫번째 차이"
 
-#: ../src/usr/bin/diffuse:789
+#: ../src/usr/bin/diffuse:822
 msgid "Font"
 msgstr "글꼴"
 
-#: ../src/usr/bin/diffuse:5878
+#: ../src/usr/bin/diffuse:6180
 msgid "Go To Line..."
 msgstr "줄로 이동..."
 
-#: ../src/usr/bin/diffuse:795
+#: ../src/usr/bin/diffuse:831
 msgid "Ignore blank line differences"
 msgstr "공백 행은 무시"
 
-#: ../src/usr/bin/diffuse:803
+#: ../src/usr/bin/diffuse:839
 msgid "Ignore blank lines"
 msgstr "빈 줄을 무시"
 
-#: ../src/usr/bin/diffuse:805
+#: ../src/usr/bin/diffuse:836
 msgid "Ignore case"
 msgstr "대소문자 무시"
 
-#: ../src/usr/bin/diffuse:796
+#: ../src/usr/bin/diffuse:828
 msgid "Ignore case differences"
 msgstr "대소문자 차이를 무시"
 
-#: ../src/usr/bin/diffuse:794
-#: ../src/usr/bin/diffuse:802
+#: ../src/usr/bin/diffuse:830 ../src/usr/bin/diffuse:838
 msgid "Ignore changes to white space"
 msgstr "빈 변화를 무시"
 
-#: ../src/usr/bin/diffuse:804
+#: ../src/usr/bin/diffuse:840
 msgid "Ignore end of line characters"
 msgstr "행의 마지막 문자를 무시"
 
-#: ../src/usr/bin/diffuse:797
+#: ../src/usr/bin/diffuse:832
 msgid "Ignore end of line differences"
 msgstr "행의 마지막 차이를 무시"
 
-#: ../src/usr/bin/diffuse:801
+#: ../src/usr/bin/diffuse:837
 msgid "Ignore white space"
 msgstr "공백을 무시"
 
-#: ../src/usr/bin/diffuse:793
+#: ../src/usr/bin/diffuse:829
 msgid "Ignore white space differences"
 msgstr "공백을 차이를 무시"
 
-#: ../src/usr/bin/diffuse:3967
+#: ../src/usr/bin/diffuse:4267
 msgid "Isolate"
 msgstr "분리"
 
-#: ../src/usr/bin/diffuse:6698
+#: ../src/usr/bin/diffuse:6984
+msgid "Las_t Tab"
+msgstr "마지막 탭(_T)"
+
+#: ../src/usr/bin/diffuse:7040
 msgid "Last Difference"
 msgstr "마지막 차이"
 
-#: ../src/usr/bin/diffuse:860
+#: ../src/usr/bin/diffuse:906
 msgid "Launch from a Bash login shell"
 msgstr "Bash 로그인 쉘에서 시작"
 
-#: ../src/usr/bin/diffuse:5884
+#: ../src/usr/bin/diffuse:6186
 msgid "Line Number: "
 msgstr "줄번호: "
 
-#: ../src/usr/bin/diffuse:6672
+#: ../src/usr/bin/diffuse:7014
 msgid "M_erge From Right Then Left"
 msgstr "오른쪽에서 병합 후 왼쪽에서 합병(_E)"
 
-#: ../src/usr/bin/diffuse:5804
+#: ../src/usr/bin/diffuse:6115
 msgid "Match Case"
 msgstr "대소문자 구분"
 
-#: ../src/usr/bin/diffuse:6704
+#: ../src/usr/bin/diffuse:7046
 msgid "Merge From Left Then Right"
 msgstr "왼쪽에서 합병 후 오른쪽에서 병합"
 
-#: ../src/usr/bin/diffuse:6705
+#: ../src/usr/bin/diffuse:7047
 msgid "Merge From Right Then Left"
 msgstr "오른쪽에서 병합 후 왼쪽에서 합병"
 
-#: ../src/usr/bin/diffuse:3968
+#: ../src/usr/bin/diffuse:4268
 msgid "Merge Selection"
 msgstr "선택 병합"
 
-#: ../src/usr/bin/diffuse:6691
+#: ../src/usr/bin/diffuse:7033
 msgid "New 2-Way File Merge"
 msgstr "새로운 2개의 파일 비교"
 
-#: ../src/usr/bin/diffuse:6692
+#: ../src/usr/bin/diffuse:7034
 msgid "New 3-Way File Merge"
 msgstr "새로운 3개의 파일 비교"
 
-#: ../src/usr/bin/diffuse:6596
+#: ../src/usr/bin/diffuse:6936
 msgid "New _2-Way File Merge"
 msgstr "새로운 2개의 파일 비교(_2)"
 
-#: ../src/usr/bin/diffuse:6597
+#: ../src/usr/bin/diffuse:6937
 msgid "New _3-Way File Merge"
 msgstr "새로운 3개의 파일 비교(_3)"
 
-#: ../src/usr/bin/diffuse:6697
+#: ../src/usr/bin/diffuse:7039
 msgid "Next Difference"
 msgstr "다음 차이"
 
-#: ../src/usr/bin/diffuse:6642
+#: ../src/usr/bin/diffuse:6983
 msgid "Next _Tab"
 msgstr "다음 탭으로(_T)"
 
-#: ../src/usr/bin/diffuse:7094
+#: ../src/usr/bin/diffuse:7446
 msgid "No modified files found."
 msgstr "변경 된 파일을 찾을 수 없습니다."
 
-#: ../src/usr/bin/diffuse:6622
+#: ../src/usr/bin/diffuse:6962
 msgid "None"
 msgstr "없음"
 
-#: ../src/usr/bin/diffuse:6287
+#: ../src/usr/bin/diffuse:6614
 msgid "Open File"
 msgstr "열기"
 
-#: ../src/usr/bin/diffuse:7065
+#: ../src/usr/bin/diffuse:7417
 msgid "Open File In New Tab"
 msgstr "새 탭에서 열기"
 
-#: ../src/usr/bin/diffuse:6588
+#: ../src/usr/bin/diffuse:6928
 msgid "Open File In New _Tab..."
 msgstr "새 탭에서 열기...(_T)"
 
-#: ../src/usr/bin/diffuse:5997
+#: ../src/usr/bin/diffuse:6313
 msgid "Open File..."
 msgstr "열기..."
 
-#: ../src/usr/bin/diffuse:6589
+#: ../src/usr/bin/diffuse:6929
 msgid "Open _Modified Files..."
 msgstr "변경 파일 열기...(_M)"
 
-#: ../src/usr/bin/diffuse:821
+#: ../src/usr/bin/diffuse:857
 msgid "Order of codecs used to identify encoding"
 msgstr "인코딩을 확인하기 위한 코덱을 주문"
 
-#: ../src/usr/bin/diffuse:3972
-#: ../src/usr/bin/diffuse:6711
+#: ../src/usr/bin/diffuse:4272 ../src/usr/bin/diffuse:7053
 msgid "Paste"
 msgstr "붙여넣기"
 
-#: ../src/usr/bin/diffuse:7178
+#: ../src/usr/bin/diffuse:7535
 msgid "Phrase not found.  Continue from the end of the file?"
 msgstr "문자열을 찾을 수 없습니다. 파일의 끝에서 계속하시겠습니까?"
 
-#: ../src/usr/bin/diffuse:7180
+#: ../src/usr/bin/diffuse:7537
 msgid "Phrase not found.  Continue from the start of the file?"
 msgstr "문자열을 찾을 수 없습니다. 파일의 시작에서 다시하시겠습니까?"
 
-#: ../src/usr/bin/diffuse:6620
+#: ../src/usr/bin/diffuse:6960
 msgid "Pr_eferences..."
 msgstr "기본 설정...(_E)"
 
-#: ../src/usr/bin/diffuse:6641
+#: ../src/usr/bin/diffuse:6982
 msgid "Pre_vious Tab"
 msgstr "이전 탭으로(_V)"
 
-#: ../src/usr/bin/diffuse:917
+#: ../src/usr/bin/diffuse:975
 msgid "Preferences"
 msgstr "기본 설정"
 
-#: ../src/usr/bin/diffuse:6482
-msgid "Press the enter key or double click to edit.  Press the space bar or use the RMB menu to manually align."
-msgstr "편집하려면 엔터키를 누르거나 두 번 클릭합니다. 수동으로 정렬하기 위해 스페이스 바를 누르거나, RMB를 사용합니다."
+#: ../src/usr/bin/diffuse:6822
+msgid ""
+"Press the enter key or double click to edit.  Press the space bar or use the "
+"RMB menu to manually align."
+msgstr ""
+"편집하려면 엔터키를 누르거나 두 번 클릭합니다. 수동으로 정렬하기 위해 스페이"
+"스 바를 누르거나, RMB를 사용합니다."
 
-#: ../src/usr/bin/diffuse:6484
+#: ../src/usr/bin/diffuse:6824
 msgid "Press the escape key to finish editing."
 msgstr "ESC 키를 눌러 편집을 끝냅니다."
 
-#: ../src/usr/bin/diffuse:6696
+#: ../src/usr/bin/diffuse:7038
 msgid "Previous Difference"
 msgstr "이전 차이"
 
-#: ../src/usr/bin/diffuse:6633
+#: ../src/usr/bin/diffuse:6973
 msgid "Re_align All"
 msgstr "전체 다시 정렬(_A)"
 
-#: ../src/usr/bin/diffuse:6694
+#: ../src/usr/bin/diffuse:7036
 msgid "Realign All"
 msgstr "전체 다시 정렬"
 
-#: ../src/usr/bin/diffuse:6708
+#: ../src/usr/bin/diffuse:7050
 msgid "Redo"
 msgstr "작업 재 실행"
 
-#: ../src/usr/bin/diffuse:819
+#: ../src/usr/bin/diffuse:854
 msgid "Regional Settings"
 msgstr "국가별 설정"
 
-#: ../src/usr/bin/diffuse:5998
+#: ../src/usr/bin/diffuse:6314
 msgid "Reload File"
 msgstr "파일을 다시 읽기"
 
-#: ../src/usr/bin/diffuse:6654
+#: ../src/usr/bin/diffuse:6996
 msgid "Remove Trailing _White Space"
 msgstr "후행 공백을 제거(_W)"
 
-#: ../src/usr/bin/diffuse:5853
+#: ../src/usr/bin/diffuse:6156
 msgid "Revision: "
 msgstr "수정: "
 
-#: ../src/usr/bin/diffuse:833
+#: ../src/usr/bin/diffuse:825
+msgid "Right margin"
+msgstr "오른쪽 여백"
+
+#: ../src/usr/bin/diffuse:879
 msgid "Root directory"
 msgstr "루트 디렉터리"
 
-#: ../src/usr/bin/diffuse:6353
+#: ../src/usr/bin/diffuse:6684
 #, python-format
 msgid "Save %(title)s Pane %(pane)d"
 msgstr "%(title)s %(pane)d번째 프레임을 저장"
 
-#: ../src/usr/bin/diffuse:6594
+#: ../src/usr/bin/diffuse:6934
 msgid "Save A_ll"
 msgstr "전체 저장(_L)"
 
-#: ../src/usr/bin/diffuse:5999
+#: ../src/usr/bin/diffuse:6315
 msgid "Save File"
 msgstr "파일로 저장"
 
-#: ../src/usr/bin/diffuse:6000
+#: ../src/usr/bin/diffuse:6316
 msgid "Save File As..."
 msgstr "파일로 저장..."
 
-#: ../src/usr/bin/diffuse:6593
+#: ../src/usr/bin/diffuse:6933
 msgid "Save File _As..."
 msgstr "파일로 저장...(_A)"
 
-#: ../src/usr/bin/diffuse:6139
+#: ../src/usr/bin/diffuse:6461
 msgid "Save changes before loading the new file?"
 msgstr "새 파일을 불러오기 전에 변경된 데이터를 저장할까요?"
 
-#: ../src/usr/bin/diffuse:5809
+#: ../src/usr/bin/diffuse:6120
 msgid "Search Backwards"
 msgstr "위 방향으로 검색"
 
-#: ../src/usr/bin/diffuse:5779
+#: ../src/usr/bin/diffuse:6090
 msgid "Search For: "
 msgstr "검색 문자열:"
 
-#: ../src/usr/bin/diffuse:3974
+#: ../src/usr/bin/diffuse:4274
 msgid "Select All"
 msgstr "모두 선택"
 
-#: ../src/usr/bin/diffuse:6611
+#: ../src/usr/bin/diffuse:6951
 msgid "Select _All"
 msgstr "모두 선택(_A)"
 
-#: ../src/usr/bin/diffuse:6486
-msgid "Select target line and press the space bar to align.  Press the escape key to cancel."
-msgstr "목표 행을 선택하고 스페이스 바를 누르면 정렬합니다. 취소하려면 ESC 키를 누르십시오."
+#: ../src/usr/bin/diffuse:6826
+msgid ""
+"Select target line and press the space bar to align.  Press the escape key "
+"to cancel."
+msgstr ""
+"목표 행을 선택하고 스페이스 바를 누르면 정렬합니다. 취소하려면 ESC 키를 누르"
+"십시오."
 
-#: ../src/usr/bin/diffuse:6645
+#: ../src/usr/bin/diffuse:6987
 msgid "Shift Pane _Left"
 msgstr "페널을 왼쪽으로 이동(_L)"
 
-#: ../src/usr/bin/diffuse:6644
+#: ../src/usr/bin/diffuse:6986
 msgid "Shift Pane _Right"
 msgstr "페널을 오른쪽으로 이동(_R)"
 
-#: ../src/usr/bin/diffuse:791
+#: ../src/usr/bin/diffuse:826
 msgid "Show line numbers"
 msgstr "줄번호 표시"
 
-#: ../src/usr/bin/diffuse:792
+#: ../src/usr/bin/diffuse:824
+msgid "Show right margin"
+msgstr "오른쪽 여백 표시"
+
+#: ../src/usr/bin/diffuse:827
 msgid "Show white space characters"
 msgstr "여백 표시"
 
-#: ../src/usr/bin/diffuse:7434
+#: ../src/usr/bin/diffuse:7815
 #, python-format
 msgid "Skipping unknown argument \"%s\"."
 msgstr "알수 없는 인수「%s」 유지 합니다."
 
-#: ../src/usr/bin/diffuse:809
+#: ../src/usr/bin/diffuse:846
 msgid "Soft tab width"
 msgstr "소프트 탭 너비"
 
-#: ../src/usr/bin/diffuse:6816
-msgid "Some files have unsaved changes.  Select the files to save before closing."
-msgstr "변경 내용이 저장되지 않은 파일이 있습니다. 종료하기 전에 저장할 파일을 선택합니다."
+#: ../src/usr/bin/diffuse:7158
+msgid ""
+"Some files have unsaved changes.  Select the files to save before closing."
+msgstr ""
+"변경 내용이 저장되지 않은 파일이 있습니다. 종료하기 전에 저장할 파일을 선택합"
+"니다."
 
-#: ../src/usr/bin/diffuse:6652
+#: ../src/usr/bin/diffuse:6994
 msgid "Sort Lines In D_escending Order"
 msgstr "행을 내림차순으로 정렬(_E)"
 
-#: ../src/usr/bin/diffuse:6651
+#: ../src/usr/bin/diffuse:6993
 msgid "Sort Lines In _Ascending Order"
 msgstr "행을 오름차순으로 정렬(_A)"
 
-#: ../src/usr/bin/diffuse:3977
+#: ../src/usr/bin/diffuse:4277
 msgid "Swap with Selected Pane"
 msgstr "선택된 프레임 대신"
 
-#: ../src/usr/bin/diffuse:790
+#: ../src/usr/bin/diffuse:823
 msgid "Tab width"
 msgstr "탭 너비"
 
-#: ../src/usr/bin/diffuse:813
+#: ../src/usr/bin/diffuse:848
 msgid "Tabs"
 msgstr "탭"
 
-#: ../src/usr/bin/diffuse:6333
+#: ../src/usr/bin/diffuse:6664
 #, python-format
 msgid "The file %s changed on disk.  Do you want to reload the file?"
 msgstr "%s 파일이 변경된 것 같습니다. 해당 파일을 다시 불러 오시겠습니까?"
 
-#: ../src/usr/bin/diffuse:6375
+#: ../src/usr/bin/diffuse:6715
 #, python-format
-msgid "The file %s has been modified by another process since reading it.  If you save, all the external changes could be lost.  Save anyways?"
-msgstr "%s 파일은 수정되었습니다. 저장하게되면 이러한 변경 내용이 손실될 수 있습니다. 저장하시겠습니까?"
+msgid ""
+"The file %s has been modified by another process since reading it.  If you "
+"save, all the external changes could be lost.  Save anyways?"
+msgstr ""
+"%s 파일은 수정되었습니다. 저장하게되면 이러한 변경 내용이 손실될 수 있습니"
+"다. 저장하시겠습니까?"
 
-#: ../src/usr/bin/diffuse:5922
+#: ../src/usr/bin/diffuse:6224
 msgid ""
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the licence, or (at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with this program.  You may also obtain a copy of the GNU General Public License from the Free Software Foundation by visiting their web site (http://www.fsf.org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the licence, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program.  You may also obtain a copy of the GNU General Public License "
+"from the Free Software Foundation by visiting their web site (http://www.fsf."
+"org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, "
+"Fifth Floor, Boston, MA  02110-1301  USA\n"
 msgstr ""
-"이 프로그램은 자유 소프트웨어입니다. 당신은 이것을 자유 소프트웨어 재단에 의해 발행된 GNU 일반 공중 사용 허가서 (버전 2, 희망은 이후 버전 중 하나)을 결정하는 조건 하에서 재배포 또는 수정 할 수 있습니다.\n"
-"\n"
-"본 프로그램은 도움이 될 것이라는 희망 배포되지만, * 완전한 무보증 *입니다. 상업적인 가능성의 보증이나 특정 목적에의 적합성은 안다 보이는 것도 포함 전혀 존재하지 않습니다. 자세한 사항은 GNU 일반 공중 사용 허가서를 참조하십시오.\n"
-"\n"
-"당신은이 프로그램과 함께 GNU 일반 공중 사용 허가서의 복제물을 일부받은 것입니다. 만약받지면 자유 소프트웨어 재단으로 문의하시기 바랍니다 (주소는 the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA).\n"
+"이 프로그램은 자유 소프트웨어입니다. 당신은 이것을 자유 소프트웨어 재단에 의"
+"해 발행된 GNU 일반 공중 사용 허가서 (버전 2, 희망은 이후 버전 중 하나)을 결정"
+"하는 조건 하에서 재배포 또는 수정 할 수 있습니다.\n"
+"\n"
+"본 프로그램은 도움이 될 것이라는 희망 배포되지만, * 완전한 무보증 *입니다. 상"
+"업적인 가능성의 보증이나 특정 목적에의 적합성은 안다 보이는 것도 포함 전혀 존"
+"재하지 않습니다. 자세한 사항은 GNU 일반 공중 사용 허가서를 참조하십시오.\n"
+"\n"
+"당신은이 프로그램과 함께 GNU 일반 공중 사용 허가서의 복제물을 일부받은 것입니"
+"다. 만약받지면 자유 소프트웨어 재단으로 문의하시기 바랍니다 (주소는 the Free "
+"Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 "
+"USA).\n"
 
-#: ../src/usr/bin/diffuse:6707
+#: ../src/usr/bin/diffuse:7049
 msgid "Undo"
 msgstr "실행 취소"
 
-#: ../src/usr/bin/diffuse:862
+#: ../src/usr/bin/diffuse:908
 msgid "Update paths for Cygwin"
 msgstr "Cygwin을 위해 경로를 업데이트"
 
-#: ../src/usr/bin/diffuse:78
+#: ../src/usr/bin/diffuse:86
 msgid ""
 "Usage:\n"
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
 "    diffuse ( -h | -? | --help | -v | --version )\n"
 "\n"
-"Diffuse is a graphical tool for merging and comparing text files.  Diffuse is\n"
-"able to compare an arbitrary number of files side-by-side and gives users the\n"
-"ability to manually adjust line matching and directly edit files.  Diffuse can\n"
+"Diffuse is a graphical tool for merging and comparing text files.  Diffuse "
+"is\n"
+"able to compare an arbitrary number of files side-by-side and gives users "
+"the\n"
+"ability to manually adjust line matching and directly edit files.  Diffuse "
+"can\n"
 "also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,\n"
 "Monotone, RCS, Subversion, and SVK repositories for comparison and merging.\n"
 "\n"
 "Help Options:\n"
 "  ( -h | -? | --help )             Display this usage information\n"
-"  ( -v | --version )               Display version and copyright information\n"
+"  ( -v | --version )               Display version and copyright "
+"information\n"
 "\n"
 "Configuration Options:\n"
 "  --no-rcfile                      Do not read any resource files\n"
@@ -643,10 +693,12 @@
 "  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
 "  ( -D | --close-if-same )         Close all tabs with no differences\n"
 "  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
+"  ( -L | --label ) <label>         Display <label> instead of the file name\n"
 "  ( -m | --modified )              Create a new tab for each modified file\n"
 "  ( -r | --revision ) <rev>        File revision <rev>\n"
 "  ( -s | --separate )              Create a new tab for each file\n"
 "  ( -t | --tab )                   Start a new tab\n"
+"  --line <line>                    Start with line <line> selected\n"
 "  --null-file                      Create a blank file comparison pane\n"
 "\n"
 "Display Options:\n"
@@ -656,179 +708,181 @@
 "  ( -i | --ignore-case )           Ignore case differences\n"
 "  ( -w | --ignore-all-space )      Ignore white space differences"
 msgstr ""
-"사용법: \n"
-"    diffuse [옵션 ...] [파일 ...] ... \n"
-"    diffuse ( -h | -? | -help | -v | - version) \n"
-"\n"
-"Diffuse은 텍스트 파일을 병합하며 비교를 위한 그래픽 도구입니다.\n"
-"사용자가 수동으로 행을 다시 정렬하고, 임의의 숫자를 병행하여 파일을 비교할 수 있습니다.\n"
-"파일을 직접 편집할 수 있습니다. 또한 Diffuse 비교 및 병합하기 위해 Bazaar, CVS,\n"
-"Darcs, Git, Mercurial, Monotone, RCS, Subversion 및 SVK 저장소에서 파일 \n"
-"수정된것을 얻을 수 있습니다. \n"
-"\n"
-"도움말 옵션: \n"
-"  ( -h | -? | - help)이 사용 정보를 보려면 \n"
-"  ( -v | - version) 버전과 저작권 정보를 표시 \n"
-"\n"
-"구성 옵션 \n"
-"  -no - rcfile 리소스 파일을 읽지 않는다 \n"
-"  -rcfile <file> 지정된 리소스 파일을 읽습니다 \n"
-"\n"
-"일반 옵션 : \n"
-"  ( -c | - commit) <rev> <rev-1>과 <rev>라는 파일 재버전 \n"
-"  ( -D | - close - if - same) 차이가 없다 탭 닫기 \n"
-"  ( -e | - encoding) <codec> <codec>에서 파일을 읽고\n"
-"  ( -m | - modified) 변경된 파일을 위해 새로운 탭을 만듬\n"
-"  ( -r | - revision) <rev> <rev>라는 파일 재버전 \n"
-"  ( -s | - separate) 각 파일에 대한 새로운 탭을 만듬 \n"
-"  ( -t | - tab) 새 탭에서 시작 \n"
-"  - null - file 빈 파일 비교 프레임을 만드는 \n"
-"\n"
-"표시 옵션: \n"
-"  ( -b | - ignore - space - change) 빈 변경 사항을 무시 \n"
-"  ( -B | - ignore - blank - lines) 빈 줄을 무시 \n"
-"  ( -E | - ignore - end - of - line) 행의 마지막을 무시 \n"
-"  ( -i | - ignore - case) 대소문자 차이를 무시 \n"
-"  ( -w | - ignore - all - space) 공백을 무시"
+"사용법:\n"
+"    diffuse [옵션 ...] [파일 ...] ...\n"
+"    diffuse ( -h | -? | --help | -v | --version )\n"
+"\n"
+"Diffuse은 텍스트 파일을 병합하며 비교를 위한 그래픽 도구입니다.  사용자가\n"
+"수동으로 행을 다시 정렬하고, 임의의 숫자를 병행하여 파일을 비교할 수 있습니다.\n"
+"파일을 직접 편집할 수 있습니다. 또한 Diffuse 비교 및 병합하기 위해 Bazaar, "
+"CVS,\n"
+"Darcs, Git, Mercurial, Monotone, RCS, Subversion 및 SVK 저장소에서 파일\n"
+"수정된것을 얻을 수 있습니다.\n"
+"\n"
+"도움말 옵션:\n"
+"  ( -h | -? | --help )             이 사용 정보를 보려면\n"
+"  ( -v | --version )               버전과 저작권 정보를 표시\n"
+"\n"
+"구성 옵션\n"
+"  --no-rcfile                      리소스 파일을 읽지 않는다\n"
+"  --rcfile <file>                  지정된 리소스 파일을 읽습니다\n"
+"\n"
+"일반 옵션:\n"
+"  ( -c | --commit )                <rev> <rev-1>과 <rev>라는 파일 재버전\n"
+"  ( -D | --close-if-same )         차이가 없다 탭 닫기\n"
+"  ( -e | --encoding )              <codec> <codec>에서 파일을 읽고\n"
+"  ( -L | --label )                 파일 이름 대신 <label> 표시\n"
+"  ( -m | --modified )              변경된 파일을 위해 새로운 탭을 만듬\n"
+"  ( -r | --revision )              <rev> <rev>라는 파일 재버전\n"
+"  ( -s | --separate )              각 파일에 대한 새로운 탭을 만듬\n"
+"  ( -t | --tab )                   새 탭에서 시작\n"
+"  --line <line>                    선택한 라인 <line>으로 시작\n"
+"  --null-file                      빈 파일 비교 프레임을 만드는\n"
+"\n"
+"표시 옵션:\n"
+"  ( -b | --ignore-space-change )   빈 변경 사항을 무시\n"
+"  ( -B | --ignore-blank-lines )    빈 줄을 무시\n"
+"  ( -E | --ignore-end-of-line )    행의 마지막을 무시\n"
+"  ( -i | --ignore-case )           대소문자 차이를 무시\n"
+"  ( -w | --ignore-all-space )      공백을 무시"
 
-#: ../src/usr/bin/diffuse:865
+#: ../src/usr/bin/diffuse:911
 msgid "Version Control"
 msgstr "버전 컨트롤"
 
-#: ../src/usr/bin/diffuse:817
+#: ../src/usr/bin/diffuse:852
 #, python-format
 msgid "Warn me when closing a tab will quit %s"
 msgstr "탭을 닫을때 %s 종료 및 경고"
 
-#: ../src/usr/bin/diffuse:548
+#: ../src/usr/bin/diffuse:542
 #, python-format
 msgid "Warning: unknown colour \"%s\""
 msgstr "경고: 알수 없는 색깔「%s」"
 
-#: ../src/usr/bin/diffuse:557
+#: ../src/usr/bin/diffuse:551
 #, python-format
 msgid "Warning: unknown float \"%s\""
 msgstr "경고: 알수 없는 부동 소수점「%s」"
 
-#: ../src/usr/bin/diffuse:566
+#: ../src/usr/bin/diffuse:560
 #, python-format
 msgid "Warning: unknown string \"%s\""
 msgstr "경고: 알수 없는 문자열「%s」"
 
-#: ../src/usr/bin/diffuse:6677
+#: ../src/usr/bin/diffuse:7019
 #, python-format
 msgid "_About %s..."
 msgstr "%s 정보...(_A)"
 
-#: ../src/usr/bin/diffuse:6599
+#: ../src/usr/bin/diffuse:6939
 msgid "_Close Tab"
 msgstr "탭 닫기(_C)"
 
-#: ../src/usr/bin/diffuse:6608
+#: ../src/usr/bin/diffuse:6948
 msgid "_Copy"
 msgstr "복사(_C)"
 
-#: ../src/usr/bin/diffuse:6613
+#: ../src/usr/bin/diffuse:6953
 msgid "_Dismiss All Edits"
 msgstr "모든 편집을 취소(_D)"
 
-#: ../src/usr/bin/diffuse:6603
+#: ../src/usr/bin/diffuse:6943
 msgid "_Edit"
 msgstr "편집(_E)"
 
-#: ../src/usr/bin/diffuse:6586
+#: ../src/usr/bin/diffuse:6926
 msgid "_File"
 msgstr "파일(_F)"
 
-#: ../src/usr/bin/diffuse:6615
+#: ../src/usr/bin/diffuse:6955
 msgid "_Find..."
 msgstr "찾기...(_F)"
 
-#: ../src/usr/bin/diffuse:6636
+#: ../src/usr/bin/diffuse:6976
 msgid "_First Difference"
 msgstr "첫번째 차이(_F)"
 
-#: ../src/usr/bin/diffuse:6618
+#: ../src/usr/bin/diffuse:6958
 msgid "_Go To Line..."
 msgstr "줄로 이동...(_G)"
 
-#: ../src/usr/bin/diffuse:6674
+#: ../src/usr/bin/diffuse:7016
 msgid "_Help"
 msgstr "도움말(_H)"
 
-#: ../src/usr/bin/diffuse:6675
+#: ../src/usr/bin/diffuse:7017
 msgid "_Help Contents..."
 msgstr "도움말 목차...(_H)"
 
-#: ../src/usr/bin/diffuse:6658
+#: ../src/usr/bin/diffuse:7000
 msgid "_Increase Indenting"
 msgstr "들여쓰기(_I)"
 
-#: ../src/usr/bin/diffuse:6634
+#: ../src/usr/bin/diffuse:6974
 msgid "_Isolate"
 msgstr "분리(_I)"
 
-#: ../src/usr/bin/diffuse:6639
+#: ../src/usr/bin/diffuse:6979
 msgid "_Last Difference"
 msgstr "마지막 차이(_L)"
 
-#: ../src/usr/bin/diffuse:6665
+#: ../src/usr/bin/diffuse:7007
 msgid "_Merge"
 msgstr "병합(_M)"
 
-#: ../src/usr/bin/diffuse:6671
+#: ../src/usr/bin/diffuse:7013
 msgid "_Merge From Left Then Right"
 msgstr "왼쪽에서 합병 후 오른쪽에서 병합(_M)"
 
-#: ../src/usr/bin/diffuse:6638
+#: ../src/usr/bin/diffuse:6978
 msgid "_Next Difference"
 msgstr "다음 차이(_N)"
 
-#: ../src/usr/bin/diffuse:6587
+#: ../src/usr/bin/diffuse:6927
 msgid "_Open File..."
 msgstr "파일 열기...(_O)"
 
-#: ../src/usr/bin/diffuse:6609
+#: ../src/usr/bin/diffuse:6949
 msgid "_Paste"
 msgstr "붙여넣기(_P)"
 
-#: ../src/usr/bin/diffuse:6637
+#: ../src/usr/bin/diffuse:6977
 msgid "_Previous Difference"
 msgstr "이전 차이(_P)"
 
-#: ../src/usr/bin/diffuse:6601
+#: ../src/usr/bin/diffuse:6941
 msgid "_Quit"
 msgstr "종료(_Q)"
 
-#: ../src/usr/bin/diffuse:6605
+#: ../src/usr/bin/diffuse:6945
 msgid "_Redo"
 msgstr "다시(_R)"
 
-#: ../src/usr/bin/diffuse:6590
+#: ../src/usr/bin/diffuse:6930
 msgid "_Reload File"
 msgstr "파일 다시 읽기(_R)"
 
-#: ../src/usr/bin/diffuse:6592
+#: ../src/usr/bin/diffuse:6932
 msgid "_Save File"
 msgstr "파일 저장(_S)"
 
-#: ../src/usr/bin/diffuse:6631
+#: ../src/usr/bin/diffuse:6971
 msgid "_Syntax Highlighting"
 msgstr "구문 강조(_S)"
 
-#: ../src/usr/bin/diffuse:6604
+#: ../src/usr/bin/diffuse:6944
 msgid "_Undo"
 msgstr "실행 취소(_U)"
 
-#: ../src/usr/bin/diffuse:6600
+#: ../src/usr/bin/diffuse:6940
 msgid "_Undo Close Tab"
 msgstr "탭 닫기 취소(_U)"
 
-#: ../src/usr/bin/diffuse:6630
+#: ../src/usr/bin/diffuse:6970
 msgid "_View"
 msgstr "보기(_V)"
 
-#: ../src/usr/bin/diffuse:5919
+#: ../src/usr/bin/diffuse:6221
 msgid "translator-credits"
 msgstr "강분도 <bundo@bundo.biz>"
-
diff -Nru diffuse-0.4.4/translations/README diffuse-0.4.5/translations/README
--- diffuse-0.4.4/translations/README	2010-10-21 01:58:01.000000000 +0000
+++ diffuse-0.4.5/translations/README	2011-07-13 09:18:32.000000000 +0000
@@ -1,11 +1,13 @@
+User Interface
+==============
+
 Below are basic instructions for adding and maintaining Gettext translations
 for Diffuse.  The installer will discover .po files in this directory and
 compile them into the corresponding .mo files.
 
 The example commands below show how to create and manage the Japanese
 translations.  Replace all instances of "ja" with the code for the desired
-language.  Also note the "Name" and "Comment" fields of the "diffuse.desktop"
-file and components of the Windows installer should be translated separately.
+language.
 
 ----
 
@@ -55,3 +57,33 @@
 1. Attempt to compile the .po file and note any warnings:
 
   $ msgfmt -c -v ja.po
+
+System Integration
+==================
+
+Localised text for the system menu (name and comment) should be manually
+added to the desktop file:
+
+  ../src/usr/share/applications/diffuse.desktop
+
+Localised text for the Microsoft Windows installer is stored in separate ISL
+files.  Copy the English version (../windows-installer/en.isl) and replace the
+text to the right of each equal sign.
+
+Documentation
+=============
+
+Documentation is stored in DocBook format.  Start a new translation of the
+manual by copying the English version of the DocBook manual
+(../src/usr/share/gnome/help/diffuse/C/diffuse.xml) and then edit the
+contents.
+
+The DocBook manual is converted to HTML for Windows and Unix man pages for
+POSIX platforms.  The conversion tools insert some English text that gets
+localised using search and replace.  Manually add new search and replace rules
+to these files:
+
+  ../windows-installer/translations.txt
+  ../utils/translations.txt
+
+The format of each line is: <language id>:<English text>:<localised text>
diff -Nru diffuse-0.4.4/translations/ru.po diffuse-0.4.5/translations/ru.po
--- diffuse-0.4.4/translations/ru.po	2010-10-21 01:58:01.000000000 +0000
+++ diffuse-0.4.5/translations/ru.po	2011-07-13 09:18:32.000000000 +0000
@@ -1,841 +1,898 @@
-# German translations for diffuse package.
-# This is an alpha release.
-# Copyright (C) 2009 Derrick Moser
-# This file is distributed under the same license as the diffuse package.
-# Henri Menke <henrimenke4@aim.com>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: diffuse-svn\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-04 19:41+0200\n"
-"PO-Revision-Date: 2010-10-05 12:30+0300\n"
-"Last-Translator: Oleg Pakhtusov <opakhtusov@gmail.com>\n"
-"Language-Team: Russian <opakhtusov@gmail.com>\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-Poedit-Language: Russian\n"
-"X-Poedit-Country: RUSSIAN FEDERATION\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#: ../src/usr/bin/diffuse:857
-msgid "\"co\" command"
-msgstr "\"co\" команда"
-
-#: ../src/usr/bin/diffuse:858
-msgid "\"rlog\" command"
-msgstr "\"rlog\" команда"
-
-#: ../src/usr/bin/diffuse:6775
-#, python-format
-msgid "%(title)s Pane %(pane)d"
-msgstr "%(title)s Субокно %(pane)d"
-
-#: ../src/usr/bin/diffuse:6323
-#, python-format
-msgid "A file named %s already exists.  Do you want to overwrite it?"
-msgstr "Файл под именем %s уже существует.  Вы хотите перезаписать его?"
-
-#: ../src/usr/bin/diffuse:3921
-msgid "Align with Selection"
-msgstr "Выровнять с Выборкой"
-
-#: ../src/usr/bin/diffuse:801
-msgid "Alignment"
-msgstr "Выравнивание"
-
-#: ../src/usr/bin/diffuse:818
-msgid "Always show the tab bar"
-msgstr "Всегда показывать панель вкладок"
-
-#: ../src/usr/bin/diffuse:5798
-msgid "Auto Detect"
-msgstr "Автообнаружение "
-
-#: ../src/usr/bin/diffuse:813
-msgid "Auto indent"
-msgstr "Автоматический отступ"
-
-#: ../src/usr/bin/diffuse:6565
-msgid "C_lear Edits"
-msgstr "Оч_истить Правки"
-
-#: ../src/usr/bin/diffuse:7030
-msgid "Choose Folder With Modified Files"
-msgstr "Выбрать Папку с Измененными Файлами"
-
-#: ../src/usr/bin/diffuse:3930
-#: ../src/usr/bin/diffuse:6665
-msgid "Clear Edits"
-msgstr "Очистить Правки"
-
-#: ../src/usr/bin/diffuse:5909
-msgid "Close Tab"
-msgstr "Закрыть Вкладку"
-
-#: ../src/usr/bin/diffuse:6784
-msgid "Close _Without Saving"
-msgstr "Закр_ыть Без Сохранения"
-
-#: ../src/usr/bin/diffuse:5776
-#, python-format
-msgid "Closing this tab will quit %s."
-msgstr "Закрытие этой вкладки закроет %s."
-
-#: ../src/usr/bin/diffuse:6027
-#, python-format
-msgid "Column %d"
-msgstr "Столбец %d"
-
-#: ../src/usr/bin/diffuse:860
-msgid "Command"
-msgstr "Команда"
-
-#: ../src/usr/bin/diffuse:6609
-msgid "Convert Leading Spaces To _Tabs"
-msgstr "Преобра_зовать Вводные Пробелы в Табуляторы"
-
-#: ../src/usr/bin/diffuse:6608
-msgid "Convert Tabs To _Spaces"
-msgstr "Преобр_азовать Табуляторы в Пробелы"
-
-#: ../src/usr/bin/diffuse:6616
-msgid "Convert To Uni_x Format"
-msgstr "Преобразовать в Uni_х Формат"
-
-#: ../src/usr/bin/diffuse:6614
-msgid "Convert To _DOS Format"
-msgstr "Преобразоват_ь в DOS Формат"
-
-#: ../src/usr/bin/diffuse:6602
-msgid "Convert To _Lower Case"
-msgstr "Пре_образовать в Нижний Регистр"
-
-#: ../src/usr/bin/diffuse:6615
-msgid "Convert To _Mac Format"
-msgstr "Преобразовать в Ma_с Формат"
-
-#: ../src/usr/bin/diffuse:6601
-msgid "Convert To _Upper Case"
-msgstr "Пр_еобразовать в Верхний Регистр"
-
-#: ../src/usr/bin/diffuse:3926
-#: ../src/usr/bin/diffuse:6663
-msgid "Copy"
-msgstr "Копировать"
-
-#: ../src/usr/bin/diffuse:6655
-msgid "Copy Left Into Selection"
-msgstr "Копировать Слева в Выборку"
-
-#: ../src/usr/bin/diffuse:6622
-msgid "Copy Left _Into Selection"
-msgstr "Копиро_вать Слева в Выборку"
-
-#: ../src/usr/bin/diffuse:6623
-msgid "Copy Right I_nto Selection"
-msgstr "Копиров_ать Справа в Выборку"
-
-#: ../src/usr/bin/diffuse:6656
-msgid "Copy Right Into Selection"
-msgstr "Копировать Справа в Выборку"
-
-#: ../src/usr/bin/diffuse:6654
-msgid "Copy Selection Left"
-msgstr "Копировать Выборку Влево"
-
-#: ../src/usr/bin/diffuse:6653
-msgid "Copy Selection Right"
-msgstr "Копировать Выборку Вправо"
-
-#: ../src/usr/bin/diffuse:6620
-msgid "Copy Selection _Left"
-msgstr "Ко_пировать Выборку Влево"
-
-#: ../src/usr/bin/diffuse:6619
-msgid "Copy Selection _Right"
-msgstr "К_опировать Выборку Вправо"
-
-#: ../src/usr/bin/diffuse:67
-msgid "Copyright © 2006-2010 Derrick Moser"
-msgstr "Copyright © 2006-2010 Derrick Moser"
-
-#: ../src/usr/bin/diffuse:6560
-msgid "Cu_t"
-msgstr "Выре_зать"
-
-#: ../src/usr/bin/diffuse:3925
-#: ../src/usr/bin/diffuse:6662
-msgid "Cut"
-msgstr "Вырезать"
-
-#: ../src/usr/bin/diffuse:837
-msgid "Cygdrive prefix"
-msgstr "Cygdrive префикс"
-
-#: ../src/usr/bin/diffuse:834
-msgid "Cygwin"
-msgstr "Cygwin"
-
-#: ../src/usr/bin/diffuse:6612
-msgid "De_crease Indenting"
-msgstr "У_меньшить Отступ"
-
-#: ../src/usr/bin/diffuse:817
-msgid "Default panes"
-msgstr "Субокон по умолчанию"
-
-#: ../src/usr/bin/diffuse:861
-msgid "Default revision"
-msgstr "Ревизия по умолчанию"
-
-#: ../src/usr/bin/diffuse:5871
-msgid "Derrick Moser <derrick_moser@yahoo.com>"
-msgstr "Derrick Moser <derrick_moser@yahoo.com>"
-
-#: ../src/usr/bin/diffuse:5868
-msgid "Diffuse is a graphical tool for merging and comparing text files."
-msgstr "Diffuse является графическим инструментом для слияния и сравнения текстовых файлов."
-
-#: ../src/usr/bin/diffuse:789
-msgid "Display"
-msgstr "Отображение"
-
-#: ../src/usr/bin/diffuse:809
-msgid "Editor"
-msgstr "Редактор"
-
-#: ../src/usr/bin/diffuse:5788
-msgid "Encoding: "
-msgstr "Кодировка: "
-
-#: ../src/usr/bin/diffuse:6370
-#, python-format
-msgid "Error encoding to %s."
-msgstr "Ошибка кодирования в %s."
-
-#: ../src/usr/bin/diffuse:1932
-#, python-format
-msgid "Error parsing %s."
-msgstr "Ошибка анализа %s."
-
-#: ../src/usr/bin/diffuse:6412
-msgid "Error parsing line number."
-msgstr "Ошибка анализа номера строки."
-
-#: ../src/usr/bin/diffuse:7327
-#, python-format
-msgid "Error parsing revision %s."
-msgstr "Ошибка анализа ревизии %s."
-
-#: ../src/usr/bin/diffuse:7391
-#, python-format
-msgid "Error processing argument \"%s\".  Directory not expected."
-msgstr "Ошибка обработки параметра \"%s\".  Каталог не ожидался."
-
-#: ../src/usr/bin/diffuse:706
-#, python-format
-msgid "Error processing line %(line)d of %(file)s."
-msgstr "Ошибка обработки строки %(line)d из %(file)s."
-
-#: ../src/usr/bin/diffuse:6217
-#: ../src/usr/bin/diffuse:7299
-#, python-format
-msgid "Error reading %s."
-msgstr "Ошибка чтения %s."
-
-#: ../src/usr/bin/diffuse:6215
-#, python-format
-msgid "Error reading revision %(rev)s of %(file)s."
-msgstr "Ошибка считывания ревизии %(rev)s из %(file)s."
-
-#: ../src/usr/bin/diffuse:6981
-#, python-format
-msgid "Error retrieving modifications for %s."
-msgstr "Ошибка извлечения модификаций для %s."
-
-#: ../src/usr/bin/diffuse:944
-#: ../src/usr/bin/diffuse:6374
-#, python-format
-msgid "Error writing %s."
-msgstr "Ошибка записи %s."
-
-#: ../src/usr/bin/diffuse:812
-msgid "Expand tabs to spaces"
-msgstr "Расширить табуляторы до пробелов"
-
-#: ../src/usr/bin/diffuse:6600
-msgid "F_ormat"
-msgstr "Фор_мат"
-
-#: ../src/usr/bin/diffuse:6891
-#, python-format
-msgid "File Merge %d"
-msgstr "Слияние Файлов %d"
-
-#: ../src/usr/bin/diffuse:6570
-msgid "Find Pre_vious"
-msgstr "Най_ти Предыдущее"
-
-#: ../src/usr/bin/diffuse:6569
-msgid "Find _Next"
-msgstr "Н_айти Следующее"
-
-#: ../src/usr/bin/diffuse:5726
-msgid "Find..."
-msgstr "Найти..."
-
-#: ../src/usr/bin/diffuse:6648
-msgid "First Difference"
-msgstr "Первое Различие"
-
-#: ../src/usr/bin/diffuse:791
-msgid "Font"
-msgstr "Шрифт"
-
-#: ../src/usr/bin/diffuse:5831
-msgid "Go To Line..."
-msgstr "Перейти на Строку..."
-
-#: ../src/usr/bin/diffuse:797
-msgid "Ignore blank line differences"
-msgstr "Игнорировать различия пустых строк"
-
-#: ../src/usr/bin/diffuse:805
-msgid "Ignore blank lines"
-msgstr "Игнорировать пустые строки"
-
-#: ../src/usr/bin/diffuse:807
-msgid "Ignore case"
-msgstr "Игнорировать регистр символов"
-
-#: ../src/usr/bin/diffuse:798
-msgid "Ignore case differences"
-msgstr "Игнорировать различия в регистре"
-
-#: ../src/usr/bin/diffuse:796
-#: ../src/usr/bin/diffuse:804
-msgid "Ignore changes to white space"
-msgstr "Игнорировать изменения пробелов, символов табуляции и пустой строки"
-
-#: ../src/usr/bin/diffuse:806
-msgid "Ignore end of line characters"
-msgstr "Игнорировать символы окончания строк (терминаторы)"
-
-#: ../src/usr/bin/diffuse:799
-msgid "Ignore end of line differences"
-msgstr "Игнорировать различия окончания строк (терминаторы)"
-
-#: ../src/usr/bin/diffuse:803
-msgid "Ignore white space"
-msgstr "Игнорировать пробелы, символы табуляции и пустой строки"
-
-#: ../src/usr/bin/diffuse:795
-msgid "Ignore white space differences"
-msgstr "Игнорировать различия пробелов, символов табуляции и пустой строки"
-
-#: ../src/usr/bin/diffuse:3922
-msgid "Isolate"
-msgstr "Изолировать"
-
-#: ../src/usr/bin/diffuse:6651
-msgid "Last Difference"
-msgstr "Последнее Различие"
-
-#: ../src/usr/bin/diffuse:863
-msgid "Launch from a Bash login shell"
-msgstr "Запуск из оболочки Bash login"
-
-#: ../src/usr/bin/diffuse:5837
-msgid "Line Number: "
-msgstr "Номер Строки: "
-
-#: ../src/usr/bin/diffuse:6625
-msgid "M_erge From Right Then Left"
-msgstr "Сл_ияние Справа Затем Слева"
-
-#: ../src/usr/bin/diffuse:5757
-msgid "Match Case"
-msgstr "Учитывать Регистр"
-
-#: ../src/usr/bin/diffuse:6657
-msgid "Merge From Left Then Right"
-msgstr "Слияние Слева Затем Справа"
-
-#: ../src/usr/bin/diffuse:6658
-msgid "Merge From Right Then Left"
-msgstr "Слияние Справа Затем Слева"
-
-#: ../src/usr/bin/diffuse:3923
-msgid "Merge Selection"
-msgstr "Объединить Выборку"
-
-#: ../src/usr/bin/diffuse:6644
-msgid "New 2-Way File Merge"
-msgstr "Новое 2-Оконное Слияние Файлов"
-
-#: ../src/usr/bin/diffuse:6645
-msgid "New 3-Way File Merge"
-msgstr "Новое 3-Оконное Слияние Файлов"
-
-#: ../src/usr/bin/diffuse:6549
-msgid "New _2-Way File Merge"
-msgstr "Новое _2-Оконное Слияние Файлов"
-
-#: ../src/usr/bin/diffuse:6550
-msgid "New _3-Way File Merge"
-msgstr "Новое _3-Оконное Слияние Файлов"
-
-#: ../src/usr/bin/diffuse:6650
-msgid "Next Difference"
-msgstr "Следующее Различие"
-
-#: ../src/usr/bin/diffuse:6595
-msgid "Next _Tab"
-msgstr "С_ледующая Вкладка"
-
-#: ../src/usr/bin/diffuse:7043
-msgid "No modified files found."
-msgstr "Модифицированные файлы не найдены."
-
-#: ../src/usr/bin/diffuse:6575
-msgid "None"
-msgstr "Нет"
-
-#: ../src/usr/bin/diffuse:6240
-msgid "Open File"
-msgstr "Открыть Файл"
-
-#: ../src/usr/bin/diffuse:7014
-msgid "Open File In New Tab"
-msgstr "Открыть Файл в Новой Вкладке"
-
-#: ../src/usr/bin/diffuse:6541
-msgid "Open File In New _Tab..."
-msgstr "Открыт_ь Файл в Новой Вкладке..."
-
-#: ../src/usr/bin/diffuse:5950
-msgid "Open File..."
-msgstr "Открыть Файл..."
-
-#: ../src/usr/bin/diffuse:6542
-msgid "Open _Modified Files..."
-msgstr "Открыть И_змененные Файлы..."
-
-#: ../src/usr/bin/diffuse:823
-msgid "Order of codecs used to identify encoding"
-msgstr "Порядок кодеков, используемых для распознания кодировки"
-
-#: ../src/usr/bin/diffuse:3927
-#: ../src/usr/bin/diffuse:6664
-msgid "Paste"
-msgstr "Вставить"
-
-#: ../src/usr/bin/diffuse:7127
-msgid "Phrase not found.  Continue from the end of the file?"
-msgstr "Фраза не найдена.  Продолжить с конца файла?"
-
-#: ../src/usr/bin/diffuse:7129
-msgid "Phrase not found.  Continue from the start of the file?"
-msgstr "Фраза не найдена.  Продолжить с начала файла?"
-
-#: ../src/usr/bin/diffuse:6573
-msgid "Pr_eferences..."
-msgstr "Предпо_чтения..."
-
-#: ../src/usr/bin/diffuse:6594
-msgid "Pre_vious Tab"
-msgstr "Предыдуща_я Вкладка"
-
-#: ../src/usr/bin/diffuse:920
-msgid "Preferences"
-msgstr "Предпочтения"
-
-#: ../src/usr/bin/diffuse:6435
-msgid "Press the enter key or double click to edit.  Press the space bar or use the RMB menu to manually align."
-msgstr "Нажатие Enter или двойной щелчок для редактирования.  Нажатие Space или меню правого щелчка для выравнивания вручную."
-
-#: ../src/usr/bin/diffuse:6437
-msgid "Press the escape key to finish editing."
-msgstr "Нажмите клавишу Escape, чтобы закончить редактирование."
-
-#: ../src/usr/bin/diffuse:6649
-msgid "Previous Difference"
-msgstr "Предыдущее Различие"
-
-#: ../src/usr/bin/diffuse:6586
-msgid "Re_align All"
-msgstr "Пере_строить Все"
-
-#: ../src/usr/bin/diffuse:6647
-msgid "Realign All"
-msgstr "Перестроить Все"
-
-#: ../src/usr/bin/diffuse:6661
-msgid "Redo"
-msgstr "Вернуть"
-
-#: ../src/usr/bin/diffuse:821
-msgid "Regional Settings"
-msgstr "Настройки Региона"
-
-#: ../src/usr/bin/diffuse:5951
-msgid "Reload File"
-msgstr "Перезагрузить Файл"
-
-#: ../src/usr/bin/diffuse:6607
-msgid "Remove Trailing _White Space"
-msgstr "Уда_лить Замыкающие Пробелы"
-
-#: ../src/usr/bin/diffuse:5806
-msgid "Revision: "
-msgstr "Ревизия: "
-
-#: ../src/usr/bin/diffuse:836
-msgid "Root directory"
-msgstr "Корневой каталог"
-
-#: ../src/usr/bin/diffuse:6306
-#, python-format
-msgid "Save %(title)s Pane %(pane)d"
-msgstr "Сохранить %(title)s Субокно %(pane)d"
-
-#: ../src/usr/bin/diffuse:6547
-msgid "Save A_ll"
-msgstr "Сохран_ить Все"
-
-#: ../src/usr/bin/diffuse:5952
-msgid "Save File"
-msgstr "Сохранить Файл"
-
-#: ../src/usr/bin/diffuse:5953
-msgid "Save File As..."
-msgstr "Сохранить Файл Как..."
-
-#: ../src/usr/bin/diffuse:6546
-msgid "Save File _As..."
-msgstr "Сохра_нить Файл Как..."
-
-#: ../src/usr/bin/diffuse:6092
-msgid "Save changes before loading the new file?"
-msgstr "Сохранить изменения перед загрузкой нового файла?"
-
-#: ../src/usr/bin/diffuse:5762
-msgid "Search Backwards"
-msgstr "Поиск в Обратном Направлении"
-
-#: ../src/usr/bin/diffuse:5732
-msgid "Search For: "
-msgstr "Искать: "
-
-#: ../src/usr/bin/diffuse:3929
-msgid "Select All"
-msgstr "Выбрать Все"
-
-#: ../src/usr/bin/diffuse:6564
-msgid "Select _All"
-msgstr "В_ыбрать Все"
-
-#: ../src/usr/bin/diffuse:6439
-msgid "Select target line and press the space bar to align.  Press the escape key to cancel."
-msgstr "Выберите целевую строку и нажмите клавишу Space, чтобы выровнять.  Нажмите Еscape для отмены."
-
-#: ../src/usr/bin/diffuse:6598
-msgid "Shift Pane _Left"
-msgstr "Перемест_ить Субокно Влево"
-
-#: ../src/usr/bin/diffuse:6597
-msgid "Shift Pane _Right"
-msgstr "Пере_местить Субокно Вправо"
-
-#: ../src/usr/bin/diffuse:793
-msgid "Show line numbers"
-msgstr "Показывать номера строк"
-
-#: ../src/usr/bin/diffuse:794
-msgid "Show white space characters"
-msgstr "Показывать символы пробелов"
-
-#: ../src/usr/bin/diffuse:7384
-#, python-format
-msgid "Skipping unknown argument \"%s\"."
-msgstr "Пропуск неизвестного параметра \"%s\"."
-
-#: ../src/usr/bin/diffuse:811
-msgid "Soft tab width"
-msgstr "Ширина мягкого табулятора"
-
-#: ../src/usr/bin/diffuse:6769
-msgid "Some files have unsaved changes.  Select the files to save before closing."
-msgstr ""
-"Некоторые файлы имеют несохраненные изменения.\n"
-"Выберите файлы для сохранения перед закрытием."
-
-#: ../src/usr/bin/diffuse:6605
-msgid "Sort Lines In D_escending Order"
-msgstr "Сорт_ировать Строки в Порядке Убывания"
-
-#: ../src/usr/bin/diffuse:6604
-msgid "Sort Lines In _Ascending Order"
-msgstr "Сор_тировать Строки в Порядке Возрастания"
-
-#: ../src/usr/bin/diffuse:3932
-msgid "Swap with Selected Pane"
-msgstr "Обменять с Выбранным Субокном"
-
-#: ../src/usr/bin/diffuse:792
-msgid "Tab width"
-msgstr "Ширина Табулятора"
-
-#: ../src/usr/bin/diffuse:815
-msgid "Tabs"
-msgstr "Вкладки"
-
-#: ../src/usr/bin/diffuse:6286
-#, python-format
-msgid "The file %s changed on disk.  Do you want to reload the file?"
-msgstr "Файл %s изменен на диске.  Вы хотите перезагрузить этот файл?"
-
-#: ../src/usr/bin/diffuse:6328
-#, python-format
-msgid "The file %s has been modified by another process since reading it.  If you save, all the external changes could be lost.  Save anyways?"
-msgstr "Файл %s был изменен другим процессом после его прочтения.  На сохранении все внешние изменения будут потеряны.  Сохранить все равно?"
-
-#: ../src/usr/bin/diffuse:5875
-msgid ""
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the licence, or (at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with this program.  You may also obtain a copy of the GNU General Public License from the Free Software Foundation by visiting their web site (http://www.fsf.org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-msgstr ""
-"Эта программа является бесплатным ПО; Вы можете распространять программу и/или изменять ее в соответствии с GNU General Public License, как опубликовано Free Software Foundation; либо версия 2 лицензии, либо (по вашему выбору) любая более поздняя версия.\n"
-"\n"
-"Эта программа распространяется в надежде, что она будет полезна, но БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ; без даже подразумеваемой гарантии ТОВАРНОГО СОСТОЯНИЯ или ПРИГОДНОСТИ ДЛЯ КОНКРЕТНОЙ ЦЕЛИ. Смотрите GNU General Public License для дополнительных подробностей.\n"
-"\n"
-"Вам Следует получить копию GNU General Public License вместе с этой программой.  Вы можете также получить копию GNU General Public License от Free Software Foundation, посетив их web-сайт (http://www.fsf.org/) или написав по адресу: Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-
-#: ../src/usr/bin/diffuse:6660
-msgid "Undo"
-msgstr "Отменить"
-
-#: ../src/usr/bin/diffuse:865
-msgid "Update paths for Cygwin"
-msgstr "Обновлять пути для Cygwin"
-
-#: ../src/usr/bin/diffuse:78
-msgid ""
-"Usage:\n"
-"    diffuse [ [OPTION...] [FILE...] ]...\n"
-"    diffuse ( -h | -? | --help | -v | --version )\n"
-"\n"
-"Diffuse is a graphical tool for merging and comparing text files.  Diffuse is\n"
-"able to compare an arbitrary number of files side-by-side and gives users the\n"
-"ability to manually adjust line matching and directly edit files.  Diffuse can\n"
-"also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,\n"
-"Monotone, RCS, Subversion, and SVK repositories for comparison and merging.\n"
-"\n"
-"Help Options:\n"
-"  ( -h | -? | --help )             Display this usage information\n"
-"  ( -v | --version )               Display version and copyright information\n"
-"\n"
-"Configuration Options:\n"
-"  --no-rcfile                      Do not read any resource files\n"
-"  --rcfile <file>                  Specify explicit resource file\n"
-"\n"
-"General Options:\n"
-"  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
-"  ( -D | --close-if-same )         Close all tabs with no differences\n"
-"  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
-"  ( -m | --modified )              Create a new tab for each modified file\n"
-"  ( -r | --revision ) <rev>        File revision <rev>\n"
-"  ( -s | --separate )              Create a new tab for each file\n"
-"  ( -t | --tab )                   Start a new tab\n"
-"  --null-file                      Create a blank file comparison pane\n"
-"\n"
-"Display Options:\n"
-"  ( -b | --ignore-space-change )   Ignore changes to white space\n"
-"  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
-"  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
-"  ( -i | --ignore-case )           Ignore case differences\n"
-"  ( -w | --ignore-all-space )      Ignore white space differences"
-msgstr ""
-"Использование:\n"
-"    diffuse [ [ОПЦИИ...] [ФАЙЛ...] ]...\n"
-"    diffuse ( -h | -? | --help | -v | --version )\n"
-"\n"
-"Diffuse является графическим инструментом для слияния и сравнения текстовых\n"
-"файлов. Может сравнить произвольное число файлов в представлении бок о бок,\n"
-"предоставляет пользователям возможность вручную корректировать соответствие\n"
-"строк и редактировать файлы напрямую. Diffuse может также извлекать ревизии\n"
-"файлов из Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion и SVK\n"
-"репозиториев для их сравнения и слияния.\n"
-"\n"
-"Параметры Справки:\n"
-"  ( -h | -? | --help )             Отобразить информацию по использованию\n"
-"  ( -v | --version )               Отобразить номер версии и авторские права\n"
-"\n"
-"Параметры Конфигурации:\n"
-"  --no-rcfile                      Не читать файлы инициализации\n"
-"  --rcfile <file>                  Определить явный файл ресурса\n"
-"\n"
-"Общие Параметры:\n"
-"  ( -c | --commit ) <rev>         Ревизии файла <rev-1> и <rev>\n"
-"  ( -D | --close-if-same )         Закрыть все не имеющие различий вкладки\n"
-"  ( -e | --encoding ) <codec>      Использовать <codec> для чтения и записи файлов\n"
-"  ( -m | --modified )              Создавать новую вкладку для каждого измененного файла\n"
-"  ( -r | --revision ) <rev>        Файл ревизии <rev>\n"
-"  ( -s | --separate )              Создавать новую вкладку для каждого файла\n"
-"  ( -t | --tab )                   Запустить новую вкладку\n"
-"  --null-file                      Создать пустое субокно сравнения файла\n"
-"\n"
-"Параметры Отображения:\n"
-"  ( -b | --ignore-space-change )   Игнорировать изменения свободного места\n"
-"  ( -B | --ignore-blank-lines )    Игнорировать изменения в пустых строках\n"
-"  ( -E | --ignore-end-of-line )    Игнорировать различия окончания строк\n"
-"  ( -i | --ignore-case )           Игнорировать различия регистра символов\n"
-"  ( -w | --ignore-all-space )      Игнорировать различия свободного места"
-
-#: ../src/usr/bin/diffuse:868
-msgid "Version Control"
-msgstr "Контроль Версий"
-
-#: ../src/usr/bin/diffuse:819
-#, python-format
-msgid "Warn me when closing a tab will quit %s"
-msgstr "Предупреждение, когда закрытие вкладки закроет %s"
-
-#: ../src/usr/bin/diffuse:549
-#, python-format
-msgid "Warning: unknown colour \"%s\""
-msgstr "Внимание: неизвестный цвет \"%s\""
-
-#: ../src/usr/bin/diffuse:558
-#, python-format
-msgid "Warning: unknown float \"%s\""
-msgstr "Внимание: неизвестное плавающее значение \"%s\""
-
-#: ../src/usr/bin/diffuse:567
-#, python-format
-msgid "Warning: unknown string \"%s\""
-msgstr "Внимание: неизвестная строка \"%s\""
-
-#: ../src/usr/bin/diffuse:6630
-#, python-format
-msgid "_About %s..."
-msgstr "О пр_ограмме %s..."
-
-#: ../src/usr/bin/diffuse:6552
-msgid "_Close Tab"
-msgstr "З_акрыть Вкладку"
-
-#: ../src/usr/bin/diffuse:6561
-msgid "_Copy"
-msgstr "Ко_пировать"
-
-#: ../src/usr/bin/diffuse:6566
-msgid "_Dismiss All Edits"
-msgstr "Сбр_осить Все Правки"
-
-#: ../src/usr/bin/diffuse:6556
-msgid "_Edit"
-msgstr "Пра_вка"
-
-#: ../src/usr/bin/diffuse:6539
-msgid "_File"
-msgstr "Фа_йл"
-
-#: ../src/usr/bin/diffuse:6568
-msgid "_Find..."
-msgstr "На_йти..."
-
-#: ../src/usr/bin/diffuse:6589
-msgid "_First Difference"
-msgstr "Пер_вое Различие"
-
-#: ../src/usr/bin/diffuse:6571
-msgid "_Go To Line..."
-msgstr "Пер_ейти на Строку..."
-
-#: ../src/usr/bin/diffuse:6627
-msgid "_Help"
-msgstr "Спр_авка"
-
-#: ../src/usr/bin/diffuse:6628
-msgid "_Help Contents..."
-msgstr "Содер_жание Справки..."
-
-#: ../src/usr/bin/diffuse:6611
-msgid "_Increase Indenting"
-msgstr "У_величить Отступ"
-
-#: ../src/usr/bin/diffuse:6587
-msgid "_Isolate"
-msgstr "И_золировать"
-
-#: ../src/usr/bin/diffuse:6592
-msgid "_Last Difference"
-msgstr "П_оследнее Различие"
-
-#: ../src/usr/bin/diffuse:6618
-msgid "_Merge"
-msgstr "С_лияние"
-
-#: ../src/usr/bin/diffuse:6624
-msgid "_Merge From Left Then Right"
-msgstr "С_лияние Слева Затем Справа"
-
-#: ../src/usr/bin/diffuse:6591
-msgid "_Next Difference"
-msgstr "Следу_ющее Различие"
-
-#: ../src/usr/bin/diffuse:6540
-msgid "_Open File..."
-msgstr "О_ткрыть Файл..."
-
-#: ../src/usr/bin/diffuse:6562
-msgid "_Paste"
-msgstr "В_ставить"
-
-#: ../src/usr/bin/diffuse:6590
-msgid "_Previous Difference"
-msgstr "Предыдуще_е Различие"
-
-#: ../src/usr/bin/diffuse:6554
-msgid "_Quit"
-msgstr "В_ыход"
-
-#: ../src/usr/bin/diffuse:6558
-msgid "_Redo"
-msgstr "Вер_нуть"
-
-#: ../src/usr/bin/diffuse:6543
-msgid "_Reload File"
-msgstr "Пер_езагрузить Файл"
-
-#: ../src/usr/bin/diffuse:6545
-msgid "_Save File"
-msgstr "С_охранить Файл"
-
-#: ../src/usr/bin/diffuse:6584
-msgid "_Syntax Highlighting"
-msgstr "Подсве_тка Синтаксиса"
-
-#: ../src/usr/bin/diffuse:6557
-msgid "_Undo"
-msgstr "От_менить"
-
-#: ../src/usr/bin/diffuse:6553
-msgid "_Undo Close Tab"
-msgstr "От_менить Закрытие Вкладки"
-
-#: ../src/usr/bin/diffuse:6583
-msgid "_View"
-msgstr "В_ид"
-
-#: ../src/usr/bin/diffuse:5872
-msgid "translator-credits"
-msgstr "v.01 О.Ю.Пахтусов (Oleg Pakhtusov) <oupakhtusov@gmail.com> "
-
+# German translations for diffuse package.
+# This is an alpha release.
+# Copyright (C) 2009 Derrick Moser
+# This file is distributed under the same license as the diffuse package.
+# Henri Menke <henrimenke4@aim.com>, 2009.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: diffuse-svn\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-06-20 19:36-0400\n"
+"PO-Revision-Date: 2010-10-05 12:30+0300\n"
+"Last-Translator: Oleg Pakhtusov <opakhtusov@gmail.com>\n"
+"Language-Team: Russian <opakhtusov@gmail.com>\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-Poedit-Language: Russian\n"
+"X-Poedit-Country: RUSSIAN FEDERATION\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: ../src/usr/bin/diffuse:894
+msgid "\"co\" command"
+msgstr "\"co\" команда"
+
+#: ../src/usr/bin/diffuse:895
+msgid "\"rlog\" command"
+msgstr "\"rlog\" команда"
+
+#: ../src/usr/bin/diffuse:7138
+#, python-format
+msgid "%(title)s Pane %(pane)d"
+msgstr "%(title)s Субокно %(pane)d"
+
+#: ../src/usr/bin/diffuse:6684
+#, python-format
+msgid "A file named %s already exists.  Do you want to overwrite it?"
+msgstr "Файл под именем %s уже существует.  Вы хотите перезаписать его?"
+
+#: ../src/usr/bin/diffuse:4240
+msgid "Align with Selection"
+msgstr "Выровнять с Выборкой"
+
+#: ../src/usr/bin/diffuse:828
+msgid "Alignment"
+msgstr "Выравнивание"
+
+#: ../src/usr/bin/diffuse:845
+msgid "Always show the tab bar"
+msgstr "Всегда показывать панель вкладок"
+
+#: ../src/usr/bin/diffuse:718
+msgid "Auto Detect"
+msgstr "Автообнаружение "
+
+#: ../src/usr/bin/diffuse:838
+msgid "Auto indent"
+msgstr "Автоматический отступ"
+
+#: ../src/usr/bin/diffuse:6926
+msgid "C_lear Edits"
+msgstr "Оч_истить Правки"
+
+#: ../src/usr/bin/diffuse:7407
+msgid "Choose Folder With Modified Files"
+msgstr "Выбрать Папку с Измененными Файлами"
+
+#: ../src/usr/bin/diffuse:4249 ../src/usr/bin/diffuse:7028
+msgid "Clear Edits"
+msgstr "Очистить Правки"
+
+#: ../src/usr/bin/diffuse:6232
+msgid "Close Tab"
+msgstr "Закрыть Вкладку"
+
+#: ../src/usr/bin/diffuse:7147
+msgid "Close _Without Saving"
+msgstr "Закр_ыть Без Сохранения"
+
+#: ../src/usr/bin/diffuse:6108
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr "Закрытие этой вкладки закроет %s."
+
+#: ../src/usr/bin/diffuse:6370
+#, python-format
+msgid "Column %d"
+msgstr "Столбец %d"
+
+#: ../src/usr/bin/diffuse:897
+msgid "Command"
+msgstr "Команда"
+
+#: ../src/usr/bin/diffuse:6972
+msgid "Convert Leading Spaces To _Tabs"
+msgstr "Преобра_зовать Вводные Пробелы в Табуляторы"
+
+#: ../src/usr/bin/diffuse:6971
+msgid "Convert Tabs To _Spaces"
+msgstr "Преобр_азовать Табуляторы в Пробелы"
+
+#: ../src/usr/bin/diffuse:6979
+msgid "Convert To Uni_x Format"
+msgstr "Преобразовать в Uni_х Формат"
+
+#: ../src/usr/bin/diffuse:6977
+msgid "Convert To _DOS Format"
+msgstr "Преобразоват_ь в DOS Формат"
+
+#: ../src/usr/bin/diffuse:6965
+msgid "Convert To _Lower Case"
+msgstr "Пре_образовать в Нижний Регистр"
+
+#: ../src/usr/bin/diffuse:6978
+msgid "Convert To _Mac Format"
+msgstr "Преобразовать в Ma_с Формат"
+
+#: ../src/usr/bin/diffuse:6964
+msgid "Convert To _Upper Case"
+msgstr "Пр_еобразовать в Верхний Регистр"
+
+#: ../src/usr/bin/diffuse:4245 ../src/usr/bin/diffuse:7026
+msgid "Copy"
+msgstr "Копировать"
+
+#: ../src/usr/bin/diffuse:7018
+msgid "Copy Left Into Selection"
+msgstr "Копировать Слева в Выборку"
+
+#: ../src/usr/bin/diffuse:6985
+msgid "Copy Left _Into Selection"
+msgstr "Копиро_вать Слева в Выборку"
+
+#: ../src/usr/bin/diffuse:6986
+msgid "Copy Right I_nto Selection"
+msgstr "Копиров_ать Справа в Выборку"
+
+#: ../src/usr/bin/diffuse:7019
+msgid "Copy Right Into Selection"
+msgstr "Копировать Справа в Выборку"
+
+#: ../src/usr/bin/diffuse:7017
+msgid "Copy Selection Left"
+msgstr "Копировать Выборку Влево"
+
+#: ../src/usr/bin/diffuse:7016
+msgid "Copy Selection Right"
+msgstr "Копировать Выборку Вправо"
+
+#: ../src/usr/bin/diffuse:6983
+msgid "Copy Selection _Left"
+msgstr "Ко_пировать Выборку Влево"
+
+#: ../src/usr/bin/diffuse:6982
+msgid "Copy Selection _Right"
+msgstr "К_опировать Выборку Вправо"
+
+#: ../src/usr/bin/diffuse:67
+msgid "Copyright © 2006-2011 Derrick Moser"
+msgstr "Copyright © 2006-2011 Derrick Moser"
+
+#: ../src/usr/bin/diffuse:6921
+msgid "Cu_t"
+msgstr "Выре_зать"
+
+#: ../src/usr/bin/diffuse:4244 ../src/usr/bin/diffuse:7025
+msgid "Cut"
+msgstr "Вырезать"
+
+#: ../src/usr/bin/diffuse:874
+msgid "Cygdrive prefix"
+msgstr "Cygdrive префикс"
+
+#: ../src/usr/bin/diffuse:871
+msgid "Cygwin"
+msgstr "Cygwin"
+
+#: ../src/usr/bin/diffuse:6975
+msgid "De_crease Indenting"
+msgstr "У_меньшить Отступ"
+
+#: ../src/usr/bin/diffuse:850
+msgid "Default codec"
+msgstr "Кодек по умолчанию"
+
+#: ../src/usr/bin/diffuse:844
+msgid "Default panes"
+msgstr "Субокон по умолчанию"
+
+#: ../src/usr/bin/diffuse:898
+msgid "Default revision"
+msgstr "Ревизия по умолчанию"
+
+#: ../src/usr/bin/diffuse:6194
+msgid "Derrick Moser <derrick_moser@yahoo.com>"
+msgstr "Derrick Moser <derrick_moser@yahoo.com>"
+
+#: ../src/usr/bin/diffuse:6191
+msgid "Diffuse is a graphical tool for merging and comparing text files."
+msgstr ""
+"Diffuse является графическим инструментом для слияния и сравнения текстовых "
+"файлов."
+
+#: ../src/usr/bin/diffuse:814
+msgid "Display"
+msgstr "Отображение"
+
+#: ../src/usr/bin/diffuse:836
+msgid "Editor"
+msgstr "Редактор"
+
+#: ../src/usr/bin/diffuse:6120
+msgid "Encoding: "
+msgstr "Кодировка: "
+
+#: ../src/usr/bin/diffuse:6731
+#, python-format
+msgid "Error encoding to %s."
+msgstr "Ошибка кодирования в %s."
+
+#: ../src/usr/bin/diffuse:2002
+#, python-format
+msgid "Error parsing %s."
+msgstr "Ошибка анализа %s."
+
+#: ../src/usr/bin/diffuse:6773 ../src/usr/bin/diffuse:7779
+msgid "Error parsing line number."
+msgstr "Ошибка анализа номера строки."
+
+#: ../src/usr/bin/diffuse:7724
+#, python-format
+msgid "Error parsing revision %s."
+msgstr "Ошибка анализа ревизии %s."
+
+#: ../src/usr/bin/diffuse:7796
+#, python-format
+msgid "Error processing argument \"%s\".  Directory not expected."
+msgstr "Ошибка обработки параметра \"%s\".  Каталог не ожидался."
+
+#: ../src/usr/bin/diffuse:690
+#, python-format
+msgid "Error processing line %(line)d of %(file)s."
+msgstr "Ошибка обработки строки %(line)d из %(file)s."
+
+#: ../src/usr/bin/diffuse:6565 ../src/usr/bin/diffuse:7696
+#, python-format
+msgid "Error reading %s."
+msgstr "Ошибка чтения %s."
+
+#: ../src/usr/bin/diffuse:6563
+#, python-format
+msgid "Error reading revision %(rev)s of %(file)s."
+msgstr "Ошибка считывания ревизии %(rev)s из %(file)s."
+
+#: ../src/usr/bin/diffuse:7358
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr "Ошибка извлечения модификаций для %s."
+
+#: ../src/usr/bin/diffuse:995 ../src/usr/bin/diffuse:6735
+#, python-format
+msgid "Error writing %s."
+msgstr "Ошибка записи %s."
+
+#: ../src/usr/bin/diffuse:839
+msgid "Expand tabs to spaces"
+msgstr "Расширить табуляторы до пробелов"
+
+#: ../src/usr/bin/diffuse:6963
+msgid "F_ormat"
+msgstr "Фор_мат"
+
+#: ../src/usr/bin/diffuse:7255
+#, python-format
+msgid "File Merge %d"
+msgstr "Слияние Файлов %d"
+
+#: ../src/usr/bin/diffuse:6931
+msgid "Find Pre_vious"
+msgstr "Най_ти Предыдущее"
+
+#: ../src/usr/bin/diffuse:6930
+msgid "Find _Next"
+msgstr "Н_айти Следующее"
+
+#: ../src/usr/bin/diffuse:6058
+msgid "Find..."
+msgstr "Найти..."
+
+#: ../src/usr/bin/diffuse:6955
+msgid "Fir_st Tab"
+msgstr "Перв_ая Вкладка"
+
+#: ../src/usr/bin/diffuse:7011
+msgid "First Difference"
+msgstr "Первое Различие"
+
+#: ../src/usr/bin/diffuse:816
+msgid "Font"
+msgstr "Шрифт"
+
+#: ../src/usr/bin/diffuse:6154
+msgid "Go To Line..."
+msgstr "Перейти на Строку..."
+
+#: ../src/usr/bin/diffuse:825
+msgid "Ignore blank line differences"
+msgstr "Игнорировать различия пустых строк"
+
+#: ../src/usr/bin/diffuse:833
+msgid "Ignore blank lines"
+msgstr "Игнорировать пустые строки"
+
+#: ../src/usr/bin/diffuse:830
+msgid "Ignore case"
+msgstr "Игнорировать регистр символов"
+
+#: ../src/usr/bin/diffuse:822
+msgid "Ignore case differences"
+msgstr "Игнорировать различия в регистре"
+
+#: ../src/usr/bin/diffuse:824 ../src/usr/bin/diffuse:832
+msgid "Ignore changes to white space"
+msgstr "Игнорировать изменения пробелов, символов табуляции и пустой строки"
+
+#: ../src/usr/bin/diffuse:834
+msgid "Ignore end of line characters"
+msgstr "Игнорировать символы окончания строк (терминаторы)"
+
+#: ../src/usr/bin/diffuse:826
+msgid "Ignore end of line differences"
+msgstr "Игнорировать различия окончания строк (терминаторы)"
+
+#: ../src/usr/bin/diffuse:831
+msgid "Ignore white space"
+msgstr "Игнорировать пробелы, символы табуляции и пустой строки"
+
+#: ../src/usr/bin/diffuse:823
+msgid "Ignore white space differences"
+msgstr "Игнорировать различия пробелов, символов табуляции и пустой строки"
+
+#: ../src/usr/bin/diffuse:4241
+msgid "Isolate"
+msgstr "Изолировать"
+
+#: ../src/usr/bin/diffuse:6958
+msgid "Las_t Tab"
+msgstr "Послед_няя Вкладка"
+
+#: ../src/usr/bin/diffuse:7014
+msgid "Last Difference"
+msgstr "Последнее Различие"
+
+#: ../src/usr/bin/diffuse:900
+msgid "Launch from a Bash login shell"
+msgstr "Запуск из оболочки Bash login"
+
+#: ../src/usr/bin/diffuse:6160
+msgid "Line Number: "
+msgstr "Номер строки: "
+
+#: ../src/usr/bin/diffuse:6988
+msgid "M_erge From Right Then Left"
+msgstr "Сл_ияние Справа Затем Слева"
+
+#: ../src/usr/bin/diffuse:6089
+msgid "Match Case"
+msgstr "Учитывать регистр"
+
+#: ../src/usr/bin/diffuse:7020
+msgid "Merge From Left Then Right"
+msgstr "Слияние Слева Затем Справа"
+
+#: ../src/usr/bin/diffuse:7021
+msgid "Merge From Right Then Left"
+msgstr "Слияние Справа Затем Слева"
+
+#: ../src/usr/bin/diffuse:4242
+msgid "Merge Selection"
+msgstr "Объединить Выборку"
+
+#: ../src/usr/bin/diffuse:7007
+msgid "New 2-Way File Merge"
+msgstr "Новое 2-Оконное Слияние Файлов"
+
+#: ../src/usr/bin/diffuse:7008
+msgid "New 3-Way File Merge"
+msgstr "Новое 3-Оконное Слияние Файлов"
+
+#: ../src/usr/bin/diffuse:6910
+msgid "New _2-Way File Merge"
+msgstr "Новое _2-Оконное Слияние Файлов"
+
+#: ../src/usr/bin/diffuse:6911
+msgid "New _3-Way File Merge"
+msgstr "Новое _3-Оконное Слияние Файлов"
+
+#: ../src/usr/bin/diffuse:7013
+msgid "Next Difference"
+msgstr "Следующее Различие"
+
+#: ../src/usr/bin/diffuse:6957
+msgid "Next _Tab"
+msgstr "С_ледующая Вкладка"
+
+#: ../src/usr/bin/diffuse:7420
+msgid "No modified files found."
+msgstr "Модифицированные файлы не найдены."
+
+#: ../src/usr/bin/diffuse:6936
+msgid "None"
+msgstr "Нет"
+
+#: ../src/usr/bin/diffuse:6588
+msgid "Open File"
+msgstr "Открыть Файл"
+
+#: ../src/usr/bin/diffuse:7391
+msgid "Open File In New Tab"
+msgstr "Открыть Файл в Новой Вкладке"
+
+#: ../src/usr/bin/diffuse:6902
+msgid "Open File In New _Tab..."
+msgstr "Открыт_ь Файл в Новой Вкладке..."
+
+#: ../src/usr/bin/diffuse:6287
+msgid "Open File..."
+msgstr "Открыть Файл..."
+
+#: ../src/usr/bin/diffuse:6903
+msgid "Open _Modified Files..."
+msgstr "Открыть И_змененные Файлы..."
+
+#: ../src/usr/bin/diffuse:851
+msgid "Order of codecs used to identify encoding"
+msgstr "Порядок кодеков, используемых для распознания кодировки"
+
+#: ../src/usr/bin/diffuse:4246 ../src/usr/bin/diffuse:7027
+msgid "Paste"
+msgstr "Вставить"
+
+#: ../src/usr/bin/diffuse:7509
+msgid "Phrase not found.  Continue from the end of the file?"
+msgstr "Фраза не найдена.  Продолжить с конца файла?"
+
+#: ../src/usr/bin/diffuse:7511
+msgid "Phrase not found.  Continue from the start of the file?"
+msgstr "Фраза не найдена.  Продолжить с начала файла?"
+
+#: ../src/usr/bin/diffuse:6934
+msgid "Pr_eferences..."
+msgstr "Предпо_чтения..."
+
+#: ../src/usr/bin/diffuse:6956
+msgid "Pre_vious Tab"
+msgstr "Предыдуща_я Вкладка"
+
+#: ../src/usr/bin/diffuse:966
+msgid "Preferences"
+msgstr "Предпочтения"
+
+#: ../src/usr/bin/diffuse:6796
+msgid ""
+"Press the enter key or double click to edit.  Press the space bar or use the "
+"RMB menu to manually align."
+msgstr ""
+"Нажатие Enter или двойной щелчок для редактирования.  Нажатие Space или меню "
+"правого щелчка для выравнивания вручную."
+
+#: ../src/usr/bin/diffuse:6798
+msgid "Press the escape key to finish editing."
+msgstr "Нажмите клавишу Escape, чтобы закончить редактирование."
+
+#: ../src/usr/bin/diffuse:7012
+msgid "Previous Difference"
+msgstr "Предыдущее Различие"
+
+#: ../src/usr/bin/diffuse:6947
+msgid "Re_align All"
+msgstr "Пере_строить Все"
+
+#: ../src/usr/bin/diffuse:7010
+msgid "Realign All"
+msgstr "Перестроить Все"
+
+#: ../src/usr/bin/diffuse:7024
+msgid "Redo"
+msgstr "Вернуть"
+
+#: ../src/usr/bin/diffuse:848
+msgid "Regional Settings"
+msgstr "Настройки Региона"
+
+#: ../src/usr/bin/diffuse:6288
+msgid "Reload File"
+msgstr "Перезагрузить Файл"
+
+#: ../src/usr/bin/diffuse:6970
+msgid "Remove Trailing _White Space"
+msgstr "Уда_лить Замыкающие Пробелы"
+
+#: ../src/usr/bin/diffuse:6130
+msgid "Revision: "
+msgstr "Ревизия: "
+
+#: ../src/usr/bin/diffuse:819
+msgid "Right margin"
+msgstr "Правое поле"
+
+#: ../src/usr/bin/diffuse:873
+msgid "Root directory"
+msgstr "Корневой каталог"
+
+#: ../src/usr/bin/diffuse:6658
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr "Сохранить %(title)s Субокно %(pane)d"
+
+#: ../src/usr/bin/diffuse:6908
+msgid "Save A_ll"
+msgstr "Сохран_ить Все"
+
+#: ../src/usr/bin/diffuse:6289
+msgid "Save File"
+msgstr "Сохранить Файл"
+
+#: ../src/usr/bin/diffuse:6290
+msgid "Save File As..."
+msgstr "Сохранить Файл Как..."
+
+#: ../src/usr/bin/diffuse:6907
+msgid "Save File _As..."
+msgstr "Сохра_нить Файл Как..."
+
+#: ../src/usr/bin/diffuse:6435
+msgid "Save changes before loading the new file?"
+msgstr "Сохранить изменения перед загрузкой нового файла?"
+
+#: ../src/usr/bin/diffuse:6094
+msgid "Search Backwards"
+msgstr "Поиск в обратном направлении"
+
+#: ../src/usr/bin/diffuse:6064
+msgid "Search For: "
+msgstr "Искать: "
+
+#: ../src/usr/bin/diffuse:4248
+msgid "Select All"
+msgstr "Выбрать Все"
+
+#: ../src/usr/bin/diffuse:6925
+msgid "Select _All"
+msgstr "В_ыбрать Все"
+
+#: ../src/usr/bin/diffuse:6800
+msgid ""
+"Select target line and press the space bar to align.  Press the escape key "
+"to cancel."
+msgstr ""
+"Выберите целевую строку и нажмите клавишу Space, чтобы выровнять.  Нажмите "
+"Еscape для отмены."
+
+#: ../src/usr/bin/diffuse:6961
+msgid "Shift Pane _Left"
+msgstr "Перемест_ить Субокно Влево"
+
+#: ../src/usr/bin/diffuse:6960
+msgid "Shift Pane _Right"
+msgstr "Пере_местить Субокно Вправо"
+
+#: ../src/usr/bin/diffuse:820
+msgid "Show line numbers"
+msgstr "Показывать номера строк"
+
+#: ../src/usr/bin/diffuse:818
+msgid "Show right margin"
+msgstr "Показывать правое поле"
+
+#: ../src/usr/bin/diffuse:821
+msgid "Show white space characters"
+msgstr "Показывать символы пробелов"
+
+#: ../src/usr/bin/diffuse:7789
+#, python-format
+msgid "Skipping unknown argument \"%s\"."
+msgstr "Пропуск неизвестного параметра \"%s\"."
+
+#: ../src/usr/bin/diffuse:840
+msgid "Soft tab width"
+msgstr "Ширина мягкого табулятора"
+
+#: ../src/usr/bin/diffuse:7132
+msgid ""
+"Some files have unsaved changes.  Select the files to save before closing."
+msgstr ""
+"Некоторые файлы имеют несохраненные изменения.\n"
+"Выберите файлы для сохранения перед закрытием."
+
+#: ../src/usr/bin/diffuse:6968
+msgid "Sort Lines In D_escending Order"
+msgstr "Сорт_ировать Строки в Порядке Убывания"
+
+#: ../src/usr/bin/diffuse:6967
+msgid "Sort Lines In _Ascending Order"
+msgstr "Сор_тировать Строки в Порядке Возрастания"
+
+#: ../src/usr/bin/diffuse:4251
+msgid "Swap with Selected Pane"
+msgstr "Обменять с Выбранным Субокном"
+
+#: ../src/usr/bin/diffuse:817
+msgid "Tab width"
+msgstr "Ширина табулятора"
+
+#: ../src/usr/bin/diffuse:842
+msgid "Tabs"
+msgstr "Вкладки"
+
+#: ../src/usr/bin/diffuse:6638
+#, python-format
+msgid "The file %s changed on disk.  Do you want to reload the file?"
+msgstr "Файл %s изменен на диске.  Вы хотите перезагрузить этот файл?"
+
+#: ../src/usr/bin/diffuse:6689
+#, python-format
+msgid ""
+"The file %s has been modified by another process since reading it.  If you "
+"save, all the external changes could be lost.  Save anyways?"
+msgstr ""
+"Файл %s был изменен другим процессом после его прочтения.  На сохранении все "
+"внешние изменения будут потеряны.  Сохранить все равно?"
+
+#: ../src/usr/bin/diffuse:6198
+msgid ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the licence, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program.  You may also obtain a copy of the GNU General Public License "
+"from the Free Software Foundation by visiting their web site (http://www.fsf."
+"org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, "
+"Fifth Floor, Boston, MA  02110-1301  USA\n"
+msgstr ""
+"Эта программа является бесплатным ПО; Вы можете распространять программу и/"
+"или изменять ее в соответствии с GNU General Public License, как "
+"опубликовано Free Software Foundation; либо версия 2 лицензии, либо (по "
+"вашему выбору) любая более поздняя версия.\n"
+"\n"
+"Эта программа распространяется в надежде, что она будет полезна, но БЕЗ "
+"КАКИХ-ЛИБО ГАРАНТИЙ; без даже подразумеваемой гарантии ТОВАРНОГО СОСТОЯНИЯ "
+"или ПРИГОДНОСТИ ДЛЯ КОНКРЕТНОЙ ЦЕЛИ. Смотрите GNU General Public License для "
+"дополнительных подробностей.\n"
+"\n"
+"Вам Следует получить копию GNU General Public License вместе с этой "
+"программой.  Вы можете также получить копию GNU General Public License от "
+"Free Software Foundation, посетив их web-сайт (http://www.fsf.org/) или "
+"написав по адресу: Free Software Foundation, Inc., 51 Franklin St, Fifth "
+"Floor, Boston, MA  02110-1301  USA\n"
+
+#: ../src/usr/bin/diffuse:7023
+msgid "Undo"
+msgstr "Отменить"
+
+#: ../src/usr/bin/diffuse:902
+msgid "Update paths for Cygwin"
+msgstr "Обновлять пути для Cygwin"
+
+#: ../src/usr/bin/diffuse:78
+msgid ""
+"Usage:\n"
+"    diffuse [ [OPTION...] [FILE...] ]...\n"
+"    diffuse ( -h | -? | --help | -v | --version )\n"
+"\n"
+"Diffuse is a graphical tool for merging and comparing text files.  Diffuse "
+"is\n"
+"able to compare an arbitrary number of files side-by-side and gives users "
+"the\n"
+"ability to manually adjust line matching and directly edit files.  Diffuse "
+"can\n"
+"also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,\n"
+"Monotone, RCS, Subversion, and SVK repositories for comparison and merging.\n"
+"\n"
+"Help Options:\n"
+"  ( -h | -? | --help )             Display this usage information\n"
+"  ( -v | --version )               Display version and copyright "
+"information\n"
+"\n"
+"Configuration Options:\n"
+"  --no-rcfile                      Do not read any resource files\n"
+"  --rcfile <file>                  Specify explicit resource file\n"
+"\n"
+"General Options:\n"
+"  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
+"  ( -D | --close-if-same )         Close all tabs with no differences\n"
+"  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
+"  ( -L | --label ) <label>         Display <label> instead of the file name\n"
+"  ( -m | --modified )              Create a new tab for each modified file\n"
+"  ( -r | --revision ) <rev>        File revision <rev>\n"
+"  ( -s | --separate )              Create a new tab for each file\n"
+"  ( -t | --tab )                   Start a new tab\n"
+"  --line <line>                    Start with line <line> selected\n"
+"  --null-file                      Create a blank file comparison pane\n"
+"\n"
+"Display Options:\n"
+"  ( -b | --ignore-space-change )   Ignore changes to white space\n"
+"  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
+"  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
+"  ( -i | --ignore-case )           Ignore case differences\n"
+"  ( -w | --ignore-all-space )      Ignore white space differences"
+msgstr ""
+"Использование:\n"
+"    diffuse [ [ОПЦИИ...] [ФАЙЛ...] ]...\n"
+"    diffuse ( -h | -? | --help | -v | --version )\n"
+"\n"
+"Diffuse является графическим инструментом для слияния и сравнения текстовых\n"
+"файлов. Может сравнить произвольное число файлов в представлении бок о бок,\n"
+"предоставляет пользователям возможность вручную корректировать соответствие\n"
+"строк и редактировать файлы напрямую. Diffuse может также извлекать ревизии\n"
+"файлов из Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion и "
+"SVK\n"
+"репозиториев для их сравнения и слияния.\n"
+"\n"
+"Параметры Справки:\n"
+"  ( -h | -? | --help )             Отобразить информацию по использованию\n"
+"  ( -v | --version )               Отобразить номер версии и авторские "
+"права\n"
+"\n"
+"Параметры Конфигурации:\n"
+"  --no-rcfile                      Не читать файлы инициализации\n"
+"  --rcfile <file>                  Определить явный файл ресурса\n"
+"\n"
+"Общие Параметры:\n"
+"  ( -c | --commit ) <rev>          Ревизии файла <rev-1> и <rev>\n"
+"  ( -D | --close-if-same )         Закрыть все не имеющие различий вкладки\n"
+"  ( -e | --encoding ) <codec>      Использовать <codec> для чтения и записи файлов\n"
+"  ( -L | --label ) <label>         Отображать <label> ярлык вместо имени файла\n"
+"  ( -m | --modified )              Создавать новую вкладку для каждого измененного файла\n"
+"  ( -r | --revision ) <rev>        Файл ревизии <rev>\n"
+"  ( -s | --separate )              Создавать новую вкладку для каждого файла\n"
+"  ( -t | --tab )                   Запустить новую вкладку\n"
+"  --line <line>                    Начать с выбранной <line> строки\n"
+"  --null-file                      Создать пустое субокно сравнения файла\n"
+"\n"
+"Параметры Отображения:\n"
+"  ( -b | --ignore-space-change )   Игнорировать изменения свободного места\n"
+"  ( -B | --ignore-blank-lines )    Игнорировать изменения в пустых строках\n"
+"  ( -E | --ignore-end-of-line )    Игнорировать различия окончания строк\n"
+"  ( -i | --ignore-case )           Игнорировать различия регистра символов\n"
+"  ( -w | --ignore-all-space )      Игнорировать различия свободного места"
+
+#: ../src/usr/bin/diffuse:905
+msgid "Version Control"
+msgstr "Контроль Версий"
+
+#: ../src/usr/bin/diffuse:846
+#, python-format
+msgid "Warn me when closing a tab will quit %s"
+msgstr "Предупреждение, когда закрытие вкладки закроет %s"
+
+#: ../src/usr/bin/diffuse:536
+#, python-format
+msgid "Warning: unknown colour \"%s\""
+msgstr "Внимание: неизвестный цвет \"%s\""
+
+#: ../src/usr/bin/diffuse:545
+#, python-format
+msgid "Warning: unknown float \"%s\""
+msgstr "Внимание: неизвестное плавающее значение \"%s\""
+
+#: ../src/usr/bin/diffuse:554
+#, python-format
+msgid "Warning: unknown string \"%s\""
+msgstr "Внимание: неизвестная строка \"%s\""
+
+#: ../src/usr/bin/diffuse:6993
+#, python-format
+msgid "_About %s..."
+msgstr "О пр_ограмме %s..."
+
+#: ../src/usr/bin/diffuse:6913
+msgid "_Close Tab"
+msgstr "З_акрыть Вкладку"
+
+#: ../src/usr/bin/diffuse:6922
+msgid "_Copy"
+msgstr "Ко_пировать"
+
+#: ../src/usr/bin/diffuse:6927
+msgid "_Dismiss All Edits"
+msgstr "Сбр_осить Все Правки"
+
+#: ../src/usr/bin/diffuse:6917
+msgid "_Edit"
+msgstr "Пра_вка"
+
+#: ../src/usr/bin/diffuse:6900
+msgid "_File"
+msgstr "Фа_йл"
+
+#: ../src/usr/bin/diffuse:6929
+msgid "_Find..."
+msgstr "На_йти..."
+
+#: ../src/usr/bin/diffuse:6950
+msgid "_First Difference"
+msgstr "Пер_вое Различие"
+
+#: ../src/usr/bin/diffuse:6932
+msgid "_Go To Line..."
+msgstr "Пер_ейти на Строку..."
+
+#: ../src/usr/bin/diffuse:6990
+msgid "_Help"
+msgstr "Спр_авка"
+
+#: ../src/usr/bin/diffuse:6991
+msgid "_Help Contents..."
+msgstr "Содер_жание Справки..."
+
+#: ../src/usr/bin/diffuse:6974
+msgid "_Increase Indenting"
+msgstr "У_величить Отступ"
+
+#: ../src/usr/bin/diffuse:6948
+msgid "_Isolate"
+msgstr "И_золировать"
+
+#: ../src/usr/bin/diffuse:6953
+msgid "_Last Difference"
+msgstr "П_оследнее Различие"
+
+#: ../src/usr/bin/diffuse:6981
+msgid "_Merge"
+msgstr "С_лияние"
+
+#: ../src/usr/bin/diffuse:6987
+msgid "_Merge From Left Then Right"
+msgstr "С_лияние Слева Затем Справа"
+
+#: ../src/usr/bin/diffuse:6952
+msgid "_Next Difference"
+msgstr "Следу_ющее Различие"
+
+#: ../src/usr/bin/diffuse:6901
+msgid "_Open File..."
+msgstr "О_ткрыть Файл..."
+
+#: ../src/usr/bin/diffuse:6923
+msgid "_Paste"
+msgstr "В_ставить"
+
+#: ../src/usr/bin/diffuse:6951
+msgid "_Previous Difference"
+msgstr "Предыдуще_е Различие"
+
+#: ../src/usr/bin/diffuse:6915
+msgid "_Quit"
+msgstr "В_ыход"
+
+#: ../src/usr/bin/diffuse:6919
+msgid "_Redo"
+msgstr "Вер_нуть"
+
+#: ../src/usr/bin/diffuse:6904
+msgid "_Reload File"
+msgstr "Пер_езагрузить Файл"
+
+#: ../src/usr/bin/diffuse:6906
+msgid "_Save File"
+msgstr "С_охранить Файл"
+
+#: ../src/usr/bin/diffuse:6945
+msgid "_Syntax Highlighting"
+msgstr "Подсве_тка Синтаксиса"
+
+#: ../src/usr/bin/diffuse:6918
+msgid "_Undo"
+msgstr "От_менить"
+
+#: ../src/usr/bin/diffuse:6914
+msgid "_Undo Close Tab"
+msgstr "От_менить Закрытие Вкладки"
+
+#: ../src/usr/bin/diffuse:6944
+msgid "_View"
+msgstr "В_ид"
+
+#: ../src/usr/bin/diffuse:6195
+msgid "translator-credits"
+msgstr "v.01 О.Ю.Пахтусов (Oleg Pakhtusov) <oupakhtusov@gmail.com> "
diff -Nru diffuse-0.4.4/translations/zh_CN.po diffuse-0.4.5/translations/zh_CN.po
--- diffuse-0.4.4/translations/zh_CN.po	2010-10-21 01:58:01.000000000 +0000
+++ diffuse-0.4.5/translations/zh_CN.po	2011-07-13 09:18:32.000000000 +0000
@@ -6,9 +6,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Diffuse svn 244\n"
+"Project-Id-Version: Diffuse svn 316\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-08 08:20-0400\n"
+"POT-Creation-Date: 2011-07-11 18:02-0400\n"
 "PO-Revision-Date: 2009-10-07 11:19+0800\n"
 "Last-Translator:  <jarryson@gmail.com>\n"
 "Language-Team: Chinese (simplified)\n"
@@ -16,591 +16,609 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: usr/bin/diffuse:857
+#: ../src/usr/bin/diffuse:900
 msgid "\"co\" command"
 msgstr "\"co\"命令"
 
-#: usr/bin/diffuse:858
+#: ../src/usr/bin/diffuse:901
 msgid "\"rlog\" command"
 msgstr "\"rlog\"命令"
 
-#: usr/bin/diffuse:6775
+#: ../src/usr/bin/diffuse:7164
 #, python-format
 msgid "%(title)s Pane %(pane)d"
 msgstr "%(title)s窗格%(pane)d"
 
-#: usr/bin/diffuse:6323
+#: ../src/usr/bin/diffuse:6710
 #, python-format
 msgid "A file named %s already exists.  Do you want to overwrite it?"
 msgstr "已存在名为%s的文件，您希望覆盖它吗？"
 
-#: usr/bin/diffuse:3921
+#: ../src/usr/bin/diffuse:4266
 msgid "Align with Selection"
 msgstr "向选中的对齐"
 
-#: usr/bin/diffuse:801
+#: ../src/usr/bin/diffuse:834
 msgid "Alignment"
 msgstr "对齐"
 
-#: usr/bin/diffuse:818
+#: ../src/usr/bin/diffuse:851
 msgid "Always show the tab bar"
 msgstr "总是显示标签栏"
 
-#: usr/bin/diffuse:5798
+#: ../src/usr/bin/diffuse:724
 msgid "Auto Detect"
 msgstr "自动探测"
 
-#: usr/bin/diffuse:813
+#: ../src/usr/bin/diffuse:844
 msgid "Auto indent"
 msgstr "自动缩进"
 
-#: usr/bin/diffuse:6565
+#: ../src/usr/bin/diffuse:6952
 msgid "C_lear Edits"
 msgstr "取消编辑(L)"
 
-#: usr/bin/diffuse:7030
+#: ../src/usr/bin/diffuse:7433
 msgid "Choose Folder With Modified Files"
 msgstr "选择更改过的文件夹"
 
-#: usr/bin/diffuse:3930 usr/bin/diffuse:6665
+#: ../src/usr/bin/diffuse:4275 ../src/usr/bin/diffuse:7054
 msgid "Clear Edits"
 msgstr "取消编辑"
 
-#: usr/bin/diffuse:5909
+#: ../src/usr/bin/diffuse:6258
 msgid "Close Tab"
 msgstr "关闭标签"
 
-#: usr/bin/diffuse:6784
+#: ../src/usr/bin/diffuse:7173
 msgid "Close _Without Saving"
 msgstr "不保存而关闭"
 
-#: usr/bin/diffuse:5776
+#: ../src/usr/bin/diffuse:6134
 #, python-format
 msgid "Closing this tab will quit %s."
 msgstr "关闭此标签将会退出%s"
 
-#: usr/bin/diffuse:6027
+#: ../src/usr/bin/diffuse:6396
 #, python-format
 msgid "Column %d"
 msgstr "%d列"
 
-#: usr/bin/diffuse:860
+#: ../src/usr/bin/diffuse:903
 msgid "Command"
 msgstr "命令"
 
-#: usr/bin/diffuse:6609
+#: ../src/usr/bin/diffuse:6998
 msgid "Convert Leading Spaces To _Tabs"
 msgstr "转换开头的空格为制表符(_T)"
 
-#: usr/bin/diffuse:6608
+#: ../src/usr/bin/diffuse:6997
 msgid "Convert Tabs To _Spaces"
 msgstr "转换制表符为空格(_S)"
 
-#: usr/bin/diffuse:6616
+#: ../src/usr/bin/diffuse:7005
 msgid "Convert To Uni_x Format"
 msgstr "转换为Unix格式(_X)"
 
-#: usr/bin/diffuse:6614
+#: ../src/usr/bin/diffuse:7003
 msgid "Convert To _DOS Format"
 msgstr "转换为DOS格式(_D)"
 
-#: usr/bin/diffuse:6602
+#: ../src/usr/bin/diffuse:6991
 msgid "Convert To _Lower Case"
 msgstr "转换成小写"
 
-#: usr/bin/diffuse:6615
+#: ../src/usr/bin/diffuse:7004
 msgid "Convert To _Mac Format"
 msgstr "转换为Mac格式(_M)"
 
-#: usr/bin/diffuse:6601
+#: ../src/usr/bin/diffuse:6990
 msgid "Convert To _Upper Case"
 msgstr "转换成大写"
 
-#: usr/bin/diffuse:3926 usr/bin/diffuse:6663
+#: ../src/usr/bin/diffuse:4271 ../src/usr/bin/diffuse:7052
 msgid "Copy"
 msgstr "复制"
 
-#: usr/bin/diffuse:6655
+#: ../src/usr/bin/diffuse:7044
 msgid "Copy Left Into Selection"
 msgstr "复制左边内容到选择之处"
 
-#: usr/bin/diffuse:6622
+#: ../src/usr/bin/diffuse:7011
 msgid "Copy Left _Into Selection"
 msgstr "复制左边内容到选择之处(_L)"
 
-#: usr/bin/diffuse:6623
+#: ../src/usr/bin/diffuse:7012
 msgid "Copy Right I_nto Selection"
 msgstr "复制右边内容到选择之处(_L)"
 
-#: usr/bin/diffuse:6656
+#: ../src/usr/bin/diffuse:7045
 msgid "Copy Right Into Selection"
 msgstr "复制右边内容到选择之处"
 
-#: usr/bin/diffuse:6654
+#: ../src/usr/bin/diffuse:7043
 msgid "Copy Selection Left"
 msgstr "复制选择之处到左边"
 
-#: usr/bin/diffuse:6653
+#: ../src/usr/bin/diffuse:7042
 msgid "Copy Selection Right"
 msgstr "复制选择之处到右边"
 
-#: usr/bin/diffuse:6620
+#: ../src/usr/bin/diffuse:7009
 msgid "Copy Selection _Left"
 msgstr "复制选择之处到左边(_L)"
 
-#: usr/bin/diffuse:6619
+#: ../src/usr/bin/diffuse:7008
 msgid "Copy Selection _Right"
 msgstr "复制选择之处到右边(_R)"
 
-#: usr/bin/diffuse:67
-msgid "Copyright © 2006-2010 Derrick Moser"
-msgstr "版权所有 © 2006-2010 Derrick Moser"
+#: ../src/usr/bin/diffuse:68
+msgid "Copyright © 2006-2011 Derrick Moser"
+msgstr "版权所有 © 2006-2011 Derrick Moser"
 
-#: usr/bin/diffuse:6560
+#: ../src/usr/bin/diffuse:6947
 msgid "Cu_t"
 msgstr "剪切(_T)"
 
-#: usr/bin/diffuse:3925 usr/bin/diffuse:6662
+#: ../src/usr/bin/diffuse:4270 ../src/usr/bin/diffuse:7051
 msgid "Cut"
 msgstr "剪切"
 
-#: usr/bin/diffuse:837
+#: ../src/usr/bin/diffuse:880
 msgid "Cygdrive prefix"
 msgstr ""
 
-#: usr/bin/diffuse:834
+#: ../src/usr/bin/diffuse:877
 msgid "Cygwin"
 msgstr ""
 
-#: usr/bin/diffuse:6612
+#: ../src/usr/bin/diffuse:7001
 msgid "De_crease Indenting"
 msgstr "减少缩进"
 
-#: usr/bin/diffuse:817
+#: ../src/usr/bin/diffuse:856
+msgid "Default codec"
+msgstr "默认编码"
+
+#: ../src/usr/bin/diffuse:850
 msgid "Default panes"
 msgstr "默认窗格"
 
-#: usr/bin/diffuse:861
+#: ../src/usr/bin/diffuse:904
 msgid "Default revision"
 msgstr "默认修正版本"
 
-#: usr/bin/diffuse:5871
+#: ../src/usr/bin/diffuse:6220
 msgid "Derrick Moser <derrick_moser@yahoo.com>"
 msgstr ""
 
-#: usr/bin/diffuse:5868
+#: ../src/usr/bin/diffuse:6217
 msgid "Diffuse is a graphical tool for merging and comparing text files."
 msgstr "Diffuse是一个合并和比较文本文件的图形化程序。"
 
-#: usr/bin/diffuse:789
+#: ../src/usr/bin/diffuse:820
 msgid "Display"
 msgstr "显示"
 
-#: usr/bin/diffuse:809
+#: ../src/usr/bin/diffuse:842
 msgid "Editor"
 msgstr "编辑器"
 
-#: usr/bin/diffuse:5788
+#: ../src/usr/bin/diffuse:6146
 msgid "Encoding: "
 msgstr "编码："
 
-#: usr/bin/diffuse:6370
+#: ../src/usr/bin/diffuse:6757
 #, python-format
 msgid "Error encoding to %s."
 msgstr "无法编码为%s。"
 
-#: usr/bin/diffuse:1932
+#: ../src/usr/bin/diffuse:2028
 #, python-format
 msgid "Error parsing %s."
 msgstr "无法解析%s。"
 
-#: usr/bin/diffuse:6412
+#: ../src/usr/bin/diffuse:6799 ../src/usr/bin/diffuse:7805
 msgid "Error parsing line number."
 msgstr "解析行数时错误。"
 
-#: usr/bin/diffuse:7327
+#: ../src/usr/bin/diffuse:7750
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "无法解析修订版本%s。"
 
-#: usr/bin/diffuse:7391
+#: ../src/usr/bin/diffuse:7822
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "无法处理\"%s\"。目录不存在。"
 
-#: usr/bin/diffuse:706
+#: ../src/usr/bin/diffuse:696
 #, python-format
 msgid "Error processing line %(line)d of %(file)s."
 msgstr "处理到文件%(file)s的%(line)d行时出错。"
 
-#: usr/bin/diffuse:6217 usr/bin/diffuse:7299
+#: ../src/usr/bin/diffuse:6591 ../src/usr/bin/diffuse:7722
 #, python-format
 msgid "Error reading %s."
 msgstr "无法读取%s。"
 
-#: usr/bin/diffuse:6215
+#: ../src/usr/bin/diffuse:6589
 #, python-format
 msgid "Error reading revision %(rev)s of %(file)s."
 msgstr "无法读取文件%(file)s中的修订版本%(rev)s。"
 
-#: usr/bin/diffuse:6981
+#: ../src/usr/bin/diffuse:7384
 #, python-format
 msgid "Error retrieving modifications for %s."
 msgstr "无法恢复对%s的修改。"
 
-#: usr/bin/diffuse:944 usr/bin/diffuse:6374
+#: ../src/usr/bin/diffuse:1013 ../src/usr/bin/diffuse:6761
 #, python-format
 msgid "Error writing %s."
 msgstr "无法写入%s"
 
-#: usr/bin/diffuse:812
+#: ../src/usr/bin/diffuse:845
 msgid "Expand tabs to spaces"
 msgstr "展开制表符为空格"
 
-#: usr/bin/diffuse:6600
+#: ../src/usr/bin/diffuse:6989
 msgid "F_ormat"
 msgstr "格式(_O)"
 
-#: usr/bin/diffuse:6891
+#: ../src/usr/bin/diffuse:7281
 #, python-format
 msgid "File Merge %d"
 msgstr "文件合并%d"
 
-#: usr/bin/diffuse:6570
+#: ../src/usr/bin/diffuse:6957
 msgid "Find Pre_vious"
 msgstr "找上一个(_V)"
 
-#: usr/bin/diffuse:6569
+#: ../src/usr/bin/diffuse:6956
 msgid "Find _Next"
 msgstr "找下一个(_N)"
 
-#: usr/bin/diffuse:5726
+#: ../src/usr/bin/diffuse:6084
 msgid "Find..."
 msgstr "查找..."
 
-#: usr/bin/diffuse:6648
+#: ../src/usr/bin/diffuse:6981
+msgid "Fir_st Tab"
+msgstr "第一个标签(_S)"
+
+#: ../src/usr/bin/diffuse:7037
 msgid "First Difference"
 msgstr "第一个不同之处"
 
-#: usr/bin/diffuse:791
+#: ../src/usr/bin/diffuse:822
 msgid "Font"
 msgstr "字体"
 
-#: usr/bin/diffuse:5831
+#: ../src/usr/bin/diffuse:6180
 msgid "Go To Line..."
 msgstr "跳到行..."
 
-#: usr/bin/diffuse:797
+#: ../src/usr/bin/diffuse:831
 msgid "Ignore blank line differences"
 msgstr "忽略空行的不同"
 
-#: usr/bin/diffuse:805
+#: ../src/usr/bin/diffuse:839
 msgid "Ignore blank lines"
 msgstr "忽略空行"
 
-#: usr/bin/diffuse:807
+#: ../src/usr/bin/diffuse:836
 msgid "Ignore case"
 msgstr "忽略大小写"
 
-#: usr/bin/diffuse:798
+#: ../src/usr/bin/diffuse:828
 msgid "Ignore case differences"
 msgstr "忽略大小写的不同"
 
-#: usr/bin/diffuse:796 usr/bin/diffuse:804
+#: ../src/usr/bin/diffuse:830 ../src/usr/bin/diffuse:838
 msgid "Ignore changes to white space"
 msgstr "忽略对空格的改变"
 
-#: usr/bin/diffuse:806
+#: ../src/usr/bin/diffuse:840
 msgid "Ignore end of line characters"
 msgstr "忽略行尾结束符"
 
-#: usr/bin/diffuse:799
+#: ../src/usr/bin/diffuse:832
 msgid "Ignore end of line differences"
 msgstr "忽略行尾的不同"
 
-#: usr/bin/diffuse:803
+#: ../src/usr/bin/diffuse:837
 msgid "Ignore white space"
 msgstr "忽略空格"
 
-#: usr/bin/diffuse:795
+#: ../src/usr/bin/diffuse:829
 msgid "Ignore white space differences"
 msgstr "忽略空格的不同"
 
-#: usr/bin/diffuse:3922
+#: ../src/usr/bin/diffuse:4267
 msgid "Isolate"
 msgstr "分离"
 
-#: usr/bin/diffuse:6651
+#: ../src/usr/bin/diffuse:6984
+msgid "Las_t Tab"
+msgstr "最后一个标签(_T)"
+
+#: ../src/usr/bin/diffuse:7040
 msgid "Last Difference"
-msgstr "上一个不同之处"
+msgstr "最后一个不同之处"
 
-#: usr/bin/diffuse:863
+#: ../src/usr/bin/diffuse:906
 msgid "Launch from a Bash login shell"
 msgstr "从命令行登录界面加载"
 
-#: usr/bin/diffuse:5837
+#: ../src/usr/bin/diffuse:6186
 msgid "Line Number: "
 msgstr "行数："
 
-#: usr/bin/diffuse:6625
+#: ../src/usr/bin/diffuse:7014
 msgid "M_erge From Right Then Left"
 msgstr "先右后左合并(_E)"
 
-#: usr/bin/diffuse:5757
+#: ../src/usr/bin/diffuse:6115
 msgid "Match Case"
 msgstr "符合大小写"
 
-#: usr/bin/diffuse:6657
+#: ../src/usr/bin/diffuse:7046
 msgid "Merge From Left Then Right"
 msgstr "先左后右合并"
 
-#: usr/bin/diffuse:6658
+#: ../src/usr/bin/diffuse:7047
 msgid "Merge From Right Then Left"
 msgstr "先右后左合并(_T)"
 
-#: usr/bin/diffuse:3923
+#: ../src/usr/bin/diffuse:4268
 msgid "Merge Selection"
 msgstr "合并选择之处"
 
-#: usr/bin/diffuse:6644
+#: ../src/usr/bin/diffuse:7033
 msgid "New 2-Way File Merge"
 msgstr "新建2方文件合并"
 
-#: usr/bin/diffuse:6645
+#: ../src/usr/bin/diffuse:7034
 msgid "New 3-Way File Merge"
 msgstr "新建3方文件合并"
 
-#: usr/bin/diffuse:6549
+#: ../src/usr/bin/diffuse:6936
 msgid "New _2-Way File Merge"
 msgstr "新建2方文件合并(_2)"
 
-#: usr/bin/diffuse:6550
+#: ../src/usr/bin/diffuse:6937
 msgid "New _3-Way File Merge"
 msgstr "新建3方文件合并(_3)"
 
-#: usr/bin/diffuse:6650
+#: ../src/usr/bin/diffuse:7039
 msgid "Next Difference"
-msgstr "下个不同之处"
+msgstr "下一个不同之处"
 
-#: usr/bin/diffuse:6595
+#: ../src/usr/bin/diffuse:6983
 msgid "Next _Tab"
-msgstr "下个标签(_T)"
+msgstr "下一个标签(_T)"
 
-#: usr/bin/diffuse:7043
+#: ../src/usr/bin/diffuse:7446
 msgid "No modified files found."
 msgstr "没有找到修改过的文件。"
 
-#: usr/bin/diffuse:6575
+#: ../src/usr/bin/diffuse:6962
 msgid "None"
 msgstr "无"
 
-#: usr/bin/diffuse:6240
+#: ../src/usr/bin/diffuse:6614
 msgid "Open File"
 msgstr "打开文件"
 
-#: usr/bin/diffuse:7014
+#: ../src/usr/bin/diffuse:7417
 msgid "Open File In New Tab"
 msgstr "在新标签里打开文件"
 
-#: usr/bin/diffuse:6541
+#: ../src/usr/bin/diffuse:6928
 msgid "Open File In New _Tab..."
 msgstr "在新标签里打开文件(_T)"
 
-#: usr/bin/diffuse:5950
+#: ../src/usr/bin/diffuse:6313
 msgid "Open File..."
 msgstr "打开文件"
 
-#: usr/bin/diffuse:6542
+#: ../src/usr/bin/diffuse:6929
 msgid "Open _Modified Files..."
 msgstr "打开修改过的文件(_M)"
 
-#: usr/bin/diffuse:823
+#: ../src/usr/bin/diffuse:857
 msgid "Order of codecs used to identify encoding"
 msgstr "用来识别编码的编码顺序"
 
-#: usr/bin/diffuse:3927 usr/bin/diffuse:6664
+#: ../src/usr/bin/diffuse:4272 ../src/usr/bin/diffuse:7053
 msgid "Paste"
 msgstr "粘贴"
 
-#: usr/bin/diffuse:7127
+#: ../src/usr/bin/diffuse:7535
 msgid "Phrase not found.  Continue from the end of the file?"
 msgstr "短语未找到，从文件结尾继续吗？"
 
-#: usr/bin/diffuse:7129
+#: ../src/usr/bin/diffuse:7537
 msgid "Phrase not found.  Continue from the start of the file?"
 msgstr "短语未找到，从文件开头继续吗？"
 
-#: usr/bin/diffuse:6573
+#: ../src/usr/bin/diffuse:6960
 msgid "Pr_eferences..."
 msgstr "首选项(_E)"
 
-#: usr/bin/diffuse:6594
+#: ../src/usr/bin/diffuse:6982
 msgid "Pre_vious Tab"
 msgstr "前一个标签(_V)"
 
-#: usr/bin/diffuse:920
+#: ../src/usr/bin/diffuse:975
 msgid "Preferences"
 msgstr "首选项"
 
-#: usr/bin/diffuse:6435
+#: ../src/usr/bin/diffuse:6822
 msgid ""
 "Press the enter key or double click to edit.  Press the space bar or use the "
 "RMB menu to manually align."
 msgstr "按回车或者鼠标双击进行编译。空格键或者右键菜单手动对齐。"
 
-#: usr/bin/diffuse:6437
+#: ../src/usr/bin/diffuse:6824
 msgid "Press the escape key to finish editing."
 msgstr "按ESC键结束编辑"
 
-#: usr/bin/diffuse:6649
+#: ../src/usr/bin/diffuse:7038
 msgid "Previous Difference"
-msgstr "前一个不同"
+msgstr "前一个不同之处"
 
-#: usr/bin/diffuse:6586
+#: ../src/usr/bin/diffuse:6973
 msgid "Re_align All"
 msgstr "重新对齐所有(_A)"
 
-#: usr/bin/diffuse:6647
+#: ../src/usr/bin/diffuse:7036
 msgid "Realign All"
 msgstr "重新对齐所有"
 
-#: usr/bin/diffuse:6661
+#: ../src/usr/bin/diffuse:7050
 msgid "Redo"
 msgstr "重做"
 
-#: usr/bin/diffuse:821
+#: ../src/usr/bin/diffuse:854
 msgid "Regional Settings"
 msgstr "区域性设置"
 
-#: usr/bin/diffuse:5951
+#: ../src/usr/bin/diffuse:6314
 msgid "Reload File"
 msgstr "重新加载文件"
 
-#: usr/bin/diffuse:6607
+#: ../src/usr/bin/diffuse:6996
 msgid "Remove Trailing _White Space"
 msgstr "删除多余的空格(_W)"
 
-#: usr/bin/diffuse:5806
+#: ../src/usr/bin/diffuse:6156
 msgid "Revision: "
 msgstr "修订："
 
-#: usr/bin/diffuse:836
+#: ../src/usr/bin/diffuse:825
+msgid "Right margin"
+msgstr "右边距"
+
+#: ../src/usr/bin/diffuse:879
 msgid "Root directory"
 msgstr "根目录"
 
-#: usr/bin/diffuse:6306
+#: ../src/usr/bin/diffuse:6684
 #, python-format
 msgid "Save %(title)s Pane %(pane)d"
 msgstr "保存%(title)s窗格%(pane)d"
 
-#: usr/bin/diffuse:6547
+#: ../src/usr/bin/diffuse:6934
 msgid "Save A_ll"
 msgstr "保存所有(_L)"
 
-#: usr/bin/diffuse:5952
+#: ../src/usr/bin/diffuse:6315
 msgid "Save File"
 msgstr "保存文件"
 
-#: usr/bin/diffuse:5953
+#: ../src/usr/bin/diffuse:6316
 msgid "Save File As..."
 msgstr "另存为"
 
-#: usr/bin/diffuse:6546
+#: ../src/usr/bin/diffuse:6933
 msgid "Save File _As..."
 msgstr "另存为(_A)"
 
-#: usr/bin/diffuse:6092
+#: ../src/usr/bin/diffuse:6461
 msgid "Save changes before loading the new file?"
 msgstr "加载新文件之前保存更改吗？"
 
-#: usr/bin/diffuse:5762
+#: ../src/usr/bin/diffuse:6120
 msgid "Search Backwards"
 msgstr "反向搜索"
 
-#: usr/bin/diffuse:5732
+#: ../src/usr/bin/diffuse:6090
 msgid "Search For: "
 msgstr "搜索："
 
-#: usr/bin/diffuse:3929
+#: ../src/usr/bin/diffuse:4274
 msgid "Select All"
 msgstr "选择所有"
 
-#: usr/bin/diffuse:6564
+#: ../src/usr/bin/diffuse:6951
 msgid "Select _All"
 msgstr "选择所有(_A)"
 
-#: usr/bin/diffuse:6439
+#: ../src/usr/bin/diffuse:6826
 msgid ""
 "Select target line and press the space bar to align.  Press the escape key "
 "to cancel."
 msgstr "选择目标行然后按空格键进行对齐，按ESC取消。"
 
-#: usr/bin/diffuse:6598
+#: ../src/usr/bin/diffuse:6987
 msgid "Shift Pane _Left"
 msgstr "左移窗格(_L)"
 
-#: usr/bin/diffuse:6597
+#: ../src/usr/bin/diffuse:6986
 msgid "Shift Pane _Right"
 msgstr "右移窗格(_R)"
 
-#: usr/bin/diffuse:793
+#: ../src/usr/bin/diffuse:826
 msgid "Show line numbers"
 msgstr "显示行号"
 
-#: usr/bin/diffuse:794
+#: ../src/usr/bin/diffuse:824
+msgid "Show right margin"
+msgstr "显示右边距"
+
+#: ../src/usr/bin/diffuse:827
 msgid "Show white space characters"
 msgstr "显示空格字符"
 
-#: usr/bin/diffuse:7384
+#: ../src/usr/bin/diffuse:7815
 #, python-format
 msgid "Skipping unknown argument \"%s\"."
 msgstr "跳过未知参数\"%s\"。"
 
-#: usr/bin/diffuse:811
+#: ../src/usr/bin/diffuse:846
 msgid "Soft tab width"
 msgstr "软制表符宽度"
 
-#: usr/bin/diffuse:6769
+#: ../src/usr/bin/diffuse:7158
 msgid ""
 "Some files have unsaved changes.  Select the files to save before closing."
-msgstr ""
-"一些文件包含未保存的更改。请在关闭前保存这些文件。"
+msgstr "一些文件包含未保存的更改。请在关闭前保存这些文件。"
 
-#: usr/bin/diffuse:6605
+#: ../src/usr/bin/diffuse:6994
 msgid "Sort Lines In D_escending Order"
 msgstr "以递减的顺序排列行"
 
-#: usr/bin/diffuse:6604
+#: ../src/usr/bin/diffuse:6993
 msgid "Sort Lines In _Ascending Order"
 msgstr "以递增的顺序排列行"
 
-#: usr/bin/diffuse:3932
+#: ../src/usr/bin/diffuse:4277
 msgid "Swap with Selected Pane"
 msgstr "交换选中的窗格"
 
-#: usr/bin/diffuse:792
+#: ../src/usr/bin/diffuse:823
 msgid "Tab width"
 msgstr "制表符宽度"
 
-#: usr/bin/diffuse:815
+#: ../src/usr/bin/diffuse:848
 msgid "Tabs"
 msgstr "标签"
 
-#: usr/bin/diffuse:6286
+#: ../src/usr/bin/diffuse:6664
 #, python-format
 msgid "The file %s changed on disk.  Do you want to reload the file?"
 msgstr "磁盘文件%s已被更改，是否重新载入？"
 
-#: usr/bin/diffuse:6328
+#: ../src/usr/bin/diffuse:6715
 #, python-format
 msgid ""
 "The file %s has been modified by another process since reading it.  If you "
 "save, all the external changes could be lost.  Save anyways?"
 msgstr ""
-"文件%s打开后被其他进程更改过了，如果保存，其他程序的修改将会丢失，"
-"保存吗？"
+"文件%s打开后被其他进程更改过了，如果保存，其他程序的修改将会丢失，保存吗？"
 
-#: usr/bin/diffuse:5875
+#: ../src/usr/bin/diffuse:6224
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -619,15 +637,15 @@
 "Fifth Floor, Boston, MA  02110-1301  USA\n"
 msgstr ""
 
-#: usr/bin/diffuse:6660
+#: ../src/usr/bin/diffuse:7049
 msgid "Undo"
 msgstr "恢复"
 
-#: usr/bin/diffuse:865
+#: ../src/usr/bin/diffuse:908
 msgid "Update paths for Cygwin"
 msgstr "为Cygwin更新路径"
 
-#: usr/bin/diffuse:78
+#: ../src/usr/bin/diffuse:86
 msgid ""
 "Usage:\n"
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
@@ -655,10 +673,12 @@
 "  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
 "  ( -D | --close-if-same )         Close all tabs with no differences\n"
 "  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
+"  ( -L | --label ) <label>         Display <label> instead of the file name\n"
 "  ( -m | --modified )              Create a new tab for each modified file\n"
 "  ( -r | --revision ) <rev>        File revision <rev>\n"
 "  ( -s | --separate )              Create a new tab for each file\n"
 "  ( -t | --tab )                   Start a new tab\n"
+"  --line <line>                    Start with line <line> selected\n"
 "  --null-file                      Create a blank file comparison pane\n"
 "\n"
 "Display Options:\n"
@@ -693,10 +713,12 @@
 "  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
 "  ( -D | --close-if-same )         Close all tabs with no differences\n"
 "  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
+"  ( -L | --label ) <label>         Display <label> instead of the file name\n"
 "  ( -m | --modified )              Create a new tab for each modified file\n"
 "  ( -r | --revision ) <rev>        File revision <rev>\n"
 "  ( -s | --separate )              Create a new tab for each file\n"
 "  ( -t | --tab )                   Start a new tab\n"
+"  --line <line>                    Start with line <line> selected\n"
 "  --null-file                      Create a blank file comparison pane\n"
 "\n"
 "显示参数:\n"
@@ -706,144 +728,143 @@
 "  ( -i | --ignore-case )           忽略小结的不同\n"
 "  ( -w | --ignore-all-space )      忽略所有空白的不同"
 
-
-#: usr/bin/diffuse:868
+#: ../src/usr/bin/diffuse:911
 msgid "Version Control"
 msgstr "版本控制"
 
-#: usr/bin/diffuse:819
+#: ../src/usr/bin/diffuse:852
 #, python-format
 msgid "Warn me when closing a tab will quit %s"
 msgstr "当关闭标签会退出%s的时候提醒我"
 
-#: usr/bin/diffuse:549
+#: ../src/usr/bin/diffuse:542
 #, python-format
 msgid "Warning: unknown colour \"%s\""
 msgstr "警告：未知的颜色\"%s\""
 
-#: usr/bin/diffuse:558
+#: ../src/usr/bin/diffuse:551
 #, python-format
 msgid "Warning: unknown float \"%s\""
 msgstr "警告：未知的浮点数\"%s\""
 
-#: usr/bin/diffuse:567
+#: ../src/usr/bin/diffuse:560
 #, python-format
 msgid "Warning: unknown string \"%s\""
 msgstr "警告：未知字符串\"%s\""
 
-#: usr/bin/diffuse:6630
+#: ../src/usr/bin/diffuse:7019
 #, python-format
 msgid "_About %s..."
 msgstr "关于%s(_A)"
 
-#: usr/bin/diffuse:6552
+#: ../src/usr/bin/diffuse:6939
 msgid "_Close Tab"
 msgstr "关闭标签(_C)"
 
-#: usr/bin/diffuse:6561
+#: ../src/usr/bin/diffuse:6948
 msgid "_Copy"
 msgstr "复制(_C)"
 
-#: usr/bin/diffuse:6566
+#: ../src/usr/bin/diffuse:6953
 msgid "_Dismiss All Edits"
 msgstr "撤销所有更改(_D)"
 
-#: usr/bin/diffuse:6556
+#: ../src/usr/bin/diffuse:6943
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: usr/bin/diffuse:6539
+#: ../src/usr/bin/diffuse:6926
 msgid "_File"
 msgstr "文件(_F)"
 
-#: usr/bin/diffuse:6568
+#: ../src/usr/bin/diffuse:6955
 msgid "_Find..."
 msgstr "查找(_F)"
 
-#: usr/bin/diffuse:6589
+#: ../src/usr/bin/diffuse:6976
 msgid "_First Difference"
-msgstr "第一个不同(_F)"
+msgstr "第一个不同之处(_F)"
 
-#: usr/bin/diffuse:6571
+#: ../src/usr/bin/diffuse:6958
 msgid "_Go To Line..."
 msgstr "跳到行(_G)"
 
-#: usr/bin/diffuse:6627
+#: ../src/usr/bin/diffuse:7016
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: usr/bin/diffuse:6628
+#: ../src/usr/bin/diffuse:7017
 msgid "_Help Contents..."
 msgstr "帮助内容(_H)"
 
-#: usr/bin/diffuse:6611
+#: ../src/usr/bin/diffuse:7000
 msgid "_Increase Indenting"
 msgstr "减少缩进(_I)"
 
-#: usr/bin/diffuse:6587
+#: ../src/usr/bin/diffuse:6974
 msgid "_Isolate"
 msgstr "分离(_I)"
 
-#: usr/bin/diffuse:6592
+#: ../src/usr/bin/diffuse:6979
 msgid "_Last Difference"
-msgstr "最后一个不同(_L)"
+msgstr "最后一个不同之处(_L)"
 
-#: usr/bin/diffuse:6618
+#: ../src/usr/bin/diffuse:7007
 msgid "_Merge"
 msgstr "合并(_M)"
 
-#: usr/bin/diffuse:6624
+#: ../src/usr/bin/diffuse:7013
 msgid "_Merge From Left Then Right"
 msgstr "先左再右合并(_M)"
 
-#: usr/bin/diffuse:6591
+#: ../src/usr/bin/diffuse:6978
 msgid "_Next Difference"
-msgstr "下一个不同(_N)"
+msgstr "下一个不同之处(_N)"
 
-#: usr/bin/diffuse:6540
+#: ../src/usr/bin/diffuse:6927
 msgid "_Open File..."
 msgstr "打开文件(_O)"
 
-#: usr/bin/diffuse:6562
+#: ../src/usr/bin/diffuse:6949
 msgid "_Paste"
 msgstr "粘贴(_P)"
 
-#: usr/bin/diffuse:6590
+#: ../src/usr/bin/diffuse:6977
 msgid "_Previous Difference"
-msgstr "前一个不同(_P)"
+msgstr "前一个不同之处(_P)"
 
-#: usr/bin/diffuse:6554
+#: ../src/usr/bin/diffuse:6941
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: usr/bin/diffuse:6558
+#: ../src/usr/bin/diffuse:6945
 msgid "_Redo"
 msgstr "重做(_R)"
 
-#: usr/bin/diffuse:6543
+#: ../src/usr/bin/diffuse:6930
 msgid "_Reload File"
 msgstr "重新加载文件(_R)"
 
-#: usr/bin/diffuse:6545
+#: ../src/usr/bin/diffuse:6932
 msgid "_Save File"
 msgstr "保存(_S)"
 
-#: usr/bin/diffuse:6584
+#: ../src/usr/bin/diffuse:6971
 msgid "_Syntax Highlighting"
 msgstr "_Syntax高亮"
 
-#: usr/bin/diffuse:6557
+#: ../src/usr/bin/diffuse:6944
 msgid "_Undo"
 msgstr "恢复(_U)"
 
-#: usr/bin/diffuse:6553
+#: ../src/usr/bin/diffuse:6940
 msgid "_Undo Close Tab"
 msgstr "恢复关闭的标签"
 
-#: usr/bin/diffuse:6583
+#: ../src/usr/bin/diffuse:6970
 msgid "_View"
 msgstr "视图(_V)"
 
-#: usr/bin/diffuse:5872
+#: ../src/usr/bin/diffuse:6221
 msgid "translator-credits"
 msgstr "Liu Hao <jarryson@gmail.com>"
diff -Nru diffuse-0.4.4/utils/book2manual.xsl diffuse-0.4.5/utils/book2manual.xsl
--- diffuse-0.4.4/utils/book2manual.xsl	2010-10-21 01:58:00.000000000 +0000
+++ diffuse-0.4.5/utils/book2manual.xsl	2011-07-13 09:18:32.000000000 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE xsl:stylesheet [
  <!ENTITY app "Diffuse">
- <!ENTITY app-version "0.4.4">
+ <!ENTITY app-version "0.4.5">
  <!ENTITY app-cmd "diffuse">
- <!ENTITY date "2010-10-21">
+ <!ENTITY date "2011-07-13">
 ]>
 <!--
   template for translating Diffuse's help documentation to a manual page
diff -Nru diffuse-0.4.4/utils/translations.txt diffuse-0.4.5/utils/translations.txt
--- diffuse-0.4.4/utils/translations.txt	2010-10-21 01:58:00.000000000 +0000
+++ diffuse-0.4.5/utils/translations.txt	2011-07-13 09:18:32.000000000 +0000
@@ -1,3 +1,12 @@
+it:Diffuse Manual:Manuale di Diffuse
+it:.SH "NAME":.SH "NOME"
+it:.SH "SYNOPSIS":.SH "SINOSSI"
+it:graphical tool for merging and comparing text files:strumento grafico per l'unione e il confronto di file
+it:.SH "DESCRIPTION":.SH "DESCRIZIONE"
+it:.SH "OPTIONS":.SH "OPZIONI"
+it:.SH "AUTHOR":.SH "AUTORE"
+it:.SH "COPYING":.SH "COPIA"
+
 ru:Diffuse Manual:Руководство по Diffuse
 ru:.SH "NAME":.SH "НАЗВАНИЕ"
 ru:.SH "SYNOPSIS":.SH "СИНТАКСИС"
diff -Nru diffuse-0.4.4/windows-installer/build.py diffuse-0.4.5/windows-installer/build.py
--- diffuse-0.4.4/windows-installer/build.py	2010-10-21 01:58:01.000000000 +0000
+++ diffuse-0.4.5/windows-installer/build.py	2011-07-13 09:18:32.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2010 Derrick Moser <derrick_moser@yahoo.com>
+# Copyright (C) 2006-2011 Derrick Moser <derrick_moser@yahoo.com>
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
@@ -25,7 +25,7 @@
 import subprocess
 import sys
 
-VERSION='0.4.4'
+VERSION='0.4.5'
 PACKAGE='1'
 PLATFORM='win' + ''.join([ c for c in platform.architecture()[0] if c.isdigit() ])
 INSTALLER='diffuse-%s-%s.%s' % (VERSION, PACKAGE, PLATFORM)
@@ -96,11 +96,10 @@
 if os.spawnv(os.P_WAIT, args[0], args) != 0:
     raise OSError('Could not run setup.py')
 
-# include Python 2.6 specific DLLs and manifests
-if platform.python_version_tuple()[:2] == ('2', '6'):
-    for f in 'msvcm90.dll', 'msvcp90.dll', 'msvcr90.dll':
-        copyFile(os.path.join(os.environ['SYSTEMROOT'], 'WinSxS\\x86_Microsoft.VC90.CRT_1fc8b3b9a1e18e3b_9.0.21022.8_x-ww_d08d0375\\' + f), 'dist\\' + f)
-    copyFile(os.path.join(os.environ['SYSTEMROOT'], 'WinSxS\\Manifests\\x86_Microsoft.VC90.CRT_1fc8b3b9a1e18e3b_9.0.21022.8_x-ww_d08d0375.manifest'), 'dist\\Microsoft.VC90.CRT.manifest')
+# include Microsoft redistributables needed by Python 2.6 and above
+for f in 'msvcm90.dll', 'msvcp90.dll', 'msvcr90.dll':
+    copyFile(os.path.join(os.environ['SYSTEMROOT'], 'WinSxS\\x86_Microsoft.VC90.CRT_1fc8b3b9a1e18e3b_9.0.21022.8_x-ww_d08d0375\\' + f), 'dist\\' + f)
+copyFile(os.path.join(os.environ['SYSTEMROOT'], 'WinSxS\\Manifests\\x86_Microsoft.VC90.CRT_1fc8b3b9a1e18e3b_9.0.21022.8_x-ww_d08d0375.manifest'), 'dist\\Microsoft.VC90.CRT.manifest')
 
 # include GTK dependencies
 gtk_dir = os.environ['GTK_BASEPATH']
@@ -119,9 +118,6 @@
     copyFile(p, os.path.join('dist\\syntax', os.path.basename(p)), True)
 copyFile('diffuserc', 'dist\\diffuserc')
 
-# application icon
-copyFile('diffuse.ico', 'dist\\diffuse.ico')
-
 # translations
 mkdir('dist\\share\\locale')
 locale_dir = os.path.join(gtk_dir, 'share\\locale')
diff -Nru diffuse-0.4.4/windows-installer/diffuse.iss diffuse-0.4.5/windows-installer/diffuse.iss
--- diffuse-0.4.4/windows-installer/diffuse.iss	2010-10-21 01:58:01.000000000 +0000
+++ diffuse-0.4.5/windows-installer/diffuse.iss	2011-07-13 09:18:32.000000000 +0000
@@ -1,10 +1,11 @@
 ; Inno Setup file for Diffuse
 ;
-; Copyright (C) 2009-2010 Derrick Moser <derrick_moser@yahoo.com>
+; Copyright (C) 2009-2011 Derrick Moser <derrick_moser@yahoo.com>
 
 [Setup]
+AppId=Diffuse
 AppName={cm:ToolName}
-AppVerName=Diffuse 0.4.4
+AppVerName=Diffuse 0.4.5
 DefaultDirName={pf}\Diffuse
 DefaultGroupName=Diffuse
 UninstallDisplayIcon={app}\diffusew.exe
@@ -17,6 +18,7 @@
 Name: "en"; MessagesFile: "compiler:Default.isl,.\en.isl"
 Name: "de"; MessagesFile: "compiler:Languages\German.isl,.\de.isl"
 Name: "es"; MessagesFile: "compiler:Languages\Spanish.isl,.\es.isl"
+Name: "it"; MessagesFile: "compiler:Languages\Italian.isl,.\it.isl"
 Name: "ja"; MessagesFile: "compiler:Languages\Japanese.isl,.\ja.isl"
 Name: "ko"; MessagesFile: "compiler:Languages\Korean-5-5.1.11.isl,.\ko.isl"
 Name: "ru"; MessagesFile: "compiler:Languages\Russian.isl,.\ru.isl"
diff -Nru diffuse-0.4.4/windows-installer/it.isl diffuse-0.4.5/windows-installer/it.isl
--- diffuse-0.4.4/windows-installer/it.isl	1970-01-01 00:00:00.000000000 +0000
+++ diffuse-0.4.5/windows-installer/it.isl	2011-07-13 09:18:32.000000000 +0000
@@ -0,0 +1,8 @@
+[CustomMessages]
+;cp1252
+ToolName=Diffuse - strumento di unione
+UninstallTool=Rimuovi lo strumento di unione Diffuse
+OpenWithTool=Apri con lo strumento di unione Diffuse
+MainFiles=File principali
+ShellIntegration=Integrazione con la shell di Windows
+AddToPath=Aggiungi il percorso di installazione al percorso di ricerca
diff -Nru diffuse-0.4.4/windows-installer/setup.py diffuse-0.4.5/windows-installer/setup.py
--- diffuse-0.4.4/windows-installer/setup.py	2010-10-21 01:58:01.000000000 +0000
+++ diffuse-0.4.5/windows-installer/setup.py	2011-07-13 09:18:32.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2009 Derrick Moser <derrick_moser@yahoo.com>
+# Copyright (C) 2006-2011 Derrick Moser <derrick_moser@yahoo.com>
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
@@ -31,7 +31,7 @@
     options = { 'py2exe': {
                    'packages': 'encodings, gtk',
                    'includes': 'cairo, pango, pangocairo, atk, gobject',
-                   'excludes': [ '_ssl', 'pyreadline', 'doctest', 'optparse', 'pickle', 'calendar', 'unittest', 'inspect', 'pdb' ],
+                   'excludes': [ '_ssl', 'pyreadline', 'doctest', 'pickle', 'calendar', 'unittest', 'inspect', 'pdb' ],
                    'dll_excludes': [ 'libglade-2.0-0.dll' ] }
               }
  )
diff -Nru diffuse-0.4.4/windows-installer/translations.txt diffuse-0.4.5/windows-installer/translations.txt
--- diffuse-0.4.4/windows-installer/translations.txt	2010-10-21 01:58:01.000000000 +0000
+++ diffuse-0.4.5/windows-installer/translations.txt	2011-07-13 09:18:32.000000000 +0000
@@ -1,2 +1,5 @@
+it:Table of Contents:Sommario
+it:Chapter:Capitolo
+
 ru:Table of Contents:Оглавление
 ru:Chapter:Глава