The FreeBSD GNOME team proudly presents GNOME 3.28 for FreeBSD.

The offical GNOME 3.28 release notes can be found at
https://help.gnome.org/misc/release-notes/3.28/

Thanks to Antoine Brodin for running the exp-runs.

PR:		229761

11 files changed, 254 insertions, 419 deletions

diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index 1842d7da5937..7324a6867be4 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gedit-plugins
-PORTVERSION=	3.18.0
-PORTREVISION=	2
+PORTVERSION=	3.28.1
 CATEGORIES=	editors gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -11,6 +10,9 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Plugins for GEdit 3
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 BUILD_DEPENDS=	gedit>=0:editors/gedit \
 		valac:lang/vala \
 		itstool:textproc/itstool
@@ -21,14 +23,12 @@ RUN_DEPENDS=	gedit>=0:editors/gedit
 
 PORTSCOUT=	limitw:1,even
 
-USES=		compiler:c11 gettext gmake gnome libtool pathfix pkgconfig \
+USES=		compiler:c11 gettext gmake gnome libtool localbase pathfix pkgconfig \
 		python:3.4+ tar:xz
+USE_GNOME=	cairo gdkpixbuf2 gtk30 gtksourceview3 intlhack introspection
 USE_CSTD=	c11
-USE_GNOME=	gtk30 gtksourceview3 intlhack
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.gnome.gedit.plugins.drawspaces.gschema.xml \
@@ -41,7 +41,8 @@ RUN_DEPENDS+=	py3?-dbus>=0:devel/py-dbus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas@${PY_FLAVOR}
 USE_GNOME+=	vte3
 CONFIGURE_ARGS+=--enable-python
-GLIB_SCHEMAS+=	org.gnome.gedit.plugins.terminal.gschema.xml
+GLIB_SCHEMAS+=	org.gnome.gedit.plugins.terminal.gschema.xml \
+		org.gnome.gedit.plugins.translate.gschema.xml
 
 post-patch:
 	@${REINPLACE_CMD} -e 's| \\t\\r\\n\\f|[:space:]|g' \
diff --git a/editors/gedit-plugins/distinfo b/editors/gedit-plugins/distinfo
index 96d7dadb5c67..08393b6828df 100644
--- a/editors/gedit-plugins/distinfo
+++ b/editors/gedit-plugins/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gedit-plugins-3.18.0.tar.xz) = e25249c0c2a057827bb4d4755a2359e1f9b4de288e0c4e201c6ef4f0e0e8c580
-SIZE (gnome3/gedit-plugins-3.18.0.tar.xz) = 1366868
+TIMESTAMP = 1525511676
+SHA256 (gnome3/gedit-plugins-3.28.1.tar.xz) = 222dfd7065d399f7eda48dce011b42cc7185cd058f523be1bbd7143980e01468
+SIZE (gnome3/gedit-plugins-3.28.1.tar.xz) = 1350468
diff --git a/editors/gedit-plugins/files/patch-py-compile b/editors/gedit-plugins/files/patch-py-compile
deleted file mode 100644
index e59b69ff5e9c..000000000000
--- a/editors/gedit-plugins/files/patch-py-compile
+++ /dev/null
@@ -1,64 +0,0 @@
---- py-compile.orig	2015-09-21 19:37:16.000000000 +0200
-+++ py-compile	2015-09-24 20:14:14.663916000 +0200
-@@ -3,8 +3,7 @@
- 
- scriptversion=2011-06-08.12; # UTC
- 
--# Copyright (C) 2000, 2001, 2003, 2004, 2005, 2008, 2009, 2011 Free
--# Software Foundation, Inc.
-+# Copyright (C) 2000-2013 Free Software Foundation, Inc.
- 
- # 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
-@@ -37,7 +36,7 @@
- usage_error ()
- {
-   echo "$me: $*" >&2
--  echo "Try \`$me --help' for more information." >&2
-+  echo "Try '$me --help' for more information." >&2
-   exit 1
- }
- 
-@@ -117,7 +116,7 @@
- fi
- 
- $PYTHON -c "
--import sys, os, py_compile
-+import sys, os, py_compile, imp
- 
- files = '''$files'''
- 
-@@ -130,12 +129,19 @@
- 	    continue
-     sys.stdout.write(file)
-     sys.stdout.flush()
--    py_compile.compile(filepath, filepath + 'c', path)
-+    if hasattr(imp, 'get_tag'):
-+        py_compile.compile(filepath, imp.cache_from_source(filepath), path)
-+    else:
-+        py_compile.compile(filepath, filepath + 'c', path)
- sys.stdout.write('\n')" || exit $?
- 
- # this will fail for python < 1.5, but that doesn't matter ...
- $PYTHON -O -c "
--import sys, os, py_compile
-+import sys, os, py_compile, imp
-+
-+# pypy does not use .pyo optimization
-+if hasattr(sys, 'pypy_translation_info'):
-+    sys.exit(0)
- 
- files = '''$files'''
- sys.stdout.write('Byte-compiling python modules (optimized versions) ...\n')
-@@ -147,7 +153,10 @@
- 	    continue
-     sys.stdout.write(file)
-     sys.stdout.flush()
--    py_compile.compile(filepath, filepath + 'o', path)
-+    if hasattr(imp, 'get_tag'):
-+        py_compile.compile(filepath, imp.cache_from_source(filepath, False), path)
-+    else:
-+        py_compile.compile(filepath, filepath + 'o', path)
- sys.stdout.write('\n')" 2>/dev/null || :
- 
- # Local Variables:
diff --git a/editors/gedit-plugins/pkg-descr b/editors/gedit-plugins/pkg-descr
index 0ebb7cb3f367..7dc45808d94d 100644
--- a/editors/gedit-plugins/pkg-descr
+++ b/editors/gedit-plugins/pkg-descr
@@ -1 +1,3 @@
 Various additional plug-ins for GEdit 3.
+
+WWW: https://wiki.gnome.org/Apps/Gedit/PluginsLists
diff --git a/editors/gedit-plugins/pkg-plist b/editors/gedit-plugins/pkg-plist
index 7fe39e5c244e..dfe46de182da 100644
--- a/editors/gedit-plugins/pkg-plist
+++ b/editors/gedit-plugins/pkg-plist
@@ -1,26 +1,26 @@
-lib/gedit/plugins/__pycache__/bracketcompletion.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/__pycache__/bracketcompletion.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/__pycache__/codecomment.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/__pycache__/bracketcompletion.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/__pycache__/codecomment.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/__pycache__/colorpicker.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/__pycache__/codecomment.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/__pycache__/colorpicker.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/__pycache__/gpdefs.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/__pycache__/colorpicker.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/__pycache__/gpdefs.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/__pycache__/joinlines.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/__pycache__/gpdefs.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/__pycache__/joinlines.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/__pycache__/smartspaces.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/__pycache__/joinlines.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/__pycache__/smartspaces.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/__pycache__/terminal.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/__pycache__/smartspaces.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/__pycache__/terminal.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/__pycache__/terminal.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/bookmarks.plugin
 lib/gedit/plugins/bracketcompletion.plugin
 lib/gedit/plugins/bracketcompletion.py
 lib/gedit/plugins/charmap.plugin
 lib/gedit/plugins/charmap/__init__.py
-lib/gedit/plugins/charmap/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/charmap/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/charmap/__pycache__/panel.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/charmap/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/charmap/__pycache__/panel.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/charmap/__pycache__/panel.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/charmap/panel.py
 lib/gedit/plugins/codecomment.plugin
 lib/gedit/plugins/codecomment.py
@@ -28,52 +28,52 @@ lib/gedit/plugins/colorpicker.plugin
 lib/gedit/plugins/colorpicker.py
 lib/gedit/plugins/colorschemer.plugin
 lib/gedit/plugins/colorschemer/__init__.py
-lib/gedit/plugins/colorschemer/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/colorschemer/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/colorschemer/__pycache__/languages.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/colorschemer/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/colorschemer/__pycache__/languages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/colorschemer/__pycache__/schemer.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/colorschemer/__pycache__/languages.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/colorschemer/__pycache__/schemer.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/colorschemer/__pycache__/schemer.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/colorschemer/languages.py
 lib/gedit/plugins/colorschemer/schemer.py
 lib/gedit/plugins/commander.plugin
 lib/gedit/plugins/commander/__init__.py
-lib/gedit/plugins/commander/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/commander/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/commander/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/commander/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/commander/__pycache__/entry.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/commander/__pycache__/entry.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/commander/__pycache__/history.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/__pycache__/entry.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/commander/__pycache__/history.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/commander/__pycache__/info.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/__pycache__/history.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/commander/__pycache__/info.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/commander/__pycache__/modules.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/__pycache__/info.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/commander/__pycache__/modules.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/commander/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/__pycache__/modules.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/commander/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/commander/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/commander/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/commander/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/commander/appactivatable.py
 lib/gedit/plugins/commander/commands/__init__.py
-lib/gedit/plugins/commander/commands/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/commander/commands/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/commander/commands/__pycache__/accel_group.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/commands/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/commander/commands/__pycache__/accel_group.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/commander/commands/__pycache__/completion.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/commands/__pycache__/accel_group.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/commander/commands/__pycache__/completion.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/commander/commands/__pycache__/exceptions.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/commands/__pycache__/completion.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/commander/commands/__pycache__/exceptions.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/commander/commands/__pycache__/metamodule.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/commands/__pycache__/exceptions.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/commander/commands/__pycache__/metamodule.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/commander/commands/__pycache__/method.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/commands/__pycache__/metamodule.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/commander/commands/__pycache__/method.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/commander/commands/__pycache__/module.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/commands/__pycache__/method.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/commander/commands/__pycache__/module.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/commander/commands/__pycache__/result.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/commands/__pycache__/module.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/commander/commands/__pycache__/result.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/commander/commands/__pycache__/rollbackimporter.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/commander/commands/__pycache__/result.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/commander/commands/__pycache__/rollbackimporter.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/commander/commands/__pycache__/rollbackimporter.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/commander/commands/accel_group.py
 lib/gedit/plugins/commander/commands/completion.py
 lib/gedit/plugins/commander/commands/exceptions.py
@@ -90,32 +90,32 @@ lib/gedit/plugins/commander/utils.py
 lib/gedit/plugins/commander/windowactivatable.py
 lib/gedit/plugins/dashboard.plugin
 lib/gedit/plugins/dashboard/__init__.py
