backport whitespace rendering to LM 19.3 Tricia

2.4.2
l10n: Update translations
2021-07-17 03:05:39 -05:00 · 2019-12-11 14:49:51 +00:00 · 2019-12-11 14:49:23 +00:00 · 2019-11-26 17:14:41 +00:00 · 2019-11-26 17:14:17 +00:00 · 2019-11-22 12:12:34 +00:00
611 changed files with 302003 additions and 343641 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -0,0 +1,64 @@
+version: 2.0
+
+shared: &shared
+
+    steps:
+
+        - checkout
+
+        - run:
+            name: Prepare environment
+            command: apt-get update
+
+        - run:
+            name: Install dependencies
+            command: |
+                wget https://github.com/linuxmint/xapps/releases/download/master.${CIRCLE_JOB}/packages.tar.gz -O xapps.tar.gz
+                ls *.tar.gz | xargs -i tar zxvf {}
+                apt install --yes --allow-downgrades ./packages/*.deb
+                rm -rf packages
+
+        - run:
+            name: Build project
+            command: mint-build -i
+
+        - run:
+            name: Prepare packages
+            command: |
+                if [ -z $CI_PULL_REQUEST ]; then
+                    mkdir /packages
+                    mv /root/*.deb /packages/
+                    git log > /packages/git.log
+                    cd /
+                    tar zcvf packages.tar.gz packages
+                fi
+
+        - run:
+            name: Deploy packages to Github
+            command: |
+                if [ -z $CI_PULL_REQUEST ]; then
+                    wget https://github.com/tcnksm/ghr/releases/download/v0.5.4/ghr_v0.5.4_linux_amd64.zip
+                    apt-get install --yes unzip
+                    unzip ghr_v0.5.4_linux_amd64.zip
+                    TAG="master".$CIRCLE_JOB
+                    ./ghr -t $GITHUB_TOKEN -u $CIRCLE_PROJECT_USERNAME -r $CIRCLE_PROJECT_REPONAME -replace $TAG /packages.tar.gz
+                    ./ghr -t $GITHUB_TOKEN -u $CIRCLE_PROJECT_USERNAME -r $CIRCLE_PROJECT_REPONAME -recreate -b "Latest unstable packages" $TAG /packages.tar.gz
+                fi
+
+jobs:
+    "mint19":
+        <<: *shared
+        docker:
+            - image: linuxmintd/mint19-amd64
+
+    "lmde3":
+        <<: *shared
+        docker:
+            - image: linuxmintd/lmde3-amd64
+
+workflows:
+    version: 2
+    build:
+        jobs:
+            - "mint19"
+            - "lmde3"
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,19 @@
+
+```
+ * Xed version (xed --version)
+ * Distribution - (Mint 17.2, Arch, Fedora 25, etc...)
+```
+
+**Issue**
+
+
+
+**Steps to reproduce**
+
+
+
+**Expected behaviour**
+
+
+
+**Other information**
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,13 @@
+# Specify filepatterns you want git to ignore.
+debian/tmp/
+debian/build/
+debian/.debhelper/
+debian/xed/
+debian/xed-common/
+debian/xed-dbg/
+debian/xed-dev/
+debian/xed-doc/
+debian/files
+debian/*.log
+debian/*.substvars
+build
--- a/12
+++ b/12
@@ -1,13 +1,13 @@
-guidelines for xedit
+guidelines for xed
 ====================

-xedit source code is maintained using the git version control system
+xed source code is maintained using the git version control system
 and is available at the following location:

-    https://github.com/mate-desktop/xedit
+    https://github.com/linuxmint/xed

 Please don't commit directly to the git repository unless
-you have been given the green light to commit freely to xedit. 
+you have been given the green light to commit freely to xed. 
 When in doubt assume you haven't ;-).

 Please attach patches in GitHub.
@@ -23,7 +23,7 @@ your help, I just want to review these fixes before applying.
 If you are a "build sheriff", feel free to commit fixes for build and 
 configure (please, send me an e-mail with the patch you have applied).

-When committing to the xedit git repository make sure to include a
+When committing to the xed git repository make sure to include a
 meaningful commit message. Changes without a sufficient commit message
 will be reverted. Commit messages should have the following format:

@@ -54,4 +54,4 @@ tracker reference if applicable) and so forth. Be concise but not too brief.

 Thanks,

-  The xedit team.
+  The xed team.
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,74 +0,0 @@
-## Process this file with automake to produce Makefile.in
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
-SUBDIRS = xedit pixmaps po data plugin-loaders plugins docs help
-
-if ENABLE_TESTS
-    SUBDIRS += tests
-endif
-
-distuninstallcheck_listfiles = find . -type f -print
-
-EXTRA_DIST = 			\
-	autogen.sh		\
-	ChangeLog		\
-	HACKING			\
-	NEWS			\
-	NEWS.GNOME		\
-	README			\
-	xmldocs.make 		\
-	omf.make		\
-	intltool-extract.in 	\
-	intltool-merge.in 	\
-	intltool-update.in
-
-DISTCLEANFILES = 		\
-	intltool-extract 	\
-	intltool-merge 		\
-	intltool-update
-
-MAINTAINERCLEANFILES = 		\
-	aclocal.m4		\
-	config.guess		\
-	config.h.in		\
-	config.sub		\
-	depcomp			\
-	intltool-extract.in 	\
-	intltool-merge.in 		\
-	intltool-update.in \
-	configure \
-	INSTALL \
-	gtk-doc.make		\
-	install-sh		\
-	ltmain.sh		\
-	missing			\
-	mkinstalldirs		\
-	omf.make		\
-	py-compile		\
-	xmldocs.make		\
-	m4/gtk-doc.m4		\
-	m4/intltool.m4		\
-	m4/libtool.m4		\
-	m4/ltoptions.m4		\
-	m4/ltsugar.m4		\
-	m4/ltversion.m4		\
-	m4/lt~obsolete.m4	\
-	`find "$(srcdir)" -type f -name Makefile.in -print`
-
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-tests
-
-dist-hook:
-	@if test -d "$(srcdir)/.git"; \
-	then \
-		echo Creating ChangeLog && \
-		(GIT_DIR=$(top_srcdir)/.git \
-		  ./missing --run git log --stat -M -C --name-status  --date=short --no-color) | \
-		  fmt --split-only > ChangeLog.tmp \
-		&& mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
-		|| ( rm -f ChangeLog.tmp ; \
-		  echo Failed to generate ChangeLog >&2 ); \
-	else \
-		echo A git clone is required to generate a ChangeLog >&2; \
-	fi
-
-include $(top_srcdir)/git.mk
--- a/69
+++ b/69
@@ -1,69 +0,0 @@
-xedit 1.13.0
-============
-
-xedit 1.12.1
-============
-
-  * Add --without-matedesktop option to enable build without
-    dependency on libmate-desktop
-
-xedit 1.12.0
-============
-
-  * Add --enable-tests option to enable/disable running tests
-    during the build
-  * Add plugin to strip trailing spaces on saving
-  * Bring back active plugins listing in bugreport script
-  * Drop support for win32/osx and checkupdate plugin
-  * Retrieve strings directly from gschema (requires intltool 0.50.1)
-  * Capitalize Xedit in window titles and desktop file
-  * GTK3. fix print-preview
-  * Some annotation fixes
-  * Some minor fixes and cleanups
-
-xedit 1.10.2
-============
-
-  * Window title: display full path to files on mounted drives
-  * Close confirmation dialog: make text unfocusable
-  * Quickopen plugin: fix filebrowser plugin support
-  * Time plugin: GTK+3 fix
-  * Multiple help fixes
-
-xedit 1.10.1
-============
-
-  * Fix gschema translations
-  * GTK3 fixes
-  * Fix man page formatting
-  * Build system fixes
-
-xedit 1.10.0
-============
-
-  * Use MateAboutDialog from libmate-desktop
-
-xedit 1.8.1
-===========
-
-  * Fix go to line crash
-  * Translations updates
-
-xedit 1.8.0
-===========
-
-  * Add GTK3 support
-  * Use yelp-tools instead of mate-doc-utils
-  * Move user plugin dir from config_dir to data_dir. Plugins should have
-    never been installed in the config dir as they are not part of the
-    configuration. This means user will need to move the plugins directory
-    from: $HOME/.config/xedit/ to $HOME/.local/share/xedit/.
-
-xedit 1.5.0
-===========
-
-  * Migration to GSettings and drop mateconf
-    (All code is migrated, except pythonconsole plugin. The plugin works,
-    except you cant configure it; the configurable things were command
-    and error colors; this will be fixed migrating the plugin to Gir
-    instead of python-gtk)
--- a/NEWS.GEDIT
+++ b/NEWS.GEDIT
--- a/NEWS.PLUMA
+++ b/NEWS.PLUMA
@@ -0,0 +1,69 @@
+xed 1.13.0
+============
+
+xed 1.12.1
+============
+
+  * Add --without-matedesktop option to enable build without
+    dependency on libmate-desktop
+
+xed 1.12.0
+============
+
+  * Add --enable-tests option to enable/disable running tests
+    during the build
+  * Add plugin to strip trailing spaces on saving
+  * Bring back active plugins listing in bugreport script
+  * Drop support for win32/osx and checkupdate plugin
+  * Retrieve strings directly from gschema (requires intltool 0.50.1)
+  * Capitalize Xed in window titles and desktop file
+  * GTK3. fix print-preview
+  * Some annotation fixes
+  * Some minor fixes and cleanups
+
+xed 1.10.2
+============
+
+  * Window title: display full path to files on mounted drives
+  * Close confirmation dialog: make text unfocusable
+  * Quickopen plugin: fix filebrowser plugin support
+  * Time plugin: GTK+3 fix
+  * Multiple help fixes
+
+xed 1.10.1
+============
+
+  * Fix gschema translations
+  * GTK3 fixes
+  * Fix man page formatting
+  * Build system fixes
+
+xed 1.10.0
+============
+
+  * Use MateAboutDialog from libmate-desktop
+
+xed 1.8.1
+===========
+
+  * Fix go to line crash
+  * Translations updates
+
+xed 1.8.0
+===========
+
+  * Add GTK3 support
+  * Use yelp-tools instead of mate-doc-utils
+  * Move user plugin dir from config_dir to data_dir. Plugins should have
+    never been installed in the config dir as they are not part of the
+    configuration. This means user will need to move the plugins directory
+    from: $HOME/.config/xed/ to $HOME/.local/share/xed/.
+
+xed 1.5.0
+===========
+
+  * Migration to GSettings and drop mateconf
+    (All code is migrated, except pythonconsole plugin. The plugin works,
+    except you cant configure it; the configurable things were command
+    and error colors; this will be fixed migrating the plugin to Gir
+    instead of python-gtk)
--- a/18
+++ b/18
@@ -1,12 +1,12 @@
 General Information
 ===================

-xedit is a small and lightweight text editor.
+xed is a small and lightweight text editor.

-xedit supports most standard editing features, plus several not found in your
+xed supports most standard editing features, plus several not found in your
 average text editor (plugins being the most notable of these).

-Although new features are always under development, currently xedit has:
+Although new features are always under development, currently xed has:

    * Complete support for UTF-8 text
    * Syntax highlighting
@@ -17,7 +17,7 @@ Although new features are always under development, currently xedit has:
    * A complete preferences interface
    * Configurable Plugin system, with optional python support

-Some of the plugins, packaged and installed with xedit include, among others:
+Some of the plugins, packaged and installed with xed include, among others:

    * Word count
    * Spell checker
@@ -27,7 +27,7 @@ Some of the plugins, packaged and installed with xedit include, among others:
    * Insert Date/Time
    * Tag list

-xedit is released under the GNU General Public License (GPL) version 2, see
+xed is released under the GNU General Public License (GPL) version 2, see
 the file 'COPYING' for more information.

 Installation
@@ -35,7 +35,9 @@ Installation

 Simple install procedure:

-  % ./autogen.sh				# run the `configure' script
-  % make					# build xedit
+  % meson --prefix=/usr/local build	# run the `configure' script
+  % ninja -v -C build			# build xed
  [ Become root if necessary ]
-  % make install				# install xedit
+  % sudo ninja install -v  -C  build	# install xed
+
+    see linuxmint/xed#265 if you see GLib-GIO-ERROR
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,32 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-PKG_NAME="xedit"
-
-(test -f $srcdir/configure.ac) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level $PKG_NAME directory"
-    exit 1
-}
-
-which mate-autogen || {
-    echo "You need to install mate-common"
-    exit 1
-}
-
-
-which yelp-build || {
-    echo "You need to install yelp-tools" 
-    exit 1
-}
-
-REQUIRED_AUTOMAKE_VERSION=1.9
-REQUIRED_MACROS=python.m4
-MATE_DATADIR="$mate_datadir"
-USE_COMMON_DOC_BUILD=yes
-
-. mate-autogen
-
--- a/configure.ac
+++ b/configure.ac
@@ -1,410 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.63.2)
-
-m4_define(xedit_major_version, 1)
-m4_define(xedit_minor_version, 0)
-m4_define(xedit_micro_version, 1)
-m4_define(xedit_version, xedit_major_version.xedit_minor_version.xedit_micro_version)
-
-AC_INIT([xedit], [xedit_version],
-    [https://github.com/linuxmint/xedit/issues],
-    [xedit], [http://github.com/linuxmint/xedit])
-
-AC_CONFIG_HEADERS(config.h)
-AC_CONFIG_SRCDIR(xedit/xedit.c)
-AC_CONFIG_MACRO_DIR([m4])
-
-AC_DEFINE(XEDIT_MAJOR_VERSION, xedit_major_version, [Xedit major version])
-AC_SUBST(XEDIT_MAJOR_VERSION, xedit_major_version)
-AC_DEFINE(XEDIT_MINOR_VERSION, xedit_minor_version, [Xedit minor version])
-AC_SUBST(XEDIT_MINOR_VERSION, xedit_minor_version)
-AC_DEFINE(XEDIT_MICRO_VERSION, xedit_micro_version, [Xedit micro version])
-AC_SUBST(XEDIT_MICRO_VERSION, xedit_micro_version)
-
-AM_INIT_AUTOMAKE([1.10 dist-xz no-dist-gzip -Wno-portability check-news])
-AM_MAINTAINER_MODE
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-
-# Checks for programs
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_PROG_MAKE_SET
-AC_SYS_LARGEFILE
-PKG_PROG_PKG_CONFIG
-
-# Initialize libtool
-LT_PREREQ([2.2.6])
-LT_INIT(disable-static)
-
-GTK_DOC_CHECK([1.0],[--flavour=no-tmpl])
-
-AC_CHECK_FUNC(sigaction)
-AC_CHECK_LIB(m, floor)
-
-dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
-AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS -I m4")
-
-dnl toolbar style for GSettings schemas
-TOOLBAR_STYLE="XEDIT_TOOLBAR_SYSTEM"
-AC_SUBST(TOOLBAR_STYLE)
-
-# GLib min/max required versions
-AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_36],
-	[Warn on use of APIs added after GLib 2.36])
-AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_36],
-	[Warn on use of APIs deprecated before GLib 2.36])
-
-dnl ===============================================================
-dnl Expanded dirs
-dnl ===============================================================
-
-# This macro expands DIR and assigns it to RET.
-# If DIR is NONE, then it's replaced by DEFAULT.
-# Based on AC_DEFINE_DIR
-AC_DEFUN([XEDIT_FULLPATH], [
-  test "x$prefix" = xNONE && prefix="$ac_default_prefix"
-  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-  ac_expand=[$]$1
-  test "x$ac_expand" = xNONE && ac_expand="[$]$2"
-  ac_expand=`eval echo [$]ac_expand`
-  $3=`eval echo [$]ac_expand`
-])
-
-dnl ================================================================
-dnl Gettext stuff.
-dnl ================================================================
-
-IT_PROG_INTLTOOL([0.50.1])
-GETTEXT_PACKAGE=xedit
-AC_SUBST([GETTEXT_PACKAGE])
-AM_GLIB_GNU_GETTEXT
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Define to the Gettext package name])
-
-dnl ================================================================
-dnl Use gvfs metadata or the old xml file store.
-dnl ================================================================
-
-AC_ARG_ENABLE([gvfs-metadata],
-	AS_HELP_STRING([--enable-gvfs-metadata], [Enable using gvfs to store metadata]),
-	[enable_gvfs_metadata=$enableval],
-	[enable_gvfs_metadata=yes])
-
-AM_CONDITIONAL(ENABLE_GVFS_METADATA, test "x$enable_gvfs_metadata" != "xno")
-
-if test "x$enable_gvfs_metadata" != "xno"; then
-	AC_DEFINE([ENABLE_GVFS_METADATA], [1], [Define to enable using gvfs metadata])
-fi
-
-dnl ================================================================
-dnl spell plugins checks: enchant and iso-codes
-dnl ================================================================
-
-ENCHANT_REQUIRED=1.2.0
-ISO_CODES_REQUIRED=0.35
-
-AC_ARG_ENABLE([spell],
-	AS_HELP_STRING([--disable-spell],[Disable spell plugin (default: enabled)]),
-	[enable_enchant=$enableval],
-	[enable_enchant=yes])
-
-if test "x$enable_enchant" = "xyes" ; then
-
-	PKG_CHECK_MODULES(ENCHANT, enchant >= $ENCHANT_REQUIRED, \
-			  have_enchant=yes, have_enchant=no)
-
-	if test "x$have_enchant" = "xyes"; then
-
-		PKG_CHECK_EXISTS([iso-codes >= $ISO_CODES_REQUIRED],
-				 [have_iso_codes=yes],[have_iso_codes=no])
-
-		if test "x$have_iso_codes" = "xyes"; then
-			AC_MSG_CHECKING([whether iso-codes has iso-639 and iso-3166 domains])
-			if $PKG_CONFIG --variable=domains iso-codes | grep 639 > /dev/null && \
-			   $PKG_CONFIG --variable=domains iso-codes | grep 3166 > /dev/null ; then
-				result=yes
-			else
-				result=no
-				have_iso_codes=no
-			fi
-			AC_MSG_RESULT([$result])
-		fi
-
-		if test "x$have_iso_codes" = "xyes"; then
-			AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["`$PKG_CONFIG --variable=prefix iso-codes`"],[ISO codes prefix])
-			AC_DEFINE([HAVE_ISO_CODES],[1],[Define if you have the iso-codes package])
-		else
-			AC_MSG_ERROR([iso-codes is required to build the spell plugin. Use --disable-spell to build without spell plugin.])
-		fi
-	else
-		enable_enchant=no
-		AC_MSG_ERROR([Enchant library not found or too old. Use --disable-spell to build without spell plugin.])
-	fi
-fi
-
-AM_CONDITIONAL(ENABLE_ENCHANT, test x"$enable_enchant" = "xyes")
-
-dnl ================================================================
-dnl Start of pkg-config checks
-dnl ================================================================
-
-AC_MSG_CHECKING([which gtk+ version to compile against])
-AC_ARG_WITH([gtk],
-  [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 2.0)])],
-  [case "$with_gtk" in
-     2.0|3.0) ;;
-     *) AC_MSG_ERROR([invalid gtk version specified]) ;;
-   esac],
-  [with_gtk=2.0])
-AC_MSG_RESULT([$with_gtk])
-
-case "$with_gtk" in
-  2.0) GTK_API_VERSION=2.0
-       GTK_REQUIRED=2.24.0
-       ;;
-  3.0) GTK_API_VERSION=3.0
-       GTK_REQUIRED=3.0.0
-       ;;
-esac
-AC_SUBST(GTK_API_VERSION)
-
-PKG_CHECK_MODULES(GMODULE,gmodule-2.0,[GMODULE_ADD="gmodule-2.0"],[GMODULE_ADD=""])
-PKG_CHECK_MODULES(XEDIT, [
-	libxml-2.0 >= 2.5.0
-	glib-2.0 >= 2.36.0
-	$GMODULE_ADD
-	gthread-2.0 >= 2.13.0
-	gio-2.0 >= 2.26.0
-	gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
-	gtksourceview-$GTK_API_VERSION >= 2.9.7
-])
-
-PKG_CHECK_MODULES(X11, [x11])
-
-XEDIT_CFLAGS="$XEDIT_CFLAGS $X11_CFLAGS"
-XEDIT_LIBS="$XEDIT_LIBS $X11_LIBS"
-
-AC_SUBST(XEDIT_CFLAGS)
-AC_SUBST(XEDIT_LIBS)
-
-PKG_CHECK_MODULES(EGG_SMCLIENT, [sm >= 1.0.0])
-
-AC_SUBST(EGG_SMCLIENT_CFLAGS)
-AC_SUBST(EGG_SMCLIENT_LIBS)
-
-dnl ================================================================
-dnl GSettings related settings
-dnl ================================================================
-
-GLIB_GSETTINGS
-
-dnl ================================================================
-dnl Python
-dnl ================================================================
-
-AC_MSG_CHECKING([whether Python support is requested])
-AC_ARG_ENABLE([python],
-	AS_HELP_STRING([--enable-python],[Enable python support]),
-	[enable_python=$enableval have_python=$enableval],
-	[enable_python=autodetect have_python=yes])
-AC_MSG_RESULT([$enable_python])
-
-if test "x$have_python" != "xno"; then
-	AM_PATH_PYTHON([2.5],[],[no])
-	if test "x$PYTHON" = "x:"; then
-		have_python=no
-	fi
-fi
-
-if test "x$have_python" != "xno"; then
-	AM_CHECK_PYTHON_HEADERS([],[have_python=no])
-fi
-
-if test "x$have_python" != "xno"; then
-	PY_EXEC_PREFIX=`$PYTHON -c 'import sys ; print sys.exec_prefix'`
-	PYTHON_LIBS="-lpython$PYTHON_VERSION"
-
-	PY_PREFIX=`$PYTHON -c 'import sys ; print sys.prefix'`
-	PYTHON_LIB_LOC="-L$libdir/python$PYTHON_VERSION/config"
-	PYTHON_CFLAGS="-I$PY_PREFIX/include/python$PYTHON_VERSION"
-	PYTHON_MAKEFILE="$libdir/python$PYTHON_VERSION/config/Makefile"
-	PYTHON_BASEMODLIBS=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE`
-	PYTHON_OTHER_LIBS=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE`
-	PYTHON_EXTRA_LIBS="$PYTHON_BASEMODLIBS $PYTHON_OTHER_LIBS"
-
-	AC_SUBST([PYTHON_LIBS])
-	AC_SUBST([PYTHON_LIB_LOC])
-	AC_SUBST([PYTHON_CFLAGS])
-	AC_SUBST([PYTHON_EXTRA_LIBS])
-fi
-
-if test "x$have_python" != "xyes"; then
-	if test "x$enable_python" = "xyes"; then
-		AC_MSG_ERROR([Python not found])
-	elif test "x$enable_python" = "xautodetect"; then
-		enable_python=no
-		AC_MSG_WARN([Python not found, disabling python support])
-	fi
-fi
-
-if test "x$have_python" != "xno"; then
-	PYGOBJECT_REQUIRED=2.15.4
-	PYGTK_REQUIRED=2.12.0
-	PYGTKSOURCEVIEW_REQUIRED=2.9.2
-
-	PKG_CHECK_MODULES([PYGTK], [
-		pygobject-2.0 >= $PYGOBJECT_REQUIRED
-		pygtk-2.0 >= $PYGTK_REQUIRED
-		pygtksourceview-2.0 >= $PYGTKSOURCEVIEW_REQUIRED],
-		[],
-		[
-		have_python=no
-		if test "x$enable_python" = "xyes"; then
-			AC_MSG_ERROR([$PYGTK_PKG_ERRORS])
-		elif test "x$enable_python" = "xautodetect"; then
-			enable_python=no
-			AC_MSG_WARN([$PYGTK_PKG_ERRORS])
-			AC_MSG_WARN([Disabling python support])
-		fi
-		])
-fi
-
-if test "x$have_python" != "xno"; then
-	AC_MSG_CHECKING([for pygtk defs])
-	PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
-	AC_MSG_RESULT([$PYGTK_DEFSDIR])
-
-	AC_MSG_CHECKING([for pygobject defs])
-	PYGOBJECT_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygobject-2.0`
-	AC_MSG_RESULT([$PYGOBJECT_DEFSDIR])
-
-	AC_MSG_CHECKING([for pygtk codegen])
-	PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py"
-	AC_MSG_RESULT([$PYGTK_CODEGEN])
-
-	AC_MSG_CHECKING([for pygtk h2def])
-	PYGTK_H2DEF="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/h2def.py"
-	AC_MSG_RESULT([$PYGTK_H2DEF])
-
-	AC_SUBST([PYGTK_DEFSDIR])
-	AC_SUBST([PYGOBJECT_DEFSDIR])
-	AC_SUBST([PYGTK_CODEGEN])
-	AC_SUBST([PYGTK_H2DEF])
-
-	dnl Check for -fno-strict-aliasing
-	FLAGS="-fno-strict-aliasing"
-	save_CFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS $FLAGS"
-	AC_MSG_CHECKING([whether [$]CC understands $FLAGS])
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[compiler_has_option=yes],[compiler_has_option=no])
-	CFLAGS="$save_CFLAGS"
-	AC_MSG_RESULT($compiler_has_option)
-	if test $compiler_has_option = yes; then
-		NO_STRICT_ALIASING_CFLAGS="$FLAGS"
-	fi
-	AC_SUBST([NO_STRICT_ALIASING_CFLAGS])
-fi
-
-if test "x$have_python" != "xno" -a "x$enable_python" != "xno"; then
-	enable_python=yes
-	AC_DEFINE([ENABLE_PYTHON],[1],[Define to compile with python support])
-fi
-
-AM_CONDITIONAL([ENABLE_PYTHON],[test "x$enable_python" = "xyes"])
-
-dnl This allows the bug-report script to know whether python has been enabled
-AC_SUBST(enable_python)
-
-dnl ================================================================
-dnl Misc
-dnl ================================================================
-AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
-AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
-
-MATE_COMPILE_WARNINGS(yes)
-
-AC_ARG_ENABLE(deprecations,
-              [AS_HELP_STRING([--enable-deprecations],
-                              [warn about deprecated usages [default=no]])],,
-              [enable_deprecations=no])
-
-if test "x$enable_deprecations" = "xyes"; then
-   DISABLE_DEPRECATED_CFLAGS="\
-DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DMATE_DISABLE_DEPRECATED"
-   AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
-fi
-
-AC_ARG_ENABLE([tests],
-	AS_HELP_STRING([--enable-tests], [Enable the tests]),
-	[enable_tests=$enableval],
-	[enable_tests=yes])
-
-AM_CONDITIONAL(ENABLE_TESTS, test x$enable_tests = xyes)
-
-PLUGIN_LIBTOOL_FLAGS="-module -avoid-version"
-LOADER_LIBTOOL_FLAGS="-module -avoid-version"
-
-AC_SUBST(PLUGIN_LIBTOOL_FLAGS)
-AC_SUBST(LOADER_LIBTOOL_FLAGS)
-
-XEDIT_PLUGINS_DATA_DIR="$datadir/xedit/plugins"
-AC_SUBST(XEDIT_PLUGINS_DATA_DIR)
-
-XEDIT_PLUGINS_LIBS_DIR="$libdir/xedit/plugins"
-AC_SUBST(XEDIT_PLUGINS_LIBS_DIR)
-
-YELP_HELP_INIT
-
-AC_CONFIG_FILES([
-Makefile
-data/xedit.desktop.in
-data/xedit-bugreport.sh
-data/xedit.pc
-data/org.x.editor.gschema.xml
-data/Makefile
-docs/Makefile
-docs/reference/Makefile
-xedit/dialogs/Makefile
-xedit/smclient/Makefile
-xedit/Makefile
-help/Makefile
-pixmaps/Makefile
-plugin-loaders/Makefile
-plugin-loaders/c/Makefile
-plugin-loaders/python/Makefile
-plugin-loaders/python/bindings/Makefile
-plugins/Makefile
-plugins/changecase/Makefile
-plugins/docinfo/Makefile
-plugins/filebrowser/Makefile
-plugins/filebrowser/org.x.editor.plugins.filebrowser.gschema.xml
-plugins/modelines/Makefile
-plugins/sort/Makefile
-plugins/spell/Makefile
-plugins/spell/org.x.editor.plugins.spell.gschema.xml
-plugins/taglist/Makefile
-plugins/time/Makefile
-plugins/time/org.x.editor.plugins.time.gschema.xml
-plugins/trailsave/Makefile
-po/Makefile.in
-tests/Makefile
-])
-
-AC_OUTPUT
-
-echo "
-
-Configuration:
-
-	Source code location:	${srcdir}
-	Compiler:		${CC}
-	GTK API version:	$GTK_API_VERSION
-	Python Plugins Support: $enable_python
-	Spell Plugin enabled:	$enable_enchant
-	Gvfs metadata enabled:	$enable_gvfs_metadata
-	Tests enabled:		$enable_tests
-"
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,38 +0,0 @@
-desktopdir 	 = $(datadir)/applications
-desktop_in_files = xedit.desktop.in
-desktop_DATA 	 = $(desktop_in_files:.desktop.in=.desktop)
-@INTLTOOL_DESKTOP_RULE@
-
-@INTLTOOL_XML_RULE@
-appdatadir = $(datadir)/appdata
-appdata_in_files = xedit.appdata.xml.in
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-
-gsettings_SCHEMAS = org.x.editor.gschema.xml
-@GSETTINGS_RULES@
-
-man_MANS = xedit.1
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = xedit.pc
-
-bugreportdir = $(libexecdir)/xedit
-bugreport_SCRIPTS = xedit-bugreport.sh
-
-EXTRA_DIST = 			\
-	$(appdata_in_files)	\
-	$(desktop_in_files)	\
-	$(man_MANS)			\
-	xedit.pc.in			\
-	xedit-bugreport.sh.in
-
-CLEANFILES =	 			\
-	$(desktop_DATA)			\
-	$(gsettings_SCHEMAS)	\
-	$(pkgconfig_DATA)		\
-	$(appdata_DATA)
-
-
-
-
-include $(top_srcdir)/git.mk
--- a/data/meson.build
+++ b/data/meson.build
@@ -0,0 +1,42 @@
+desktop = custom_target(
+    'desktop',
+    input: 'xed.desktop.in.in',
+    output: 'xed.desktop',
+    command: [intltool_merge, '-d', '-u', po_dir, '@INPUT@', '@OUTPUT@'],
+    install: true,
+    install_dir: desktopdir,
+)
+
+appdata = custom_target(
+    'appdata',
+    input: 'xed.appdata.xml.in',
+    output: 'xed.appdata.xml',
+    command: [intltool_merge, '-x', '-u', po_dir, '@INPUT@', '@OUTPUT@'],
+    install: true,
+    install_dir: join_paths(datadir, 'metainfo'),
+)
+
+schema_conf = configuration_data()
+schema_conf.set('GETTEXT_PACKAGE', 'xed')
+
+schema_file = configure_file(
+    input: 'org.x.editor.gschema.xml.in',
+    output: 'org.x.editor.gschema.xml',
+    configuration: schema_conf,
+    install_dir: join_paths(datadir, 'glib-2.0', 'schemas')
+)
+
+service_conf = configuration_data()
+service_conf.set('bindir', join_paths(prefix, bindir))
+
+configure_file(
+    input: 'org.x.editor.service.in',
+    output: 'org.x.editor.service',
+    configuration: service_conf,
+    install_dir: join_paths(datadir, 'dbus-1', 'services')
+)
+
+install_data(
+    'xed.1',
+    install_dir : join_paths(get_option('prefix'), get_option('mandir'), 'man1')
+)
--- a/data/org.x.editor.gschema.xml.in
+++ b/data/org.x.editor.gschema.xml.in
@@ -1,200 +1,378 @@
 <?xml version="1.0"?>
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
-  <schema id="org.x.editor" path="/org.x.editor/">
+<schemalist>
+  <enum id="org.x.editor.WrapMode">
+    <value nick="none" value="0"/>
+    <value nick="char" value="1"/>
+    <value nick="word" value="2"/>
+    <value nick="word-char" value="3"/>
+  </enum>
+
+  <enum id="org.x.editor.SmartHomeEnd">
+    <value nick="disabled" value="0"/>
+    <value nick="before" value="1"/>
+    <value nick="after" value="2"/>
+    <value nick="always" value="3"/>
+  </enum>
+
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.x.editor" path="/org/x/editor/">
+    <child name="preferences" schema="org.x.editor.preferences"/>
+    <child name="state" schema="org.x.editor.state"/>
+    <child name="plugins" schema="org.x.editor.plugins"/>
+  </schema>
+
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.x.editor.preferences" path="/org/x/editor/preferences/">
+    <child name="editor" schema="org.x.editor.preferences.editor"/>
+    <child name="ui" schema="org.x.editor.preferences.ui"/>
+    <child name="print" schema="org.x.editor.preferences.print"/>
+    <child name="encodings" schema="org.x.editor.preferences.encodings"/>
+  </schema>
+
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.x.editor.preferences.editor" path="/org/x/editor/preferences/editor/">
+
    <key name="use-default-font" type="b">
      <default>true</default>
      <summary>Use Default Font</summary>
-      <description>Whether to use the system's default fixed width font for editing text instead of a font specific to xedit.  If this option is turned off, then the font named in the "Editor Font" option will be used instead of the system font.</description>
+      <description>Whether to use the system's default fixed width font for editing text instead of a font specific to xed.  If this option is turned off, then the font named in the "Editor Font" option will be used instead of the system font.</description>
    </key>
+
    <key name="editor-font" type="s">
      <default context="editor-font" l10n="messages">'Monospace 12'</default>
      <summary>Editor Font</summary>
      <description>A custom font that will be used for the editing area. This will only take effect if the "Use Default Font" option is turned off.</description>
    </key>
-    <key name="color-scheme" type="s">
+
+    <key name="prefer-dark-theme" type="b">
+      <default>false</default>
+      <summary>Prefer Dark Theme</summary>
+      <description>Whether xed should prefer the dark variation of the current Gtk theme if available.</description>
+    </key>
+
+    <key name="scheme" type="s">
      <default>'tango'</default>
      <summary>Style Scheme</summary>
      <description>The ID of a GtkSourceView Style Scheme used to color the text.</description>
    </key>
+
    <key name="create-backup-copy" type="b">
      <default>false</default>
      <summary>Create Backup Copies</summary>
-      <description>Whether xedit should create backup copies for the files it saves.  You can set the backup file extension with the "Backup Copy Extension" option.</description>
+      <description>Whether xed should create backup copies for the files it saves.  You can set the backup file extension with the "Backup Copy Extension" option.</description>
    </key>
+
    <key name="auto-save" type="b">
      <default>false</default>
      <summary>Autosave</summary>
-      <description>Whether xedit should automatically save modified files after a time interval.  You can set the time interval with the "Autosave Interval" option.</description>
+      <description>Whether xed should automatically save modified files after a time interval.  You can set the time interval with the "Autosave Interval" option.</description>
    </key>
-    <key name="auto-save-interval" type="i">
+
+    <key name="auto-save-interval" type="u">
      <default>10</default>
      <summary>Autosave Interval</summary>
-      <description>Number of minutes after which xedit will automatically save modified files.  This will only take effect if the "Autosave" option is turned on.</description>
+      <description>Number of minutes after which xed will automatically save modified files.  This will only take effect if the "Autosave" option is turned on.</description>
    </key>
+
    <key name="writable-vfs-schemes" type="as">
      <default>[ 'dav', 'davs', 'ftp', 'sftp', 'smb', 'ssh' ]</default>
      <summary>Writable VFS schemes</summary>
-      <description>List of VFS schemes xedit supports in write mode. The 'file' scheme is writable by default.</description>
+      <description>List of VFS schemes xed supports in write mode. The 'file' scheme is writable by default.</description>
    </key>
+
    <key name="max-undo-actions" type="i">
      <default>2000</default>
      <summary>Maximum Number of Undo Actions</summary>
-      <description>Maximum number of actions that xedit will be able to undo or redo. Use "-1" for unlimited number of actions.</description>
+      <description>Maximum number of actions that xed will be able to undo or redo. Use "-1" for unlimited number of actions.</description>
    </key>
-    <key name="wrap-mode" type="s">
-      <default>'GTK_WRAP_WORD'</default>
+
+    <key name="wrap-mode" enum="org.x.editor.WrapMode">
+      <default>'word'</default>
      <summary>Line Wrapping Mode</summary>
-      <description>Specifies how to wrap long lines in the editing area. Use "GTK_WRAP_NONE" for no wrapping, "GTK_WRAP_WORD" for wrapping at word boundaries, and "GTK_WRAP_CHAR" for wrapping at individual character boundaries.  Note that the values are case-sensitive, so make sure they appear exactly as mentioned here.</description>
+      <description>Specifies how to wrap long lines in the editing area. Use "none" for no wrapping, "word" for wrapping at word boundaries, and "char" for wrapping at individual character boundaries.  Note that the values are case-sensitive, so make sure they appear exactly as mentioned here.</description>
    </key>
-    <key name="tabs-size" type="i">
+
+    <key name="tabs-size" type="u">
      <default>4</default>
      <summary>Tab Size</summary>
      <description>Specifies the number of spaces that should be displayed instead of Tab characters.</description>
    </key>
+
    <key name="insert-spaces" type="b">
-      <default>false</default>
+      <default>true</default>
      <summary>Insert spaces</summary>
-      <description>Whether xedit should insert spaces instead of tabs.</description>
+      <description>Whether xed should insert spaces instead of tabs.</description>
    </key>
+
    <key name="auto-indent" type="b">
      <default>false</default>
      <summary>Automatic indent</summary>
-      <description>Whether xedit should enable automatic indentation.</description>
+      <description>Whether xed should enable automatic indentation.</description>
    </key>
+
    <key name="display-line-numbers" type="b">
      <default>false</default>
      <summary>Display Line Numbers</summary>
-      <description>Whether xedit should display line numbers in the editing area.</description>
+      <description>Whether xed should display line numbers in the editing area.</description>
    </key>
+
    <key name="highlight-current-line" type="b">
      <default>false</default>
      <summary>Highlight Current Line</summary>
-      <description>Whether xedit should highlight the current line.</description>
+      <description>Whether xed should highlight the current line.</description>
    </key>
+
    <key name="bracket-matching" type="b">
      <default>false</default>
      <summary>Highlight Matching Bracket</summary>
-      <description>Whether xedit should highlight the bracket matching the selected one.</description>
+      <description>Whether xed should highlight the bracket matching the selected one.</description>
    </key>
+
    <key name="display-right-margin" type="b">
      <default>false</default>
      <summary>Display Right Margin</summary>
-      <description>Whether xedit should display the right margin in the editing area.</description>
+      <description>Whether xed should display the right margin in the editing area.</description>
    </key>
-    <key name="right-margin-position" type="i">
-      <default>80</default>
+
+    <key name="right-margin-position" type="u">
+      <default>120</default>
      <summary>Right Margin Position</summary>
      <description>Specifies the position of the right margin.</description>
    </key>
-    <key name="smart-home-end" type="s">
+
+    <key name="smart-home-end" enum="org.x.editor.SmartHomeEnd">
      <default>'after'</default>
      <summary>Smart Home End</summary>
-      <description>Specifies how the cursor moves when the HOME and END keys are pressed. Use "DISABLED" to always move at the start/end of the line, "AFTER" to move to the start/end of the line the first time the keys are pressed and to the start/end of the text ignoring whitespaces the second time the keys are pressed, "BEFORE" to move to the start/end of the text before moving to the start/end of the line and "ALWAYS" to always move to the start/end of the text instead of the start/end of the line.</description>
+      <description>Specifies how the cursor moves when the HOME and END keys are pressed. Use "disabled" to always move at the start/end of the line, "after" to move to the start/end of the line the first time the keys are pressed and to the start/end of the text ignoring whitespaces the second time the keys are pressed, "before" to move to the start/end of the text before moving to the start/end of the line and "always" to always move to the start/end of the text instead of the start/end of the line.</description>
    </key>
+
    <key name="restore-cursor-position" type="b">
      <default>true</default>
      <summary>Restore Previous Cursor Position</summary>
-      <description>Whether xedit should restore the previous cursor position when a file is loaded.</description>
+      <description>Whether xed should restore the previous cursor position when a file is loaded.</description>
    </key>
-    <key name="enable-search-highlighting" type="b">
+
+    <key name="search-highlighting" type="b">
      <default>true</default>
      <summary>Enable Search Highlighting</summary>
-      <description>Whether xedit should highlight all the occurrences of the searched text.</description>
+      <description>Whether xed should highlight all the occurrences of the searched text.</description>
    </key>
-    <key name="enable-syntax-highlighting" type="b">
+
+    <key name="syntax-highlighting" type="b">
      <default>true</default>
      <summary>Enable Syntax Highlighting</summary>
-      <description>Whether xedit should enable syntax highlighting.</description>
+      <description>Whether xed should enable syntax highlighting.</description>
    </key>
+
+    <key name="ensure-trailing-newline" type="b">
+      <default>true</default>
+      <summary>Ensure Trailing Newline</summary>
+      <description>Whether xed will ensure that documents always end with a trailing newline.</description>
+    </key>
+
+    <key name="draw-whitespace" type="b">
+      <default>false</default>
+      <summary>Draw whitespace</summary>
+      <description>Whether xed should render whitespace</description>
+    </key>
+
+    <key name="draw-whitespace-leading" type="b">
+      <default>false</default>
+      <summary>Draw leading whitespace</summary>
+      <description>Whether xed should render leading whitespace</description>
+    </key>
+
+    <key name="draw-whitespace-inside" type="b">
+      <default>false</default>
+      <summary>Draw whitespace within text</summary>
+      <description>Whether xed should render whitespace between words and characters</description>
+    </key>
+
+    <key name="draw-whitespace-trailing" type="b">
+      <default>false</default>
+      <summary>Draw trailing whitespace</summary>
+      <description>Whether xed should render trailing whitespace</description>
+    </key>
+
+    <key name="draw-whitespace-newline" type="b">
+      <default>false</default>
+      <summary>Draw newline characters</summary>
+      <description>Whether xed should render newline characters</description>
+    </key>
+
+  </schema>
+
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.x.editor.preferences.ui" path="/org/x/editor/preferences/ui/">
+
    <key name="toolbar-visible" type="b">
      <default>true</default>
      <summary>Toolbar is Visible</summary>
      <description>Whether the toolbar should be visible in editing windows.</description>
    </key>
-    <key name="toolbar-buttons-style" type="s">
-      <default>'@TOOLBAR_STYLE@'</default>
-      <summary>Toolbar Buttons Style</summary>
-      <description>Style for the toolbar buttons.  Possible values are "XEDIT_TOOLBAR_SYSTEM" to use the system's default style, "XEDIT_TOOLBAR_ICONS" to display icons only, "XEDIT_TOOLBAR_ICONS_AND_TEXT" to display both icons and text, and "XEDIT_TOOLBAR_ICONS_BOTH_HORIZ" to display prioritized text beside icons. Note that the values are case-sensitive, so make sure they appear exactly as mentioned here.</description>
-    </key>
+
    <key name="statusbar-visible" type="b">
      <default>true</default>
      <summary>Status Bar is Visible</summary>
      <description>Whether the status bar at the bottom of editing windows should be visible.</description>
    </key>
-    <key name="side-pane-visible" type="b">
+
+    <key name="side-panel-visible" type="b">
      <default>false</default>
      <summary>Side Pane is Visible</summary>
      <description>Whether the side pane at the left of editing windows should be visible.</description>
    </key>
+
    <key name="bottom-panel-visible" type="b">
      <default>false</default>
      <summary>Bottom Panel is Visible</summary>
      <description>Whether the bottom panel at the bottom of editing windows should be visible.</description>
    </key>
-    <key name="max-recents" type="i">
+
+    <key name="enable-tab-scrolling" type="b">
+      <default>true</default>
+      <summary>Allow changing active tabs by scrolling</summary>
+      <description>Whether you can change active tabs by scrolling.</description>
+    </key>
+
+    <key name="minimap-visible" type="b">
+      <default>false</default>
+      <summary>Minimap is visible</summary>
+      <description>Whether the minimap for the document should be visible.</description>
+    </key>
+
+    <key name="max-recents" type="u">
      <default>5</default>
      <summary>Maximum Recent Files</summary>
      <description>Specifies the maximum number of recently opened files that will be displayed in the "Recent Files" submenu.</description>
    </key>
+
+  </schema>
+
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.x.editor.preferences.print" path="/org/x/editor/preferences/print/">
+
    <key name="print-syntax-highlighting" type="b">
      <default>true</default>
      <summary>Print Syntax Highlighting</summary>
-      <description>Whether xedit should print syntax highlighting when printing documents.</description>
+      <description>Whether xed should print syntax highlighting when printing documents.</description>
    </key>
+
    <key name="print-header" type="b">
      <default>true</default>
      <summary>Print Header</summary>
-      <description>Whether xedit should include a document header when printing documents.</description>
+      <description>Whether xed should include a document header when printing documents.</description>
    </key>
-    <key name="print-wrap-mode" type="s">
-      <default>'GTK_WRAP_WORD'</default>
+
+    <key name="print-wrap-mode" enum="org.x.editor.WrapMode">
+      <default>'word'</default>
      <summary>Printing Line Wrapping Mode</summary>
-      <description>Specifies how to wrap long lines for printing.  Use "GTK_WRAP_NONE" for no wrapping, "GTK_WRAP_WORD" for wrapping at word boundaries, and "GTK_WRAP_CHAR" for wrapping at individual character boundaries.  Note that the values are case-sensitive, so make sure they appear exactly as mentioned here.</description>
+      <description>Specifies how to wrap long lines for printing.  Use "none" for no wrapping, "word" for wrapping at word boundaries, and "char" for wrapping at individual character boundaries.  Note that the values are case-sensitive, so make sure they appear exactly as mentioned here.</description>
    </key>
-    <key name="print-line-numbers" type="i">
+
+    <key name="print-line-numbers" type="u">
      <default>0</default>
      <summary>Print Line Numbers</summary>
-      <description>If this value is 0, then no line numbers will be inserted when printing a document.  Otherwise, xedit will print line numbers every such number of lines.</description>
+      <description>If this value is 0, then no line numbers will be inserted when printing a document.  Otherwise, xed will print line numbers every such number of lines.</description>
    </key>
+
    <key name="print-font-body-pango" type="s">
      <default context="print-font-body-pango" l10n="messages">'Monospace 9'</default>
      <summary>Body Font for Printing</summary>
      <description>Specifies the font to use for a document's body when printing documents.</description>
    </key>
+
    <key name="print-font-header-pango" type="s">
      <default context="print-font-header-pango" l10n="messages">'Sans 11'</default>
      <summary>Header Font for Printing</summary>
      <description>Specifies the font to use for page headers when printing a document. This will only take effect if the "Print Header" option is turned on.</description>
    </key>
+
    <key name="print-font-numbers-pango" type="s">
      <default context="print-font-numbers-pango" l10n="messages">'Sans 8'</default>
      <summary>Line Number Font for Printing</summary>
      <description>Specifies the font to use for line numbers when printing.  This will only take effect if the "Print Line Numbers" option is non-zero.</description>
    </key>
-    <key name="auto-detected-encodings" type="as">
+
+  </schema>
+
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.x.editor.preferences.encodings" path="/org/x/editor/preferences/encodings/">
+
+    <key name="auto-detected" type="as">
      <default context="auto-detected" l10n="messages">[ 'UTF-8', 'CURRENT', 'ISO-8859-15', 'UTF-16' ]</default>
      <summary>Automatically Detected Encodings</summary>
-      <description>Sorted list of encodings used by xedit for automatically detecting the encoding of a file. "CURRENT" represents the current locale encoding. Only recognized encodings are used.</description>
+      <description>Sorted list of encodings used by xed for automatically detecting the encoding of a file. "CURRENT" represents the current locale encoding. Only recognized encodings are used.</description>
    </key>
-    <key name="shown-in-menu-encodings" type="as">
+
+    <key name="shown-in-menu" type="as">
      <default context="shown-in-menu" l10n="messages">[ 'ISO-8859-15' ]</default>
      <summary>Encodings shown in menu</summary>
      <description>List of encodings shown in the Character Encoding menu in open/save file selector. Only recognized encodings are used.</description>
    </key>
+
+  </schema>
+
+  <schema id="org.x.editor.state" path="/org/x/editor/state/">
+    <child name="window" schema="org.x.editor.state.window"/>
+    <child name="file-filter" schema="org.x.editor.state.file-filter"/>
+    <child name="history-entry" schema="org.x.editor.state.history-entry"/>
+  </schema>
+
+  <schema id="org.x.editor.state.window" path="/org/x/editor/state/window/">
+
+    <key name="state" type="i">
+      <default>0</default>
+    </key>
+
+    <key name="size" type="(ii)">
+      <default>(650,500)</default>
+    </key>
+
+    <key name="side-panel-size" type="i">
+      <default>200</default>
+    </key>
+
+    <key name="side-panel-active-page" type="i">
+      <default>0</default>
+    </key>
+
+    <key name="bottom-panel-size" type="i">
+      <default>140</default>
+    </key>
+
+    <key name="bottom-panel-active-page" type="i">
+      <default>0</default>
+    </key>
+
+  </schema>
+
+  <schema id="org.x.editor.state.file-filter" path="/org/x/editor/state/file-filter/">
+
+    <key name="filter-id" type="i">
+      <default>0</default>
+    </key>
+
+  </schema>
+
+  <schema id="org.x.editor.state.history-entry" path="/org/x/editor/state/history-entry/">
+
    <key name="history-search-for" type="as">
      <default>[]</default>
      <summary>History for "search for" entries</summary>
      <description>List of entries in "search for" textbox.</description>
    </key>
+
    <key name="history-replace-with" type="as">
      <default>[]</default>
      <summary>History for "replace with" entries</summary>
      <description>List of entries in "replace with" textbox.</description>
    </key>
+
+  </schema>
+
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.x.editor.plugins" path="/org/x/editor/plugins/">
+
    <key name="active-plugins" type="as">
      <default>[ 'docinfo', 'modelines', 'filebrowser', 'spell', 'time' ]</default>
      <summary>Active plugins</summary>
-      <description>List of active plugins. It contains the "Location" of the active plugins. See the .xedit-plugin file for obtaining the "Location" of a given plugin.</description>
+      <description>List of active plugins. It contains the "Location" of the active plugins. See the .xed-plugin file for obtaining the "Location" of a given plugin.</description>
    </key>
+
  </schema>
+
 </schemalist>
--- a/data/org.x.editor.service.in
+++ b/data/org.x.editor.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.x.editor
+Exec=@bindir@/xed
--- a/data/xed.1
+++ b/data/xed.1
@@ -0,0 +1,72 @@
+.\" Man page for Xed.
+.TH XED 1
+.\"
+.SH "NAME"
+Xed \- The Text Editor
+.SH "SYNOPSIS"
+.B xed [OPTIONS...] [FILES...]
+.SH "DESCRIPTION"
+Xed is the official text editor of the X-APPS project, which aims to provide applications to the Cinnamon, MATE and Xfce desktops. While aiming at simplicity and ease of use, Xed is a powerful general purpose text editor. It can be used to create and edit all sorts of text files.
+.PP
+Xed features a flexible plugin system which can be used to dynamically add new advanced features to Xed itself.
+.PP
+This manual page briefly documents the \fBxed\fR command.
+
+.SH "OPTIONS"
+.TP
+\fBfilename(s)...\fR
+Specifies the file to open when \fBxed\fR starts. If this is not specified, \fBxed\fR will start a new, blank file with an "Unsaved Document" label. Multiple files can be loaded if they are separated by spaces. \fBxed\fR also supports handling of remote files.
+.TP
+\fB\-\-display=DISPLAY\fR
+X display to use.
+.TP
+\fB\-\-encoding\fR
+Set the character encoding to be used for opening the files listed on the command line.
+.TP
+\fB\-\-new\-window\fR
+Create a new toplevel window in an existing instance of \fBxed\fR.
+.TP
+\fB\-\-new\-document\fR
+Create a new document in an existing instance of \fBxed\fR, on the last Xed window that had focus.
+.TP
+\fB+[num]\fR
+For the first file, go to the line specified by "num" (do not insert a space between the "+" sign and the number).
+If "num" is missing, go to the last line.
+.TP
+\fB\-\-list-encodings\fR
+Display list of possible values for the encoding option and exit
+.TP
+\fB\-\-version\fR
+Output version information and exit
+.TP
+\fB\-?, \-h, \-\-help\fR
+Print standard command line options.
+.TP
+\fB\-\-help\-all\fR
+Print all command line options.
+.P
+This program also accepts the standard GTK options.
+
+.SH "EXAMPLES"
+\fBxed \-\-encoding WINDOWS-1252 ftp://ftp.kernel.org/pub/linux/kernel/README\fR
+.RS 4
+Open the Linux Kernel README file from kernel.org's FTP server using Windows-1252 character encoding.
+.RE
+.PP
+\fBxed +156 http://www.some-website.com/\fR
+.RS 4
+Open the main web page of some-website.com and jump to line 156.
+.RE
+.PP
+\fBxed \-\-new\-window ~/.bashrc ~/.bash_history\fR
+.RS 4
+Open the current users .bashrc and .bash_history files in a new window.
+
+.SH "BUGS"
+.SS Should you encounter any bugs, they may be reported at: 
+http://github.com/linuxmint/xed/issues
+
+.fi
+.SH "SEE ALSO"
+.SS
+Xed documentation can be found from the "Help" menu, or by pressing the F1 key. 
--- a/data/xedit.appdata.xml.in
+++ b/data/xedit.appdata.xml.in
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
- <id>xedit.desktop</id>
+ <id>xed.desktop</id>
 <metadata_license>CC0-1.0</metadata_license>
 <project_license>GPL-2.0+</project_license>
- <name>Xedit</name>
+ <name>Xed</name>
 <_summary>A Text Editor</_summary>
 <_description>
  <p>
-   Xedit is a small, but powerful text editor. It has most standard text editor functions and fully
+   Xed is a small, but powerful text editor. It has most standard text editor functions and fully
   supports international text in Unicode. Advanced features include syntax
   highlighting and automatic indentation of source code, printing and editing
   of multiple documents in one window.
  </p>
  <p>
-   Xedit is extensible through a plugin system, which currently includes
+   Xed is extensible through a plugin system, which currently includes
   support for spell checking, comparing files, viewing CVS ChangeLogs, and
   adjusting indentation levels.
  </p>
 </_description>
- <url type="homepage">http://www.github.com/linuxmint/xedit</url>
+ <url type="homepage">http://www.github.com/linuxmint/xed</url>
 <updatecontact>root@linuxmint.com</updatecontact>
 <project_group>X-Apps</project_group>
 </component>
--- a/data/xedit.desktop.in.in
+++ b/data/xedit.desktop.in.in
@@ -1,12 +1,12 @@
 [Desktop Entry]
 _Name=Text Editor
 _Comment=Edit text files
-Exec=xedit %U
+Exec=xed %U
 Terminal=false
 Type=Application
 StartupNotify=true
 MimeType=text/plain;
 Icon=accessories-text-editor
 Categories=GTK;Utility;TextEditor;
-Keywords=text;editor;tabs;highlighting;code;multiple;files;pluggable;
-X-MATE-DocPath=xedit/xedit.xml
+Keywords=text;editor;tabs;highlighting;code;multiple;files;pluggable;notepad;
+X-MATE-DocPath=xed/xed.xml
--- a/data/xedit-bugreport.sh.in
+++ b/data/xedit-bugreport.sh.in
@@ -1,73 +0,0 @@
-#!/bin/sh
-
-ENABLE_PYTHON=@enable_python@
-
-PKG_CONFIG_MODULES="glib-2.0 gtk+-2.0 gtksourceview-2.0 \
-		    pygobject-2.0 pygtk-2.0 \
-		    pygtksourceview-2.0 enchant iso-codes"
-
-echo_padded ()
-{
-	echo -n "  - $1 "
-	N=$(echo -n $1 | wc -m)
-	while test $N -le 20
-	do
-		echo -n " "
-		N=`expr $N + 1`
-	done
-}
-
-if (which gsettings >/dev/null)
-then
-	echo "GSettings configuration dump:"
-	gsettings list-recursively org.x.editor
-	echo
-fi
-
-echo "Active plugins:"
-gsettings get org.x.editor active-plugins 				\
-	| sed -r -e 's/^\[(.*)\]$/\1/' -e 's/, /\n/g'			\
-	| sed -e 's/^.*$/  - \0/'
-echo
-
-# Manually installed plugins (in $HOME)
-if [ -d $HOME/.config/xedit/plugins ]
-then
-	echo "Plugins in \$HOME:"
-	ls $HOME/.config/xedit/plugins/*.xedit-plugin			\
-		| sed -r -e 's#.*/([^/]*)\.xedit-plugin$#  - \1#'
-else
-	echo "No plugin installed in \$HOME."
-fi
-echo
-
-echo "Module versions:"
-if (which pkg-config > /dev/null)
-then
-	for i in $PKG_CONFIG_MODULES
-	do
-		echo_padded "`echo -n $i | sed -r -e 's/^(.*)-[0-9]\.[0-9]$/\1/'`"
-		pkg-config --modversion $i 2>/dev/null || echo
-	done
-else
-	echo "  pkg-config unavailable"
-fi
-echo
-
-echo "Python module versions:"
-if test "$ENABLE_PYTHON" = "yes"
-then
-	echo_padded "python"
-	python -V 2>&1 | cut -c8-
-
-	echo_padded "pygtk"
-	python -c "import gtk, sys; \
-		   sys.stdout.write('%d.%d.%d ' % gtk.pygtk_version); \
-		   sys.stdout.write('(GTK+ %d.%d.%d)' % gtk.gtk_version)" \
-		   2>/dev/null
-	echo
-else
-	echo "  Python support was not enabled at compile time."
-fi
-echo
-
--- a/data/xedit.1
+++ b/data/xedit.1
@@ -1,72 +0,0 @@
-.\" Man page for Xedit.
-.TH XEDIT 1
-.\"
-.SH "NAME"
-Xedit \- The Text Editor
-.SH "SYNOPSIS"
-.B xedit [OPTIONS...] [FILES...]
-.SH "DESCRIPTION"
-Xedit is the official text editor of the X-APPS project, which aims to provide applications to the Cinnamon, MATE and Xfce desktops. While aiming at simplicity and ease of use, Xedit is a powerful general purpose text editor. It can be used to create and edit all sorts of text files.
-.PP
-Xedit features a flexible plugin system which can be used to dynamically add new advanced features to Xedit itself.
-.PP
-This manual page briefly documents the \fBxedit\fR command.
-
-.SH "OPTIONS"
-.TP
-\fBfilename(s)...\fR
-Specifies the file to open when \fBxedit\fR starts. If this is not specified, \fBxedit\fR will start a new, blank file with an "Unsaved Document" label. Multiple files can be loaded if they are separated by spaces. \fBxedit\fR also supports handling of remote files.
-.TP
-\fB\-\-display=DISPLAY\fR
-X display to use.
-.TP
-\fB\-\-encoding\fR
-Set the character encoding to be used for opening the files listed on the command line.
-.TP
-\fB\-\-new\-window\fR
-Create a new toplevel window in an existing instance of \fBxedit\fR.
-.TP
-\fB\-\-new\-document\fR
-Create a new document in an existing instance of \fBxedit\fR, on the last Xedit window that had focus.
-.TP
-\fB+[num]\fR
-For the first file, go to the line specified by "num" (do not insert a space between the "+" sign and the number).
-If "num" is missing, go to the last line.
-.TP
-\fB\-\-list-encodings\fR
-Display list of possible values for the encoding option and exit
-.TP
-\fB\-\-version\fR
-Output version information and exit
-.TP
-\fB\-?, \-h, \-\-help\fR
-Print standard command line options.
-.TP
-\fB\-\-help\-all\fR
-Print all command line options.
-.P
-This program also accepts the standard GTK options.
-
-.SH "EXAMPLES"
-\fBxedit \-\-encoding WINDOWS-1252 ftp://ftp.kernel.org/pub/linux/kernel/README\fR
-.RS 4
-Open the Linux Kernel README file from kernel.org's FTP server using Windows-1252 character encoding.
-.RE
-.PP
-\fBxedit +156 http://www.some-website.com/\fR
-.RS 4
-Open the main web page of some-website.com and jump to line 156.
-.RE
-.PP
-\fBxedit \-\-new\-window ~/.bashrc ~/.bash_history\fR
-.RS 4
-Open the current users .bashrc and .bash_history files in a new window.
-
-.SH "BUGS"
-.SS Should you encounter any bugs, they may be reported at: 
-http://github.com/linuxmint/xedit/issues
-
-.fi
-.SH "SEE ALSO"
-.SS
-Xedit documentation can be found from the "Help" menu, or by pressing the F1 key. 
--- a/data/xedit.pc.in
+++ b/data/xedit.pc.in
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-pluginsdir=@libdir@/xedit/plugins
-
-Name: xedit
-Description: xedit
-Requires: gtksourceview-@GTK_API_VERSION@
-Version: @VERSION@
-Cflags: -I${includedir}/xedit
-Libs: -L${libdir}
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,642 @@
-xedit (1.0.1) sarah; urgency=medium
+xed (2.4.3) tricia; urgency=medium
+
+  [ okaestne ] [backported by wolfpackmars2]
+  * Implement #225: Options to render whitespace 
+  * backported from xed-3
+
+xed (2.4.2) tricia; urgency=medium
+
+  * l10n: Update translations
+
+ -- Clement Lefebvre <root@linuxmint.com>  Wed, 11 Dec 2019 14:49:32 +0000
+
+xed (2.4.1) tricia; urgency=medium
+
+  * l10n: Update translations
+
+ -- Clement Lefebvre <root@linuxmint.com>  Tue, 26 Nov 2019 17:14:23 +0000
+
+xed (2.4.0) tricia; urgency=medium
+
+  [ Michael Webster ]
+  * print-preview: add a print button to the preview toolbar, to immediately print the previewed document.
+
+  [ nardholio ]
+  * Packaging: remove dependency on libpeas-1.0-0-python3loader (#325)
+
+  [ Pavel Shlyak ]
+  * Cleanup (#321)
+
+  [ Leigh Scott ]
+  * add open uri plugin (#317)
+
+  [ Clement Lefebvre ]
+  * open-uri: Make the plugin built-in
+  * open-uri: Simplify and fix translations
+  * Print preview: Reuse existing msgid
+
+ -- Clement Lefebvre <root@linuxmint.com>  Fri, 22 Nov 2019 12:12:12 +0000
+
+xed (2.2.3) tina; urgency=medium
+
+  * l10n: Update translations
+
+ -- Clement Lefebvre <root@linuxmint.com>  Sun, 28 Jul 2019 15:03:33 +0200
+
+xed (2.2.2) tina; urgency=medium
+
+  * Preferences: Make dialog slightly taller
+
+ -- Clement Lefebvre <root@linuxmint.com>  Thu, 25 Jul 2019 10:59:55 +0200
+
+xed (2.2.1) tina; urgency=medium
+
+  [ Alexander Drozdov ]
+  * Automatically open new Xed window on current workspace... (#319)
+
+  [ Clement Lefebvre ]
+  * l10n: Update translations
+
+ -- Clement Lefebvre <root@linuxmint.com>  Wed, 10 Jul 2019 11:26:12 +0200
+
+xed (2.2.0) tina; urgency=medium
+
+  [ Eli Schwartz ]
+  * meson: require itstool command to be available (#266)
+
+  [ JosephMcc ]
+  * statusbar: Fix the menu button styling (#281)
+  * cleanup: Remove an unused Makefile.am (#280)
+
+  [ Stephen Collins ]
+  * print preview: fix layout drawing for 1X2 and 2X1 layouts (#291)
+  * Filebrowser: Kill the click policy property with fire (#293)
+
+  [ JosephMcc ]
+  * xed-window: Fix the tabs/spaces label in the statusbar (#283)
+  * xed-notebook: Always show the main notebook tabs (#285)
+
+  [ Stephen Collins ]
+  * Fix some deprecation warnings (#289)
+  * print preview: fix logic for forward button sensitivity (#292)
+  * Add toggle comment and toggle comment block actions w/ keybindings (#290)
+
+  [ Clement Lefebvre ]
+  * l10n: Update POT
+
+  [ Stephen Collins ]
+  * print job: replace some deprecated font button functions (#294)
+  * Replace deprecated gdk_cursor_new with gdk_cursor_new_for_display (#295)
+  * Print preview: remove a couple calls to gtk_adjustment_value_changed (#296)
+  * Search: replace a few functions that were deprecated in Gtk 3.22 (#297)
+  * Fix stuttering and disappearing of the toolbar when fullscreen (#300)
+  * Switch deprecated gtk_icon_info_free to g_object_unref (#301)
+  * Remove references to deprecated GTK_STOCK_* (#298)
+  * Remove deprecated call to gtk_widget_override_background_color (#299)
+  * Tab width popup: only select a menu item when the menu is open (#311)
+  * Simplify an if statement. The logic is identical, but easier to read (#314)
+
+  [ Leigh Scott ]
+  * Add minimum required version for xapp (#313)
+
+  [ Stephen Collins ]
+  * Prevent a warning when closing the window while print preview is open (#315)
+
+  [ Clement Lefebvre ]
+  * l10n: Update POT
+
+ -- Clement Lefebvre <root@linuxmint.com>  Sat, 29 Jun 2019 17:23:48 +0200
+
+xed (2.0.2) tessa; urgency=medium
+
+  [ Clement Lefebvre ]
+  * Fix non-translated desktop file
+
+  [ Michael Webster ]
+  * highlight mode window:  Make activatable via shortcut (ctrl-shift-H), focus the search entry by default, and allow Escape to cancel the dialog from the search entry.
+
+  [ chingyinwan123 ]
+  * Fix warnings when building xed 2.0.1 (#264)
+
+  [ Clement Lefebvre ]
+  * l10n: Update translations
+
+ -- Clement Lefebvre <root@linuxmint.com>  Tue, 11 Dec 2018 14:10:08 +0000
+
+xed (2.0.1) tessa; urgency=medium
+
+  [ Leigh Scott ]
+  * Switch build instructions for meson port. (#263)
+
+  [ Clement Lefebvre ]
+  * l10n: Update translations
+
+ -- Clement Lefebvre <root@linuxmint.com>  Tue, 27 Nov 2018 18:33:21 +0000
+
+xed (2.0.0) tessa; urgency=medium
+
+  [ Tomasz Gąsior ]
+  * Import GeditHighlightModeDialog and -Selector from Gedit to Xed.
+  * Use highlight dialog instead submenu in "View" menu.
+  * XedWindow cleanup.
+  * Import GeditStatusMenuButton.
+  * Fix compilation warning.
+  * Use popover with highlight selector instead loooong menu in statusbar.
+  * Use XedStatusMenuButton instead -ComboBox in statusbar, for consistency.
+  * Kill XedStatusComboBox. It's not used now.
+
+  [ JosephMcc ]
+  * xed-window: Indicate if we are currently using spaces or tabs in statusbar (#246)
+
+  [ NikoKrause ]
+  * Use icon for keyboard shortcuts help entry (#255)
+  * Rearrange help entries (xapp consistency) (#256)
+  * close dialog: use "suggested-action" style class (#261)
+
+  [ Stephen Collins ]
+  * Port to meson (#258)
+
+  [ Clement Lefebvre ]
+  * Fix merge issues
+  * l10n: Update POT
+
+ -- Clement Lefebvre <root@linuxmint.com>  Mon, 19 Nov 2018 11:34:46 +0000
+
+xed (1.8.3) tara; urgency=medium
+
+  [ Michael Webster ]
+  * search bar/xed-history-entry: Set a 'width-chars' on the GtkEntry widgets of the search and replace entry widgets, and allow their labels to ellipsize upon resizing.
+
+ -- Clement Lefebvre <root@linuxmint.com>  Tue, 17 Jul 2018 09:32:59 +0200
+
+xed (1.8.2) tara; urgency=medium
+
+  [ NikoKrause ]
+  * missing l10n: Help -> Shortcuts (#229)
+
+  [ Clement Lefebvre ]
+  * l10n: Update POT file
+  * l10n: Update translations
+
+ -- Clement Lefebvre <root@linuxmint.com>  Tue, 26 Jun 2018 13:21:55 +0200
+
+xed (1.8.1) tara; urgency=medium
+
+  * l10n: Update translations
+  * l10n: Update files
+
+ -- Clement Lefebvre <root@linuxmint.com>  Tue, 22 May 2018 12:53:38 +0100
+
+xed (1.8.0) tara; urgency=medium
+
+  [ Clement Lefebvre ]
+  * Add CI configuration
+
+  [ Leigh Scott ]
+  * Fix clang compile issue (#209)
+  * Fix Py*DeprecationWarning (#202)
+
+  [ JosephMcc ]
+  * Pull upstream fixes for gtk and gtksourceview changes
+  * preferences-dialog: Complete revamp
+  * xed-window: Rework the fullscreen toolbar
+  * xed-status-combo-box: Remove some deprecated css functionality
+  * xed-view-frame: Fix the css for the minimap frame
+  * xed-notebook: Clean up some gtk3.20+ conditionals
+  * Add a shortcuts window
+  * xed-view: Add shortcuts for change case
+  * debian: Add --enable-silent-rules to debian/rules
+  * css: Add support for Adwaita
+  * xed-searchbar: Fix the size of the searchbar close button
+  * xed-spell-checker.c: Clean up the code formatting
+  * spell-plugin: Update for removal of some deprecated functionality
+  * xed-notebook: Allow changing tabs with mouse back/forward buttons
+  * Fix a couple of issues turned up by Codacy
+  * Clean up a few build warnings
+  * spell-plugin: Port to gspell
+  * spell-plugin: Fix a link to the help file
+
+  [ Nic ]
+  * Add C tags to the taglist plugin (#188)
+
+  [ Clement Lefebvre ]
+  * CI: Don't build for Mint 18
+
+  [ JosephMcc ]
+  * xed-window: Fix a potential crash
+
+  [ Mickael Albertus ]
+  * Creation of plugin Word completion (#199)
+
+  [ Clement Lefebvre ]
+  * Wordcompletion: Fix a few mgsids
+  * l10n: Update POT file
+
+ -- Clement Lefebvre <root@linuxmint.com>  Sun, 06 May 2018 16:43:18 +0100
+
+xed (1.6.3) sylvia; urgency=medium
+
+  * l10n: Update translations
+
+ -- Clement Lefebvre <root@linuxmint.com>  Thu, 23 Nov 2017 12:24:36 +0000
+
+xed (1.6.2) sylvia; urgency=medium
+
+  [ JosephMcc ]
+  * xed-status-combo-box: Simplify the widget heirarchy (#185)
+
+ -- Clement Lefebvre <root@linuxmint.com>  Fri, 17 Nov 2017 10:42:21 +0000
+
+xed (1.6.1) sylvia; urgency=medium
+
+  * l10n: Fix localization in TextSize plugin
+
+ -- Clement Lefebvre <root@linuxmint.com>  Wed, 15 Nov 2017 13:11:20 +0000
+
+xed (1.6.0) sylvia; urgency=medium
+
+  [ JosephMcc ]
+  * translations: Add the textsize plugin to POTFILES.in (#151)
+
+  [ Clement Lefebvre ]
+  * l10n: Update POT file
+
+  [ JosephMcc ]
+  * text zoom: Put a limit on the min and max zoom (#137)
+
+  [ Gavin D. Howard ]
+  * Make the trailsave plugin also strip trailing lines (#135)
+
+  [ JosephMcc ]
+  * Don't present users with the hidden highlight languages (#167)
+  * xed-view: Fix a crash when right clicking the left gutter (#166)
+  * Minimap (#175)
+
+  [ Clement Lefebvre ]
+  * l10n: Update POT file
+  * l10n: Update translations
+
+ -- Clement Lefebvre <root@linuxmint.com>  Fri, 03 Nov 2017 21:13:44 +0000
+
+xed (1.4.6) sonya; urgency=medium
+
+  [ githpr ]
+  * Use correct value to save the window state in gsettings. (#147)
+
+ -- Clement Lefebvre <root@linuxmint.com>  Sat, 15 Jul 2017 21:37:18 +0200
+
+xed (1.4.5) sonya; urgency=medium
+
+  [ JosephMcc ]
+  * Create ISSUE_TEMPLATE.md
+
+  [ Clement Lefebvre ]
+  * Packaging: Remove dependency on libpeas-1.0-0-python3loader in LMDE
+
+ -- Clement Lefebvre <root@linuxmint.com>  Tue, 04 Jul 2017 13:11:46 +0200
+
+xed (1.4.4) sonya; urgency=medium
+
+  * l10n: Update translations
+
+ -- Clement Lefebvre <root@linuxmint.com>  Wed, 28 Jun 2017 10:11:34 +0200
+
+xed (1.4.3) sonya; urgency=medium
+
+  [ Mike Krüger ]
+  * bugfix: ugly white border (gtk 3.20>) (#128)
+
+  [ JosephMcc ]
+  * filebrowser: Change an icon name (#132)
+
+ -- Clement Lefebvre <root@linuxmint.com>  Tue, 20 Jun 2017 15:22:10 +0200
+
+xed (1.4.2) sonya; urgency=medium
+
+  [ leigh123linux ]
+  * fix gtksourceprintcompositor.h includes warning (#117)
+
+  [ Clement Lefebvre ]
+  * l10n: Update translations
+
+ -- Clement Lefebvre <root@linuxmint.com>  Tue, 23 May 2017 13:35:28 +0100
+
+xed (1.4.1) sonya; urgency=medium
+
+  * Depend on gtksourceview-3.0 >= 3.14.0
+  * Only use gtk_text_view_set_top_margin() with GTK 3.18+
+  * Packaging: Change description
+  * l10n: Update translations
+
+ -- Clement Lefebvre <root@linuxmint.com>  Sat, 06 May 2017 14:57:27 +0100
+
+xed (1.4.0) sonya; urgency=medium
+
+  [ Clement Lefebvre ]
+  * Search: Don't jump to the next result when toggling search options
+
+  [ JosephMcc ]
+  * close-confirmation-dialog: Clean up code styling
+  * close-confirmation-dialog: Clean up some deprecations
+  * xed-encodings-dialog: Clean up code styling
+  * xed-encodings-dialog: Clean up some deprecations
+  * xed-encodings-combo-box: Clean up code styling
+  * xed-commands-file: Clean up code styling
+  * xed-commands-file: Clean up deprecations
+  * xed-app: Clean up code styling
+  * xed-app: Remove an unused variable
+  * xed-commands-search: Fix some missing casts
+  * xed-document: Clean up code style
+  * xed-document: Remove use of deprecated gdk_color_parse
+  * xed-documents-panel: Cleanup code styling
+  * xed-documents-panel: Remove an unused variable
+  * xed-message-bus: Clean up code styling
+  * xed-message-bus: Clean up an unused variables
+  * xed-io-error-message-area: Clean up code styling
+  * xed-io-error-message-area: Fix up some deprecations
+  * xed-panel: Clean up code formatting
+  * plugins: Drop support for old style python plugins
+  * build: Clean up a bit more of the gtk2 and --enable-python leftovers
+  * build GObject introspection data
+  * Fix some introspection warnings
+  * Remove a couple of invalid annotations
+  * xed-window: Remove an unused function
+  * Drop some leftover 2.xx comments from gnome/pluma
+  * Port plugin system to libpeas
+  * changecase-plugin: Port to libpeas
+  * docinfo-plugin: Port to libpeas
+  * filebrowser-plugin: Port to libpeas
+  * modelines-plugin: Port to libpeas
+  * sort-plugin: Port to libpeas
+  * spell-plugin: Port to libpeas
+  * taglist-plugin: Port to libpeas
+  * time-plugin: Port to libpeas
+  * trailsave-plugin: Port to libpeas
+  * plugins: Make them actually recognized and loaded by Xed
+  * Remove old plugin system and docs for it
+  * enable dh_girepository helper to fill ${gir:Depends} properly
+  * taglist plugin: don't look for taglist in non-existing legacy dirs
+  * xed-panel: Clean up the layout of the panels
+  * xed-sort-plugin.c: Clean up code styling
+  * Add buttons to the statusbar to show/hide the panels
+  * xed-window: Stop using deprecated (v/h)box
+  * xed-panel: Remove the header and close button
+  * xed-panel: Simplify panel building a bit
+  * xed-panel: Move the notebook tabs to the top
+  * Add a few style classes
+  * xed-statusbar: Clean up the styling a bit
+  * Add view menu entry for word wrap
+  * preferences-dialog: Clean up code styling
+  * preferences-dialog: Clean up uses of GtkStock
+  * Allow scrolling on notebook tabs to change the active page
+  * xed-prefs-manager-app: Remove some leftover logging
+  * xed-notebook.c: Clean up the code formatting
+  * xed-pref-manager-app.c: Clean up code style
+  * xed-prefs-manager-app.c: Clean up an unused variable
+  * notebooks: Don't show tabs when the notebook only has one page
+  * xed-window.c: Fix a few missing casts
+  * xed-utils: Clean up code styling
+  * xed-utils.h: Clean up code styling
+  * xed-utils: Remove a couple functions
+  * xed-panel: Clean up more uses of GtkStock
+  * xed-panel.c: Add a couple of missing casts
+  * xed-status-combo-box: Don't use deprecated GtkArrow
+  * xed-status-combo-box.c: Clean up some code styling
+  * xed-tab.c: Clean up code style
+  * xed-tab: Clean up some uses of GtkStock
+  * xed-window: Use a better icon for the documents panel tab
+  * xed-print-preview.c: Clean up code styling
+  * xed-print-preview.c: Restyle the toolbar
+  * xed-print-preview.c: Don't you deprecated gtk_layout_get_*adjustment
+  * xed-progress-message-area.c: Clean up code style
+  * xed-progress-message-area: Clean up more uses of GtkStock
+  * Install introspection data and lib into a private dir
+  * Add new (App/Window/View)Activatable interfaces for plugins
+  * docinfo-plugin: Update for WindowActivatable changes
+  * sort-plugin: Port the sort plugin to WindowActivatable
+  * spell-plugin: Update to the new WindowActivatable interface
+  * time-plugin: Port to WindowActivatable
+  * changecase-plugin: Port to WindowActivatable
+  * taglist-plugin: Port to WindowActivatable
+  * trailsave-plugin: Port to WindowActivatable
+  * time-plugin: Clean up a bit from libpeas port
+  * spell-plugin: Clean up a few things
+  * Clean up uses of deprecated GtkMisc
+  * xed-tab-label.c/h: Clean up code styling
+  * xed-file-dialog.c/h: Clean up code styling
+  * xed-statusbar.c/h: Clean up code styling
+  * xed-statusbar: Fix a missing cast
+  * xed-searchbar: Add a couple missing casts and remove an unused variable
+  * xed-searchbar.c/h: Clean up styling a bit
+  * Port to the use of GFile instead of URIs and merge gio document loader and saver into document loader and saver
+  * Revamp our handling of settings
+  * Clean up the docs a bit
+  * Redesign the goto line popup dialog
+  * xed-preferences-dialog: Fix a setting having the wrong sensitiviy
+  * tests: Fix to use GFile instead of uris
+  * xed-document-output-stream: Clean up code style
+  * xed-document-output-stream: Clean up code style
+  * Merge smart converter in the document output stream
+  * xed-document-output-stream: Factor out validate_and_insert method
+  * Pull some upstream changes from Gedit in prep for using more of the GtkSource* backend
+  * Remove the xed style scheme manager instance
+  * xed-document: Fix a couple of possible memory leaks
+  * Kill xed-language-manager and use gtksourcelanguagemanager directly
+  * xed-document: Rework externally modified/deleted check
+  * Remove xed_utils_location_has_file_scheme
+  * Clean up our GSettings use a bit more
+  * Port to the GtkSourceView search functionality
+  * Add _xed_document_needs_saving
+  * Plugins: Remove the changecase plugin
+  * xed-document: Do some cleanup
+  * Port to GtkSource* API
+  * Port xed to dbus and GtkApplication
+  * message-area: Rename message area to info bar
+  * info-bars: Don't use deprecated gtk_misc
+  * info-bars: Don't use deprecated GtkStock
+  * info-bar: Don't use icons in buttons
+  * xed-progress-info-bar: Properly expand the progress bar
+  * Don't use deprecated gtk_widget_set margin_left/right
+  * Remove the dialog utility library
+  * Start using GResource
+  * Set textdomain as soon as possible
+  * Don't use global vars for command line parsing
+  * xed-app: Handle also application::open
+  * xed-app: Shutdown metadata-manager after GTK+
+  * xed-app: Fix a typo
+  * xed-window: Fix getting the wrong window size when cloning a window
+  * Add a preference to allow using the dark variant of a theme if available
+  * Debian: Bring back the xed-doc package
+  * xed-view: Add some margin to the top and left of the text view
+  * Makefile: Forgot to git add changes
+  * debian: Add a dependency on xapps-common
+  * prefs-dialog: Fix a crash when removing style schemes
+  * docs: Start cleaning up the docs
+  * Implement font zooming in the editor
+  * Sort: Turn sort into a simpler and undoable action
+  * Focus view when opening files from the filebrowser or documents panel
+  * Fix g_free which should be g_object_unref in file browser
+  * Use slice allocator instead of g_new when appropriate
+  * xed-file-browser-widget: Clean up code styling
+  * filebrowser-view: Removed the unused "busy" cursor
+  * Do not leak file info for . and .. dirs
+  * filebrowser: Unref the enumerator in the filebrowser plugin
+  * file-browser-messages: Clean up formatting
+  * filebrowser: Don't leak GFiles
+  * filebrowser: Fix crash on open_terminal action
+  * filebrowser: Remove the back and forward toolbar dropdowns
+  * filebrowser: Support new location of gtk bookmarks file
+  * xed-file-browser-utils.c: Clean up code style
+  * filebrowser: "Rename" menu entry should have an ellipsis
+  * filebrowser: use Untitled File/Folder for new file/folders
+  * filebrowser: don't use deprecated GIOScheduler
+  * filebrowser: Redesign the toolbar in filebrowser
+  * filebrowser: Activate selected item when search is complete
+  * filebrowser: Don't use deprecated GtkStock
+  * filebrowser: Do not parse .hidden in the file browser
+  * filebrowser: Make the "Open terminal here" command work again
+  * filebrowser: Set the combobox insensitive when the bookmarks are showing
+  * build: Fix the python3 dependency
+  * Actually fix the python dependency
+  * Fix calling set_command_line_wait()
+  * Allow building with --disable-spell
+  * debian: Add dependency on libpeas-1.0-0-python3loader
+  * Focus a tab when attempting to close it with unsaved changes
+  * Add a new animated xed-paned
+  * xed-commands-view: Clean up code style
+  * time-plugin: Use GDateTime
+  * xed-utils: Add runtime checks for x11 specific functions
+
+  [ leigh123linux ]
+  * Fix FSF address
+
+  [ JosephMcc ]
+  * Use GtkApplication inhibit API
+
+  [ Clement Lefebvre ]
+  * Fix po/POTFILES.in and generate POT file
+  * Fix "gedit" occurence
+
+ -- Clement Lefebvre <root@linuxmint.com>  Fri, 05 May 2017 08:38:39 +0100
+
+xed (1.2.2) serena; urgency=medium
+
+  [ JosephMcc ]
+  * searchbar: Add a close button
+  * searchbar: Make sure we clear highlighting when the last character is removed
+
+  [ Clement Lefebvre ]
+  * Search: Fix search jumping to next result while typing
+  * Search: Perform a search when case-sensitive or entire-word buttons are clicked
+  * l10n: Add missing pot file
+  * l10n: Update translations
+
+ -- Clement Lefebvre <root@linuxmint.com>  Mon, 12 Dec 2016 12:43:35 +0000
+
+xed (1.2.1) serena; urgency=medium
+
+  * l10n: Improve some of the new msgids
+  * l10n: Update translations
+
+ -- Clement Lefebvre <root@linuxmint.com>  Thu, 10 Nov 2016 00:36:06 +0000
+
+xed (1.2.0) serena; urgency=medium
+
+  [ JosephMcc ]
+  * configure: Don't require passing --with-gtk=3.0 to build
+
+  [ Clement Lefebvre ]
+  * Fixed NEWS files
+  * Add "notepad" to the list of menu item keywords
+  * Fixed some UI elements not localized
+  * Makepot
+  * Revert "Makepot"
+  * Revert "Fixed some UI elements not localized"
+  * When running as root, add an infobar to warn about Elevated Privileges
+  * Toolbar: Don't emphasize toolbar items (save, open, undo)
+  * Give Xed a Sublime-like searchbar
+  * Reformated code to conform to Mint coding style
+  * Default Settings: Changed line width to 120 chars and enabled "insert-spaces".
+
+  [ JosephMcc ]
+  * toolbar: Revamp the main toolbar style
+  * ui: Convert the remaining actions to use symbolic icons
+  * prefs: Remove now unused toolbar style prefs
+  * ui: Don't hide the main notebook tabs in fullscreen
+  * xed-close-button: Convert to using a symbolic icon
+  * filbrowser-plugin: Convert indentation to spaces and remove extra whitespace
+  * filebrowser-plugin: Convert most icons to symbolic icons
+
+  [ Clement Lefebvre ]
+  * Update pot file
+
+ -- Clement Lefebvre <root@linuxmint.com>  Wed, 02 Nov 2016 15:55:04 +0000
+
+xed (1.0.6) sarah; urgency=medium
+
+  [ Michael Webster ]
+  * xed-notebook.c: check vertical mouse position when determining whether a tab is being manipulated.  We were just checking horizontal position, which meant that depending on where you start a drag-and-drop, it might think you're trying to drag a tab instead, causing undesirable behavior.
+
+  [ Clement Lefebvre ]
+  * Updated translations
+  * Added new translations to po/LINGUAS
+
+ -- Clement Lefebvre <root@linuxmint.com>  Sat, 25 Jun 2016 11:38:33 +0100
+
+xed (1.0.5) sarah; urgency=medium
+
+  * Updated translations
+
+ -- Clement Lefebvre <root@linuxmint.com>  Tue, 24 May 2016 14:30:35 +0100
+
+xed (1.0.4) sarah; urgency=medium
+
+  [ monsta ]
+  * fix a few build warnings
+
+  [ itzexor ]
+  * Fix build with gnome-common
+
+  [ Sorokin Alexei ]
+  * Remove MATE leftovers
+  * Warnings fixes
+
+  [ Clement Lefebvre ]
+  * GTK 3.10 compatibility
+
+  [ JosephMcc ]
+  * gtk: We're targeting gtk3.10 so clean up all the gtk version checks and go with that
+
+  [ itzexor ]
+  * xed-close-confirmation-dialog: fix scrolledwindow minimum height
+
+  [ JosephMcc ]
+  * notebooks: Remove the extra frame from the main and documents panel scrolled windows
+
+  [ Clement Lefebvre ]
+  * Use Ctrl+Y for Redo
+  * Updated translations
+
+ -- Clement Lefebvre <root@linuxmint.com>  Wed, 27 Apr 2016 14:30:49 +0100
+
+xed (1.0.3) sarah; urgency=medium
+
+  * packaging: switch to gnome-common
+  * Fixed wrong dconf paths
+
+ -- Clement Lefebvre <root@linuxmint.com>  Wed, 10 Feb 2016 10:18:18 +0000
+
+xed (1.0.2) sarah; urgency=medium
+
+  * Renamed Xedit -> Xed (avoid name clash with x11-apps's xedit)
+  * Switch autogen.sh from mate-common to gnome-common
+  * Fix incorrect git URL in HACKING
+  * Clean up GTK support
+  * xedit-status-combo-box: Clean up and fix deprecations
+
+ -- Clement Lefebvre <root@linuxmint.com>  Sat, 06 Feb 2016 16:43:25 +0000
+
+xed (1.0.1) sarah; urgency=medium

  * Remove branding from window title and menu item
  * Removed more MATE references
@@ -9,7 +647,7 @@ xedit (1.0.1) sarah; urgency=medium

 -- Clement Lefebvre <root@linuxmint.com>  Wed, 27 Jan 2016 11:17:20 +0000

-xedit (1.0.0) sarah; urgency=medium
+xed (1.0.0) sarah; urgency=medium

  * Initial version

--- a/debian/clean
+++ b/debian/clean
@@ -0,0 +1 @@
+debian/build/
--- a/debian/control
+++ b/debian/control
@@ -1,138 +1,146 @@
-Source: xedit
+Source: xed
 Section: x11
 Priority: optional
 Maintainer: Linux Mint <root@linuxmint.com>
-Build-Depends: autotools-dev,
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
+               gobject-introspection,
               gtk-doc-tools,
               intltool,
-               iso-codes,
-               libenchant-dev,
+               libgirepository1.0-dev,
               libglib2.0-dev,
+               libgspell-1-dev,
               libgtk-3-dev,
               libgtksourceview-3.0-dev,
+               libpeas-dev,
+               libxapp-dev,
               libsm-dev,
               libx11-dev,
               libxml2-dev,
-               mate-common,
+               gnome-common,
+               python3,
+               python3-gi,
               yelp-tools,
+               meson
 Standards-Version: 3.9.6

-Package: xedit
+Package: xed
 Architecture: any
 Depends: iso-codes,
-         xedit-common (= ${source:Version}),
+         xed-common (= ${source:Version}),
         ${misc:Depends},
         ${python:Depends},
         ${shlibs:Depends},
+         python3,
+         python3-gi,
+         xapps-common,
         zenity
 XB-Python-Version: ${python:Versions}
-Description: generic text editor
- Xedit is a text editor which supports most standard editor features,
+Description: Text editor
+ Xed is a text editor which supports most standard editor features,
 extending this basic functionality with other features not usually
- found in simple text editors. Xedit is a graphical application which
+ found in simple text editors. Xed is a graphical application which
 supports editing multiple text files in one window (known sometimes as
 tabs or MDI).
 .
- Xedit fully supports international text through its use of the
+ Xed fully supports international text through its use of the
 Unicode UTF-8 encoding in edited files. Its core feature set includes syntax
 highlighting of source code, auto indentation and printing and print preview
 support.
 .
- Xedit is also extensible through its plugin system, which currently
+ Xed is also extensible through its plugin system, which currently
 includes support for spell checking, comparing files, viewing CVS
 ChangeLogs, and adjusting indentation levels.

-Package: xedit-common
+Package: xed-common
 Architecture: all
 Depends: python,
         ${misc:Depends},
-Description: generic text editor (common files)
- Xedit is a text editor which supports most standard editor features,
+Description: Text editor (common files)
+ Xed is a text editor which supports most standard editor features,
 extending this basic functionality with other features not usually
- found in simple text editors. Xedit is a graphical application which
+ found in simple text editors. Xed is a graphical application which
 supports editing multiple text files in one window (known sometimes as
 tabs or MDI).
 .
- Xedit fully supports international text through its use of the
+ Xed fully supports international text through its use of the
 Unicode UTF-8 encoding in edited files. Its core feature set includes syntax
 highlighting of source code, auto indentation and printing and print preview
 support.
 .
- Xedit is also extensible through its plugin system, which currently
+ Xed is also extensible through its plugin system, which currently
 includes support for spell checking, comparing files, viewing CVS
 ChangeLogs, and adjusting indentation levels.
 .
 This package contains the architecture independent files.

-Package: xedit-dev
+Package: xed-dev
 Architecture: any
 Section: devel
-Depends: xedit (= ${binary:Version}),
+Depends: xed (= ${binary:Version}),
         ${misc:Depends},
-Description: generic text editor (development files)
- Xedit is a text editor which supports most standard editor features,
+Description: Text editor (development files)
+ Xed is a text editor which supports most standard editor features,
 extending this basic functionality with other features not usually
- found in simple text editors. Xedit is a graphical application which
+ found in simple text editors. Xed is a graphical application which
 supports editing multiple text files in one window (known sometimes as
 tabs or MDI).
 .
- Xedit fully supports international text through its use of the
+ Xed fully supports international text through its use of the
 Unicode UTF-8 encoding in edited files. Its core feature set includes syntax
 highlighting of source code, auto indentation and printing and print preview
 support.
 .
- Xedit is also extensible through its plugin system, which currently
+ Xed is also extensible through its plugin system, which currently
 includes support for spell checking, comparing files, viewing CVS
 ChangeLogs, and adjusting indentation levels.
 .
- This package contains the development files for building Xedit plugins.
+ This package contains the development files for building Xed plugins.

-Package: xedit-dbg
+Package: xed-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: xedit (= ${binary:Version}),
+Depends: xed (= ${binary:Version}),
         ${misc:Depends},
-Description: generic text editor (debugging symbols)
- Xedit is a text editor which supports most standard editor features,
+Description: Text editor (debugging symbols)
+ Xed is a text editor which supports most standard editor features,
 extending this basic functionality with other features not usually
- found in simple text editors. Xedit is a graphical application which
+ found in simple text editors. Xed is a graphical application which
 supports editing multiple text files in one window (known sometimes as
 tabs or MDI).
 .
- Xedit fully supports international text through its use of the
+ Xed fully supports international text through its use of the
 Unicode UTF-8 encoding in edited files. Its core feature set includes syntax
 highlighting of source code, auto indentation and printing and print preview
 support.
 .
- Xedit is also extensible through its plugin system, which currently
+ Xed is also extensible through its plugin system, which currently
 includes support for spell checking, comparing files, viewing CVS
 ChangeLogs, and adjusting indentation levels.
 .
- This package contains debugging symbols for Xedit. It is
+ This package contains debugging symbols for Xed. It is
 provided to help debugging problems.
 .
 The debugging symbols are installed in /usr/lib/debug and will
 automatically be used by gdb.

-Package: xedit-doc
+Package: xed-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends},
-Description: generic text editor (documentation files)
- Xedit is a text editor which supports most standard editor features,
+Description: Text editor (documentation files)
+ Xed is a text editor which supports most standard editor features,
 extending this basic functionality with other features not usually
- found in simple text editors. Xedit is a graphical application which
+ found in simple text editors. Xed is a graphical application which
 supports editing multiple text files in one window (known sometimes as
 tabs or MDI).
 .
- Xedit fully supports international text through its use of the
+ Xed fully supports international text through its use of the
 Unicode UTF-8 encoding in edited files. Its core feature set includes syntax
 highlighting of source code, auto indentation and printing and print preview
 support.
 .
- Xedit is also extensible through its plugin system, which currently
+ Xed is also extensible through its plugin system, which currently
 includes support for spell checking, comparing files, viewing CVS
 ChangeLogs, and adjusting indentation levels.
 .
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,88 +1,88 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: xedit (old name: mate-text-editor)
+Upstream-Name: xed (old name: mate-text-editor)
 Upstream-Contact: Stefano Karapetsas <stefano@karapetsas.com>
-Source: http://git.mate-desktop.org/xedit/
+Source: http://git.mate-desktop.org/xed/

-Files: plugins/docinfo/xedit-docinfo-plugin.c
-       plugins/docinfo/xedit-docinfo-plugin.h
-       plugins/spell/xedit-spell-checker-dialog.c
-       plugins/spell/xedit-spell-checker-dialog.h
-       plugins/spell/xedit-spell-checker-language.h
-       plugins/spell/xedit-spell-checker.c
-       plugins/spell/xedit-spell-checker.h
-       plugins/spell/xedit-spell-language-dialog.c
-       plugins/spell/xedit-spell-language-dialog.h
-       plugins/spell/xedit-spell-plugin.c
-       plugins/spell/xedit-spell-plugin.h
-       plugins/taglist/xedit-taglist-plugin-panel.c
-       plugins/taglist/xedit-taglist-plugin-panel.h
-       plugins/taglist/xedit-taglist-plugin-parser.c
-       plugins/taglist/xedit-taglist-plugin-parser.h
-       plugins/taglist/xedit-taglist-plugin.c
-       plugins/taglist/xedit-taglist-plugin.h
-       plugins/time/xedit-time-plugin.c
-       plugins/time/xedit-time-plugin.h
-       xedit/dialogs/xedit-encodings-dialog.c
-       xedit/dialogs/xedit-encodings-dialog.h
-       xedit/dialogs/xedit-preferences-dialog.c
-       xedit/dialogs/xedit-preferences-dialog.h
-       xedit/dialogs/xedit-search-dialog.c
-       xedit/dialogs/xedit-search-dialog.h
-       xedit/xedit-app.c
-       xedit/xedit-app.h
-       xedit/xedit-documents-panel.c
-       xedit/xedit-documents-panel.h
-       xedit/xedit-encodings-combo-box.c
-       xedit/xedit-encodings-combo-box.h
-       xedit/xedit-encodings.h
-       xedit/xedit-file-chooser-dialog.c
-       xedit/xedit-file-chooser-dialog.h
-       xedit/xedit-help.c
-       xedit/xedit-help.h
-       xedit/xedit-io-error-message-area.c
-       xedit/xedit-io-error-message-area.h
-       xedit/xedit-language-manager.c
-       xedit/xedit-language-manager.h
-       xedit/xedit-metadata-manager.c
-       xedit/xedit-metadata-manager.h
-       xedit/xedit-panel.c
-       xedit/xedit-panel.h
-       xedit/xedit-plugin-manager.h
-       xedit/xedit-plugin.c
-       xedit/xedit-plugin.h
-       xedit/xedit-plugins-engine.c
-       xedit/xedit-plugins-engine.h
-       xedit/xedit-prefs-manager-app.c
-       xedit/xedit-prefs-manager-app.h
-       xedit/xedit-prefs-manager-private.h
-       xedit/xedit-prefs-manager.c
-       xedit/xedit-prefs-manager.h
-       xedit/xedit-progress-message-area.c
-       xedit/xedit-progress-message-area.h
-       xedit/xedit-tab.c
-       xedit/xedit-tab.h
-       xedit/xedit-ui.h
-       xedit/xedit-ui.xml
-       xedit/xedit-window-private.h
-       xedit/xedit-window.c
-       xedit/xedit-window.h
-       xedit/xedit.c
+Files: plugins/docinfo/xed-docinfo-plugin.c
+       plugins/docinfo/xed-docinfo-plugin.h
+       plugins/spell/xed-spell-checker-dialog.c
+       plugins/spell/xed-spell-checker-dialog.h
+       plugins/spell/xed-spell-checker-language.h
+       plugins/spell/xed-spell-checker.c
+       plugins/spell/xed-spell-checker.h
+       plugins/spell/xed-spell-language-dialog.c
+       plugins/spell/xed-spell-language-dialog.h
+       plugins/spell/xed-spell-plugin.c
+       plugins/spell/xed-spell-plugin.h
+       plugins/taglist/xed-taglist-plugin-panel.c
+       plugins/taglist/xed-taglist-plugin-panel.h
+       plugins/taglist/xed-taglist-plugin-parser.c
+       plugins/taglist/xed-taglist-plugin-parser.h
+       plugins/taglist/xed-taglist-plugin.c
+       plugins/taglist/xed-taglist-plugin.h
+       plugins/time/xed-time-plugin.c
+       plugins/time/xed-time-plugin.h
+       xed/dialogs/xed-encodings-dialog.c
+       xed/dialogs/xed-encodings-dialog.h
+       xed/dialogs/xed-preferences-dialog.c
+       xed/dialogs/xed-preferences-dialog.h
+       xed/dialogs/xed-search-dialog.c
+       xed/dialogs/xed-search-dialog.h
+       xed/xed-app.c
+       xed/xed-app.h
+       xed/xed-documents-panel.c
+       xed/xed-documents-panel.h
+       xed/xed-encodings-combo-box.c
+       xed/xed-encodings-combo-box.h
+       xed/xed-encodings.h
+       xed/xed-file-chooser-dialog.c
+       xed/xed-file-chooser-dialog.h
+       xed/xed-help.c
+       xed/xed-help.h
+       xed/xed-io-error-message-area.c
+       xed/xed-io-error-message-area.h
+       xed/xed-language-manager.c
+       xed/xed-language-manager.h
+       xed/xed-metadata-manager.c
+       xed/xed-metadata-manager.h
+       xed/xed-panel.c
+       xed/xed-panel.h
+       xed/xed-plugin-manager.h
+       xed/xed-plugin.c
+       xed/xed-plugin.h
+       xed/xed-plugins-engine.c
+       xed/xed-plugins-engine.h
+       xed/xed-prefs-manager-app.c
+       xed/xed-prefs-manager-app.h
+       xed/xed-prefs-manager-private.h
+       xed/xed-prefs-manager.c
+       xed/xed-prefs-manager.h
+       xed/xed-progress-message-area.c
+       xed/xed-progress-message-area.h
+       xed/xed-tab.c
+       xed/xed-tab.h
+       xed/xed-ui.h
+       xed/xed-ui.xml
+       xed/xed-window-private.h
+       xed/xed-window.c
+       xed/xed-window.h
+       xed/xed.c
 Copyright: 2001-2007, Paolo Maggi
 License: GPL-2+

-Files: plugins/filebrowser/xedit-file-bookmarks-store.c
-       plugins/filebrowser/xedit-file-bookmarks-store.h
-       plugins/filebrowser/xedit-file-browser-error.h
-       plugins/filebrowser/xedit-file-browser-messages.h
-       plugins/filebrowser/xedit-file-browser-plugin.c
-       plugins/filebrowser/xedit-file-browser-plugin.h
-       plugins/filebrowser/xedit-file-browser-store.c
-       plugins/filebrowser/xedit-file-browser-store.h
-       plugins/filebrowser/xedit-file-browser-utils.c
-       plugins/filebrowser/xedit-file-browser-view.c
-       plugins/filebrowser/xedit-file-browser-view.h
-       plugins/filebrowser/xedit-file-browser-widget.c
-       plugins/filebrowser/xedit-file-browser-widget.h
+Files: plugins/filebrowser/xed-file-bookmarks-store.c
+       plugins/filebrowser/xed-file-bookmarks-store.h
+       plugins/filebrowser/xed-file-browser-error.h
+       plugins/filebrowser/xed-file-browser-messages.h
+       plugins/filebrowser/xed-file-browser-plugin.c
+       plugins/filebrowser/xed-file-browser-plugin.h
+       plugins/filebrowser/xed-file-browser-store.c
+       plugins/filebrowser/xed-file-browser-store.h
+       plugins/filebrowser/xed-file-browser-utils.c
+       plugins/filebrowser/xed-file-browser-view.c
+       plugins/filebrowser/xed-file-browser-view.h
+       plugins/filebrowser/xed-file-browser-widget.c
+       plugins/filebrowser/xed-file-browser-widget.h
       plugins/snippets/snippets/Document.py
       plugins/snippets/snippets/Helper.py
       plugins/snippets/snippets/Library.py
@@ -96,98 +96,98 @@ Files: plugins/filebrowser/xedit-file-bookmarks-store.c
 Copyright: 2005-2008, Jesse van den Kieboom <jesse@icecrew.nl>
 License: GPL-2+

-Files: plugin-loaders/c/xedit-plugin-loader-c.c
-       plugin-loaders/c/xedit-plugin-loader-c.h
-       plugin-loaders/python/xedit-plugin-loader-python.c
-       plugin-loaders/python/xedit-plugin-loader-python.h
+Files: plugin-loaders/c/xed-plugin-loader-c.c
+       plugin-loaders/c/xed-plugin-loader-c.h
+       plugin-loaders/python/xed-plugin-loader-python.c
+       plugin-loaders/python/xed-plugin-loader-python.h
       plugins/quickopen/quickopen/__init__.py
       plugins/quickopen/quickopen/popup.py
       plugins/quickopen/quickopen/virtualdirs.py
       plugins/quickopen/quickopen/windowhelper.py
-       plugins/spell/xedit-spell-utils.c
-       plugins/spell/xedit-spell-utils.h
-       xedit/xedit-plugin-loader.c
-       xedit/xedit-plugin-loader.h
-       xedit/xedit-status-combo-box.c
-       xedit/xedit-status-combo-box.h
+       plugins/spell/xed-spell-utils.c
+       plugins/spell/xed-spell-utils.h
+       xed/xed-plugin-loader.c
+       xed/xed-plugin-loader.h
+       xed/xed-status-combo-box.c
+       xed/xed-status-combo-box.h
       tests/document-loader.c
       tests/document-saver.c
 Copyright: 2008-2010, Jesse van den Kieboom
 License: GPL-2+

-Files: xedit/xedit-commands-documents.c
-       xedit/xedit-commands-edit.c
-       xedit/xedit-commands-file-print.c
-       xedit/xedit-commands-file.c
-       xedit/xedit-commands-search.c
-       xedit/xedit-commands-view.c
-       xedit/xedit-commands.h
-       xedit/xedit-debug.c
-       xedit/xedit-debug.h
-       xedit/xedit-document.c
-       xedit/xedit-document.h
-       xedit/xedit-utils.c
-       xedit/xedit-utils.h
-       xedit/xedit-view.c
-       xedit/xedit-view.h
+Files: xed/xed-commands-documents.c
+       xed/xed-commands-edit.c
+       xed/xed-commands-file-print.c
+       xed/xed-commands-file.c
+       xed/xed-commands-search.c
+       xed/xed-commands-view.c
+       xed/xed-commands.h
+       xed/xed-debug.c
+       xed/xed-debug.h
+       xed/xed-document.c
+       xed/xed-document.h
+       xed/xed-utils.c
+       xed/xed-utils.h
+       xed/xed-view.c
+       xed/xed-view.h
 Copyright: 1998-1999, Alex Roberts, Evan Lawrence
           2000-2002, Chema Celorio, Paolo Maggi
           2002-2006, Paolo Maggi
 License: GPL-2+

-Files: plugins/changecase/xedit-changecase-plugin.c
-       plugins/changecase/xedit-changecase-plugin.h
-       xedit/xedit-close-button.c
-       xedit/xedit-close-button.h
-       xedit/xedit-history-entry.c
-       xedit/xedit-history-entry.h
-       xedit/xedit-print-preview.c
-       xedit/xedit-print-preview.h
-       xedit/xedit-statusbar.c
-       xedit/xedit-statusbar.h
-       xedit/xedit-style-scheme-manager.h
-       xedit/xedit-tab-label.c
-       xedit/xedit-tab-label.h
+Files: plugins/changecase/xed-changecase-plugin.c
+       plugins/changecase/xed-changecase-plugin.h
+       xed/xed-close-button.c
+       xed/xed-close-button.h
+       xed/xed-history-entry.c
+       xed/xed-history-entry.h
+       xed/xed-print-preview.c
+       xed/xed-print-preview.h
+       xed/xed-statusbar.c
+       xed/xed-statusbar.h
+       xed/xed-style-scheme-manager.h
+       xed/xed-tab-label.c
+       xed/xed-tab-label.h
 Copyright: 2004-2010, Paolo Borelli
 License: GPL-2+

-Files: xedit/xedit-dirs.h
-       xedit/xedit-document-input-stream.c
-       xedit/xedit-document-input-stream.h
-       xedit/xedit-document-output-stream.c
-       xedit/xedit-document-output-stream.h
-       xedit/xedit-smart-charset-converter.c
-       xedit/xedit-smart-charset-converter.h
+Files: xed/xed-dirs.h
+       xed/xed-document-input-stream.c
+       xed/xed-document-input-stream.h
+       xed/xed-document-output-stream.c
+       xed/xed-document-output-stream.h
+       xed/xed-smart-charset-converter.c
+       xed/xed-smart-charset-converter.h
       tests/document-input-stream.c
       tests/document-output-stream.c
       tests/smart-converter.c
 Copyright: 2008-2010, Ignacio Casal Quinteiro
 License: GPL-2+

-Files: plugins/externaltools/scripts/xedit-tool-merge.pl
+Files: plugins/externaltools/scripts/xed-tool-merge.pl
       plugins/externaltools/tools/library.py
       plugins/modelines/modeline-parser.c
       plugins/modelines/modeline-parser.h
-       plugins/modelines/xedit-modeline-plugin.c
-       plugins/modelines/xedit-modeline-plugin.h
+       plugins/modelines/xed-modeline-plugin.c
+       plugins/modelines/xed-modeline-plugin.h
 Copyright: 2005-2007, Steve Frécinaux <code@istique.net>
 License: GPL-2+

-Files: xedit/xedit-document-loader.c
-       xedit/xedit-document-loader.h
-       xedit/xedit-document-saver.h
-       xedit/xedit-plugin-info-priv.h
-       xedit/xedit-plugin-info.c
-       xedit/xedit-plugin-info.h
+Files: xed/xed-document-loader.c
+       xed/xed-document-loader.h
+       xed/xed-document-saver.h
+       xed/xed-plugin-info-priv.h
+       xed/xed-plugin-info.c
+       xed/xed-plugin-info.h
 Copyright: 2002-2005, Paolo Maggi
           2007, Paolo Maggi
           2007, Steve Frécinaux
 License: GPL-2+

-Files: xedit/smclient/eggdesktopfile.h
-       xedit/smclient/eggsmclient-private.h
-       xedit/smclient/eggsmclient.c
-       xedit/smclient/eggsmclient.h
+Files: xed/smclient/eggdesktopfile.h
+       xed/smclient/eggsmclient-private.h
+       xed/smclient/eggsmclient.c
+       xed/smclient/eggsmclient.h
 Copyright: 2007, Novell, Inc.
 License: LGPL-2+

@@ -197,22 +197,22 @@ Files: plugins/externaltools/tools/__init__.py
       plugins/externaltools/tools/manager.py
       tools/generate-plugin.py
       tools/preprocessor.py
-       tools/plugin_template/xedit-plugin.c
-       tools/plugin_template/xedit-plugin.h
+       tools/plugin_template/xed-plugin.c
+       tools/plugin_template/xed-plugin.h
 Copyright: 2005-2006, Steve Frécinaux <steve@istique.net>
           2006, Steve Frécinaux <steve@istique.net>
 License: GPL-2+

-Files: xedit/xedit-gio-document-loader.c
-       xedit/xedit-gio-document-loader.h
-       xedit/xedit-gio-document-saver.h
+Files: xed/xed-gio-document-loader.c
+       xed/xed-gio-document-loader.h
+       xed/xed-gio-document-saver.h
 Copyright: 2005, Paolo Maggi
           2007, Paolo Maggi, Steve Frécinaux
           2008, Jesse van den Kieboom
 License: GPL-2+

-Files: plugins/sort/xedit-sort-plugin.c
-       plugins/sort/xedit-sort-plugin.h
+Files: plugins/sort/xed-sort-plugin.c
+       plugins/sort/xed-sort-plugin.h
 Copyright: *No copyright*
 License: GPL-2+

@@ -223,62 +223,62 @@ Copyright: 1998, James Henstridge <james@daa.com.au>
           2006, Steve Frécinaux
 License: GPL-2+

-Files: xedit/bacon-message-connection.c
-       xedit/bacon-message-connection.h
+Files: xed/bacon-message-connection.c
+       xed/bacon-message-connection.h
 Copyright: 2003, Bastien Nocera <hadess@hadess.net>
 License: GPL-2+

-Files: xedit/xedit-print-job.c
-       xedit/xedit-print-job.h
+Files: xed/xed-print-job.c
+       xed/xed-print-job.h
 Copyright: 2000-2001, Chema Celorio, Paolo Maggi
           2002-2008, Paolo Maggi
 License: GPL-2+

-Files: xedit/xedit-notebook.c
-       xedit/xedit-notebook.h
+Files: xed/xed-notebook.c
+       xed/xed-notebook.h
 Copyright: 2002, Christophe Fergeau
           2003, Marco Pesenti Gritti
           2003-2004, Christian Persch
           2005, Paolo Maggi
 License: GPL-2+

-Files: xedit/xedit-object-module.c
-       xedit/xedit-object-module.h
+Files: xed/xed-object-module.c
+       xed/xed-object-module.h
 Copyright: 2003, Marco Pesenti Gritti
           2003-2004, Christian Persch
           2005, Paolo Maggi
           2008, Jesse van den Kieboom
 License: GPL-2+

-Files: plugins/spell/xedit-automatic-spell-checker.c
-       plugins/spell/xedit-automatic-spell-checker.h
+Files: plugins/spell/xed-automatic-spell-checker.c
+       plugins/spell/xed-automatic-spell-checker.h
 Copyright: 2002, Evan Martin
           2002, Paolo Maggi
 License: GPL-2+

-Files: xedit/xedittextregion.c
-       xedit/xedittextregion.h
+Files: xed/xedtextregion.c
+       xed/xedtextregion.h
 Copyright: 2002, Gustavo Giráldez <gustavo.giraldez@gmx.net>
 License: GPL-2+

-Files: plugins/checkupdate/xedit-check-update-plugin.c
-       plugins/checkupdate/xedit-check-update-plugin.h
+Files: plugins/checkupdate/xed-check-update-plugin.c
+       plugins/checkupdate/xed-check-update-plugin.h
 Copyright: 2009, Ignacio Casal Quinteiro <icq@gnome.org>
 License: GPL-2+

-Files: plugin-loaders/python/xedit-plugin-python.c
-       plugin-loaders/python/xedit-plugin-python.h
+Files: plugin-loaders/python/xed-plugin-python.c
+       plugin-loaders/python/xed-plugin-python.h
 Copyright: 2005, Raphael Slinckx
           2008, Jesse van den Kieboom
 License: GPL-2+

-Files: xedit/dialogs/xedit-close-confirmation-dialog.c
-       xedit/dialogs/xedit-close-confirmation-dialog.h
+Files: xed/dialogs/xed-close-confirmation-dialog.c
+       xed/dialogs/xed-close-confirmation-dialog.h
 Copyright: 2004-2005, GNOME Foundation
 License: GPL-2+

-Files: xedit/xedit-session.c
-       xedit/xedit-session.h
+Files: xed/xed-session.c
+       xed/xed-session.h
 Copyright: 2002, Ximian, Inc.
           2005, Paolo Maggi
 License: GPL-2+
@@ -288,7 +288,7 @@ Files: plugins/externaltools/tools/filelookup.py
 Copyright: 2009-2010, Per Arneng <per.arneng@anyplanet.com>
 License: GPL-2+

-Files: ./xedit/xedit-plugin-info.h
+Files: ./xed/xed-plugin-info.h
 Copyright: 2002-2005, Paolo Maggi
           2007, Paolo Maggi
           2007, Steve Frécinaux
@@ -300,44 +300,44 @@ Copyright: 1998, James Henstridge <james@daa.com.au>
           2008, B. Clausius
 License: GPL-2+

-Files: xedit/xedit-commands-help.c
+Files: xed/xed-commands-help.c
 Copyright: 1998-1999, Alex Roberts, Evan Lawrence
           2000-2001, Chema Celorio, Paolo Maggi
           2002-2005, Paolo Maggi
           2011, Perberos
 License: GPL-2+

-Files: plugins/spell/xedit-spell-checker-language.c
+Files: plugins/spell/xed-spell-checker-language.c
 Copyright: 2003-2004, Christian Persch
           2006, Paolo Maggi
 License: GPL-2+

-Files: xedit/xedit-dirs.c
+Files: xed/xed-dirs.c
 Copyright: 2008, Ignacio Casal Quinteiro
           2011, Perberos
 License: GPL-2+

-Files: xedit/xedit-gio-document-saver.c
+Files: xed/xed-gio-document-saver.c
 Copyright: 2005-2006, Paolo Borelli and Paolo Maggi
           2007, Paolo Borelli, Paolo Maggi, Steve Fr<46>cinaux
           2008, Jesse van den Kieboom
 License: GPL-2+

-Files: xedit/xedit-style-scheme-manager.c
+Files: xed/xed-style-scheme-manager.c
 Copyright: 2007, Paolo Borelli and Paolo Maggi
 License: GPL-2+

-Files: xedit/xedit-document-saver.c
+Files: xed/xed-document-saver.c
 Copyright: 2005-2006, Paolo Borelli and Paolo Maggi
           2007, Paolo Borelli, Paolo Maggi, Steve Fr<46>cinaux
 License: GPL-2+

-Files: xedit/xedit-plugin-manager.c
+Files: xed/xed-plugin-manager.c
 Copyright: 2002, Paolo Maggi and James Willcox
           2003-2006, Paolo Maggi
 License: GPL-2+

-Files: xedit/xedit-encodings.c
+Files: xed/xed-encodings.c
 Copyright: 2002, Red Hat, Inc.
           2002-2005, Paolo Maggi
 License: GPL-2+
@@ -347,13 +347,13 @@ Copyright: 2005-2006, Steve Fr<46>cinaux <steve@istique.net>
           2010, Per Arneng <per.arneng@anyplanet.com>
 License: GPL-2+

-Files: xedit/smclient/eggsmclient-xsmp.c
+Files: xed/smclient/eggsmclient-xsmp.c
 Copyright: 1998, Carsten Schaar
           1998, The Open Group
           2007, Novell, Inc.
 License: LGPL-2+

-Files: xedit/smclient/eggdesktopfile.c
+Files: xed/smclient/eggdesktopfile.c
 Copyright: 1999-2000, Red Hat Inc.
           2001, George Lebl
           2007, Novell, Inc.
@@ -361,7 +361,7 @@ License: LGPL-2+

 Files: data/*.in.in
       data/*.sh.in
-       data/xedit.1
+       data/xed.1
       data/*.convert
       data/*.desktop.in.in
       data/*.pc.in
@@ -382,8 +382,8 @@ Files: data/*.in.in
       plugins/filebrowser/*.template
       plugins/filebrowser/*-marshal.list
       plugins/modelines/language-mappings
-       plugins/filebrowser/xedit-file-browser-messages.c
-       plugins/filebrowser/xedit-file-browser-utils.h
+       plugins/filebrowser/xed-file-browser-messages.c
+       plugins/filebrowser/xed-file-browser-utils.h
       plugins/snippets/snippets/Completion.py
       plugins/snippets/snippets/Exporter.py
       plugins/snippets/snippets/Importer.py
@@ -392,16 +392,16 @@ Files: data/*.in.in
       plugins/snippets/data/lang/snippets.lang
       plugins/snippets/snippets/*.ui
       plugins/taglist/*.xml.in
-       xedit/xedit-message-bus.c
-       xedit/xedit-message-bus.h
-       xedit/xedit-message-type.c
-       xedit/xedit-message-type.h
-       xedit/xedit-message.c
-       xedit/xedit-message.h
-       xedit/*.template
-       xedit/*.ui
-       xedit/*.rc
-       xedit/dialogs/*.ui
+       xed/xed-message-bus.c
+       xed/xed-message-bus.h
+       xed/xed-message-type.c
+       xed/xed-message-type.h
+       xed/xed-message.c
+       xed/xed-message.h
+       xed/*.template
+       xed/*.ui
+       xed/*.rc
+       xed/dialogs/*.ui
       tests/setup-document-saver.sh
       data/Makefile.am
       docs/reference/Makefile.am
@@ -411,24 +411,24 @@ Files: data/*.in.in
       plugin-loaders/Makefile.am
       plugin-loaders/python/Makefile.am
       plugin-loaders/python/bindings/Makefile.am
-       plugin-loaders/python/bindings/xedit.defs
-       plugin-loaders/python/bindings/xedit.override
-       plugin-loaders/python/bindings/xeditcommands.defs
-       plugin-loaders/python/bindings/xeditcommands.override
-       plugin-loaders/python/bindings/xeditmessage.override
-       plugin-loaders/python/bindings/xeditplugin.override
-       plugin-loaders/python/bindings/xeditutils.defs
-       plugin-loaders/python/bindings/xeditutils.override
+       plugin-loaders/python/bindings/xed.defs
+       plugin-loaders/python/bindings/xed.override
+       plugin-loaders/python/bindings/xedcommands.defs
+       plugin-loaders/python/bindings/xedcommands.override
+       plugin-loaders/python/bindings/xedmessage.override
+       plugin-loaders/python/bindings/xedplugin.override
+       plugin-loaders/python/bindings/xedutils.defs
+       plugin-loaders/python/bindings/xedutils.override
       plugins/time/Makefile.am
       plugins/docinfo/Makefile.am
       plugins/pythonconsole/pythonconsole/Makefile.am
       plugins/pythonconsole/Makefile.am
       plugins/filebrowser/Makefile.am
-       plugins/filebrowser/xedit-file-browser-widget-ui.xml
+       plugins/filebrowser/xed-file-browser-widget-ui.xml
       plugins/quickopen/quickopen/Makefile.am
       plugins/quickopen/Makefile.am
       plugins/spell/Makefile.am
-       plugins/spell/xedit-spell-marshal.list
+       plugins/spell/xed-spell-marshal.list
       plugins/Makefile.am
       plugins/modelines/Makefile.am
       plugins/externaltools/tools/Makefile.am
@@ -443,17 +443,17 @@ Files: data/*.in.in
       plugins/snippets/data/Makefile.am
       plugins/snippets/snippets/Makefile.am
       plugins/sort/Makefile.am
-       xedit/xedit-marshal.list
+       xed/xed-marshal.list
       po/gnome-copyrights.txt
-       xedit/Makefile.am
-       xedit/smclient/Makefile.am
-       xedit/dialogs/Makefile.am
+       xed/Makefile.am
+       xed/smclient/Makefile.am
+       xed/dialogs/Makefile.am
       po/LINGUAS
       po/POTFILES.in
       po/POTFILES.skip
       tests/Makefile.am
       tools/plugin_template/Makefile.am
-       tools/plugin_template/xedit-plugin.desktop.in
+       tools/plugin_template/xed-plugin.desktop.in
       .tx/config
       AUTHORS
       COPYING
--- a/debian/rules
+++ b/debian/rules
@@ -3,31 +3,30 @@
 DHFLAGS=--parallel

 %:
-	dh $@ $(DHFLAGS)
-
-override_dh_install:
-	rm -rfv debian/tmp/usr/lib/*/xedit/plugin-loaders/*.la
-	rm -rfv debian/tmp/usr/lib/*/xedit/plugins/*.la
-	dh_install --fail-missing
+	dh $@ $(DHFLAGS) --with gir

 override_dh_auto_configure:
-	# upstream tarball is without configure. autogen.sh will create it
-	NOCONFIGURE=1 ./autogen.sh
-	dh_auto_configure $(DHFLAGS) -- \
-		--disable-silent-rules \
-		--libexecdir=/usr/lib/ \
-		--disable-python \
-		--enable-gtk-doc \
-		--with-gtk=3.0
+	meson debian/build \
+		--prefix=/usr \
+		--buildtype=plain \
+		-D docs=true \
+		-D deprecated_warnings=false

 override_dh_installchangelogs:
 	dh_installchangelogs NEWS

 override_dh_auto_test:
-	DEB_BUILD_OPTIONS=nocheck dh_auto_test
+	ninja -C debian/build test

 override_dh_strip:
-	dh_strip --dbg-package=xedit-dbg
+	dh_strip --dbg-package=xed-dbg

 get-orig-source:
 	uscan --noconf --force-download --rename --download-current-version --destdir=..
+
+override_dh_auto_install:
+	DESTDIR=${CURDIR}/debian/tmp \
+	ninja -C debian/build install
+
+override_dh_auto_build:
+	ninja -C debian/build
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-http://git.mate-desktop.org/xedit/ \
-    snapshot/xedit-(\d\.(?:[0-9]+|)[24680]\.\d)\.tar\.xz
+http://git.mate-desktop.org/xed/ \
+    snapshot/xed-(\d\.(?:[0-9]+|)[24680]\.\d)\.tar\.xz
--- a/debian/xed-common.install
+++ b/debian/xed-common.install
@@ -0,0 +1,6 @@
+usr/share/metainfo
+usr/share/xed/plugins
+usr/share/glib-2.0
+usr/share/help
+usr/share/locale
+usr/share/xed/icons
--- a/debian/xed-common.lintian-overrides
+++ b/debian/xed-common.lintian-overrides
@@ -0,0 +1,2 @@
+# Catch false-positive lintian message
+xed-common: privacy-breach-generic usr/share/xed/plugins/snippets/mallard.xml (http://$1/)
--- a/debian/xed-dev.install
+++ b/debian/xed-dev.install
@@ -0,0 +1,3 @@
+usr/include
+usr/lib/*/pkgconfig/
+usr/share/xed/gir-1.0
--- a/debian/xed-doc.install
+++ b/debian/xed-doc.install
@@ -0,0 +1 @@
+usr/share/gtk-doc
--- a/debian/xed.install
+++ b/debian/xed.install
@@ -0,0 +1,7 @@
+usr/bin/xed
+usr/lib/*/xed/girepository-1.0/
+usr/lib/*/xed/plugins/
+usr/lib/*/xed/*.so
+usr/share/applications/xed.desktop
+usr/share/dbus-1/
+usr/share/man/
--- a/debian/xedit-common.install
+++ b/debian/xedit-common.install
@@ -1,7 +0,0 @@
-usr/share/appdata/
-usr/share/glib-2.0/
-usr/share/help/
-usr/share/locale/
-usr/share/xedit/icons/
-usr/share/xedit/plugins/
-usr/share/xedit/ui/
--- a/debian/xedit-common.lintian-overrides
+++ b/debian/xedit-common.lintian-overrides
@@ -1,2 +0,0 @@
-# Catch false-positive lintian message
-xedit-common: privacy-breach-generic usr/share/xedit/plugins/snippets/mallard.xml (http://$1/)
--- a/debian/xedit-dev.install
+++ b/debian/xedit-dev.install
@@ -1,2 +0,0 @@
-usr/include/xedit/
-usr/lib/*/pkgconfig/
--- a/debian/xedit-doc.install
+++ b/debian/xedit-doc.install
@@ -1 +0,0 @@
-usr/share/gtk-doc/
--- a/debian/xedit.install
+++ b/debian/xedit.install
@@ -1,6 +0,0 @@
-usr/bin/
-usr/lib/*/xedit/plugin-loaders/*.so
-usr/lib/*/xedit/plugins/
-usr/lib/xedit/xedit-bugreport.sh
-usr/share/applications/
-usr/share/man/
--- a/debian/xedit.postrm
+++ b/debian/xedit.postrm
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ remove = "$1" -o abort-install = "$1" -o disappear = "$1" ]; then
-    dpkg-divert --package xedit --remove --rename --divert /usr/bin/x11edit /usr/bin/xedit
-    dpkg-divert --package xedit --remove --rename --divert /usr/share/man/man1/x11edit.1.gz /usr/share/man/man1/xedit.1.gz
-fi
-
-exit 0
--- a/debian/xedit.preinst
+++ b/debian/xedit.preinst
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-    install|upgrade)
-        dpkg-divert --package xedit --add --rename --divert /usr/bin/x11edit /usr/bin/xedit
-        dpkg-divert --package xedit --add --rename --divert /usr/share/man/man1/x11edit.1.gz /usr/share/man/man1/xedit.1.gz
-    ;;
-esac
-
-exit 0
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,5 +0,0 @@
-SUBDIRS = reference
-
-EXTRA_DIST = class-diagram.dia
-
-include $(top_srcdir)/git.mk
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -1,119 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-# see /gtk-doc/examples/Makefile.am
-
-# We require automake 1.6 at least.
-AUTOMAKE_OPTIONS = 1.6
-
-# The name of the module, e.g. 'glib'.
-DOC_MODULE=xedit
-
-# The top-level SGML file. You can change this if you want to.
-DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
-
-# The directory containing the source code. Relative to $(srcdir).
-# gtk-doc will search all .c & .h files beneath here for inline comments
-# documenting the functions and macros.
-DOC_SOURCE_DIR=../../xedit
-
-# Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS=
-
-# Extra options to supply to gtkdoc-scan.
-# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" 
-SCAN_OPTIONS=
-
-# Extra options to supply to gtkdoc-mkdb.
-MKDB_OPTIONS=--sgml-mode --output-format=xml
-
-# Extra options to supply to gtkdoc-mktmpl
-# e.g. MKTMPL_OPTIONS=--only-section-tmpl
-MKTMPL_OPTIONS=
-
-# Extra options to supply to gtkdoc-fixref. Not normally needed.
-# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
-FIXXREF_OPTIONS=
-
-# Used for dependencies. The docs will be rebuilt if any of these change.
-HFILE_GLOB=$(top_srcdir)/xedit/*.h
-CFILE_GLOB=$(top_srcdir)/xedit/*.c
-
-# Header files to ignore when scanning (These are internal to xedit).
-IGNORE_HFILES=		\
-	xedit-commands.h			\
-	xedit-document-loader.h			\
-	xedit-document-saver.h			\
-	xedit-documents-panel.h			\
-	xedit-io-error-message-area.h		\
-	xedit-languages-manager.h		\
-	xedit-object-module.h			\
-	xedit-plugin-manager.h			\
-	xedit-plugins-engine.h			\
-	xedit-prefs-manager-private.h		\
-	xedit-session.h				\
-	xedit-ui.h				\
-	xedit-window-private.h			\
-	xedit-output-window.h			\
-	xedit-close-confirmation-dialog.h	\
-	xedit-encodings-dialog.h		\
-	xedit-open-location-dialog.h		\
-	xedit-page-setup-dialog.h		\
-	xedit-preferences-dialog.h		\
-	xedit-search-dialog.h			\
-	xedit-marshal.h				\
-	xedit-enum-types.h
-
-# These files are not part of xedit but were copied into it for some reason.
-# Do not parse them to make the docs.
-IGNORE_HFILES +=	\
-	bacon-message-connection.h		\
-	xedittextregion.h			\
-	sexy-icon-entry.h
-
-# Images to copy into HTML directory.
-HTML_IMAGES=
-
-# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
-# e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files=
-
-# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
-# These files must be listed here *and* in content_files
-# e.g. expand_content_files=running.sgml
-expand_content_files=
-
-# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
-# Only needed if you are using gtkdoc-scangobj to dynamically query widget
-# signals and properties.
-GTKDOC_CFLAGS=	\
-	-I$(top_srcdir)/xedit	\
-	-I$(top_builddir)/xedit \
-	-I$(top_srcdir)		\
-	-I$(top_builddir)	\
-	$(XEDIT_CFLAGS)
-
-GTKDOC_LIBS=	\
-	$(top_builddir)/xedit/libxedit.la	\
-	$(XEDIT_LIBS)
-
-if ENABLE_PYTHON
-GTKDOC_CFLAGS += \
-        $(NO_STRICT_ALIASING_CFLAGS)    \
-        $(PYGTK_CFLAGS)                 \
-        $(PYTHON_CFLAGS)                \
-        $(AM_CFLAGS)
-GTKDOC_LIBS += \
-	$(top_builddir)/plugin-loaders/python/bindings/xedit.la
-endif
-
-# This includes the standard gtk-doc make rules, copied by gtkdocize.
-include $(top_srcdir)/gtk-doc.make
-
-# Other files to distribute
-# e.g. EXTRA_DIST += version.xml.in
-
-regenerate-types:
-	grep _get_type $(DOC_SOURCE_DIR)/xedit-*.h | grep -oR '^.*\.h' | sort | uniq - | sed -r 's/^.*\.h$/#include "\0"/' > xedit.types
-	grep _get_type $(DOC_SOURCE_DIR)/xedit-*.h | grep -oR '^.*\.h' | sort | uniq - | sed -re 'y/-/_/' -e 's/^(.*)\.h$/\1_get_type/' >> xedit.types.new
-
-include $(top_srcdir)/git.mk
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -0,0 +1,36 @@
+docs_ignore_h = [
+    'xed-close-confirmation-dialog.h',
+    'xed-dirs.h',
+    'xed-commands.h',
+    'xed-documents-panel.h',
+    'xed-io-error-info-bar.h',
+    'xed-languages-manager.h',
+    'xed-plugins-engine.h',
+    'xed-session.h',
+    'xed-ui.h',
+    'xed-window-private.h',
+    'xed-output-window.h',
+    'xed-encodings-dialog.h',
+    'xed-open-location-dialog.h',
+    'xed-page-setup-dialog.h',
+    'xed-preferences-dialog.h',
+    'xed-search-dialog.h',
+    'xed-marshal.h',
+    'xed-enum-types.h'
+]
+
+gnome.gtkdoc(
+    'xed',
+    mode: 'xml',
+    install: true,
+    main_xml: 'xed-docs.xml',
+    gobject_typesfile: 'xed.types',
+    src_dir: [
+        join_paths(meson.source_root(), 'xed'),
+        join_paths(meson.build_root(), 'xed'),
+    ],
+    ignore_headers: docs_ignore_h,
+    dependencies: libxed_dep,
+    scan_args: ['--rebuild-types'],
+    mkdb_args: ['--xml-mode', '--output-format=xml'],
+)
--- a/docs/reference/xed-docs.xml
+++ b/docs/reference/xed-docs.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
+  <bookinfo>
+    <title>xed Reference Manual</title>
+  </bookinfo>
+
+  <chapter>
+    <title>xed</title>
+    <xi:include href="xml/xed-app.xml"/>
+    <xi:include href="xml/xed-app-activatable.xml"/>
+    <xi:include href="xml/xed-document.xml"/>
+    <xi:include href="xml/xed-encodings-combo-box.xml"/>
+    <xi:include href="xml/xed-file-chooser-dialog.xml"/>
+    <xi:include href="xml/xed-message-bus.xml"/>
+    <xi:include href="xml/xed-message-type.xml"/>
+    <xi:include href="xml/xed-message.xml"/>
+    <xi:include href="xml/xed-notebook.xml"/>
+    <xi:include href="xml/xed-panel.xml"/>
+    <xi:include href="xml/xed-print-job-preview.xml"/>
+    <xi:include href="xml/xed-print-job.xml"/>
+    <xi:include href="xml/xed-progress-info-bar.xml"/>
+    <xi:include href="xml/xed-statusbar.xml"/>
+    <xi:include href="xml/xed-tab.xml"/>
+    <xi:include href="xml/xed-view.xml"/>
+    <xi:include href="xml/xed-view-activatable.xml"/>
+    <xi:include href="xml/xed-window.xml"/>
+    <xi:include href="xml/xed-convert.xml"/>
+    <xi:include href="xml/xed-debug.xml"/>
+    <xi:include href="xml/xed-help.xml"/>
+    <xi:include href="xml/xed-utils.xml"/>
+  </chapter>
+
+  <chapter id="object-tree">
+    <title>Object Hierarchy</title>
+    <xi:include href="xml/tree_index.sgml"/>
+  </chapter>
+
+  <index id="api-index-full">
+    <title>Index of all symbols</title>
+    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
+  </index>
+
+  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
+
+</book>
--- a/docs/reference/xedit-overrides.txt
+++ b/docs/reference/xedit-overrides.txt
--- a/docs/reference/xed-sections.txt
+++ b/docs/reference/xed-sections.txt
@@ -0,0 +1,501 @@
+<SECTION>
+<FILE>xed-app</FILE>
+<TITLE>XedApp</TITLE>
+XedApp
+xed_app_create_window
+xed_app_set_window_title
+xed_app_get_main_windows
+xed_app_get_documents
+xed_app_get_views
+xed_app_show_help
+<SUBSECTION Standard>
+XED_APP
+XED_IS_APP
+XED_TYPE_APP
+xed_app_get_type
+XED_APP_CLASS
+XED_IS_APP_CLASS
+XED_APP_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>xed-app-activatable</FILE>
+<TITLE>XedAppActivatable</TITLE>
+XedAppActivatable
+xed_app_activatable_activate
+xed_app_activatable_deactivate
+<SUBSECTION Standard>
+XED_TYPE_APP_ACTIVATABLE
+XED_APP_ACTIVATABLE
+XED_APP_ACTIVATABLE_IFACE
+XED_IS_APP_ACTIVATABLE
+XED_APP_ACTIVATABLE_GET_IFACE
+xed_app_activatable_get_type
+</SECTION>
+
+<SECTION>
+<FILE>xed-document</FILE>
+XedDocumentPrivate
+<TITLE>XedDocument</TITLE>
+XedDocument
+xed_document_new
+xed_document_get_file
+xed_document_get_uri_for_display
+xed_document_get_short_name_for_display
+xed_document_set_short_name_for_display
+xed_document_get_mime_type
+xed_document_get_readonly
+xed_document_is_untouched
+xed_document_is_untitled
+xed_document_get_deleted
+xed_document_goto_line
+xed_document_goto_line_offset
+xed_document_set_language
+xed_document_get_metadata
+<SUBSECTION Standard>
+XED_DOCUMENT
+XED_IS_DOCUMENT
+XED_TYPE_DOCUMENT
+xed_document_get_type
+XED_DOCUMENT_CLASS
+XED_IS_DOCUMENT_CLASS
+XED_DOCUMENT_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>xed-encodings-combo-box</FILE>
+<TITLE>XedEncodingsOptionMenu</TITLE>
+XedEncodingsComboBox
+xed_encodings_combo_box_new
+xed_encodings_combo_box_get_selected_encoding
+xed_encodings_combo_box_set_selected_encoding
+<SUBSECTION Standard>
+XED_ENCODINGS_COMBO_BOX
+XED_IS_ENCODINGS_COMBO_BOX
+XED_TYPE_ENCODINGS_COMBO_BOX
+xed_encodings_combo_box_get_type
+XED_ENCODINGS_COMBO_BOX_CLASS
+XED_IS_ENCODINGS_COMBO_BOX_CLASS
+XED_ENCODINGS_COMBO_BOX_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>xed-file-chooser-dialog</FILE>
+XedFileChooserDialogPrivate
+<TITLE>XedFileChooserDialog</TITLE>
+XedFileChooserDialog
+xed_file_chooser_dialog_new
+xed_file_chooser_dialog_set_encoding
+<SUBSECTION Standard>
+XED_FILE_CHOOSER_DIALOG
+XED_IS_FILE_CHOOSER_DIALOG
+XED_TYPE_FILE_CHOOSER_DIALOG
+xed_file_chooser_dialog_get_type
+XED_FILE_CHOOSER_DIALOG_CLASS
+XED_IS_FILE_CHOOSER_DIALOG_CLASS
+XED_FILE_CHOOSER_DIALOG_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>xed-message-bus</FILE>
+<TITLE>XedMessageBus</TITLE>
+XedMessageBus
+XedMessageCallback
+xed_message_bus_get_default
+xed_message_bus_new
+xed_message_bus_lookup
+xed_message_bus_register
+xed_message_bus_unregister
+xed_message_bus_unregister_all
+xed_message_bus_is_registered
+xed_message_bus_foreach
+xed_message_bus_connect
+xed_message_bus_disconnect
+xed_message_bus_disconnect_by_func
+xed_message_bus_block
+xed_message_bus_block_by_func
+xed_message_bus_unblock
+xed_message_bus_unblock_by_func
+xed_message_bus_send_message
+xed_message_bus_send_message_sync
+xed_message_bus_send
+xed_message_bus_send_sync
+<SUBSECTION Standard>
+XED_MESSAGE_BUS
+XED_IS_MESSAGE_BUS
+XED_TYPE_MESSAGE_BUS
+xed_message_bus_get_type
+XED_MESSAGE_BUS_CLASS
+XED_IS_MESSAGE_BUS_CLASS
+XED_MESSAGE_BUS_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>xed-message-type</FILE>
+<TITLE>XedMessageType</TITLE>
+XedMessageType
+xed_message_type_get_type
+xed_message_type_is_supported
+xed_message_type_identifier
+xed_message_type_is_valid_object_path
+xed_message_type_new
+xed_message_type_new_valist
+xed_message_type_ref
+xed_message_type_unref
+xed_message_type_set
+xed_message_type_set_valist
+xed_message_type_instantiate
+xed_message_type_instantiate_valist
+xed_message_type_get_object_path
+xed_message_type_get_method
+xed_message_type_lookup
+xed_message_type_foreach
+<SUBSECTION Standard>
+XED_TYPE_MESSAGE_TYPE
+</SECTION>
+
+<SECTION>
+<FILE>xed-message</FILE>
+<TITLE>XedMessage</TITLE>
+XedMessage
+xed_message_get
+xed_message_get_valist
+xed_message_get_value
+xed_message_set
+xed_message_set_valist
+xed_message_set_value
+xed_message_set_valuesv
+xed_message_get_object_path
+xed_message_get_method
+xed_message_has_key
+xed_message_get_key_type
+xed_message_validate
+<SUBSECTION Standard>
+XED_MESSAGE
+XED_IS_MESSAGE
+XED_TYPE_MESSAGE
+xed_message_get_type
+XED_MESSAGE_CLASS
+XED_IS_MESSAGE_CLASS
+XED_MESSAGE_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>xed-notebook</FILE>
+XedNotebookPrivate
+<TITLE>XedNotebook</TITLE>
+XedNotebook
+xed_notebook_new
+xed_notebook_add_tab
+xed_notebook_remove_tab
+xed_notebook_remove_all_tabs
+xed_notebook_reorder_tab
+xed_notebook_move_tab
+xed_notebook_set_always_show_tabs
+xed_notebook_set_close_buttons_sensitive
+xed_notebook_get_close_buttons_sensitive
+xed_notebook_set_tab_drag_and_drop_enabled
+xed_notebook_get_tab_drag_and_drop_enabled
+<SUBSECTION Standard>
+XED_NOTEBOOK
+XED_IS_NOTEBOOK
+XED_TYPE_NOTEBOOK
+xed_notebook_get_type
+XED_NOTEBOOK_CLASS
+XED_IS_NOTEBOOK_CLASS
+XED_NOTEBOOK_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>xed-panel</FILE>
+XedPanelPrivate
+<TITLE>XedPanel</TITLE>
+XedPanel
+xed_panel_new
+xed_panel_add_item
+xed_panel_add_item_with_stock_icon
+xed_panel_remove_item
+xed_panel_activate_item
+xed_panel_item_is_active
+xed_panel_get_orientation
+xed_panel_get_n_items
+<SUBSECTION Standard>
+XED_PANEL
+XED_IS_PANEL
+XED_TYPE_PANEL
+xed_panel_get_type
+XED_PANEL_CLASS
+XED_IS_PANEL_CLASS
+XED_PANEL_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>xed-print-job-preview</FILE>
+XedPrintJobPreviewPrivate
+<TITLE>XedPrintJobPreview</TITLE>
+XedPrintJobPreview
+xed_print_job_preview_new
+<SUBSECTION Standard>
+XED_PRINT_JOB_PREVIEW
+XED_IS_PRINT_JOB_PREVIEW
+XED_TYPE_PRINT_JOB_PREVIEW
+xed_print_job_preview_get_type
+XED_PRINT_JOB_PREVIEW_CLASS
+XED_IS_PRINT_JOB_PREVIEW_CLASS
+XED_PRINT_JOB_PREVIEW_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>xed-print-job</FILE>
+<TITLE>XedPrintJob</TITLE>
+XedPrintJob
+xed_print_job_new
+xed_print_job_save_config
+xed_print_dialog_new
+<SUBSECTION Standard>
+XED_PRINT_JOB
+XED_IS_PRINT_JOB
+XED_TYPE_PRINT_JOB
+xed_print_job_get_type
+XED_PRINT_JOB_CLASS
+XED_IS_PRINT_JOB_CLASS
+XED_PRINT_JOB_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>xed-progress-info-bar</FILE>
+<TITLE>XedProgressInfoBar</TITLE>
+XedProgressInfoBar
+xed_progress_info_bar_new
+xed_progress_info_bar_set_icon_name
+xed_progress_info_bar_set_markup
+xed_progress_info_bar_set_text
+xed_progress_info_bar_set_fraction
+xed_progress_info_bar_pulse
+<SUBSECTION Standard>
+XED_PROGRESS_INFO_BAR
+XED_IS_PROGRESS_INFO_BAR
+XED_TYPE_PROGRESS_INFO_BAR
+xed_progress_info_bar_get_type
+XED_PROGRESS_INFO_BAR_CLASS
+XED_IS_PROGRESS_INFO_BAR_CLASS
+XED_PROGRESS_INFO_BAR_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>xed-statusbar</FILE>
+<TITLE>XedStatusbar</TITLE>
+XedStatusbar
+xed_statusbar_new
+xed_statusbar_set_window_state
+xed_statusbar_set_overwrite
+xed_statusbar_set_cursor_position
+xed_statusbar_clear_overwrite
+xed_statusbar_flash_message
+<SUBSECTION Standard>
+XED_STATUSBAR
+XED_IS_STATUSBAR
+XED_TYPE_STATUSBAR
+xed_statusbar_get_type
+XED_STATUSBAR_CLASS
+XED_IS_STATUSBAR_CLASS
+XED_STATUSBAR_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>xed-tab</FILE>
+XedTabState
+XedTabPrivate
+<TITLE>XedTab</TITLE>
+XedTab
+xed_tab_get_view
+xed_tab_get_document
+xed_tab_get_from_document
+xed_tab_get_state
+xed_tab_get_auto_save_enabled
+xed_tab_set_auto_save_enabled
+xed_tab_get_auto_save_interval
+xed_tab_set_auto_save_interval
+<SUBSECTION Standard>
+XED_TAB
+XED_IS_TAB
+XED_TYPE_TAB
+xed_tab_get_type
+XED_TAB_CLASS
+XED_IS_TAB_CLASS
+XED_TAB_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>xed-view</FILE>
+XedViewPrivate
+<TITLE>XedView</TITLE>
+XedView
+xed_view_new
+xed_view_cut_clipboard
+xed_view_copy_clipboard
+xed_view_paste_clipboard
+xed_view_delete_selection
+xed_view_select_all
+xed_view_scroll_to_cursor
+xed_view_set_colors
+xed_view_set_font
+<SUBSECTION Standard>
+XED_VIEW
+XED_IS_VIEW
+XED_TYPE_VIEW
+xed_view_get_type
+XED_VIEW_CLASS
+XED_IS_VIEW_CLASS
+XED_VIEW_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>xed-view-activatable</FILE>
+<TITLE>XedViewActivatable</TITLE>
+XedViewActivatable
+xed_view_activatable_activate
+xed_view_activatable_deactivate
+xed_view_activatable_update_state
+<SUBSECTION Standard>
+XED_TYPE_VIEW_ACTIVATABLE
+XED_VIEW_ACTIVATABLE
+XED_VIEW_ACTIVATABLE_IFACE
+XED_IS_VIEW_ACTIVATABLE
+XED_VIEW_ACTIVATABLE_GET_IFACE
+xed_view_activatable_get_type
+</SECTION>
+
+<SECTION>
+<FILE>xed-window</FILE>
+XedWindowState
+XedWindowPrivate
+<TITLE>XedWindow</TITLE>
+XedWindow
+xed_window_create_tab
+xed_window_create_tab_from_location
+xed_window_close_tab
+xed_window_close_all_tabs
+xed_window_close_tabs
+xed_window_get_active_tab
+xed_window_set_active_tab
+xed_window_get_active_view
+xed_window_get_active_document
+xed_window_get_documents
+xed_window_get_unsaved_documents
+xed_window_get_views
+xed_window_get_group
+xed_window_get_side_panel
+xed_window_get_bottom_panel
+xed_window_get_statusbar
+xed_window_get_ui_manager
+xed_window_get_state
+xed_window_get_tab_from_location
+xed_window_get_message_bus
+<SUBSECTION Standard>
+XED_WINDOW
+XED_IS_WINDOW
+XED_TYPE_WINDOW
+xed_window_get_type
+XED_WINDOW_CLASS
+XED_IS_WINDOW_CLASS
+XED_WINDOW_GET_CLASS
+</SECTION>
+
+<FILE>xed-window-activatable</FILE>
+<TITLE>XedWindowActivatable</TITLE>
+XedWindowActivatable
+xed_window_activatable_activate
+xed_window_activatable_deactivate
+xed_window_activatable_update_state
+<SUBSECTION Standard>
+XED_TYPE_WINDOW_ACTIVATABLE
+XED_WINDOW_ACTIVATABLE
+XED_WINDOW_ACTIVATABLE_IFACE
+XED_IS_WINDOW_ACTIVATABLE
+XED_WINDOW_ACTIVATABLE_GET_IFACE
+xed_window_activatable_get_type
+
+<SECTION>
+<FILE>xed-convert</FILE>
+XedConvertError
+XED_CONVERT_ERROR
+xed_convert_error_quark
+xed_convert_to_utf8
+xed_convert_from_utf8
+</SECTION>
+
+<SECTION>
+<FILE>xed-debug</FILE>
+XedDebugSection
+DEBUG_VIEW
+DEBUG_SEARCH
+DEBUG_PRINT
+DEBUG_PREFS
+DEBUG_PLUGINS
+DEBUG_TAB
+DEBUG_DOCUMENT
+DEBUG_COMMANDS
+DEBUG_APP
+DEBUG_SESSION
+DEBUG_UTILS
+DEBUG_METADATA
+DEBUG_WINDOW
+DEBUG_LOADER
+DEBUG_SAVER
+xed_debug_init
+xed_debug
+xed_debug_message
+</SECTION>
+
+<SECTION>
+<FILE>xed-help</FILE>
+xed_help_display
+</SECTION>
+
+<SECTION>
+<FILE>xed-utils</FILE>
+GBOOLEAN_TO_POINTER
+GPOINTER_TO_BOOLEAN
+IS_VALID_BOOLEAN
+xed_gtk_button_new_with_stock_icon
+xed_dialog_add_button
+xed_utils_escape_underscores
+xed_utils_escape_slashes
+xed_utils_str_middle_truncate
+g_utf8_caselessnmatch
+xed_utils_set_atk_name_description
+xed_utils_set_atk_relation
+xed_utils_uri_exists
+xed_utils_get_stdin
+xed_warning
+xed_utils_make_valid_utf8
+xed_utils_uri_get_dirname
+xed_utils_replace_home_dir_with_tilde
+xed_utils_get_current_workspace
+xed_utils_get_window_workspace
+xed_utils_activate_url
+xed_utils_is_valid_uri
+xed_utils_get_glade_widgets
+xed_utils_make_canonical_uri_from_shell_arg
+xed_utils_format_uri_for_display
+</SECTION>
+
+<SECTION>
+<FILE>xed-enum-types</FILE>
+XED_TYPE_CONVERT_ERROR
+xed_convert_error_get_type
+XED_TYPE_DEBUG_SECTION
+xed_debug_section_get_type
+XED_TYPE_SEARCH_FLAGS
+xed_search_flags_get_type
+XED_TYPE_DOCUMENT_SAVE_FLAGS
+xed_document_save_flags_get_type
+XED_TYPE_TOOLBAR_SETTING
+xed_toolbar_setting_get_type
+XED_TYPE_TAB_STATE
+xed_tab_state_get_type
+XED_TYPE_WINDOW_STATE
+xed_window_state_get_type
+</SECTION>
+
--- a/docs/reference/xedit-docs.sgml
+++ b/docs/reference/xedit-docs.sgml
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
-  <bookinfo>
-    <title>xedit Reference Manual</title>
-  </bookinfo>
-
-  <chapter>
-    <title>xedit</title>
-    <xi:include href="xml/xedit-app.xml"/>
-    <xi:include href="xml/xedit-document.xml"/>
-    <xi:include href="xml/xedit-encodings-option-menu.xml"/>
-    <xi:include href="xml/xedit-file-chooser-dialog.xml"/>
-    <xi:include href="xml/xedit-message-bus.xml"/>
-    <xi:include href="xml/xedit-message-type.xml"/>
-    <xi:include href="xml/xedit-message.xml"/>
-    <xi:include href="xml/xedit-notebook.xml"/>
-    <xi:include href="xml/xedit-panel.xml"/>
-    <xi:include href="xml/xedit-plugin.xml"/>
-    <xi:include href="xml/xedit-print-job-preview.xml"/>
-    <xi:include href="xml/xedit-print.xml"/>
-    <xi:include href="xml/xedit-progress-message-area.xml"/>
-    <xi:include href="xml/xedit-statusbar.xml"/>
-    <xi:include href="xml/xedit-tab.xml"/>
-    <xi:include href="xml/xedit-view.xml"/>
-    <xi:include href="xml/xedit-window.xml"/>
-    <xi:include href="xml/xedit-convert.xml"/>
-    <xi:include href="xml/xedit-debug.xml"/>
-    <xi:include href="xml/xedit-encodings.xml"/>
-    <xi:include href="xml/xedit-help.xml"/>
-    <xi:include href="xml/xedit-metadata-manager.xml"/>
-    <xi:include href="xml/xedit-prefs-manager-app.xml"/>
-    <xi:include href="xml/xedit-prefs-manager.xml"/>
-    <xi:include href="xml/xedit-utils.xml"/>
-  </chapter>
-</book>
--- a/docs/reference/xedit-sections.txt
+++ b/docs/reference/xedit-sections.txt
@@ -1,799 +0,0 @@
-<SECTION>
-<FILE>xedit-app</FILE>
-XeditAppPrivate
-<TITLE>XeditApp</TITLE>
-XeditApp
-xedit_app_get_default
-xedit_app_create_window
-xedit_app_get_windows
-xedit_app_get_active_window
-xedit_app_get_documents
-xedit_app_get_views
-<SUBSECTION Standard>
-XEDIT_APP
-XEDIT_IS_APP
-XEDIT_TYPE_APP
-xedit_app_get_type
-XEDIT_APP_CLASS
-XEDIT_IS_APP_CLASS
-XEDIT_APP_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>xedit-document</FILE>
-XeditSearchFlags
-XeditDocumentPrivate
-<TITLE>XeditDocument</TITLE>
-XeditDocument
-XeditDocumentSaveFlags
-XEDIT_DOCUMENT_ERROR
-xedit_document_error_quark
-xedit_document_new
-xedit_document_get_uri
-xedit_document_get_uri_for_display
-xedit_document_get_short_name_for_display
-xedit_document_get_mime_type
-xedit_document_get_readonly
-xedit_document_load
-xedit_document_insert_file
-xedit_document_load_cancel
-xedit_document_save
-xedit_document_save_as
-xedit_document_is_untouched
-xedit_document_is_untitled
-xedit_document_get_deleted
-xedit_document_goto_line
-xedit_document_set_search_text
-xedit_document_get_search_text
-xedit_document_get_can_search_again
-xedit_document_search_forward
-xedit_document_search_backward
-xedit_document_replace_all
-xedit_document_set_language
-xedit_document_set_enable_search_highlighting
-xedit_document_get_enable_search_highlighting
-XEDIT_SEARCH_IS_DONT_SET_FLAGS
-XEDIT_SEARCH_SET_DONT_SET_FLAGS
-XEDIT_SEARCH_IS_ENTIRE_WORD
-XEDIT_SEARCH_SET_ENTIRE_WORD
-XEDIT_SEARCH_IS_CASE_SENSITIVE
-XEDIT_SEARCH_SET_CASE_SENSITIVE
-<SUBSECTION Standard>
-XEDIT_DOCUMENT
-XEDIT_IS_DOCUMENT
-XEDIT_TYPE_DOCUMENT
-xedit_document_get_type
-XEDIT_DOCUMENT_CLASS
-XEDIT_IS_DOCUMENT_CLASS
-XEDIT_DOCUMENT_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>xedit-encodings-option-menu</FILE>
-XeditEncodingsOptionMenuPrivate
-<TITLE>XeditEncodingsOptionMenu</TITLE>
-XeditEncodingsOptionMenu
-xedit_encodings_option_menu_new
-xedit_encodings_option_menu_get_selected_encoding
-xedit_encodings_option_menu_set_selected_encoding
-<SUBSECTION Standard>
-XEDIT_ENCODINGS_OPTION_MENU
-XEDIT_IS_ENCODINGS_OPTION_MENU
-XEDIT_TYPE_ENCODINGS_OPTION_MENU
-xedit_encodings_option_menu_get_type
-XEDIT_ENCODINGS_OPTION_MENU_CLASS
-XEDIT_IS_ENCODINGS_OPTION_MENU_CLASS
-XEDIT_ENCODINGS_OPTION_MENU_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>xedit-file-chooser-dialog</FILE>
-XeditFileChooserDialogPrivate
-<TITLE>XeditFileChooserDialog</TITLE>
-XeditFileChooserDialog
-xedit_file_chooser_dialog_new
-xedit_file_chooser_dialog_set_encoding
-<SUBSECTION Standard>
-XEDIT_FILE_CHOOSER_DIALOG
-XEDIT_IS_FILE_CHOOSER_DIALOG
-XEDIT_TYPE_FILE_CHOOSER_DIALOG
-xedit_file_chooser_dialog_get_type
-XEDIT_FILE_CHOOSER_DIALOG_CLASS
-XEDIT_IS_FILE_CHOOSER_DIALOG_CLASS
-XEDIT_FILE_CHOOSER_DIALOG_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>xedit-message-bus</FILE>
-<TITLE>XeditMessageBus</TITLE>
-XeditMessageBus
-XeditMessageCallback
-xedit_message_bus_get_default
-xedit_message_bus_new
-xedit_message_bus_lookup
-xedit_message_bus_register
-xedit_message_bus_unregister
-xedit_message_bus_unregister_all
-xedit_message_bus_is_registered
-xedit_message_bus_foreach
-xedit_message_bus_connect
-xedit_message_bus_disconnect
-xedit_message_bus_disconnect_by_func
-xedit_message_bus_block
-xedit_message_bus_block_by_func
-xedit_message_bus_unblock
-xedit_message_bus_unblock_by_func
-xedit_message_bus_send_message
-xedit_message_bus_send_message_sync
-xedit_message_bus_send
-xedit_message_bus_send_sync
-<SUBSECTION Standard>
-XEDIT_MESSAGE_BUS
-XEDIT_IS_MESSAGE_BUS
-XEDIT_TYPE_MESSAGE_BUS
-xedit_message_bus_get_type
-XEDIT_MESSAGE_BUS_CLASS
-XEDIT_IS_MESSAGE_BUS_CLASS
-XEDIT_MESSAGE_BUS_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>xedit-message-type</FILE>
-<TITLE>XeditMessageType</TITLE>
-XeditMessageType
-xedit_message_type_get_type
-xedit_message_type_is_supported
-xedit_message_type_identifier
-xedit_message_type_is_valid_object_path
-xedit_message_type_new
-xedit_message_type_new_valist
-xedit_message_type_ref
-xedit_message_type_unref
-xedit_message_type_set
-xedit_message_type_set_valist
-xedit_message_type_instantiate
-xedit_message_type_instantiate_valist
-xedit_message_type_get_object_path
-xedit_message_type_get_method
-xedit_message_type_lookup
-xedit_message_type_foreach
-<SUBSECTION Standard>
-XEDIT_TYPE_MESSAGE_TYPE
-</SECTION>
-
-<SECTION>
-<FILE>xedit-message</FILE>
-<TITLE>XeditMessage</TITLE>
-XeditMessage
-xedit_message_get
-xedit_message_get_valist
-xedit_message_get_value
-xedit_message_set
-xedit_message_set_valist
-xedit_message_set_value
-xedit_message_set_valuesv
-xedit_message_get_object_path
-xedit_message_get_method
-xedit_message_has_key
-xedit_message_get_key_type
-xedit_message_validate
-<SUBSECTION Standard>
-XEDIT_MESSAGE
-XEDIT_IS_MESSAGE
-XEDIT_TYPE_MESSAGE
-xedit_message_get_type
-XEDIT_MESSAGE_CLASS
-XEDIT_IS_MESSAGE_CLASS
-XEDIT_MESSAGE_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>xedit-notebook</FILE>
-XeditNotebookPrivate
-<TITLE>XeditNotebook</TITLE>
-XeditNotebook
-xedit_notebook_new
-xedit_notebook_add_tab
-xedit_notebook_remove_tab
-xedit_notebook_remove_all_tabs
-xedit_notebook_reorder_tab
-xedit_notebook_move_tab
-xedit_notebook_set_always_show_tabs
-xedit_notebook_set_close_buttons_sensitive
-xedit_notebook_get_close_buttons_sensitive
-xedit_notebook_set_tab_drag_and_drop_enabled
-xedit_notebook_get_tab_drag_and_drop_enabled
-<SUBSECTION Standard>
-XEDIT_NOTEBOOK
-XEDIT_IS_NOTEBOOK
-XEDIT_TYPE_NOTEBOOK
-xedit_notebook_get_type
-XEDIT_NOTEBOOK_CLASS
-XEDIT_IS_NOTEBOOK_CLASS
-XEDIT_NOTEBOOK_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>xedit-panel</FILE>
-XeditPanelPrivate
-<TITLE>XeditPanel</TITLE>
-XeditPanel
-xedit_panel_new
-xedit_panel_add_item
-xedit_panel_add_item_with_stock_icon
-xedit_panel_remove_item
-xedit_panel_activate_item
-xedit_panel_item_is_active
-xedit_panel_get_orientation
-xedit_panel_get_n_items
-<SUBSECTION Standard>
-XEDIT_PANEL
-XEDIT_IS_PANEL
-XEDIT_TYPE_PANEL
-xedit_panel_get_type
-XEDIT_PANEL_CLASS
-XEDIT_IS_PANEL_CLASS
-XEDIT_PANEL_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>xedit-plugin</FILE>
-<TITLE>XeditPlugin</TITLE>
-XeditPlugin
-xedit_plugin_activate
-xedit_plugin_deactivate
-xedit_plugin_update_ui
-xedit_plugin_is_configurable
-xedit_plugin_create_configure_dialog
-XEDIT_PLUGIN_REGISTER_TYPE
-<SUBSECTION Standard>
-XEDIT_PLUGIN
-XEDIT_IS_PLUGIN
-XEDIT_TYPE_PLUGIN
-xedit_plugin_get_type
-XEDIT_PLUGIN_CLASS
-XEDIT_IS_PLUGIN_CLASS
-XEDIT_PLUGIN_GET_CLASS
-XEDIT_PLUGIN_REGISTER_TYPE_WITH_CODE
-XEDIT_PLUGIN_REGISTER_TYPE
-XEDIT_PLUGIN_DEFINE_TYPE_WITH_CODE
-XEDIT_PLUGIN_DEFINE_TYPE
-</SECTION>
-
-<SECTION>
-<FILE>xedit-print-job-preview</FILE>
-XeditPrintJobPreviewPrivate
-<TITLE>XeditPrintJobPreview</TITLE>
-XeditPrintJobPreview
-xedit_print_job_preview_new
-<SUBSECTION Standard>
-XEDIT_PRINT_JOB_PREVIEW
-XEDIT_IS_PRINT_JOB_PREVIEW
-XEDIT_TYPE_PRINT_JOB_PREVIEW
-xedit_print_job_preview_get_type
-XEDIT_PRINT_JOB_PREVIEW_CLASS
-XEDIT_IS_PRINT_JOB_PREVIEW_CLASS
-XEDIT_PRINT_JOB_PREVIEW_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>xedit-print</FILE>
-<TITLE>XeditPrintJob</TITLE>
-XeditPrintJob
-xedit_print_job_new
-xedit_print_job_save_config
-xedit_print_dialog_new
-<SUBSECTION Standard>
-XEDIT_PRINT_JOB
-XEDIT_IS_PRINT_JOB
-XEDIT_TYPE_PRINT_JOB
-xedit_print_job_get_type
-XEDIT_PRINT_JOB_CLASS
-XEDIT_IS_PRINT_JOB_CLASS
-XEDIT_PRINT_JOB_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>xedit-progress-message-area</FILE>
-XeditProgressMessageAreaPrivate
-<TITLE>XeditProgressMessageArea</TITLE>
-XeditProgressMessageArea
-xedit_progress_message_area_new
-xedit_progress_message_area_set_stock_image
-xedit_progress_message_area_set_markup
-xedit_progress_message_area_set_text
-xedit_progress_message_area_set_fraction
-xedit_progress_message_area_pulse
-<SUBSECTION Standard>
-XEDIT_PROGRESS_MESSAGE_AREA
-XEDIT_IS_PROGRESS_MESSAGE_AREA
-XEDIT_TYPE_PROGRESS_MESSAGE_AREA
-xedit_progress_message_area_get_type
-XEDIT_PROGRESS_MESSAGE_AREA_CLASS
-XEDIT_IS_PROGRESS_MESSAGE_AREA_CLASS
-XEDIT_PROGRESS_MESSAGE_AREA_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>xedit-statusbar</FILE>
-XeditStatusbarPrivate
-<TITLE>XeditStatusbar</TITLE>
-XeditStatusbar
-xedit_statusbar_new
-XeditStatus
-xedit_statusbar_set_window_state
-xedit_statusbar_set_overwrite
-xedit_statusbar_set_cursor_position
-xedit_statusbar_clear_overwrite
-xedit_statusbar_flash_message
-<SUBSECTION Standard>
-XEDIT_STATUSBAR
-XEDIT_IS_STATUSBAR
-XEDIT_TYPE_STATUSBAR
-xedit_statusbar_get_type
-XEDIT_STATUSBAR_CLASS
-XEDIT_IS_STATUSBAR_CLASS
-XEDIT_STATUSBAR_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>xedit-tab</FILE>
-XeditTabState
-XeditTabPrivate
-<TITLE>XeditTab</TITLE>
-XeditTab
-xedit_tab_get_view
-xedit_tab_get_document
-xedit_tab_get_from_document
-xedit_tab_get_state
-xedit_tab_get_auto_save_enabled
-xedit_tab_set_auto_save_enabled
-xedit_tab_get_auto_save_interval
-xedit_tab_set_auto_save_interval
-<SUBSECTION Standard>
-XEDIT_TAB
-XEDIT_IS_TAB
-XEDIT_TYPE_TAB
-xedit_tab_get_type
-XEDIT_TAB_CLASS
-XEDIT_IS_TAB_CLASS
-XEDIT_TAB_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>xedit-view</FILE>
-XeditViewPrivate
-<TITLE>XeditView</TITLE>
-XeditView
-xedit_view_new
-xedit_view_cut_clipboard
-xedit_view_copy_clipboard
-xedit_view_paste_clipboard
-xedit_view_delete_selection
-xedit_view_select_all
-xedit_view_scroll_to_cursor
-xedit_view_set_colors
-xedit_view_set_font
-<SUBSECTION Standard>
-XEDIT_VIEW
-XEDIT_IS_VIEW
-XEDIT_TYPE_VIEW
-xedit_view_get_type
-XEDIT_VIEW_CLASS
-XEDIT_IS_VIEW_CLASS
-XEDIT_VIEW_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>xedit-window</FILE>
-XeditWindowState
-XeditWindowPrivate
-<TITLE>XeditWindow</TITLE>
-XeditWindow
-xedit_window_create_tab
-xedit_window_create_tab_from_uri
-xedit_window_close_tab
-xedit_window_close_all_tabs
-xedit_window_close_tabs
-xedit_window_get_active_tab
-xedit_window_set_active_tab
-xedit_window_get_active_view
-xedit_window_get_active_document
-xedit_window_get_documents
-xedit_window_get_unsaved_documents
-xedit_window_get_views
-xedit_window_get_group
-xedit_window_get_side_panel
-xedit_window_get_bottom_panel
-xedit_window_get_statusbar
-xedit_window_get_ui_manager
-xedit_window_get_state
-xedit_window_get_tab_from_location
-xedit_window_get_tab_from_uri
-xedit_window_get_message_bus
-<SUBSECTION Standard>
-XEDIT_WINDOW
-XEDIT_IS_WINDOW
-XEDIT_TYPE_WINDOW
-xedit_window_get_type
-XEDIT_WINDOW_CLASS
-XEDIT_IS_WINDOW_CLASS
-XEDIT_WINDOW_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>xedit-convert</FILE>
-XeditConvertError
-XEDIT_CONVERT_ERROR
-xedit_convert_error_quark
-xedit_convert_to_utf8
-xedit_convert_from_utf8
-</SECTION>
-
-<SECTION>
-<FILE>xedit-debug</FILE>
-XeditDebugSection
-DEBUG_VIEW
-DEBUG_SEARCH
-DEBUG_PRINT
-DEBUG_PREFS
-DEBUG_PLUGINS
-DEBUG_TAB
-DEBUG_DOCUMENT
-DEBUG_COMMANDS
-DEBUG_APP
-DEBUG_SESSION
-DEBUG_UTILS
-DEBUG_METADATA
-DEBUG_WINDOW
-DEBUG_LOADER
-DEBUG_SAVER
-xedit_debug_init
-xedit_debug
-xedit_debug_message
-</SECTION>
-
-<SECTION>
-<FILE>xedit-encodings</FILE>
-XeditEncoding
-XEDIT_TYPE_ENCODING
-xedit_encoding_get_type
-xedit_encoding_copy
-xedit_encoding_free
-xedit_encoding_get_from_charset
-xedit_encoding_get_from_index
-xedit_encoding_to_string
-xedit_encoding_get_name
-xedit_encoding_get_charset
-xedit_encoding_get_utf8
-xedit_encoding_get_current
-</SECTION>
-
-<SECTION>
-<FILE>xedit-help</FILE>
-xedit_help_display
-</SECTION>
-
-<SECTION>
-<FILE>xedit-metadata-manager</FILE>
-xedit_metadata_manager_shutdown
-xedit_metadata_manager_get
-xedit_metadata_manager_set
-</SECTION>
-
-<SECTION>
-<FILE>xedit-prefs-manager-app</FILE>
-xedit_prefs_manager_app_init
-xedit_prefs_manager_app_shutdown
-xedit_prefs_manager_get_window_state
-xedit_prefs_manager_set_window_state
-xedit_prefs_manager_window_state_can_set
-xedit_prefs_manager_get_window_size
-xedit_prefs_manager_get_default_window_size
-xedit_prefs_manager_set_window_size
-xedit_prefs_manager_window_size_can_set
-xedit_prefs_manager_get_side_panel_size
-xedit_prefs_manager_get_default_side_panel_size
-xedit_prefs_manager_set_side_panel_size
-xedit_prefs_manager_side_panel_size_can_set
-xedit_prefs_manager_get_bottom_panel_size
-xedit_prefs_manager_get_default_bottom_panel_size
-xedit_prefs_manager_set_bottom_panel_size
-xedit_prefs_manager_bottom_panel_size_can_set
-</SECTION>
-
-<SECTION>
-<FILE>xedit-prefs-manager</FILE>
-XEDIT_BASE_KEY
-GPM_PREFS_DIR
-GPM_FONT_DIR
-GPM_USE_DEFAULT_FONT
-GPM_EDITOR_FONT
-GPM_COLORS_DIR
-GPM_USE_DEFAULT_COLORS
-GPM_BACKGROUND_COLOR
-GPM_TEXT_COLOR
-GPM_SELECTED_TEXT_COLOR
-GPM_SELECTION_COLOR
-GPM_SAVE_DIR
-GPM_CREATE_BACKUP_COPY
-GPM_BACKUP_COPY_EXTENSION
-GPM_AUTO_SAVE
-GPM_AUTO_SAVE_INTERVAL
-GPM_UNDO_DIR
-GPM_UNDO_ACTIONS_LIMIT
-GPM_WRAP_MODE_DIR
-GPM_WRAP_MODE
-GPM_TABS_DIR
-GPM_TABS_SIZE
-GPM_INSERT_SPACES
-GPM_AUTO_INDENT_DIR
-GPM_AUTO_INDENT
-GPM_LINE_NUMBERS_DIR
-GPM_DISPLAY_LINE_NUMBERS
-GPM_CURRENT_LINE_DIR
-GPM_HIGHLIGHT_CURRENT_LINE
-GPM_BRACKET_MATCHING_DIR
-GPM_BRACKET_MATCHING
-GPM_RIGHT_MARGIN_DIR
-GPM_DISPLAY_RIGHT_MARGIN
-GPM_RIGHT_MARGIN_POSITION
-GPM_CURSOR_POSITION_DIR
-GPM_RESTORE_CURSOR_POSITION
-GPM_SEARCH_HIGHLIGHTING_DIR
-GPM_SEARCH_HIGHLIGHTING_ENABLE
-GPM_TOOLBAR_DIR
-GPM_TOOLBAR_VISIBLE
-GPM_TOOLBAR_BUTTONS_STYLE
-GPM_STATUSBAR_DIR
-GPM_STATUSBAR_VISIBLE
-GPM_SIDE_PANE_DIR
-GPM_SIDE_PANE_VISIBLE
-GPM_BOTTOM_PANEL_DIR
-GPM_BOTTOM_PANEL_VISIBLE
-GPM_RECENTS_DIR
-GPM_MAX_RECENTS
-GPM_PRINT_PAGE_DIR
-GPM_PRINT_SYNTAX
-GPM_PRINT_HEADER
-GPM_PRINT_WRAP_MODE
-GPM_PRINT_LINE_NUMBERS
-GPM_PRINT_FONT_DIR
-GPM_PRINT_FONT_BODY
-GPM_PRINT_FONT_BODY_PANGO
-GPM_PRINT_FONT_HEADER
-GPM_PRINT_FONT_HEADER_PANGO
-GPM_PRINT_FONT_NUMBERS
-GPM_PRINT_FONT_NUMBERS_PANGO
-GPM_WINDOW_DIR
-GPM_WINDOW_STATE
-GPM_WINDOW_WIDTH
-GPM_WINDOW_HEIGHT
-GPM_SIDE_PANEL_SIZE
-GPM_BOTTOM_PANEL_SIZE
-GPM_ENCODINGS_DIR
-GPM_AUTO_DETECTED_ENCODINGS
-GPM_SHOWN_IN_MENU_ENCODINGS
-GPM_SYNTAX_HL_DIR
-GPM_SYNTAX_HL_ENABLE
-GPM_WRITABLE_VFS_SCHEMES
-GPM_DEFAULT_USE_DEFAULT_FONT
-GPM_DEFAULT_EDITOR_FONT
-GPM_DEFAULT_USE_DEFAULT_COLORS
-GPM_DEFAULT_BACKGROUND_COLOR
-GPM_DEFAULT_TEXT_COLOR
-GPM_DEFAULT_SELECTED_TEXT_COLOR
-GPM_DEFAULT_SELECTION_COLOR
-GPM_DEFAULT_CREATE_BACKUP_COPY
-GPM_DEFAULT_BACKUP_COPY_EXTENSION
-GPM_DEFAULT_AUTO_SAVE
-GPM_DEFAULT_AUTO_SAVE_INTERVAL
-GPM_DEFAULT_UNDO_ACTIONS_LIMIT
-GPM_DEFAULT_WRAP_MODE
-GPM_DEFAULT_TABS_SIZE
-GPM_DEFAULT_INSERT_SPACES
-GPM_DEFAULT_AUTO_INDENT
-GPM_DEFAULT_DISPLAY_LINE_NUMBERS
-GPM_DEFAULT_AUTO_DETECTED_ENCODINGS
-GPM_DEFAULT_TOOLBAR_VISIBLE
-GPM_DEFAULT_TOOLBAR_BUTTONS_STYLE
-GPM_DEFAULT_TOOLBAR_SHOW_TOOLTIPS
-GPM_DEFAULT_STATUSBAR_VISIBLE
-GPM_DEFAULT_SIDE_PANE_VISIBLE
-GPM_DEFAULT_BOTTOM_PANEL_VISIBLE
-GPM_DEFAULT_PRINT_SYNTAX
-GPM_DEFAULT_PRINT_HEADER
-GPM_DEFAULT_PRINT_WRAP_MODE
-GPM_DEFAULT_PRINT_LINE_NUMBERS
-GPM_DEFAULT_PRINT_FONT_BODY_PANGO
-GPM_DEFAULT_PRINT_FONT_HEADER_PANGO
-GPM_DEFAULT_PRINT_FONT_NUMBERS_PANGO
-GPM_DEFAULT_MAX_RECENTS
-GPM_DEFAULT_WINDOW_STATE
-GPM_DEFAULT_WINDOW_WIDTH
-GPM_DEFAULT_WINDOW_HEIGHT
-GPM_DEFAULT_WINDOW_STATE_STR
-GPM_DEFAULT_WINDOW_WIDTH_STR
-GPM_DEFAULT_WINDOW_HEIGHT_STR
-GPM_DEFAULT_SIDE_PANEL_SIZE
-GPM_DEFAULT_BOTTOM_PANEL_SIZE
-GPM_DEFAULT_SIDE_PANEL_SIZE_STR
-GPM_DEFAULT_BOTTOM_PANEL_SIZE_STR
-GPM_DEFAULT_HIGHLIGHT_CURRENT_LINE
-GPM_DEFAULT_BRACKET_MATCHING
-GPM_DEFAULT_DISPLAY_RIGHT_MARGIN
-GPM_DEFAULT_RIGHT_MARGIN_POSITION
-GPM_DEFAULT_SYNTAX_HL_ENABLE
-GPM_DEFAULT_WRITABLE_VFS_SCHEMES
-GPM_DEFAULT_RESTORE_CURSOR_POSITION
-GPM_DEFAULT_SEARCH_HIGHLIGHTING_ENABLE
-XeditToolbarSetting
-xedit_prefs_manager_init
-xedit_prefs_manager_shutdown
-xedit_prefs_manager_get_use_default_font
-xedit_prefs_manager_set_use_default_font
-xedit_prefs_manager_use_default_font_can_set
-xedit_prefs_manager_get_editor_font
-xedit_prefs_manager_set_editor_font
-xedit_prefs_manager_editor_font_can_set
-xedit_prefs_manager_get_use_default_colors
-xedit_prefs_manager_set_use_default_colors
-xedit_prefs_manager_use_default_colors_can_set
-xedit_prefs_manager_get_background_color
-xedit_prefs_manager_set_background_color
-xedit_prefs_manager_background_color_can_set
-xedit_prefs_manager_get_text_color
-xedit_prefs_manager_set_text_color
-xedit_prefs_manager_text_color_can_set
-xedit_prefs_manager_get_selection_color
-xedit_prefs_manager_set_selection_color
-xedit_prefs_manager_selection_color_can_set
-xedit_prefs_manager_get_selected_text_color
-xedit_prefs_manager_set_selected_text_color
-xedit_prefs_manager_selected_text_color_can_set
-xedit_prefs_manager_get_create_backup_copy
-xedit_prefs_manager_set_create_backup_copy
-xedit_prefs_manager_create_backup_copy_can_set
-xedit_prefs_manager_get_backup_extension
-xedit_prefs_manager_get_auto_save
-xedit_prefs_manager_set_auto_save
-xedit_prefs_manager_auto_save_can_set
-xedit_prefs_manager_get_auto_save_interval
-xedit_prefs_manager_set_auto_save_interval
-xedit_prefs_manager_auto_save_interval_can_set
-xedit_prefs_manager_get_undo_actions_limit
-xedit_prefs_manager_set_undo_actions_limit
-xedit_prefs_manager_undo_actions_limit_can_set
-xedit_prefs_manager_get_wrap_mode
-xedit_prefs_manager_set_wrap_mode
-xedit_prefs_manager_wrap_mode_can_set
-xedit_prefs_manager_get_tabs_size
-xedit_prefs_manager_set_tabs_size
-xedit_prefs_manager_tabs_size_can_set
-xedit_prefs_manager_get_insert_spaces
-xedit_prefs_manager_set_insert_spaces
-xedit_prefs_manager_insert_spaces_can_set
-xedit_prefs_manager_get_auto_indent
-xedit_prefs_manager_set_auto_indent
-xedit_prefs_manager_auto_indent_can_set
-xedit_prefs_manager_get_display_line_numbers
-xedit_prefs_manager_set_display_line_numbers
-xedit_prefs_manager_display_line_numbers_can_set
-xedit_prefs_manager_get_toolbar_visible
-xedit_prefs_manager_set_toolbar_visible
-xedit_prefs_manager_toolbar_visible_can_set
-xedit_prefs_manager_get_toolbar_buttons_style
-xedit_prefs_manager_set_toolbar_buttons_style
-xedit_prefs_manager_toolbar_buttons_style_can_set
-xedit_prefs_manager_get_statusbar_visible
-xedit_prefs_manager_set_statusbar_visible
-xedit_prefs_manager_statusbar_visible_can_set
-xedit_prefs_manager_get_side_pane_visible
-xedit_prefs_manager_set_side_pane_visible
-xedit_prefs_manager_side_pane_visible_can_set
-xedit_prefs_manager_get_bottom_panel_visible
-xedit_prefs_manager_set_bottom_panel_visible
-xedit_prefs_manager_bottom_panel_visible_can_set
-xedit_prefs_manager_get_print_syntax_hl
-xedit_prefs_manager_set_print_syntax_hl
-xedit_prefs_manager_print_syntax_hl_can_set
-xedit_prefs_manager_get_print_header
-xedit_prefs_manager_set_print_header
-xedit_prefs_manager_print_header_can_set
-xedit_prefs_manager_get_print_wrap_mode
-xedit_prefs_manager_set_print_wrap_mode
-xedit_prefs_manager_print_wrap_mode_can_set
-xedit_prefs_manager_get_print_line_numbers
-xedit_prefs_manager_set_print_line_numbers
-xedit_prefs_manager_print_line_numbers_can_set
-xedit_prefs_manager_get_print_font_body
-xedit_prefs_manager_set_print_font_body
-xedit_prefs_manager_print_font_body_can_set
-xedit_prefs_manager_get_default_print_font_body
-xedit_prefs_manager_get_print_font_header
-xedit_prefs_manager_set_print_font_header
-xedit_prefs_manager_print_font_header_can_set
-xedit_prefs_manager_get_default_print_font_header
-xedit_prefs_manager_get_print_font_numbers
-xedit_prefs_manager_set_print_font_numbers
-xedit_prefs_manager_print_font_numbers_can_set
-xedit_prefs_manager_get_default_print_font_numbers
-xedit_prefs_manager_get_max_recents
-xedit_prefs_manager_get_auto_detected_encodings
-xedit_prefs_manager_get_shown_in_menu_encodings
-xedit_prefs_manager_set_shown_in_menu_encodings
-xedit_prefs_manager_shown_in_menu_encodings_can_set
-xedit_prefs_manager_get_highlight_current_line
-xedit_prefs_manager_set_highlight_current_line
-xedit_prefs_manager_highlight_current_line_can_set
-xedit_prefs_manager_get_bracket_matching
-xedit_prefs_manager_set_bracket_matching
-xedit_prefs_manager_bracket_matching_can_set
-xedit_prefs_manager_get_display_right_margin
-xedit_prefs_manager_set_display_right_margin
-xedit_prefs_manager_display_right_margin_can_set
-xedit_prefs_manager_get_right_margin_position
-xedit_prefs_manager_set_right_margin_position
-xedit_prefs_manager_right_margin_position_can_set
-xedit_prefs_manager_get_enable_syntax_highlighting
-xedit_prefs_manager_set_enable_syntax_highlighting
-xedit_prefs_manager_enable_syntax_highlighting_can_set
-xedit_prefs_manager_get_writable_vfs_schemes
-xedit_prefs_manager_get_restore_cursor_position
-xedit_prefs_manager_get_enable_search_highlighting
-xedit_prefs_manager_set_enable_search_highlighting
-xedit_prefs_manager_enable_search_highlighting_can_set
-</SECTION>
-
-<SECTION>
-<FILE>xedit-utils</FILE>
-GBOOLEAN_TO_POINTER
-GPOINTER_TO_BOOLEAN
-IS_VALID_BOOLEAN
-xedit_utils_uri_has_writable_scheme
-xedit_utils_uri_has_file_scheme
-xedit_utils_menu_position_under_widget
-xedit_utils_menu_position_under_tree_view
-xedit_gtk_button_new_with_stock_icon
-xedit_dialog_add_button
-xedit_utils_escape_underscores
-xedit_utils_escape_slashes
-xedit_utils_str_middle_truncate
-g_utf8_caselessnmatch
-xedit_utils_set_atk_name_description
-xedit_utils_set_atk_relation
-xedit_utils_uri_exists
-xedit_utils_escape_search_text
-xedit_utils_unescape_search_text
-xedit_utils_get_stdin
-xedit_warning
-xedit_utils_make_valid_utf8
-xedit_utils_uri_get_dirname
-xedit_utils_replace_home_dir_with_tilde
-xedit_utils_get_current_workspace
-xedit_utils_get_window_workspace
-xedit_utils_activate_url
-xedit_utils_is_valid_uri
-xedit_utils_get_glade_widgets
-xedit_utils_make_canonical_uri_from_shell_arg
-xedit_utils_format_uri_for_display
-</SECTION>
-
-<SECTION>
-<FILE>xedit-enum-types</FILE>
-XEDIT_TYPE_CONVERT_ERROR
-xedit_convert_error_get_type
-XEDIT_TYPE_DEBUG_SECTION
-xedit_debug_section_get_type
-XEDIT_TYPE_SEARCH_FLAGS
-xedit_search_flags_get_type
-XEDIT_TYPE_DOCUMENT_SAVE_FLAGS
-xedit_document_save_flags_get_type
-XEDIT_TYPE_TOOLBAR_SETTING
-xedit_toolbar_setting_get_type
-XEDIT_TYPE_TAB_STATE
-xedit_tab_state_get_type
-XEDIT_TYPE_WINDOW_STATE
-xedit_window_state_get_type
-</SECTION>
-
--- a/docs/reference/xedit.types
+++ b/docs/reference/xedit.types
@@ -1,32 +0,0 @@
-#include "xedit-app.h"
-#include "xedit-document.h"
-#include "xedit-encodings.h"
-#include "xedit-encodings-combo-box.h"
-#include "xedit-file-chooser-dialog.h"
-#include "xedit-message.h"
-#include "xedit-message-bus.h"
-#include "xedit-message-type.h"
-#include "xedit-notebook.h"
-#include "xedit-panel.h"
-#include "xedit-plugin.h"
-#include "xedit-progress-message-area.h"
-#include "xedit-statusbar.h"
-#include "xedit-tab.h"
-#include "xedit-view.h"
-#include "xedit-window.h"
-xedit_app_get_type
-xedit_document_get_type
-xedit_encoding_get_type
-xedit_encodings_combo_box_get_type
-xedit_file_chooser_dialog_get_type
-xedit_message_get_type
-xedit_message_bus_get_type
-xedit_message_type_get_type
-xedit_notebook_get_type
-xedit_panel_get_type
-xedit_plugin_get_type
-xedit_progress_message_area_get_type
-xedit_statusbar_get_type
-xedit_tab_get_type
-xedit_view_get_type
-xedit_window_get_type
--- a/help/C/figures/xedit_format_bold.png
+++ b/help/C/figures/xedit_format_bold.png
--- a/help/C/figures/xedit_format_italic.png
+++ b/help/C/figures/xedit_format_italic.png
--- a/help/C/figures/xedit_format_strikethrough.png
+++ b/help/C/figures/xedit_format_strikethrough.png
--- a/help/C/figures/xedit_format_underline.png
+++ b/help/C/figures/xedit_format_underline.png
--- a/help/C/figures/xedit_recent_files_menu_icon.png
+++ b/help/C/figures/xedit_recent_files_menu_icon.png
--- a/help/C/figures/xedit_window.png
+++ b/help/C/figures/xedit_window.png
--- a/help/C/index.docbook
+++ b/help/C/index.docbook
@@ -4,7 +4,7 @@
  <!ENTITY appversion "1.10">
  <!ENTITY manrevision "3.0">
  <!ENTITY date "July 2015">
-  <!ENTITY app "xedit">
+  <!ENTITY app "xed">
 ]>

 <!-- =============Document Header ============================= -->
@@ -23,7 +23,7 @@
 <!-- Remember to remove the &manrevision; entity from the revision entries other
   than the current revision. -->
 		<revision>
-		  <revnumber>xedit V1.0</revnumber>
+		  <revnumber>xed V1.0</revnumber>
 		  <date>2000</date>
 		  <revdescription>
 			 <para role="author">Eric Baudais <email>baudais@okstate.edu</email>
@@ -32,7 +32,7 @@
 		  </revdescription>
 		</revision>
 		<revision>
-		  <revnumber>xedit Manual V2.0</revnumber>
+		  <revnumber>xed Manual V2.0</revnumber>
 		  <date>March 2002</date>
 		  <revdescription>
 			 <para role="author">Sun GNOME Documentation Team</para>
@@ -40,7 +40,7 @@
 		  </revdescription>
 		</revision>
 		<revision>
-		  <revnumber>xedit Manual V2.1</revnumber>
+		  <revnumber>xed Manual V2.1</revnumber>
 		  <date>June 2002</date>
 		  <revdescription>
 			 <para role="author">Sun GNOME Documentation Team</para>
@@ -48,7 +48,7 @@
 		  </revdescription>
 		</revision>
 		<revision>
-		  <revnumber>xedit Manual V2.2</revnumber>
+		  <revnumber>xed Manual V2.2</revnumber>
 		  <date>August 2002</date>
 		  <revdescription>
 			 <para role="author">Sun GNOME Documentation Team</para>
@@ -56,7 +56,7 @@
 		  </revdescription>
 		</revision>
 		<revision>
-		  <revnumber>xedit Manual V2.3</revnumber>
+		  <revnumber>xed Manual V2.3</revnumber>
 		  <date>September 2002</date>
 		  <revdescription>
 			 <para role="author">Sun GNOME Documentation Team</para>
@@ -64,7 +64,7 @@
 		  </revdescription>
 		</revision>
 		<revision>
-		  <revnumber>xedit Manual V2.4</revnumber>
+		  <revnumber>xed Manual V2.4</revnumber>
 		  <date>January 2003</date>
 		  <revdescription>
 			 <para role="author">Sun GNOME Documentation Team</para>
@@ -72,7 +72,7 @@
 		  </revdescription>
 		</revision>
 		<revision>
-		  <revnumber>xedit Manual V2.5</revnumber>
+		  <revnumber>xed Manual V2.5</revnumber>
 		  <date>March 2003</date>
 		  <revdescription>
 			 <para role="author">Sun GNOME Documentation Team</para>
@@ -80,7 +80,7 @@
 		  </revdescription>
 		</revision>
 		<revision>
-		  <revnumber>xedit Manual V2.6</revnumber>
+		  <revnumber>xed Manual V2.6</revnumber>
 		  <date>September 2003</date>
 		  <revdescription>
 			 <para role="author">Sun GNOME Documentation Team</para>
@@ -88,7 +88,7 @@
 		  </revdescription>
 		</revision>
 		<revision>
-		  <revnumber>xedit Manual V2.7</revnumber>
+		  <revnumber>xed Manual V2.7</revnumber>
 		  <date>March 2004</date>
 		  <revdescription>
 			 <para role="author">Sun GNOME Documentation Team</para>
@@ -123,27 +123,27 @@
 	 <releaseinfo> This manual describes version &appversion; of &app;.
 		</releaseinfo>
  </articleinfo>
-  <indexterm><primary>xedit</primary></indexterm>
+  <indexterm><primary>xed</primary></indexterm>
  <indexterm><primary>text editor</primary></indexterm>

 <!-- ============= Document Body ============================= -->
 <!-- ============= Introduction ============================== -->
-  <sect1 id="xedit-intro">
+  <sect1 id="xed-intro">
 	 <title>Introduction</title>

   <!-- removed ids, here as anchors to prevent possible breakage -->
-	 <anchor id="xedit-customize-toolbar"/>
+	 <anchor id="xed-customize-toolbar"/>

 	 <para>The <application>&app;</application> application enables you to create and edit text files.</para>

 	 <para>The aim of <application>&app;</application> is to be a simple and easy to use text editor. More powerful features can be enabled with different <firstterm>plugins</firstterm>, allowing a variety of tasks related to text-editing.</para>
  </sect1>
 <!-- ============= Getting Started =========================== -->
-  <sect1 id="xedit-getting-started">
+  <sect1 id="xed-getting-started">
 	 <title>Getting Started</title>

-<!-- ============= To Start xedit ============================ -->
-	 <sect2 id="xedit-to-start">
+<!-- ============= To Start xed ============================ -->
+	 <sect2 id="xed-to-start">
 		<title>Starting &app;</title>
 		<para>You can start <application>&app;</application> in the following ways:</para>
 		<variablelist>
@@ -156,26 +156,26 @@
    		<varlistentry>
    		<term>Command line</term>
    		<listitem>
-    		<para>Execute the following command: <command>xedit</command></para>
+    		<para>Execute the following command: <command>xed</command></para>
    		</listitem>
    		</varlistentry>
    		</variablelist>
-    <para>By default, when you open a text document in the file manager, xedit will start, and display the document.</para>
+    <para>By default, when you open a text document in the file manager, xed will start, and display the document.</para>
 	</sect2>

-	<sect2 id="xedit-when-you-start">
+	<sect2 id="xed-when-you-start">

 		<title>The &app; Window</title>
 		<para>When you start <application>&app;</application>, the following window is displayed:</para>

-		<figure id="xedit-window">
+		<figure id="xed-window">
 		  <title>&app; Window</title>
 		  <screenshot>
 			 <mediaobject>
 				<imageobject>
-				  <imagedata fileref="figures/xedit_window.png" format="PNG"/>
+				  <imagedata fileref="figures/xed_window.png" format="PNG"/>
 					 </imageobject>
-				<textobject> <phrase>Shows xedit main window.</phrase>
+				<textobject> <phrase>Shows xed main window.</phrase>
 				</textobject>
 			</mediaobject>
 		  </screenshot>
@@ -229,37 +229,37 @@
 	 </sect2>

 <!-- ============= To Open Multiple Files from the Command Line ========= -->
-	 <sect2 id="xedit-run-from-cmd-line">
+	 <sect2 id="xed-run-from-cmd-line">
 		<title>Running &app; from a Command Line</title>
 		<para>You can run <application>&app;</application> from a command line and open a single file or multiple files. To open multiple files from a command line, type the following command, then press <keycap>Return</keycap>:</para>
-		<para><command>xedit <replaceable>file1.txt file2.txt file3.txt</replaceable></command></para>
+		<para><command>xed <replaceable>file1.txt file2.txt file3.txt</replaceable></command></para>
 		<para>Alternatively, you can specify a URI instead of a filename.</para>
-    <para>For more information on how to run <application>&app;</application> from a command line, see the unix manual page for &app;, <ulink url="man:xedit" type="man"><citerefentry><refentrytitle>&app;</refentrytitle><manvolnum>1</manvolnum></citerefentry></ulink>.</para>
+    <para>For more information on how to run <application>&app;</application> from a command line, see the unix manual page for &app;, <ulink url="man:xed" type="man"><citerefentry><refentrytitle>&app;</refentrytitle><manvolnum>1</manvolnum></citerefentry></ulink>.</para>
 	 </sect2>
  </sect1>
 <!-- ================ Usage ================================ -->
-  <sect1 id="xedit-usage">
+  <sect1 id="xed-usage">
 	 <title>Working with Files</title>

 <!-- ============= To Create a New File ======================== -->
-	 <sect2 id="xedit-create-new-file">
+	 <sect2 id="xed-create-new-file">
 		<title>Creating a New Document</title>
 		<para>To create a new document, choose <menuchoice><guimenu>File</guimenu><guimenuitem>New</guimenuitem></menuchoice>. The application displays a new blank document in the <application>&app;</application> window.</para>
 	 </sect2>

 <!-- ============= To Open a File ============================= -->
-	 <sect2 id="xedit-open-file">
+	 <sect2 id="xed-open-file">
 		<title>Opening a File</title>
 		<para>To open a file, choose <menuchoice><guimenu>File</guimenu><guimenuitem>Open</guimenuitem></menuchoice> to display the <guilabel>Open File</guilabel> dialog. Select the file that you want to open, then click <guibutton>Open</guibutton>. The file is displayed in the <application>&app;</application> window. </para>

-		<para>The application records the paths and filenames of the five most recent files that you edited and displays the files as menu items on the <menuchoice><guimenu>File</guimenu></menuchoice> menu. You can also click on the <inlinemediaobject><imageobject><imagedata fileref="figures/xedit_recent_files_menu_icon.png" format="PNG"/></imageobject><textobject><phrase>Shows Recent Files menu icon.</phrase></textobject></inlinemediaobject>  icon on the toolbar to display the list of recent files.  </para>
+		<para>The application records the paths and filenames of the five most recent files that you edited and displays the files as menu items on the <menuchoice><guimenu>File</guimenu></menuchoice> menu. You can also click on the <inlinemediaobject><imageobject><imagedata fileref="figures/xed_recent_files_menu_icon.png" format="PNG"/></imageobject><textobject><phrase>Shows Recent Files menu icon.</phrase></textobject></inlinemediaobject>  icon on the toolbar to display the list of recent files.  </para>

-		<note><para>You can open multiple files in <application>&app;</application>. The application adds a tab for each open file to the window. For more on this see <xref linkend="xedit-tabs"/>.</para></note>
+		<note><para>You can open multiple files in <application>&app;</application>. The application adds a tab for each open file to the window. For more on this see <xref linkend="xed-tabs"/>.</para></note>

 	 </sect2>

 <!-- ============= To Save a File ============================== -->
-	 <sect2 id="xedit-save-file">
+	 <sect2 id="xed-save-file">
 		<title>Saving a File</title>
 		<para>You can save files in the following ways:</para>
 		<itemizedlist>
@@ -274,7 +274,7 @@
 	 </sect2>

 <!-- ============= To Open a File from a URI ======================= -->
-	 <sect2 id="xedit-open-from-uri">
+	 <sect2 id="xed-open-from-uri">
 		<title>Opening a File from a URI</title>
 		<para>To open a file from a Uniform Resource Identifier (URI), perform the following steps:</para>
 		<orderedlist>
@@ -296,7 +296,7 @@
 	 </sect2>

 <!-- ============= Working with tabs ======================== -->
-	 <sect2 id="xedit-tabs">
+	 <sect2 id="xed-tabs">
 	   <title>Working With Tabs</title>

 		 <para>When more than one file is open, <application>&app;</application> shows a <firstterm>tab</firstterm> for each document above the display area. To switch to another document, click on its tab.</para>
@@ -310,7 +310,7 @@
    <title>Working with Text</title>

 <!-- ============= To Edit Text ================================ -->
-	 <sect2 id="xedit-edit-text">
+	 <sect2 id="xed-edit-text">
 		<title>Editing Text</title>
 		<para>You can edit the text of a file in the following ways:</para>
 		<itemizedlist>
@@ -329,26 +329,26 @@
 		</itemizedlist>
 	 </sect2>
 <!-- ============== To Undo or Redo Edits ====================== -->
-	 <sect2 id="xedit-undo-redo-edits">
+	 <sect2 id="xed-undo-redo-edits">
 		<title>Undoing and Redoing Changes</title>
 		<para>To undo a change you have made, choose <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Undo</guimenuitem> </menuchoice>. To reverse this action, choose <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Redo</guimenuitem> </menuchoice>.</para>
 	 </sect2>

 	</sect1>
-	<sect1 id="xedit-find">
+	<sect1 id="xed-find">
 		<title>Finding and Replacing</title>

 		<para>In <application>&app;</application>, there are two ways of searching for text. You can use the <guilabel>Find</guilabel> dialog to search for a specific piece of text, or <guilabel>Incremental Search</guilabel> to highlight matching text as you type it.
 		</para>

 <!-- ============= To Find Text ================================ -->
-	 <sect2 id="xedit-find-text">
+	 <sect2 id="xed-find-text">
 		<title>Finding Text</title>
 		<para>To search a file for a string of text, perform the following steps:</para>
 		<orderedlist>
 		  <listitem><para>Choose <menuchoice> <guimenu>Search</guimenu> <guimenuitem>Find</guimenuitem> </menuchoice> to display the <guilabel>Find</guilabel> dialog.</para>
 		  </listitem>
-		  <listitem><para>Type the string that you want to find in the <guilabel>Search for</guilabel> field. You can include special characters such as a new line or tab: see <xref linkend="xedit-find-escapes"/>.</para>
+		  <listitem><para>Type the string that you want to find in the <guilabel>Search for</guilabel> field. You can include special characters such as a new line or tab: see <xref linkend="xed-find-escapes"/>.</para>
 		  </listitem>
 		  <listitem><para>Click <guibutton>Find</guibutton> to search the file for the first occurrence of the string after your current cursor position. If <application>&app;</application> finds the string, the application selects first occurrence of the string. Other occurrences of the string are highlighted.</para>
 		  </listitem>
@@ -359,7 +359,7 @@
 		<para>To remove the highlighting from the text, choose  <menuchoice> <guimenu>Search</guimenu> <guimenuitem>Clear Highlight</guimenuitem> </menuchoice>.</para>
 	 </sect2>

-	 <sect2 id="xedit-find-incremental">
+	 <sect2 id="xed-find-incremental">
 	   <title>Incremental Search</title>

 	   <para>Incremental search highlights matching text in the document as you type it letter by letter. (This is similar to the search feature in several web browsers.)</para>
@@ -370,14 +370,14 @@
 	 </sect2>

 <!-- ============= To Find and Replace Text =================== -->
-	 <sect2 id="xedit-find-replace-text">
+	 <sect2 id="xed-find-replace-text">
 		<title>Replacing Text</title>

 		<para>To search a file for a string, and replace the string with an alternative string, perform the following steps:</para>
 		<orderedlist>
 		  <listitem><para>Choose <menuchoice> <guimenu>Search</guimenu> <guimenuitem>Replace</guimenuitem> </menuchoice> to display the <guilabel>Replace</guilabel> dialog.</para>
 		  </listitem>
-		  <listitem><para>Type the string that you want to find, in the <guilabel>Search for</guilabel> field. You can include special characters such as a new line or tab: see <xref linkend="xedit-find-escapes"/>.</para></listitem>
+		  <listitem><para>Type the string that you want to find, in the <guilabel>Search for</guilabel> field. You can include special characters such as a new line or tab: see <xref linkend="xed-find-escapes"/>.</para></listitem>
 		  <listitem><para>Type the string that you want to use to replace the string that you find, in the <guilabel>Replace with</guilabel> field.</para>
 		  </listitem>
 		</orderedlist>
@@ -387,7 +387,7 @@
 	 </sect2>

 <!-- ============= Find and Replace Options ============================ -->
-  <sect2 id="xedit-find-options">
+  <sect2 id="xed-find-options">
 		<title>Find and Replace Options</title>
 		<para>The <guilabel>Find</guilabel> dialog and the <guilabel>Replace</guilabel> dialog both have the following options:</para>
 		<itemizedlist>
@@ -403,7 +403,7 @@
  </sect2>

 <!-- ============= Special Characters ============================ -->
-	 <sect2 id="xedit-find-escapes">
+	 <sect2 id="xed-find-escapes">
 	   <title>Special Characters</title>
 	     <para>You can include the following escape sequences in the text to find or replace to represent special characters:</para>
 			 <variablelist>
@@ -439,7 +439,7 @@
    </sect2>

 <!-- ============= To Position the Cursor on a Specific Line ======================= -->
-    <sect2 id="xedit-goto-line">
+    <sect2 id="xed-goto-line">
      <title>Positioning the Cursor on a Specific Line</title>

      <para>To position the cursor on a specific line in the current file, choose <menuchoice> <guimenu>Search</guimenu> <guimenuitem>Go to Line</guimenuitem> </menuchoice>. The line number box appears at the top of the display area.</para>
@@ -449,23 +449,23 @@

  </sect1>

-  <sect1 id="xedit-printing">
+  <sect1 id="xed-printing">
    <title>Printing</title>

 <!-- ============= To Set the Page Options ============================ -->
-	 <sect2 id="xedit-page-setup">
+	 <sect2 id="xed-page-setup">
 		<title>Setting the Page Options</title>

 		<para>To set the page options, choose <menuchoice> <guimenu>File</guimenu> <guimenuitem>Page Setup</guimenuitem> </menuchoice> to display the <guilabel>Page Setup</guilabel> dialog.</para>

 		<para>The <guilabel>Page Setup</guilabel> dialog enables you to specify the following print options:</para>

-		<sect3 id="xedit-page-setup-general">
+		<sect3 id="xed-page-setup-general">
 		<title>General Tabbed Section</title>
 	 	<variablelist>
 		  <varlistentry> <term><guilabel>Print syntax highlighting</guilabel> </term>
 			 <listitem>
-				<para>Select this option to print syntax highlighting. For more information about syntax highlighting, see <xref linkend="xedit-set-highlightmode"/>.  </para>
+				<para>Select this option to print syntax highlighting. For more information about syntax highlighting, see <xref linkend="xed-set-highlightmode"/>.  </para>
 			 </listitem>
 		  </varlistentry>
 		  <varlistentry> <term><guilabel>Print page headers</guilabel> </term>
@@ -491,7 +491,7 @@
 		</variablelist>
 		</sect3>

-		<sect3 id="xedit-page-setup-fonts">
+		<sect3 id="xed-page-setup-fonts">
 	 		<title>Fonts</title>
 	 	<variablelist>
 		  <varlistentry> <term><guilabel>Body</guilabel> </term>
@@ -517,7 +517,7 @@
 	 </sect2>

 <!-- ============= To Print a File ============================ -->
-	 <sect2 id="xedit-print-file">
+	 <sect2 id="xed-print-file">
 		<title>Printing a Document</title>
 		<para>You can use <application>&app;</application> to perform the following print operations:</para>
 		<itemizedlist>
@@ -700,13 +700,13 @@

  </sect1>

-  <sect1 id="xedit-programming-features">
+  <sect1 id="xed-programming-features">
 	  <title>Programming Features</title>

-	  <para>Several of <application>&app;</application>'s features for programming are provided with plugins. For example, the Tag List plugin provides a list of commonly-used tags for different markup languages: see <xref linkend="xedit-tag-list-plugin"/>.</para>
+	  <para>Several of <application>&app;</application>'s features for programming are provided with plugins. For example, the Tag List plugin provides a list of commonly-used tags for different markup languages: see <xref linkend="xed-tag-list-plugin"/>.</para>

 <!-- ============= Syntax Highlighting =================== -->
-	 <sect2 id="xedit-set-highlightmode">
+	 <sect2 id="xed-set-highlightmode">
 	 <title>Syntax Highlighting</title>
 	 <para>Syntax highlighting makes source code easier to read by showing different parts of the text in different colors.</para>

@@ -746,16 +746,16 @@
 	 </sect2>

 <!-- ============= To Pipe the Output of a Command to a File ======= -->
-	 <sect2 id="xedit-pipe-output">
+	 <sect2 id="xed-pipe-output">
 		<title>Piping the Output of a Command to a File</title>
-		<para>You can use <application>&app;</application> to pipe the output of a command to a text file. For example, to pipe the output of an <command>ls</command> command to a text file, type <command>ls | xedit</command>, then press <keycap>Return</keycap>.</para>
+		<para>You can use <application>&app;</application> to pipe the output of a command to a text file. For example, to pipe the output of an <command>ls</command> command to a text file, type <command>ls | xed</command>, then press <keycap>Return</keycap>.</para>
 		<para>The output of the <command>ls</command> command is displayed in a new text file in the <application>&app;</application> window.</para>
 		<para>Alternatively, you can use the <application>External tools</application> plugin to pipe command output to the current file. <!-- fixme: xref needed! --></para>
 	 </sect2>
  </sect1>

 <!-- ================ Shortcut Keys ============================= -->
-<sect1 id="xedit-shortcutkeys">
+<sect1 id="xed-shortcutkeys">
  <title>Shortcut Keys</title>
  <para>Use shortcut keys to perform common tasks more quickly than with the mouse and menus. The following tables list all of <application>&app;</application>'s shortcut keys.</para>

@@ -853,7 +853,7 @@
                      </row>
                      <row valign="top">
                        <entry><para>Ctrl + Q</para></entry>
-                        <entry><para>Quit Xedit.</para></entry>
+                        <entry><para>Quit Xed.</para></entry>
                      </row>
                    </tbody>
                  </tgroup>
@@ -880,7 +880,7 @@
                        <entry><para>Undo the last action.</para></entry>
                      </row>
                      <row valign="top">
-                        <entry><para>Ctrl + Shift + Z</para></entry>
+                        <entry><para>Ctrl + Y</para></entry>
                        <entry><para>Redo the last undone action .</para></entry>
                      </row>
                      <row valign="top">
@@ -1062,18 +1062,18 @@


 <!-- ============= Preferences ============================= -->
-  <sect1 id="xedit-prefs">
+  <sect1 id="xed-prefs">
    <title>Preferences</title>

    <para>To configure <application>&app;</application>, choose <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Preferences</guimenuitem> </menuchoice>. The <guilabel>Preferences</guilabel> dialog contains the following categories:</para>
    <itemizedlist>
-      <listitem><para><xref linkend="xedit-prefs-view"/></para></listitem>
-      <listitem><para><xref linkend="xedit-prefs-editor"/></para></listitem>
-      <listitem><para><xref linkend="xedit-prefs-fontsandcolors"/></para></listitem>
-      <listitem><para><xref linkend="xedit-prefs-plugins"/></para></listitem>
+      <listitem><para><xref linkend="xed-prefs-view"/></para></listitem>
+      <listitem><para><xref linkend="xed-prefs-editor"/></para></listitem>
+      <listitem><para><xref linkend="xed-prefs-fontsandcolors"/></para></listitem>
+      <listitem><para><xref linkend="xed-prefs-plugins"/></para></listitem>
    </itemizedlist>

-    <sect2 id="xedit-prefs-view">
+    <sect2 id="xed-prefs-view">
      <title>View Preferences</title>
      <variablelist>
        <varlistentry>
@@ -1112,7 +1112,7 @@
      </variablelist>
    </sect2>

-    <sect2 id="xedit-prefs-editor">
+    <sect2 id="xed-prefs-editor">
      <title>Editor Preferences</title>
      <variablelist>
        <varlistentry>
@@ -1138,7 +1138,7 @@
      </variablelist>
    </sect2>

-    <sect2 id="xedit-prefs-fontsandcolors">
+    <sect2 id="xed-prefs-fontsandcolors">
      <title>Font &amp; Colors Preferences</title>
      <variablelist>
        <varlistentry>
@@ -1191,12 +1191,12 @@
      </variablelist>
    </sect2>

-    <sect2 id="xedit-prefs-plugins">
+    <sect2 id="xed-prefs-plugins">
      <title>Plugins Preferences</title>
-      <para>Plugins add extra features to <application>&app;</application>. For more information on plugins and how to use the built-in plugins, see <xref linkend="xedit-plugins-overview"/>.</para>
+      <para>Plugins add extra features to <application>&app;</application>. For more information on plugins and how to use the built-in plugins, see <xref linkend="xed-plugins-overview"/>.</para>

-<!-- ============= To Load xedit Plugins ========================= -->
-	 <sect3 id="xedit-install-plugins">
+<!-- ============= To Load xed Plugins ========================= -->
+	 <sect3 id="xed-install-plugins">
 		<title>Enabling a Plugin</title>
 		<para>To enable a <application>&app;</application> plugin, perform the following steps:</para>
                <orderedlist>
@@ -1215,8 +1215,8 @@
                </orderedlist>
 	 </sect3>

-<!-- ============= To Remove xedit Plugins ========================= -->
-  	 <sect3 id="xedit-remove-plugins">
+<!-- ============= To Remove xed Plugins ========================= -->
+  	 <sect3 id="xed-remove-plugins">
  		<title>Disabling a Plugin</title>
  		<para>A plugin remains enabled when you quit <application>&app;</application>. </para>
  		<para>To disable a <application>&app;</application> plugin, perform the following steps:</para>
@@ -1238,52 +1238,52 @@
 	 </sect2>

 </sect1>
-<!-- ============= To Use the xedit Plugins ========================= -->
-	 <sect1 id="xedit-plugins">
+<!-- ============= To Use the xed Plugins ========================= -->
+	 <sect1 id="xed-plugins">
 		<title>Plugins</title>
-		<sect2 id="xedit-plugins-overview">
+		<sect2 id="xed-plugins-overview">
 		  <title>Working with Plugins</title>
  		<para>You can add extra features to <application>&app;</application> by enabling <firstterm>plugins</firstterm>. A plugin is a supplementary program that enhances the functionality of an application. Plugins add new items to the <application>&app;</application> menus for the new features they provide.
  		</para>
-  		<para>Several plugins come built-in with <application>&app;</application>, and you can install more. The <ulink type="http" url="http://live.gnome.org/Xedit/Plugins">xedit website</ulink> lists third-party plugins.</para>
-  		<para>To enable and disable plugins, or see which plugins are currently enabled, use the <link linkend="xedit-prefs-plugins">Plugins Preferences</link>.</para>
+  		<para>Several plugins come built-in with <application>&app;</application>, and you can install more. The <ulink type="http" url="http://live.gnome.org/Xed/Plugins">xed website</ulink> lists third-party plugins.</para>
+  		<para>To enable and disable plugins, or see which plugins are currently enabled, use the <link linkend="xed-prefs-plugins">Plugins Preferences</link>.</para>
  		<para>The following plugins come built-in with <application>&app;</application>:</para>
  		<!-- Not yet documented:
  		File browser
  		-->
  		<itemizedlist>
  		  <listitem>
-  		    <para><link linkend="xedit-change-case-plugin"><application>Change Case</application></link> allows you to change the case of the selected text.</para>
+  		    <para><link linkend="xed-change-case-plugin"><application>Change Case</application></link> allows you to change the case of the selected text.</para>
  		  </listitem>
  		  <listitem>
-  		    <para><application><link linkend="xedit-document-statistics-plugin">Document Statistics</link></application> shows the number of lines, words, and characters in the document. </para>
+  		    <para><application><link linkend="xed-document-statistics-plugin">Document Statistics</link></application> shows the number of lines, words, and characters in the document. </para>
  		  </listitem>
  		  <listitem>
-  		    <para><application><!-- <link linkend="xedit-file-browser-plugin">File Browser</link>-->File Browser</application> allows you to browse your files and folders in the side pane.</para>
+  		    <para><application><!-- <link linkend="xed-file-browser-plugin">File Browser</link>-->File Browser</application> allows you to browse your files and folders in the side pane.</para>
  		  </listitem>
  		  <listitem>
-  		    <para><application><link linkend="xedit-indent-lines-plugin">Indent Lines</link></application> adds or removes indentation from the selected lines.</para>
+  		    <para><application><link linkend="xed-indent-lines-plugin">Indent Lines</link></application> adds or removes indentation from the selected lines.</para>
  		  </listitem>
  		  <listitem>
-  		    <para><application><link linkend="xedit-insert-date-time-plugin">Insert Date/Time</link></application> adds the current date and time into a document.</para>
+  		    <para><application><link linkend="xed-insert-date-time-plugin">Insert Date/Time</link></application> adds the current date and time into a document.</para>
  		  </listitem>
  		  <listitem>
-  		    <para><application><link linkend="xedit-modelines-plugin">Modelines</link></application> allows you to set editing preferences for individual documents, and supports <application>Emacs</application>, <application>Kate</application> and <application>Vim</application>-style modelines.</para>
+  		    <para><application><link linkend="xed-modelines-plugin">Modelines</link></application> allows you to set editing preferences for individual documents, and supports <application>Emacs</application>, <application>Kate</application> and <application>Vim</application>-style modelines.</para>
  		  </listitem>
  		  <listitem>
-  		    <para><application><link linkend="xedit-sort-plugin">Sort</link></application> arranges selected lines of text into alphabetical order.</para>
+  		    <para><application><link linkend="xed-sort-plugin">Sort</link></application> arranges selected lines of text into alphabetical order.</para>
  		  </listitem>
  		  <listitem>
-  		    <para><application><link linkend="xedit-spell-checker-plugin">Spell Checker</link></application> corrects the spelling in the selected text, or marks errors automatically in the document.</para>
+  		    <para><application><link linkend="xed-spell-checker-plugin">Spell Checker</link></application> corrects the spelling in the selected text, or marks errors automatically in the document.</para>
  		  </listitem>
  		  <listitem>
-  		    <para><application><link linkend="xedit-tag-list-plugin">Tag List</link></application> lets you insert commonly-used tags for HTML and other languages from a list in the side pane.</para>
+  		    <para><application><link linkend="xed-tag-list-plugin">Tag List</link></application> lets you insert commonly-used tags for HTML and other languages from a list in the side pane.</para>
  		  </listitem>
  		</itemizedlist>

  	</sect2>

-<sect2 id="xedit-change-case-plugin">
+<sect2 id="xed-change-case-plugin">
 <title>Change Case Plugin</title>
 	<para>The <application>Change Case</application> plugin changes the case of the selected text.</para>
 	 <para>The following items are added to the <guimenu>Edit</guimenu> menu when the <application>Change Case</application> plugin is enabled:</para>
@@ -1334,7 +1334,7 @@

 </sect2>

-<sect2 id="xedit-document-statistics-plugin">
+<sect2 id="xed-document-statistics-plugin">
 <title>Document Statistics Plugin</title>
 	<para>The <application>Document Statistics</application> plugin counts the number of lines, words, characters with spaces, characters without spaces, and bytes in the current file. The plugin displays the results in a <guilabel>Document Statistics</guilabel> dialog. To use the Document Statistics plugin, perform the following steps:</para>
 		<orderedlist>
@@ -1364,28 +1364,28 @@
 		</orderedlist>
 </sect2>

-<sect2 id="xedit-file-browser-plugin">
+<sect2 id="xed-file-browser-plugin">
  <title>File Browser Plugin</title>
  <para>The <application>File Browser</application> Plugin shows your files and folders in the side pane, allowing you to quickly open files.</para>
  <para>To view the File Browser, choose <menuchoice><guimenu>View</guimenu> <guimenuitem>Side Pane</guimenuitem> </menuchoice> and then click on the tab showing the File Browser icon at the bottom of the side pane.</para>
-  <sect3 id="xedit-file-browser-plugin-browsing">
+  <sect3 id="xed-file-browser-plugin-browsing">
    <title>Browsing your Files</title>
    <para>The File Browser tab initially shows your file manager bookmarks. To browse the contents of any item, double-click it.</para>
    <para>To show a parent folder, choose from the drop-down list, or press the up arrow on the File Browser's toolbar.</para>
    <para>To show the folder that contains the document you are currently working on, right-click in the file list and choose <guimenuitem>Set root to active document</guimenuitem>.</para>
  </sect3>
-  <sect3 id="xedit-file-browser-plugin-open">
+  <sect3 id="xed-file-browser-plugin-open">
    <title>Opening a File</title>
    <para>To open a file in <application>&app;</application>, double-click it in the file list.</para>
  </sect3>
-  <sect3 id="xedit-file-browser-plugin-create">
+  <sect3 id="xed-file-browser-plugin-create">
    <title>Creating Files and Folders</title>
    <para>To create a new, empty text file in the current folder shown in the browser, right-click in the file list and choose <guimenuitem>New File</guimenuitem>.</para>
    <para>To create a new folder in the current folder shown in the browser, right-click in the file list and choose <guimenuitem>New Folder</guimenuitem>.</para>
    </sect3>
 </sect2>

-<sect2 id="xedit-indent-lines-plugin">
+<sect2 id="xed-indent-lines-plugin">
 <title>Indent Lines Plugin</title>
 	<para>The <application>Indent Lines</application> plugin adds or removes space from the beginning of lines of text.</para>
 	<para>To indent or unindent text, perform the following steps:</para>
@@ -1403,11 +1403,11 @@
 		    </itemizedlist>
 		  </listitem>
 		</orderedlist>
-	<para>The amount of space used, and whether tab character or space characters are used, depends on the <guilabel>Tab Stops</guilabel> settings in the Editor Preferences: see <xref linkend="xedit-prefs-editor"/>.</para>
+	<para>The amount of space used, and whether tab character or space characters are used, depends on the <guilabel>Tab Stops</guilabel> settings in the Editor Preferences: see <xref linkend="xed-prefs-editor"/>.</para>

 </sect2>

-<sect2 id="xedit-insert-date-time-plugin">
+<sect2 id="xed-insert-date-time-plugin">
 <title>Insert Date/Time Plugin</title>
 	<para>The <application>Insert Date/Time</application> plugin inserts the current date and time into a document. To use the Insert Date/Time plugin, perform the following steps:</para>
 		<orderedlist>
@@ -1417,7 +1417,7 @@
 		  </listitem>
 		</orderedlist>

-<sect3 id="xedit-date-time-configure">
+<sect3 id="xed-date-time-configure">
 <title>Configuring the Insert Date/Time Plugin</title>
 <para>To configure the Insert Date/Time plugin, perform the following steps:</para>
 		<orderedlist>
@@ -1455,7 +1455,7 @@
 </sect3>
 </sect2>

-<sect2 id="xedit-modelines-plugin">
+<sect2 id="xed-modelines-plugin">
  <title>Modelines Plugin</title>
    <para>The <application>Modelines</application> plugin allows you to set  preferences for individual documents. A <firstterm>modeline</firstterm> is a line of text at the start or end of the document with settings that <application>&app;</application> recognises.</para>
    <para>Preferences set using modelines take precedence over the ones specified in the preference dialog.</para>
@@ -1480,24 +1480,24 @@

    <para>The <application>Modelines</application> plugin supports a subset of the options used by other text editors <application>Emacs</application>, <application>Kate</application> and <application>Vim</application>.</para>

-    <sect3 id="xedit-modelines-plugin-emacs">
+    <sect3 id="xed-modelines-plugin-emacs">
      <title>Emacs Modelines</title>
      <para>The first two lines of a document are scanned for <application>Emacs</application> modelines.</para>
      <para>The <application>Emacs</application> options for tab-width, indent-offset, indent-tabs-mode and autowrap are supported. For more information, see the <ulink type="http" url="http://www.delorie.com/gnu/docs/emacs/emacs_486.html">GNU Emacs Manual</ulink>.</para>
    </sect3>
-    <sect3 id="xedit-modelines-plugin-kate">
+    <sect3 id="xed-modelines-plugin-kate">
      <title>Kate Modelines</title>
      <para>The first and last ten lines a document are scanned for <application>Kate</application> modelines.</para>
      <para>The <application>Kate</application> options for tab-width, indent-width, space-indent, word-wrap and word-wrap-column are supported. For more information, see the <ulink type="http" url="http://www.kate-editor.org/article/katepart_modelines">Kate website</ulink>.</para>
    </sect3>
-    <sect3 id="xedit-modelines-plugin-vim">
+    <sect3 id="xed-modelines-plugin-vim">
      <title>Vim Modelines</title>
      <para>The first and last three lines a document are scanned for <application>Vim</application> modelines.</para>
      <para>The <application>Vim</application> options for et, expandtab, ts, tabstop, sw, shiftwidth, wrap, and textwidth are supported. For more information, see the <ulink type="http" url="http://vimdoc.sourceforge.net/htmldoc/options.html#modeline">Vim website</ulink>.</para>
    </sect3>
 </sect2>

-<sect2 id="xedit-sort-plugin">
+<sect2 id="xed-sort-plugin">
 <title>Sort Plugin</title>
 	<para>The <application>Sort</application> plugin arranges selected lines of text into alphabetical order.</para>
 		  <caution><para>You cannot undo the Sort operation, so you should save the file before performing the sort. To revert to the saved version of the file after the sort operation, choose <menuchoice> <guimenu>File</guimenu> <guimenuitem>Revert</guimenuitem> </menuchoice>.
@@ -1534,7 +1534,7 @@
 		</orderedlist>
 </sect2>

-<sect2 id="xedit-spell-checker-plugin">
+<sect2 id="xed-spell-checker-plugin">
 <title>Spell Checker Plugin</title>
 	<para>The <application>Spell Checker</application> plugin checks the spelling in the selected text. You can configure <application>&app;</application> to check the spelling automatically, or you can check the spelling manually, in the specified language. The language setting, and the autocheck spelling properties, apply per document. To use the Spell checker plugin, perform the following steps:</para>
 		<orderedlist>
@@ -1589,7 +1589,7 @@
 		</orderedlist>
 </sect2>

-<sect2 id="xedit-tag-list-plugin">
+<sect2 id="xed-tag-list-plugin">
 <title>Tag List Plugin</title>
 	<para>The <application>Tag List</application> plugin allows you to insert common tags from a list in the side pane.</para>
  <para>To use the Tag List plugin, perform the following steps:</para>
--- a/help/LINGUAS
+++ b/help/LINGUAS
@@ -0,0 +1,23 @@
+ar
+bg
+ca
+cs
+da
+de
+el
+es
+fi
+fr
+hu
+it
+ja
+ko
+oc
+pt_BR
+ru
+sv
+th
+uk
+zh_CN
+zh_HK
+zh_TW
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,16 +0,0 @@
-@YELP_HELP_RULES@
- 
-HELP_ID = xedit
-HELP_FILES = index.docbook legal.xml
-HELP_MEDIA = \
-	figures/xedit_format_bold.png			\
-	figures/xedit_format_italic.png			\
-	figures/xedit_format_strikethrough.png		\
-	figures/xedit_format_underline.png		\
-	figures/xedit_recent_files_menu_icon.png	\
-	figures/xedit_window.png	
-
-HELP_LINGUAS = ar bg ca cs da de el es fi fr hu it ja ko oc pt_BR ru sv th uk zh_CN zh_HK zh_TW
-
-
-include $(top_srcdir)/git.mk
--- a/help/ar/ar.po
+++ b/help/ar/ar.po
--- a/help/bg/bg.po
+++ b/help/bg/bg.po
--- a/help/ca/ca.po
+++ b/help/ca/ca.po
--- a/help/cs/cs.po
+++ b/help/cs/cs.po
--- a/help/da/da.po
+++ b/help/da/da.po
--- a/help/de/de.po
+++ b/help/de/de.po
--- a/help/el/el.po
+++ b/help/el/el.po
--- a/help/es/es.po
+++ b/help/es/es.po
--- a/help/fi/fi.po
+++ b/help/fi/fi.po
--- a/help/fr/fr.po
+++ b/help/fr/fr.po
--- a/help/hu/hu.po
+++ b/help/hu/hu.po
--- a/help/it/it.po
+++ b/help/it/it.po
--- a/help/ja/ja.po
+++ b/help/ja/ja.po
--- a/help/ko/ko.po
+++ b/help/ko/ko.po
--- a/help/meson.build
+++ b/help/meson.build
@@ -0,0 +1,20 @@
+help_sources = [
+    'index.docbook',
+    'legal.xml'
+]
+
+help_media = [
+    'figures/xed_format_bold.png',
+    'figures/xed_format_italic.png',
+    'figures/xed_format_strikethrough.png',
+    'figures/xed_format_underline.png',
+    'figures/xed_recent_files_menu_icon.png',
+    'figures/xed_window.png'
+]
+
+gnome.yelp(
+    meson.project_name(),
+    sources: help_sources,
+    media: help_media,
+    symlink_media: false
+)
--- a/help/oc/oc.po
+++ b/help/oc/oc.po
--- a/help/pt_BR/pt_BR.po
+++ b/help/pt_BR/pt_BR.po
--- a/help/ru/ru.po
+++ b/help/ru/ru.po
--- a/help/sv/sv.po
+++ b/help/sv/sv.po
--- a/help/th/th.po
+++ b/help/th/th.po
--- a/help/uk/uk.po
+++ b/help/uk/uk.po
--- a/help/xedit.omf.in
+++ b/help/xedit.omf.in
--- a/help/zh_CN/zh_CN.po
+++ b/help/zh_CN/zh_CN.po
--- a/help/zh_HK/zh_HK.po
+++ b/help/zh_HK/zh_HK.po
@@ -10,8 +10,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"

 #: ../base.xml:24(title) ../base.xml:95(revnumber)
-msgid "xedit Manual V2.5.1"
-msgstr "xedit 手冊 V2.5.1"
+msgid "xed Manual V2.5.1"
+msgstr "xed 手冊 V2.5.1"

 #: ../base.xml:26(year)
 msgid "2003"
@@ -58,8 +58,8 @@ msgstr "Baris"

 #: ../base.xml:65(surname)
 msgid ""
-"Cicek provided information from earlier revisions of the xedit application."
-msgstr "Cicek 提供 xedit 應用程式較早版本的資訊。"
+"Cicek provided information from earlier revisions of the xed application."
+msgstr "Cicek 提供 xed 應用程式較早版本的資訊。"

 #: ../base.xml:66(contrib)
 msgid "Acknowledgements"
@@ -80,64 +80,64 @@ msgid "Sun MATE Documentation Team"
 msgstr "Sun MATE 文件小組"

 #: ../base.xml:103(revnumber)
-msgid "xedit Manual V2.5"
-msgstr "xedit 手冊 V2.5"
+msgid "xed Manual V2.5"
+msgstr "xed 手冊 V2.5"

 #: ../base.xml:104(date)
 msgid "March 2003"
 msgstr "2003 年 3 月"

 #: ../base.xml:111(revnumber)
-msgid "xedit Manual V2.4"
-msgstr "xedit 手冊 V2.4"
+msgid "xed Manual V2.4"
+msgstr "xed 手冊 V2.4"

 #: ../base.xml:112(date)
 msgid "January 2003"
 msgstr "2003 年 1 月"

 #: ../base.xml:119(revnumber)
-msgid "xedit Manual V2.3"
-msgstr "xedit 手冊 V2.3"
+msgid "xed Manual V2.3"
+msgstr "xed 手冊 V2.3"

 #: ../base.xml:120(date)
 msgid "September 2002"
 msgstr "2002 年 9 月"

 #: ../base.xml:127(revnumber)
-msgid "xedit Manual V2.2"
-msgstr "xedit 手冊 V2.2"
+msgid "xed Manual V2.2"
+msgstr "xed 手冊 V2.2"

 #: ../base.xml:128(date)
 msgid "August 2002"
 msgstr "2002 年 8 月"

 #: ../base.xml:135(revnumber)
-msgid "xedit Manual V2.1"
-msgstr "xedit 手冊 V2.1"
+msgid "xed Manual V2.1"
+msgstr "xed 手冊 V2.1"

 #: ../base.xml:136(date)
 msgid "June 2002"
 msgstr "2002 年 6 月"

 #: ../base.xml:143(revnumber)
-msgid "xedit Manual V2.0"
-msgstr "xedit 手冊 V2.0"
+msgid "xed Manual V2.0"
+msgstr "xed 手冊 V2.0"

 #: ../base.xml:144(date)
 msgid "March 2002"
 msgstr "2002 年 3 月"

 #: ../base.xml:151(revnumber)
-msgid "xedit V1.0"
-msgstr "xedit 手冊 V1.0"
+msgid "xed V1.0"
+msgstr "xed 手冊 V1.0"

 #: ../base.xml:154(para)
 msgid "Eric Baudais <email>baudais@okstate.edu</email>"
 msgstr "Eric Baudais <email>baudais@okstate.edu</email>"

 #: ../base.xml:160(releaseinfo)
-msgid "This manual describes version 2.2.1 of xedit."
-msgstr "本手冊的內容是說明 2.2.1 版的 xedit。"
+msgid "This manual describes version 2.2.1 of xed."
+msgstr "本手冊的內容是說明 2.2.1 版的 xed。"

 #: ../base.xml:163(title)
 msgid "Feedback"
@@ -145,17 +145,17 @@ msgstr "意見回饋"

 #: ../base.xml:164(para)
 msgid ""
-"To report a bug or make a suggestion regarding the <application>xedit</"
+"To report a bug or make a suggestion regarding the <application>xed</"
 "application> application or this manual, follow the directions in the <ulink "
 "url=\"help:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
-"關於本 <application>xedit</application> 應用程式或本手冊，如果要報告錯誤 或提"
+"關於本 <application>xed</application> 應用程式或本手冊，如果要報告錯誤 或提"
 "出建議，請遵照 <ulink url=\"help:mate-feedback\" type=\"help\">MATE "
 "Feedback Page</ulink> 的指示。"

 #: ../base.xml:171(primary)
-msgid "xedit"
-msgstr "xedit"
+msgid "xed"
+msgstr "xed"

 #: ../base.xml:172(primary)
 msgid "text editor"
@@ -167,13 +167,13 @@ msgstr "介紹"

 #: ../base.xml:178(para)
 msgid ""
-"The <application>xedit</application> application enables you to create and "
-"edit text files. You can use <application>xedit</application> plugins to "
+"The <application>xed</application> application enables you to create and "
+"edit text files. You can use <application>xed</application> plugins to "
 "perform a variety of tasks related to text-editing from within the "
-"<application>xedit</application> window."
+"<application>xed</application> window."
 msgstr ""
-"您可以使用 <application>xedit</application> 應用程式建立和編輯文字 檔案。您可"
-"以使用 <application>xedit</application> 增效模組在 <application>xedit</"
+"您可以使用 <application>xed</application> 應用程式建立和編輯文字 檔案。您可"
+"以使用 <application>xed</application> 增效模組在 <application>xed</"
 "application> 視窗中 執行各種和文字編輯相關的工作。"

 #: ../base.xml:185(title)
@@ -181,12 +181,12 @@ msgid "Getting Started"
 msgstr "入門"

 #: ../base.xml:189(title)
-msgid "To Start xedit"
-msgstr "啟動 xedit"
+msgid "To Start xed"
+msgstr "啟動 xed"

 #: ../base.xml:190(para)
-msgid "You can start <application>xedit</application> in the following ways:"
-msgstr "您可以使用下列方式啟動 <application>xedit</application>："
+msgid "You can start <application>xed</application> in the following ways:"
+msgstr "您可以使用下列方式啟動 <application>xed</application>："

 #: ../base.xml:193(guimenu)
 msgid "Menu"
@@ -194,11 +194,11 @@ msgstr "功能表"

 #: ../base.xml:195(para)
 msgid ""
-"For information about how to start <application>xedit</application> from a "
+"For information about how to start <application>xed</application> from a "
 "menu, see the latest version of the MATE Desktop User Guide for your "
 "platform."
 msgstr ""
-"若需如何從功能表啟動 <application>xedit</application> 的詳細資訊，請參閱最新"
+"若需如何從功能表啟動 <application>xed</application> 的詳細資訊，請參閱最新"
 "版的平台 MATE Desktop User Guide。"

 #: ../base.xml:200(term)
@@ -206,32 +206,32 @@ msgid "Command line"
 msgstr "指令行"

 #: ../base.xml:202(para)
-msgid "Execute the following command: <command>xedit</command>"
-msgstr "執行以下的指令： <command>xedit</command>"
+msgid "Execute the following command: <command>xed</command>"
+msgstr "執行以下的指令： <command>xed</command>"

 #: ../base.xml:210(title)
-msgid "When You Start xedit"
-msgstr "當您啟動 xedit"
+msgid "When You Start xed"
+msgstr "當您啟動 xed"

 #: ../base.xml:211(para)
 msgid ""
-"When you start <application>xedit</application>, the following window is "
+"When you start <application>xed</application>, the following window is "
 "displayed:"
-msgstr "當您啟動 <application>xedit</application> 後，會顯示下面的視窗："
+msgstr "當您啟動 <application>xed</application> 後，會顯示下面的視窗："

 #: ../base.xml:214(title)
-msgid "xedit Window"
-msgstr "xedit 視窗"
+msgid "xed Window"
+msgstr "xed 視窗"

 #: ../base.xml:220(phrase)
-msgid "Shows xedit main window."
-msgstr "顯示 xedit 主視窗。"
+msgid "Shows xed main window."
+msgstr "顯示 xed 主視窗。"

 #: ../base.xml:226(para)
 msgid ""
-"The <application>xedit</application> window contains the following elements:"
+"The <application>xed</application> window contains the following elements:"
 msgstr ""
-"<application>xedit</application> 視窗包含下列的 元素：您可以選擇下列條件中的"
+"<application>xed</application> 視窗包含下列的 元素：您可以選擇下列條件中的"
 "一項或以上："

 #: ../base.xml:229(term)
@@ -241,9 +241,9 @@ msgstr "功能表列"
 #: ../base.xml:231(para)
 msgid ""
 "The menus on the menubar contain all of the commands you need to work with "
-"files in <application>xedit</application>."
+"files in <application>xed</application>."
 msgstr ""
-"在功能表列上的功能表中，有您在 <application>xedit</application> 中與檔案工作"
+"在功能表列上的功能表中，有您在 <application>xed</application> 中與檔案工作"
 "所需的所有指令。"

 #: ../base.xml:235(term)
@@ -280,19 +280,19 @@ msgstr "狀態列"

 #: ../base.xml:254(para)
 msgid ""
-"The statusbar displays information about current <application>xedit</"
+"The statusbar displays information about current <application>xed</"
 "application> activity and contextual information about the menu items."
 msgstr ""
-"狀態列可以顯示目前 <application>xedit</application> 活動的資訊，以及有關功能"
+"狀態列可以顯示目前 <application>xed</application> 活動的資訊，以及有關功能"
 "表項目 的上下文資訊。"

 #: ../base.xml:260(para)
 msgid ""
-"When you right-click in the <application>xedit</application> window, the "
+"When you right-click in the <application>xed</application> window, the "
 "application displays a popup menu. The popup menu contains the most common "
 "text editing commands."
 msgstr ""
-"當您在 <application>xedit</application> 視窗中按滑鼠右鍵時，應用程式會顯示即"
+"當您在 <application>xed</application> 視窗中按滑鼠右鍵時，應用程式會顯示即"
 "現式功能表。即現式功能表包含了 最常用的文字編輯指令。"

 #: ../base.xml:266(title)
@@ -304,27 +304,27 @@ msgid ""
 "To open a file, choose <menuchoice><guimenu>File</guimenu><guimenuitem>Open</"
 "guimenuitem></menuchoice> to display the <guilabel>Open File</guilabel> "
 "dialog. Select the file that you want to open, then click <guibutton>OK</"
-"guibutton>. The file is displayed in the <application>xedit</application> "
+"guibutton>. The file is displayed in the <application>xed</application> "
 "window."
 msgstr ""
 "如果要開啟檔案，請選擇 <menuchoice><guimenu>檔案</guimenu><guimenuitem>開啟</"
 "guimenuitem></menuchoice> ，顯示<guilabel>開啟檔案</guilabel>對話方塊。選取要"
 "開啟的檔案 ，然後按一下<guibutton>確定</guibutton>。這個檔案便會 顯示在 "
-"<application>xedit</application> 視窗中。"
+"<application>xed</application> 視窗中。"

 #: ../base.xml:273(para)
 msgid ""
-"You can open multiple files in <application>xedit</application>. The "
+"You can open multiple files in <application>xed</application>. The "
 "application displays one file at a time in the application window. The "
 "application adds a tab for each open file to the window. To display another "
 "open file, click on the tab that corresponds to the file. To create a new "
-"<application> xedit</application> window for each file that is open, drag "
+"<application> xed</application> window for each file that is open, drag "
 "the tab corresponding to each file to the desktop background."
 msgstr ""
-"您可以在 <application>xedit</application> 中，開啟多個檔案。 本應用程式在應用"
+"您可以在 <application>xed</application> 中，開啟多個檔案。 本應用程式在應用"
 "程式視窗中，一次只會顯示一個檔案。 應用程式會為每個開啟的檔案，在視窗中增加一"
 "個標籤。如果要顯示另外一個 開啟的檔案，請按該檔案的標籤。如果為每一個開啟的檔"
-"案，建立一個新的 <application> xedit</application> 視窗，請將檔案的 標籤一個"
+"案，建立一個新的 <application> xed</application> 視窗，請將檔案的 標籤一個"
 "個地拖曳至桌面背景上。"

 #: ../base.xml:279(para)
@@ -332,11 +332,11 @@ msgid ""
 "You can also use the <guimenu>Documents</guimenu> menu to move between the "
 "open files. You can choose <menuchoice><guimenu>Documents</"
 "guimenu><guimenuitem>Move to New Window</guimenuitem></menuchoice> to move a "
-"document to a new <application> xedit</application> window."
+"document to a new <application> xed</application> window."
 msgstr ""
 "您也可以使用 <guimenu>文件</guimenu>功能表，在開啟的檔案之間移動。您可以選擇"
 "<menuchoice><guimenu>文件</guimenu><guimenuitem>移至新視窗</guimenuitem></"
-"menuchoice>，將文件移到新的 <application> xedit</application> 視窗。"
+"menuchoice>，將文件移到新的 <application> xed</application> 視窗。"

 #: ../base.xml:290(phrase)
 msgid "Shows Recent Files menu icon."
@@ -361,11 +361,11 @@ msgstr "從指令行開啟多個檔案"

 #: ../base.xml:298(para)
 msgid ""
-"You can run <application>xedit</application> from a command line and open a "
+"You can run <application>xed</application> from a command line and open a "
 "single file or multiple files. To open multiple files from a command line, "
 "type the following command, then press <keycap>Return</keycap>:"
 msgstr ""
-"您可以從指令行執行 <application>xedit</application>，並開啟一個或多個檔案。如"
+"您可以從指令行執行 <application>xed</application>，並開啟一個或多個檔案。如"
 "果要從指令行開啟多個檔案，請鍵入下列指令，然後按一下 <keycap>Return</keycap> "
 "鍵。"

@@ -374,26 +374,26 @@ msgid "file1.txt file2.txt file3.txt"
 msgstr "file1.txt file2.txt file3.txt"

 #: ../base.xml:301(command)
-msgid "xedit <placeholder-1/>"
-msgstr "xedit <placeholder-1/>"
+msgid "xed <placeholder-1/>"
+msgstr "xed <placeholder-1/>"

 #: ../base.xml:302(para)
 msgid ""
 "When the application starts, the files that you specify are displayed in the "
-"<application>xedit</application> window."
+"<application>xed</application> window."
 msgstr ""
-"當應用程式啟動時，您所指定的檔案便會顯示在 <application>xedit</application> "
+"當應用程式啟動時，您所指定的檔案便會顯示在 <application>xed</application> "
 "視窗內。"

 #: ../base.xml:304(para)
 msgid ""
-"For more information on how to run <application>xedit</application> from a "
-"command line, see <ulink url=\"man:xedit\" type=\"man"
-"\"><citerefentry><refentrytitle>xedit</refentrytitle><manvolnum>1</"
+"For more information on how to run <application>xed</application> from a "
+"command line, see <ulink url=\"man:xed\" type=\"man"
+"\"><citerefentry><refentrytitle>xed</refentrytitle><manvolnum>1</"
 "manvolnum></citerefentry></ulink>."
 msgstr ""
-"若需如何從指令行執行 <application>xedit</application> 的詳細資訊，請參閱 "
-"<ulink url=\"man:xedit\" type=\"man\"><citerefentry><refentrytitle>xedit</"
+"若需如何從指令行執行 <application>xed</application> 的詳細資訊，請參閱 "
+"<ulink url=\"man:xed\" type=\"man\"><citerefentry><refentrytitle>xed</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry></ulink>。"

 #: ../base.xml:309(title)
@@ -408,10 +408,10 @@ msgstr "建立新檔案"
 msgid ""
 "To create a new file, choose <menuchoice><guimenu>File</"
 "guimenu><guimenuitem>New</guimenuitem></menuchoice>. The application "
-"displays a new file in the <application>xedit</application> window."
+"displays a new file in the <application>xed</application> window."
 msgstr ""
 "如果要建立新檔案，請選擇 <menuchoice><guimenu>檔案</guimenu><guimenuitem>開新"
-"檔案</guimenuitem></menuchoice>。應用程式會在 <application>xedit</"
+"檔案</guimenuitem></menuchoice>。應用程式會在 <application>xed</"
 "application> 視窗內顯示新檔案。"

 #: ../base.xml:321(title)
@@ -446,11 +446,11 @@ msgstr ""

 #: ../base.xml:334(para)
 msgid ""
-"To save all of the files that are currently open in <application>xedit</"
+"To save all of the files that are currently open in <application>xed</"
 "application>, choose <menuchoice><guimenu>Documents</"
 "guimenu><guimenuitem>Save All</guimenuitem></menuchoice>."
 msgstr ""
-"如果要儲存目前在 <application>xedit</application> 中開啟的所有檔案，請選擇 "
+"如果要儲存目前在 <application>xed</application> 中開啟的所有檔案，請選擇 "
 "<menuchoice><guimenu>文件</guimenu><guimenuitem>全部 儲存</guimenuitem></"
 "menuchoice>。"

@@ -541,14 +541,14 @@ msgid ""
 "choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Redo</guimenuitem></"
 "menuchoice>. The number of previous edits that you can undo is determined by "
 "the <guilabel>Set limit on undo actions to</guilabel> setting in the <xref "
-"linkend=\"xedit-prefs-undo\"/> tabbed section of the <guilabel>Preferences</"
+"linkend=\"xed-prefs-undo\"/> tabbed section of the <guilabel>Preferences</"
 "guilabel> dialog."
 msgstr ""
 "如果要還原或重做編輯，請選擇 <menuchoice><guimenu>編輯</guimenu><guimenuitem>"
 "還原</guimenuitem></menuchoice>。如果要重做編輯，請選擇 <menuchoice><guimenu>"
 "編輯</guimenu><guimenuitem>重做</guimenuitem></menuchoice>。您所能還原之前編"
 "輯的次數，是取決於 <guilabel>限制還原次數為</guilabel>設定 (在 <xref linkend="
-"\"xedit-prefs-undo\"/>標籤區段中 (在 <guilabel>偏好設定</guilabel>對話方塊"
+"\"xed-prefs-undo\"/>標籤區段中 (在 <guilabel>偏好設定</guilabel>對話方塊"
 "中))。"

 #: ../base.xml:399(title)
@@ -626,12 +626,12 @@ msgstr ""
 #: ../base.xml:435(para) ../base.xml:490(para)
 msgid ""
 "Click <guibutton>Find</guibutton> to search the file for the first "
-"occurrence of the string. If <application>xedit</application> finds the "
+"occurrence of the string. If <application>xed</application> finds the "
 "string, the application moves the cursor to the string, and selects the "
 "string."
 msgstr ""
 "按一下<guibutton>尋找</guibutton>，搜尋檔案中 第一個字串事件。如果 "
-"<application>xedit</application> 找到字串，應用程式會將游標移動到字串上，並選"
+"<application>xed</application> 找到字串，應用程式會將游標移動到字串上，並選"
 "取 該字串。"

 #: ../base.xml:440(para) ../base.xml:500(para)
@@ -710,14 +710,14 @@ msgstr ""

 #: ../base.xml:522(para)
 msgid ""
-"Type <command>xedit <replaceable>URI</replaceable></command> at a command "
+"Type <command>xed <replaceable>URI</replaceable></command> at a command "
 "line, where <replaceable>URI</replaceable> is the URI of the file that you "
 "want to open, then press <keycap>Return</keycap>. Valid types of "
 "<replaceable>URI</replaceable> include <literal>http:</literal>, "
 "<literal>ftp:</literal>, <literal>file:</literal>, and all of the methods "
 "supported by <literal>gvfs</literal>."
 msgstr ""
-"在指令行上輸入 <command>xedit <replaceable>URI</replaceable></command> (此處"
+"在指令行上輸入 <command>xed <replaceable>URI</replaceable></command> (此處"
 "的 <replaceable>URI</replaceable> 是指您要開啟之檔案的 URI)，然後按下 "
 "<keycap>Return</keycap> 鍵。有效的 <replaceable>URI</replaceable> 類型包括 "
 "<literal>http:</literal>、<literal>ftp:</literal>、<literal>file:</literal>，"
@@ -733,31 +733,31 @@ msgstr "輸出指令到檔案"

 #: ../base.xml:532(para)
 msgid ""
-"You can use <application>xedit</application> to pipe the output of a command "
+"You can use <application>xed</application> to pipe the output of a command "
 "to a text file. For example, to pipe the output of an <command>ls </command> "
-"command to a text file, type <command>ls | xedit</command>, then press "
+"command to a text file, type <command>ls | xed</command>, then press "
 "<keycap>Return</keycap>."
 msgstr ""
-"您可以使用 <application>xedit</application>，將指令的輸出傳送到 文字檔案。例"
+"您可以使用 <application>xed</application>，將指令的輸出傳送到 文字檔案。例"
 "如，如果要將 <command>ls </command> 指令的輸出傳送到文字檔案，請鍵入 "
-"<command>ls | xedit</command>，然後按下 <keycap>Return</keycap> 鍵。"
+"<command>ls | xed</command>，然後按下 <keycap>Return</keycap> 鍵。"

 #: ../base.xml:536(para)
 msgid ""
 "The output of the <command>ls</command> command is displayed in a new text "
-"file in the <application>xedit</application> window."
+"file in the <application>xed</application> window."
 msgstr ""
-"<command>ls</command> 指令的輸出，會 在 <application>xedit</application> 視窗"
+"<command>ls</command> 指令的輸出，會 在 <application>xed</application> 視窗"
 "中以一個新的文字檔案顯示。"

 #: ../base.xml:538(para)
 msgid ""
 "Alternatively, you can use the Shell command plugin to pipe command output "
 "to the current file. For information about how to use the Shell command "
-"plugin, see <xref linkend=\"xedit-shell-command-plugin\"/>."
+"plugin, see <xref linkend=\"xed-shell-command-plugin\"/>."
 msgstr ""
 "或者，您可以使用 Shell 指令增效模組，將指令輸出 傳送到目前的檔案中。如需如何"
-"使用 Shell 指令增效模組的資訊，請參閱 <xref linkend=\"xedit-shell-command-"
+"使用 Shell 指令增效模組的資訊，請參閱 <xref linkend=\"xed-shell-command-"
 "plugin\"/>。"

 #: ../base.xml:543(title)
@@ -823,9 +823,9 @@ msgstr "列印檔案"

 #: ../base.xml:571(para)
 msgid ""
-"You can use <application>xedit</application> to perform the following print "
+"You can use <application>xed</application> to perform the following print "
 "operations:"
-msgstr "您可以使用<application>xedit</application>，執行 下列列印作業："
+msgstr "您可以使用<application>xed</application>，執行 下列列印作業："

 #: ../base.xml:574(para)
 msgid "Print a file to a printer."
@@ -837,11 +837,11 @@ msgstr "將列印指令的輸出列印到檔案。"

 #: ../base.xml:579(para)
 msgid ""
-"If you print to a file, <application>xedit</application> sends the output of "
+"If you print to a file, <application>xed</application> sends the output of "
 "the file to a pre-press format file. The most common pre-press formats are "
 "PostScript and Portable Document Format (PDF)."
 msgstr ""
-"如果您是列印至檔案，<application>xedit</application> 會先將 檔案輸出傳送到某"
+"如果您是列印至檔案，<application>xed</application> 會先將 檔案輸出傳送到某"
 "個印前格式檔案。最常見的印前 格式為 PostScript 與 Portable Document Format "
 "(PDF)。"

@@ -1012,13 +1012,13 @@ msgstr "自訂工具列與狀態列"
 msgid ""
 "To display or hide the toolbar, choose <menuchoice><guimenu>View</"
 "guimenu><guimenuitem>Toolbar</guimenuitem></menuchoice>. To customize how "
-"<application>xedit</application> displays the toolbar, choose "
+"<application>xed</application> displays the toolbar, choose "
 "<menuchoice><guimenu>View</guimenu><guisubmenu>Customize Toolbar</"
 "guisubmenu></menuchoice>, then select one of the following menu items:"
 msgstr ""
 "如果要顯示或隱藏工具列，請選擇<menuchoice><guimenu>檢視</"
 "guimenu><guimenuitem>工具列</guimenuitem></menuchoice>。如果要自訂 "
-"<application>xedit</application> 顯示工具列的方式，請選擇"
+"<application>xed</application> 顯示工具列的方式，請選擇"
 "<menuchoice><guimenu>檢視</guimenu><guisubmenu>自訂工具列</guisubmenu></"
 "menuchoice>，然後選取下列任一項 功能表項目："

@@ -1058,13 +1058,13 @@ msgstr "顯示圖示，以及顯示一些圖示旁的文字。"
 msgid ""
 "To display or hide the statusbar, choose <menuchoice><guimenu>View</"
 "guimenu><guimenuitem>Statusbar</guimenuitem></menuchoice>. To customize how "
-"<application>xedit</application> displays the statusbar, choose "
+"<application>xed</application> displays the statusbar, choose "
 "<menuchoice><guimenu>View</guimenu><guisubmenu>Customize Statusbar</"
 "guisubmenu></menuchoice>, then select one of the following menu items:"
 msgstr ""
 "如果要顯示或隱藏狀態列，請選擇<menuchoice><guimenu>檢視</"
 "guimenu><guimenuitem>狀態列</guimenuitem></menuchoice>。如果要自訂 "
-"<application>xedit</application> 顯示狀態列的方式，請選擇"
+"<application>xed</application> 顯示狀態列的方式，請選擇"
 "<menuchoice><guimenu>檢視</guimenu><guisubmenu>自訂狀態列</guisubmenu></"
 "menuchoice>，然後選取下列任一項 功能表項目："

@@ -1103,12 +1103,12 @@ msgstr "偏好設定"

 #: ../base.xml:737(para)
 msgid ""
-"To configure <application>xedit</application>, choose "
+"To configure <application>xed</application>, choose "
 "<menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></"
 "menuchoice>. The <guilabel>Preferences</guilabel> dialog contains the "
 "following categories:"
 msgstr ""
-"如果要配置 <application>xedit</application>，請選擇 <menuchoice><guimenu>編輯"
+"如果要配置 <application>xed</application>，請選擇 <menuchoice><guimenu>編輯"
 "</guimenu><guimenuitem>偏好設定</guimenuitem></menuchoice>。<guilabel>偏好設"
 "定</guilabel>對話方塊含有下列 種類："

@@ -1133,9 +1133,9 @@ msgstr "使用預設配色字型"
 #: ../base.xml:763(para)
 msgid ""
 "Select this option to use the default system font for the text in the "
-"<application>xedit</application> text window."
+"<application>xed</application> text window."
 msgstr ""
-"選取這個選項，在 <application>xedit</application> 文字視窗的文字中，會使用系"
+"選取這個選項，在 <application>xed</application> 文字視窗的文字中，會使用系"
 "統預設的字型。"

 #: ../base.xml:766(guilabel)
@@ -1144,11 +1144,11 @@ msgstr "編輯器字型"

 #: ../base.xml:768(para)
 msgid ""
-"This field displays the font that <application>xedit</application> uses to "
+"This field displays the font that <application>xed</application> uses to "
 "display text. Click on the button to specify the font type, style, and size "
 "to use for text."
 msgstr ""
-"這個欄位會顯示 <application>xedit</application> 用來顯示文字的字型。 按一下按"
+"這個欄位會顯示 <application>xed</application> 用來顯示文字的字型。 按一下按"
 "鈕，指定文字所使用的字體類型、樣式與大小。"

 #: ../base.xml:772(guilabel)
@@ -1158,9 +1158,9 @@ msgstr "使用預設的配色色彩"
 #: ../base.xml:774(para)
 msgid ""
 "Select this option to use the default theme colors in the "
-"<application>xedit</application> text window."
+"<application>xed</application> text window."
 msgstr ""
-"選取這個選項，會在 <application>xedit</application> 文字視窗中，使用預設的配"
+"選取這個選項，會在 <application>xed</application> 文字視窗中，使用預設的配"
 "色色彩。"

 #: ../base.xml:777(guilabel)
@@ -1171,10 +1171,10 @@ msgstr "文字色彩"
 msgid ""
 "Click on the <guibutton>Text color</guibutton> button to display the color "
 "selector dialog. Select a color to use to display text in the "
-"<application>xedit</application> text window."
+"<application>xed</application> text window."
 msgstr ""
 "按一下<guibutton>文字色彩</guibutton>按鈕， 顯示色彩選擇元件對話方塊。請選取"
-"顏色，程式會在 <application>xedit</application> 文字視窗中，以該顏色顯示文"
+"顏色，程式會在 <application>xed</application> 文字視窗中，以該顏色顯示文"
 "字。"

 #: ../base.xml:784(guilabel)
@@ -1184,11 +1184,11 @@ msgstr "背景色彩"
 #: ../base.xml:786(para)
 msgid ""
 "Click on the <guibutton>Background color</guibutton> button to display the "
-"color selector dialog. Select a background color for the <application>xedit</"
+"color selector dialog. Select a background color for the <application>xed</"
 "application> text window."
 msgstr ""
 "按一下<guibutton>背景色彩</guibutton>按鈕， 顯示色彩選擇元件對話方塊。請為 "
-"<application>xedit</application> 文字視窗選取背景色彩。"
+"<application>xed</application> 文字視窗選取背景色彩。"

 #: ../base.xml:791(guilabel)
 msgid "Selected text color"
@@ -1226,9 +1226,9 @@ msgstr "tab 字元的寬度為"
 #: ../base.xml:813(para)
 msgid ""
 "Use this spin box to specify the width of the space that <application> "
-"xedit</application> inserts when you press the <keycap>Tab</keycap> key."
+"xed</application> inserts when you press the <keycap>Tab</keycap> key."
 msgstr ""
-"請使用這個旋轉方塊，指定 <application> xedit</application> 在您按下 "
+"請使用這個旋轉方塊，指定 <application> xed</application> 在您按下 "
 "<keycap>Tab</keycap> 鍵時會加入的空格寬度。"

 #: ../base.xml:818(guilabel)
@@ -1237,11 +1237,11 @@ msgstr "以插入空格取代跳格"

 #: ../base.xml:820(para)
 msgid ""
-"Select this option to specify that <application> xedit</application> inserts "
+"Select this option to specify that <application> xed</application> inserts "
 "spaces instead of a tab character when you press the <keycap>Tab</keycap> "
 "key."
 msgstr ""
-"選取這個選項可以指定 <application> xedit</application> 在您按下 <keycap>Tab</"
+"選取這個選項可以指定 <application> xed</application> 在您按下 <keycap>Tab</"
 "keycap> 鍵時，以插入空格取 代跳格字元。"

 #: ../base.xml:830(title)
@@ -1293,8 +1293,8 @@ msgstr "顯示行號"
 #: ../base.xml:861(para)
 msgid ""
 "Select this option to display line numbers on the left side of the "
-"<application>xedit</application> window."
-msgstr "選取這個選項，會在 <application>xedit</application> 視窗左側顯示行號。"
+"<application>xed</application> window."
+msgstr "選取這個選項，會在 <application>xed</application> 視窗左側顯示行號。"

 #: ../base.xml:869(title)
 msgid "Open"
@@ -1320,18 +1320,18 @@ msgstr ""

 #: ../base.xml:877(para)
 msgid ""
-"By default, <application>xedit</application> uses UTF-8 encoding to try to "
+"By default, <application>xed</application> uses UTF-8 encoding to try to "
 "open a file. UTF-8 encoding can be used for multilingual texts, as UTF-8 "
 "covers almost all known alphabets and character sets. If the file is not a "
-"valid UTF-8 file, <application>xedit</application> tries to open the file by "
+"valid UTF-8 file, <application>xed</application> tries to open the file by "
 "using the encoding for the current locale. If this also fails, "
-"<application>xedit</application> tries to use an encoding from the Supported "
+"<application>xed</application> tries to use an encoding from the Supported "
 "encodings list, starting at the top of the list."
 msgstr ""
-"依預設值，<application>xedit</application> 是使用 UTF-8 編碼來開啟檔案。UTF-"
+"依預設值，<application>xed</application> 是使用 UTF-8 編碼來開啟檔案。UTF-"
 "8 編碼可用於內含多種語言的文件，因為 UTF-8 涵蓋了大多數已知的字母與字元集。如"
-"果檔案並不是有效的 UTF-8 檔，<application>xedit</application> 會試著以目前語"
-"系的編碼來開啟檔案。如果這樣依然有問題，<application>xedit</application> 會從"
+"果檔案並不是有效的 UTF-8 檔，<application>xed</application> 會試著以目前語"
+"系的編碼來開啟檔案。如果這樣依然有問題，<application>xed</application> 會從"
 "支援的編碼清單中第一個編碼方式開始，一個個地來試著開啟檔案。"

 #: ../base.xml:880(para)
@@ -1566,10 +1566,10 @@ msgstr "按一下這個按鈕，可以選取列印行號時的字型。"
 #: ../base.xml:1043(para)
 msgid ""
 "To reset the fonts to the default fonts for printing a file from "
-"<application>xedit</application> click on the <guibutton>Restore Default "
+"<application>xed</application> click on the <guibutton>Restore Default "
 "Fonts</guibutton> button."
 msgstr ""
-"如果要將 <application>xedit</application> 列印檔案時的字型，重設為預設值， 請"
+"如果要將 <application>xed</application> 列印檔案時的字型，重設為預設值， 請"
 "按一下<guibutton>還原預設字型</guibutton>按鈕。"

 #: ../base.xml:1050(title)
@@ -1579,11 +1579,11 @@ msgstr "增效模組"
 #: ../base.xml:1051(para)
 msgid ""
 "For information about how to use the <guilabel>Plugins</guilabel> category "
-"of the <guilabel>Preferences</guilabel> dialog, see <xref linkend=\"xedit-"
+"of the <guilabel>Preferences</guilabel> dialog, see <xref linkend=\"xed-"
 "install-plugins\"/>."
 msgstr ""
 "關於如何使用<guilabel>偏好設定</guilabel>對話方塊的<guilabel>增效模組</"
-"guilabel>類別，進一步資訊請參閱 <xref linkend=\"xedit-install-plugins\"/>。"
+"guilabel>類別，進一步資訊請參閱 <xref linkend=\"xed-install-plugins\"/>。"

 #: ../base.xml:1058(title)
 msgid "Working with Plugins"
@@ -1592,15 +1592,15 @@ msgstr "使用增效模組"
 #: ../base.xml:1059(para)
 msgid ""
 "A plugin is a supplementary program that enhances the functionality of an "
-"application. The <application>xedit</application> plugins enable you to "
+"application. The <application>xed</application> plugins enable you to "
 "perform a variety of functions related to text editing from within the "
-"<application> xedit</application> window. The following table lists the "
-"<application> xedit</application> plugins."
+"<application> xed</application> window. The following table lists the "
+"<application> xed</application> plugins."
 msgstr ""
 "增效模組是一種以可增強應用程式功能的 補強性程式。您可以使用 "
-"<application>xedit</application> 增效模組，在 <application> xedit</"
+"<application>xed</application> 增效模組，在 <application> xed</"
 "application> 視窗內，執行多種文字編輯功能。下表所列的，便是 <application> "
-"xedit</application> 的增效模組。"
+"xed</application> 的增效模組。"

 #: ../base.xml:1070(para) ../base.xml:1150(para)
 msgid "Plugin Name"
@@ -1707,37 +1707,37 @@ msgid "Inserts the username of the current user into the file."
 msgstr "將目前的使用者名稱加入到檔案中。"

 #: ../base.xml:1123(title)
-msgid "To Load xedit Plugins"
-msgstr "載入 xedit 增效模組"
+msgid "To Load xed Plugins"
+msgstr "載入 xed 增效模組"

 #: ../base.xml:1124(para)
 msgid ""
-"To load <application>xedit</application> plugins, choose "
+"To load <application>xed</application> plugins, choose "
 "<menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></"
 "menuchoice>. Within the <guilabel>Plugins</guilabel> category, click on the "
 "<guilabel>Manager</guilabel> subcategory. The <guilabel>Manager</guilabel> "
 "subcategory displays the following information:"
 msgstr ""
-"如果要載入 <application>xedit</application>增效模組，請選擇"
+"如果要載入 <application>xed</application>增效模組，請選擇"
 "<menuchoice><guimenu>編輯</guimenu><guimenuitem>偏好設定</guimenuitem></"
 "menuchoice>。在<guilabel>增效模組</guilabel>類別中，按一下<guilabel>管理員</"
 "guilabel>子類別。 <guilabel>管理員</guilabel>子類別會顯示下列資訊："

 #: ../base.xml:1131(para)
 msgid ""
-"A list of the plugins that you can use with <application>xedit</application>."
-msgstr "可以與 <application>xedit</application> 一同使用之增效模組的清單。"
+"A list of the plugins that you can use with <application>xed</application>."
+msgstr "可以與 <application>xed</application> 一同使用之增效模組的清單。"

 #: ../base.xml:1133(para)
 msgid ""
 "A <guibutton>Configure plugin</guibutton> button. You can use this button to "
 "open a configuration dialog for the plugins that you can configure. For "
-"example, see <xref linkend=\"xedit-compare-files-configure\"/> and <xref "
-"linkend=\"xedit-date-time-configure\"/>."
+"example, see <xref linkend=\"xed-compare-files-configure\"/> and <xref "
+"linkend=\"xed-date-time-configure\"/>."
 msgstr ""
 "<guibutton>配置增效模組</guibutton> 按鈕。您可以使用這個按鈕，為您可以配置的"
-"增效模組，開啟配置對話方塊。例如，請參閱 <xref linkend=\"xedit-compare-files-"
-"configure\"/> 以及 <xref linkend=\"xedit-date-time-configure\"/>。"
+"增效模組，開啟配置對話方塊。例如，請參閱 <xref linkend=\"xed-compare-files-"
+"configure\"/> 以及 <xref linkend=\"xed-date-time-configure\"/>。"

 #: ../base.xml:1136(para)
 msgid ""
@@ -1753,12 +1753,12 @@ msgstr "增效模組作者及模組名稱之詳細資訊。"
 #: ../base.xml:1142(para)
 msgid ""
 "To load a plugin, select the check box next to the name of the plugin. The "
-"<application>xedit</application> application adds the plugin to the "
-"appropriate <application>xedit</application> menu, as described in the "
+"<application>xed</application> application adds the plugin to the "
+"appropriate <application>xed</application> menu, as described in the "
 "following table."
 msgstr ""
-"如果要載入增效模組，請選取增效模組名稱旁的核取方塊。<application>xedit</"
-"application> 應用程式 會如下表所述，將外掛程式加入適當的 <application>xedit</"
+"如果要載入增效模組，請選取增效模組名稱旁的核取方塊。<application>xed</"
+"application> 應用程式 會如下表所述，將外掛程式加入適當的 <application>xed</"
 "application> 功能表中。"

 #: ../base.xml:1151(para)
@@ -1826,23 +1826,23 @@ msgstr ""
 "guibutton>。"

 #: ../base.xml:1216(title)
-msgid "To Remove xedit Plugins"
-msgstr "移除 xedit 增效模組"
+msgid "To Remove xed Plugins"
+msgstr "移除 xed 增效模組"

 #: ../base.xml:1217(para)
-msgid "A plugin remains loaded when you quit <application>xedit</application>."
+msgid "A plugin remains loaded when you quit <application>xed</application>."
 msgstr ""
-"即使您離開了 <application>xedit</application>，增效模組仍然是載入應用程式中。"
+"即使您離開了 <application>xed</application>，增效模組仍然是載入應用程式中。"

 #: ../base.xml:1218(para)
 msgid ""
-"To remove <application>xedit</application> plugins, choose "
+"To remove <application>xed</application> plugins, choose "
 "<menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></"
 "menuchoice>. Within the <guilabel>Plugins</guilabel> category, click on the "
 "<guilabel>Manager</guilabel> subcategory. To remove a plugin, deselect the "
 "check box next to the name of the plugin."
 msgstr ""
-"如果要移除 <application>xedit</application> 增效模組，請選擇"
+"如果要移除 <application>xed</application> 增效模組，請選擇"
 "<menuchoice><guimenu>編輯</guimenu><guimenuitem>偏好設定</guimenuitem></"
 "menuchoice>。在<guilabel>增效模組</guilabel>類別中，按一下<guilabel>管理員</"
 "guilabel>子類別。 如果要移除增效模組，請取消選取增效模組名稱旁的核取方塊。"
@@ -1912,22 +1912,22 @@ msgstr ""

 #: ../base.xml:1258(para)
 msgid ""
-"Set the environment variable CVSEDITOR to <application>xedit</application>. "
+"Set the environment variable CVSEDITOR to <application>xed</application>. "
 "For example, if you are using the <command>bash</command> shell, run the "
 "following command at the operating system prompt: <screen> <userinput>export "
-"CVSEDITOR=<application>xedit</application> </userinput> </screen>"
+"CVSEDITOR=<application>xed</application> </userinput> </screen>"
 msgstr ""
-"將環境變數 CVSEDITOR 設為 <application>xedit</application>。 例如，如果您正在"
+"將環境變數 CVSEDITOR 設為 <application>xed</application>。 例如，如果您正在"
 "使用 <command>bash</command> shell，請在作業系統 提示的時候，輸入下面的指"
-"令： <screen> <userinput>export CVSEDITOR=<application>xedit</application> </"
+"令： <screen> <userinput>export CVSEDITOR=<application>xed</application> </"
 "userinput> </screen>"

 #: ../base.xml:1264(para)
 msgid ""
-"Commit a file to CVS in the usual way. A <application>xedit</application> "
+"Commit a file to CVS in the usual way. A <application>xed</application> "
 "window opens, to enable you to enter the commit message."
 msgstr ""
-"以平常的方式將檔案確定至 CVS。此時會開啟 <application>xedit</application> 視"
+"以平常的方式將檔案確定至 CVS。此時會開啟 <application>xed</application> 視"
 "窗，讓您輸入 commit 訊息。"

 #: ../base.xml:1267(para)
@@ -1938,35 +1938,35 @@ msgstr "載入 CVS ChangeLog 增效模組。"
 msgid ""
 "Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Open CVS ChangeLogs</"
 "guimenuitem></menuchoice> to open all of the ChangeLog files referenced in "
-"the commit message. <application>xedit</application> opens each ChangeLog "
+"the commit message. <application>xed</application> opens each ChangeLog "
 "file in a new tab."
 msgstr ""
 "請選擇 <menuchoice><guimenu>檔案</guimenu><guimenuitem>開啟 CVS ChangeLogs</"
 "guimenuitem></menuchoice>，開啟所有 commit 訊息中所出現的 ChangeLog 檔案。"
-"<application>xedit</application> 會為每個 變更Log 檔案開啟一個新標籤。"
+"<application>xed</application> 會為每個 變更Log 檔案開啟一個新標籤。"

 #: ../base.xml:1272(para)
 msgid ""
 "Copy the ChangeLog entries that you want to add to the commit message from "
-"the <application>xedit</application> ChangeLog files."
+"the <application>xed</application> ChangeLog files."
 msgstr ""
-"<application>xedit</application> ChangeLog 檔案中，複製您想加入 commit 訊息"
+"<application>xed</application> ChangeLog 檔案中，複製您想加入 commit 訊息"
 "的 ChangeLog 記錄。"

 #: ../base.xml:1275(para)
 msgid ""
-"Insert the copied ChangeLog entries in the <application>xedit</application> "
+"Insert the copied ChangeLog entries in the <application>xed</application> "
 "commit message tab."
 msgstr ""
-"將 ChangeLog 記錄加入 <application>xedit</application> 的 commit 訊息標籤內。"
+"將 ChangeLog 記錄加入 <application>xed</application> 的 commit 訊息標籤內。"

 #: ../base.xml:1278(para)
 msgid "Save your changes to the commit message, then close all files."
 msgstr "儲存您對 commit 訊息所做的變更，然後關閉所有的檔案。"

 #: ../base.xml:1281(para)
-msgid "Quit <application>xedit</application>."
-msgstr "結束 <application>xedit</application>。"
+msgid "Quit <application>xed</application>."
+msgstr "結束 <application>xed</application>。"

 #: ../base.xml:1288(title)
 msgid "Compare Files Plugin"
@@ -1993,13 +1993,13 @@ msgid ""
 "guimenuitem></menuchoice>. When you choose this option for the first time, "
 "you are prompted to confirm the location of the <command>diff</command> "
 "command. You are not prompted for this location again. See <xref linkend="
-"\"xedit-compare-files-configure\"/> for information about how to change this "
+"\"xed-compare-files-configure\"/> for information about how to change this "
 "location later."
 msgstr ""
 "請選擇 <menuchoice><guimenu>工具</guimenu><guimenuitem>比較檔案</"
 "guimenuitem></menuchoice>。 當您是第一次選擇這個選項，系統會提示您，請您確認 "
 "<command>diff</command> 指令的位置。以後則不會再提示您確認位置。若需如何在日"
-"後變更這個位置的詳細資訊，請參閱 <xref linkend=\"xedit-compare-files-"
+"後變更這個位置的詳細資訊，請參閱 <xref linkend=\"xed-compare-files-"
 "configure\"/>。"

 #: ../base.xml:1299(para)
@@ -2157,12 +2157,12 @@ msgstr "目前文件的位元組數。"

 #: ../base.xml:1376(para)
 msgid ""
-"You can continue to update the <application>xedit</application> file while "
+"You can continue to update the <application>xed</application> file while "
 "the <guilabel>Document Statistics</guilabel> dialog is open. To refresh the "
 "contents of the <guilabel>Document Statistics</guilabel> dialog, click on "
 "the <guibutton>Update</guibutton> button."
 msgstr ""
-"您可以不斷地更新<application>xedit</application> 檔案，而無須關閉<guilabel>文"
+"您可以不斷地更新<application>xed</application> 檔案，而無須關閉<guilabel>文"
 "件統計資料</guilabel>對話方塊。要重新整理<guilabel>文件統計資料</guilabel>對"
 "話方塊的內容，請按一下<guibutton>更新</guibutton>按鈕。"

@@ -2243,36 +2243,36 @@ msgstr ""
 msgid ""
 "If you have not configured the Insert Date/Time plugin to automatically "
 "insert the date/time without prompting you for the format, "
-"<application>xedit</application> displays the <guilabel>Insert Date and "
+"<application>xed</application> displays the <guilabel>Insert Date and "
 "Time</guilabel> dialog. Select the appropriate date/time format from the "
 "list. Click on the <guibutton>Insert</guibutton> button to close the "
-"<guilabel>Insert Date and Time</guilabel> dialog; <application>xedit</"
+"<guilabel>Insert Date and Time</guilabel> dialog; <application>xed</"
 "application> inserts the date/time at the cursor position in the current "
 "file."
 msgstr ""
 "如果您尚未將加入日期/時間增效模組配置成不需提示即自動加入日期/時間，"
-"<application>xedit</application> 會顯示<guilabel>加入日期和時間</guilabel>對"
+"<application>xed</application> 會顯示<guilabel>加入日期和時間</guilabel>對"
 "話方塊。從清單中選取適當的日期/時間格式。按一下<guibutton>插入</guibutton>按"
-"鈕，關閉<guilabel>加入日期和時間</guilabel>對話方塊；<application>xedit</"
+"鈕，關閉<guilabel>加入日期和時間</guilabel>對話方塊；<application>xed</"
 "application> 會在目前檔案的游標位置上插入日期/時間。"

 #: ../base.xml:1416(para)
 msgid ""
-"If you have configured <application>xedit</application> to use one "
+"If you have configured <application>xed</application> to use one "
 "particular date/time format, the <guilabel>Insert Date and Time</guilabel> "
 "dialog is not displayed; the date/time is automatically entered at the "
 "cursor position in the current file."
 msgstr ""
-"如果您已經將 <application>xedit</application> 配置成使用特定的日期/時間格式，"
+"如果您已經將 <application>xed</application> 配置成使用特定的日期/時間格式，"
 "則不會顯示<guilabel>加入日期和時間</guilabel>對話方塊；即會在目前檔案的游標位"
 "置上插入日期/時間。"

 #: ../base.xml:1417(para)
 msgid ""
-"See <xref linkend=\"xedit-date-time-configure\"/> for information about how "
+"See <xref linkend=\"xed-date-time-configure\"/> for information about how "
 "to configure the Insert Date/Time plugin."
 msgstr ""
-"若需如何配置加入日期/時間增效模組的詳細資訊，請參閱 <xref linkend=\"xedit-"
+"若需如何配置加入日期/時間增效模組的詳細資訊，請參閱 <xref linkend=\"xed-"
 "date-time-configure\"/>。"

 #: ../base.xml:1422(title)
@@ -2309,17 +2309,17 @@ msgstr ""

 #: ../base.xml:1443(para)
 msgid ""
-"To use the same <application>xedit</application>-provided date/time format "
+"To use the same <application>xed</application>-provided date/time format "
 "each time you insert the date/time, select the <guilabel>Use the selected "
 "format</guilabel> option, then select the appropriate format from the list. "
-"When you select this option, <application>xedit</application> does not "
+"When you select this option, <application>xed</application> does not "
 "prompt you for the date/time format when you choose "
 "<menuchoice><guimenu>Edit</guimenu><guimenuitem>Insert Date and Time</"
 "guimenuitem></menuchoice>."
 msgstr ""
-"如果要在每次加入日期/時間時都使用 <application>xedit</application> 提供的日"
+"如果要在每次加入日期/時間時都使用 <application>xed</application> 提供的日"
 "期/時間格式，請選取<guilabel>使用選取的格式</guilabel>選項，然後從清單中選取"
-"適當的格式。當您選取這個選項後，<application>xedit</application> 並不會在您選"
+"適當的格式。當您選取這個選項後，<application>xed</application> 並不會在您選"
 "擇<menuchoice><guimenu>編輯</guimenu><guimenuitem>加入日期和時間</"
 "guimenuitem></menuchoice>時，提示您設定日期/時間的格式。"

@@ -2331,7 +2331,7 @@ msgid ""
 "specify a custom format, see <ulink url=\"man:strftime\" type=\"man"
 "\"><citerefentry><refentrytitle>strftime</refentrytitle><manvolnum>3</"
 "manvolnum></citerefentry></ulink>. When you select this option, "
-"<application>xedit</application> does not prompt you for the date/time "
+"<application>xed</application> does not prompt you for the date/time "
 "format when you choose <menuchoice><guimenu>Edit</"
 "guimenu><guimenuitem>Insert Date and Time</guimenuitem></menuchoice>."
 msgstr ""
@@ -2339,7 +2339,7 @@ msgstr ""
 "自訂格式</guilabel>選項，然後在文字方塊中輸入適當的格式。若需如何自訂格式的詳"
 "細資訊，請參閱 <ulink url=\"man:strftime\" type=\"man"
 "\"><citerefentry><refentrytitle>strftime</refentrytitle><manvolnum>3</"
-"manvolnum></citerefentry></ulink>。當您選取這個選項後，<application>xedit</"
+"manvolnum></citerefentry></ulink>。當您選取這個選項後，<application>xed</"
 "application> 並不會在您選擇<menuchoice><guimenu>編輯</guimenu><guimenuitem>加"
 "入日期和時間</guimenuitem></menuchoice>時，提示您設定日期/時間的格式。"

@@ -2358,11 +2358,11 @@ msgstr "Shell 指令增效模組"
 #: ../base.xml:1463(para)
 msgid ""
 "The Shell Command plugin enables you to capture the output from a shell "
-"command in <application>xedit</application>, by displaying the text output "
+"command in <application>xed</application>, by displaying the text output "
 "of the shell command in the output window. To use the Shell command plugin, "
 "perform the following steps:"
 msgstr ""
-"Shell 指令增效模組可以從 <application>xedit</application> 的 shell 指令擷取輸"
+"Shell 指令增效模組可以從 <application>xed</application> 的 shell 指令擷取輸"
 "出，而將 shell 指令的文字輸出 顯示於輸出視窗中。如果要使用 Shell 指令增效模"
 "組，請執行 下列的步驟："

@@ -2406,11 +2406,11 @@ msgstr "%n"
 #: ../base.xml:1485(para)
 msgid ""
 "Use these special characters to specify the filename of the current active "
-"document, without the path. In this case, <application>xedit</application> "
+"document, without the path. In this case, <application>xed</application> "
 "looks for the file in the Working directory."
 msgstr ""
 "使用此類特殊字元，指定目前使用中的檔案名稱，不包括路徑。此時，"
-"<application>xedit</application> 會在工作目錄中找尋檔案。"
+"<application>xed</application> 會在工作目錄中找尋檔案。"

 #: ../base.xml:1489(para)
 msgid ""
@@ -2425,11 +2425,11 @@ msgstr ""
 msgid ""
 "Select the <guilabel>Show results in Output Window</guilabel> option to "
 "display the results of the command in the output window. If you do not "
-"select this option, <application>xedit</application> discards the results of "
+"select this option, <application>xed</application> discards the results of "
 "the command."
 msgstr ""
 "選取<guilabel>在輸出視窗顯示結果</guilabel>選項，在輸出視窗顯示指令的執行結"
-"果。如果沒有選取這個選項，<application>xedit</application> 會放棄指令結果。"
+"果。如果沒有選取這個選項，<application>xed</application> 會放棄指令結果。"

 #: ../base.xml:1496(para)
 msgid ""
--- a/help/zh_TW/zh_TW.po
+++ b/help/zh_TW/zh_TW.po
@@ -10,8 +10,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"

 #: ../base.xml:24(title) ../base.xml:95(revnumber)
-msgid "xedit Manual V2.5.1"
-msgstr "xedit 手冊 V2.5.1"
+msgid "xed Manual V2.5.1"
+msgstr "xed 手冊 V2.5.1"

 #: ../base.xml:26(year)
 msgid "2003"
@@ -58,8 +58,8 @@ msgstr "Baris"

 #: ../base.xml:65(surname)
 msgid ""
-"Cicek provided information from earlier revisions of the xedit application."
-msgstr "Cicek 提供 xedit 應用程式較早版本的資訊。"
+"Cicek provided information from earlier revisions of the xed application."
+msgstr "Cicek 提供 xed 應用程式較早版本的資訊。"

 #: ../base.xml:66(contrib)
 msgid "Acknowledgements"
@@ -80,64 +80,64 @@ msgid "Sun MATE Documentation Team"
 msgstr "Sun MATE 文件小組"

 #: ../base.xml:103(revnumber)
-msgid "xedit Manual V2.5"
-msgstr "xedit 手冊 V2.5"
+msgid "xed Manual V2.5"
+msgstr "xed 手冊 V2.5"

 #: ../base.xml:104(date)
 msgid "March 2003"
 msgstr "2003 年 3 月"

 #: ../base.xml:111(revnumber)
-msgid "xedit Manual V2.4"
-msgstr "xedit 手冊 V2.4"
+msgid "xed Manual V2.4"
+msgstr "xed 手冊 V2.4"

 #: ../base.xml:112(date)
 msgid "January 2003"
 msgstr "2003 年 1 月"

 #: ../base.xml:119(revnumber)
-msgid "xedit Manual V2.3"
-msgstr "xedit 手冊 V2.3"
+msgid "xed Manual V2.3"
+msgstr "xed 手冊 V2.3"

 #: ../base.xml:120(date)
 msgid "September 2002"
 msgstr "2002 年 9 月"

 #: ../base.xml:127(revnumber)
-msgid "xedit Manual V2.2"
-msgstr "xedit 手冊 V2.2"
+msgid "xed Manual V2.2"
+msgstr "xed 手冊 V2.2"

 #: ../base.xml:128(date)
 msgid "August 2002"
 msgstr "2002 年 8 月"

 #: ../base.xml:135(revnumber)
-msgid "xedit Manual V2.1"
-msgstr "xedit 手冊 V2.1"
+msgid "xed Manual V2.1"
+msgstr "xed 手冊 V2.1"

 #: ../base.xml:136(date)
 msgid "June 2002"
 msgstr "2002 年 6 月"

 #: ../base.xml:143(revnumber)
-msgid "xedit Manual V2.0"
-msgstr "xedit 手冊 V2.0"
+msgid "xed Manual V2.0"
+msgstr "xed 手冊 V2.0"

 #: ../base.xml:144(date)
 msgid "March 2002"
 msgstr "2002 年 3 月"

 #: ../base.xml:151(revnumber)
-msgid "xedit V1.0"
-msgstr "xedit 手冊 V1.0"
+msgid "xed V1.0"
+msgstr "xed 手冊 V1.0"

 #: ../base.xml:154(para)
 msgid "Eric Baudais <email>baudais@okstate.edu</email>"
 msgstr "Eric Baudais <email>baudais@okstate.edu</email>"

 #: ../base.xml:160(releaseinfo)
-msgid "This manual describes version 2.2.1 of xedit."
-msgstr "本手冊的內容是說明 2.2.1 版的 xedit。"
+msgid "This manual describes version 2.2.1 of xed."
+msgstr "本手冊的內容是說明 2.2.1 版的 xed。"

 #: ../base.xml:163(title)
 msgid "Feedback"
@@ -145,17 +145,17 @@ msgstr "意見回饋"

 #: ../base.xml:164(para)
 msgid ""
-"To report a bug or make a suggestion regarding the <application>xedit</"
+"To report a bug or make a suggestion regarding the <application>xed</"
 "application> application or this manual, follow the directions in the <ulink "
 "url=\"help:mate-feedback\" type=\"help\">MATE Feedback Page</ulink>."
 msgstr ""
-"關於本 <application>xedit</application> 應用程式或本手冊，如果要報告錯誤 或提"
+"關於本 <application>xed</application> 應用程式或本手冊，如果要報告錯誤 或提"
 "出建議，請遵照 <ulink url=\"help:mate-feedback\" type=\"help\">MATE "
 "Feedback Page</ulink> 的指示。"

 #: ../base.xml:171(primary)
-msgid "xedit"
-msgstr "xedit"
+msgid "xed"
+msgstr "xed"

 #: ../base.xml:172(primary)
 msgid "text editor"
@@ -167,13 +167,13 @@ msgstr "介紹"

 #: ../base.xml:178(para)
 msgid ""
-"The <application>xedit</application> application enables you to create and "
-"edit text files. You can use <application>xedit</application> plugins to "
+"The <application>xed</application> application enables you to create and "
+"edit text files. You can use <application>xed</application> plugins to "
 "perform a variety of tasks related to text-editing from within the "
-"<application>xedit</application> window."
+"<application>xed</application> window."
 msgstr ""
-"您可以使用 <application>xedit</application> 應用程式建立和編輯文字 檔案。您可"
-"以使用 <application>xedit</application> 增效模組在 <application>xedit</"
+"您可以使用 <application>xed</application> 應用程式建立和編輯文字 檔案。您可"
+"以使用 <application>xed</application> 增效模組在 <application>xed</"
 "application> 視窗中 執行各種和文字編輯相關的工作。"

 #: ../base.xml:185(title)
@@ -181,12 +181,12 @@ msgid "Getting Started"
 msgstr "入門"

 #: ../base.xml:189(title)
-msgid "To Start xedit"
-msgstr "啟動 xedit"
+msgid "To Start xed"
+msgstr "啟動 xed"

 #: ../base.xml:190(para)
-msgid "You can start <application>xedit</application> in the following ways:"
-msgstr "您可以使用下列方式啟動 <application>xedit</application>："
+msgid "You can start <application>xed</application> in the following ways:"
+msgstr "您可以使用下列方式啟動 <application>xed</application>："

 #: ../base.xml:193(guimenu)
 msgid "Menu"
@@ -194,11 +194,11 @@ msgstr "功能表"

 #: ../base.xml:195(para)
 msgid ""
-"For information about how to start <application>xedit</application> from a "
+"For information about how to start <application>xed</application> from a "
 "menu, see the latest version of the MATE Desktop User Guide for your "
 "platform."
 msgstr ""
-"若需如何從功能表啟動 <application>xedit</application> 的詳細資訊，請參閱最新"
+"若需如何從功能表啟動 <application>xed</application> 的詳細資訊，請參閱最新"
 "版的平台 MATE Desktop User Guide。"

 #: ../base.xml:200(term)
@@ -206,32 +206,32 @@ msgid "Command line"
 msgstr "指令行"

 #: ../base.xml:202(para)
-msgid "Execute the following command: <command>xedit</command>"
-msgstr "執行以下的指令： <command>xedit</command>"
+msgid "Execute the following command: <command>xed</command>"
+msgstr "執行以下的指令： <command>xed</command>"

 #: ../base.xml:210(title)
-msgid "When You Start xedit"
-msgstr "當您啟動 xedit"
+msgid "When You Start xed"
+msgstr "當您啟動 xed"

 #: ../base.xml:211(para)
 msgid ""
-"When you start <application>xedit</application>, the following window is "
+"When you start <application>xed</application>, the following window is "
 "displayed:"
-msgstr "當您啟動 <application>xedit</application> 後，會顯示下面的視窗："
+msgstr "當您啟動 <application>xed</application> 後，會顯示下面的視窗："

 #: ../base.xml:214(title)
-msgid "xedit Window"
-msgstr "xedit 視窗"
+msgid "xed Window"
+msgstr "xed 視窗"

 #: ../base.xml:220(phrase)
-msgid "Shows xedit main window."
-msgstr "顯示 xedit 主視窗。"
+msgid "Shows xed main window."
+msgstr "顯示 xed 主視窗。"

 #: ../base.xml:226(para)
 msgid ""
-"The <application>xedit</application> window contains the following elements:"
+"The <application>xed</application> window contains the following elements:"
 msgstr ""
-"<application>xedit</application> 視窗包含下列的 元素：您可以選擇下列條件中的"
+"<application>xed</application> 視窗包含下列的 元素：您可以選擇下列條件中的"
 "一項或以上："

 #: ../base.xml:229(term)
@@ -241,9 +241,9 @@ msgstr "功能表列"
 #: ../base.xml:231(para)
 msgid ""
 "The menus on the menubar contain all of the commands you need to work with "
-"files in <application>xedit</application>."
+"files in <application>xed</application>."
 msgstr ""
-"在功能表列上的功能表中，有您在 <application>xedit</application> 中與檔案工作"
+"在功能表列上的功能表中，有您在 <application>xed</application> 中與檔案工作"
 "所需的所有指令。"

 #: ../base.xml:235(term)
@@ -280,19 +280,19 @@ msgstr "狀態列"

 #: ../base.xml:254(para)
 msgid ""
-"The statusbar displays information about current <application>xedit</"
+"The statusbar displays information about current <application>xed</"
 "application> activity and contextual information about the menu items."
 msgstr ""
-"狀態列可以顯示目前 <application>xedit</application> 活動的資訊，以及有關功能"
+"狀態列可以顯示目前 <application>xed</application> 活動的資訊，以及有關功能"
 "表項目 的上下文資訊。"

 #: ../base.xml:260(para)
 msgid ""
-"When you right-click in the <application>xedit</application> window, the "
+"When you right-click in the <application>xed</application> window, the "
 "application displays a popup menu. The popup menu contains the most common "
 "text editing commands."
 msgstr ""
-"當您在 <application>xedit</application> 視窗中按滑鼠右鍵時，應用程式會顯示即"
+"當您在 <application>xed</application> 視窗中按滑鼠右鍵時，應用程式會顯示即"
 "現式功能表。即現式功能表包含了 最常用的文字編輯指令。"

 #: ../base.xml:266(title)
@@ -304,27 +304,27 @@ msgid ""
 "To open a file, choose <menuchoice><guimenu>File</guimenu><guimenuitem>Open</"
 "guimenuitem></menuchoice> to display the <guilabel>Open File</guilabel> "
 "dialog. Select the file that you want to open, then click <guibutton>OK</"
-"guibutton>. The file is displayed in the <application>xedit</application> "
+"guibutton>. The file is displayed in the <application>xed</application> "
 "window."
 msgstr ""
 "如果要開啟檔案，請選擇 <menuchoice><guimenu>檔案</guimenu><guimenuitem>開啟</"
 "guimenuitem></menuchoice> ，顯示<guilabel>開啟檔案</guilabel>對話方塊。選取要"
 "開啟的檔案 ，然後按一下<guibutton>確定</guibutton>。這個檔案便會 顯示在 "
-"<application>xedit</application> 視窗中。"
+"<application>xed</application> 視窗中。"

 #: ../base.xml:273(para)
 msgid ""
-"You can open multiple files in <application>xedit</application>. The "
+"You can open multiple files in <application>xed</application>. The "
 "application displays one file at a time in the application window. The "
 "application adds a tab for each open file to the window. To display another "
 "open file, click on the tab that corresponds to the file. To create a new "
-"<application> xedit</application> window for each file that is open, drag "
+"<application> xed</application> window for each file that is open, drag "
 "the tab corresponding to each file to the desktop background."
 msgstr ""
-"您可以在 <application>xedit</application> 中，開啟多個檔案。 本應用程式在應用"
+"您可以在 <application>xed</application> 中，開啟多個檔案。 本應用程式在應用"
 "程式視窗中，一次只會顯示一個檔案。 應用程式會為每個開啟的檔案，在視窗中增加一"
 "個標籤。如果要顯示另外一個 開啟的檔案，請按該檔案的標籤。如果為每一個開啟的檔"
-"案，建立一個新的 <application> xedit</application> 視窗，請將檔案的 標籤一個"
+"案，建立一個新的 <application> xed</application> 視窗，請將檔案的 標籤一個"
 "個地拖曳至桌面背景上。"

 #: ../base.xml:279(para)
@@ -332,11 +332,11 @@ msgid ""
 "You can also use the <guimenu>Documents</guimenu> menu to move between the "
 "open files. You can choose <menuchoice><guimenu>Documents</"
 "guimenu><guimenuitem>Move to New Window</guimenuitem></menuchoice> to move a "
-"document to a new <application> xedit</application> window."
+"document to a new <application> xed</application> window."
 msgstr ""
 "您也可以使用 <guimenu>文件</guimenu>功能表，在開啟的檔案之間移動。您可以選擇"
 "<menuchoice><guimenu>文件</guimenu><guimenuitem>移至新視窗</guimenuitem></"
-"menuchoice>，將文件移到新的 <application> xedit</application> 視窗。"
+"menuchoice>，將文件移到新的 <application> xed</application> 視窗。"

 #: ../base.xml:290(phrase)
 msgid "Shows Recent Files menu icon."
@@ -361,11 +361,11 @@ msgstr "從指令行開啟多個檔案"

 #: ../base.xml:298(para)
 msgid ""
-"You can run <application>xedit</application> from a command line and open a "
+"You can run <application>xed</application> from a command line and open a "
 "single file or multiple files. To open multiple files from a command line, "
 "type the following command, then press <keycap>Return</keycap>:"
 msgstr ""
-"您可以從指令行執行 <application>xedit</application>，並開啟一個或多個檔案。如"
+"您可以從指令行執行 <application>xed</application>，並開啟一個或多個檔案。如"
 "果要從指令行開啟多個檔案，請鍵入下列指令，然後按一下 <keycap>Return</keycap> "
 "鍵。"

@@ -374,26 +374,26 @@ msgid "file1.txt file2.txt file3.txt"
 msgstr "file1.txt file2.txt file3.txt"

 #: ../base.xml:301(command)
-msgid "xedit <placeholder-1/>"
-msgstr "xedit <placeholder-1/>"
+msgid "xed <placeholder-1/>"
+msgstr "xed <placeholder-1/>"

 #: ../base.xml:302(para)
 msgid ""
 "When the application starts, the files that you specify are displayed in the "
-"<application>xedit</application> window."
+"<application>xed</application> window."
 msgstr ""
-"當應用程式啟動時，您所指定的檔案便會顯示在 <application>xedit</application> "
+"當應用程式啟動時，您所指定的檔案便會顯示在 <application>xed</application> "
 "視窗內。"

 #: ../base.xml:304(para)
 msgid ""
-"For more information on how to run <application>xedit</application> from a "
-"command line, see <ulink url=\"man:xedit\" type=\"man"
-"\"><citerefentry><refentrytitle>xedit</refentrytitle><manvolnum>1</"
+"For more information on how to run <application>xed</application> from a "
+"command line, see <ulink url=\"man:xed\" type=\"man"
+"\"><citerefentry><refentrytitle>xed</refentrytitle><manvolnum>1</"
 "manvolnum></citerefentry></ulink>."
 msgstr ""
-"若需如何從指令行執行 <application>xedit</application> 的詳細資訊，請參閱 "
-"<ulink url=\"man:xedit\" type=\"man\"><citerefentry><refentrytitle>xedit</"
+"若需如何從指令行執行 <application>xed</application> 的詳細資訊，請參閱 "
+"<ulink url=\"man:xed\" type=\"man\"><citerefentry><refentrytitle>xed</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry></ulink>。"

 #: ../base.xml:309(title)
@@ -408,10 +408,10 @@ msgstr "建立新檔案"
 msgid ""
 "To create a new file, choose <menuchoice><guimenu>File</"
 "guimenu><guimenuitem>New</guimenuitem></menuchoice>. The application "
-"displays a new file in the <application>xedit</application> window."
+"displays a new file in the <application>xed</application> window."
 msgstr ""
 "如果要建立新檔案，請選擇 <menuchoice><guimenu>檔案</guimenu><guimenuitem>開新"
-"檔案</guimenuitem></menuchoice>。應用程式會在 <application>xedit</"
+"檔案</guimenuitem></menuchoice>。應用程式會在 <application>xed</"
 "application> 視窗內顯示新檔案。"

 #: ../base.xml:321(title)
@@ -446,11 +446,11 @@ msgstr ""

 #: ../base.xml:334(para)
 msgid ""
-"To save all of the files that are currently open in <application>xedit</"
+"To save all of the files that are currently open in <application>xed</"
 "application>, choose <menuchoice><guimenu>Documents</"
 "guimenu><guimenuitem>Save All</guimenuitem></menuchoice>."
 msgstr ""
-"如果要儲存目前在 <application>xedit</application> 中開啟的所有檔案，請選擇 "
+"如果要儲存目前在 <application>xed</application> 中開啟的所有檔案，請選擇 "
 "<menuchoice><guimenu>文件</guimenu><guimenuitem>全部 儲存</guimenuitem></"
 "menuchoice>。"

@@ -541,14 +541,14 @@ msgid ""
 "choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Redo</guimenuitem></"
 "menuchoice>. The number of previous edits that you can undo is determined by "
 "the <guilabel>Set limit on undo actions to</guilabel> setting in the <xref "
-"linkend=\"xedit-prefs-undo\"/> tabbed section of the <guilabel>Preferences</"
+"linkend=\"xed-prefs-undo\"/> tabbed section of the <guilabel>Preferences</"
 "guilabel> dialog."
 msgstr ""
 "如果要還原或重做編輯，請選擇 <menuchoice><guimenu>編輯</guimenu><guimenuitem>"
 "還原</guimenuitem></menuchoice>。如果要重做編輯，請選擇 <menuchoice><guimenu>"
 "編輯</guimenu><guimenuitem>重做</guimenuitem></menuchoice>。您所能還原之前編"
 "輯的次數，是取決於 <guilabel>限制還原次數為</guilabel>設定 (在 <xref linkend="
-"\"xedit-prefs-undo\"/>標籤區段中 (在 <guilabel>偏好設定</guilabel>對話方塊"
+"\"xed-prefs-undo\"/>標籤區段中 (在 <guilabel>偏好設定</guilabel>對話方塊"
 "中))。"

 #: ../base.xml:399(title)
@@ -626,12 +626,12 @@ msgstr ""
 #: ../base.xml:435(para) ../base.xml:490(para)
 msgid ""
 "Click <guibutton>Find</guibutton> to search the file for the first "
-"occurrence of the string. If <application>xedit</application> finds the "
+"occurrence of the string. If <application>xed</application> finds the "
 "string, the application moves the cursor to the string, and selects the "
 "string."
 msgstr ""
 "按一下<guibutton>尋找</guibutton>，搜尋檔案中 第一個字串事件。如果 "
-"<application>xedit</application> 找到字串，應用程式會將游標移動到字串上，並選"
+"<application>xed</application> 找到字串，應用程式會將游標移動到字串上，並選"
 "取 該字串。"

 #: ../base.xml:440(para) ../base.xml:500(para)
@@ -710,14 +710,14 @@ msgstr ""

 #: ../base.xml:522(para)
 msgid ""
-"Type <command>xedit <replaceable>URI</replaceable></command> at a command "
+"Type <command>xed <replaceable>URI</replaceable></command> at a command "
 "line, where <replaceable>URI</replaceable> is the URI of the file that you "
 "want to open, then press <keycap>Return</keycap>. Valid types of "
 "<replaceable>URI</replaceable> include <literal>http:</literal>, "
 "<literal>ftp:</literal>, <literal>file:</literal>, and all of the methods "
 "supported by <literal>gvfs</literal>."
 msgstr ""
-"在指令行上輸入 <command>xedit <replaceable>URI</replaceable></command> (此處"
+"在指令行上輸入 <command>xed <replaceable>URI</replaceable></command> (此處"
 "的 <replaceable>URI</replaceable> 是指您要開啟之檔案的 URI)，然後按下 "
 "<keycap>Return</keycap> 鍵。有效的 <replaceable>URI</replaceable> 類型包括 "
 "<literal>http:</literal>、<literal>ftp:</literal>、<literal>file:</literal>，"
@@ -733,31 +733,31 @@ msgstr "輸出指令到檔案"

 #: ../base.xml:532(para)
 msgid ""
-"You can use <application>xedit</application> to pipe the output of a command "
+"You can use <application>xed</application> to pipe the output of a command "
 "to a text file. For example, to pipe the output of an <command>ls </command> "
-"command to a text file, type <command>ls | xedit</command>, then press "
+"command to a text file, type <command>ls | xed</command>, then press "
 "<keycap>Return</keycap>."
 msgstr ""
-"您可以使用 <application>xedit</application>，將指令的輸出傳送到 文字檔案。例"
+"您可以使用 <application>xed</application>，將指令的輸出傳送到 文字檔案。例"
 "如，如果要將 <command>ls </command> 指令的輸出傳送到文字檔案，請鍵入 "
-"<command>ls | xedit</command>，然後按下 <keycap>Return</keycap> 鍵。"
+"<command>ls | xed</command>，然後按下 <keycap>Return</keycap> 鍵。"

 #: ../base.xml:536(para)
 msgid ""
 "The output of the <command>ls</command> command is displayed in a new text "
-"file in the <application>xedit</application> window."
+"file in the <application>xed</application> window."
 msgstr ""
-"<command>ls</command> 指令的輸出，會 在 <application>xedit</application> 視窗"
+"<command>ls</command> 指令的輸出，會 在 <application>xed</application> 視窗"
 "中以一個新的文字檔案顯示。"

 #: ../base.xml:538(para)
 msgid ""
 "Alternatively, you can use the Shell command plugin to pipe command output "
 "to the current file. For information about how to use the Shell command "
-"plugin, see <xref linkend=\"xedit-shell-command-plugin\"/>."
+"plugin, see <xref linkend=\"xed-shell-command-plugin\"/>."
 msgstr ""
 "或者，您可以使用 Shell 指令增效模組，將指令輸出 傳送到目前的檔案中。如需如何"
-"使用 Shell 指令增效模組的資訊，請參閱 <xref linkend=\"xedit-shell-command-"
+"使用 Shell 指令增效模組的資訊，請參閱 <xref linkend=\"xed-shell-command-"
 "plugin\"/>。"

 #: ../base.xml:543(title)
@@ -823,9 +823,9 @@ msgstr "列印檔案"

 #: ../base.xml:571(para)
 msgid ""
-"You can use <application>xedit</application> to perform the following print "
+"You can use <application>xed</application> to perform the following print "
 "operations:"
-msgstr "您可以使用<application>xedit</application>，執行 下列列印作業："
+msgstr "您可以使用<application>xed</application>，執行 下列列印作業："

 #: ../base.xml:574(para)
 msgid "Print a file to a printer."
@@ -837,11 +837,11 @@ msgstr "將列印指令的輸出列印到檔案。"

 #: ../base.xml:579(para)
 msgid ""
-"If you print to a file, <application>xedit</application> sends the output of "
+"If you print to a file, <application>xed</application> sends the output of "
 "the file to a pre-press format file. The most common pre-press formats are "
 "PostScript and Portable Document Format (PDF)."
 msgstr ""
-"如果您是列印至檔案，<application>xedit</application> 會先將 檔案輸出傳送到某"
+"如果您是列印至檔案，<application>xed</application> 會先將 檔案輸出傳送到某"
 "個印前格式檔案。最常見的印前 格式為 PostScript 與 Portable Document Format "
 "(PDF)。"

@@ -1012,13 +1012,13 @@ msgstr "自訂工具列與狀態列"
 msgid ""
 "To display or hide the toolbar, choose <menuchoice><guimenu>View</"
 "guimenu><guimenuitem>Toolbar</guimenuitem></menuchoice>. To customize how "
-"<application>xedit</application> displays the toolbar, choose "
+"<application>xed</application> displays the toolbar, choose "
 "<menuchoice><guimenu>View</guimenu><guisubmenu>Customize Toolbar</"
 "guisubmenu></menuchoice>, then select one of the following menu items:"
 msgstr ""
 "如果要顯示或隱藏工具列，請選擇<menuchoice><guimenu>檢視</"
 "guimenu><guimenuitem>工具列</guimenuitem></menuchoice>。如果要自訂 "
-"<application>xedit</application> 顯示工具列的方式，請選擇"
+"<application>xed</application> 顯示工具列的方式，請選擇"
 "<menuchoice><guimenu>檢視</guimenu><guisubmenu>自訂工具列</guisubmenu></"
 "menuchoice>，然後選取下列任一項 功能表項目："

@@ -1058,13 +1058,13 @@ msgstr "顯示圖示，以及顯示一些圖示旁的文字。"
 msgid ""
 "To display or hide the statusbar, choose <menuchoice><guimenu>View</"
 "guimenu><guimenuitem>Statusbar</guimenuitem></menuchoice>. To customize how "
-"<application>xedit</application> displays the statusbar, choose "
+"<application>xed</application> displays the statusbar, choose "
 "<menuchoice><guimenu>View</guimenu><guisubmenu>Customize Statusbar</"
 "guisubmenu></menuchoice>, then select one of the following menu items:"
 msgstr ""
 "如果要顯示或隱藏狀態列，請選擇<menuchoice><guimenu>檢視</"
 "guimenu><guimenuitem>狀態列</guimenuitem></menuchoice>。如果要自訂 "
-"<application>xedit</application> 顯示狀態列的方式，請選擇"
+"<application>xed</application> 顯示狀態列的方式，請選擇"
 "<menuchoice><guimenu>檢視</guimenu><guisubmenu>自訂狀態列</guisubmenu></"
 "menuchoice>，然後選取下列任一項 功能表項目："

@@ -1103,12 +1103,12 @@ msgstr "偏好設定"

 #: ../base.xml:737(para)
 msgid ""
-"To configure <application>xedit</application>, choose "
+"To configure <application>xed</application>, choose "
 "<menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></"
 "menuchoice>. The <guilabel>Preferences</guilabel> dialog contains the "
 "following categories:"
 msgstr ""
-"如果要配置 <application>xedit</application>，請選擇 <menuchoice><guimenu>編輯"
+"如果要配置 <application>xed</application>，請選擇 <menuchoice><guimenu>編輯"
 "</guimenu><guimenuitem>偏好設定</guimenuitem></menuchoice>。<guilabel>偏好設"
 "定</guilabel>對話方塊含有下列 種類："

@@ -1133,9 +1133,9 @@ msgstr "使用預設配色字型"
 #: ../base.xml:763(para)
 msgid ""
 "Select this option to use the default system font for the text in the "
-"<application>xedit</application> text window."
+"<application>xed</application> text window."
 msgstr ""
-"選取這個選項，在 <application>xedit</application> 文字視窗的文字中，會使用系"
+"選取這個選項，在 <application>xed</application> 文字視窗的文字中，會使用系"
 "統預設的字型。"

 #: ../base.xml:766(guilabel)
@@ -1144,11 +1144,11 @@ msgstr "編輯器字型"

 #: ../base.xml:768(para)
 msgid ""
-"This field displays the font that <application>xedit</application> uses to "
+"This field displays the font that <application>xed</application> uses to "
 "display text. Click on the button to specify the font type, style, and size "
 "to use for text."
 msgstr ""
-"這個欄位會顯示 <application>xedit</application> 用來顯示文字的字型。 按一下按"
+"這個欄位會顯示 <application>xed</application> 用來顯示文字的字型。 按一下按"
 "鈕，指定文字所使用的字體類型、樣式與大小。"

 #: ../base.xml:772(guilabel)
@@ -1158,9 +1158,9 @@ msgstr "使用預設的配色色彩"
 #: ../base.xml:774(para)
 msgid ""
 "Select this option to use the default theme colors in the "
-"<application>xedit</application> text window."
+"<application>xed</application> text window."
 msgstr ""
-"選取這個選項，會在 <application>xedit</application> 文字視窗中，使用預設的配"
+"選取這個選項，會在 <application>xed</application> 文字視窗中，使用預設的配"
 "色色彩。"

 #: ../base.xml:777(guilabel)
@@ -1171,10 +1171,10 @@ msgstr "文字色彩"
 msgid ""
 "Click on the <guibutton>Text color</guibutton> button to display the color "
 "selector dialog. Select a color to use to display text in the "
-"<application>xedit</application> text window."
+"<application>xed</application> text window."
 msgstr ""
 "按一下<guibutton>文字色彩</guibutton>按鈕， 顯示色彩選擇元件對話方塊。請選取"
-"顏色，程式會在 <application>xedit</application> 文字視窗中，以該顏色顯示文"
+"顏色，程式會在 <application>xed</application> 文字視窗中，以該顏色顯示文"
 "字。"

 #: ../base.xml:784(guilabel)
@@ -1184,11 +1184,11 @@ msgstr "背景色彩"
 #: ../base.xml:786(para)
 msgid ""
 "Click on the <guibutton>Background color</guibutton> button to display the "
-"color selector dialog. Select a background color for the <application>xedit</"
+"color selector dialog. Select a background color for the <application>xed</"
 "application> text window."
 msgstr ""
 "按一下<guibutton>背景色彩</guibutton>按鈕， 顯示色彩選擇元件對話方塊。請為 "
-"<application>xedit</application> 文字視窗選取背景色彩。"
+"<application>xed</application> 文字視窗選取背景色彩。"

 #: ../base.xml:791(guilabel)
 msgid "Selected text color"
@@ -1226,9 +1226,9 @@ msgstr "tab 字元的寬度為"
 #: ../base.xml:813(para)
 msgid ""
 "Use this spin box to specify the width of the space that <application> "
-"xedit</application> inserts when you press the <keycap>Tab</keycap> key."
+"xed</application> inserts when you press the <keycap>Tab</keycap> key."
 msgstr ""
-"請使用這個旋轉方塊，指定 <application> xedit</application> 在您按下 "
+"請使用這個旋轉方塊，指定 <application> xed</application> 在您按下 "
 "<keycap>Tab</keycap> 鍵時會加入的空格寬度。"

 #: ../base.xml:818(guilabel)
@@ -1237,11 +1237,11 @@ msgstr "以插入空格取代跳格"

 #: ../base.xml:820(para)
 msgid ""
-"Select this option to specify that <application> xedit</application> inserts "
+"Select this option to specify that <application> xed</application> inserts "
 "spaces instead of a tab character when you press the <keycap>Tab</keycap> "
 "key."
 msgstr ""
-"選取這個選項可以指定 <application> xedit</application> 在您按下 <keycap>Tab</"
+"選取這個選項可以指定 <application> xed</application> 在您按下 <keycap>Tab</"
 "keycap> 鍵時，以插入空格取 代跳格字元。"

 #: ../base.xml:830(title)
@@ -1293,8 +1293,8 @@ msgstr "顯示行號"
 #: ../base.xml:861(para)
 msgid ""
 "Select this option to display line numbers on the left side of the "
-"<application>xedit</application> window."
-msgstr "選取這個選項，會在 <application>xedit</application> 視窗左側顯示行號。"
+"<application>xed</application> window."
+msgstr "選取這個選項，會在 <application>xed</application> 視窗左側顯示行號。"

 #: ../base.xml:869(title)
 msgid "Open"
@@ -1320,18 +1320,18 @@ msgstr ""

 #: ../base.xml:877(para)
 msgid ""
-"By default, <application>xedit</application> uses UTF-8 encoding to try to "
+"By default, <application>xed</application> uses UTF-8 encoding to try to "
 "open a file. UTF-8 encoding can be used for multilingual texts, as UTF-8 "
 "covers almost all known alphabets and character sets. If the file is not a "
-"valid UTF-8 file, <application>xedit</application> tries to open the file by "
+"valid UTF-8 file, <application>xed</application> tries to open the file by "
 "using the encoding for the current locale. If this also fails, "
-"<application>xedit</application> tries to use an encoding from the Supported "
+"<application>xed</application> tries to use an encoding from the Supported "
 "encodings list, starting at the top of the list."
 msgstr ""
-"依預設值，<application>xedit</application> 是使用 UTF-8 編碼來開啟檔案。UTF-"
+"依預設值，<application>xed</application> 是使用 UTF-8 編碼來開啟檔案。UTF-"
 "8 編碼可用於內含多種語言的文件，因為 UTF-8 涵蓋了大多數已知的字母與字元集。如"
-"果檔案並不是有效的 UTF-8 檔，<application>xedit</application> 會試著以目前語"
-"系的編碼來開啟檔案。如果這樣依然有問題，<application>xedit</application> 會從"
+"果檔案並不是有效的 UTF-8 檔，<application>xed</application> 會試著以目前語"
+"系的編碼來開啟檔案。如果這樣依然有問題，<application>xed</application> 會從"
 "支援的編碼清單中第一個編碼方式開始，一個個地來試著開啟檔案。"

 #: ../base.xml:880(para)
@@ -1566,10 +1566,10 @@ msgstr "按一下這個按鈕，可以選取列印行號時的字型。"
 #: ../base.xml:1043(para)
 msgid ""
 "To reset the fonts to the default fonts for printing a file from "
-"<application>xedit</application> click on the <guibutton>Restore Default "
+"<application>xed</application> click on the <guibutton>Restore Default "
 "Fonts</guibutton> button."
 msgstr ""
-"如果要將 <application>xedit</application> 列印檔案時的字型，重設為預設值， 請"
+"如果要將 <application>xed</application> 列印檔案時的字型，重設為預設值， 請"
 "按一下<guibutton>還原預設字型</guibutton>按鈕。"

 #: ../base.xml:1050(title)
@@ -1579,11 +1579,11 @@ msgstr "增效模組"
 #: ../base.xml:1051(para)
 msgid ""
 "For information about how to use the <guilabel>Plugins</guilabel> category "
-"of the <guilabel>Preferences</guilabel> dialog, see <xref linkend=\"xedit-"
+"of the <guilabel>Preferences</guilabel> dialog, see <xref linkend=\"xed-"
 "install-plugins\"/>."
 msgstr ""
 "關於如何使用<guilabel>偏好設定</guilabel>對話方塊的<guilabel>增效模組</"
-"guilabel>類別，進一步資訊請參閱 <xref linkend=\"xedit-install-plugins\"/>。"
+"guilabel>類別，進一步資訊請參閱 <xref linkend=\"xed-install-plugins\"/>。"

 #: ../base.xml:1058(title)
 msgid "Working with Plugins"
@@ -1592,15 +1592,15 @@ msgstr "使用增效模組"
 #: ../base.xml:1059(para)
 msgid ""
 "A plugin is a supplementary program that enhances the functionality of an "
-"application. The <application>xedit</application> plugins enable you to "
+"application. The <application>xed</application> plugins enable you to "
 "perform a variety of functions related to text editing from within the "
-"<application> xedit</application> window. The following table lists the "
-"<application> xedit</application> plugins."
+"<application> xed</application> window. The following table lists the "
+"<application> xed</application> plugins."
 msgstr ""
 "增效模組是一種以可增強應用程式功能的 補強性程式。您可以使用 "
-"<application>xedit</application> 增效模組，在 <application> xedit</"
+"<application>xed</application> 增效模組，在 <application> xed</"
 "application> 視窗內，執行多種文字編輯功能。下表所列的，便是 <application> "
-"xedit</application> 的增效模組。"
+"xed</application> 的增效模組。"

 #: ../base.xml:1070(para) ../base.xml:1150(para)
 msgid "Plugin Name"
@@ -1707,37 +1707,37 @@ msgid "Inserts the username of the current user into the file."
 msgstr "將目前的使用者名稱加入到檔案中。"

 #: ../base.xml:1123(title)
-msgid "To Load xedit Plugins"
-msgstr "載入 xedit 增效模組"
+msgid "To Load xed Plugins"
+msgstr "載入 xed 增效模組"

 #: ../base.xml:1124(para)
 msgid ""
-"To load <application>xedit</application> plugins, choose "
+"To load <application>xed</application> plugins, choose "
 "<menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></"
 "menuchoice>. Within the <guilabel>Plugins</guilabel> category, click on the "
 "<guilabel>Manager</guilabel> subcategory. The <guilabel>Manager</guilabel> "
 "subcategory displays the following information:"
 msgstr ""
-"如果要載入 <application>xedit</application>增效模組，請選擇"
+"如果要載入 <application>xed</application>增效模組，請選擇"
 "<menuchoice><guimenu>編輯</guimenu><guimenuitem>偏好設定</guimenuitem></"
 "menuchoice>。在<guilabel>增效模組</guilabel>類別中，按一下<guilabel>管理員</"
 "guilabel>子類別。 <guilabel>管理員</guilabel>子類別會顯示下列資訊："

 #: ../base.xml:1131(para)
 msgid ""
-"A list of the plugins that you can use with <application>xedit</application>."
-msgstr "可以與 <application>xedit</application> 一同使用之增效模組的清單。"
+"A list of the plugins that you can use with <application>xed</application>."
+msgstr "可以與 <application>xed</application> 一同使用之增效模組的清單。"

 #: ../base.xml:1133(para)
 msgid ""
 "A <guibutton>Configure plugin</guibutton> button. You can use this button to "
 "open a configuration dialog for the plugins that you can configure. For "
-"example, see <xref linkend=\"xedit-compare-files-configure\"/> and <xref "
-"linkend=\"xedit-date-time-configure\"/>."
+"example, see <xref linkend=\"xed-compare-files-configure\"/> and <xref "
+"linkend=\"xed-date-time-configure\"/>."
 msgstr ""
 "<guibutton>配置增效模組</guibutton> 按鈕。您可以使用這個按鈕，為您可以配置的"
-"增效模組，開啟配置對話方塊。例如，請參閱 <xref linkend=\"xedit-compare-files-"
-"configure\"/> 以及 <xref linkend=\"xedit-date-time-configure\"/>。"
+"增效模組，開啟配置對話方塊。例如，請參閱 <xref linkend=\"xed-compare-files-"
+"configure\"/> 以及 <xref linkend=\"xed-date-time-configure\"/>。"

 #: ../base.xml:1136(para)
 msgid ""
@@ -1753,12 +1753,12 @@ msgstr "增效模組作者及模組名稱之詳細資訊。"
 #: ../base.xml:1142(para)
 msgid ""
 "To load a plugin, select the check box next to the name of the plugin. The "
-"<application>xedit</application> application adds the plugin to the "
-"appropriate <application>xedit</application> menu, as described in the "
+"<application>xed</application> application adds the plugin to the "
+"appropriate <application>xed</application> menu, as described in the "
 "following table."
 msgstr ""
-"如果要載入增效模組，請選取增效模組名稱旁的核取方塊。<application>xedit</"
-"application> 應用程式 會如下表所述，將外掛程式加入適當的 <application>xedit</"
+"如果要載入增效模組，請選取增效模組名稱旁的核取方塊。<application>xed</"
+"application> 應用程式 會如下表所述，將外掛程式加入適當的 <application>xed</"
 "application> 功能表中。"

 #: ../base.xml:1151(para)
@@ -1826,23 +1826,23 @@ msgstr ""
 "guibutton>。"

 #: ../base.xml:1216(title)
-msgid "To Remove xedit Plugins"
-msgstr "移除 xedit 增效模組"
+msgid "To Remove xed Plugins"
+msgstr "移除 xed 增效模組"

 #: ../base.xml:1217(para)
-msgid "A plugin remains loaded when you quit <application>xedit</application>."
+msgid "A plugin remains loaded when you quit <application>xed</application>."
 msgstr ""
-"即使您離開了 <application>xedit</application>，增效模組仍然是載入應用程式中。"
+"即使您離開了 <application>xed</application>，增效模組仍然是載入應用程式中。"

 #: ../base.xml:1218(para)
 msgid ""
-"To remove <application>xedit</application> plugins, choose "
+"To remove <application>xed</application> plugins, choose "
 "<menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></"
 "menuchoice>. Within the <guilabel>Plugins</guilabel> category, click on the "
 "<guilabel>Manager</guilabel> subcategory. To remove a plugin, deselect the "
 "check box next to the name of the plugin."
 msgstr ""
-"如果要移除 <application>xedit</application> 增效模組，請選擇"
+"如果要移除 <application>xed</application> 增效模組，請選擇"
 "<menuchoice><guimenu>編輯</guimenu><guimenuitem>偏好設定</guimenuitem></"
 "menuchoice>。在<guilabel>增效模組</guilabel>類別中，按一下<guilabel>管理員</"
 "guilabel>子類別。 如果要移除增效模組，請取消選取增效模組名稱旁的核取方塊。"
@@ -1912,22 +1912,22 @@ msgstr ""

 #: ../base.xml:1258(para)
 msgid ""
-"Set the environment variable CVSEDITOR to <application>xedit</application>. "
+"Set the environment variable CVSEDITOR to <application>xed</application>. "
 "For example, if you are using the <command>bash</command> shell, run the "
 "following command at the operating system prompt: <screen> <userinput>export "
-"CVSEDITOR=<application>xedit</application> </userinput> </screen>"
+"CVSEDITOR=<application>xed</application> </userinput> </screen>"
 msgstr ""
-"將環境變數 CVSEDITOR 設為 <application>xedit</application>。 例如，如果您正在"
+"將環境變數 CVSEDITOR 設為 <application>xed</application>。 例如，如果您正在"
 "使用 <command>bash</command> shell，請在作業系統 提示的時候，輸入下面的指"
-"令： <screen> <userinput>export CVSEDITOR=<application>xedit</application> </"
+"令： <screen> <userinput>export CVSEDITOR=<application>xed</application> </"
 "userinput> </screen>"

 #: ../base.xml:1264(para)
 msgid ""
-"Commit a file to CVS in the usual way. A <application>xedit</application> "
+"Commit a file to CVS in the usual way. A <application>xed</application> "
 "window opens, to enable you to enter the commit message."
 msgstr ""
-"以平常的方式將檔案確定至 CVS。此時會開啟 <application>xedit</application> 視"
+"以平常的方式將檔案確定至 CVS。此時會開啟 <application>xed</application> 視"
 "窗，讓您輸入 commit 訊息。"

 #: ../base.xml:1267(para)
@@ -1938,35 +1938,35 @@ msgstr "載入 CVS ChangeLog 增效模組。"
 msgid ""
 "Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Open CVS ChangeLogs</"
 "guimenuitem></menuchoice> to open all of the ChangeLog files referenced in "
-"the commit message. <application>xedit</application> opens each ChangeLog "
+"the commit message. <application>xed</application> opens each ChangeLog "
 "file in a new tab."
 msgstr ""
 "請選擇 <menuchoice><guimenu>檔案</guimenu><guimenuitem>開啟 CVS ChangeLogs</"
 "guimenuitem></menuchoice>，開啟所有 commit 訊息中所出現的 ChangeLog 檔案。"
-"<application>xedit</application> 會為每個 變更Log 檔案開啟一個新標籤。"
+"<application>xed</application> 會為每個 變更Log 檔案開啟一個新標籤。"

 #: ../base.xml:1272(para)
 msgid ""
 "Copy the ChangeLog entries that you want to add to the commit message from "
-"the <application>xedit</application> ChangeLog files."
+"the <application>xed</application> ChangeLog files."
 msgstr ""
-"<application>xedit</application> ChangeLog 檔案中，複製您想加入 commit 訊息"
+"<application>xed</application> ChangeLog 檔案中，複製您想加入 commit 訊息"
 "的 ChangeLog 記錄。"

 #: ../base.xml:1275(para)
 msgid ""
-"Insert the copied ChangeLog entries in the <application>xedit</application> "
+"Insert the copied ChangeLog entries in the <application>xed</application> "
 "commit message tab."
 msgstr ""
-"將 ChangeLog 記錄加入 <application>xedit</application> 的 commit 訊息標籤內。"
+"將 ChangeLog 記錄加入 <application>xed</application> 的 commit 訊息標籤內。"

 #: ../base.xml:1278(para)
 msgid "Save your changes to the commit message, then close all files."
 msgstr "儲存您對 commit 訊息所做的變更，然後關閉所有的檔案。"

 #: ../base.xml:1281(para)
-msgid "Quit <application>xedit</application>."
-msgstr "結束 <application>xedit</application>。"
+msgid "Quit <application>xed</application>."
+msgstr "結束 <application>xed</application>。"

 #: ../base.xml:1288(title)
 msgid "Compare Files Plugin"
@@ -1993,13 +1993,13 @@ msgid ""
 "guimenuitem></menuchoice>. When you choose this option for the first time, "
 "you are prompted to confirm the location of the <command>diff</command> "
 "command. You are not prompted for this location again. See <xref linkend="
-"\"xedit-compare-files-configure\"/> for information about how to change this "
+"\"xed-compare-files-configure\"/> for information about how to change this "
 "location later."
 msgstr ""
 "請選擇 <menuchoice><guimenu>工具</guimenu><guimenuitem>比較檔案</"
 "guimenuitem></menuchoice>。 當您是第一次選擇這個選項，系統會提示您，請您確認 "
 "<command>diff</command> 指令的位置。以後則不會再提示您確認位置。若需如何在日"
-"後變更這個位置的詳細資訊，請參閱 <xref linkend=\"xedit-compare-files-"
+"後變更這個位置的詳細資訊，請參閱 <xref linkend=\"xed-compare-files-"
 "configure\"/>。"

 #: ../base.xml:1299(para)
@@ -2153,12 +2153,12 @@ msgstr "目前文件的位元組數。"

 #: ../base.xml:1376(para)
 msgid ""
-"You can continue to update the <application>xedit</application> file while "
+"You can continue to update the <application>xed</application> file while "
 "the <guilabel>Document Statistics</guilabel> dialog is open. To refresh the "
 "contents of the <guilabel>Document Statistics</guilabel> dialog, click on "
 "the <guibutton>Update</guibutton> button."
 msgstr ""
-"您可以不斷地更新<application>xedit</application> 檔案，而無須關閉<guilabel>文"
+"您可以不斷地更新<application>xed</application> 檔案，而無須關閉<guilabel>文"
 "件統計資料</guilabel>對話方塊。要重新整理<guilabel>文件統計資料</guilabel>對"
 "話方塊的內容，請按一下<guibutton>更新</guibutton>按鈕。"

@@ -2239,36 +2239,36 @@ msgstr ""
 msgid ""
 "If you have not configured the Insert Date/Time plugin to automatically "
 "insert the date/time without prompting you for the format, "
-"<application>xedit</application> displays the <guilabel>Insert Date and "
+"<application>xed</application> displays the <guilabel>Insert Date and "
 "Time</guilabel> dialog. Select the appropriate date/time format from the "
 "list. Click on the <guibutton>Insert</guibutton> button to close the "
-"<guilabel>Insert Date and Time</guilabel> dialog; <application>xedit</"
+"<guilabel>Insert Date and Time</guilabel> dialog; <application>xed</"
 "application> inserts the date/time at the cursor position in the current "
 "file."
 msgstr ""
 "如果您尚未將加入日期/時間增效模組配置成不需提示即自動加入日期/時間，"
-"<application>xedit</application> 會顯示<guilabel>加入日期和時間</guilabel>對"
+"<application>xed</application> 會顯示<guilabel>加入日期和時間</guilabel>對"
 "話方塊。從清單中選取適當的日期/時間格式。按一下<guibutton>插入</guibutton>按"
-"鈕，關閉<guilabel>加入日期和時間</guilabel>對話方塊；<application>xedit</"
+"鈕，關閉<guilabel>加入日期和時間</guilabel>對話方塊；<application>xed</"
 "application> 會在目前檔案的游標位置上插入日期/時間。"

 #: ../base.xml:1416(para)
 msgid ""
-"If you have configured <application>xedit</application> to use one "
+"If you have configured <application>xed</application> to use one "
 "particular date/time format, the <guilabel>Insert Date and Time</guilabel> "
 "dialog is not displayed; the date/time is automatically entered at the "
 "cursor position in the current file."
 msgstr ""
-"如果您已經將 <application>xedit</application> 配置成使用特定的日期/時間格式，"
+"如果您已經將 <application>xed</application> 配置成使用特定的日期/時間格式，"
 "則不會顯示<guilabel>加入日期和時間</guilabel>對話方塊；即會在目前檔案的游標位"
 "置上插入日期/時間。"

 #: ../base.xml:1417(para)
 msgid ""
-"See <xref linkend=\"xedit-date-time-configure\"/> for information about how "
+"See <xref linkend=\"xed-date-time-configure\"/> for information about how "
 "to configure the Insert Date/Time plugin."
 msgstr ""
-"若需如何配置加入日期/時間增效模組的詳細資訊，請參閱 <xref linkend=\"xedit-"
+"若需如何配置加入日期/時間增效模組的詳細資訊，請參閱 <xref linkend=\"xed-"
 "date-time-configure\"/>。"

 #: ../base.xml:1422(title)
@@ -2305,17 +2305,17 @@ msgstr ""

 #: ../base.xml:1443(para)
 msgid ""
-"To use the same <application>xedit</application>-provided date/time format "
+"To use the same <application>xed</application>-provided date/time format "
 "each time you insert the date/time, select the <guilabel>Use the selected "
 "format</guilabel> option, then select the appropriate format from the list. "
-"When you select this option, <application>xedit</application> does not "
+"When you select this option, <application>xed</application> does not "
 "prompt you for the date/time format when you choose "
 "<menuchoice><guimenu>Edit</guimenu><guimenuitem>Insert Date and Time</"
 "guimenuitem></menuchoice>."
 msgstr ""
-"如果要在每次加入日期/時間時都使用 <application>xedit</application> 提供的日"
+"如果要在每次加入日期/時間時都使用 <application>xed</application> 提供的日"
 "期/時間格式，請選取<guilabel>使用選取的格式</guilabel>選項，然後從清單中選取"
-"適當的格式。當您選取這個選項後，<application>xedit</application> 並不會在您選"
+"適當的格式。當您選取這個選項後，<application>xed</application> 並不會在您選"
 "擇<menuchoice><guimenu>編輯</guimenu><guimenuitem>加入日期和時間</"
 "guimenuitem></menuchoice>時，提示您設定日期/時間的格式。"

@@ -2326,11 +2326,11 @@ msgstr "Shell 指令增效模組"
 #: ../base.xml:1463(para)
 msgid ""
 "The Shell Command plugin enables you to capture the output from a shell "
-"command in <application>xedit</application>, by displaying the text output "
+"command in <application>xed</application>, by displaying the text output "
 "of the shell command in the output window. To use the Shell command plugin, "
 "perform the following steps:"
 msgstr ""
-"Shell 指令增效模組可以從 <application>xedit</application> 的 shell 指令擷取輸"
+"Shell 指令增效模組可以從 <application>xed</application> 的 shell 指令擷取輸"
 "出，而將 shell 指令的文字輸出 顯示於輸出視窗中。如果要使用 Shell 指令增效模"
 "組，請執行 下列的步驟："

@@ -2374,11 +2374,11 @@ msgstr "%n"
 #: ../base.xml:1485(para)
 msgid ""
 "Use these special characters to specify the filename of the current active "
-"document, without the path. In this case, <application>xedit</application> "
+"document, without the path. In this case, <application>xed</application> "
 "looks for the file in the Working directory."
 msgstr ""
 "使用此類特殊字元，指定目前使用中的檔案名稱，不包括路徑。此時，"
-"<application>xedit</application> 會在工作目錄中找尋檔案。"
+"<application>xed</application> 會在工作目錄中找尋檔案。"

 #: ../base.xml:1489(para)
 msgid ""
@@ -2393,11 +2393,11 @@ msgstr ""
 msgid ""
 "Select the <guilabel>Show results in Output Window</guilabel> option to "
 "display the results of the command in the output window. If you do not "
-"select this option, <application>xedit</application> discards the results of "
+"select this option, <application>xed</application> discards the results of "
 "the command."
 msgstr ""
 "選取<guilabel>在輸出視窗顯示結果</guilabel>選項，在輸出視窗顯示指令的執行結"
-"果。如果沒有選取這個選項，<application>xedit</application> 會放棄指令結果。"
+"果。如果沒有選取這個選項，<application>xed</application> 會放棄指令結果。"

 #: ../base.xml:1496(para)
 msgid ""
--- a/m4/python.m4
+++ b/m4/python.m4
@@ -1,62 +0,0 @@
-## this one is commonly used with AM_PATH_PYTHONDIR ...
-dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
-dnl Check if a module containing a given symbol is visible to python.
-AC_DEFUN([AM_CHECK_PYMOD],
-[AC_REQUIRE([AM_PATH_PYTHON])
-py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
-AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1)
-AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
-ifelse([$2],[], [prog="
-import sys
-try:
-        import $1
-except ImportError:
-        sys.exit(1)
-except:
-        sys.exit(0)
-sys.exit(0)"], [prog="
-import $1
-$1.$2"])
-if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
-  then
-    eval "py_cv_mod_$py_mod_var=yes"
-  else
-    eval "py_cv_mod_$py_mod_var=no"
-  fi
-])
-py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
-if test "x$py_val" != xno; then
-  AC_MSG_RESULT(yes)
-  ifelse([$3], [],, [$3
-])dnl
-else
-  AC_MSG_RESULT(no)
-  ifelse([$4], [],, [$4
-])dnl
-fi
-])
-
-dnl a macro to check for ability to create python extensions
-dnl  AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
-dnl function also defines PYTHON_INCLUDES
-AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
-[AC_REQUIRE([AM_PATH_PYTHON])
-AC_MSG_CHECKING(for headers required to compile python extensions)
-dnl deduce PYTHON_INCLUDES
-py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
-py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
-PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
-if test "$py_prefix" != "$py_exec_prefix"; then
-  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
-fi
-AC_SUBST(PYTHON_INCLUDES)
-dnl check if the headers exist:
-save_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
-AC_TRY_CPP([#include <Python.h>],dnl
-[AC_MSG_RESULT(found)
-$1],dnl
-[AC_MSG_RESULT(not found)
-$2])
-CPPFLAGS="$save_CPPFLAGS"
-])
--- a/meson.build
+++ b/meson.build
@@ -0,0 +1,104 @@
+project('xed', 'c', version : '2.4.3')
+
+gnome = import('gnome')
+i18n = import('i18n')
+pkgconfig = import('pkgconfig')
+
+version = meson.project_version()
+
+xed_conf = configuration_data()
+xed_conf.set_quoted('VERSION', version)
+xed_conf.set_quoted('GETTEXT_PACKAGE', 'xed')
+
+# directories
+prefix = get_option('prefix')
+bindir = get_option('bindir')
+datadir = get_option('datadir')
+libdir = get_option('libdir')
+includedir = get_option('includedir')
+libexecdir = get_option('libexecdir')
+desktopdir = join_paths(datadir, 'applications')
+schema_dir = join_paths(datadir, 'glib-2.0', 'schemas')
+
+po_dir = join_paths(meson.source_root(), 'po')
+
+# dependencies
+libxml = dependency('libxml-2.0', version: '>= 2.5.0')
+glib = dependency('glib-2.0', version: '>= 2.40.0')
+gthread = dependency('gthread-2.0', version: '>= 2.13.0')
+gio = dependency('gio-2.0', version: '>= 2.40.0')
+gtk = dependency('gtk+-3.0', version: '>= 3.19.3')
+gtksourceview = dependency('gtksourceview-3.0', version: '>= 3.19.0')
+libpeas = dependency('libpeas-1.0', version: '>= 1.12.0')
+libpeas_gtk = dependency('libpeas-gtk-1.0', version: '>= 1.12.0')
+gir_dep = dependency('gobject-introspection-1.0', version: '>= 0.6.7', required: false)
+gmodule = dependency('gmodule-2.0')
+xapp = dependency('xapp', version: '>= 1.4.0')
+X11 = dependency('x11')
+pango = dependency('pango')
+
+if gir_dep.found()
+    xed_conf.set('ENABLE_INTROSPECTION', 1)
+endif
+
+enable_spell = get_option('enable_spell')
+if enable_spell
+    gspell = dependency('gspell-1', version: '>= 0.2.5')
+endif
+
+if get_option('enable_gvfs_metadata')
+    xed_conf.set('ENABLE_GVFS_METADATA', true)
+endif
+
+# on some systems we need to find the math lib to make sure it builds
+cc = meson.get_compiler('c')
+math = cc.find_library('m', required: false)
+
+intltool_merge = find_program('intltool-merge')
+itstool = find_program('itstool')
+
+# generate config.h
+config_h_file = configure_file(
+    output : 'config.h',
+    configuration : xed_conf
+)
+
+config_h = declare_dependency(
+    sources: config_h_file
+)
+
+include_dirs = include_directories('.', 'xed')
+
+# compiler flags
+add_global_arguments('-DDATADIR="@0@"'.format(join_paths(prefix, datadir)), language: 'c')
+add_global_arguments('-DLIBDIR="@0@"'.format(join_paths(prefix, libdir)), language: 'c')
+
+# remove this later or add as build option
+if not get_option('deprecated_warnings')
+    add_global_arguments([
+            '-Wno-deprecated-declarations',
+            '-Wno-deprecated',
+            '-Wno-declaration-after-statement',
+        ],
+        language: 'c',
+    )
+endif
+
+subdir('xed')
+subdir('pixmaps')
+subdir('po')
+subdir('data')
+subdir('plugins')
+subdir('help')
+if get_option('docs')
+    subdir('docs/reference')
+endif
+
+message('prefix = @0@'.format(prefix))
+message('bindir = @0@'.format(bindir))
+message('datadir = @0@'.format(datadir))
+message('libdir = @0@'.format(libdir))
+message('includedir = @0@'.format(includedir))
+message('libexecdir = @0@'.format(libexecdir))
+message('desktopdir = @0@'.format(desktopdir))
+message('schema_dir = @0@'.format(schema_dir))
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -0,0 +1,23 @@
+option(
+	'enable_spell',
+	type : 'boolean',
+	value : true,
+	description : 'enable gspell'
+)
+option(
+	'enable_gvfs_metadata',
+	type : 'boolean',
+	value : true,
+	description : 'enable gvfs metadata'
+)
+option('docs',
+    type: 'boolean',
+    value: false,
+    description: 'Build the API references (requires gtk-doc)'
+)
+option(
+	'deprecated_warnings',
+    type : 'boolean',
+    value : false,
+    description: 'Show build warnings for deprecations'
+)
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -1,8 +0,0 @@
-icondir = $(datadir)/xedit/icons
-icon_DATA = xedit-plugin.png
-
-EXTRA_DIST = \
-	$(icon_DATA) \
-	xedit.ico
-
-include $(top_srcdir)/git.mk
--- a/pixmaps/meson.build
+++ b/pixmaps/meson.build
@@ -0,0 +1,4 @@
+install_data(
+    'xed-plugin.png',
+    install_dir: join_paths(datadir, 'xed', 'icons')
+)
--- a/pixmaps/xedit-plugin.png
+++ b/pixmaps/xedit-plugin.png
--- a/pixmaps/xedit.ico
+++ b/pixmaps/xedit.ico
--- a/plugin-loaders/Makefile.am
+++ b/plugin-loaders/Makefile.am
@@ -1,7 +0,0 @@
-SUBDIRS = c
-
-if ENABLE_PYTHON
-SUBDIRS += python
-endif
-
-include $(top_srcdir)/git.mk
--- a/plugin-loaders/c/Makefile.am
+++ b/plugin-loaders/c/Makefile.am
@@ -1,24 +0,0 @@
-# C plugin loader
-
-loaderdir = $(libdir)/xedit/plugin-loaders
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir) 						\
-	$(XEDIT_CFLAGS) 						\
-	$(WARN_CFLAGS)							\
-	$(DISABLE_DEPRECATED_CFLAGS)					\
-	-DXEDIT_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
-
-loader_LTLIBRARIES = libcloader.la
-
-NOINST_H_FILES = \
-	xedit-plugin-loader-c.h
-
-libcloader_la_SOURCES = \
-	xedit-plugin-loader-c.c 	\
-	$(NOINST_H_FILES)
-
-libcloader_la_LDFLAGS = $(LOADER_LIBTOOL_FLAGS)
-libcloader_la_LIBADD = $(XEDIT_LIBS)
-
-include $(top_srcdir)/git.mk
--- a/plugin-loaders/c/xedit-plugin-loader-c.c
+++ b/plugin-loaders/c/xedit-plugin-loader-c.c
@@ -1,182 +0,0 @@
-/*
- * xedit-plugin-loader-c.c
- * This file is part of xedit
- *
- * Copyright (C) 2008 - Jesse van den Kieboom
- *
- * 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 License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, 
- * Boston, MA 02110-1301, USA. 
- */
-
-#include "xedit-plugin-loader-c.h"
-#include <xedit/xedit-object-module.h>
-
-#define XEDIT_PLUGIN_LOADER_C_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), XEDIT_TYPE_PLUGIN_LOADER_C, XeditPluginLoaderCPrivate))
-
-struct _XeditPluginLoaderCPrivate
-{
-	GHashTable *loaded_plugins;
-};
-
-static void xedit_plugin_loader_iface_init (gpointer g_iface, gpointer iface_data);
-
-XEDIT_PLUGIN_LOADER_REGISTER_TYPE (XeditPluginLoaderC, xedit_plugin_loader_c, G_TYPE_OBJECT, xedit_plugin_loader_iface_init);
-
-
-static const gchar *
-xedit_plugin_loader_iface_get_id (void)
-{
-	return "C";
-}
-
-static XeditPlugin *
-xedit_plugin_loader_iface_load (XeditPluginLoader *loader,
-				XeditPluginInfo   *info,
-				const gchar       *path)
-{
-	XeditPluginLoaderC *cloader = XEDIT_PLUGIN_LOADER_C (loader);
-	XeditObjectModule *module;
-	const gchar *module_name;
-	XeditPlugin *result;
-
-	module = (XeditObjectModule *)g_hash_table_lookup (cloader->priv->loaded_plugins, info);
-	module_name = xedit_plugin_info_get_module_name (info);
-
-	if (module == NULL)
-	{
-		/* For now we force all modules to be resident */
-		module = xedit_object_module_new (module_name,
-						  path,
-						  "register_xedit_plugin",
-						  TRUE);
-
-		/* Infos are available for all the lifetime of the loader.
-		 * If this changes, we should use weak refs or something */
-
-		g_hash_table_insert (cloader->priv->loaded_plugins, info, module);
-	}
-
-	if (!g_type_module_use (G_TYPE_MODULE (module)))
-	{
-		g_warning ("Could not load plugin module: %s", xedit_plugin_info_get_name (info));
-
-		return NULL;
-	}
-
-	/* TODO: for now we force data-dir-name = module-name... if needed we can
-	 * add a datadir field to the plugin descriptor file.
-	 */
-	result = (XeditPlugin *)xedit_object_module_new_object (module,
-								"install-dir", path,
-								"data-dir-name", module_name,
-								NULL);
-
-	if (!result)
-	{
-		g_warning ("Could not create plugin object: %s", xedit_plugin_info_get_name (info));
-		g_type_module_unuse (G_TYPE_MODULE (module));
-		
-		return NULL;
-	}
-
-	g_type_module_unuse (G_TYPE_MODULE (module));
-	
-	return result;
-}
-
-static void
-xedit_plugin_loader_iface_unload (XeditPluginLoader *loader,
-				  XeditPluginInfo   *info)
-{
-	//XeditPluginLoaderC *cloader = XEDIT_PLUGIN_LOADER_C (loader);
-	
-	/* this is a no-op, since the type module will be properly unused as
-	   the last reference to the plugin dies. When the plugin is activated
-	   again, the library will be reloaded */
-}
-
-static void
-xedit_plugin_loader_iface_init (gpointer g_iface, 
-				gpointer iface_data)
-{
-	XeditPluginLoaderInterface *iface = (XeditPluginLoaderInterface *)g_iface;
-	
-	iface->get_id = xedit_plugin_loader_iface_get_id;
-	iface->load = xedit_plugin_loader_iface_load;
-	iface->unload = xedit_plugin_loader_iface_unload;
-}
-
-static void
-xedit_plugin_loader_c_finalize (GObject *object)
-{
-	XeditPluginLoaderC *cloader = XEDIT_PLUGIN_LOADER_C (object);
-	GList *infos;
-	GList *item;
-
-	/* FIXME: this sanity check it's not efficient. Let's remove it
-	 * once we are confident with the code */
-
-	infos = g_hash_table_get_keys (cloader->priv->loaded_plugins);
-	
-	for (item = infos; item; item = item->next)
-	{
-		XeditPluginInfo *info = (XeditPluginInfo *)item->data;
-
-		if (xedit_plugin_info_is_active (info))
-		{
-			g_warning ("There are still C plugins loaded during destruction");
-			break;
-		}
-	}
-
-	g_list_free (infos);	
-
-	g_hash_table_destroy (cloader->priv->loaded_plugins);
-	
-	G_OBJECT_CLASS (xedit_plugin_loader_c_parent_class)->finalize (object);
-}
-
-static void
-xedit_plugin_loader_c_class_init (XeditPluginLoaderCClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	
-	object_class->finalize = xedit_plugin_loader_c_finalize;
-
-	g_type_class_add_private (object_class, sizeof (XeditPluginLoaderCPrivate));
-}
-
-static void
-xedit_plugin_loader_c_class_finalize (XeditPluginLoaderCClass *klass)
-{
-}
-
-static void
-xedit_plugin_loader_c_init (XeditPluginLoaderC *self)
-{
-	self->priv = XEDIT_PLUGIN_LOADER_C_GET_PRIVATE (self);
-	
-	/* loaded_plugins maps XeditPluginInfo to a XeditObjectModule */
-	self->priv->loaded_plugins = g_hash_table_new (g_direct_hash,
-						       g_direct_equal);
-}
-
-XeditPluginLoaderC *
-xedit_plugin_loader_c_new ()
-{
-	GObject *loader = g_object_new (XEDIT_TYPE_PLUGIN_LOADER_C, NULL);
-
-	return XEDIT_PLUGIN_LOADER_C (loader);
-}
--- a/plugin-loaders/c/xedit-plugin-loader-c.h
+++ b/plugin-loaders/c/xedit-plugin-loader-c.h
@@ -1,60 +0,0 @@
-/*
- * xedit-plugin-loader-c.h
- * This file is part of xedit
- *
- * Copyright (C) 2008 - Jesse van den Kieboom
- *
- * 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 License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, 
- * Boston, MA 02110-1301, USA. 
- */
-
-#ifndef __XEDIT_PLUGIN_LOADER_C_H__
-#define __XEDIT_PLUGIN_LOADER_C_H__
-
-#include <xedit/xedit-plugin-loader.h>
-
-G_BEGIN_DECLS
-
-#define XEDIT_TYPE_PLUGIN_LOADER_C		(xedit_plugin_loader_c_get_type ())
-#define XEDIT_PLUGIN_LOADER_C(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), XEDIT_TYPE_PLUGIN_LOADER_C, XeditPluginLoaderC))
-#define XEDIT_PLUGIN_LOADER_C_CONST(obj)	(G_TYPE_CHECK_INSTANCE_CAST ((obj), XEDIT_TYPE_PLUGIN_LOADER_C, XeditPluginLoaderC const))
-#define XEDIT_PLUGIN_LOADER_C_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), XEDIT_TYPE_PLUGIN_LOADER_C, XeditPluginLoaderCClass))
-#define XEDIT_IS_PLUGIN_LOADER_C(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), XEDIT_TYPE_PLUGIN_LOADER_C))
-#define XEDIT_IS_PLUGIN_LOADER_C_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), XEDIT_TYPE_PLUGIN_LOADER_C))
-#define XEDIT_PLUGIN_LOADER_C_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), XEDIT_TYPE_PLUGIN_LOADER_C, XeditPluginLoaderCClass))
-
-typedef struct _XeditPluginLoaderC		XeditPluginLoaderC;
-typedef struct _XeditPluginLoaderCClass		XeditPluginLoaderCClass;
-typedef struct _XeditPluginLoaderCPrivate	XeditPluginLoaderCPrivate;
-
-struct _XeditPluginLoaderC {
-	GObject parent;
-	
-	XeditPluginLoaderCPrivate *priv;
-};
-
-struct _XeditPluginLoaderCClass {
-	GObjectClass parent_class;
-};
-
-GType xedit_plugin_loader_c_get_type (void) G_GNUC_CONST;
-XeditPluginLoaderC *xedit_plugin_loader_c_new(void);
-
-/* All the loaders must implement this function */
-G_MODULE_EXPORT GType register_xedit_plugin_loader (GTypeModule * module);
-
-G_END_DECLS
-
-#endif /* __XEDIT_PLUGIN_LOADER_C_H__ */
--- a/plugin-loaders/python/Makefile.am
+++ b/plugin-loaders/python/Makefile.am
@@ -1,36 +0,0 @@
-# C plugin loader
-
-SUBDIRS = bindings
-loaderdir = $(libdir)/xedit/plugin-loaders
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir) 						\
-	-I$(top_builddir)						\
-	-I$(top_srcdir)/xedit						\
-	-I$(top_builddir)/xedit						\
-	$(XEDIT_CFLAGS) 						\
-	$(WARN_CFLAGS)							\
-	$(DISABLE_DEPRECATED_CFLAGS)					\
-	$(PYGTK_CFLAGS)							\
-	$(PYTHON_CFLAGS)						\
-	-DXEDIT_PLUGINS_LIBS_DIR=\"$(XEDIT_PLUGINS_LIBS_DIR)\"		\
-	-DXEDIT_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
-
-loader_LTLIBRARIES = libpythonloader.la
-
-
-NOINST_H_FILES = \
-	xedit-plugin-loader-python.h	\
-	xedit-plugin-python.h
-
-libpythonloader_la_SOURCES = \
-	xedit-plugin-loader-python.c 	\
-	xedit-plugin-python.c		\
-	$(NOINST_H_FILES)
-
-libpythonloader_la_LDFLAGS = $(LOADER_LIBTOOL_FLAGS)
-libpythonloader_la_LIBADD = \
-	$(XEDIT_LIBS) 			\
-	bindings/xedit.la
-
-include $(top_srcdir)/git.mk
--- a/plugin-loaders/python/bindings/Makefile.am
+++ b/plugin-loaders/python/bindings/Makefile.am
@@ -1,115 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-noinst_LTLIBRARIES = \
-	xedit.la
-
-nodist_xedit_la_SOURCES = 	\
-	xedit.c			\
-	xeditutils.c		\
-	xeditcommands.c
-
-xedit_la_LDFLAGS = \
-	-module -avoid-version
-
-xedit_la_LIBADD = \
-	$(PYTHON_LIB_LOC)       \
-	$(PYTHON_LIBS)		\
-	$(PYTHON_EXTRA_LIBS)	\
-	$(PYGTK_LIBS)
-
-xedit_la_CFLAGS = \
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	-I$(top_srcdir)/xedit				\
-	-I$(top_builddir)/xedit				\
-	-I$(top_srcdir)/plugin-loaders/python		\
-	-I$(top_builddir)/plugin-loaders/python		\
-	$(XEDIT_CFLAGS)					\
-	$(NO_STRICT_ALIASING_CFLAGS)			\
-	$(PYGTK_CFLAGS)					\
-	$(PYTHON_CFLAGS)				\
-	$(AM_CFLAGS)
-
-$(top_builddir)/xedit/xedit-enum-types.h:
-	cd $(top_builddir)/xedit && $(MAKE) xedit-enum-types.h
-
-xedit.c: xedit.defs xedit.override xeditplugin.override xeditmessage.override $(top_builddir)/xedit/xedit-enum-types.h
-	( cd $(srcdir) && $(PYGTK_CODEGEN) \
-		--register $(PYGTK_DEFSDIR)/pango-types.defs \
-		--register $(PYGTK_DEFSDIR)/gdk-types.defs \
-		--register $(PYGTK_DEFSDIR)/gtk-types.defs \
-		--register $(PYGTK_DEFSDIR)/gtksourceview2.defs \
-		--register $(PYGOBJECT_DEFSDIR)/gio-types.defs \
-		--override $*.override \
-		--prefix py$* $(<F) ) > $@ 
-
-xeditutils.c: xeditutils.defs xeditutils.override
-	( cd $(srcdir) && $(PYGTK_CODEGEN) \
-		--override $*.override \
-		--prefix py$* $(<F) ) > $@ 
-
-xeditcommands.c: xeditcommands.defs xeditcommands.override xedit.defs
-	( cd $(srcdir) && $(PYGTK_CODEGEN) \
-		--register xedit.defs \
-		--register $(PYGTK_DEFSDIR)/gtk-types.defs \
-		--override $*.override \
-		--prefix py$* $(<F) ) > $@ 
-
-BINDING_XEDIT_HEADERS_SRCDIR_IN = \
-	xedit/xedit-app.h		\
-	xedit/xedit-document.h		\
-	xedit/xedit-encodings.h		\
-	xedit/xedit-plugin.h		\
-	plugin-loaders/python/xedit-plugin-python.h \
-	xedit/xedit-view.h		\
-	xedit/xedit-statusbar.h		\
-	xedit/xedit-tab.h 		\
-	xedit/xedit-panel.h 		\
-	xedit/xedit-window.h 		\
-	xedit/xedit-help.h		\
-	xedit/xedit-debug.h		\
-	xedit/xedit-message-type.h	\
-	xedit/xedit-message.h		\
-	xedit/xedit-message-bus.h	\
-	xedit/xedit-language-manager.h
-
-BINDING_UTILS_HEADERS_SRCDIR_IN = \
-	xedit/xedit-utils.h
-
-BINDING_COMMANDS_HEADERS_SRCDIR_IN = \
-	xedit/xedit-commands.h
-
-BINDING_HEADERS_BUILDDIR_IN = 
-
-BINDING_XEDIT_HEADERS_SRCDIR	:= $(addprefix $(top_srcdir)/,$(BINDING_XEDIT_HEADERS_SRCDIR_IN))
-BINDING_UTILS_HEADERS_SRCDIR	:= $(addprefix $(top_srcdir)/,$(BINDING_UTILS_HEADERS_SRCDIR_IN))
-BINDING_COMMANDS_HEADERS_SRCDIR	:= $(addprefix $(top_srcdir)/,$(BINDING_COMMANDS_HEADERS_SRCDIR_IN))
-
-BINDING_HEADERS_BUILDDIR	:= $(addprefix $(top_builddir)/,$(BINDING_HEADERS_BUILDDIR_IN))
-
-regenerate-python-binding:
-	$(PYGTK_H2DEF) $(sort $(BINDING_XEDIT_HEADERS_SRCDIR) $(BINDING_HEADERS_BUILDDIR)) > xedit.defs.new
-	$(PYGTK_H2DEF) $(sort $(BINDING_UTILS_HEADERS_SRCDIR) $(BINDING_HEADERS_BUILDDIR)) > xeditutils.defs.new
-	$(PYGTK_H2DEF) $(sort $(BINDING_COMMANDS_HEADERS_SRCDIR) $(BINDING_HEADERS_BUILDDIR)) > xeditcommands.defs.new
-
-BUILT_SOURCES = \
-	xedit.c		\
-	xeditutils.c	\
-	xeditcommands.c
-
-EXTRA_DIST = \
-	xedit.override		\
-	xedit.defs		\
-	xeditutils.override	\
-	xeditutils.defs		\
-	xeditcommands.override 	\
-	xeditcommands.defs	\
-	xeditmessage.override	\
-	xeditplugin.override
-
-CLEANFILES = $(BUILT_SOURCES)
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
-
-include $(top_srcdir)/git.mk
--- a/plugin-loaders/python/bindings/xedit.defs
+++ b/plugin-loaders/python/bindings/xedit.defs
--- a/plugin-loaders/python/bindings/xedit.override
+++ b/plugin-loaders/python/bindings/xedit.override
@@ -1,461 +0,0 @@
-%%
-headers
-#include <pygobject.h>
-#include <pygtk/pygtk.h>
-
-#include <xedit/xedit-language-manager.h>
-#include <xedit/xedit-plugin.h>
-#include <xedit/xedit-app.h>
-#include <xedit/xedit-encodings.h>
-#include <xedit/xedit-enum-types.h>
-#include <xedit/xedit-statusbar.h>
-#include <xedit/xedit-debug.h>
-#include <xedit/xedit-help.h>
-
-#include "xedit-plugin-python.h"
-
-void pyxedit_register_classes (PyObject *d); 
-void pyxedit_add_constants (PyObject *module, const gchar *strip_prefix);
-
-static PyObject *
-_helper_wrap_gobject_glist (const GList *list)
-{
-    PyObject *py_list;
-    const GList *tmp;
-
-    if ((py_list = PyList_New(0)) == NULL) {
-        return NULL;
-    }
-    for (tmp = list; tmp != NULL; tmp = tmp->next) {
-        PyObject *py_obj = pygobject_new(G_OBJECT(tmp->data));
-
-        if (py_obj == NULL) {
-            Py_DECREF(py_list);
-            return NULL;
-        }
-        PyList_Append(py_list, py_obj);
-        Py_DECREF(py_obj);
-    }
-    return py_list;
-}
-
-static PyObject *
-_helper_wrap_gobject_gslist (const GSList *list)
-{
-    PyObject *py_list;
-    const GSList *tmp;
-
-    if ((py_list = PyList_New(0)) == NULL) {
-        return NULL;
-    }
-    for (tmp = list; tmp != NULL; tmp = tmp->next) {
-        PyObject *py_obj = pygobject_new(G_OBJECT(tmp->data));
-
-        if (py_obj == NULL) {
-            Py_DECREF(py_list);
-            return NULL;
-        }
-        PyList_Append(py_list, py_obj);
-        Py_DECREF(py_obj);
-    }
-    return py_list;
-}
-%%
-include
-  xeditplugin.override
-  xeditmessage.override
-%%
-modulename xedit 
-%%
-import gtk.Widget as PyGtkWidget_Type
-import gobject.GObject as PyGObject_Type
-import gtk.gdk.Screen as PyGdkScreen_Type
-import gtk.VBox as PyGtkVBox_Type
-import gtk.Window as PyGtkWindow_Type
-import gtk.Image as PyGtkImage_Type
-import gtk.Statusbar as PyGtkStatusbar_Type
-import gtksourceview2.Buffer as PyGtkSourceBuffer_Type
-import gtksourceview2.View as PyGtkSourceView_Type
-import gtksourceview2.Language as PyGtkSourceLanguage_Type
-import gtksourceview2.LanguageManager as PyGtkSourceLanguageManager_Type
-%%
-ignore-glob
-  *_get_type
-  xedit_document_error_quark
-  xedit_panel_add_item_with_stock_icon
-%%
-override xedit_app_create_window kwargs
-static PyObject *
-_wrap_xedit_app_create_window(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "screen", NULL};
-    PyGObject *screen = NULL;
-    XeditWindow *ret;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-			"|O!", kwlist,
-			&PyGdkScreen_Type, &screen))
-        return NULL;
-
-    ret = xedit_app_create_window(XEDIT_APP(self->obj),
-				  screen ? GDK_SCREEN(screen->obj) : NULL);
-
-    /* pygobject_new handles NULL checking */
-    return pygobject_new((GObject *)ret);
-}
-%%
-override xedit_app_get_windows
-static PyObject *
-_wrap_xedit_app_get_windows(PyGObject *self)
-{
-    const GList *list;
-    PyObject *py_list;
-
-    list = xedit_app_get_windows (XEDIT_APP (self->obj));
-
-    py_list = _helper_wrap_gobject_glist (list);
-
-    return py_list;
-}
-%%
-override xedit_app_get_views
-static PyObject *
-_wrap_xedit_app_get_views(PyGObject *self)
-{
-    GList *list;
-    PyObject *py_list;
-
-    list = xedit_app_get_views (XEDIT_APP (self->obj));
-
-    py_list = _helper_wrap_gobject_glist (list);
-
-    g_list_free (list);
-
-    return py_list;
-}
-%%
-override xedit_app_get_documents
-static PyObject *
-_wrap_xedit_app_get_documents(PyGObject *self)
-{
-    GList *list;
-    PyObject *py_list;
-
-    list = xedit_app_get_documents (XEDIT_APP (self->obj));
-
-    py_list = _helper_wrap_gobject_glist (list);
-
-    g_list_free (list);
-
-    return py_list;
-}
-%%
-override xedit_window_get_documents
-static PyObject *
-_wrap_xedit_window_get_documents(PyGObject *self)
-{
-    GList *list;
-    PyObject *py_list;
-
-    list = xedit_window_get_documents (XEDIT_WINDOW (self->obj));
-
-    py_list = _helper_wrap_gobject_glist (list);
-
-    g_list_free(list);
-
-    return py_list;
-}
-%%
-override xedit_window_get_unsaved_documents
-static PyObject *
-_wrap_xedit_window_get_unsaved_documents(PyGObject *self)
-{
-    GList *list;
-    PyObject *py_list;
-
-    list = xedit_window_get_unsaved_documents (XEDIT_WINDOW (self->obj));
-
-    py_list = _helper_wrap_gobject_glist (list);
-
-    g_list_free(list);
-
-    return py_list;
-}
-%%
-override xedit_window_get_views
-static PyObject *
-_wrap_xedit_window_get_views(PyGObject *self)
-{
-    GList *list;
-    PyObject *py_list;
-
-    list = xedit_window_get_views (XEDIT_WINDOW (self->obj));
-
-    py_list = _helper_wrap_gobject_glist (list);
-
-    g_list_free(list);
-
-    return py_list;
-}
-%%
-override xedit_window_close_tabs kwargs
-static PyObject *
-_wrap_xedit_window_close_tabs (PyGObject *self,
-			       PyObject  *args,
-			       PyObject  *kwargs)
-{
-	static char *kwlist[] = { "tabs", NULL };
-	PyObject *list, *item;
-	GList *glist = NULL;
-	int len, i;
-
-	if (!PyArg_ParseTupleAndKeywords (args, kwargs,
-					  "O:XeditWindow.close_tabs", kwlist,
-					  &list))
-		return NULL;
-
-	if (!PySequence_Check (list))
-	{
-		PyErr_SetString (PyExc_TypeError,
-				 "first argument must be a sequence");
-		return NULL;
-	}
-
-	len = PySequence_Length (list);
-
-	for (i = 0; i < len; i++)
-	{
-		item = PySequence_GetItem (list, i);
-		Py_DECREF(item);
-
-		if (!pygobject_check (item, &PyXeditTab_Type))
-		{
-			PyErr_SetString (PyExc_TypeError,
-					 "sequence item not a Gtkwidget object");
-			g_list_free (glist);
-			return NULL;
-		}
-
-		glist = g_list_append (glist, pygobject_get (item));
-	}
-
-	xedit_window_close_tabs (XEDIT_WINDOW (self->obj), glist);
-
-	g_list_free (glist);
-	Py_INCREF (Py_None);
-	return Py_None;
-}
-%%
-override xedit_document_get_search_text
-static PyObject *
-_wrap_xedit_document_get_search_text(PyGObject *self)
-{
-    PyObject *tuple, *string;
-    guint flags;
-    gchar *ret;
-
-    ret = xedit_document_get_search_text (XEDIT_DOCUMENT (self->obj), &flags);
-
-    tuple = PyTuple_New(2);
-    if (ret) {
-        string = PyString_FromString(ret);
-        PyTuple_SetItem(tuple, 0, string);
-    } else {
-        Py_INCREF(Py_None);
-        PyTuple_SetItem(tuple, 0, Py_None);
-    }
-    PyTuple_SetItem(tuple, 1, PyInt_FromLong(flags));
-
-    g_free(ret);
-
-    return tuple;
-}
-%%
-override xedit_panel_add_item kwargs
-static PyObject *
-_wrap_xedit_panel_add_item(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist1[] = { "item", "name", "image", NULL };
-    static char *kwlist2[] = { "item", "name", "stock_id", NULL };
-    PyGObject *item, *image;
-    char *name = NULL;
-    char *stock_id = NULL;
-
-    if (PyArg_ParseTupleAndKeywords(args, kwargs, "O!sO!:XeditPanel.add_item", kwlist1, &PyGtkWidget_Type, &item, &name, &PyGtkImage_Type, &image)) {
-        xedit_panel_add_item(XEDIT_PANEL(self->obj), GTK_WIDGET(item->obj), name, GTK_WIDGET(image->obj));
-        Py_INCREF(Py_None);
-        return Py_None;
-    }
-
-    PyErr_Clear();
-
-    if (PyArg_ParseTupleAndKeywords(args, kwargs, "O!ss:XeditPanel.add_item", kwlist2, &PyGtkWidget_Type, &item, &name, &stock_id)) {
-        xedit_panel_add_item_with_stock_icon(XEDIT_PANEL(self->obj), GTK_WIDGET(item->obj), name, stock_id);
-        Py_INCREF(Py_None);
-        return Py_None;
-    }
-
-    PyErr_Clear();
-    PyErr_SetString(PyExc_TypeError, "the last arg should be either a gtk.Image or a stock_id string");
-    return NULL;
-}
-%%
-override xedit_app_get_default_deprecated
-/* deprecated wrappers */
-static PyObject *
-_wrap_xedit_app_get_default_deprecated(PyObject *self)
-{
-    if (PyErr_Warn(PyExc_DeprecationWarning, "use xedit.app_get_default instead") < 0)
-	return NULL;
-    return _wrap_xedit_app_get_default(self);
-}
-%%
-override xedit_encoding_get_from_charset_deprecated kwargs
-static PyObject *
-_wrap_xedit_encoding_get_from_charset_deprecated(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    if (PyErr_Warn(PyExc_DeprecationWarning, "use xedit.encoding_get_from_charset instead") < 0)
-	return NULL;
-    return _wrap_xedit_encoding_get_from_charset(self, args, kwargs);
-}
-%%
-override xedit_encoding_get_from_index_deprecated kwargs
-static PyObject *
-_wrap_xedit_encoding_get_from_index_deprecated(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    if (PyErr_Warn(PyExc_DeprecationWarning, "use xedit.encoding_get_from_index instead") < 0)
-	return NULL;
-    return _wrap_xedit_encoding_get_from_index(self, args, kwargs);
-}
-%%
-override xedit_encoding_get_utf8_deprecated
-static PyObject *
-_wrap_xedit_encoding_get_utf8_deprecated(PyObject *self)
-{
-    if (PyErr_Warn(PyExc_DeprecationWarning, "use xedit.encoding_get_utf8 instead") < 0)
-	return NULL;
-    return _wrap_xedit_encoding_get_utf8(self);
-}
-%%
-override xedit_encoding_get_current_deprecated
-static PyObject *
-_wrap_xedit_encoding_get_current_deprecated(PyObject *self)
-{
-    if (PyErr_Warn(PyExc_DeprecationWarning, "use xedit.encoding_get_current instead") < 0)
-	return NULL;
-    return _wrap_xedit_encoding_get_current(self);
-}
-%%
-override xedit_tab_get_from_document_deprecated kwargs
-static PyObject *
-_wrap_xedit_tab_get_from_document_deprecated(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    if (PyErr_Warn(PyExc_DeprecationWarning, "use xedit.tab_get_from_document instead") < 0)
-	return NULL;
-    return _wrap_xedit_tab_get_from_document(self, args, kwargs);
-}
-%%
-override xedit_language_manager_list_languages_sorted kwargs
-static PyObject *
-_wrap_xedit_language_manager_list_languages_sorted(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "lm", "include_hidden", NULL };
-    PyGObject *lm;
-    int include_hidden;
-    PyObject *py_list;
-    GSList *list;
-
-    if (!PyArg_ParseTupleAndKeywords (args, kwargs,
-                                      "O!i:language_manager_list_languages_sorted",
-                                      kwlist, &PyGtkSourceLanguageManager_Type, &lm,
-                                      &include_hidden))
-        return NULL;
-
-    list = xedit_language_manager_list_languages_sorted (GTK_SOURCE_LANGUAGE_MANAGER (lm->obj),
-                                                         include_hidden);
-
-    py_list = _helper_wrap_gobject_gslist (list);
-
-    g_slist_free (list);
-
-    return py_list;
-}
-%%
-override xedit_debug kwargs
-static PyObject *
-_wrap_xedit_debug(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "message", NULL };
-    PyObject *traceback_module, *mdict, *func, *traceback, *tuple;
-    PyObject *filename, *lineno, *funcname;
-    char *message = NULL;
-
-    if (g_getenv ("XEDIT_DEBUG_PLUGINS") == NULL)
-    {
-        Py_INCREF (Py_None);
-        return Py_None;
-    }
-
-    if (!PyArg_ParseTupleAndKeywords (args, kwargs, "|s", kwlist, &message))
-        return NULL;
-
-    traceback_module = PyImport_ImportModule ("traceback");
-    if (traceback_module == NULL)
-    {
-        g_warning ("traceback module cannot be imported");
-        Py_INCREF (Py_None);
-        return Py_None;
-    }
-
-    mdict = PyModule_GetDict (traceback_module);
-    func = PyDict_GetItemString (mdict, "extract_stack");
-    traceback = PyObject_CallFunction (func, "zi", NULL, 1);
-    tuple = PyList_GetItem (traceback, 0);
-
-    if (tuple == NULL || !PyTuple_Check (tuple))
-    {
-        g_warning ("traceback tuple is null!");
-    }
-    else
-    {
-        filename = PyTuple_GetItem (tuple, 0);
-        lineno = PyTuple_GetItem (tuple, 1);
-        funcname = PyTuple_GetItem (tuple, 2);
-
-        if (message == NULL)
-            xedit_debug (XEDIT_DEBUG_PLUGINS,
-                         PyString_AsString (filename),
-                         PyInt_AsLong (lineno),
-                         PyString_AsString (funcname));
-        else
-            xedit_debug_message (XEDIT_DEBUG_PLUGINS,
-                                 PyString_AsString (filename),
-                                 PyInt_AsLong (lineno),
-                                 PyString_AsString (funcname),
-                                 "%s",
-                                 message);
-    }
-    Py_DECREF (traceback);
-    Py_DECREF (traceback_module);
-
-    Py_INCREF (Py_None);
-    return Py_None;
-}
-%%
-override xedit_statusbar_flash_message kwargs
-static PyObject *
-_wrap_xedit_statusbar_flash_message(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "context_id", "message", NULL };
-    int context_id;
-    char *message;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,"is:XeditStatusbar.flash_message", kwlist, &context_id, &message))
-        return NULL;
-   
-    xedit_statusbar_flash_message(XEDIT_STATUSBAR(self->obj), context_id, "%s", message);
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-%%
--- a/plugin-loaders/python/bindings/xeditcommands.defs
+++ b/plugin-loaders/python/bindings/xeditcommands.defs
@@ -1,45 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-;; Enumerations and flags ...
-
-
-;; From ../../xedit/xedit-commands.h
-
-(define-function load_uri
-  (c-name "xedit_commands_load_uri")
-  (return-type "none")
-  (parameters
-    '("XeditWindow*" "window")
-    '("const-gchar*" "uri")
-    '("const-XeditEncoding*" "encoding")
-    '("gint" "line_pos")
-  )
-)
-
-(define-function load_uris
-  (c-name "xedit_commands_load_uris")
-  (return-type "gint")
-  (parameters
-    '("XeditWindow*" "window")
-    '("const-GSList*" "uris")
-    '("const-XeditEncoding*" "encoding")
-    '("gint" "line_pos")
-  )
-)
-
-(define-function save_document
-  (c-name "xedit_commands_save_document")
-  (return-type "none")
-  (parameters
-    '("XeditWindow*" "window")
-    '("XeditDocument*" "document")
-  )
-)
-
-(define-function save_all_documents
-  (c-name "xedit_commands_save_all_documents")
-  (return-type "none")
-  (parameters
-    '("XeditWindow*" "window")
-  )
-)
--- a/plugin-loaders/python/bindings/xeditcommands.override
+++ b/plugin-loaders/python/bindings/xeditcommands.override
@@ -1,122 +0,0 @@
-%%
-headers
-#define NO_IMPORT_PYGOBJECT
-#define NO_IMPORT_PYGTK
-#include <pygobject.h>
-#include <pygtk/pygtk.h>
-
-#include "xedit-commands.h"
-#include "xedit-window.h"
-
-void pyxeditcommands_register_classes (PyObject *d);
-void pyxeditcommands_add_constants (PyObject *module, const gchar *strip_prefix);
-
-%%
-modulename xedit.commands
-%%
-import xedit.Window as PyXeditWindow_Type
-import xedit.Document as PyXeditDocument_Type
-%%
-ignore-glob
-  _*
-%%
-override xedit_commands_load_uri kwargs 
-static PyObject *
-_wrap_xedit_commands_load_uri (PyObject *self, PyObject *args, PyObject *kwargs)
-{
-	static char *kwlist[] = { "window", "uri", "encoding", "line_pos", NULL };
-	PyGObject *window;
-	char *uri;
-	int line_pos = 0;
-	PyObject *py_encoding = NULL;
-	XeditEncoding *encoding = NULL;
-
-	if (!PyArg_ParseTupleAndKeywords (args, kwargs, "O!s|Oi:load_uri", 
-	                                  kwlist, &PyXeditWindow_Type, 
-	                                  &window, &uri, &py_encoding, 
-	                                  &line_pos))
-		return NULL;
-    
-	if (py_encoding != NULL && py_encoding != Py_None)
-	{
-		if (pyg_boxed_check (py_encoding, XEDIT_TYPE_ENCODING))
-			encoding = pyg_boxed_get (py_encoding, XeditEncoding);
-		else
-		{
-			PyErr_SetString (PyExc_TypeError, 
-			                 "encoding should be a XeditEncoding");
-			return NULL;
-		}
-	}
-
-	xedit_commands_load_uri (XEDIT_WINDOW (window->obj), uri, encoding, 
-	                        line_pos);
-	Py_INCREF (Py_None);
-	return Py_None;
-}
-%%
-override xedit_commands_load_uris kwargs 
-static PyObject *
-_wrap_xedit_commands_load_uris (PyObject *self, PyObject *args, PyObject *kwargs)
-{
-	static char *kwlist[] = { "window", "uris", "encoding", "line_pos", NULL };
-	PyGObject *window;
-	GSList *uris = NULL;
-	int line_pos = 0;
-	PyObject *py_encoding = NULL;
-	PyObject *list;
-	PyObject *item;
-	XeditEncoding *encoding = NULL;
-	int len;
-	int i;
-
-	if (!PyArg_ParseTupleAndKeywords (args, kwargs, "O!O|Oi:load_uri", 
-	                                  kwlist, &PyXeditWindow_Type, 
-	                                  &window, &list, &py_encoding, 
-	                                  &line_pos))
-		return NULL;
-    
-	if (py_encoding != NULL && py_encoding != Py_None)
-	{
-		if (pyg_boxed_check (py_encoding, XEDIT_TYPE_ENCODING))
-			encoding = pyg_boxed_get (py_encoding, XeditEncoding);
-		else {
-			PyErr_SetString (PyExc_TypeError, 
-			                 "encoding should be a XeditEncoding");
-			return NULL;
-		}
-	}
-
-	if (!PySequence_Check (list))
-	{
-		PyErr_SetString (PyExc_TypeError, 
-		                 "second argument must be a sequence");
-		return NULL;
-	}
-
-	len = PySequence_Length (list);
-
-	for (i = 0; i < len; i++)
-	{
-		item = PySequence_GetItem (list, i);
-		Py_DECREF (item);
-
-		if (!PyString_Check (item))
-		{
-			PyErr_SetString (PyExc_TypeError,
-					 "sequence item not a string");
-			g_slist_free (uris);
-			return NULL;
-		}
-
-		uris = g_slist_prepend (uris, PyString_AsString (item));
-	}
-
-	uris = g_slist_reverse (uris);
-	xedit_commands_load_uris (XEDIT_WINDOW (window->obj), uris, 
-	                          encoding, line_pos);
-	g_slist_free (uris);
-
-	Py_INCREF (Py_None);
-	return Py_None;
-}
--- a/plugin-loaders/python/bindings/xeditmessage.override
+++ b/plugin-loaders/python/bindings/xeditmessage.override
@@ -1,556 +0,0 @@
-%%
-headers
-
-#include <xedit/xedit-message-bus.h>
-#include <xedit/xedit-message.h>
-
-static GType
-_helper_wrap_get_gtype_from_pytype (PyObject *pytype)
-{
-    PyTypeObject *type = (PyTypeObject *)pytype;
-    
-    if (type == &PyList_Type || type == &PyTuple_Type)
-    	return G_TYPE_STRV;
-
-    return pyg_type_from_object (pytype);
-}
-
-static gchar *
-_helper_wrap_get_string (PyObject *obj)
-{
-	PyObject *str;
-	gchar *result;
-	
-	str = PyObject_Str (obj);
-	
-	if (!str)
-		return NULL;
-	
-	result = g_strdup (PyString_AsString (str));
-	Py_DECREF (str);
-	
-	return result;
-}
-
-static int
-_helper_wrap_list_to_gvalue (GValue *gvalue, PyObject *pyvalue)
-{
-	int num;
-	gchar **lst;
-	gint i;
-	
-	num = PySequence_Size (pyvalue);
-	lst = g_new0 (gchar *, num + 1);
-	
-	for (i = 0; i < num; i++)
-	{
-		lst[i] = _helper_wrap_get_string (PySequence_GetItem (pyvalue, i));
-		
-		if (lst[i] == NULL)
-		{
-			g_strfreev (lst);
-			return 1;
-		}
-	}
-	
-	g_value_set_boxed (gvalue, lst);
-	g_strfreev (lst);
-	
-	return 0;
-}
-
-static int
-_helper_wrap_get_gvalue_from_pyobject (GValue *gvalue, PyObject *pyvalue)
-{
-	if (pyvalue->ob_type == &PyList_Type || pyvalue->ob_type == &PyTuple_Type)
-		return _helper_wrap_list_to_gvalue (gvalue, pyvalue);
-
-	return pyg_value_from_pyobject(gvalue, pyvalue);
-}
-
-static int
-_helper_wrap_message_set_value(XeditMessage *message, PyObject *pykey, PyObject *pyvalue)
-{
-    gchar *key;
-    GType gtype;
-    GValue value = {0,};
-
-    key = _helper_wrap_get_string(pykey);
-    
-    if (key == NULL)
-        return 0;
-
-    gtype = xedit_message_get_key_type(message, key);
-    
-    if (gtype == 0) {
-        PyErr_SetString(PyExc_TypeError, "invalid key");
-        g_free (key);
-        return 0;
-    }
-
-    g_value_init(&value, gtype);
-    
-    if (_helper_wrap_get_gvalue_from_pyobject (&value, pyvalue)) {
-        PyErr_SetString(PyExc_TypeError,
-                        "value is of the wrong type for this key");
-        g_free (key);
-        return 0;
-    }
-
-    xedit_message_set_value(message, key, &value);
-    g_value_unset(&value);
-    g_free (key);
-    
-    return 1;
-}
-
-typedef void (*ParsePairFunc)(PyObject *key, PyObject *value, gpointer user_data);
-
-static void
-_helper_parse_pairs_dict (PyObject *dict, ParsePairFunc func, gpointer user_data)
-{
-    if (!dict)
-        return;
-    
-    PyObject *key, *value;
-    Py_ssize_t i = 0;
-    
-    while (PyDict_Next(dict, &i, &key, &value))
-    {
-        func(key, value, user_data);
-    }
-}
-
-static void
-_helper_parse_pairs(PyObject *args, PyObject *kwargs, ParsePairFunc func, gpointer user_data)
-{
-    guint len;
-    guint i;
-    
-    len = PyTuple_Size(args);
-    
-    for (i = 0; i < len; ++i)
-    {
-    	PyObject *d = PyTuple_GetItem(args, i);
-    	
-    	if (PyDict_Check(d))
-            _helper_parse_pairs_dict(d, func, user_data);
-    }
-  
-    _helper_parse_pairs_dict(kwargs, func, user_data);  
-}
-
-static void
-_helper_message_set(PyObject *key, PyObject *value, XeditMessage *message)
-{
-    _helper_wrap_message_set_value(message, key, value);
-}
-
-static void
-_helper_message_set_values(XeditMessage *message, PyObject *args, PyObject *kwargs)
-{
-    _helper_parse_pairs(args, kwargs, (ParsePairFunc)_helper_message_set, message);
-}
-
-static XeditMessage *
-_helper_wrap_create_message(XeditMessageBus *bus, PyObject *args, PyObject *kwargs)
-{
-    PyObject *pypath, *pymethod, *pydict;
-    
-    if (!PyArg_ParseTuple(args, "OO|O:XeditMessage.create", &pypath, &pymethod, &pydict))
-        return NULL;
-    
-    gchar *object_path = _helper_wrap_get_string(pypath);
-    gchar *method = _helper_wrap_get_string(pymethod);
-    
-    XeditMessageType *message_type = xedit_message_bus_lookup (bus, object_path, method);
-    XeditMessage *message;
-     
-    if (message_type)
-    {
-        message = xedit_message_type_instantiate(message_type, NULL);
-        _helper_message_set_values(message, args, kwargs);
-    }
-    else
-    {
-    	PyErr_SetString(PyExc_StandardError, "Message type does not exist");
-        message = NULL;
-    }
-    
-    g_free(object_path);
-    g_free(method);
-    
-    return message;
-}
-
-typedef struct {
-    PyObject *func;
-    PyObject *data;
-} PyXeditCustomNotify;
-
-static void 
-pyxedit_custom_destroy_notify(gpointer user_data)
-{
-    PyXeditCustomNotify *cunote = user_data;
-    PyGILState_STATE state;
-    
-    g_return_if_fail(user_data);
-    state = pyg_gil_state_ensure();
-    Py_XDECREF(cunote->func);
-    Py_XDECREF(cunote->data);
-    pyg_gil_state_release(state);
-    
-    g_free(cunote);
-}
-%%
-ignore-glob
-  *_get_type
-  xedit_message_type_foreach
-  xedit_message_type_instantiate_valist
-  xedit_message_type_new_valist
-  xedit_message_get_valist
-  xedit_message_set_valist
-  xedit_message_set_valuesv
-  xedit_message_bus_disconnect_by_func
-  xedit_message_bus_block_by_func
-  xedit_message_bus_unblock_by_func
-%%
-override xedit_message_type_new kwargs
-
-typedef struct
-{
-    XeditMessageType *message_type;
-    PyObject *optional;
-} MessageTypeSetInfo;
-
-static void
-_message_type_set(PyObject *key, PyObject *value, MessageTypeSetInfo *info)
-{
-    GType gtype;
-    
-    gchar *k = _helper_wrap_get_string(key);
-
-    if (!k)
-        return;
-
-    gtype = _helper_wrap_get_gtype_from_pytype(value);
-    
-    gboolean optional = info->optional && PySequence_Contains(info->optional, key);
-    
-    xedit_message_type_set(info->message_type, optional, k, gtype, NULL);
-    g_free(k);
-}
-
-static int
-_wrap_xedit_message_type_new(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    PyObject *pypath, *pymethod, *optional = NULL, *pydict;
-    
-    if (!PyArg_ParseTuple(args, "OO|OO:XeditMessageType.new", &pypath, &pymethod, &optional, &pydict))
-        return -1;
-    
-    XeditMessageType *message_type = XEDIT_MESSAGE_TYPE(g_object_new(pyg_type_from_object((PyObject *) self), NULL));
-    
-    MessageTypeSetInfo info = {message_type, optional && PySequence_Check(optional) ? optional : NULL};
-    _helper_parse_pairs (args, kwargs, (ParsePairFunc)_message_type_set, &info);
-    
-    self->obj = (GObject *)message_type;    
-    pygobject_register_wrapper((PyObject *) self);
-    
-    return 0;
-}
-%%
-override xedit_message_type_instantiate kwargs
-static PyObject *
-_wrap_xedit_message_type_instantiate(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    XeditMessageType *message_type = XEDIT_MESSAGE_TYPE (self->obj);
-    XeditMessage *message = xedit_message_type_instantiate(message_type, NULL);
-    
-    _helper_message_set_values(message, args, kwargs);
-    
-    return pygobject_new((GObject *)message);
-}
-%%
-override xedit_message_get args
-static PyObject *
-_wrap_xedit_message_get(PyGObject *self, PyObject *args)
-{
-    guint len, i;
-    PyObject *ret;
-
-    len = PyTuple_Size(args);
-    
-    ret = PyTuple_New(len);
-    
-    for (i = 0; i < len; i++) {
-        GValue value = { 0, };
-        PyObject *py_key = PyTuple_GetItem(args, i);
-        gchar *key = _helper_wrap_get_string(py_key);
-        
-        if (!key) {
-	    PyErr_SetString(PyExc_TypeError, "keys must be strings");
-	    Py_DECREF(ret);
-	    return NULL;
-	}
-	
-	xedit_message_get_value (XEDIT_MESSAGE (self->obj), key, &value);
-	g_free (key);
-
-	PyTuple_SetItem(ret, i, pyg_value_as_pyobject(&value, TRUE));
-	g_value_unset(&value);
-    }
-    
-    return ret;
-}
-%%
-override xedit_message_get_value kwargs
-static PyObject *
-_wrap_xedit_message_get_value(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "key", NULL };
-    const gchar *key;
-    PyObject *ret;
-    GValue value = { 0, };
-    
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:XeditMessage.get_value", kwlist, &key))
-        return NULL;
-
-    xedit_message_get_value(XEDIT_MESSAGE(self->obj), key, &value);
-    ret = pyg_value_as_pyobject(&value, TRUE);
-    g_value_unset(&value);
-    
-    return ret;
-}
-%%
-override xedit_message_set_value kwargs
-static PyObject *
-_wrap_xedit_message_set_value(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "key", "value", NULL };
-    PyObject *pykey, *pyvalue;
-    
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OO:XeditMessage.set_value", kwlist, &pykey, &pyvalue))
-        return NULL;
-    
-    if (!_helper_wrap_message_set_value(XEDIT_MESSAGE(self->obj), pykey, pyvalue))
-        return NULL;
-    
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-%%
-override xedit_message_set kwargs
-static PyObject *
-_wrap_xedit_message_set (PyGObject *self, PyObject *args, PyObject *kwargs) {
-    _helper_message_set_values(XEDIT_MESSAGE(self->obj), args, kwargs);
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-%%
-override xedit_message_bus_new
-static int
-_wrap_xedit_message_bus_new(PyGObject *self)
-{
-    pygobject_construct (self, NULL);
-    
-    if (!self->obj) {
-        PyErr_SetString (PyExc_RuntimeError, "could not create xedit.MessageBus object");
-        return -1;
-    }
-
-    return 0;
-}
-%%
-new-constructor XEDIT_TYPE_MESSAGE_BUS
-%%
-override xedit_message_bus_register kwargs
-static PyObject *
-_wrap_xedit_message_bus_register(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    PyObject *pypath, *pymethod, *optional = NULL, *pydict;
-    XeditMessageBus *bus = XEDIT_MESSAGE_BUS(self->obj);
-
-    if (!PyArg_ParseTuple(args, "OO|OO:XeditMessageBus.register", &pypath, &pymethod, &optional, &pydict))
-        return NULL;
-    
-    gchar *object_path = _helper_wrap_get_string(pypath);
-    gchar *method = _helper_wrap_get_string(pymethod);
-    
-    XeditMessageType *message_type = xedit_message_bus_register(bus, object_path, method, 0, NULL);
-    
-    g_free(object_path);
-    g_free(method);
-    
-    if (!message_type)
-    {
-    	PyErr_SetString(PyExc_StandardError, "Message type already exists");
-    	return NULL;
-    }
-    
-    MessageTypeSetInfo info = {message_type, optional && PySequence_Check(optional) ? optional : NULL};
-    _helper_parse_pairs (args, kwargs, (ParsePairFunc)_message_type_set, &info);
-    
-    return pyg_boxed_new(XEDIT_TYPE_MESSAGE_TYPE, message_type, TRUE, TRUE);
-}
-%%
-override xedit_message_bus_connect kwargs
-static void
-pyxedit_message_bus_connect_cb(XeditMessageBus *bus, XeditMessage *message, gpointer data)
-{
-    PyGILState_STATE state;
-    PyXeditCustomNotify *cunote = data;
-    PyObject *pybus, *pymessage, *retobj;
-
-    g_assert(cunote->func);
-
-    state = pyg_gil_state_ensure();
-
-    pybus = pygobject_new((GObject *)bus);
-    pymessage = pygobject_new((GObject *)message);
-
-    if (cunote->data) {
-        retobj = PyEval_CallFunction(cunote->func, "(NNO)", pybus, pymessage, cunote->data);
-    } else {
-        retobj = PyEval_CallFunction(cunote->func, "(NN)", pybus, pymessage);
-    }
-
-    if (PyErr_Occurred()) {
-        PyErr_Print();
-    }
-
-    Py_XDECREF(retobj);
-
-    pyg_gil_state_release(state);
-}
-
-static PyObject *
-_wrap_xedit_message_bus_connect(PyGObject *self, PyObject *args, PyObject *kwargs) 
-{
-    static char *kwlist[] = { "domain", "name", "func", "data", NULL };
-    PyObject *pyfunc, *pyarg = NULL;
-    const gchar *domain;
-    const gchar *name;
-    PyXeditCustomNotify *cunote;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-				     "ssO|O:XeditMessageBus.connect",
-				     kwlist, &domain, &name, &pyfunc, &pyarg))
-        return NULL;
-
-    if (!PyCallable_Check(pyfunc)) {
-        PyErr_SetString(PyExc_TypeError, "func must be a callable object");
-        return NULL;
-    }
-    cunote = g_new(PyXeditCustomNotify, 1);
-    Py_INCREF(pyfunc);
-    cunote->func = pyfunc;
-    Py_XINCREF(pyarg);
-    cunote->data = pyarg;
-
-    guint id = xedit_message_bus_connect(XEDIT_MESSAGE_BUS(self->obj),
-                                         domain,
-                                         name,
-                                         pyxedit_message_bus_connect_cb,
-                                         (gpointer)cunote,
-                                         pyxedit_custom_destroy_notify);
-    return PyLong_FromUnsignedLong(id);
-}
-%%
-override xedit_message_bus_send kwargs
-static PyObject *
-_wrap_xedit_message_bus_send(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    /* create a new message object */
-    XeditMessage *message;
-    XeditMessageBus *bus = XEDIT_MESSAGE_BUS(self->obj);
-    message = _helper_wrap_create_message(bus, args, kwargs);
-    
-    if (!message)
-        return NULL;
-    
-    xedit_message_bus_send_message(bus, message);
-    g_object_unref (message);
-    
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-%%
-override xedit_message_bus_send_sync kwargs
-static PyObject *
-_wrap_xedit_message_bus_send_sync(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    /* create a new message object */
-    XeditMessage *message;
-    XeditMessageBus *bus = XEDIT_MESSAGE_BUS(self->obj);
-    
-    message = _helper_wrap_create_message(bus, args, kwargs);
-    
-    if (!message)
-        return NULL;
-    
-    xedit_message_bus_send_message_sync(bus, message);
-    return pygobject_new((GObject *)message);
-}
-%%
-override-slot XeditMessage.tp_getattro
-static PyObject *
-_wrap_xedit_message_tp_getattro(PyObject *self, PyObject *attrname)
-{
-	XeditMessage *message = XEDIT_MESSAGE(((PyGObject *)self)->obj);
-	XeditMessageType *type;
-
-	gchar *name = _helper_wrap_get_string (attrname);
-	gboolean exists;
-	gboolean intype;
-	PyObject *ret;
-	
-	if (name == NULL)
-	{
-		PyErr_SetString(PyExc_TypeError, "attr name somehow not a string");
-		return NULL;
-	}
-	
-	g_object_get (message, "type", &type, NULL);
-	intype = xedit_message_type_lookup (type, name) != G_TYPE_INVALID;
-	xedit_message_type_unref (type);
-	
-	exists = xedit_message_has_key (message, name);
-	
-	if (!intype)
-	{
-		ret = PyObject_GenericGetAttr(self, attrname);
-	}
-	else if (exists)
-	{
-		GValue value = { 0, };
-		xedit_message_get_value (message, name, &value);
-		ret = pyg_value_as_pyobject(&value, TRUE);
-		g_value_unset (&value);
-	}
-	else
-	{
-		Py_INCREF(Py_None);
-		ret = Py_None;
-	}
-
-	g_free (name);
-	return ret;
-}
-%%
-override-slot XeditMessage.tp_setattro
-static int
-_wrap_xedit_message_tp_setattro(PyObject *self, PyObject *attrname, PyObject *value)
-{
-	XeditMessage *message = XEDIT_MESSAGE(((PyGObject *)self)->obj);
-
-	if (!_helper_wrap_message_set_value(message, attrname, value))
-	{
-		return PyObject_GenericSetAttr(self, attrname, value);
-	}
-	else
-	{
-		return 1;
-	}
-}
--- a/Show More
+++ b/Show More