diff --git a/po/POTFILES.in b/po/POTFILES.in
index 07979577c..accb95384 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -12,6 +12,7 @@ src/cli/grampscli.py
 src/cli/plug/__init__.py
 
 # gen
+src/gen/config.py
 src/gen/const.py
 src/gen/relationship.py
 
@@ -304,8 +305,8 @@ src/gen/plug/utils.py
 src/gen/plug/docgen/graphdoc.py
 
 # gen.plug.export package
-src/gen/plug/export/_exportassistant.py
-src/gen/plug/export/_exportoptions.py
+#src/gen/plug/export/_exportassistant.py
+#src/gen/plug/export/_exportoptions.py
 
 # plugin report base API (was ReportBase)
 src/gen/plug/report/_constants.py
@@ -435,6 +436,8 @@ src/gui/merge/mergesource.py
 src/gui/plug/_dialogs.py
 src/gui/plug/_guioptions.py
 src/gui/plug/_windows.py
+src/gui/plug/export/_exportassistant.py
+src/gui/plug/export/_exportoptions.py
 src/gui/plug/quick/_quickreports.py
 src/gui/plug/quick/_quicktable.py
 src/gui/plug/quick/_textbufdoc.py
@@ -484,11 +487,11 @@ src/gui/widgets/undoableentry.py
 src/gui/widgets/validatedmaskedentry.py
 
 # Config package
-src/config.py
+#src/config.py
 
 # docgen directory
-src/docgen/ODSTab.py
-src/docgen/TextBufDoc.py
+#src/docgen/ODSTab.py
+#src/docgen/TextBufDoc.py
 
 # plugins directory
 src/plugins/bookreport.py
@@ -572,7 +575,7 @@ src/plugins/import/import.gpr.py
 src/plugins/import/importcsv.py
 src/plugins/import/importgedcom.py
 src/plugins/import/importgeneweb.py
-src/plugins/import/importgrdb.py
+#src/plugins/import/importgrdb.py
 src/plugins/import/importprogen.py
 src/plugins/import/importvcard.py
 src/plugins/import/importgpkg.py
@@ -593,7 +596,8 @@ src/plugins/lib/libtranslate.py
 src/plugins/lib/libtreebase.py
 src/plugins/lib/holidays.xml.in
 src/plugins/lib/maps/geography.py
-src/plugins/lib/maps/osmgps.py
+#src/plugins/lib/maps/osmgps.py
+src/plugins/lib/maps/osmGps.py
 src/plugins/lib/maps/placeselection.py
 
 # plugins/mapservices  directory
@@ -679,7 +683,9 @@ src/plugins/view/fanchartview.py
 src/plugins/view/geography.gpr.py
 src/plugins/view/geoclose.py
 src/plugins/view/geoevents.py
+src/plugins/view/geofamclose.py
 src/plugins/view/geofamily.py
+src/plugins/view/geomoves.py
 src/plugins/view/geoperson.py
 src/plugins/view/geoplaces.py
 src/plugins/view/grampletview.py
@@ -719,10 +725,11 @@ src/gui/glade/displaystate.glade
 src/gui/glade/addmedia.glade
 src/gui/glade/dialog.glade
 src/gui/glade/configure.glade
-src/gui/glade/dateedit.glade
+#src/gui/glade/dateedit.glade
 src/gui/glade/editsource.glade
 src/gui/glade/styleeditor.glade
 src/gui/glade/dbman.glade
+src/gui/glade/editdate.glade
 src/gui/glade/editcitation.glade
 src/gui/glade/editurl.glade
 src/gui/glade/editrepository.glade
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 68062cd38..f47dce614 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -332,6 +332,7 @@ src/plugins/tool/calculateestimateddates.py
 src/plugins/tool/dateparserdisplaytest.py
 src/plugins/tool/dumpgenderstats.py
 src/plugins/tool/phpgedviewconnector.py
+src/plugins/tool/populatesources.py
 src/plugins/tool/testcasegenerator.py
 src/plugins/tool/phpgedview.glade
 src/plugins/tool/toolsdebug.gpr.py
diff --git a/src/gen/db/Makefile.am b/src/gen/db/Makefile.am
index 59edf40e0..8092d2dc7 100644
--- a/src/gen/db/Makefile.am
+++ b/src/gen/db/Makefile.am
@@ -1,4 +1,4 @@
-# This is the src/RelLib level Makefile for Gramps
+# This is the src/gen/db level Makefile for Gramps
 # $Id$
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
@@ -13,6 +13,7 @@ pkgpython_PYTHON = \
 	bsddbtxn.py \
 	cursor.py \
 	dbconst.py \
+	dictionary.py \
 	exceptions.py \
 	read.py \
 	txn.py \
diff --git a/src/gen/merge/Makefile.am b/src/gen/merge/Makefile.am
index 7d71f25e8..b98034748 100644
--- a/src/gen/merge/Makefile.am
+++ b/src/gen/merge/Makefile.am
@@ -1,4 +1,4 @@
-# This is the src/RelLib level Makefile for Gramps
+# This is the src/gen/merge level Makefile for Gramps
 # $Id: Makefile.am 18851 2012-02-10 20:25:15Z josipsf $
 # We could use GNU make's ':=' syntax for nice wildcard use,
 # but that is not necessarily portable.
@@ -8,6 +8,7 @@ pkgpythondir = $(datadir)/@PACKAGE@/gen/merge
 
 pkgpython_PYTHON = \
 	__init__.py \
+	diff.py \
 	mergepersonquery.py \
 	mergefamilyquery.py \
 	mergeeventquery.py \