-lib/gedit/plugins/dashboard/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/dashboard/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/dashboard/__pycache__/dashboard.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/dashboard/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/dashboard/__pycache__/dashboard.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/dashboard/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/dashboard/__pycache__/dashboard.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/dashboard/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/dashboard/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/dashboard/dashboard.py
 lib/gedit/plugins/dashboard/utils.py
 lib/gedit/plugins/drawspaces.plugin
 lib/gedit/plugins/findinfiles.plugin
 lib/gedit/plugins/git.plugin
 lib/gedit/plugins/git/__init__.py
-lib/gedit/plugins/git/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/git/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/git/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/git/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/git/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/git/__pycache__/debug.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/git/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/git/__pycache__/debug.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/git/__pycache__/diffrenderer.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/git/__pycache__/debug.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/git/__pycache__/diffrenderer.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/git/__pycache__/viewactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/git/__pycache__/diffrenderer.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/git/__pycache__/viewactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/git/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/git/__pycache__/viewactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/git/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/git/__pycache__/workerthread.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/git/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/git/__pycache__/workerthread.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/git/__pycache__/workerthread.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/git/appactivatable.py
 lib/gedit/plugins/git/debug.py
 lib/gedit/plugins/git/diffrenderer.py
@@ -132,16 +132,16 @@ lib/gedit/plugins/libwordcompletion.so
 lib/gedit/plugins/libzeitgeist.so
 lib/gedit/plugins/multiedit.plugin
 lib/gedit/plugins/multiedit/__init__.py
-lib/gedit/plugins/multiedit/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/multiedit/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/multiedit/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/multiedit/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/multiedit/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/multiedit/__pycache__/signals.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/multiedit/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/multiedit/__pycache__/signals.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/multiedit/__pycache__/viewactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/multiedit/__pycache__/signals.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/multiedit/__pycache__/viewactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/multiedit/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/multiedit/__pycache__/viewactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/multiedit/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/multiedit/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/multiedit/appactivatable.py
 lib/gedit/plugins/multiedit/signals.py
 lib/gedit/plugins/multiedit/viewactivatable.py
@@ -150,26 +150,43 @@ lib/gedit/plugins/smartspaces.plugin
 lib/gedit/plugins/smartspaces.py
 lib/gedit/plugins/synctex.plugin
 lib/gedit/plugins/synctex/__init__.py
-lib/gedit/plugins/synctex/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/synctex/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/synctex/__pycache__/evince_dbus.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/synctex/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/synctex/__pycache__/evince_dbus.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/synctex/__pycache__/synctex.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/synctex/__pycache__/evince_dbus.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/synctex/__pycache__/synctex.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/synctex/__pycache__/synctex.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/synctex/evince_dbus.py
 lib/gedit/plugins/synctex/synctex.py
 lib/gedit/plugins/terminal.plugin
 lib/gedit/plugins/terminal.py
 lib/gedit/plugins/textsize.plugin
 lib/gedit/plugins/textsize/__init__.py
-lib/gedit/plugins/textsize/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/textsize/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/textsize/__pycache__/signals.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/textsize/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/textsize/__pycache__/signals.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/textsize/__pycache__/viewactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/textsize/__pycache__/signals.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/textsize/__pycache__/viewactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/textsize/__pycache__/viewactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/textsize/signals.py
 lib/gedit/plugins/textsize/viewactivatable.py
+lib/gedit/plugins/translate.plugin
+lib/gedit/plugins/translate/__init__.py
+lib/gedit/plugins/translate/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/translate/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/translate/__pycache__/preferences.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/translate/__pycache__/preferences.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/translate/__pycache__/settings.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/translate/__pycache__/settings.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/translate/__pycache__/translateview.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/translate/__pycache__/translateview.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/translate/preferences.py
+lib/gedit/plugins/translate/services/apertium.py
+lib/gedit/plugins/translate/services/service.py
+lib/gedit/plugins/translate/services/services.py
+lib/gedit/plugins/translate/services/yandex.py
+lib/gedit/plugins/translate/settings.py
+lib/gedit/plugins/translate/translateview.py
 lib/gedit/plugins/wordcompletion.plugin
 lib/gedit/plugins/zeitgeist.plugin
 share/appdata/gedit-bookmarks.metainfo.xml
@@ -189,44 +206,45 @@ share/appdata/gedit-smartspaces.metainfo.xml
 share/appdata/gedit-synctex.metainfo.xml
 share/appdata/gedit-terminal.metainfo.xml
 share/appdata/gedit-textsize.metainfo.xml
+share/appdata/gedit-translate.metainfo.xml
 share/appdata/gedit-wordcompletion.metainfo.xml
 share/appdata/gedit-zeitgeist.metainfo.xml
 share/gedit/plugins/colorschemer/ui/schemer.ui
-share/gedit/plugins/commander/modules/__pycache__/align.cpython-%%PYTHON_SUFFIX%%.pyc
 share/gedit/plugins/commander/modules/__pycache__/align.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-share/gedit/plugins/commander/modules/__pycache__/bookmark.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/__pycache__/align.cpython-%%PYTHON_SUFFIX%%.pyc
 share/gedit/plugins/commander/modules/__pycache__/bookmark.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-share/gedit/plugins/commander/modules/__pycache__/doc.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/__pycache__/bookmark.cpython-%%PYTHON_SUFFIX%%.pyc
 share/gedit/plugins/commander/modules/__pycache__/doc.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-share/gedit/plugins/commander/modules/__pycache__/edit.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/__pycache__/doc.cpython-%%PYTHON_SUFFIX%%.pyc
 share/gedit/plugins/commander/modules/__pycache__/edit.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-share/gedit/plugins/commander/modules/__pycache__/format.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/__pycache__/edit.cpython-%%PYTHON_SUFFIX%%.pyc
 share/gedit/plugins/commander/modules/__pycache__/format.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-share/gedit/plugins/commander/modules/__pycache__/goto.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/__pycache__/format.cpython-%%PYTHON_SUFFIX%%.pyc
 share/gedit/plugins/commander/modules/__pycache__/goto.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-share/gedit/plugins/commander/modules/__pycache__/grep.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/__pycache__/goto.cpython-%%PYTHON_SUFFIX%%.pyc
 share/gedit/plugins/commander/modules/__pycache__/grep.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-share/gedit/plugins/commander/modules/__pycache__/help.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/__pycache__/grep.cpython-%%PYTHON_SUFFIX%%.pyc
 share/gedit/plugins/commander/modules/__pycache__/help.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-share/gedit/plugins/commander/modules/__pycache__/move.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/__pycache__/help.cpython-%%PYTHON_SUFFIX%%.pyc
 share/gedit/plugins/commander/modules/__pycache__/move.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-share/gedit/plugins/commander/modules/__pycache__/reload.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/__pycache__/move.cpython-%%PYTHON_SUFFIX%%.pyc
 share/gedit/plugins/commander/modules/__pycache__/reload.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-share/gedit/plugins/commander/modules/__pycache__/set.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/__pycache__/reload.cpython-%%PYTHON_SUFFIX%%.pyc
 share/gedit/plugins/commander/modules/__pycache__/set.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-share/gedit/plugins/commander/modules/__pycache__/shell.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/__pycache__/set.cpython-%%PYTHON_SUFFIX%%.pyc
 share/gedit/plugins/commander/modules/__pycache__/shell.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+share/gedit/plugins/commander/modules/__pycache__/shell.cpython-%%PYTHON_SUFFIX%%.pyc
 share/gedit/plugins/commander/modules/align.py
 share/gedit/plugins/commander/modules/bookmark.py
 share/gedit/plugins/commander/modules/doc.py
 share/gedit/plugins/commander/modules/edit.py
 share/gedit/plugins/commander/modules/find/__init__.py
-share/gedit/plugins/commander/modules/find/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 share/gedit/plugins/commander/modules/find/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-share/gedit/plugins/commander/modules/find/__pycache__/finder.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/find/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 share/gedit/plugins/commander/modules/find/__pycache__/finder.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-share/gedit/plugins/commander/modules/find/__pycache__/regex.cpython-%%PYTHON_SUFFIX%%.pyc
+share/gedit/plugins/commander/modules/find/__pycache__/finder.cpython-%%PYTHON_SUFFIX%%.pyc
 share/gedit/plugins/commander/modules/find/__pycache__/regex.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+share/gedit/plugins/commander/modules/find/__pycache__/regex.cpython-%%PYTHON_SUFFIX%%.pyc
 share/gedit/plugins/commander/modules/find/finder.py
 share/gedit/plugins/commander/modules/find/regex.py
 share/gedit/plugins/commander/modules/format.py
@@ -237,10 +255,10 @@ share/gedit/plugins/commander/modules/move.py
 share/gedit/plugins/commander/modules/reload.py
 share/gedit/plugins/commander/modules/set.py
 share/gedit/plugins/commander/modules/shell.py
+share/gedit/plugins/translate/ui/preferences.ui
 share/help/C/gedit/bookmarks.page
 share/help/C/gedit/bracket-comp.page
 share/help/C/gedit/character-map.page
-share/help/C/gedit/code-assistance.page
 share/help/C/gedit/code-comment.page
 share/help/C/gedit/color-picker.page
 share/help/C/gedit/commander.page
@@ -250,15 +268,14 @@ share/help/C/gedit/git.page
 share/help/C/gedit/join-split-lines.page
 share/help/C/gedit/legal-plugins.xml
 share/help/C/gedit/multi-edit.page
-share/help/C/gedit/session-saver.page
 share/help/C/gedit/terminal.page
 share/help/C/gedit/text-size.page
+share/help/C/gedit/translate.page
 share/help/C/gedit/word-completion.page
 share/help/C/gedit/zeitgeist-dataprovider.page
 share/help/ar/gedit/bookmarks.page
 share/help/ar/gedit/bracket-comp.page
 share/help/ar/gedit/character-map.page
-share/help/ar/gedit/code-assistance.page
 share/help/ar/gedit/code-comment.page
 share/help/ar/gedit/color-picker.page
 share/help/ar/gedit/commander.page
@@ -268,15 +285,14 @@ share/help/ar/gedit/git.page
 share/help/ar/gedit/join-split-lines.page
 share/help/ar/gedit/legal-plugins.xml
 share/help/ar/gedit/multi-edit.page
-share/help/ar/gedit/session-saver.page
 share/help/ar/gedit/terminal.page
 share/help/ar/gedit/text-size.page
+share/help/ar/gedit/translate.page
 share/help/ar/gedit/word-completion.page
 share/help/ar/gedit/zeitgeist-dataprovider.page
 share/help/bg/gedit/bookmarks.page
 share/help/bg/gedit/bracket-comp.page
 share/help/bg/gedit/character-map.page
-share/help/bg/gedit/code-assistance.page
 share/help/bg/gedit/code-comment.page
 share/help/bg/gedit/color-picker.page
 share/help/bg/gedit/commander.page
