diff --git a/gramps/gen/db/dictionary.py b/gramps/gen/db/dictionary.py
index d3974774a..36a8cd5fa 100644
--- a/gramps/gen/db/dictionary.py
+++ b/gramps/gen/db/dictionary.py
@@ -40,6 +40,9 @@ from . import (PERSON_KEY,
                NOTE_KEY,
                TAG_KEY)
 
+from ..const import GRAMPS_LOCALE as glocale
+_ = glocale.translation.gettext
+from ..errors import DbError
 from ..utils.id import create_id
 from ..lib.researcher import Researcher
 from ..lib.mediaobj import MediaObject
diff --git a/gramps/guiQML/grampsqml.py b/gramps/guiQML/grampsqml.py
index 136d38f89..e366f6aef 100644
--- a/gramps/guiQML/grampsqml.py
+++ b/gramps/guiQML/grampsqml.py
@@ -41,6 +41,8 @@ LOG = logging.getLogger(".grampsqml")
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
+from gramps.gen.const import GRAMPS_LOCALE as glocale
+_ = glocale.translation.gettext
 from gramps.gen.constfunc import has_display
 from gramps.gen.config import config
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index dd038f897..0f668431f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -13,6 +13,7 @@ gramps/gen/datehandler/_datedisplay.py
 gramps/gen/datehandler/_datestrings.py
 gramps/gen/datehandler/_dateparser.py
 gramps/gen/db/base.py
+gramps/gen/db/dictionary.py
 gramps/gen/db/exceptions.py
 gramps/gen/db/undoredo.py
 gramps/gen/db/upgrade.py
@@ -296,6 +297,7 @@ gramps/gen/lib/srcattrtype.py
 gramps/gen/lib/styledtexttagtype.py
 gramps/gen/lib/surnamebase.py
 gramps/gen/lib/urltype.py
+gramps/gen/merge/diff.py
 gramps/gen/merge/mergecitationquery.py
 gramps/gen/merge/mergeeventquery.py
 gramps/gen/merge/mergefamilyquery.py
@@ -305,6 +307,7 @@ gramps/gen/merge/mergepersonquery.py
 gramps/gen/merge/mergeplacequery.py
 gramps/gen/merge/mergerepositoryquery.py
 gramps/gen/merge/mergesourcequery.py
+gramps/gen/merge/test/merge_ref_test.py
 gramps/gen/mime/_pythonmime.py
 gramps/gen/mime/_winmime.py
 gramps/gen/plug/_gramplet.py
@@ -323,6 +326,7 @@ gramps/gen/plug/report/stdoptions.py
 gramps/gen/plug/report/utils.py
 gramps/gen/plug/utils.py
 gramps/gen/proxy/private.py
+gramps/gen/recentfiles.py
 gramps/gen/relationship.py
 gramps/gen/simple/_simpleaccess.py
 gramps/gen/utils/alive.py
@@ -338,6 +342,7 @@ gramps/gen/utils/string.py
 gramps/gen/utils/unknown.py
 gramps/grampsapp.py
 gramps/gui/aboutdialog.py
+gramps/gui/autocomp.py
 gramps/gui/clipboard.py
 gramps/gui/columnorder.py
 gramps/gui/configure.py
@@ -526,6 +531,8 @@ gramps/gui/widgets/reorderfam.py
 gramps/gui/widgets/styledtextbuffer.py
 gramps/gui/widgets/styledtexteditor.py
 gramps/gui/widgets/validatedmaskedentry.py
+gramps/guiQML/grampsqml.py
+gramps/guiQML/views/dbman.py
 gramps/plugins/docgen/asciidoc.py
 gramps/plugins/docgen/docgen.gpr.py
 gramps/plugins/docgen/gtkprint.glade
@@ -660,6 +667,7 @@ gramps/plugins/tool/changenames.py
 gramps/plugins/tool/changetypes.glade
 gramps/plugins/tool/changetypes.py
 gramps/plugins/tool/check.py
+gramps/plugins/tool/dateparserdisplaytest.py
 gramps/plugins/tool/dumpgenderstats.py
 gramps/plugins/tool/eventcmp.glade
 gramps/plugins/tool/eventcmp.py
@@ -676,6 +684,7 @@ gramps/plugins/tool/ownereditor.glade
 gramps/plugins/tool/ownereditor.py
 gramps/plugins/tool/patchnames.glade
 gramps/plugins/tool/patchnames.py
+gramps/plugins/tool/phpgedviewconnector.py
 gramps/plugins/tool/rebuild.py
 gramps/plugins/tool/rebuildgenderstat.py
 gramps/plugins/tool/rebuildrefmap.py
@@ -685,6 +694,7 @@ gramps/plugins/tool/removeunused.glade
 gramps/plugins/tool/removeunused.py
 gramps/plugins/tool/reorderids.py
 gramps/plugins/tool/sortevents.py
+gramps/plugins/tool/testcasegenerator.py
 gramps/plugins/tool/tools.gpr.py
 gramps/plugins/tool/verify.glade
 gramps/plugins/tool/verify.py
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 1391b6877..ba2f0481d 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -17,7 +17,6 @@ gramps/gen/dbstate.py
 gramps/gen/errors.py
 gramps/gen/git_revision.py
 gramps/gen/__init__.py
-gramps/gen/recentfiles.py
 gramps/gen/sort.py
 gramps/gen/soundex.py
 gramps/gen/updatecallback.py
@@ -60,8 +59,6 @@ gramps/gen/db/backup.py
 gramps/gen/db/bsddbtxn.py
 gramps/gen/db/cursor.py
 gramps/gen/db/dbconst.py
-gramps/gen/db/dictionary.py
-#gramps/gen/db/read.py
 gramps/gen/db/test/db_test.py
 gramps/gen/db/txn.py
 #
@@ -177,8 +174,6 @@ gramps/gen/lib/witness.py
 # gen.merge package
 #
 gramps/gen/merge/__init__.py
-gramps/gen/merge/diff.py
-gramps/gen/merge/test/merge_ref_test.py
 #
 # gen mime API
 #
@@ -263,7 +258,6 @@ gramps/gen/utils/docgen/tabbeddoc.py
 # gui - GUI code
 #
 gramps/gui/__init__.py
-gramps/gui/autocomp.py
 gramps/gui/basesidebar.py
 gramps/gui/dbguielement.py
 gramps/gui/ddtargets.py
@@ -384,7 +378,6 @@ gramps/gui/widgets/valuetoolitem.py
 #
 # gui qt (do not need translation yet)
 #
-gramps/guiQML/grampsqml.py
 gramps/guiQML/__init__.py
 gramps/guiQML/qmlwidgets/TextButton.qml
 gramps/guiQML/qmlwidgets/TopBar.qml
@@ -392,7 +385,6 @@ gramps/guiQML/questiondialog.py
 gramps/guiQML/viewmanager.py
 gramps/guiQML/views/centralview.py
 gramps/guiQML/views/centralview.qml
-gramps/guiQML/views/dbman.py
 gramps/guiQML/views/dbman.qml
 gramps/guiQML/views/__init__.py
 gramps/guiQML/views/peopleview.qml
@@ -500,11 +492,8 @@ gramps/plugins/sidebar/__init__.py
 #
 # Development tools
 #
-gramps/plugins/tool/dateparserdisplaytest.py
 gramps/plugins/tool/__init__.py
-gramps/plugins/tool/phpgedviewconnector.py
 gramps/plugins/tool/populatesources.py
-gramps/plugins/tool/testcasegenerator.py
 #
 # plugins/view directory
 #