3 files changed, 96 insertions, 201 deletions

diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 6e45ff6aa347..3f8d4e019650 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gedit
-PORTVERSION=	3.28.1
-PORTREVISION=	2
+PORTVERSION=	3.38.0
 CATEGORIES=	editors gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
@@ -21,30 +20,27 @@ BUILD_DEPENDS=	iso-codes>=0:misc/iso-codes \
 LIB_DEPENDS=	libenchant.so:textproc/enchant \
 		libpeas-gtk-1.0.so:devel/libpeas \
 		libgspell-1.so:textproc/gspell \
-		libsoup-2.4.so:devel/libsoup
+		libsoup-2.4.so:devel/libsoup \
+		libtepl-5.so:x11-toolkits/tepl \
+		libamtk-5.so:x11-toolkits/amtk
+
 RUN_DEPENDS=	iso-codes>=0:misc/iso-codes \
 		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
 		${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas@${PY_FLAVOR}
 
 PORTSCOUT=	limitw:1,even
 
-USES=		compiler:c11 desktop-file-utils gettext gmake gnome libtool \
-		localbase pathfix pkgconfig python:3.4+ shebangfix tar:xz xorg
+USES=		compiler:c11 desktop-file-utils gettext gnome localbase meson \
+		pkgconfig python:3.4+ tar:xz xorg
 USE_CSTD=	c11
-USE_GNOME=	cairo gdkpixbuf2 gtksourceview3 intlhack introspection \
+USE_GNOME=	cairo gdkpixbuf2 gtksourceview4 intlhack introspection \
 		libxml2 pygobject3
-SHEBANG_FILES=	plugins/externaltools/data/send-to-fpaste.tool.in
 USE_XORG=	sm x11
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-updater \
-		--enable-python \
-		--enable-spell
-CPPFLAGS+=	-Wno-error=format-nonliteral
-CFLAGS+=	-Wno-error=format-nonliteral
-LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
-PLIST_SUB=	VERSION="3.14"
+PLIST_SUB=	VERSION="3.38"
 INSTALL_TARGET=	install-strip
+MESON_ARGS+=	--buildtype plain
+BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 GLIB_SCHEMAS=	org.gnome.gedit.enums.xml \
 		org.gnome.gedit.plugins.externaltools.gschema.xml \
@@ -53,10 +49,7 @@ GLIB_SCHEMAS=	org.gnome.gedit.enums.xml \
 		org.gnome.gedit.plugins.filebrowser.gschema.xml \
 		org.gnome.gedit.plugins.pythonconsole.gschema.xml \
 		org.gnome.gedit.plugins.time.enums.xml \
-		org.gnome.gedit.plugins.time.gschema.xml
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|=python|=${PYTHON_CMD}|g' \
-		${WRKSRC}/py-compile
+		org.gnome.gedit.plugins.time.gschema.xml \
+		org.gnome.gedit.plugins.spell.gschema.xml
 
 .include <bsd.port.mk>
diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo
index 5b9fcbf5e0bd..b97065b2d9bf 100644
--- a/editors/gedit/distinfo
+++ b/editors/gedit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525511297
-SHA256 (gnome/gedit-3.28.1.tar.xz) = f174be0958ce63771fef9a81d06da6769358dab8705364a6abb5c7d10ec8211d
-SIZE (gnome/gedit-3.28.1.tar.xz) = 3149684
+TIMESTAMP = 1601386260
+SHA256 (gnome/gedit-3.38.0.tar.xz) = 46cf06806de58f6e5e95e34fd98ad0b2c0c50b3dae6d23ca57d16d5cc41856f8
+SIZE (gnome/gedit-3.38.0.tar.xz) = 6842872
diff --git a/editors/gedit/pkg-plist b/editors/gedit/pkg-plist
index 9227dd476b5b..b9892623bee9 100644
--- a/editors/gedit/pkg-plist
+++ b/editors/gedit/pkg-plist
@@ -1,11 +1,11 @@
 bin/gedit
-bin/gnome-text-editor
 include/gedit-%%VERSION%%/gedit/gedit-app-activatable.h
 include/gedit-%%VERSION%%/gedit/gedit-app.h
 include/gedit-%%VERSION%%/gedit/gedit-commands.h
 include/gedit-%%VERSION%%/gedit/gedit-debug.h
 include/gedit-%%VERSION%%/gedit/gedit-document.h
 include/gedit-%%VERSION%%/gedit/gedit-encodings-combo-box.h
+include/gedit-%%VERSION%%/gedit/gedit-enum-types.h
 include/gedit-%%VERSION%%/gedit/gedit-menu-extension.h
 include/gedit-%%VERSION%%/gedit/gedit-message-bus.h
 include/gedit-%%VERSION%%/gedit/gedit-message.h
@@ -18,30 +18,10 @@ include/gedit-%%VERSION%%/gedit/gedit-view.h
 include/gedit-%%VERSION%%/gedit/gedit-window-activatable.h
 include/gedit-%%VERSION%%/gedit/gedit-window.h
 lib/gedit/girepository-1.0/Gedit-3.0.typelib
-lib/gedit/libgedit.so
+lib/gedit/libgedit-%%VERSION%%.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%%.opt-1.pyc
-lib/gedit/plugins/externaltools/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-lib/gedit/plugins/externaltools/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-lib/gedit/plugins/externaltools/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
-lib/gedit/plugins/externaltools/__pycache__/capture.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-lib/gedit/plugins/externaltools/__pycache__/capture.cpython-%%PYTHON_SUFFIX%%.pyc
-lib/gedit/plugins/externaltools/__pycache__/filelookup.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-lib/gedit/plugins/externaltools/__pycache__/filelookup.cpython-%%PYTHON_SUFFIX%%.pyc
-lib/gedit/plugins/externaltools/__pycache__/functions.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-lib/gedit/plugins/externaltools/__pycache__/functions.cpython-%%PYTHON_SUFFIX%%.pyc
-lib/gedit/plugins/externaltools/__pycache__/library.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-lib/gedit/plugins/externaltools/__pycache__/library.cpython-%%PYTHON_SUFFIX%%.pyc
-lib/gedit/plugins/externaltools/__pycache__/linkparsing.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-lib/gedit/plugins/externaltools/__pycache__/linkparsing.cpython-%%PYTHON_SUFFIX%%.pyc
-lib/gedit/plugins/externaltools/__pycache__/manager.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-lib/gedit/plugins/externaltools/__pycache__/manager.cpython-%%PYTHON_SUFFIX%%.pyc
-lib/gedit/plugins/externaltools/__pycache__/outputpanel.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-lib/gedit/plugins/externaltools/__pycache__/outputpanel.cpython-%%PYTHON_SUFFIX%%.pyc
-lib/gedit/plugins/externaltools/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-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
@@ -55,68 +35,22 @@ lib/gedit/plugins/filebrowser.plugin
 lib/gedit/plugins/libdocinfo.so
 lib/gedit/plugins/libfilebrowser.so
 lib/gedit/plugins/libmodelines.so
+lib/gedit/plugins/libquickhighlight.so
 lib/gedit/plugins/libsort.so
 lib/gedit/plugins/libspell.so
 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%%.opt-1.pyc
-lib/gedit/plugins/pythonconsole/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-lib/gedit/plugins/pythonconsole/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-lib/gedit/plugins/pythonconsole/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.pyc
-lib/gedit/plugins/pythonconsole/__pycache__/console.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-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/quickhighlight.plugin
 lib/gedit/plugins/quickopen.plugin
 lib/gedit/plugins/quickopen/__init__.py
-lib/gedit/plugins/quickopen/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-lib/gedit/plugins/quickopen/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-lib/gedit/plugins/quickopen/__pycache__/popup.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-lib/gedit/plugins/quickopen/__pycache__/popup.cpython-%%PYTHON_SUFFIX%%.pyc
-lib/gedit/plugins/quickopen/__pycache__/virtualdirs.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-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%%.opt-1.pyc
-lib/gedit/plugins/snippets/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-lib/gedit/plugins/snippets/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-lib/gedit/plugins/snippets/__pycache__/appactivatable.cpython-%%PYTHON_SUFFIX%%.pyc
-lib/gedit/plugins/snippets/__pycache__/completion.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-lib/gedit/plugins/snippets/__pycache__/completion.cpython-%%PYTHON_SUFFIX%%.pyc
-lib/gedit/plugins/snippets/__pycache__/document.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-lib/gedit/plugins/snippets/__pycache__/document.cpython-%%PYTHON_SUFFIX%%.pyc
-lib/gedit/plugins/snippets/__pycache__/exporter.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-lib/gedit/plugins/snippets/__pycache__/exporter.cpython-%%PYTHON_SUFFIX%%.pyc
-lib/gedit/plugins/snippets/__pycache__/helper.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-lib/gedit/plugins/snippets/__pycache__/helper.cpython-%%PYTHON_SUFFIX%%.pyc
-lib/gedit/plugins/snippets/__pycache__/importer.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-lib/gedit/plugins/snippets/__pycache__/importer.cpython-%%PYTHON_SUFFIX%%.pyc
-lib/gedit/plugins/snippets/__pycache__/languagemanager.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-lib/gedit/plugins/snippets/__pycache__/languagemanager.cpython-%%PYTHON_SUFFIX%%.pyc
-lib/gedit/plugins/snippets/__pycache__/library.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-lib/gedit/plugins/snippets/__pycache__/library.cpython-%%PYTHON_SUFFIX%%.pyc
-lib/gedit/plugins/snippets/__pycache__/manager.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-lib/gedit/plugins/snippets/__pycache__/manager.cpython-%%PYTHON_SUFFIX%%.pyc
-lib/gedit/plugins/snippets/__pycache__/parser.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-lib/gedit/plugins/snippets/__pycache__/parser.cpython-%%PYTHON_SUFFIX%%.pyc
-lib/gedit/plugins/snippets/__pycache__/placeholder.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-lib/gedit/plugins/snippets/__pycache__/placeholder.cpython-%%PYTHON_SUFFIX%%.pyc
-lib/gedit/plugins/snippets/__pycache__/shareddata.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-lib/gedit/plugins/snippets/__pycache__/shareddata.cpython-%%PYTHON_SUFFIX%%.pyc
-lib/gedit/plugins/snippets/__pycache__/signals.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-lib/gedit/plugins/snippets/__pycache__/signals.cpython-%%PYTHON_SUFFIX%%.pyc
-lib/gedit/plugins/snippets/__pycache__/singleton.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-lib/gedit/plugins/snippets/__pycache__/singleton.cpython-%%PYTHON_SUFFIX%%.pyc
-lib/gedit/plugins/snippets/__pycache__/snippet.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-lib/gedit/plugins/snippets/__pycache__/snippet.cpython-%%PYTHON_SUFFIX%%.pyc
-lib/gedit/plugins/snippets/__pycache__/substitutionparser.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-lib/gedit/plugins/snippets/__pycache__/substitutionparser.cpython-%%PYTHON_SUFFIX%%.pyc
-lib/gedit/plugins/snippets/__pycache__/windowactivatable.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-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,12 +72,8 @@ 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%%.opt-1.pyc
-%%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/applications/org.gnome.gedit.desktop
 share/dbus-1/services/org.gnome.gedit.service
 %%DATADIR%%/gir-1.0/Gedit-3.0.gir
@@ -183,39 +113,6 @@ 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/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
-share/gtk-doc/html/gedit/ch01.html
-share/gtk-doc/html/gedit/gedit-GeditCommands.html
-share/gtk-doc/html/gedit/gedit-gedit-debug.html
-share/gtk-doc/html/gedit/gedit-gedit-menu-extension.html
-share/gtk-doc/html/gedit/gedit-gedit-tab.html
-share/gtk-doc/html/gedit/gedit-gedit-utils.html
-share/gtk-doc/html/gedit/gedit-gedit-view.html
-share/gtk-doc/html/gedit/gedit-gedit-window.html
-share/gtk-doc/html/gedit/gedit.devhelp2
-share/gtk-doc/html/gedit/home.png
-share/gtk-doc/html/gedit/index.html
-share/gtk-doc/html/gedit/left-insensitive.png
-share/gtk-doc/html/gedit/left.png
-share/gtk-doc/html/gedit/object-tree.html
-share/gtk-doc/html/gedit/right-insensitive.png
-share/gtk-doc/html/gedit/right.png
-share/gtk-doc/html/gedit/style.css
-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/gedit3-screenshot.png
@@ -249,13 +146,12 @@ share/help/C/gedit/gedit-quickstart.page
 share/help/C/gedit/gedit-replace.page
 share/help/C/gedit/gedit-save-file.page
 share/help/C/gedit/gedit-search.page
-share/help/C/gedit/gedit-shortcut-keys.page
 share/help/C/gedit/gedit-spellcheck.page
 share/help/C/gedit/gedit-syntax-highlighting.page
 share/help/C/gedit/gedit-tab-groups.page
 share/help/C/gedit/gedit-tabs-moving.page
 share/help/C/gedit/gedit-tabs.page
-share/help/C/gedit/gedit-undo-recent-action.page
+share/help/C/gedit/gedit-undo-redo.page
 share/help/C/gedit/index.page
 share/help/C/gedit/legal.xml
 share/help/ar/gedit/figures/gedit-html-snippet.png
@@ -291,13 +187,12 @@ share/help/ar/gedit/gedit-quickstart.page
 share/help/ar/gedit/gedit-replace.page
 share/help/ar/gedit/gedit-save-file.page
 share/help/ar/gedit/gedit-search.page
-share/help/ar/gedit/gedit-shortcut-keys.page
 share/help/ar/gedit/gedit-spellcheck.page
 share/help/ar/gedit/gedit-syntax-highlighting.page
 share/help/ar/gedit/gedit-tab-groups.page
 share/help/ar/gedit/gedit-tabs-moving.page
 share/help/ar/gedit/gedit-tabs.page
-share/help/ar/gedit/gedit-undo-recent-action.page
+share/help/ar/gedit/gedit-undo-redo.page
 share/help/ar/gedit/index.page
 share/help/ar/gedit/legal.xml
 share/help/bg/gedit/figures/gedit-html-snippet.png
@@ -333,13 +228,12 @@ share/help/bg/gedit/gedit-quickstart.page
 share/help/bg/gedit/gedit-replace.page
 share/help/bg/gedit/gedit-save-file.page
 share/help/bg/gedit/gedit-search.page
-share/help/bg/gedit/gedit-shortcut-keys.page
 share/help/bg/gedit/gedit-spellcheck.page
 share/help/bg/gedit/gedit-syntax-highlighting.page
 share/help/bg/gedit/gedit-tab-groups.page
 share/help/bg/gedit/gedit-tabs-moving.page
 share/help/bg/gedit/gedit-tabs.page
-share/help/bg/gedit/gedit-undo-recent-action.page
+share/help/bg/gedit/gedit-undo-redo.page
 share/help/bg/gedit/index.page
 share/help/bg/gedit/legal.xml
 share/help/ca/gedit/figures/gedit-html-snippet.png
@@ -375,13 +269,12 @@ share/help/ca/gedit/gedit-quickstart.page
 share/help/ca/gedit/gedit-replace.page
 share/help/ca/gedit/gedit-save-file.page
 share/help/ca/gedit/gedit-search.page
-share/help/ca/gedit/gedit-shortcut-keys.page
 share/help/ca/gedit/gedit-spellcheck.page
 share/help/ca/gedit/gedit-syntax-highlighting.page
 share/help/ca/gedit/gedit-tab-groups.page
 share/help/ca/gedit/gedit-tabs-moving.page
 share/help/ca/gedit/gedit-tabs.page
-share/help/ca/gedit/gedit-undo-recent-action.page
+share/help/ca/gedit/gedit-undo-redo.page
 share/help/ca/gedit/index.page
 share/help/ca/gedit/legal.xml
 share/help/cs/gedit/figures/gedit-html-snippet.png
@@ -417,13 +310,12 @@ share/help/cs/gedit/gedit-quickstart.page
 share/help/cs/gedit/gedit-replace.page
 share/help/cs/gedit/gedit-save-file.page
 share/help/cs/gedit/gedit-search.page
-share/help/cs/gedit/gedit-shortcut-keys.page
 share/help/cs/gedit/gedit-spellcheck.page
 share/help/cs/gedit/gedit-syntax-highlighting.page
 share/help/cs/gedit/gedit-tab-groups.page
 share/help/cs/gedit/gedit-tabs-moving.page
 share/help/cs/gedit/gedit-tabs.page
-share/help/cs/gedit/gedit-undo-recent-action.page
+share/help/cs/gedit/gedit-undo-redo.page
 share/help/cs/gedit/index.page
 share/help/cs/gedit/legal.xml
 share/help/da/gedit/figures/gedit-html-snippet.png
@@ -459,13 +351,12 @@ share/help/da/gedit/gedit-quickstart.page
 share/help/da/gedit/gedit-replace.page
 share/help/da/gedit/gedit-save-file.page
 share/help/da/gedit/gedit-search.page
-share/help/da/gedit/gedit-shortcut-keys.page
 share/help/da/gedit/gedit-spellcheck.page
 share/help/da/gedit/gedit-syntax-highlighting.page
 share/help/da/gedit/gedit-tab-groups.page
 share/help/da/gedit/gedit-tabs-moving.page
 share/help/da/gedit/gedit-tabs.page
-share/help/da/gedit/gedit-undo-recent-action.page
+share/help/da/gedit/gedit-undo-redo.page
 share/help/da/gedit/index.page
 share/help/da/gedit/legal.xml
 share/help/de/gedit/figures/gedit-html-snippet.png
@@ -501,13 +392,12 @@ share/help/de/gedit/gedit-quickstart.page
 share/help/de/gedit/gedit-replace.page
 share/help/de/gedit/gedit-save-file.page
 share/help/de/gedit/gedit-search.page
-share/help/de/gedit/gedit-shortcut-keys.page
 share/help/de/gedit/gedit-spellcheck.page
 share/help/de/gedit/gedit-syntax-highlighting.page
 share/help/de/gedit/gedit-tab-groups.page
 share/help/de/gedit/gedit-tabs-moving.page
 share/help/de/gedit/gedit-tabs.page
-share/help/de/gedit/gedit-undo-recent-action.page
+share/help/de/gedit/gedit-undo-redo.page
 share/help/de/gedit/index.page
 share/help/de/gedit/legal.xml
 share/help/el/gedit/figures/gedit-html-snippet.png
@@ -543,15 +433,55 @@ share/help/el/gedit/gedit-quickstart.page
 share/help/el/gedit/gedit-replace.page
 share/help/el/gedit/gedit-save-file.page
 share/help/el/gedit/gedit-search.page
-share/help/el/gedit/gedit-shortcut-keys.page
 share/help/el/gedit/gedit-spellcheck.page
 share/help/el/gedit/gedit-syntax-highlighting.page
 share/help/el/gedit/gedit-tab-groups.page
 share/help/el/gedit/gedit-tabs-moving.page
 share/help/el/gedit/gedit-tabs.page
-share/help/el/gedit/gedit-undo-recent-action.page
+share/help/el/gedit/gedit-undo-redo.page
 share/help/el/gedit/index.page
 share/help/el/gedit/legal.xml
+share/help/en_GB/gedit/figures/gedit-html-snippet.png
+share/help/en_GB/gedit/figures/gedit-icon.png
+share/help/en_GB/gedit/figures/gedit3-screenshot.png
+share/help/en_GB/gedit/gedit-change-color-scheme.page
+share/help/en_GB/gedit/gedit-change-default-font.page
+share/help/en_GB/gedit/gedit-close-file.page
+share/help/en_GB/gedit/gedit-create-new-file.page
+share/help/en_GB/gedit/gedit-edit-as-root.page
+share/help/en_GB/gedit/gedit-files-basic.page
+share/help/en_GB/gedit/gedit-full-screen.page
+share/help/en_GB/gedit/gedit-open-files-from-sidepane.page
+share/help/en_GB/gedit/gedit-open-files.page
+share/help/en_GB/gedit/gedit-open-on-server.page
+share/help/en_GB/gedit/gedit-open-recent.page
+share/help/en_GB/gedit/gedit-plugin-guide.page
+share/help/en_GB/gedit/gedit-plugins-change-case.page
+share/help/en_GB/gedit/gedit-plugins-doc-stats.page
+share/help/en_GB/gedit/gedit-plugins-external-tools.page
+share/help/en_GB/gedit/gedit-plugins-file-browser.page
+share/help/en_GB/gedit/gedit-plugins-insert-date-time.page
+share/help/en_GB/gedit/gedit-plugins-install.page
+share/help/en_GB/gedit/gedit-plugins-modelines.page
+share/help/en_GB/gedit/gedit-plugins-pyconsole.page
+share/help/en_GB/gedit/gedit-plugins-quick-open.page
+share/help/en_GB/gedit/gedit-plugins-snippets.page
+share/help/en_GB/gedit/gedit-plugins-sort.page
+share/help/en_GB/gedit/gedit-printing-order.page
+share/help/en_GB/gedit/gedit-printing-select.page
+share/help/en_GB/gedit/gedit-printing.page
+share/help/en_GB/gedit/gedit-quickstart.page
+share/help/en_GB/gedit/gedit-replace.page
+share/help/en_GB/gedit/gedit-save-file.page
+share/help/en_GB/gedit/gedit-search.page
+share/help/en_GB/gedit/gedit-spellcheck.page
+share/help/en_GB/gedit/gedit-syntax-highlighting.page
+share/help/en_GB/gedit/gedit-tab-groups.page
+share/help/en_GB/gedit/gedit-tabs-moving.page
+share/help/en_GB/gedit/gedit-tabs.page
+share/help/en_GB/gedit/gedit-undo-redo.page
+share/help/en_GB/gedit/index.page
+share/help/en_GB/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/gedit3-screenshot.png
@@ -585,13 +515,12 @@ share/help/es/gedit/gedit-quickstart.page
 share/help/es/gedit/gedit-replace.page
 share/help/es/gedit/gedit-save-file.page
 share/help/es/gedit/gedit-search.page
-share/help/es/gedit/gedit-shortcut-keys.page
 share/help/es/gedit/gedit-spellcheck.page
 share/help/es/gedit/gedit-syntax-highlighting.page
 share/help/es/gedit/gedit-tab-groups.page
 share/help/es/gedit/gedit-tabs-moving.page
 share/help/es/gedit/gedit-tabs.page
-share/help/es/gedit/gedit-undo-recent-action.page
+share/help/es/gedit/gedit-undo-redo.page
 share/help/es/gedit/index.page
 share/help/es/gedit/legal.xml
 share/help/eu/gedit/figures/gedit-html-snippet.png
@@ -627,13 +556,12 @@ share/help/eu/gedit/gedit-quickstart.page
 share/help/eu/gedit/gedit-replace.page
 share/help/eu/gedit/gedit-save-file.page
 share/help/eu/gedit/gedit-search.page
-share/help/eu/gedit/gedit-shortcut-keys.page
 share/help/eu/gedit/gedit-spellcheck.page
 share/help/eu/gedit/gedit-syntax-highlighting.page
 share/help/eu/gedit/gedit-tab-groups.page
 share/help/eu/gedit/gedit-tabs-moving.page
 share/help/eu/gedit/gedit-tabs.page
-share/help/eu/gedit/gedit-undo-recent-action.page
+share/help/eu/gedit/gedit-undo-redo.page
 share/help/eu/gedit/index.page
 share/help/eu/gedit/legal.xml
 share/help/fi/gedit/figures/gedit-html-snippet.png
@@ -669,13 +597,12 @@ share/help/fi/gedit/gedit-quickstart.page
 share/help/fi/gedit/gedit-replace.page
 share/help/fi/gedit/gedit-save-file.page
 share/help/fi/gedit/gedit-search.page
-share/help/fi/gedit/gedit-shortcut-keys.page
 share/help/fi/gedit/gedit-spellcheck.page
 share/help/fi/gedit/gedit-syntax-highlighting.page
 share/help/fi/gedit/gedit-tab-groups.page
 share/help/fi/gedit/gedit-tabs-moving.page
 share/help/fi/gedit/gedit-tabs.page
-share/help/fi/gedit/gedit-undo-recent-action.page
+share/help/fi/gedit/gedit-undo-redo.page
 share/help/fi/gedit/index.page
 share/help/fi/gedit/legal.xml
 share/help/fr/gedit/figures/gedit-html-snippet.png
@@ -711,13 +638,12 @@ share/help/fr/gedit/gedit-quickstart.page
 share/help/fr/gedit/gedit-replace.page
 share/help/fr/gedit/gedit-save-file.page
 share/help/fr/gedit/gedit-search.page
-share/help/fr/gedit/gedit-shortcut-keys.page
 share/help/fr/gedit/gedit-spellcheck.page
 share/help/fr/gedit/gedit-syntax-highlighting.page
 share/help/fr/gedit/gedit-tab-groups.page
 share/help/fr/gedit/gedit-tabs-moving.page
 share/help/fr/gedit/gedit-tabs.page
-share/help/fr/gedit/gedit-undo-recent-action.page
+share/help/fr/gedit/gedit-undo-redo.page
 share/help/fr/gedit/index.page
 share/help/fr/gedit/legal.xml
 share/help/gl/gedit/figures/gedit-html-snippet.png
@@ -753,13 +679,12 @@ share/help/gl/gedit/gedit-quickstart.page
 share/help/gl/gedit/gedit-replace.page
 share/help/gl/gedit/gedit-save-file.page
 share/help/gl/gedit/gedit-search.page
-share/help/gl/gedit/gedit-shortcut-keys.page
 share/help/gl/gedit/gedit-spellcheck.page
 share/help/gl/gedit/gedit-syntax-highlighting.page
 share/help/gl/gedit/gedit-tab-groups.page
 share/help/gl/gedit/gedit-tabs-moving.page
 share/help/gl/gedit/gedit-tabs.page
-share/help/gl/gedit/gedit-undo-recent-action.page
+share/help/gl/gedit/gedit-undo-redo.page
 share/help/gl/gedit/index.page
 share/help/gl/gedit/legal.xml
 share/help/hu/gedit/figures/gedit-html-snippet.png
@@ -795,13 +720,12 @@ share/help/hu/gedit/gedit-quickstart.page
 share/help/hu/gedit/gedit-replace.page
 share/help/hu/gedit/gedit-save-file.page
 share/help/hu/gedit/gedit-search.page
-share/help/hu/gedit/gedit-shortcut-keys.page
 share/help/hu/gedit/gedit-spellcheck.page
 share/help/hu/gedit/gedit-syntax-highlighting.page
 share/help/hu/gedit/gedit-tab-groups.page
 share/help/hu/gedit/gedit-tabs-moving.page
 share/help/hu/gedit/gedit-tabs.page
-share/help/hu/gedit/gedit-undo-recent-action.page
+share/help/hu/gedit/gedit-undo-redo.page
 share/help/hu/gedit/index.page
 share/help/hu/gedit/legal.xml
 share/help/id/gedit/figures/gedit-html-snippet.png
@@ -837,13 +761,12 @@ share/help/id/gedit/gedit-quickstart.page
 share/help/id/gedit/gedit-replace.page
 share/help/id/gedit/gedit-save-file.page
 share/help/id/gedit/gedit-search.page
-share/help/id/gedit/gedit-shortcut-keys.page
 share/help/id/gedit/gedit-spellcheck.page
 share/help/id/gedit/gedit-syntax-highlighting.page
 share/help/id/gedit/gedit-tab-groups.page
 share/help/id/gedit/gedit-tabs-moving.page
 share/help/id/gedit/gedit-tabs.page
-share/help/id/gedit/gedit-undo-recent-action.page
+share/help/id/gedit/gedit-undo-redo.page
 share/help/id/gedit/index.page
 share/help/id/gedit/legal.xml
 share/help/it/gedit/figures/gedit-html-snippet.png
@@ -879,13 +802,12 @@ share/help/it/gedit/gedit-quickstart.page
 share/help/it/gedit/gedit-replace.page
 share/help/it/gedit/gedit-save-file.page
 share/help/it/gedit/gedit-search.page
-share/help/it/gedit/gedit-shortcut-keys.page
 share/help/it/gedit/gedit-spellcheck.page
 share/help/it/gedit/gedit-syntax-highlighting.page
 share/help/it/gedit/gedit-tab-groups.page
 share/help/it/gedit/gedit-tabs-moving.page
 share/help/it/gedit/gedit-tabs.page
-share/help/it/gedit/gedit-undo-recent-action.page
+share/help/it/gedit/gedit-undo-redo.page
 share/help/it/gedit/index.page
 share/help/it/gedit/legal.xml
 share/help/ja/gedit/figures/gedit-html-snippet.png
@@ -921,13 +843,12 @@ share/help/ja/gedit/gedit-quickstart.page
 share/help/ja/gedit/gedit-replace.page
 share/help/ja/gedit/gedit-save-file.page
 share/help/ja/gedit/gedit-search.page
-share/help/ja/gedit/gedit-shortcut-keys.page
 share/help/ja/gedit/gedit-spellcheck.page
 share/help/ja/gedit/gedit-syntax-highlighting.page
 share/help/ja/gedit/gedit-tab-groups.page
 share/help/ja/gedit/gedit-tabs-moving.page
 share/help/ja/gedit/gedit-tabs.page
-share/help/ja/gedit/gedit-undo-recent-action.page
+share/help/ja/gedit/gedit-undo-redo.page
 share/help/ja/gedit/index.page
 share/help/ja/gedit/legal.xml
 share/help/ko/gedit/figures/gedit-html-snippet.png
@@ -963,13 +884,12 @@ share/help/ko/gedit/gedit-quickstart.page
 share/help/ko/gedit/gedit-replace.page
 share/help/ko/gedit/gedit-save-file.page
 share/help/ko/gedit/gedit-search.page
-share/help/ko/gedit/gedit-shortcut-keys.page
 share/help/ko/gedit/gedit-spellcheck.page
 share/help/ko/gedit/gedit-syntax-highlighting.page
 share/help/ko/gedit/gedit-tab-groups.page
 share/help/ko/gedit/gedit-tabs-moving.page
 share/help/ko/gedit/gedit-tabs.page
-share/help/ko/gedit/gedit-undo-recent-action.page
+share/help/ko/gedit/gedit-undo-redo.page
 share/help/ko/gedit/index.page
 share/help/ko/gedit/legal.xml
 share/help/lv/gedit/figures/gedit-html-snippet.png
@@ -1005,13 +925,12 @@ share/help/lv/gedit/gedit-quickstart.page
 share/help/lv/gedit/gedit-replace.page
 share/help/lv/gedit/gedit-save-file.page
 share/help/lv/gedit/gedit-search.page
-share/help/lv/gedit/gedit-shortcut-keys.page
 share/help/lv/gedit/gedit-spellcheck.page
 share/help/lv/gedit/gedit-syntax-highlighting.page
 share/help/lv/gedit/gedit-tab-groups.page
 share/help/lv/gedit/gedit-tabs-moving.page
 share/help/lv/gedit/gedit-tabs.page
-share/help/lv/gedit/gedit-undo-recent-action.page
+share/help/lv/gedit/gedit-undo-redo.page
 share/help/lv/gedit/index.page
 share/help/lv/gedit/legal.xml
 share/help/oc/gedit/figures/gedit-html-snippet.png
@@ -1047,13 +966,12 @@ share/help/oc/gedit/gedit-quickstart.page
 share/help/oc/gedit/gedit-replace.page
 share/help/oc/gedit/gedit-save-file.page
 share/help/oc/gedit/gedit-search.page
-share/help/oc/gedit/gedit-shortcut-keys.page
 share/help/oc/gedit/gedit-spellcheck.page
 share/help/oc/gedit/gedit-syntax-highlighting.page
 share/help/oc/gedit/gedit-tab-groups.page
 share/help/oc/gedit/gedit-tabs-moving.page
 share/help/oc/gedit/gedit-tabs.page
-share/help/oc/gedit/gedit-undo-recent-action.page
+share/help/oc/gedit/gedit-undo-redo.page
 share/help/oc/gedit/index.page
 share/help/oc/gedit/legal.xml
 share/help/pl/gedit/figures/gedit-html-snippet.png
@@ -1089,13 +1007,12 @@ 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/gedit-undo-redo.page
 share/help/pl/gedit/index.page
 share/help/pl/gedit/legal.xml
 share/help/pt_BR/gedit/figures/gedit-html-snippet.png
@@ -1131,13 +1048,12 @@ share/help/pt_BR/gedit/gedit-quickstart.page
 share/help/pt_BR/gedit/gedit-replace.page
 share/help/pt_BR/gedit/gedit-save-file.page
 share/help/pt_BR/gedit/gedit-search.page
-share/help/pt_BR/gedit/gedit-shortcut-keys.page
 share/help/pt_BR/gedit/gedit-spellcheck.page
 share/help/pt_BR/gedit/gedit-syntax-highlighting.page
 share/help/pt_BR/gedit/gedit-tab-groups.page
 share/help/pt_BR/gedit/gedit-tabs-moving.page
 share/help/pt_BR/gedit/gedit-tabs.page
-share/help/pt_BR/gedit/gedit-undo-recent-action.page
+share/help/pt_BR/gedit/gedit-undo-redo.page
 share/help/pt_BR/gedit/index.page
 share/help/pt_BR/gedit/legal.xml
 share/help/ro/gedit/figures/gedit-html-snippet.png
@@ -1173,13 +1089,12 @@ share/help/ro/gedit/gedit-quickstart.page
 share/help/ro/gedit/gedit-replace.page
 share/help/ro/gedit/gedit-save-file.page
 share/help/ro/gedit/gedit-search.page
-share/help/ro/gedit/gedit-shortcut-keys.page
 share/help/ro/gedit/gedit-spellcheck.page
 share/help/ro/gedit/gedit-syntax-highlighting.page
 share/help/ro/gedit/gedit-tab-groups.page
 share/help/ro/gedit/gedit-tabs-moving.page
 share/help/ro/gedit/gedit-tabs.page
-share/help/ro/gedit/gedit-undo-recent-action.page
+share/help/ro/gedit/gedit-undo-redo.page
 share/help/ro/gedit/index.page
 share/help/ro/gedit/legal.xml
 share/help/ru/gedit/figures/gedit-html-snippet.png
@@ -1215,13 +1130,12 @@ share/help/ru/gedit/gedit-quickstart.page
 share/help/ru/gedit/gedit-replace.page
 share/help/ru/gedit/gedit-save-file.page
 share/help/ru/gedit/gedit-search.page
-share/help/ru/gedit/gedit-shortcut-keys.page
 share/help/ru/gedit/gedit-spellcheck.page
 share/help/ru/gedit/gedit-syntax-highlighting.page
 share/help/ru/gedit/gedit-tab-groups.page
 share/help/ru/gedit/gedit-tabs-moving.page
 share/help/ru/gedit/gedit-tabs.page
-share/help/ru/gedit/gedit-undo-recent-action.page
+share/help/ru/gedit/gedit-undo-redo.page
 share/help/ru/gedit/index.page
 share/help/ru/gedit/legal.xml
 share/help/sl/gedit/figures/gedit-html-snippet.png
@@ -1257,13 +1171,12 @@ share/help/sl/gedit/gedit-quickstart.page
 share/help/sl/gedit/gedit-replace.page
 share/help/sl/gedit/gedit-save-file.page
 share/help/sl/gedit/gedit-search.page
-share/help/sl/gedit/gedit-shortcut-keys.page
 share/help/sl/gedit/gedit-spellcheck.page
 share/help/sl/gedit/gedit-syntax-highlighting.page
 share/help/sl/gedit/gedit-tab-groups.page
 share/help/sl/gedit/gedit-tabs-moving.page
 share/help/sl/gedit/gedit-tabs.page
-share/help/sl/gedit/gedit-undo-recent-action.page
+share/help/sl/gedit/gedit-undo-redo.page
 share/help/sl/gedit/index.page
 share/help/sl/gedit/legal.xml
 share/help/sv/gedit/figures/gedit-html-snippet.png
@@ -1299,13 +1212,12 @@ share/help/sv/gedit/gedit-quickstart.page
 share/help/sv/gedit/gedit-replace.page
 share/help/sv/gedit/gedit-save-file.page
 share/help/sv/gedit/gedit-search.page
-share/help/sv/gedit/gedit-shortcut-keys.page
 share/help/sv/gedit/gedit-spellcheck.page
 share/help/sv/gedit/gedit-syntax-highlighting.page
 share/help/sv/gedit/gedit-tab-groups.page
 share/help/sv/gedit/gedit-tabs-moving.page
 share/help/sv/gedit/gedit-tabs.page
-share/help/sv/gedit/gedit-undo-recent-action.page
+share/help/sv/gedit/gedit-undo-redo.page
 share/help/sv/gedit/index.page
 share/help/sv/gedit/legal.xml
 share/help/te/gedit/figures/gedit-html-snippet.png
@@ -1341,13 +1253,12 @@ share/help/te/gedit/gedit-quickstart.page
 share/help/te/gedit/gedit-replace.page
 share/help/te/gedit/gedit-save-file.page
 share/help/te/gedit/gedit-search.page
-share/help/te/gedit/gedit-shortcut-keys.page
 share/help/te/gedit/gedit-spellcheck.page
 share/help/te/gedit/gedit-syntax-highlighting.page
 share/help/te/gedit/gedit-tab-groups.page
 share/help/te/gedit/gedit-tabs-moving.page
 share/help/te/gedit/gedit-tabs.page
-share/help/te/gedit/gedit-undo-recent-action.page
+share/help/te/gedit/gedit-undo-redo.page
 share/help/te/gedit/index.page
 share/help/te/gedit/legal.xml
 share/help/th/gedit/figures/gedit-html-snippet.png
@@ -1383,13 +1294,12 @@ share/help/th/gedit/gedit-quickstart.page
 share/help/th/gedit/gedit-replace.page
 share/help/th/gedit/gedit-save-file.page
 share/help/th/gedit/gedit-search.page
-share/help/th/gedit/gedit-shortcut-keys.page
 share/help/th/gedit/gedit-spellcheck.page
 share/help/th/gedit/gedit-syntax-highlighting.page
 share/help/th/gedit/gedit-tab-groups.page
 share/help/th/gedit/gedit-tabs-moving.page
 share/help/th/gedit/gedit-tabs.page
-share/help/th/gedit/gedit-undo-recent-action.page
+share/help/th/gedit/gedit-undo-redo.page
 share/help/th/gedit/index.page
 share/help/th/gedit/legal.xml
 share/help/uk/gedit/figures/gedit-html-snippet.png
@@ -1425,13 +1335,12 @@ share/help/uk/gedit/gedit-quickstart.page
 share/help/uk/gedit/gedit-replace.page
 share/help/uk/gedit/gedit-save-file.page
 share/help/uk/gedit/gedit-search.page
-share/help/uk/gedit/gedit-shortcut-keys.page
 share/help/uk/gedit/gedit-spellcheck.page
 share/help/uk/gedit/gedit-syntax-highlighting.page
 share/help/uk/gedit/gedit-tab-groups.page
 share/help/uk/gedit/gedit-tabs-moving.page
 share/help/uk/gedit/gedit-tabs.page
-share/help/uk/gedit/gedit-undo-recent-action.page
+share/help/uk/gedit/gedit-undo-redo.page
 share/help/uk/gedit/index.page
 share/help/uk/gedit/legal.xml
 share/help/zh_CN/gedit/figures/gedit-html-snippet.png
@@ -1467,13 +1376,12 @@ share/help/zh_CN/gedit/gedit-quickstart.page
 share/help/zh_CN/gedit/gedit-replace.page
 share/help/zh_CN/gedit/gedit-save-file.page
 share/help/zh_CN/gedit/gedit-search.page
-share/help/zh_CN/gedit/gedit-shortcut-keys.page
 share/help/zh_CN/gedit/gedit-spellcheck.page
 share/help/zh_CN/gedit/gedit-syntax-highlighting.page
 share/help/zh_CN/gedit/gedit-tab-groups.page
 share/help/zh_CN/gedit/gedit-tabs-moving.page
 share/help/zh_CN/gedit/gedit-tabs.page
-share/help/zh_CN/gedit/gedit-undo-recent-action.page
+share/help/zh_CN/gedit/gedit-undo-redo.page
 share/help/zh_CN/gedit/index.page
 share/help/zh_CN/gedit/legal.xml
 share/help/zh_HK/gedit/figures/gedit-html-snippet.png
@@ -1509,13 +1417,12 @@ share/help/zh_HK/gedit/gedit-quickstart.page
 share/help/zh_HK/gedit/gedit-replace.page
 share/help/zh_HK/gedit/gedit-save-file.page
 share/help/zh_HK/gedit/gedit-search.page
-share/help/zh_HK/gedit/gedit-shortcut-keys.page
 share/help/zh_HK/gedit/gedit-spellcheck.page
 share/help/zh_HK/gedit/gedit-syntax-highlighting.page
 share/help/zh_HK/gedit/gedit-tab-groups.page
 share/help/zh_HK/gedit/gedit-tabs-moving.page
 share/help/zh_HK/gedit/gedit-tabs.page
-share/help/zh_HK/gedit/gedit-undo-recent-action.page
+share/help/zh_HK/gedit/gedit-undo-redo.page
 share/help/zh_HK/gedit/index.page
 share/help/zh_HK/gedit/legal.xml
 share/help/zh_TW/gedit/figures/gedit-html-snippet.png
@@ -1551,22 +1458,16 @@ share/help/zh_TW/gedit/gedit-quickstart.page
 share/help/zh_TW/gedit/gedit-replace.page
 share/help/zh_TW/gedit/gedit-save-file.page
 share/help/zh_TW/gedit/gedit-search.page
-share/help/zh_TW/gedit/gedit-shortcut-keys.page
 share/help/zh_TW/gedit/gedit-spellcheck.page
 share/help/zh_TW/gedit/gedit-syntax-highlighting.page
 share/help/zh_TW/gedit/gedit-tab-groups.page
 share/help/zh_TW/gedit/gedit-tabs-moving.page
 share/help/zh_TW/gedit/gedit-tabs.page
-share/help/zh_TW/gedit/gedit-undo-recent-action.page
+share/help/zh_TW/gedit/gedit-undo-redo.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/icons/hicolor/scalable/apps/org.gnome.gedit.svg
+share/icons/hicolor/symbolic/apps/org.gnome.gedit-symbolic.svg
 share/locale/af/LC_MESSAGES/gedit.mo
 share/locale/am/LC_MESSAGES/gedit.mo
 share/locale/an/LC_MESSAGES/gedit.mo
@@ -1627,6 +1528,7 @@ share/locale/lv/LC_MESSAGES/gedit.mo
 share/locale/mai/LC_MESSAGES/gedit.mo
 share/locale/mg/LC_MESSAGES/gedit.mo
 share/locale/mi/LC_MESSAGES/gedit.mo
+share/locale/mjw/LC_MESSAGES/gedit.mo
 share/locale/mk/LC_MESSAGES/gedit.mo
 share/locale/ml/LC_MESSAGES/gedit.mo
 share/locale/mn/LC_MESSAGES/gedit.mo