@@ -286,15 +302,14 @@ share/help/bg/gedit/git.page
 share/help/bg/gedit/join-split-lines.page
 share/help/bg/gedit/legal-plugins.xml
 share/help/bg/gedit/multi-edit.page
-share/help/bg/gedit/session-saver.page
 share/help/bg/gedit/terminal.page
 share/help/bg/gedit/text-size.page
+share/help/bg/gedit/translate.page
 share/help/bg/gedit/word-completion.page
 share/help/bg/gedit/zeitgeist-dataprovider.page
 share/help/ca/gedit/bookmarks.page
 share/help/ca/gedit/bracket-comp.page
 share/help/ca/gedit/character-map.page
-share/help/ca/gedit/code-assistance.page
 share/help/ca/gedit/code-comment.page
 share/help/ca/gedit/color-picker.page
 share/help/ca/gedit/commander.page
@@ -304,15 +319,14 @@ share/help/ca/gedit/git.page
 share/help/ca/gedit/join-split-lines.page
 share/help/ca/gedit/legal-plugins.xml
 share/help/ca/gedit/multi-edit.page
-share/help/ca/gedit/session-saver.page
 share/help/ca/gedit/terminal.page
 share/help/ca/gedit/text-size.page
+share/help/ca/gedit/translate.page
 share/help/ca/gedit/word-completion.page
 share/help/ca/gedit/zeitgeist-dataprovider.page
 share/help/cs/gedit/bookmarks.page
 share/help/cs/gedit/bracket-comp.page
 share/help/cs/gedit/character-map.page
-share/help/cs/gedit/code-assistance.page
 share/help/cs/gedit/code-comment.page
 share/help/cs/gedit/color-picker.page
 share/help/cs/gedit/commander.page
@@ -322,15 +336,14 @@ share/help/cs/gedit/git.page
 share/help/cs/gedit/join-split-lines.page
 share/help/cs/gedit/legal-plugins.xml
 share/help/cs/gedit/multi-edit.page
-share/help/cs/gedit/session-saver.page
 share/help/cs/gedit/terminal.page
 share/help/cs/gedit/text-size.page
+share/help/cs/gedit/translate.page
 share/help/cs/gedit/word-completion.page
 share/help/cs/gedit/zeitgeist-dataprovider.page
 share/help/da/gedit/bookmarks.page
 share/help/da/gedit/bracket-comp.page
 share/help/da/gedit/character-map.page
-share/help/da/gedit/code-assistance.page
 share/help/da/gedit/code-comment.page
 share/help/da/gedit/color-picker.page
 share/help/da/gedit/commander.page
@@ -340,15 +353,14 @@ share/help/da/gedit/git.page
 share/help/da/gedit/join-split-lines.page
 share/help/da/gedit/legal-plugins.xml
 share/help/da/gedit/multi-edit.page
-share/help/da/gedit/session-saver.page
 share/help/da/gedit/terminal.page
 share/help/da/gedit/text-size.page
+share/help/da/gedit/translate.page
 share/help/da/gedit/word-completion.page
 share/help/da/gedit/zeitgeist-dataprovider.page
 share/help/de/gedit/bookmarks.page
 share/help/de/gedit/bracket-comp.page
 share/help/de/gedit/character-map.page
-share/help/de/gedit/code-assistance.page
 share/help/de/gedit/code-comment.page
 share/help/de/gedit/color-picker.page
 share/help/de/gedit/commander.page
@@ -358,15 +370,14 @@ share/help/de/gedit/git.page
 share/help/de/gedit/join-split-lines.page
 share/help/de/gedit/legal-plugins.xml
 share/help/de/gedit/multi-edit.page
-share/help/de/gedit/session-saver.page
 share/help/de/gedit/terminal.page
 share/help/de/gedit/text-size.page
+share/help/de/gedit/translate.page
 share/help/de/gedit/word-completion.page
 share/help/de/gedit/zeitgeist-dataprovider.page
 share/help/el/gedit/bookmarks.page
 share/help/el/gedit/bracket-comp.page
 share/help/el/gedit/character-map.page
-share/help/el/gedit/code-assistance.page
 share/help/el/gedit/code-comment.page
 share/help/el/gedit/color-picker.page
 share/help/el/gedit/commander.page
@@ -376,15 +387,14 @@ share/help/el/gedit/git.page
 share/help/el/gedit/join-split-lines.page
 share/help/el/gedit/legal-plugins.xml
 share/help/el/gedit/multi-edit.page
-share/help/el/gedit/session-saver.page
 share/help/el/gedit/terminal.page
 share/help/el/gedit/text-size.page
+share/help/el/gedit/translate.page
 share/help/el/gedit/word-completion.page
 share/help/el/gedit/zeitgeist-dataprovider.page
 share/help/es/gedit/bookmarks.page
 share/help/es/gedit/bracket-comp.page
 share/help/es/gedit/character-map.page
-share/help/es/gedit/code-assistance.page
 share/help/es/gedit/code-comment.page
 share/help/es/gedit/color-picker.page
 share/help/es/gedit/commander.page
@@ -394,15 +404,14 @@ share/help/es/gedit/git.page
 share/help/es/gedit/join-split-lines.page
 share/help/es/gedit/legal-plugins.xml
 share/help/es/gedit/multi-edit.page
-share/help/es/gedit/session-saver.page
 share/help/es/gedit/terminal.page
 share/help/es/gedit/text-size.page
+share/help/es/gedit/translate.page
 share/help/es/gedit/word-completion.page
 share/help/es/gedit/zeitgeist-dataprovider.page
 share/help/eu/gedit/bookmarks.page
 share/help/eu/gedit/bracket-comp.page
 share/help/eu/gedit/character-map.page
-share/help/eu/gedit/code-assistance.page
 share/help/eu/gedit/code-comment.page
 share/help/eu/gedit/color-picker.page
 share/help/eu/gedit/commander.page
@@ -412,15 +421,14 @@ share/help/eu/gedit/git.page
 share/help/eu/gedit/join-split-lines.page
 share/help/eu/gedit/legal-plugins.xml
 share/help/eu/gedit/multi-edit.page
-share/help/eu/gedit/session-saver.page
 share/help/eu/gedit/terminal.page
 share/help/eu/gedit/text-size.page
+share/help/eu/gedit/translate.page
 share/help/eu/gedit/word-completion.page
 share/help/eu/gedit/zeitgeist-dataprovider.page
 share/help/fi/gedit/bookmarks.page
 share/help/fi/gedit/bracket-comp.page
 share/help/fi/gedit/character-map.page
-share/help/fi/gedit/code-assistance.page
 share/help/fi/gedit/code-comment.page
 share/help/fi/gedit/color-picker.page
 share/help/fi/gedit/commander.page
@@ -430,15 +438,14 @@ share/help/fi/gedit/git.page
 share/help/fi/gedit/join-split-lines.page
 share/help/fi/gedit/legal-plugins.xml
 share/help/fi/gedit/multi-edit.page
-share/help/fi/gedit/session-saver.page
 share/help/fi/gedit/terminal.page
 share/help/fi/gedit/text-size.page
+share/help/fi/gedit/translate.page
 share/help/fi/gedit/word-completion.page
 share/help/fi/gedit/zeitgeist-dataprovider.page
 share/help/fr/gedit/bookmarks.page
 share/help/fr/gedit/bracket-comp.page
 share/help/fr/gedit/character-map.page
-share/help/fr/gedit/code-assistance.page
 share/help/fr/gedit/code-comment.page
 share/help/fr/gedit/color-picker.page
 share/help/fr/gedit/commander.page
@@ -448,15 +455,14 @@ share/help/fr/gedit/git.page
 share/help/fr/gedit/join-split-lines.page
 share/help/fr/gedit/legal-plugins.xml
 share/help/fr/gedit/multi-edit.page
-share/help/fr/gedit/session-saver.page
 share/help/fr/gedit/terminal.page
 share/help/fr/gedit/text-size.page
+share/help/fr/gedit/translate.page
 share/help/fr/gedit/word-completion.page
 share/help/fr/gedit/zeitgeist-dataprovider.page
 share/help/gl/gedit/bookmarks.page
 share/help/gl/gedit/bracket-comp.page
 share/help/gl/gedit/character-map.page
-share/help/gl/gedit/code-assistance.page
 share/help/gl/gedit/code-comment.page
 share/help/gl/gedit/color-picker.page
 share/help/gl/gedit/commander.page
@@ -466,15 +472,14 @@ share/help/gl/gedit/git.page
 share/help/gl/gedit/join-split-lines.page
 share/help/gl/gedit/legal-plugins.xml
 share/help/gl/gedit/multi-edit.page
-share/help/gl/gedit/session-saver.page
 share/help/gl/gedit/terminal.page
 share/help/gl/gedit/text-size.page
+share/help/gl/gedit/translate.page
 share/help/gl/gedit/word-completion.page
 share/help/gl/gedit/zeitgeist-dataprovider.page
 share/help/hu/gedit/bookmarks.page
 share/help/hu/gedit/bracket-comp.page
 share/help/hu/gedit/character-map.page
-share/help/hu/gedit/code-assistance.page
 share/help/hu/gedit/code-comment.page
 share/help/hu/gedit/color-picker.page
 share/help/hu/gedit/commander.page
@@ -484,15 +489,14 @@ share/help/hu/gedit/git.page
 share/help/hu/gedit/join-split-lines.page
 share/help/hu/gedit/legal-plugins.xml
 share/help/hu/gedit/multi-edit.page
-share/help/hu/gedit/session-saver.page
 share/help/hu/gedit/terminal.page
 share/help/hu/gedit/text-size.page
+share/help/hu/gedit/translate.page
 share/help/hu/gedit/word-completion.page
 share/help/hu/gedit/zeitgeist-dataprovider.page
 share/help/it/gedit/bookmarks.page
 share/help/it/gedit/bracket-comp.page
 share/help/it/gedit/character-map.page
-share/help/it/gedit/code-assistance.page
 share/help/it/gedit/code-comment.page
 share/help/it/gedit/color-picker.page
 share/help/it/gedit/commander.page
@@ -502,15 +506,14 @@ share/help/it/gedit/git.page
 share/help/it/gedit/join-split-lines.page
 share/help/it/gedit/legal-plugins.xml
 share/help/it/gedit/multi-edit.page
-share/help/it/gedit/session-saver.page
 share/help/it/gedit/terminal.page
 share/help/it/gedit/text-size.page
+share/help/it/gedit/translate.page
 share/help/it/gedit/word-completion.page
 share/help/it/gedit/zeitgeist-dataprovider.page
 share/help/ja/gedit/bookmarks.page
 share/help/ja/gedit/bracket-comp.page
 share/help/ja/gedit/character-map.page
