diff --git a/po/POTFILES.in b/po/POTFILES.in
index ea95c0b2c..05039269f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,699 @@
 # List of source files which contain translatable strings.
 gramps/gen/const.py.in
+gramps/cli/arghandler.py
+gramps/cli/argparser.py
+gramps/cli/clidbman.py
+gramps/cli/grampscli.py
+gramps/cli/plug/__init__.py
+gramps/cli/user.py
+gramps/gen/config.py
+gramps/gen/db/base.py
+gramps/gen/db/exceptions.py
+gramps/gen/db/undoredo.py
+gramps/gen/db/upgrade.py
+gramps/gen/db/write.py
+gramps/gen/display/name.py
+gramps/gen/filters/_filterparser.py
+gramps/gen/filters/rules/_changedsincebase.py
+gramps/gen/filters/rules/_everything.py
+gramps/gen/filters/rules/_hasattributebase.py
+gramps/gen/filters/rules/_hascitationbase.py
+gramps/gen/filters/rules/_haseventbase.py
+gramps/gen/filters/rules/_hasgallerybase.py
+gramps/gen/filters/rules/_hasgrampsid.py
+gramps/gen/filters/rules/_hasldsbase.py
+gramps/gen/filters/rules/_hasnotebase.py
+gramps/gen/filters/rules/_hasnoteregexbase.py
+gramps/gen/filters/rules/_hasnotesubstrbase.py
+gramps/gen/filters/rules/_hasreferencecountbase.py
+gramps/gen/filters/rules/_hassourcebase.py
+gramps/gen/filters/rules/_hassourcecountbase.py
+gramps/gen/filters/rules/_hassourceofbase.py
+gramps/gen/filters/rules/_hastagbase.py
+gramps/gen/filters/rules/_hastextmatchingsubstringof.py
+gramps/gen/filters/rules/_isprivate.py
+gramps/gen/filters/rules/_ispublic.py
+gramps/gen/filters/rules/_matcheseventfilterbase.py
+gramps/gen/filters/rules/_matchesfilterbase.py
+gramps/gen/filters/rules/_matchessourceconfidencebase.py
+gramps/gen/filters/rules/_matchessourcefilterbase.py
+gramps/gen/filters/rules/_regexpidbase.py
+gramps/gen/filters/rules/_rule.py
+gramps/gen/filters/rules/citation/_allcitations.py
+gramps/gen/filters/rules/citation/_changedsince.py
+gramps/gen/filters/rules/citation/_citationprivate.py
+gramps/gen/filters/rules/citation/_hascitation.py
+gramps/gen/filters/rules/citation/_hasgallery.py
+gramps/gen/filters/rules/citation/_hasidof.py
+gramps/gen/filters/rules/citation/_hasnote.py
+gramps/gen/filters/rules/citation/_hasnotematchingsubstringof.py
+gramps/gen/filters/rules/citation/_hasnoteregexp.py
+gramps/gen/filters/rules/citation/_hasreferencecountof.py
+gramps/gen/filters/rules/citation/_hassource.py
+gramps/gen/filters/rules/citation/_matchesfilter.py
+gramps/gen/filters/rules/citation/_matchespagesubstringof.py
+gramps/gen/filters/rules/citation/_matchesrepositoryfilter.py
+gramps/gen/filters/rules/citation/_matchessourcefilter.py
+gramps/gen/filters/rules/citation/_regexpidof.py
+gramps/gen/filters/rules/event/_allevents.py
+gramps/gen/filters/rules/event/_changedsince.py
+gramps/gen/filters/rules/event/_eventprivate.py
+gramps/gen/filters/rules/event/_hasattribute.py
+gramps/gen/filters/rules/event/_hascitation.py
+gramps/gen/filters/rules/event/_hasdata.py
+gramps/gen/filters/rules/event/_hasgallery.py
+gramps/gen/filters/rules/event/_hasidof.py
+gramps/gen/filters/rules/event/_hasnote.py
+gramps/gen/filters/rules/event/_hasnotematchingsubstringof.py
+gramps/gen/filters/rules/event/_hasnoteregexp.py
+gramps/gen/filters/rules/event/_hasreferencecountof.py
+gramps/gen/filters/rules/event/_hassourcecount.py
+gramps/gen/filters/rules/event/_hastype.py
+gramps/gen/filters/rules/event/_matchesfilter.py
+gramps/gen/filters/rules/event/_matchespersonfilter.py
+gramps/gen/filters/rules/event/_matchessourceconfidence.py
+gramps/gen/filters/rules/event/_matchessourcefilter.py
+gramps/gen/filters/rules/event/_regexpidof.py
+gramps/gen/filters/rules/family/_allfamilies.py
+gramps/gen/filters/rules/family/_changedsince.py
+gramps/gen/filters/rules/family/_childhasidof.py
+gramps/gen/filters/rules/family/_childhasnameof.py
+gramps/gen/filters/rules/family/_familyprivate.py
+gramps/gen/filters/rules/family/_fatherhasidof.py
+gramps/gen/filters/rules/family/_fatherhasnameof.py
+gramps/gen/filters/rules/family/_hasattribute.py
+gramps/gen/filters/rules/family/_hascitation.py
+gramps/gen/filters/rules/family/_hasevent.py
+gramps/gen/filters/rules/family/_hasgallery.py
+gramps/gen/filters/rules/family/_hasidof.py
+gramps/gen/filters/rules/family/_haslds.py
+gramps/gen/filters/rules/family/_hasnote.py
+gramps/gen/filters/rules/family/_hasnotematchingsubstringof.py
+gramps/gen/filters/rules/family/_hasnoteregexp.py
+gramps/gen/filters/rules/family/_hasreferencecountof.py
+gramps/gen/filters/rules/family/_hasreltype.py
+gramps/gen/filters/rules/family/_hassourcecount.py
+gramps/gen/filters/rules/family/_hassourceof.py
+gramps/gen/filters/rules/family/_hastag.py
+gramps/gen/filters/rules/family/_isbookmarked.py
+gramps/gen/filters/rules/family/_matchesfilter.py
+gramps/gen/filters/rules/family/_matchessourceconfidence.py
+gramps/gen/filters/rules/family/_motherhasidof.py
+gramps/gen/filters/rules/family/_motherhasnameof.py
+gramps/gen/filters/rules/family/_regexpchildname.py
+gramps/gen/filters/rules/family/_regexpfathername.py
+gramps/gen/filters/rules/family/_regexpidof.py
+gramps/gen/filters/rules/family/_regexpmothername.py
+gramps/gen/filters/rules/family/_searchchildname.py
+gramps/gen/filters/rules/family/_searchfathername.py
+gramps/gen/filters/rules/family/_searchmothername.py
+gramps/gen/filters/rules/media/_allmedia.py
+gramps/gen/filters/rules/media/_changedsince.py
+gramps/gen/filters/rules/media/_hasattribute.py
+gramps/gen/filters/rules/media/_hascitation.py
+gramps/gen/filters/rules/media/_hasidof.py
+gramps/gen/filters/rules/media/_hasmedia.py
+gramps/gen/filters/rules/media/_hasnotematchingsubstringof.py
+gramps/gen/filters/rules/media/_hasnoteregexp.py
+gramps/gen/filters/rules/media/_hasreferencecountof.py
+gramps/gen/filters/rules/media/_hassourcecount.py
+gramps/gen/filters/rules/media/_hassourceof.py
+gramps/gen/filters/rules/media/_hastag.py
+gramps/gen/filters/rules/media/_matchesfilter.py
+gramps/gen/filters/rules/media/_matchessourceconfidence.py
+gramps/gen/filters/rules/media/_mediaprivate.py
+gramps/gen/filters/rules/media/_regexpidof.py
+gramps/gen/filters/rules/note/_allnotes.py
+gramps/gen/filters/rules/note/_changedsince.py
+gramps/gen/filters/rules/note/_hasidof.py
+gramps/gen/filters/rules/note/_hasnote.py
+gramps/gen/filters/rules/note/_hasreferencecountof.py
+gramps/gen/filters/rules/note/_hastag.py
+gramps/gen/filters/rules/note/_matchesfilter.py
+gramps/gen/filters/rules/note/_matchesregexpof.py
+gramps/gen/filters/rules/note/_matchessubstringof.py
+gramps/gen/filters/rules/note/_noteprivate.py
+gramps/gen/filters/rules/note/_regexpidof.py
+gramps/gen/filters/rules/person/_changedsince.py
+gramps/gen/filters/rules/person/_deeprelationshippathbetween.py
+gramps/gen/filters/rules/person/_disconnected.py
+gramps/gen/filters/rules/person/_everyone.py
+gramps/gen/filters/rules/person/_familywithincompleteevent.py
+gramps/gen/filters/rules/person/_hasaddress.py
+gramps/gen/filters/rules/person/_hasalternatename.py
+gramps/gen/filters/rules/person/_hasassociation.py
+gramps/gen/filters/rules/person/_hasattribute.py
+gramps/gen/filters/rules/person/_hasbirth.py
+gramps/gen/filters/rules/person/_hascitation.py
+gramps/gen/filters/rules/person/_hascommonancestorwith.py
+gramps/gen/filters/rules/person/_hascommonancestorwithfiltermatch.py
+gramps/gen/filters/rules/person/_hasdeath.py
+gramps/gen/filters/rules/person/_hasevent.py
+gramps/gen/filters/rules/person/_hasfamilyattribute.py
+gramps/gen/filters/rules/person/_hasfamilyevent.py
+gramps/gen/filters/rules/person/_hasgallery.py
+gramps/gen/filters/rules/person/_hasidof.py
+gramps/gen/filters/rules/person/_haslds.py
+gramps/gen/filters/rules/person/_hasnameof.py
+gramps/gen/filters/rules/person/_hasnameorigintype.py
+gramps/gen/filters/rules/person/_hasnametype.py
+gramps/gen/filters/rules/person/_hasnickname.py
+gramps/gen/filters/rules/person/_hasnote.py
+gramps/gen/filters/rules/person/_hasnotematchingsubstringof.py
+gramps/gen/filters/rules/person/_hasnoteregexp.py
+gramps/gen/filters/rules/person/_hasrelationship.py
+gramps/gen/filters/rules/person/_hassourcecount.py
+gramps/gen/filters/rules/person/_hassourceof.py
+gramps/gen/filters/rules/person/_hastag.py
+gramps/gen/filters/rules/person/_hastextmatchingsubstringof.py
+gramps/gen/filters/rules/person/_hasunknowngender.py
+gramps/gen/filters/rules/person/_havealtfamilies.py
+gramps/gen/filters/rules/person/_havechildren.py
+gramps/gen/filters/rules/person/_incompletenames.py
+gramps/gen/filters/rules/person/_isancestorof.py
+gramps/gen/filters/rules/person/_isancestoroffiltermatch.py
+gramps/gen/filters/rules/person/_isbookmarked.py
+gramps/gen/filters/rules/person/_ischildoffiltermatch.py
+gramps/gen/filters/rules/person/_isdefaultperson.py
+gramps/gen/filters/rules/person/_isdescendantfamilyof.py
+gramps/gen/filters/rules/person/_isdescendantfamilyoffiltermatch.py
+gramps/gen/filters/rules/person/_isdescendantof.py
+gramps/gen/filters/rules/person/_isdescendantoffiltermatch.py
+gramps/gen/filters/rules/person/_isduplicatedancestorof.py
+gramps/gen/filters/rules/person/_isfemale.py
+gramps/gen/filters/rules/person/_islessthannthgenerationancestorof.py
+gramps/gen/filters/rules/person/_islessthannthgenerationancestorofbookmarked.py
+gramps/gen/filters/rules/person/_islessthannthgenerationancestorofdefaultperson.py
+gramps/gen/filters/rules/person/_islessthannthgenerationdescendantof.py
+gramps/gen/filters/rules/person/_ismale.py
+gramps/gen/filters/rules/person/_ismorethannthgenerationancestorof.py
+gramps/gen/filters/rules/person/_ismorethannthgenerationdescendantof.py
+gramps/gen/filters/rules/person/_isparentoffiltermatch.py
+gramps/gen/filters/rules/person/_isrelatedwith.py
+gramps/gen/filters/rules/person/_issiblingoffiltermatch.py
+gramps/gen/filters/rules/person/_isspouseoffiltermatch.py
+gramps/gen/filters/rules/person/_iswitness.py
+gramps/gen/filters/rules/person/_matcheseventfilter.py
+gramps/gen/filters/rules/person/_matchesfilter.py
+gramps/gen/filters/rules/person/_matchessourceconfidence.py
+gramps/gen/filters/rules/person/_matchidof.py
+gramps/gen/filters/rules/person/_missingparent.py
+gramps/gen/filters/rules/person/_multiplemarriages.py
+gramps/gen/filters/rules/person/_nevermarried.py
+gramps/gen/filters/rules/person/_nobirthdate.py
+gramps/gen/filters/rules/person/_nodeathdate.py
+gramps/gen/filters/rules/person/_peopleprivate.py
+gramps/gen/filters/rules/person/_peoplepublic.py
+gramps/gen/filters/rules/person/_personwithincompleteevent.py
+gramps/gen/filters/rules/person/_probablyalive.py
+gramps/gen/filters/rules/person/_regexpidof.py
+gramps/gen/filters/rules/person/_regexpname.py
+gramps/gen/filters/rules/person/_relationshippathbetween.py
+gramps/gen/filters/rules/person/_relationshippathbetweenbookmarks.py
+gramps/gen/filters/rules/person/_searchname.py
+gramps/gen/filters/rules/place/_allplaces.py
+gramps/gen/filters/rules/place/_changedsince.py
+gramps/gen/filters/rules/place/_hascitation.py
+gramps/gen/filters/rules/place/_hasgallery.py
+gramps/gen/filters/rules/place/_hasidof.py
+gramps/gen/filters/rules/place/_hasnolatorlon.py
+gramps/gen/filters/rules/place/_hasnote.py
+gramps/gen/filters/rules/place/_hasnotematchingsubstringof.py
+gramps/gen/filters/rules/place/_hasnoteregexp.py
+gramps/gen/filters/rules/place/_hasplace.py
+gramps/gen/filters/rules/place/_hasreferencecountof.py
+gramps/gen/filters/rules/place/_hassourcecount.py
+gramps/gen/filters/rules/place/_hassourceof.py
+gramps/gen/filters/rules/place/_inlatlonneighborhood.py
+gramps/gen/filters/rules/place/_matcheseventfilter.py
+gramps/gen/filters/rules/place/_matchesfilter.py
+gramps/gen/filters/rules/place/_matchessourceconfidence.py
+gramps/gen/filters/rules/place/_placeprivate.py
+gramps/gen/filters/rules/place/_regexpidof.py
+gramps/gen/filters/rules/repository/_allrepos.py
+gramps/gen/filters/rules/repository/_changedsince.py
+gramps/gen/filters/rules/repository/_hasidof.py
+gramps/gen/filters/rules/repository/_hasnotematchingsubstringof.py
+gramps/gen/filters/rules/repository/_hasnoteregexp.py
+gramps/gen/filters/rules/repository/_hasreferencecountof.py
+gramps/gen/filters/rules/repository/_hasrepo.py
+gramps/gen/filters/rules/repository/_matchesfilter.py
+gramps/gen/filters/rules/repository/_matchesnamesubstringof.py
+gramps/gen/filters/rules/repository/_regexpidof.py
+gramps/gen/filters/rules/repository/_repoprivate.py
+gramps/gen/filters/rules/source/_allsources.py
+gramps/gen/filters/rules/source/_changedsince.py
+gramps/gen/filters/rules/source/_hasgallery.py
+gramps/gen/filters/rules/source/_hasidof.py
+gramps/gen/filters/rules/source/_hasnote.py
+gramps/gen/filters/rules/source/_hasnotematchingsubstringof.py
+gramps/gen/filters/rules/source/_hasnoteregexp.py
+gramps/gen/filters/rules/source/_hasreferencecountof.py
+gramps/gen/filters/rules/source/_hasrepository.py
+gramps/gen/filters/rules/source/_hasrepositorycallnumberref.py
+gramps/gen/filters/rules/source/_matchesfilter.py
+gramps/gen/filters/rules/source/_matchesrepositoryfilter.py
+gramps/gen/filters/rules/source/_matchestitlesubstringof.py
+gramps/gen/filters/rules/source/_regexpidof.py
+gramps/gen/filters/rules/source/_sourceprivate.py
+gramps/gen/lib/attrtype.py
+gramps/gen/lib/childreftype.py
+gramps/gen/lib/date.py
+gramps/gen/lib/eventroletype.py
+gramps/gen/lib/eventtype.py
+gramps/gen/lib/familyreltype.py
+gramps/gen/lib/grampstype.py
+gramps/gen/lib/ldsord.py
+gramps/gen/lib/markertype.py
+gramps/gen/lib/nameorigintype.py
+gramps/gen/lib/nametype.py
+gramps/gen/lib/notetype.py
+gramps/gen/lib/person.py
+gramps/gen/lib/repotype.py
+gramps/gen/lib/srcmediatype.py
+gramps/gen/lib/styledtexttagtype.py
+gramps/gen/lib/surnamebase.py
+gramps/gen/lib/urltype.py
+gramps/gen/merge/mergecitationquery.py
+gramps/gen/merge/mergeeventquery.py
+gramps/gen/merge/mergefamilyquery.py
+gramps/gen/merge/mergemediaquery.py
+gramps/gen/merge/mergenotequery.py
+gramps/gen/merge/mergepersonquery.py
+gramps/gen/merge/mergeplacequery.py
+gramps/gen/merge/mergerepositoryquery.py
+gramps/gen/merge/mergesourcequery.py
+gramps/gen/mime/_gnomemime.py
+gramps/gen/mime/_pythonmime.py
+gramps/gen/mime/_winmime.py
+gramps/gen/plug/_gramplet.py
+gramps/gen/plug/_manager.py
+gramps/gen/plug/_pluginreg.py
+gramps/gen/plug/docbackend/docbackend.py
+gramps/gen/plug/report/_book.py
+gramps/gen/plug/report/_constants.py
+gramps/gen/plug/report/_paper.py
+gramps/gen/plug/report/endnotes.py
+gramps/gen/plug/report/utils.py
+gramps/gen/plug/utils.py
+gramps/gen/proxy/private.py
+gramps/gen/relationship.py
+gramps/gen/simple/_simpleaccess.py
+gramps/gen/utils/alive.py
+gramps/gen/utils/db.py
+gramps/gen/utils/keyword.py
+gramps/gen/utils/lds.py
+gramps/gen/utils/place.py
+gramps/gen/utils/string.py
+gramps/gen/utils/trans.py
+gramps/gen/utils/unknown.py
+gramps/grampsapp.py
+gramps/gui/aboutdialog.py
+gramps/gui/clipboard.py
+gramps/gui/columnorder.py
+gramps/gui/configure.py
+gramps/gui/dbloader.py
+gramps/gui/dbman.py
+gramps/gui/dialog.py
+gramps/gui/displaystate.py
+gramps/gui/editors/addmedia.py
+gramps/gui/editors/displaytabs/addrembedlist.py
+gramps/gui/editors/displaytabs/attrembedlist.py
+gramps/gui/editors/displaytabs/backreflist.py
+gramps/gui/editors/displaytabs/backrefmodel.py
+gramps/gui/editors/displaytabs/buttontab.py
+gramps/gui/editors/displaytabs/citationembedlist.py
+gramps/gui/editors/displaytabs/dataembedlist.py
+gramps/gui/editors/displaytabs/embeddedlist.py
+gramps/gui/editors/displaytabs/eventembedlist.py
+gramps/gui/editors/displaytabs/eventrefmodel.py
+gramps/gui/editors/displaytabs/familyldsembedlist.py
+gramps/gui/editors/displaytabs/gallerytab.py
+gramps/gui/editors/displaytabs/ldsembedlist.py
+gramps/gui/editors/displaytabs/locationembedlist.py
+gramps/gui/editors/displaytabs/nameembedlist.py
+gramps/gui/editors/displaytabs/namemodel.py
+gramps/gui/editors/displaytabs/notetab.py
+gramps/gui/editors/displaytabs/personeventembedlist.py
+gramps/gui/editors/displaytabs/personrefembedlist.py
+gramps/gui/editors/displaytabs/repoembedlist.py
+gramps/gui/editors/displaytabs/surnametab.py
+gramps/gui/editors/displaytabs/webembedlist.py
+gramps/gui/editors/editaddress.py
+gramps/gui/editors/editattribute.py
+gramps/gui/editors/editchildref.py
+gramps/gui/editors/editcitation.py
+gramps/gui/editors/editdate.py
+gramps/gui/editors/editevent.py
+gramps/gui/editors/editeventref.py
+gramps/gui/editors/editfamily.py
+gramps/gui/editors/editldsord.py
+gramps/gui/editors/editlink.py
+gramps/gui/editors/editlocation.py
+gramps/gui/editors/editmedia.py
+gramps/gui/editors/editmediaref.py
+gramps/gui/editors/editname.py
+gramps/gui/editors/editnote.py
+gramps/gui/editors/editperson.py
+gramps/gui/editors/editpersonref.py
+gramps/gui/editors/editplace.py
+gramps/gui/editors/editprimary.py
+gramps/gui/editors/editreporef.py
+gramps/gui/editors/editrepository.py
+gramps/gui/editors/editsource.py
+gramps/gui/editors/edittaglist.py
+gramps/gui/editors/editurl.py
+gramps/gui/editors/filtereditor.py
+gramps/gui/editors/objectentries.py
+gramps/gui/filters/_searchbar.py
+gramps/gui/filters/sidebar/_citationsidebarfilter.py
+gramps/gui/filters/sidebar/_eventsidebarfilter.py
+gramps/gui/filters/sidebar/_familysidebarfilter.py
+gramps/gui/filters/sidebar/_mediasidebarfilter.py
+gramps/gui/filters/sidebar/_notesidebarfilter.py
+gramps/gui/filters/sidebar/_personsidebarfilter.py
+gramps/gui/filters/sidebar/_placesidebarfilter.py
+gramps/gui/filters/sidebar/_reposidebarfilter.py
+gramps/gui/filters/sidebar/_sidebarfilter.py
+gramps/gui/filters/sidebar/_sourcesidebarfilter.py
+gramps/gui/glade/addmedia.glade
+gramps/gui/glade/baseselector.glade
+gramps/gui/glade/book.glade
+gramps/gui/glade/clipboard.glade
+gramps/gui/glade/configure.glade
+gramps/gui/glade/dbman.glade
+gramps/gui/glade/dialog.glade
+gramps/gui/glade/displaystate.glade
+gramps/gui/glade/editaddress.glade
+gramps/gui/glade/editattribute.glade
+gramps/gui/glade/editchildref.glade
+gramps/gui/glade/editcitation.glade
+gramps/gui/glade/editdate.glade
+gramps/gui/glade/editevent.glade
+gramps/gui/glade/editeventref.glade
+gramps/gui/glade/editfamily.glade
+gramps/gui/glade/editldsord.glade
+gramps/gui/glade/editlink.glade
+gramps/gui/glade/editlocation.glade
+gramps/gui/glade/editmedia.glade
+gramps/gui/glade/editmediaref.glade
+gramps/gui/glade/editname.glade
+gramps/gui/glade/editnote.glade
+gramps/gui/glade/editperson.glade
+gramps/gui/glade/editpersonref.glade
+gramps/gui/glade/editplace.glade
+gramps/gui/glade/editreporef.glade
+gramps/gui/glade/editrepository.glade
+gramps/gui/glade/editsource.glade
+gramps/gui/glade/editsourceref.glade
+gramps/gui/glade/editurl.glade
+gramps/gui/glade/grampletpane.glade
+gramps/gui/glade/mergecitation.glade
+gramps/gui/glade/mergedata.glade
+gramps/gui/glade/mergeevent.glade
+gramps/gui/glade/mergefamily.glade
+gramps/gui/glade/mergemedia.glade
+gramps/gui/glade/mergenote.glade
+gramps/gui/glade/mergeperson.glade
+gramps/gui/glade/mergeplace.glade
+gramps/gui/glade/mergerepository.glade
+gramps/gui/glade/mergesource.glade
+gramps/gui/glade/papermenu.glade
+gramps/gui/glade/plugins.glade
+gramps/gui/glade/reorder.glade
+gramps/gui/glade/rule.glade
+gramps/gui/glade/styleeditor.glade
+gramps/gui/glade/tipofday.glade
+gramps/gui/glade/updateaddons.glade
+gramps/gui/grampsbar.py
+gramps/gui/grampsgui.py
+gramps/gui/logger/_errorreportassistant.py
+gramps/gui/logger/_errorview.py
+gramps/gui/makefilter.py
+gramps/gui/merge/mergecitation.py
+gramps/gui/merge/mergeevent.py
+gramps/gui/merge/mergefamily.py
+gramps/gui/merge/mergemedia.py
+gramps/gui/merge/mergenote.py
+gramps/gui/merge/mergeperson.py
+gramps/gui/merge/mergeplace.py
+gramps/gui/merge/mergerepository.py
+gramps/gui/merge/mergesource.py
+gramps/gui/plug/_dialogs.py
+gramps/gui/plug/_guioptions.py
+gramps/gui/plug/_windows.py
+gramps/gui/plug/export/_exportassistant.py
+gramps/gui/plug/export/_exportoptions.py
+gramps/gui/plug/quick/_quickreports.py
+gramps/gui/plug/quick/_quicktable.py
+gramps/gui/plug/quick/_textbufdoc.py
+gramps/gui/plug/report/_bookdialog.py
+gramps/gui/plug/report/_docreportdialog.py
+gramps/gui/plug/report/_graphvizreportdialog.py
+gramps/gui/plug/report/_papermenu.py
+gramps/gui/plug/report/_reportdialog.py
+gramps/gui/plug/report/_stylecombobox.py
+gramps/gui/plug/report/_styleeditor.py
+gramps/gui/plug/tool.py
+gramps/gui/selectors/selectcitation.py
+gramps/gui/selectors/selectevent.py
+gramps/gui/selectors/selectfamily.py
+gramps/gui/selectors/selectnote.py
+gramps/gui/selectors/selectobject.py
+gramps/gui/selectors/selectperson.py
+gramps/gui/selectors/selectplace.py
+gramps/gui/selectors/selectrepository.py
+gramps/gui/selectors/selectsource.py
+gramps/gui/spell.py
+gramps/gui/tipofday.py
+gramps/gui/undohistory.py
+gramps/gui/utils.py
+gramps/gui/viewmanager.py
+gramps/gui/views/bookmarks.py
+gramps/gui/views/listview.py
+gramps/gui/views/navigationview.py
+gramps/gui/views/pageview.py
+gramps/gui/views/tags.py
+gramps/gui/views/treemodels/citationtreemodel.py
+gramps/gui/views/treemodels/mediamodel.py
+gramps/gui/views/treemodels/peoplemodel.py
+gramps/gui/views/treemodels/placemodel.py
+gramps/gui/views/treemodels/treebasemodel.py
+gramps/gui/widgets/buttons.py
+gramps/gui/widgets/expandcollapsearrow.py
+gramps/gui/widgets/grampletpane.py
+gramps/gui/widgets/labels.py
+gramps/gui/widgets/monitoredwidgets.py
+gramps/gui/widgets/photo.py
+gramps/gui/widgets/progressdialog.py
+gramps/gui/widgets/reorderfam.py
+gramps/gui/widgets/styledtextbuffer.py
+gramps/gui/widgets/styledtexteditor.py
+gramps/gui/widgets/validatedmaskedentry.py
+gramps/plugins/docgen/asciidoc.py
+gramps/plugins/docgen/docgen.gpr.py
+gramps/plugins/docgen/gtkprint.glade
+gramps/plugins/docgen/gtkprint.py
+gramps/plugins/docgen/htmldoc.py
+gramps/plugins/docgen/odfdoc.py
+gramps/plugins/docgen/pdfdoc.py
+gramps/plugins/docgen/psdrawdoc.py
+gramps/plugins/docgen/rtfdoc.py
+gramps/plugins/docgen/svgdrawdoc.py
+gramps/plugins/drawreport/ancestortree.py
+gramps/plugins/drawreport/calendarreport.py
+gramps/plugins/drawreport/descendtree.py
+gramps/plugins/drawreport/drawplugins.gpr.py
+gramps/plugins/drawreport/fanchart.py
+gramps/plugins/drawreport/statisticschart.py
+gramps/plugins/drawreport/timeline.py
+gramps/plugins/export/exportcsv.py
+gramps/plugins/export/exportgedcom.py
+gramps/plugins/export/exportgeneweb.py
+gramps/plugins/export/exportpkg.py
+gramps/plugins/export/exportvcalendar.py
+gramps/plugins/export/exportvcard.py
+gramps/plugins/export/exportxml.py
+gramps/plugins/gramplet/ageondategramplet.py
+gramps/plugins/gramplet/agestats.py
+gramps/plugins/gramplet/attributes.py
+gramps/plugins/gramplet/attributesgramplet.py
+gramps/plugins/gramplet/backlinks.py
+gramps/plugins/gramplet/calendargramplet.py
+gramps/plugins/gramplet/children.py
+gramps/plugins/gramplet/citations.py
+gramps/plugins/gramplet/descendgramplet.py
+gramps/plugins/gramplet/editexifmetadata.py
+gramps/plugins/gramplet/events.py
+gramps/plugins/gramplet/fanchartdescgramplet.py
+gramps/plugins/gramplet/fanchartgramplet.py
+gramps/plugins/gramplet/faqgramplet.py
+gramps/plugins/gramplet/givennamegramplet.py
+gramps/plugins/gramplet/gramplet.gpr.py
+gramps/plugins/gramplet/notes.py
+gramps/plugins/gramplet/pedigreegramplet.py
+gramps/plugins/gramplet/persondetails.py
+gramps/plugins/gramplet/personresidence.py
+gramps/plugins/gramplet/placedetails.py
+gramps/plugins/gramplet/quickviewgramplet.py
+gramps/plugins/gramplet/recordsgramplet.py
+gramps/plugins/gramplet/relativegramplet.py
+gramps/plugins/gramplet/repositorydetails.py
+gramps/plugins/gramplet/sessionloggramplet.py
+gramps/plugins/gramplet/statsgramplet.py
+gramps/plugins/gramplet/surnamecloudgramplet.py
+gramps/plugins/gramplet/todogramplet.py
+gramps/plugins/gramplet/topsurnamesgramplet.py
+gramps/plugins/gramplet/welcomegramplet.py
+gramps/plugins/gramplet/whatsnext.py
+gramps/plugins/graph/graphplugins.gpr.py
+gramps/plugins/graph/gvfamilylines.py
+gramps/plugins/graph/gvhourglass.py
+gramps/plugins/graph/gvrelgraph.py
+gramps/plugins/import/import.gpr.py
+gramps/plugins/import/importcsv.py
+gramps/plugins/import/importgedcom.glade
+gramps/plugins/import/importgedcom.py
+gramps/plugins/import/importgeneweb.py
+gramps/plugins/import/importgpkg.py
+gramps/plugins/import/importgrdb.py
+gramps/plugins/import/importprogen.py
+gramps/plugins/import/importvcard.py
+gramps/plugins/import/importxml.py
+gramps/plugins/lib/holidays.xml.in
+gramps/plugins/lib/libgedcom.py
+gramps/plugins/lib/libgrdb.py
+gramps/plugins/lib/libhtmlconst.py
+gramps/plugins/lib/libmetadata.py
+gramps/plugins/lib/libnarrate.py
+gramps/plugins/lib/libpersonview.py
+gramps/plugins/lib/libplaceview.py
+gramps/plugins/lib/libplugins.gpr.py
+gramps/plugins/lib/librecords.py
+gramps/plugins/lib/libtranslate.py
+gramps/plugins/lib/maps/geography.py
+gramps/plugins/lib/maps/osmGps.py
+gramps/plugins/lib/maps/placeselection.py
+gramps/plugins/mapservices/eniroswedenmap.py
+gramps/plugins/mapservices/mapservice.gpr.py
+gramps/plugins/quickview/ageondate.py
+gramps/plugins/quickview/all_events.py
+gramps/plugins/quickview/all_relations.py
+gramps/plugins/quickview/attributematch.py
+gramps/plugins/quickview/filterbyname.py
+gramps/plugins/quickview/lineage.py
+gramps/plugins/quickview/linkreferences.py
+gramps/plugins/quickview/onthisday.py
+gramps/plugins/quickview/quickview.gpr.py
+gramps/plugins/quickview/references.py
+gramps/plugins/quickview/reporef.py
+gramps/plugins/quickview/samesurnames.py
+gramps/plugins/quickview/siblings.py
+gramps/plugins/rel/relplugins.gpr.py
+gramps/plugins/textreport/alphabeticalindex.py
+gramps/plugins/textreport/ancestorreport.py
+gramps/plugins/textreport/birthdayreport.py
+gramps/plugins/textreport/custombooktext.py
+gramps/plugins/textreport/descendreport.py
+gramps/plugins/textreport/detancestralreport.py
+gramps/plugins/textreport/detdescendantreport.py
+gramps/plugins/textreport/endoflinereport.py
+gramps/plugins/textreport/familygroup.py
+gramps/plugins/textreport/indivcomplete.py
+gramps/plugins/textreport/kinshipreport.py
+gramps/plugins/textreport/numberofancestorsreport.py
+gramps/plugins/textreport/placereport.py
+gramps/plugins/textreport/recordsreport.py
+gramps/plugins/textreport/simplebooktitle.py
+gramps/plugins/textreport/summary.py
+gramps/plugins/textreport/tableofcontents.py
+gramps/plugins/textreport/tagreport.py
+gramps/plugins/textreport/textplugins.gpr.py
+gramps/plugins/tool/changenames.glade
+gramps/plugins/tool/changenames.py
+gramps/plugins/tool/changetypes.glade
+gramps/plugins/tool/changetypes.py
+gramps/plugins/tool/check.py
+gramps/plugins/tool/desbrowser.glade
+gramps/plugins/tool/desbrowser.py
+gramps/plugins/tool/eval.glade
+gramps/plugins/tool/eval.py
+gramps/plugins/tool/eventcmp.glade
+gramps/plugins/tool/eventcmp.py
+gramps/plugins/tool/eventnames.py
+gramps/plugins/tool/extractcity.py
+gramps/plugins/tool/finddupes.glade
+gramps/plugins/tool/finddupes.py
+gramps/plugins/tool/leak.glade
+gramps/plugins/tool/leak.py
+gramps/plugins/tool/mediamanager.py
+gramps/plugins/tool/mergecitations.glade
+gramps/plugins/tool/mergecitations.py
+gramps/plugins/tool/notrelated.glade
+gramps/plugins/tool/notrelated.py
+gramps/plugins/tool/ownereditor.glade
+gramps/plugins/tool/ownereditor.py
+gramps/plugins/tool/patchnames.glade
+gramps/plugins/tool/patchnames.py
+gramps/plugins/tool/rebuild.py
+gramps/plugins/tool/rebuildgenderstat.py
+gramps/plugins/tool/rebuildrefmap.py
+gramps/plugins/tool/relcalc.glade
+gramps/plugins/tool/relcalc.py
+gramps/plugins/tool/removeunused.glade
+gramps/plugins/tool/removeunused.py
+gramps/plugins/tool/reorderids.py
+gramps/plugins/tool/sortevents.py
+gramps/plugins/tool/soundgen.glade
+gramps/plugins/tool/soundgen.py
+gramps/plugins/tool/tools.gpr.py
+gramps/plugins/tool/verify.glade
+gramps/plugins/tool/verify.py
+gramps/plugins/view/citationlistview.py
+gramps/plugins/view/citationtreeview.py
+gramps/plugins/view/eventview.py
+gramps/plugins/view/familyview.py
+gramps/plugins/view/fanchartdescview.py
+gramps/plugins/view/fanchartview.py
+gramps/plugins/view/geoclose.py
+gramps/plugins/view/geoevents.py
+gramps/plugins/view/geofamclose.py
+gramps/plugins/view/geofamily.py
+gramps/plugins/view/geography.gpr.py
+gramps/plugins/view/geomoves.py
+gramps/plugins/view/geoperson.py
+gramps/plugins/view/geoplaces.py
+gramps/plugins/view/grampletview.py
+gramps/plugins/view/htmlrenderer.gpr.py
+gramps/plugins/view/htmlrenderer.py
+gramps/plugins/view/mediaview.py
+gramps/plugins/view/noteview.py
+gramps/plugins/view/pedigreeview.py
+gramps/plugins/view/personlistview.py
+gramps/plugins/view/persontreeview.py
+gramps/plugins/view/placelistview.py
+gramps/plugins/view/placetreeview.py
+gramps/plugins/view/relview.py
+gramps/plugins/view/repoview.py
+gramps/plugins/view/sourceview.py
+gramps/plugins/view/view.gpr.py
+gramps/plugins/webreport/narrativeweb.py
+gramps/plugins/webreport/webcal.py
+gramps/plugins/webreport/webplugins.gpr.py
+gramps/plugins/webstuff/webstuff.gpr.py
+gramps/plugins/webstuff/webstuff.py
+gramps/webapp/grampsdb/view/citation.py
+gramps/webapp/grampsdb/view/event.py
+gramps/webapp/grampsdb/view/family.py
+gramps/webapp/grampsdb/view/media.py
+gramps/webapp/grampsdb/view/note.py
+gramps/webapp/grampsdb/view/person.py
+gramps/webapp/grampsdb/view/place.py
+gramps/webapp/grampsdb/view/repository.py
+gramps/webapp/grampsdb/view/source.py
+gramps/webapp/grampsdb/view/tag.py
+gramps/webapp/grampsdb/views.py
+osm-gps-map/examples/mapviewer.ui
 #
 #   Files to extract from and then merge into
 #
diff --git a/po/update_po.py b/po/update_po.py
index 917999242..2787e97d3 100644
--- a/po/update_po.py
+++ b/po/update_po.py
@@ -472,9 +472,7 @@ def create_filesfile():
                     full_filename = os.path.join(dirpath, filename)
                     #Skip the file if in POTFILES.skip
                     if full_filename[lentopdir:] in notinfiles:
-                        continue
-                    #Add the file
-                    infiles['../gramps' + full_filename[lentopdir:]] = None
+                        infiles['../gramps' + full_filename[lentopdir:]] = None
     #now we write out all the files in form ../gramps/filename
     f = open('tmpfiles', 'w')
     for file in sorted(infiles.keys()):