-share/help/ja/gedit/code-assistance.page
 share/help/ja/gedit/code-comment.page
 share/help/ja/gedit/color-picker.page
 share/help/ja/gedit/commander.page
@@ -520,15 +523,14 @@ share/help/ja/gedit/git.page
 share/help/ja/gedit/join-split-lines.page
 share/help/ja/gedit/legal-plugins.xml
 share/help/ja/gedit/multi-edit.page
-share/help/ja/gedit/session-saver.page
 share/help/ja/gedit/terminal.page
 share/help/ja/gedit/text-size.page
+share/help/ja/gedit/translate.page
 share/help/ja/gedit/word-completion.page
 share/help/ja/gedit/zeitgeist-dataprovider.page
 share/help/ko/gedit/bookmarks.page
 share/help/ko/gedit/bracket-comp.page
 share/help/ko/gedit/character-map.page
-share/help/ko/gedit/code-assistance.page
 share/help/ko/gedit/code-comment.page
 share/help/ko/gedit/color-picker.page
 share/help/ko/gedit/commander.page
@@ -538,15 +540,14 @@ share/help/ko/gedit/git.page
 share/help/ko/gedit/join-split-lines.page
 share/help/ko/gedit/legal-plugins.xml
 share/help/ko/gedit/multi-edit.page
-share/help/ko/gedit/session-saver.page
 share/help/ko/gedit/terminal.page
 share/help/ko/gedit/text-size.page
+share/help/ko/gedit/translate.page
 share/help/ko/gedit/word-completion.page
 share/help/ko/gedit/zeitgeist-dataprovider.page
 share/help/lv/gedit/bookmarks.page
 share/help/lv/gedit/bracket-comp.page
 share/help/lv/gedit/character-map.page
-share/help/lv/gedit/code-assistance.page
 share/help/lv/gedit/code-comment.page
 share/help/lv/gedit/color-picker.page
 share/help/lv/gedit/commander.page
@@ -556,15 +557,14 @@ share/help/lv/gedit/git.page
 share/help/lv/gedit/join-split-lines.page
 share/help/lv/gedit/legal-plugins.xml
 share/help/lv/gedit/multi-edit.page
-share/help/lv/gedit/session-saver.page
 share/help/lv/gedit/terminal.page
 share/help/lv/gedit/text-size.page
+share/help/lv/gedit/translate.page
 share/help/lv/gedit/word-completion.page
 share/help/lv/gedit/zeitgeist-dataprovider.page
 share/help/oc/gedit/bookmarks.page
 share/help/oc/gedit/bracket-comp.page
 share/help/oc/gedit/character-map.page
-share/help/oc/gedit/code-assistance.page
 share/help/oc/gedit/code-comment.page
 share/help/oc/gedit/color-picker.page
 share/help/oc/gedit/commander.page
@@ -574,15 +574,31 @@ share/help/oc/gedit/git.page
 share/help/oc/gedit/join-split-lines.page
 share/help/oc/gedit/legal-plugins.xml
 share/help/oc/gedit/multi-edit.page
-share/help/oc/gedit/session-saver.page
 share/help/oc/gedit/terminal.page
 share/help/oc/gedit/text-size.page
+share/help/oc/gedit/translate.page
 share/help/oc/gedit/word-completion.page
 share/help/oc/gedit/zeitgeist-dataprovider.page
+share/help/pl/gedit/bookmarks.page
+share/help/pl/gedit/bracket-comp.page
+share/help/pl/gedit/character-map.page
+share/help/pl/gedit/code-comment.page
+share/help/pl/gedit/color-picker.page
+share/help/pl/gedit/commander.page
+share/help/pl/gedit/dashboard.page
+share/help/pl/gedit/draw-spaces.page
+share/help/pl/gedit/git.page
+share/help/pl/gedit/join-split-lines.page
+share/help/pl/gedit/legal-plugins.xml
+share/help/pl/gedit/multi-edit.page
+share/help/pl/gedit/terminal.page
+share/help/pl/gedit/text-size.page
+share/help/pl/gedit/translate.page
+share/help/pl/gedit/word-completion.page
+share/help/pl/gedit/zeitgeist-dataprovider.page
 share/help/pt_BR/gedit/bookmarks.page
 share/help/pt_BR/gedit/bracket-comp.page
 share/help/pt_BR/gedit/character-map.page
-share/help/pt_BR/gedit/code-assistance.page
 share/help/pt_BR/gedit/code-comment.page
 share/help/pt_BR/gedit/color-picker.page
 share/help/pt_BR/gedit/commander.page
@@ -592,15 +608,14 @@ share/help/pt_BR/gedit/git.page
 share/help/pt_BR/gedit/join-split-lines.page
 share/help/pt_BR/gedit/legal-plugins.xml
 share/help/pt_BR/gedit/multi-edit.page
-share/help/pt_BR/gedit/session-saver.page
 share/help/pt_BR/gedit/terminal.page
 share/help/pt_BR/gedit/text-size.page
+share/help/pt_BR/gedit/translate.page
 share/help/pt_BR/gedit/word-completion.page
 share/help/pt_BR/gedit/zeitgeist-dataprovider.page
 share/help/ru/gedit/bookmarks.page
 share/help/ru/gedit/bracket-comp.page
 share/help/ru/gedit/character-map.page
-share/help/ru/gedit/code-assistance.page
 share/help/ru/gedit/code-comment.page
 share/help/ru/gedit/color-picker.page
 share/help/ru/gedit/commander.page
@@ -610,15 +625,14 @@ share/help/ru/gedit/git.page
 share/help/ru/gedit/join-split-lines.page
 share/help/ru/gedit/legal-plugins.xml
 share/help/ru/gedit/multi-edit.page
-share/help/ru/gedit/session-saver.page
 share/help/ru/gedit/terminal.page
 share/help/ru/gedit/text-size.page
+share/help/ru/gedit/translate.page
 share/help/ru/gedit/word-completion.page
 share/help/ru/gedit/zeitgeist-dataprovider.page
 share/help/sl/gedit/bookmarks.page
 share/help/sl/gedit/bracket-comp.page
 share/help/sl/gedit/character-map.page
-share/help/sl/gedit/code-assistance.page
 share/help/sl/gedit/code-comment.page
 share/help/sl/gedit/color-picker.page
 share/help/sl/gedit/commander.page
@@ -628,15 +642,14 @@ share/help/sl/gedit/git.page
 share/help/sl/gedit/join-split-lines.page
 share/help/sl/gedit/legal-plugins.xml
 share/help/sl/gedit/multi-edit.page
-share/help/sl/gedit/session-saver.page
 share/help/sl/gedit/terminal.page
 share/help/sl/gedit/text-size.page
+share/help/sl/gedit/translate.page
 share/help/sl/gedit/word-completion.page
 share/help/sl/gedit/zeitgeist-dataprovider.page
 share/help/sv/gedit/bookmarks.page
 share/help/sv/gedit/bracket-comp.page
 share/help/sv/gedit/character-map.page
-share/help/sv/gedit/code-assistance.page
 share/help/sv/gedit/code-comment.page
 share/help/sv/gedit/color-picker.page
 share/help/sv/gedit/commander.page
@@ -646,15 +659,14 @@ share/help/sv/gedit/git.page
 share/help/sv/gedit/join-split-lines.page
 share/help/sv/gedit/legal-plugins.xml
 share/help/sv/gedit/multi-edit.page
-share/help/sv/gedit/session-saver.page
 share/help/sv/gedit/terminal.page
 share/help/sv/gedit/text-size.page
+share/help/sv/gedit/translate.page
 share/help/sv/gedit/word-completion.page
 share/help/sv/gedit/zeitgeist-dataprovider.page
 share/help/te/gedit/bookmarks.page
 share/help/te/gedit/bracket-comp.page
 share/help/te/gedit/character-map.page
-share/help/te/gedit/code-assistance.page
 share/help/te/gedit/code-comment.page
 share/help/te/gedit/color-picker.page
 share/help/te/gedit/commander.page
@@ -664,15 +676,14 @@ share/help/te/gedit/git.page
 share/help/te/gedit/join-split-lines.page
 share/help/te/gedit/legal-plugins.xml
 share/help/te/gedit/multi-edit.page
-share/help/te/gedit/session-saver.page
 share/help/te/gedit/terminal.page
 share/help/te/gedit/text-size.page
+share/help/te/gedit/translate.page
 share/help/te/gedit/word-completion.page
 share/help/te/gedit/zeitgeist-dataprovider.page
 share/help/th/gedit/bookmarks.page
 share/help/th/gedit/bracket-comp.page
 share/help/th/gedit/character-map.page
-share/help/th/gedit/code-assistance.page
 share/help/th/gedit/code-comment.page
 share/help/th/gedit/color-picker.page
 share/help/th/gedit/commander.page
@@ -682,15 +693,14 @@ share/help/th/gedit/git.page
 share/help/th/gedit/join-split-lines.page
 share/help/th/gedit/legal-plugins.xml
 share/help/th/gedit/multi-edit.page
-share/help/th/gedit/session-saver.page
 share/help/th/gedit/terminal.page
 share/help/th/gedit/text-size.page
+share/help/th/gedit/translate.page
 share/help/th/gedit/word-completion.page
 share/help/th/gedit/zeitgeist-dataprovider.page
 share/help/uk/gedit/bookmarks.page
 share/help/uk/gedit/bracket-comp.page
 share/help/uk/gedit/character-map.page
-share/help/uk/gedit/code-assistance.page
 share/help/uk/gedit/code-comment.page
 share/help/uk/gedit/color-picker.page
 share/help/uk/gedit/commander.page
@@ -700,15 +710,14 @@ share/help/uk/gedit/git.page
 share/help/uk/gedit/join-split-lines.page
 share/help/uk/gedit/legal-plugins.xml
 share/help/uk/gedit/multi-edit.page
-share/help/uk/gedit/session-saver.page
 share/help/uk/gedit/terminal.page
 share/help/uk/gedit/text-size.page
+share/help/uk/gedit/translate.page
 share/help/uk/gedit/word-completion.page
 share/help/uk/gedit/zeitgeist-dataprovider.page
 share/help/zh_CN/gedit/bookmarks.page
 share/help/zh_CN/gedit/bracket-comp.page
 share/help/zh_CN/gedit/character-map.page
-share/help/zh_CN/gedit/code-assistance.page
 share/help/zh_CN/gedit/code-comment.page
 share/help/zh_CN/gedit/color-picker.page
 share/help/zh_CN/gedit/commander.page
@@ -718,15 +727,14 @@ share/help/zh_CN/gedit/git.page
 share/help/zh_CN/gedit/join-split-lines.page
 share/help/zh_CN/gedit/legal-plugins.xml
 share/help/zh_CN/gedit/multi-edit.page
-share/help/zh_CN/gedit/session-saver.page
 share/help/zh_CN/gedit/terminal.page
 share/help/zh_CN/gedit/text-size.page
+share/help/zh_CN/gedit/translate.page
 share/help/zh_CN/gedit/word-completion.page
 share/help/zh_CN/gedit/zeitgeist-dataprovider.page
 share/help/zh_HK/gedit/bookmarks.page
 share/help/zh_HK/gedit/bracket-comp.page
 share/help/zh_HK/gedit/character-map.page
-share/help/zh_HK/gedit/code-assistance.page
 share/help/zh_HK/gedit/code-comment.page
 share/help/zh_HK/gedit/color-picker.page
 share/help/zh_HK/gedit/commander.page
@@ -736,15 +744,14 @@ share/help/zh_HK/gedit/git.page
 share/help/zh_HK/gedit/join-split-lines.page
 share/help/zh_HK/gedit/legal-plugins.xml
 share/help/zh_HK/gedit/multi-edit.page
-share/help/zh_HK/gedit/session-saver.page
 share/help/zh_HK/gedit/terminal.page
 share/help/zh_HK/gedit/text-size.page
+share/help/zh_HK/gedit/translate.page
 share/help/zh_HK/gedit/word-completion.page
 share/help/zh_HK/gedit/zeitgeist-dataprovider.page
 share/help/zh_TW/gedit/bookmarks.page
 share/help/zh_TW/gedit/bracket-comp.page
 share/help/zh_TW/gedit/character-map.page
-share/help/zh_TW/gedit/code-assistance.page
 share/help/zh_TW/gedit/code-comment.page
 share/help/zh_TW/gedit/color-picker.page
 share/help/zh_TW/gedit/commander.page
@@ -754,9 +761,9 @@ share/help/zh_TW/gedit/git.page
 share/help/zh_TW/gedit/join-split-lines.page
 share/help/zh_TW/gedit/legal-plugins.xml
 share/help/zh_TW/gedit/multi-edit.page
-share/help/zh_TW/gedit/session-saver.page
 share/help/zh_TW/gedit/terminal.page
 share/help/zh_TW/gedit/text-size.page
+share/help/zh_TW/gedit/translate.page
 share/help/zh_TW/gedit/word-completion.page
 share/help/zh_TW/gedit/zeitgeist-dataprovider.page
 share/locale/af/LC_MESSAGES/gedit-plugins.mo
@@ -791,6 +798,7 @@ share/locale/eu/LC_MESSAGES/gedit-plugins.mo
 share/locale/fa/LC_MESSAGES/gedit-plugins.mo
 share/locale/fi/LC_MESSAGES/gedit-plugins.mo
 share/locale/fr/LC_MESSAGES/gedit-plugins.mo
+share/locale/fur/LC_MESSAGES/gedit-plugins.mo
 share/locale/ga/LC_MESSAGES/gedit-plugins.mo
 share/locale/gl/LC_MESSAGES/gedit-plugins.mo
 share/locale/gu/LC_MESSAGES/gedit-plugins.mo
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index eb5efb2e713c..c9286ba1ee3c 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	gedit
-PORTVERSION=	3.22.0
-PORTREVISION=	2
+PORTVERSION=	3.28.1
 CATEGORIES=	editors gnome
 MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome3
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Small but powerful text editor for GNOME 3 Desktop Environment
@@ -29,7 +28,7 @@ RUN_DEPENDS=	iso-codes>=0:misc/iso-codes \
 PORTSCOUT=	limitw:1,even
 
 USES=		compiler:c11 desktop-file-utils gettext gmake gnome libtool \
-		localbase pathfix pkgconfig python:3.2+ shebangfix tar:xz
+		localbase pathfix pkgconfig python:3.4+ shebangfix tar:xz
 USE_CSTD=	c11
 USE_GNOME=	cairo gdkpixbuf2 gtksourceview3 intlhack introspection \
 		libxml2 pygobject3
@@ -43,6 +42,7 @@ CPPFLAGS+=	-Wno-error=format-nonliteral
 CFLAGS+=	-Wno-error=format-nonliteral
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
+SHEBANG_FILES=	plugins/externaltools/data/send-to-fpaste.tool.in
 PLIST_SUB=	VERSION="3.14"
 INSTALL_TARGET=	install-strip
 
diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo
index 05aeb29a5f0d..5b9fcbf5e0bd 100644
--- a/editors/gedit/distinfo
+++ b/editors/gedit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476903361
-SHA256 (gnome3/gedit-3.22.0.tar.xz) = 063b5a0b5dcc8f540f6e8c3ea1c22cf8a3a19edffc25315a1b6bc51d462b3f45
-SIZE (gnome3/gedit-3.22.0.tar.xz) = 2957520
+TIMESTAMP = 1525511297
+SHA256 (gnome/gedit-3.28.1.tar.xz) = f174be0958ce63771fef9a81d06da6769358dab8705364a6abb5c7d10ec8211d
+SIZE (gnome/gedit-3.28.1.tar.xz) = 3149684
diff --git a/editors/gedit/pkg-descr b/editors/gedit/pkg-descr
index 8fa7597ad479..3f40c3455c3b 100644
--- a/editors/gedit/pkg-descr
+++ b/editors/gedit/pkg-descr
@@ -4,7 +4,7 @@ gEdit is a Gtk+ 3 text editor. Its features include:
 	* Global Search and Replace
 	* Dynamically loaded fonts
 	* Splitscreen Mode
-	* Printing support
+	* Printing support 
 	* Configurable Plugins system
 	* Unlimited Undo/Redo
 
diff --git a/editors/gedit/pkg-plist b/editors/gedit/pkg-plist
index 9ca3d9e31364..c09a17748a39 100644
--- a/editors/gedit/pkg-plist
+++ b/editors/gedit/pkg-plist
@@ -22,26 +22,26 @@ lib/gedit/libgedit.so
 lib/gedit/plugins/docinfo.plugin
 lib/gedit/plugins/externaltools.plugin
 lib/gedit/plugins/externaltools/__init__.py
-lib/gedit/plugins/externaltools/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/externaltools/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/externaltools/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/externaltools/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/externaltools/__pycache__/capture.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/externaltools/__pycache__/capture.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/externaltools/__pycache__/filelookup.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/capture.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/externaltools/__pycache__/filelookup.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/externaltools/__pycache__/functions.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/filelookup.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/externaltools/__pycache__/functions.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/externaltools/__pycache__/library.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/functions.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/externaltools/__pycache__/library.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/externaltools/__pycache__/linkparsing.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/library.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/externaltools/__pycache__/linkparsing.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/externaltools/__pycache__/manager.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/linkparsing.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/externaltools/__pycache__/manager.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/externaltools/__pycache__/outputpanel.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/manager.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/externaltools/__pycache__/outputpanel.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/externaltools/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/outputpanel.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/externaltools/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/externaltools/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/externaltools/appactivatable.py
 lib/gedit/plugins/externaltools/capture.py
 lib/gedit/plugins/externaltools/filelookup.py
@@ -61,62 +61,62 @@ lib/gedit/plugins/libtime.so
 lib/gedit/plugins/modelines.plugin
 lib/gedit/plugins/pythonconsole.plugin
 lib/gedit/plugins/pythonconsole/__init__.py
-lib/gedit/plugins/pythonconsole/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/pythonconsole/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/pythonconsole/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/pythonconsole/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/pythonconsole/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/pythonconsole/__pycache__/console.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/pythonconsole/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/pythonconsole/__pycache__/console.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/pythonconsole/__pycache__/console.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/pythonconsole/config.py
 lib/gedit/plugins/pythonconsole/console.py
 lib/gedit/plugins/quickopen.plugin
 lib/gedit/plugins/quickopen/__init__.py
-lib/gedit/plugins/quickopen/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/quickopen/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/quickopen/__pycache__/popup.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/quickopen/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/quickopen/__pycache__/popup.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/quickopen/__pycache__/virtualdirs.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/quickopen/__pycache__/popup.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/quickopen/__pycache__/virtualdirs.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/quickopen/__pycache__/virtualdirs.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/quickopen/popup.py
 lib/gedit/plugins/quickopen/virtualdirs.py
 lib/gedit/plugins/snippets.plugin
 lib/gedit/plugins/snippets/__init__.py
-lib/gedit/plugins/snippets/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/snippets/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/snippets/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/completion.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/snippets/__pycache__/completion.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/document.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/completion.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/snippets/__pycache__/document.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/exporter.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/document.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/snippets/__pycache__/exporter.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/helper.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/exporter.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/snippets/__pycache__/helper.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/importer.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/helper.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/snippets/__pycache__/importer.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/languagemanager.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/importer.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/snippets/__pycache__/languagemanager.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/library.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/languagemanager.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/snippets/__pycache__/library.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/manager.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/library.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/snippets/__pycache__/manager.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/parser.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/manager.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/snippets/__pycache__/parser.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/placeholder.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/parser.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/snippets/__pycache__/placeholder.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/shareddata.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/placeholder.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/snippets/__pycache__/shareddata.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/signals.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/shareddata.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/snippets/__pycache__/signals.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/singleton.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/signals.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/snippets/__pycache__/singleton.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/snippet.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/singleton.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/snippets/__pycache__/snippet.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/substitutionparser.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/snippet.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/snippets/__pycache__/substitutionparser.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
-lib/gedit/plugins/snippets/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
+lib/gedit/plugins/snippets/__pycache__/substitutionparser.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/snippets/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+lib/gedit/plugins/snippets/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gedit/plugins/snippets/appactivatable.py
 lib/gedit/plugins/snippets/completion.py
 lib/gedit/plugins/snippets/document.py
@@ -138,13 +138,12 @@ lib/gedit/plugins/sort.plugin
 lib/gedit/plugins/spell.plugin
 lib/gedit/plugins/time.plugin
 %%PYTHON_SITELIBDIR%%/gi/overrides/Gedit.py
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gedit.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gedit.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gedit.cpython-%%PYTHON_SUFFIX%%.pyc
 libdata/pkgconfig/gedit.pc
 libexec/gedit/gedit-bugreport.sh
 man/man1/gedit.1.gz
 share/GConf/gsettings/gedit.convert
-share/appdata/org.gnome.gedit.appdata.xml
 share/applications/org.gnome.gedit.desktop
 share/dbus-1/services/org.gnome.gedit.service
 %%DATADIR%%/gir-1.0/Gedit-3.0.gir
@@ -184,16 +183,17 @@ share/dbus-1/services/org.gnome.gedit.service
 %%DATADIR%%/plugins/snippets/ui/snippets.ui
 %%DATADIR%%/plugins/snippets/xml.xml
 %%DATADIR%%/plugins/snippets/xslt.xml
-share/gtk-doc/html/gedit/gedit-GeditApp.html
-share/gtk-doc/html/gedit/gedit-GeditAppActivatable.html
-share/gtk-doc/html/gedit/gedit-GeditDocument.html
-share/gtk-doc/html/gedit/gedit-GeditEncodingsComboBox.html
-share/gtk-doc/html/gedit/gedit-GeditMessage.html
-share/gtk-doc/html/gedit/gedit-GeditMessageBus.html
-share/gtk-doc/html/gedit/gedit-GeditProgressInfoBar.html
-share/gtk-doc/html/gedit/gedit-GeditStatusbar.html
-share/gtk-doc/html/gedit/gedit-GeditViewActivatable.html
-share/gtk-doc/html/gedit/gedit-GeditWindowActivatable.html
+share/gtk-doc/html/gedit/GeditApp.html
+share/gtk-doc/html/gedit/GeditAppActivatable.html
+share/gtk-doc/html/gedit/GeditDocument.html
+share/gtk-doc/html/gedit/GeditEncodingsComboBox.html
+share/gtk-doc/html/gedit/GeditMessage.html
+share/gtk-doc/html/gedit/GeditMessageBus.html
+share/gtk-doc/html/gedit/GeditProgressInfoBar.html
+share/gtk-doc/html/gedit/GeditStatusbar.html
+share/gtk-doc/html/gedit/GeditViewActivatable.html
+share/gtk-doc/html/gedit/GeditWindowActivatable.html
+share/gtk-doc/html/gedit/annotation-glossary.html
 share/gtk-doc/html/gedit/api-index-3-14.html
 share/gtk-doc/html/gedit/api-index-deprecated.html
 share/gtk-doc/html/gedit/api-index-full.html
@@ -218,11 +218,6 @@ share/gtk-doc/html/gedit/up-insensitive.png
 share/gtk-doc/html/gedit/up.png
 share/help/C/gedit/figures/gedit-html-snippet.png
 share/help/C/gedit/figures/gedit-icon.png
-share/help/C/gedit/figures/gedit-new-external-tool.png
-share/help/C/gedit/figures/gedit-open-location.png
-share/help/C/gedit/figures/gedit-side-pane1.png
-share/help/C/gedit/figures/gedit-side-pane2.png
-share/help/C/gedit/figures/gedit-side-pane3.png
 share/help/C/gedit/figures/gedit3-screenshot.png
 share/help/C/gedit/gedit-change-color-scheme.page
 share/help/C/gedit/gedit-change-default-font.page
@@ -265,11 +260,6 @@ share/help/C/gedit/index.page
 share/help/C/gedit/legal.xml
 share/help/ar/gedit/figures/gedit-html-snippet.png
 share/help/ar/gedit/figures/gedit-icon.png
-share/help/ar/gedit/figures/gedit-new-external-tool.png
-share/help/ar/gedit/figures/gedit-open-location.png
-share/help/ar/gedit/figures/gedit-side-pane1.png
-share/help/ar/gedit/figures/gedit-side-pane2.png
-share/help/ar/gedit/figures/gedit-side-pane3.png
 share/help/ar/gedit/figures/gedit3-screenshot.png
 share/help/ar/gedit/gedit-change-color-scheme.page
 share/help/ar/gedit/gedit-change-default-font.page
@@ -312,11 +302,6 @@ share/help/ar/gedit/index.page
 share/help/ar/gedit/legal.xml
 share/help/bg/gedit/figures/gedit-html-snippet.png
 share/help/bg/gedit/figures/gedit-icon.png
-share/help/bg/gedit/figures/gedit-new-external-tool.png
-share/help/bg/gedit/figures/gedit-open-location.png
-share/help/bg/gedit/figures/gedit-side-pane1.png
-share/help/bg/gedit/figures/gedit-side-pane2.png
-share/help/bg/gedit/figures/gedit-side-pane3.png
 share/help/bg/gedit/figures/gedit3-screenshot.png
 share/help/bg/gedit/gedit-change-color-scheme.page
 share/help/bg/gedit/gedit-change-default-font.page
@@ -359,11 +344,6 @@ share/help/bg/gedit/index.page
 share/help/bg/gedit/legal.xml
 share/help/ca/gedit/figures/gedit-html-snippet.png
 share/help/ca/gedit/figures/gedit-icon.png
-share/help/ca/gedit/figures/gedit-new-external-tool.png
-share/help/ca/gedit/figures/gedit-open-location.png
-share/help/ca/gedit/figures/gedit-side-pane1.png
-share/help/ca/gedit/figures/gedit-side-pane2.png
-share/help/ca/gedit/figures/gedit-side-pane3.png
 share/help/ca/gedit/figures/gedit3-screenshot.png
 share/help/ca/gedit/gedit-change-color-scheme.page
 share/help/ca/gedit/gedit-change-default-font.page
@@ -406,11 +386,6 @@ share/help/ca/gedit/index.page
 share/help/ca/gedit/legal.xml
 share/help/cs/gedit/figures/gedit-html-snippet.png
 share/help/cs/gedit/figures/gedit-icon.png
-share/help/cs/gedit/figures/gedit-new-external-tool.png
-share/help/cs/gedit/figures/gedit-open-location.png
-share/help/cs/gedit/figures/gedit-side-pane1.png
-share/help/cs/gedit/figures/gedit-side-pane2.png
-share/help/cs/gedit/figures/gedit-side-pane3.png
 share/help/cs/gedit/figures/gedit3-screenshot.png
 share/help/cs/gedit/gedit-change-color-scheme.page
 share/help/cs/gedit/gedit-change-default-font.page
@@ -453,11 +428,6 @@ share/help/cs/gedit/index.page
 share/help/cs/gedit/legal.xml
 share/help/da/gedit/figures/gedit-html-snippet.png
 share/help/da/gedit/figures/gedit-icon.png
-share/help/da/gedit/figures/gedit-new-external-tool.png
-share/help/da/gedit/figures/gedit-open-location.png
-share/help/da/gedit/figures/gedit-side-pane1.png
-share/help/da/gedit/figures/gedit-side-pane2.png
-share/help/da/gedit/figures/gedit-side-pane3.png
 share/help/da/gedit/figures/gedit3-screenshot.png
 share/help/da/gedit/gedit-change-color-scheme.page
 share/help/da/gedit/gedit-change-default-font.page
@@ -500,11 +470,6 @@ share/help/da/gedit/index.page
 share/help/da/gedit/legal.xml
 share/help/de/gedit/figures/gedit-html-snippet.png
 share/help/de/gedit/figures/gedit-icon.png
-share/help/de/gedit/figures/gedit-new-external-tool.png
-share/help/de/gedit/figures/gedit-open-location.png
-share/help/de/gedit/figures/gedit-side-pane1.png
-share/help/de/gedit/figures/gedit-side-pane2.png
-share/help/de/gedit/figures/gedit-side-pane3.png
 share/help/de/gedit/figures/gedit3-screenshot.png
 share/help/de/gedit/gedit-change-color-scheme.page
 share/help/de/gedit/gedit-change-default-font.page
@@ -547,11 +512,6 @@ share/help/de/gedit/index.page
 share/help/de/gedit/legal.xml
 share/help/el/gedit/figures/gedit-html-snippet.png
 share/help/el/gedit/figures/gedit-icon.png
-share/help/el/gedit/figures/gedit-new-external-tool.png
-share/help/el/gedit/figures/gedit-open-location.png
-share/help/el/gedit/figures/gedit-side-pane1.png
-share/help/el/gedit/figures/gedit-side-pane2.png
-share/help/el/gedit/figures/gedit-side-pane3.png
 share/help/el/gedit/figures/gedit3-screenshot.png
 share/help/el/gedit/gedit-change-color-scheme.page
 share/help/el/gedit/gedit-change-default-font.page
@@ -594,11 +554,6 @@ share/help/el/gedit/index.page
 share/help/el/gedit/legal.xml
 share/help/es/gedit/figures/gedit-html-snippet.png
 share/help/es/gedit/figures/gedit-icon.png
-share/help/es/gedit/figures/gedit-new-external-tool.png
-share/help/es/gedit/figures/gedit-open-location.png
-share/help/es/gedit/figures/gedit-side-pane1.png
-share/help/es/gedit/figures/gedit-side-pane2.png
-share/help/es/gedit/figures/gedit-side-pane3.png
 share/help/es/gedit/figures/gedit3-screenshot.png
 share/help/es/gedit/gedit-change-color-scheme.page
 share/help/es/gedit/gedit-change-default-font.page
@@ -641,11 +596,6 @@ share/help/es/gedit/index.page
 share/help/es/gedit/legal.xml
 share/help/eu/gedit/figures/gedit-html-snippet.png
 share/help/eu/gedit/figures/gedit-icon.png
-share/help/eu/gedit/figures/gedit-new-external-tool.png
-share/help/eu/gedit/figures/gedit-open-location.png
-share/help/eu/gedit/figures/gedit-side-pane1.png
-share/help/eu/gedit/figures/gedit-side-pane2.png
-share/help/eu/gedit/figures/gedit-side-pane3.png
 share/help/eu/gedit/figures/gedit3-screenshot.png
 share/help/eu/gedit/gedit-change-color-scheme.page
 share/help/eu/gedit/gedit-change-default-font.page
@@ -688,11 +638,6 @@ share/help/eu/gedit/index.page
 share/help/eu/gedit/legal.xml
 share/help/fi/gedit/figures/gedit-html-snippet.png
 share/help/fi/gedit/figures/gedit-icon.png
-share/help/fi/gedit/figures/gedit-new-external-tool.png
-share/help/fi/gedit/figures/gedit-open-location.png
-share/help/fi/gedit/figures/gedit-side-pane1.png
-share/help/fi/gedit/figures/gedit-side-pane2.png
-share/help/fi/gedit/figures/gedit-side-pane3.png
 share/help/fi/gedit/figures/gedit3-screenshot.png
 share/help/fi/gedit/gedit-change-color-scheme.page
 share/help/fi/gedit/gedit-change-default-font.page
@@ -735,11 +680,6 @@ share/help/fi/gedit/index.page
 share/help/fi/gedit/legal.xml
 share/help/fr/gedit/figures/gedit-html-snippet.png
 share/help/fr/gedit/figures/gedit-icon.png
-share/help/fr/gedit/figures/gedit-new-external-tool.png
-share/help/fr/gedit/figures/gedit-open-location.png
-share/help/fr/gedit/figures/gedit-side-pane1.png
-share/help/fr/gedit/figures/gedit-side-pane2.png
-share/help/fr/gedit/figures/gedit-side-pane3.png
 share/help/fr/gedit/figures/gedit3-screenshot.png
 share/help/fr/gedit/gedit-change-color-scheme.page
 share/help/fr/gedit/gedit-change-default-font.page
@@ -782,11 +722,6 @@ share/help/fr/gedit/index.page
 share/help/fr/gedit/legal.xml
 share/help/gl/gedit/figures/gedit-html-snippet.png
 share/help/gl/gedit/figures/gedit-icon.png
-share/help/gl/gedit/figures/gedit-new-external-tool.png
-share/help/gl/gedit/figures/gedit-open-location.png
-share/help/gl/gedit/figures/gedit-side-pane1.png
-share/help/gl/gedit/figures/gedit-side-pane2.png
-share/help/gl/gedit/figures/gedit-side-pane3.png
 share/help/gl/gedit/figures/gedit3-screenshot.png
 share/help/gl/gedit/gedit-change-color-scheme.page
 share/help/gl/gedit/gedit-change-default-font.page
@@ -829,11 +764,6 @@ share/help/gl/gedit/index.page
 share/help/gl/gedit/legal.xml
 share/help/hu/gedit/figures/gedit-html-snippet.png
 share/help/hu/gedit/figures/gedit-icon.png
-share/help/hu/gedit/figures/gedit-new-external-tool.png
-share/help/hu/gedit/figures/gedit-open-location.png
-share/help/hu/gedit/figures/gedit-side-pane1.png
-share/help/hu/gedit/figures/gedit-side-pane2.png
-share/help/hu/gedit/figures/gedit-side-pane3.png
 share/help/hu/gedit/figures/gedit3-screenshot.png
 share/help/hu/gedit/gedit-change-color-scheme.page
 share/help/hu/gedit/gedit-change-default-font.page
@@ -876,11 +806,6 @@ share/help/hu/gedit/index.page
 share/help/hu/gedit/legal.xml
 share/help/id/gedit/figures/gedit-html-snippet.png
 share/help/id/gedit/figures/gedit-icon.png
-share/help/id/gedit/figures/gedit-new-external-tool.png
-share/help/id/gedit/figures/gedit-open-location.png
-share/help/id/gedit/figures/gedit-side-pane1.png
-share/help/id/gedit/figures/gedit-side-pane2.png
-share/help/id/gedit/figures/gedit-side-pane3.png
 share/help/id/gedit/figures/gedit3-screenshot.png
 share/help/id/gedit/gedit-change-color-scheme.page
 share/help/id/gedit/gedit-change-default-font.page
@@ -923,11 +848,6 @@ share/help/id/gedit/index.page
 share/help/id/gedit/legal.xml
 share/help/it/gedit/figures/gedit-html-snippet.png
 share/help/it/gedit/figures/gedit-icon.png
-share/help/it/gedit/figures/gedit-new-external-tool.png
-share/help/it/gedit/figures/gedit-open-location.png
-share/help/it/gedit/figures/gedit-side-pane1.png
-share/help/it/gedit/figures/gedit-side-pane2.png
-share/help/it/gedit/figures/gedit-side-pane3.png
 share/help/it/gedit/figures/gedit3-screenshot.png
 share/help/it/gedit/gedit-change-color-scheme.page
 share/help/it/gedit/gedit-change-default-font.page
@@ -970,11 +890,6 @@ share/help/it/gedit/index.page
 share/help/it/gedit/legal.xml
 share/help/ja/gedit/figures/gedit-html-snippet.png
 share/help/ja/gedit/figures/gedit-icon.png
-share/help/ja/gedit/figures/gedit-new-external-tool.png
-share/help/ja/gedit/figures/gedit-open-location.png
-share/help/ja/gedit/figures/gedit-side-pane1.png
-share/help/ja/gedit/figures/gedit-side-pane2.png
-share/help/ja/gedit/figures/gedit-side-pane3.png
 share/help/ja/gedit/figures/gedit3-screenshot.png
 share/help/ja/gedit/gedit-change-color-scheme.page
 share/help/ja/gedit/gedit-change-default-font.page
@@ -1017,11 +932,6 @@ share/help/ja/gedit/index.page
 share/help/ja/gedit/legal.xml
 share/help/ko/gedit/figures/gedit-html-snippet.png
 share/help/ko/gedit/figures/gedit-icon.png
-share/help/ko/gedit/figures/gedit-new-external-tool.png
-share/help/ko/gedit/figures/gedit-open-location.png
-share/help/ko/gedit/figures/gedit-side-pane1.png
-share/help/ko/gedit/figures/gedit-side-pane2.png
-share/help/ko/gedit/figures/gedit-side-pane3.png
 share/help/ko/gedit/figures/gedit3-screenshot.png
 share/help/ko/gedit/gedit-change-color-scheme.page
 share/help/ko/gedit/gedit-change-default-font.page
@@ -1064,11 +974,6 @@ share/help/ko/gedit/index.page
 share/help/ko/gedit/legal.xml
 share/help/lv/gedit/figures/gedit-html-snippet.png
 share/help/lv/gedit/figures/gedit-icon.png
-share/help/lv/gedit/figures/gedit-new-external-tool.png
-share/help/lv/gedit/figures/gedit-open-location.png
-share/help/lv/gedit/figures/gedit-side-pane1.png
-share/help/lv/gedit/figures/gedit-side-pane2.png
-share/help/lv/gedit/figures/gedit-side-pane3.png
 share/help/lv/gedit/figures/gedit3-screenshot.png
 share/help/lv/gedit/gedit-change-color-scheme.page
 share/help/lv/gedit/gedit-change-default-font.page
@@ -1111,11 +1016,6 @@ share/help/lv/gedit/index.page
 share/help/lv/gedit/legal.xml
 share/help/oc/gedit/figures/gedit-html-snippet.png
 share/help/oc/gedit/figures/gedit-icon.png
-share/help/oc/gedit/figures/gedit-new-external-tool.png
-share/help/oc/gedit/figures/gedit-open-location.png
-share/help/oc/gedit/figures/gedit-side-pane1.png
-share/help/oc/gedit/figures/gedit-side-pane2.png
-share/help/oc/gedit/figures/gedit-side-pane3.png
 share/help/oc/gedit/figures/gedit3-screenshot.png
 share/help/oc/gedit/gedit-change-color-scheme.page
 share/help/oc/gedit/gedit-change-default-font.page
@@ -1156,13 +1056,50 @@ share/help/oc/gedit/gedit-tabs.page
 share/help/oc/gedit/gedit-undo-recent-action.page
 share/help/oc/gedit/index.page
 share/help/oc/gedit/legal.xml
+share/help/pl/gedit/figures/gedit-html-snippet.png
+share/help/pl/gedit/figures/gedit-icon.png
+share/help/pl/gedit/figures/gedit3-screenshot.png
+share/help/pl/gedit/gedit-change-color-scheme.page
+share/help/pl/gedit/gedit-change-default-font.page
+share/help/pl/gedit/gedit-close-file.page
+share/help/pl/gedit/gedit-create-new-file.page
+share/help/pl/gedit/gedit-edit-as-root.page
+share/help/pl/gedit/gedit-files-basic.page
+share/help/pl/gedit/gedit-full-screen.page
+share/help/pl/gedit/gedit-open-files-from-sidepane.page
+share/help/pl/gedit/gedit-open-files.page
+share/help/pl/gedit/gedit-open-on-server.page
+share/help/pl/gedit/gedit-open-recent.page
+share/help/pl/gedit/gedit-plugin-guide.page
+share/help/pl/gedit/gedit-plugins-change-case.page
+share/help/pl/gedit/gedit-plugins-doc-stats.page
+share/help/pl/gedit/gedit-plugins-external-tools.page
+share/help/pl/gedit/gedit-plugins-file-browser.page
+share/help/pl/gedit/gedit-plugins-insert-date-time.page
+share/help/pl/gedit/gedit-plugins-install.page
+share/help/pl/gedit/gedit-plugins-modelines.page
+share/help/pl/gedit/gedit-plugins-pyconsole.page
+share/help/pl/gedit/gedit-plugins-quick-open.page
+share/help/pl/gedit/gedit-plugins-snippets.page
+share/help/pl/gedit/gedit-plugins-sort.page
+share/help/pl/gedit/gedit-printing-order.page
+share/help/pl/gedit/gedit-printing-select.page
+share/help/pl/gedit/gedit-printing.page
+share/help/pl/gedit/gedit-quickstart.page
+share/help/pl/gedit/gedit-replace.page
+share/help/pl/gedit/gedit-save-file.page
+share/help/pl/gedit/gedit-search.page
+share/help/pl/gedit/gedit-shortcut-keys.page
+share/help/pl/gedit/gedit-spellcheck.page
+share/help/pl/gedit/gedit-syntax-highlighting.page
+share/help/pl/gedit/gedit-tab-groups.page
+share/help/pl/gedit/gedit-tabs-moving.page
+share/help/pl/gedit/gedit-tabs.page
+share/help/pl/gedit/gedit-undo-recent-action.page
+share/help/pl/gedit/index.page
+share/help/pl/gedit/legal.xml
 share/help/pt_BR/gedit/figures/gedit-html-snippet.png
 share/help/pt_BR/gedit/figures/gedit-icon.png
-share/help/pt_BR/gedit/figures/gedit-new-external-tool.png
-share/help/pt_BR/gedit/figures/gedit-open-location.png
-share/help/pt_BR/gedit/figures/gedit-side-pane1.png
-share/help/pt_BR/gedit/figures/gedit-side-pane2.png
-share/help/pt_BR/gedit/figures/gedit-side-pane3.png
 share/help/pt_BR/gedit/figures/gedit3-screenshot.png
 share/help/pt_BR/gedit/gedit-change-color-scheme.page
 share/help/pt_BR/gedit/gedit-change-default-font.page
@@ -1205,11 +1142,6 @@ share/help/pt_BR/gedit/index.page
 share/help/pt_BR/gedit/legal.xml
 share/help/ro/gedit/figures/gedit-html-snippet.png
 share/help/ro/gedit/figures/gedit-icon.png
-share/help/ro/gedit/figures/gedit-new-external-tool.png
-share/help/ro/gedit/figures/gedit-open-location.png
-share/help/ro/gedit/figures/gedit-side-pane1.png
-share/help/ro/gedit/figures/gedit-side-pane2.png
-share/help/ro/gedit/figures/gedit-side-pane3.png
 share/help/ro/gedit/figures/gedit3-screenshot.png
 share/help/ro/gedit/gedit-change-color-scheme.page
 share/help/ro/gedit/gedit-change-default-font.page
@@ -1252,11 +1184,6 @@ share/help/ro/gedit/index.page
 share/help/ro/gedit/legal.xml
 share/help/ru/gedit/figures/gedit-html-snippet.png
 share/help/ru/gedit/figures/gedit-icon.png
-share/help/ru/gedit/figures/gedit-new-external-tool.png
-share/help/ru/gedit/figures/gedit-open-location.png
-share/help/ru/gedit/figures/gedit-side-pane1.png
-share/help/ru/gedit/figures/gedit-side-pane2.png
-share/help/ru/gedit/figures/gedit-side-pane3.png
 share/help/ru/gedit/figures/gedit3-screenshot.png
 share/help/ru/gedit/gedit-change-color-scheme.page
 share/help/ru/gedit/gedit-change-default-font.page
@@ -1299,11 +1226,6 @@ share/help/ru/gedit/index.page
 share/help/ru/gedit/legal.xml
 share/help/sl/gedit/figures/gedit-html-snippet.png
 share/help/sl/gedit/figures/gedit-icon.png
-share/help/sl/gedit/figures/gedit-new-external-tool.png
-share/help/sl/gedit/figures/gedit-open-location.png
-share/help/sl/gedit/figures/gedit-side-pane1.png
-share/help/sl/gedit/figures/gedit-side-pane2.png
-share/help/sl/gedit/figures/gedit-side-pane3.png
 share/help/sl/gedit/figures/gedit3-screenshot.png
 share/help/sl/gedit/gedit-change-color-scheme.page
 share/help/sl/gedit/gedit-change-default-font.page
@@ -1346,11 +1268,6 @@ share/help/sl/gedit/index.page
 share/help/sl/gedit/legal.xml
 share/help/sv/gedit/figures/gedit-html-snippet.png
 share/help/sv/gedit/figures/gedit-icon.png
-share/help/sv/gedit/figures/gedit-new-external-tool.png
-share/help/sv/gedit/figures/gedit-open-location.png
-share/help/sv/gedit/figures/gedit-side-pane1.png
-share/help/sv/gedit/figures/gedit-side-pane2.png
-share/help/sv/gedit/figures/gedit-side-pane3.png
 share/help/sv/gedit/figures/gedit3-screenshot.png
 share/help/sv/gedit/gedit-change-color-scheme.page
 share/help/sv/gedit/gedit-change-default-font.page
@@ -1393,11 +1310,6 @@ share/help/sv/gedit/index.page
 share/help/sv/gedit/legal.xml
 share/help/te/gedit/figures/gedit-html-snippet.png
 share/help/te/gedit/figures/gedit-icon.png
-share/help/te/gedit/figures/gedit-new-external-tool.png
-share/help/te/gedit/figures/gedit-open-location.png
-share/help/te/gedit/figures/gedit-side-pane1.png
-share/help/te/gedit/figures/gedit-side-pane2.png
-share/help/te/gedit/figures/gedit-side-pane3.png
 share/help/te/gedit/figures/gedit3-screenshot.png
 share/help/te/gedit/gedit-change-color-scheme.page
 share/help/te/gedit/gedit-change-default-font.page
@@ -1440,11 +1352,6 @@ share/help/te/gedit/index.page
 share/help/te/gedit/legal.xml
 share/help/th/gedit/figures/gedit-html-snippet.png
 share/help/th/gedit/figures/gedit-icon.png
-share/help/th/gedit/figures/gedit-new-external-tool.png
-share/help/th/gedit/figures/gedit-open-location.png
-share/help/th/gedit/figures/gedit-side-pane1.png
-share/help/th/gedit/figures/gedit-side-pane2.png
-share/help/th/gedit/figures/gedit-side-pane3.png
 share/help/th/gedit/figures/gedit3-screenshot.png
 share/help/th/gedit/gedit-change-color-scheme.page
 share/help/th/gedit/gedit-change-default-font.page
@@ -1487,11 +1394,6 @@ share/help/th/gedit/index.page
 share/help/th/gedit/legal.xml
 share/help/uk/gedit/figures/gedit-html-snippet.png
 share/help/uk/gedit/figures/gedit-icon.png
-share/help/uk/gedit/figures/gedit-new-external-tool.png
-share/help/uk/gedit/figures/gedit-open-location.png
-share/help/uk/gedit/figures/gedit-side-pane1.png
-share/help/uk/gedit/figures/gedit-side-pane2.png
-share/help/uk/gedit/figures/gedit-side-pane3.png
 share/help/uk/gedit/figures/gedit3-screenshot.png
 share/help/uk/gedit/gedit-change-color-scheme.page
 share/help/uk/gedit/gedit-change-default-font.page
@@ -1534,11 +1436,6 @@ share/help/uk/gedit/index.page
 share/help/uk/gedit/legal.xml
 share/help/zh_CN/gedit/figures/gedit-html-snippet.png
 share/help/zh_CN/gedit/figures/gedit-icon.png
-share/help/zh_CN/gedit/figures/gedit-new-external-tool.png
-share/help/zh_CN/gedit/figures/gedit-open-location.png
-share/help/zh_CN/gedit/figures/gedit-side-pane1.png
-share/help/zh_CN/gedit/figures/gedit-side-pane2.png
-share/help/zh_CN/gedit/figures/gedit-side-pane3.png
 share/help/zh_CN/gedit/figures/gedit3-screenshot.png
 share/help/zh_CN/gedit/gedit-change-color-scheme.page
 share/help/zh_CN/gedit/gedit-change-default-font.page
@@ -1581,11 +1478,6 @@ share/help/zh_CN/gedit/index.page
 share/help/zh_CN/gedit/legal.xml
 share/help/zh_HK/gedit/figures/gedit-html-snippet.png
 share/help/zh_HK/gedit/figures/gedit-icon.png
-share/help/zh_HK/gedit/figures/gedit-new-external-tool.png
-share/help/zh_HK/gedit/figures/gedit-open-location.png
-share/help/zh_HK/gedit/figures/gedit-side-pane1.png
-share/help/zh_HK/gedit/figures/gedit-side-pane2.png
-share/help/zh_HK/gedit/figures/gedit-side-pane3.png
 share/help/zh_HK/gedit/figures/gedit3-screenshot.png
 share/help/zh_HK/gedit/gedit-change-color-scheme.page
 share/help/zh_HK/gedit/gedit-change-default-font.page
@@ -1628,11 +1520,6 @@ share/help/zh_HK/gedit/index.page
 share/help/zh_HK/gedit/legal.xml
 share/help/zh_TW/gedit/figures/gedit-html-snippet.png
 share/help/zh_TW/gedit/figures/gedit-icon.png
-share/help/zh_TW/gedit/figures/gedit-new-external-tool.png
-share/help/zh_TW/gedit/figures/gedit-open-location.png
-share/help/zh_TW/gedit/figures/gedit-side-pane1.png
-share/help/zh_TW/gedit/figures/gedit-side-pane2.png
-share/help/zh_TW/gedit/figures/gedit-side-pane3.png
 share/help/zh_TW/gedit/figures/gedit3-screenshot.png
 share/help/zh_TW/gedit/gedit-change-color-scheme.page
 share/help/zh_TW/gedit/gedit-change-default-font.page
@@ -1673,6 +1560,13 @@ share/help/zh_TW/gedit/gedit-tabs.page
 share/help/zh_TW/gedit/gedit-undo-recent-action.page
 share/help/zh_TW/gedit/index.page
 share/help/zh_TW/gedit/legal.xml
+share/icons/hicolor/16x16/apps/gedit.png
+share/icons/hicolor/22x22/apps/gedit.png
+share/icons/hicolor/24x24/apps/gedit.png
+share/icons/hicolor/256x256/apps/gedit.png
+share/icons/hicolor/32x32/apps/gedit.png
+share/icons/hicolor/48x48/apps/gedit.png
+share/icons/hicolor/symbolic/apps/gedit-symbolic.svg
 share/locale/af/LC_MESSAGES/gedit.mo
 share/locale/am/LC_MESSAGES/gedit.mo
 share/locale/an/LC_MESSAGES/gedit.mo
@@ -1775,12 +1669,6 @@ share/locale/xh/LC_MESSAGES/gedit.mo
 share/locale/zh_CN/LC_MESSAGES/gedit.mo
 share/locale/zh_HK/LC_MESSAGES/gedit.mo
 share/locale/zh_TW/LC_MESSAGES/gedit.mo
-share/icons/hicolor/16x16/apps/gedit.png
-share/icons/hicolor/22x22/apps/gedit.png
-share/icons/hicolor/24x24/apps/gedit.png
-share/icons/hicolor/256x256/apps/gedit.png
-share/icons/hicolor/32x32/apps/gedit.png
-share/icons/hicolor/48x48/apps/gedit.png
-share/icons/hicolor/symbolic/apps/gedit-symbolic.svg
+share/metainfo/org.gnome.gedit.appdata.xml
 share/vala/vapi/gedit.deps
 share/vala/vapi/gedit.vapi
diff --git a/editors/ghex/Makefile b/editors/ghex/Makefile
index 5cb3735b8b60..4d4852813f00 100644
--- a/editors/ghex/Makefile
+++ b/editors/ghex/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ghex
-PORTVERSION=	3.18.0
+PORTVERSION=	3.18.3
 CATEGORIES=	editors gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -12,14 +12,12 @@ COMMENT=	GNOME 3 hex editor
 
 BUILD_DEPENDS=	itstool:textproc/itstool
 
-USES=		gettext gmake gnome libtool pathfix pkgconfig tar:xz
-USE_GNOME=	gnomeprefix gtk30 intlhack libxml2:build
+USES=		gettext gmake gnome libtool localbase pathfix pkgconfig tar:xz
+USE_GNOME=	cairo gnomeprefix gtk30 intlhack libxml2:build
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-compile-warnings=no
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.gnome.GHex.gschema.xml
diff --git a/editors/ghex/distinfo b/editors/ghex/distinfo
index 3e01d7e37552..44d75957cd40 100644
--- a/editors/ghex/distinfo
+++ b/editors/ghex/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/ghex-3.18.0.tar.xz) = c5b1eb50a8dd1334880b37617871498b778ea137f79bb43894ec68e4f63dc925
-SIZE (gnome3/ghex-3.18.0.tar.xz) = 1569372
+TIMESTAMP = 1516389461
+SHA256 (gnome3/ghex-3.18.3.tar.xz) = c67450f86f9c09c20768f1af36c11a66faf460ea00fbba628a9089a6804808d3
+SIZE (gnome3/ghex-3.18.3.tar.xz) = 1630720