diff --git a/po/gramps.pot b/po/gramps.pot
index 13777c0d1..5ae1d3945 100644
--- a/po/gramps.pot
+++ b/po/gramps.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-23 12:07-0800\n"
+"POT-Creation-Date: 2017-01-05 09:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1149,7 +1149,7 @@ msgstr ""
 
 #: ../gramps/cli/clidbman.py:169 ../gramps/cli/clidbman.py:171
 #: ../gramps/gui/clipboard.py:186 ../gramps/gui/clipboard.py:187
-#: ../gramps/gui/plug/_windows.py:488
+#: ../gramps/gui/plug/_windows.py:496
 msgid "Unavailable"
 msgstr ""
 
@@ -1166,7 +1166,7 @@ msgstr ""
 msgid "Database"
 msgstr ""
 
-#: ../gramps/cli/clidbman.py:175 ../gramps/gui/dbman.py:396
+#: ../gramps/cli/clidbman.py:175 ../gramps/gui/dbman.py:401
 msgid "Last accessed"
 msgstr ""
 
@@ -1210,7 +1210,7 @@ msgid ""
 "\"%s\"?"
 msgstr ""
 
-#: ../gramps/cli/clidbman.py:441 ../gramps/gui/dbman.py:720
+#: ../gramps/cli/clidbman.py:441 ../gramps/gui/dbman.py:726
 msgid "Could not delete Family Tree"
 msgstr ""
 
@@ -1242,6 +1242,17 @@ msgid "Locked by %s"
 msgstr ""
 
 #. allow deferred translation of attribute UI strings
+#. Pro-Gen has a text field for the date.
+#. It can be anything (it should be dd-mm-yyyy), but we have seen:
+#. yyyy
+#. mm-yyyy
+#. before yyyy
+#. dd=mm-yyyy  (typo I guess)
+#. 00-00-yyyy
+#. oo-oo-yyyy
+#. dd-mm-00 (does this mean we do not know about the year?)
+#. This function tries to parse the text and create a proper Gramps Date()
+#. object. If all else fails we create a MOD_TEXTONLY Date() object.
 #: ../gramps/cli/clidbman.py:558 ../gramps/gen/lib/attrtype.py:62
 #: ../gramps/gen/lib/childreftype.py:73 ../gramps/gen/lib/eventroletype.py:52
 #: ../gramps/gen/lib/eventtype.py:162 ../gramps/gen/lib/familyreltype.py:47
@@ -1253,7 +1264,7 @@ msgstr ""
 #: ../gramps/gen/utils/lds.py:86 ../gramps/gen/utils/unknown.py:119
 #: ../gramps/gen/utils/unknown.py:121 ../gramps/gen/utils/unknown.py:125
 #: ../gramps/gen/utils/unknown.py:131 ../gramps/gen/utils/unknown.py:136
-#: ../gramps/gui/clipboard.py:183 ../gramps/gui/dbman.py:981
+#: ../gramps/gui/clipboard.py:183 ../gramps/gui/dbman.py:987
 #: ../gramps/gui/editors/displaytabs/personrefembedlist.py:125
 #: ../gramps/gui/editors/displaytabs/personrefembedlist.py:143
 #: ../gramps/gui/editors/editmedia.py:178
@@ -1267,6 +1278,7 @@ msgstr ""
 #: ../gramps/plugins/gramplet/relativegramplet.py:135
 #: ../gramps/plugins/graph/gvfamilylines.py:267
 #: ../gramps/plugins/graph/gvrelgraph.py:791
+#: ../gramps/plugins/importer/importprogen.py:981
 #: ../gramps/plugins/lib/maps/geography.py:836
 #: ../gramps/plugins/lib/maps/geography.py:846
 #: ../gramps/plugins/lib/maps/geography.py:847
@@ -1341,12 +1353,12 @@ msgid ""
 "the Repair button"
 msgstr ""
 
-#: ../gramps/cli/grampscli.py:152 ../gramps/gui/dbloader.py:306
+#: ../gramps/cli/grampscli.py:152 ../gramps/gui/dbloader.py:160
 msgid "Read only database"
 msgstr ""
 
-#: ../gramps/cli/grampscli.py:153 ../gramps/gui/dbloader.py:247
-#: ../gramps/gui/dbloader.py:307
+#: ../gramps/cli/grampscli.py:153 ../gramps/gui/dbloader.py:161
+#: ../gramps/gui/dbloader.py:500
 msgid "You do not have write access to the selected file."
 msgstr ""
 
@@ -1354,14 +1366,14 @@ msgstr ""
 #: ../gramps/cli/grampscli.py:185 ../gramps/cli/grampscli.py:188
 #: ../gramps/cli/grampscli.py:191 ../gramps/cli/grampscli.py:194
 #: ../gramps/cli/grampscli.py:197 ../gramps/cli/grampscli.py:200
-#: ../gramps/cli/grampscli.py:203 ../gramps/gui/dbloader.py:410
-#: ../gramps/gui/dbloader.py:413 ../gramps/gui/dbloader.py:416
-#: ../gramps/gui/dbloader.py:419 ../gramps/gui/dbloader.py:422
+#: ../gramps/cli/grampscli.py:203 ../gramps/gui/dbloader.py:264
+#: ../gramps/gui/dbloader.py:267 ../gramps/gui/dbloader.py:270
+#: ../gramps/gui/dbloader.py:273 ../gramps/gui/dbloader.py:276
 msgid "Cannot open database"
 msgstr ""
 
-#: ../gramps/cli/grampscli.py:207 ../gramps/gui/dbloader.py:203
-#: ../gramps/gui/dbloader.py:426
+#: ../gramps/cli/grampscli.py:207 ../gramps/gui/dbloader.py:280
+#: ../gramps/gui/dbloader.py:457
 #, python-format
 msgid "Could not open file: %s"
 msgstr ""
@@ -4023,7 +4035,7 @@ msgstr ""
 
 #: ../gramps/gen/filters/rules/media/_hasmedia.py:48
 #: ../gramps/gui/glade/mergemedia.glade:245
-#: ../gramps/gui/glade/mergemedia.glade:261 ../gramps/gui/viewmanager.py:1299
+#: ../gramps/gui/glade/mergemedia.glade:261 ../gramps/gui/viewmanager.py:1698
 msgid "Path:"
 msgstr ""
 
@@ -5585,8 +5597,8 @@ msgstr ""
 #: ../gramps/gui/filters/sidebar/_eventsidebarfilter.py:104
 #: ../gramps/gui/glade/rule.glade:931
 #: ../gramps/gui/glade/styleeditor.glade:262
-#: ../gramps/gui/plug/_windows.py:130 ../gramps/gui/plug/_windows.py:239
-#: ../gramps/gui/plug/_windows.py:612 ../gramps/gui/plug/_windows.py:1096
+#: ../gramps/gui/plug/_windows.py:134 ../gramps/gui/plug/_windows.py:243
+#: ../gramps/gui/plug/_windows.py:620 ../gramps/gui/plug/_windows.py:1104
 #: ../gramps/gui/selectors/selectevent.py:73
 #: ../gramps/plugins/gramplet/coordinates.py:90
 #: ../gramps/plugins/gramplet/events.py:86
@@ -5838,7 +5850,9 @@ msgstr ""
 msgid "about"
 msgstr ""
 
-#: ../gramps/gen/lib/date.py:1889 ../gramps/plugins/lib/libsubstkeyword.py:314
+#: ../gramps/gen/lib/date.py:1889
+#: ../gramps/plugins/importer/importprogen.py:1716
+#: ../gramps/plugins/lib/libsubstkeyword.py:314
 msgid "after"
 msgstr ""
 
@@ -6711,9 +6725,9 @@ msgstr ""
 #: ../gramps/gui/filters/sidebar/_personsidebarfilter.py:126
 #: ../gramps/gui/filters/sidebar/_placesidebarfilter.py:105
 #: ../gramps/gui/filters/sidebar/_reposidebarfilter.py:104
-#: ../gramps/gui/plug/_guioptions.py:1165 ../gramps/gui/plug/_windows.py:126
-#: ../gramps/gui/plug/_windows.py:1095
-#: ../gramps/gui/plug/report/_bookdialog.py:372
+#: ../gramps/gui/plug/_guioptions.py:1165 ../gramps/gui/plug/_windows.py:130
+#: ../gramps/gui/plug/_windows.py:1103
+#: ../gramps/gui/plug/report/_bookdialog.py:373
 #: ../gramps/gui/selectors/selectperson.py:93
 #: ../gramps/gui/selectors/selectplace.py:70
 #: ../gramps/gui/views/bookmarks.py:240 ../gramps/gui/views/tags.py:402
@@ -6807,10 +6821,10 @@ msgstr ""
 #: ../gramps/gui/filters/sidebar/_notesidebarfilter.py:102
 #: ../gramps/gui/filters/sidebar/_placesidebarfilter.py:106
 #: ../gramps/gui/filters/sidebar/_reposidebarfilter.py:105
-#: ../gramps/gui/merge/mergeperson.py:253 ../gramps/gui/plug/_windows.py:119
-#: ../gramps/gui/plug/_windows.py:235 ../gramps/gui/plug/_windows.py:1094
-#: ../gramps/gui/plug/report/_bookdialog.py:373
-#: ../gramps/gui/plug/report/_bookdialog.py:377
+#: ../gramps/gui/merge/mergeperson.py:253 ../gramps/gui/plug/_windows.py:123
+#: ../gramps/gui/plug/_windows.py:239 ../gramps/gui/plug/_windows.py:1102
+#: ../gramps/gui/plug/report/_bookdialog.py:374
+#: ../gramps/gui/plug/report/_bookdialog.py:378
 #: ../gramps/gui/selectors/selectevent.py:69
 #: ../gramps/gui/selectors/selectnote.py:76
 #: ../gramps/gui/selectors/selectobject.py:82
@@ -6944,7 +6958,7 @@ msgid "Matrilineal"
 msgstr ""
 
 #: ../gramps/gen/lib/nameorigintype.py:86 ../gramps/gui/clipboard.py:323
-#: ../gramps/gui/plug/_windows.py:617
+#: ../gramps/gui/plug/_windows.py:625
 msgid "Location"
 msgstr ""
 
@@ -6966,7 +6980,7 @@ msgstr ""
 #: ../gramps/gui/editors/editplaceref.py:71
 #: ../gramps/gui/editors/editreporef.py:71
 #: ../gramps/gui/glade/editeventref.glade:183
-#: ../gramps/gui/glade/editeventref.glade:563
+#: ../gramps/gui/glade/editeventref.glade:601
 #: ../gramps/gui/glade/editmediaref.glade:342
 #: ../gramps/gui/glade/editmediaref.glade:756
 #: ../gramps/gui/glade/editname.glade:671
@@ -7510,18 +7524,8 @@ msgstr ""
 msgid "Merge Person"
 msgstr ""
 
-#: ../gramps/gen/merge/mergepersonquery.py:157
-msgid ""
-"A person with multiple relations with the same spouse is about to be merged. "
-"This is beyond the capabilities of the merge routine. The merge is aborted."
-msgstr ""
-
-#: ../gramps/gen/merge/mergepersonquery.py:168
-msgid "Multiple families get merged. This is unusual, the merge is aborted."
-msgstr ""
-
 #: ../gramps/gen/merge/mergeplacequery.py:60
-#: ../gramps/gui/merge/mergeplace.py:77
+#: ../gramps/gui/merge/mergeplace.py:78
 msgid "Merge Places"
 msgstr ""
 
@@ -8080,7 +8084,7 @@ msgstr ""
 #. ------------------------------------------------------------------------
 #: ../gramps/gen/plug/report/_book.py:71 ../gramps/gui/plug/_dialogs.py:59
 #: ../gramps/gui/plug/report/_bookdialog.py:84
-#: ../gramps/gui/viewmanager.py:111
+#: ../gramps/gui/viewmanager.py:112
 msgid "Unsupported"
 msgstr ""
 
@@ -8278,7 +8282,7 @@ msgstr ""
 #. translators: needed for French, ignore otherwise
 #: ../gramps/gen/plug/report/utils.py:160
 #: ../gramps/gui/editors/editattribute.py:135
-#: ../gramps/gui/plug/_windows.py:677
+#: ../gramps/gui/plug/_windows.py:685
 #: ../gramps/plugins/textreport/detancestralreport.py:461
 #: ../gramps/plugins/textreport/detdescendantreport.py:508
 #: ../gramps/plugins/textreport/familygroup.py:136
@@ -8446,130 +8450,130 @@ msgid ""
 "Gramps."
 msgstr ""
 
-#: ../gramps/gen/relationship.py:860
+#: ../gramps/gen/relationship.py:1273
 #: ../gramps/plugins/view/pedigreeview.py:1530
 msgid "Relationship loop detected"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:919
+#: ../gramps/gen/relationship.py:1332
 #, python-format
 msgid ""
 "Family Tree reaches back more than the maximum %d generations searched.\n"
 "It is possible that relationships have been missed"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:993
+#: ../gramps/gen/relationship.py:1406
 msgid "Relationship loop detected:"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:994
+#: ../gramps/gen/relationship.py:1407
 #, python-format
 msgid "Person %(person)s connects to himself via %(relation)s"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1272
+#: ../gramps/gen/relationship.py:1685
 msgid "undefined"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1757
+#: ../gramps/gen/relationship.py:2170
 #: ../gramps/plugins/importer/importcsv.py:217
 msgid "husband"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1759
+#: ../gramps/gen/relationship.py:2172
 #: ../gramps/plugins/importer/importcsv.py:214
 msgid "wife"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1761
+#: ../gramps/gen/relationship.py:2174
 msgid "gender unknown|spouse"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1764
+#: ../gramps/gen/relationship.py:2177
 msgid "ex-husband"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1766
+#: ../gramps/gen/relationship.py:2179
 msgid "ex-wife"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1768
+#: ../gramps/gen/relationship.py:2181
 msgid "gender unknown|ex-spouse"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1771
+#: ../gramps/gen/relationship.py:2184
 msgid "unmarried|husband"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1773
+#: ../gramps/gen/relationship.py:2186
 msgid "unmarried|wife"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1775
+#: ../gramps/gen/relationship.py:2188
 msgid "gender unknown,unmarried|spouse"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1778
+#: ../gramps/gen/relationship.py:2191
 msgid "unmarried|ex-husband"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1780
+#: ../gramps/gen/relationship.py:2193
 msgid "unmarried|ex-wife"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1782
+#: ../gramps/gen/relationship.py:2195
 msgid "gender unknown,unmarried|ex-spouse"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1785
+#: ../gramps/gen/relationship.py:2198
 msgid "male,civil union|partner"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1787
+#: ../gramps/gen/relationship.py:2200
 msgid "female,civil union|partner"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1789
+#: ../gramps/gen/relationship.py:2202
 msgid "gender unknown,civil union|partner"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1792
+#: ../gramps/gen/relationship.py:2205
 msgid "male,civil union|former partner"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1794
+#: ../gramps/gen/relationship.py:2207
 msgid "female,civil union|former partner"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1796
+#: ../gramps/gen/relationship.py:2209
 msgid "gender unknown,civil union|former partner"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1799
+#: ../gramps/gen/relationship.py:2212
 msgid "male,unknown relation|partner"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1801
+#: ../gramps/gen/relationship.py:2214
 msgid "female,unknown relation|partner"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1803
+#: ../gramps/gen/relationship.py:2216
 msgid "gender unknown,unknown relation|partner"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1808
+#: ../gramps/gen/relationship.py:2221
 msgid "male,unknown relation|former partner"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1810
+#: ../gramps/gen/relationship.py:2223
 msgid "female,unknown relation|former partner"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1812
+#: ../gramps/gen/relationship.py:2225
 msgid "gender unknown,unknown relation|former partner"
 msgstr ""
 
-#: ../gramps/gen/relationship.py:1905
+#: ../gramps/gen/relationship.py:2318
 #, python-format
 msgid ""
 "Family relationship translator not available for language '%s'. Using "
@@ -9405,6 +9409,7 @@ msgstr ""
 #: ../gramps/plugins/export/exportcsv.py:473
 #: ../gramps/plugins/gramplet/quickviewgramplet.py:114
 #: ../gramps/plugins/importer/importcsv.py:169
+#: ../gramps/plugins/importer/importprogen.py:871
 #: ../gramps/plugins/quickview/filterbyname.py:195
 #: ../gramps/plugins/quickview/filterbyname.py:258
 #: ../gramps/plugins/quickview/quickview.gpr.py:205
@@ -9427,7 +9432,7 @@ msgstr ""
 msgid "Repository"
 msgstr ""
 
-#: ../gramps/gui/clipboard.py:967 ../gramps/gui/dbman.py:127
+#: ../gramps/gui/clipboard.py:967 ../gramps/gui/dbman.py:126
 #: ../gramps/gui/editors/displaytabs/attrembedlist.py:63
 #: ../gramps/gui/editors/displaytabs/srcattrembedlist.py:64
 #: ../gramps/plugins/gramplet/attributes.py:57
@@ -9473,7 +9478,7 @@ msgstr ""
 
 #: ../gramps/gui/columnorder.py:107 ../gramps/gui/configure.py:1543
 #: ../gramps/gui/configure.py:1566 ../gramps/gui/configure.py:1591
-#: ../gramps/gui/plug/_dialogs.py:130 ../gramps/gui/viewmanager.py:1423
+#: ../gramps/gui/plug/_dialogs.py:130 ../gramps/gui/viewmanager.py:1828
 #: ../gramps/plugins/lib/maps/geography.py:1007
 #: ../gramps/plugins/lib/maps/geography.py:1261
 msgid "_Apply"
@@ -9508,17 +9513,17 @@ msgstr ""
 
 #. self.window.connect('response', self.close)
 #: ../gramps/gui/configure.py:106 ../gramps/gui/configure.py:180
-#: ../gramps/gui/glade/book.glade:466 ../gramps/gui/glade/book.glade:540
+#: ../gramps/gui/glade/book.glade:466 ../gramps/gui/glade/book.glade:538
 #: ../gramps/gui/glade/clipboard.glade:71 ../gramps/gui/glade/dialog.glade:20
 #: ../gramps/gui/glade/dialog.glade:141
-#: ../gramps/gui/glade/displaystate.glade:25
+#: ../gramps/gui/glade/displaystate.glade:23
 #: ../gramps/gui/glade/plugins.glade:22 ../gramps/gui/glade/rule.glade:24
 #: ../gramps/gui/glade/rule.glade:1024 ../gramps/gui/glade/tipofday.glade:117
 #: ../gramps/gui/glade/updateaddons.glade:26
-#: ../gramps/gui/plug/_windows.py:102 ../gramps/gui/plug/_windows.py:683
-#: ../gramps/gui/plug/_windows.py:739
-#: ../gramps/gui/plug/quick/_textbufdoc.py:61 ../gramps/gui/undohistory.py:90
-#: ../gramps/gui/viewmanager.py:511 ../gramps/gui/viewmanager.py:1295
+#: ../gramps/gui/plug/_windows.py:105 ../gramps/gui/plug/_windows.py:691
+#: ../gramps/gui/plug/_windows.py:747
+#: ../gramps/gui/plug/quick/_textbufdoc.py:60 ../gramps/gui/undohistory.py:90
+#: ../gramps/gui/viewmanager.py:512 ../gramps/gui/viewmanager.py:1692
 #: ../gramps/gui/views/bookmarks.py:258 ../gramps/gui/views/tags.py:424
 #: ../gramps/gui/widgets/grampletbar.py:635
 #: ../gramps/gui/widgets/grampletpane.py:236
@@ -9614,7 +9619,7 @@ msgstr ""
 msgid "Phone"
 msgstr ""
 
-#: ../gramps/gui/configure.py:524 ../gramps/gui/plug/_windows.py:615
+#: ../gramps/gui/configure.py:524 ../gramps/gui/plug/_windows.py:623
 #: ../gramps/plugins/view/repoview.py:95
 msgid "Email"
 msgstr ""
@@ -9756,7 +9761,7 @@ msgstr ""
 #: ../gramps/gui/editors/displaytabs/nameembedlist.py:129
 #: ../gramps/gui/editors/displaytabs/webembedlist.py:115
 #: ../gramps/gui/editors/editfamily.py:148
-#: ../gramps/gui/plug/report/_bookdialog.py:652
+#: ../gramps/gui/plug/report/_bookdialog.py:653
 #: ../gramps/gui/views/tags.py:416 ../gramps/gui/widgets/fanchart.py:1712
 #: ../gramps/gui/widgets/fanchart.py:1754
 #: ../gramps/plugins/view/pedigreeview.py:1627
@@ -9772,8 +9777,8 @@ msgstr ""
 #: ../gramps/gui/editors/displaytabs/nameembedlist.py:130
 #: ../gramps/gui/editors/displaytabs/webembedlist.py:116
 #: ../gramps/gui/glade/editlink.glade:222
-#: ../gramps/gui/plug/report/_bookdialog.py:626
-#: ../gramps/gui/viewmanager.py:486 ../gramps/gui/views/tags.py:417
+#: ../gramps/gui/plug/report/_bookdialog.py:627
+#: ../gramps/gui/viewmanager.py:487 ../gramps/gui/views/tags.py:417
 #: ../gramps/gui/widgets/fanchart.py:1511
 #: ../gramps/plugins/view/pedigreeview.py:1662
 #: ../gramps/plugins/view/pedigreeview.py:1890
@@ -9787,7 +9792,7 @@ msgstr ""
 #: ../gramps/gui/editors/displaytabs/nameembedlist.py:124
 #: ../gramps/gui/editors/displaytabs/webembedlist.py:117
 #: ../gramps/gui/editors/editfamily.py:151
-#: ../gramps/gui/plug/report/_bookdialog.py:621
+#: ../gramps/gui/plug/report/_bookdialog.py:622
 #: ../gramps/gui/views/bookmarks.py:254 ../gramps/gui/views/listview.py:212
 #: ../gramps/gui/views/tags.py:418 ../gramps/plugins/lib/libpersonview.py:391
 msgid "_Remove"
@@ -9800,7 +9805,7 @@ msgstr ""
 #: ../gramps/gui/glade/editperson.glade:12
 #: ../gramps/gui/glade/editperson.glade:516 ../gramps/gui/glade/rule.glade:463
 #: ../gramps/gui/glade/styleeditor.glade:1872
-#: ../gramps/gui/plug/_windows.py:148 ../gramps/gui/plug/_windows.py:203
+#: ../gramps/gui/plug/_windows.py:152 ../gramps/gui/plug/_windows.py:207
 #: ../gramps/plugins/gramplet/coordinates.py:142
 #: ../gramps/plugins/gramplet/descendant.py:110
 msgid "Edit"
@@ -10059,7 +10064,7 @@ msgid "Always"
 msgstr ""
 
 #: ../gramps/gui/configure.py:1375
-msgid "Check for updates"
+msgid "Check for addon updates"
 msgstr ""
 
 #: ../gramps/gui/configure.py:1381
@@ -10087,7 +10092,7 @@ msgid "Do not ask about previously notified addons"
 msgstr ""
 
 #: ../gramps/gui/configure.py:1407
-msgid "Check now"
+msgid "Check for updated addons now"
 msgstr ""
 
 #: ../gramps/gui/configure.py:1417
@@ -10162,7 +10167,7 @@ msgid "Select media directory"
 msgstr ""
 
 #: ../gramps/gui/configure.py:1541 ../gramps/gui/configure.py:1564
-#: ../gramps/gui/configure.py:1589 ../gramps/gui/dbloader.py:146
+#: ../gramps/gui/configure.py:1589 ../gramps/gui/dbloader.py:397
 #: ../gramps/gui/editors/edittaglist.py:117
 #: ../gramps/gui/glade/addmedia.glade:22
 #: ../gramps/gui/glade/baseselector.glade:24
@@ -10204,14 +10209,14 @@ msgstr ""
 #: ../gramps/gui/glade/mergeplace.glade:21
 #: ../gramps/gui/glade/mergerepository.glade:21
 #: ../gramps/gui/glade/mergesource.glade:21
-#: ../gramps/gui/glade/reorder.glade:24 ../gramps/gui/glade/rule.glade:316
+#: ../gramps/gui/glade/reorder.glade:22 ../gramps/gui/glade/rule.glade:316
 #: ../gramps/gui/glade/rule.glade:747 ../gramps/gui/glade/styleeditor.glade:86
 #: ../gramps/gui/glade/styleeditor.glade:1723
 #: ../gramps/gui/logger/_errorview.py:141 ../gramps/gui/plug/_guioptions.py:78
-#: ../gramps/gui/plug/_guioptions.py:1728 ../gramps/gui/plug/_windows.py:432
+#: ../gramps/gui/plug/_guioptions.py:1728 ../gramps/gui/plug/_windows.py:440
 #: ../gramps/gui/plug/report/_fileentry.py:64
 #: ../gramps/gui/plug/report/_reportdialog.py:161 ../gramps/gui/utils.py:172
-#: ../gramps/gui/viewmanager.py:1421 ../gramps/gui/views/listview.py:1021
+#: ../gramps/gui/viewmanager.py:1826 ../gramps/gui/views/listview.py:1023
 #: ../gramps/gui/views/navigationview.py:362 ../gramps/gui/views/tags.py:634
 #: ../gramps/gui/widgets/progressdialog.py:437
 #: ../gramps/plugins/lib/maps/geography.py:1006
@@ -10226,15 +10231,15 @@ msgstr ""
 msgid "Select database directory"
 msgstr ""
 
-#: ../gramps/gui/configure.py:1586 ../gramps/gui/viewmanager.py:1418
+#: ../gramps/gui/configure.py:1586 ../gramps/gui/viewmanager.py:1823
 msgid "Select backup directory"
 msgstr ""
 
-#: ../gramps/gui/dbloader.py:130 ../gramps/gui/plug/tool.py:108
+#: ../gramps/gui/dbloader.py:119 ../gramps/gui/plug/tool.py:108
 msgid "Undo history warning"
 msgstr ""
 
-#: ../gramps/gui/dbloader.py:131
+#: ../gramps/gui/dbloader.py:120
 msgid ""
 "Proceeding with import will erase the undo history for this session. In "
 "particular, you will not be able to revert the import or any changes made "
@@ -10244,23 +10249,65 @@ msgid ""
 "your database."
 msgstr ""
 
-#: ../gramps/gui/dbloader.py:136
+#: ../gramps/gui/dbloader.py:125
 msgid "_Proceed with import"
 msgstr ""
 
-#: ../gramps/gui/dbloader.py:136 ../gramps/gui/plug/tool.py:115
+#: ../gramps/gui/dbloader.py:125 ../gramps/gui/plug/tool.py:115
 msgid "_Stop"
 msgstr ""
 
-#: ../gramps/gui/dbloader.py:143
-msgid "Gramps: Import Family Tree"
+#: ../gramps/gui/dbloader.py:202 ../gramps/gui/dbloader.py:217
+#: ../gramps/gui/dbloader.py:247
+msgid "Are you sure you want to upgrade this Family Tree?"
 msgstr ""
 
-#: ../gramps/gui/dbloader.py:148
+#: ../gramps/gui/dbloader.py:205 ../gramps/gui/dbloader.py:220
+#: ../gramps/gui/dbloader.py:250
+msgid ""
+"I have made a backup,\n"
+"please upgrade my Family Tree"
+msgstr ""
+
+#: ../gramps/gui/dbloader.py:207 ../gramps/gui/dbloader.py:222
+#: ../gramps/gui/dbloader.py:237 ../gramps/gui/dbloader.py:252
+#: ../gramps/gui/plug/report/_bookdialog.py:243
+#: ../gramps/gui/plug/report/_bookdialog.py:739
+#: ../gramps/gui/viewmanager.py:792
+msgid "Cancel"
+msgstr ""
+
+#: ../gramps/gui/dbloader.py:232
+msgid "Are you sure you want to downgrade this Family Tree?"
+msgstr ""
+
+#: ../gramps/gui/dbloader.py:235
+msgid ""
+"I have made a backup,\n"
+"please downgrade my Family Tree"
+msgstr ""
+
+#: ../gramps/gui/dbloader.py:321
+msgid "All files"
+msgstr ""
+
+#: ../gramps/gui/dbloader.py:362
+msgid "Automatically detected"
+msgstr ""
+
+#: ../gramps/gui/dbloader.py:371
+msgid "Select file _type:"
+msgstr ""
+
+#: ../gramps/gui/dbloader.py:387
+msgid "Import Family Tree"
+msgstr ""
+
+#: ../gramps/gui/dbloader.py:398
 msgid "Import"
 msgstr ""
 
-#: ../gramps/gui/dbloader.py:204
+#: ../gramps/gui/dbloader.py:458
 #, python-format
 msgid ""
 "File type \"%s\" is unknown to Gramps.\n"
@@ -10269,75 +10316,33 @@ msgid ""
 "others."
 msgstr ""
 
-#: ../gramps/gui/dbloader.py:228 ../gramps/gui/dbloader.py:235
+#: ../gramps/gui/dbloader.py:481 ../gramps/gui/dbloader.py:488
 msgid "Cannot open file"
 msgstr ""
 
-#: ../gramps/gui/dbloader.py:229
+#: ../gramps/gui/dbloader.py:482
 msgid "The selected file is a directory, not a file.\n"
 msgstr ""
 
-#: ../gramps/gui/dbloader.py:236
+#: ../gramps/gui/dbloader.py:489
 msgid "You do not have read access to the selected file."
 msgstr ""
 
-#: ../gramps/gui/dbloader.py:246
+#: ../gramps/gui/dbloader.py:499
 msgid "Cannot create file"
 msgstr ""
 
-#: ../gramps/gui/dbloader.py:269
+#: ../gramps/gui/dbloader.py:524
 #, python-format
 msgid "Could not import file: %s"
 msgstr ""
 
-#: ../gramps/gui/dbloader.py:270
+#: ../gramps/gui/dbloader.py:525
 msgid ""
 "This file incorrectly identifies its character set, so it cannot be "
 "accurately imported. Please fix the encoding, and import again"
 msgstr ""
 
-#: ../gramps/gui/dbloader.py:348 ../gramps/gui/dbloader.py:363
-#: ../gramps/gui/dbloader.py:393
-msgid "Are you sure you want to upgrade this Family Tree?"
-msgstr ""
-
-#: ../gramps/gui/dbloader.py:351 ../gramps/gui/dbloader.py:366
-#: ../gramps/gui/dbloader.py:396
-msgid ""
-"I have made a backup,\n"
-"please upgrade my Family Tree"
-msgstr ""
-
-#: ../gramps/gui/dbloader.py:353 ../gramps/gui/dbloader.py:368
-#: ../gramps/gui/dbloader.py:383 ../gramps/gui/dbloader.py:398
-#: ../gramps/gui/plug/report/_bookdialog.py:242
-#: ../gramps/gui/plug/report/_bookdialog.py:738
-#: ../gramps/gui/viewmanager.py:791
-msgid "Cancel"
-msgstr ""
-
-#: ../gramps/gui/dbloader.py:378
-msgid "Are you sure you want to downgrade this Family Tree?"
-msgstr ""
-
-#: ../gramps/gui/dbloader.py:381
-msgid ""
-"I have made a backup,\n"
-"please downgrade my Family Tree"
-msgstr ""
-
-#: ../gramps/gui/dbloader.py:467
-msgid "All files"
-msgstr ""
-
-#: ../gramps/gui/dbloader.py:508
-msgid "Automatically detected"
-msgstr ""
-
-#: ../gramps/gui/dbloader.py:517
-msgid "Select file _type:"
-msgstr ""
-
 #: ../gramps/gui/dbman.py:97
 #, python-format
 msgid "%s_-_Manage_Family_Trees"
@@ -10347,7 +10352,7 @@ msgstr ""
 msgid "Family_Trees_manager_window"
 msgstr ""
 
-#: ../gramps/gui/dbman.py:112 ../gramps/gui/glade/dbman.glade:352
+#: ../gramps/gui/dbman.py:112 ../gramps/gui/glade/dbman.glade:345
 msgid "_Archive"
 msgstr ""
 
@@ -10355,14 +10360,14 @@ msgstr ""
 msgid "_Extract"
 msgstr ""
 
-#: ../gramps/gui/dbman.py:119 ../gramps/gui/dbman.py:143
+#: ../gramps/gui/dbman.py:119 ../gramps/gui/dbman.py:140
 msgid "Database Information"
 msgstr ""
 
-#: ../gramps/gui/dbman.py:122 ../gramps/gui/editors/edittaglist.py:118
+#: ../gramps/gui/dbman.py:121 ../gramps/gui/editors/edittaglist.py:118
 #: ../gramps/gui/glade/addmedia.glade:38
 #: ../gramps/gui/glade/baseselector.glade:40
-#: ../gramps/gui/glade/book.glade:482 ../gramps/gui/glade/book.glade:556
+#: ../gramps/gui/glade/book.glade:482 ../gramps/gui/glade/book.glade:554
 #: ../gramps/gui/glade/configure.glade:39 ../gramps/gui/glade/dbman.glade:24
 #: ../gramps/gui/glade/editaddress.glade:36
 #: ../gramps/gui/glade/editattribute.glade:37
@@ -10399,13 +10404,13 @@ msgstr ""
 #: ../gramps/gui/glade/mergeplace.glade:36
 #: ../gramps/gui/glade/mergerepository.glade:37
 #: ../gramps/gui/glade/mergesource.glade:37
-#: ../gramps/gui/glade/reorder.glade:40 ../gramps/gui/glade/rule.glade:333
+#: ../gramps/gui/glade/reorder.glade:38 ../gramps/gui/glade/rule.glade:333
 #: ../gramps/gui/glade/rule.glade:764
 #: ../gramps/gui/glade/styleeditor.glade:103
 #: ../gramps/gui/glade/styleeditor.glade:1739
 #: ../gramps/gui/plug/_guioptions.py:79
 #: ../gramps/gui/plug/report/_reportdialog.py:165 ../gramps/gui/utils.py:186
-#: ../gramps/gui/viewmanager.py:1293 ../gramps/gui/views/tags.py:635
+#: ../gramps/gui/viewmanager.py:1694 ../gramps/gui/views/tags.py:635
 #: ../gramps/plugins/tool/check.py:770
 #: ../gramps/plugins/tool/patchnames.py:117
 #: ../gramps/plugins/tool/populatesources.py:91
@@ -10413,20 +10418,24 @@ msgstr ""
 msgid "_OK"
 msgstr ""
 
-#: ../gramps/gui/dbman.py:126
+#: ../gramps/gui/dbman.py:125
 msgid "Setting"
 msgstr ""
 
-#: ../gramps/gui/dbman.py:367
+#: ../gramps/gui/dbman.py:200
+msgid "Family Trees"
+msgstr ""
+
+#: ../gramps/gui/dbman.py:372
 msgid "Family Tree name"
 msgstr ""
 
 #. icon_column = Gtk.TreeViewColumn(_('Status'), render,
 #. icon_name=ICON_COL)
-#: ../gramps/gui/dbman.py:380
+#: ../gramps/gui/dbman.py:385
 #: ../gramps/gui/editors/displaytabs/familyldsembedlist.py:53
 #: ../gramps/gui/editors/displaytabs/ldsembedlist.py:63
-#: ../gramps/gui/plug/_windows.py:123 ../gramps/gui/plug/_windows.py:180
+#: ../gramps/gui/plug/_windows.py:127 ../gramps/gui/plug/_windows.py:184
 #: ../gramps/plugins/importer/importgedcom.glade:515
 #: ../gramps/plugins/quickview/ageondate.py:54
 #: ../gramps/plugins/textreport/indivcomplete.py:494
@@ -10436,16 +10445,16 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: ../gramps/gui/dbman.py:387
+#: ../gramps/gui/dbman.py:392
 msgid "Database Type"
 msgstr ""
 
-#: ../gramps/gui/dbman.py:493
+#: ../gramps/gui/dbman.py:499
 #, python-format
 msgid "Break the lock on the '%s' database?"
 msgstr ""
 
-#: ../gramps/gui/dbman.py:494
+#: ../gramps/gui/dbman.py:500
 msgid ""
 "Gramps believes that someone else is actively editing this database. You "
 "cannot edit this database while it is locked. If no one is editing the "
@@ -10453,15 +10462,15 @@ msgid ""
 "the database and you break the lock, you may corrupt the database."
 msgstr ""
 
-#: ../gramps/gui/dbman.py:500
+#: ../gramps/gui/dbman.py:506
 msgid "Break lock"
 msgstr ""
 
-#: ../gramps/gui/dbman.py:592
+#: ../gramps/gui/dbman.py:598
 msgid "Rename failed"
 msgstr ""
 
-#: ../gramps/gui/dbman.py:593
+#: ../gramps/gui/dbman.py:599
 #, python-format
 msgid ""
 "An attempt to rename a version failed with the following message:\n"
@@ -10469,54 +10478,54 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../gramps/gui/dbman.py:611
+#: ../gramps/gui/dbman.py:617
 msgid "Could not rename the Family Tree."
 msgstr ""
 
-#: ../gramps/gui/dbman.py:612
+#: ../gramps/gui/dbman.py:618
 msgid "Family Tree already exists, choose a unique name."
 msgstr ""
 
-#: ../gramps/gui/dbman.py:656
+#: ../gramps/gui/dbman.py:662
 msgid "Extracting archive..."
 msgstr ""
 
-#: ../gramps/gui/dbman.py:661
+#: ../gramps/gui/dbman.py:667
 msgid "Importing archive..."
 msgstr ""
 
-#: ../gramps/gui/dbman.py:677
+#: ../gramps/gui/dbman.py:683
 #, python-format
 msgid "Remove the '%s' Family Tree?"
 msgstr ""
 
-#: ../gramps/gui/dbman.py:678
+#: ../gramps/gui/dbman.py:684
 msgid "Removing this Family Tree will permanently destroy the data."
 msgstr ""
 
-#: ../gramps/gui/dbman.py:680
+#: ../gramps/gui/dbman.py:686
 msgid "Remove Family Tree"
 msgstr ""
 
-#: ../gramps/gui/dbman.py:685
+#: ../gramps/gui/dbman.py:691
 #, python-format
 msgid "Remove the '%(revision)s' version of '%(database)s'"
 msgstr ""
 
-#: ../gramps/gui/dbman.py:689
+#: ../gramps/gui/dbman.py:695
 msgid ""
 "Removing this version will prevent you from extracting it in the future."
 msgstr ""
 
-#: ../gramps/gui/dbman.py:691
+#: ../gramps/gui/dbman.py:697
 msgid "Remove version"
 msgstr ""
 
-#: ../gramps/gui/dbman.py:746
+#: ../gramps/gui/dbman.py:752
 msgid "Deletion failed"
 msgstr ""
 
-#: ../gramps/gui/dbman.py:747
+#: ../gramps/gui/dbman.py:753
 #, python-format
 msgid ""
 "An attempt to delete a version failed with the following message:\n"
@@ -10524,55 +10533,55 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../gramps/gui/dbman.py:764
+#: ../gramps/gui/dbman.py:770
 #, python-format
 msgid "Convert the '%s' database?"
 msgstr ""
 
-#: ../gramps/gui/dbman.py:765
+#: ../gramps/gui/dbman.py:771
 msgid "You wish to convert this database into the new DB-API format?"
 msgstr ""
 
-#: ../gramps/gui/dbman.py:766
+#: ../gramps/gui/dbman.py:772
 msgid "Convert"
 msgstr ""
 
-#: ../gramps/gui/dbman.py:776
+#: ../gramps/gui/dbman.py:782
 #, python-format
 msgid "Opening the '%s' database"
 msgstr ""
 
-#: ../gramps/gui/dbman.py:777
+#: ../gramps/gui/dbman.py:783
 msgid "An attempt to convert the database failed. Perhaps it needs updating."
 msgstr ""
 
-#: ../gramps/gui/dbman.py:788 ../gramps/gui/dbman.py:813
+#: ../gramps/gui/dbman.py:794 ../gramps/gui/dbman.py:819
 #, python-format
 msgid "Converting the '%s' database"
 msgstr ""
 
-#: ../gramps/gui/dbman.py:789
+#: ../gramps/gui/dbman.py:795
 msgid "An attempt to export the database failed."
 msgstr ""
 
-#: ../gramps/gui/dbman.py:793
+#: ../gramps/gui/dbman.py:799
 msgid "Converting data..."
 msgstr ""
 
-#: ../gramps/gui/dbman.py:798 ../gramps/gui/dbman.py:801
+#: ../gramps/gui/dbman.py:804 ../gramps/gui/dbman.py:807
 #, python-format
 msgid "(Converted #%d)"
 msgstr ""
 
-#: ../gramps/gui/dbman.py:814
+#: ../gramps/gui/dbman.py:820
 msgid "An attempt to import into the database failed."
 msgstr ""
 
-#: ../gramps/gui/dbman.py:871
+#: ../gramps/gui/dbman.py:877
 msgid "Repair Family Tree?"
 msgstr ""
 
-#: ../gramps/gui/dbman.py:872
+#: ../gramps/gui/dbman.py:878
 #, python-format
 msgid ""
 "If you click %(bold_start)sProceed%(bold_end)s, Gramps will attempt to "
@@ -10599,31 +10608,31 @@ msgid ""
 "%(recover_file)s in the Family Tree directory."
 msgstr ""
 
-#: ../gramps/gui/dbman.py:903
+#: ../gramps/gui/dbman.py:909
 msgid "Proceed, I have taken a backup"
 msgstr ""
 
-#: ../gramps/gui/dbman.py:904
+#: ../gramps/gui/dbman.py:910
 msgid "Stop"
 msgstr ""
 
-#: ../gramps/gui/dbman.py:927
+#: ../gramps/gui/dbman.py:933
 msgid "Rebuilding database from backup files"
 msgstr ""
 
-#: ../gramps/gui/dbman.py:932
+#: ../gramps/gui/dbman.py:938
 msgid "Error restoring backup data"
 msgstr ""
 
-#: ../gramps/gui/dbman.py:971
+#: ../gramps/gui/dbman.py:977
 msgid "Could not create Family Tree"
 msgstr ""
 
-#: ../gramps/gui/dbman.py:1099
+#: ../gramps/gui/dbman.py:1105
 msgid "Retrieve failed"
 msgstr ""
 
-#: ../gramps/gui/dbman.py:1100
+#: ../gramps/gui/dbman.py:1106
 #, python-format
 msgid ""
 "An attempt to retrieve the data failed with the following message:\n"
@@ -10631,11 +10640,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../gramps/gui/dbman.py:1138 ../gramps/gui/dbman.py:1164
+#: ../gramps/gui/dbman.py:1144 ../gramps/gui/dbman.py:1170
 msgid "Archiving failed"
 msgstr ""
 
-#: ../gramps/gui/dbman.py:1139
+#: ../gramps/gui/dbman.py:1145
 #, python-format
 msgid ""
 "An attempt to create the archive failed with the following message:\n"
@@ -10643,15 +10652,15 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../gramps/gui/dbman.py:1144
+#: ../gramps/gui/dbman.py:1150
 msgid "Creating data to be archived..."
 msgstr ""
 
-#: ../gramps/gui/dbman.py:1153
+#: ../gramps/gui/dbman.py:1159
 msgid "Saving archive..."
 msgstr ""
 
-#: ../gramps/gui/dbman.py:1165
+#: ../gramps/gui/dbman.py:1171
 #, python-format
 msgid ""
 "An attempt to archive the data failed with the following message:\n"
@@ -10670,44 +10679,44 @@ msgid ""
 "Instead select one of the available options"
 msgstr ""
 
-#: ../gramps/gui/displaystate.py:379
+#: ../gramps/gui/displaystate.py:382
 #: ../gramps/plugins/gramplet/persondetails.py:169
 msgid "No active person"
 msgstr ""
 
-#: ../gramps/gui/displaystate.py:380
+#: ../gramps/gui/displaystate.py:383
 msgid "No active family"
 msgstr ""
 
-#: ../gramps/gui/displaystate.py:381
+#: ../gramps/gui/displaystate.py:384
 msgid "No active event"
 msgstr ""
 
-#: ../gramps/gui/displaystate.py:382
+#: ../gramps/gui/displaystate.py:385
 msgid "No active place"
 msgstr ""
 
-#: ../gramps/gui/displaystate.py:383
+#: ../gramps/gui/displaystate.py:386
 msgid "No active source"
 msgstr ""
 
-#: ../gramps/gui/displaystate.py:384
+#: ../gramps/gui/displaystate.py:387
 msgid "No active citation"
 msgstr ""
 
-#: ../gramps/gui/displaystate.py:385
+#: ../gramps/gui/displaystate.py:388
 msgid "No active repository"
 msgstr ""
 
-#: ../gramps/gui/displaystate.py:386
+#: ../gramps/gui/displaystate.py:389
 msgid "No active media"
 msgstr ""
 
-#: ../gramps/gui/displaystate.py:387
+#: ../gramps/gui/displaystate.py:390
 msgid "No active note"
 msgstr ""
 
-#: ../gramps/gui/displaystate.py:618
+#: ../gramps/gui/displaystate.py:621
 msgid "No active object"
 msgstr ""
 
@@ -10995,7 +11004,7 @@ msgstr ""
 #: ../gramps/gui/glade/editfamily.glade:192
 #: ../gramps/gui/merge/mergeperson.py:231
 #: ../gramps/gui/selectors/selectfamily.py:70
-#: ../gramps/gui/widgets/reorderfam.py:83
+#: ../gramps/gui/widgets/reorderfam.py:84
 #: ../gramps/plugins/gramplet/persondetails.py:219
 #: ../gramps/plugins/importer/importcsv.py:216
 #: ../gramps/plugins/quickview/all_relations.py:300
@@ -11016,7 +11025,7 @@ msgstr ""
 #: ../gramps/gui/glade/editfamily.glade:470
 #: ../gramps/gui/merge/mergeperson.py:234
 #: ../gramps/gui/selectors/selectfamily.py:71
-#: ../gramps/gui/widgets/reorderfam.py:84
+#: ../gramps/gui/widgets/reorderfam.py:85
 #: ../gramps/plugins/gramplet/persondetails.py:220
 #: ../gramps/plugins/importer/importcsv.py:213
 #: ../gramps/plugins/quickview/all_relations.py:297
@@ -11339,6 +11348,7 @@ msgid "_Associations"
 msgstr ""
 
 #: ../gramps/gui/editors/displaytabs/personrefembedlist.py:90
+#: ../gramps/plugins/importer/importprogen.py:1381
 msgid "Godfather"
 msgstr ""
 
@@ -11579,12 +11589,12 @@ msgid ""
 "leave blank to get the next available ID value."
 msgstr ""
 
-#: ../gramps/gui/editors/editcitation.py:313
+#: ../gramps/gui/editors/editcitation.py:311
 #, python-format
 msgid "Add Citation (%s)"
 msgstr ""
 
-#: ../gramps/gui/editors/editcitation.py:319
+#: ../gramps/gui/editors/editcitation.py:316
 #, python-format
 msgid "Edit Citation (%s)"
 msgstr ""
@@ -11648,13 +11658,13 @@ msgid "manual|New_Event_dialog"
 msgstr ""
 
 #: ../gramps/gui/editors/editevent.py:98
-#: ../gramps/gui/editors/editeventref.py:252
+#: ../gramps/gui/editors/editeventref.py:261
 #, python-format
 msgid "Event: %s"
 msgstr ""
 
 #: ../gramps/gui/editors/editevent.py:100
-#: ../gramps/gui/editors/editeventref.py:254
+#: ../gramps/gui/editors/editeventref.py:263
 msgid "New Event"
 msgstr ""
 
@@ -11694,12 +11704,12 @@ msgstr ""
 msgid "Add Event (%s)"
 msgstr ""
 
-#: ../gramps/gui/editors/editevent.py:274
+#: ../gramps/gui/editors/editevent.py:273
 #, python-format
 msgid "Edit Event (%s)"
 msgstr ""
 
-#: ../gramps/gui/editors/editevent.py:319
+#: ../gramps/gui/editors/editevent.py:318
 #, python-format
 msgid "Delete Event (%s)"
 msgstr ""
@@ -11709,7 +11719,7 @@ msgid "manual|Event_Reference_Editor_dialog"
 msgstr ""
 
 #: ../gramps/gui/editors/editeventref.py:76
-#: ../gramps/gui/editors/editeventref.py:255
+#: ../gramps/gui/editors/editeventref.py:264
 msgid "Event Reference Editor"
 msgstr ""
 
@@ -11721,11 +11731,11 @@ msgstr ""
 msgid "_General"
 msgstr ""
 
-#: ../gramps/gui/editors/editeventref.py:260
+#: ../gramps/gui/editors/editeventref.py:269
 msgid "Modify Event"
 msgstr ""
 
-#: ../gramps/gui/editors/editeventref.py:265
+#: ../gramps/gui/editors/editeventref.py:274
 msgid "Add Event"
 msgstr ""
 
@@ -11956,7 +11966,7 @@ msgid "Cannot save family. ID already exists."
 msgstr ""
 
 #: ../gramps/gui/editors/editfamily.py:1093
-#: ../gramps/gui/editors/editnote.py:321
+#: ../gramps/gui/editors/editnote.py:326
 #: ../gramps/gui/editors/editreference.py:294
 #, python-format
 msgid ""
@@ -12063,19 +12073,19 @@ msgid ""
 "exist! Please enter a different path"
 msgstr ""
 
-#: ../gramps/gui/editors/editmedia.py:326
+#: ../gramps/gui/editors/editmedia.py:324
 #: ../gramps/gui/editors/editmediaref.py:523
 #, python-format
 msgid "Add Media Object (%s)"
 msgstr ""
 
-#: ../gramps/gui/editors/editmedia.py:331
+#: ../gramps/gui/editors/editmedia.py:329
 #: ../gramps/gui/editors/editmediaref.py:517
 #, python-format
 msgid "Edit Media Object (%s)"
 msgstr ""
 
-#: ../gramps/gui/editors/editmedia.py:368
+#: ../gramps/gui/editors/editmedia.py:369
 msgid "Remove Media Object"
 msgstr ""
 
@@ -12177,28 +12187,28 @@ msgstr ""
 msgid "_Note"
 msgstr ""
 
-#: ../gramps/gui/editors/editnote.py:292 ../gramps/gui/editors/editnote.py:338
+#: ../gramps/gui/editors/editnote.py:292 ../gramps/gui/editors/editnote.py:341
 #: ../gramps/gui/editors/objectentries.py:436
 msgid "Edit Note"
 msgstr ""
 
-#: ../gramps/gui/editors/editnote.py:311
+#: ../gramps/gui/editors/editnote.py:316
 msgid "Cannot save note"
 msgstr ""
 
-#: ../gramps/gui/editors/editnote.py:312
+#: ../gramps/gui/editors/editnote.py:317
 msgid "No data exists for this note. Please enter data or cancel the edit."
 msgstr ""
 
-#: ../gramps/gui/editors/editnote.py:320
+#: ../gramps/gui/editors/editnote.py:325
 msgid "Cannot save note. ID already exists."
 msgstr ""
 
-#: ../gramps/gui/editors/editnote.py:333
+#: ../gramps/gui/editors/editnote.py:336
 msgid "Add Note"
 msgstr ""
 
-#: ../gramps/gui/editors/editnote.py:353
+#: ../gramps/gui/editors/editnote.py:359
 #, python-format
 msgid "Delete Note (%s)"
 msgstr ""
@@ -12265,12 +12275,12 @@ msgstr ""
 msgid "Cannot save person. ID already exists."
 msgstr ""
 
-#: ../gramps/gui/editors/editperson.py:863
+#: ../gramps/gui/editors/editperson.py:860
 #, python-format
 msgid "Add Person (%s)"
 msgstr ""
 
-#: ../gramps/gui/editors/editperson.py:869
+#: ../gramps/gui/editors/editperson.py:866
 #: ../gramps/plugins/view/relview.py:580
 #: ../gramps/plugins/view/relview.py:1002
 #: ../gramps/plugins/view/relview.py:1059
@@ -12385,17 +12395,17 @@ msgstr ""
 msgid "Cannot save place. ID already exists."
 msgstr ""
 
-#: ../gramps/gui/editors/editplace.py:308
+#: ../gramps/gui/editors/editplace.py:306
 #, python-format
 msgid "Add Place (%s)"
 msgstr ""
 
-#: ../gramps/gui/editors/editplace.py:313
+#: ../gramps/gui/editors/editplace.py:311
 #, python-format
 msgid "Edit Place (%s)"
 msgstr ""
 
-#: ../gramps/gui/editors/editplace.py:338
+#: ../gramps/gui/editors/editplace.py:339
 #, python-format
 msgid "Delete Place (%s)"
 msgstr ""
@@ -12494,17 +12504,17 @@ msgid ""
 "No data exists for this repository. Please enter data or cancel the edit."
 msgstr ""
 
-#: ../gramps/gui/editors/editrepository.py:201
+#: ../gramps/gui/editors/editrepository.py:199
 #, python-format
 msgid "Add Repository (%s)"
 msgstr ""
 
-#: ../gramps/gui/editors/editrepository.py:206
+#: ../gramps/gui/editors/editrepository.py:204
 #, python-format
 msgid "Edit Repository (%s)"
 msgstr ""
 
-#: ../gramps/gui/editors/editrepository.py:219
+#: ../gramps/gui/editors/editrepository.py:220
 #, python-format
 msgid "Delete Repository (%s)"
 msgstr ""
@@ -12533,17 +12543,17 @@ msgstr ""
 msgid "Cannot save source. ID already exists."
 msgstr ""
 
-#: ../gramps/gui/editors/editsource.py:222
+#: ../gramps/gui/editors/editsource.py:220
 #, python-format
 msgid "Add Source (%s)"
 msgstr ""
 
-#: ../gramps/gui/editors/editsource.py:227
+#: ../gramps/gui/editors/editsource.py:225
 #, python-format
 msgid "Edit Source (%s)"
 msgstr ""
 
-#: ../gramps/gui/editors/editsource.py:242
+#: ../gramps/gui/editors/editsource.py:243
 #, python-format
 msgid "Delete Source (%s)"
 msgstr ""
@@ -12588,7 +12598,7 @@ msgstr ""
 #: ../gramps/gui/editors/edittaglist.py:116
 #: ../gramps/gui/glade/addmedia.glade:55
 #: ../gramps/gui/glade/baseselector.glade:56
-#: ../gramps/gui/glade/clipboard.glade:21 ../gramps/gui/glade/dbman.glade:157
+#: ../gramps/gui/glade/clipboard.glade:21 ../gramps/gui/glade/dbman.glade:150
 #: ../gramps/gui/glade/editaddress.glade:55
 #: ../gramps/gui/glade/editattribute.glade:54
 #: ../gramps/gui/glade/editchildref.glade:58
@@ -12625,11 +12635,11 @@ msgstr ""
 #: ../gramps/gui/glade/mergeplace.glade:51
 #: ../gramps/gui/glade/mergerepository.glade:53
 #: ../gramps/gui/glade/mergesource.glade:53
-#: ../gramps/gui/glade/reorder.glade:56 ../gramps/gui/glade/rule.glade:41
+#: ../gramps/gui/glade/reorder.glade:54 ../gramps/gui/glade/rule.glade:41
 #: ../gramps/gui/glade/rule.glade:351 ../gramps/gui/glade/rule.glade:781
 #: ../gramps/gui/logger/_errorview.py:143
 #: ../gramps/gui/plug/report/_reportdialog.py:158
-#: ../gramps/gui/undohistory.py:82 ../gramps/gui/viewmanager.py:489
+#: ../gramps/gui/undohistory.py:82 ../gramps/gui/viewmanager.py:490
 #: ../gramps/gui/views/bookmarks.py:259 ../gramps/gui/views/tags.py:425
 #: ../gramps/gui/views/tags.py:633 ../gramps/gui/widgets/grampletbar.py:641
 #: ../gramps/gui/widgets/grampletpane.py:240
@@ -12982,7 +12992,7 @@ msgid "%s does not contain"
 msgstr ""
 
 #: ../gramps/gui/filters/_searchbar.py:168
-#: ../gramps/gui/views/listview.py:1152 ../gramps/gui/views/listview.py:1172
+#: ../gramps/gui/views/listview.py:1154 ../gramps/gui/views/listview.py:1174
 msgid "Updating display..."
 msgstr ""
 
@@ -13035,7 +13045,7 @@ msgid "Participants"
 msgstr ""
 
 #: ../gramps/gui/filters/sidebar/_familysidebarfilter.py:115
-#: ../gramps/gui/widgets/reorderfam.py:90
+#: ../gramps/gui/widgets/reorderfam.py:91
 #: ../gramps/plugins/textreport/tagreport.py:260
 #: ../gramps/plugins/view/familyview.py:82
 #: ../gramps/plugins/webreport/narrativeweb.py:7068
@@ -13106,7 +13116,7 @@ msgid "Book _name:"
 msgstr ""
 
 #: ../gramps/gui/glade/book.glade:90
-#: ../gramps/gui/plug/report/_bookdialog.py:623
+#: ../gramps/gui/plug/report/_bookdialog.py:624
 msgid "Clear the book"
 msgstr ""
 
@@ -13142,7 +13152,7 @@ msgstr ""
 msgid "Configure currently selected item"
 msgstr ""
 
-#: ../gramps/gui/glade/book.glade:524 ../gramps/gui/glade/dbman.glade:272
+#: ../gramps/gui/glade/book.glade:522 ../gramps/gui/glade/dbman.glade:265
 msgid "_Delete"
 msgstr ""
 
@@ -13186,40 +13196,40 @@ msgstr ""
 msgid "Version description"
 msgstr ""
 
-#: ../gramps/gui/glade/dbman.glade:107
+#: ../gramps/gui/glade/dbman.glade:103
 msgid "Family Trees - Gramps"
 msgstr ""
 
-#: ../gramps/gui/glade/dbman.glade:125
+#: ../gramps/gui/glade/dbman.glade:118
 msgid "_Close Window"
 msgstr ""
 
-#: ../gramps/gui/glade/dbman.glade:141
+#: ../gramps/gui/glade/dbman.glade:134
 msgid "_Load Family Tree"
 msgstr ""
 
-#: ../gramps/gui/glade/dbman.glade:241 ../gramps/gui/glade/editlink.glade:208
+#: ../gramps/gui/glade/dbman.glade:234 ../gramps/gui/glade/editlink.glade:208
 msgid "_New"
 msgstr ""
 
-#: ../gramps/gui/glade/dbman.glade:257
+#: ../gramps/gui/glade/dbman.glade:250
 msgid "_Info"
 msgstr ""
 
-#: ../gramps/gui/glade/dbman.glade:288
+#: ../gramps/gui/glade/dbman.glade:281
 msgid "_Rename"
 msgstr ""
 
-#: ../gramps/gui/glade/dbman.glade:304
+#: ../gramps/gui/glade/dbman.glade:297
 #: ../gramps/gui/glade/grampletpane.glade:137
 msgid "Close"
 msgstr ""
 
-#: ../gramps/gui/glade/dbman.glade:320
+#: ../gramps/gui/glade/dbman.glade:313
 msgid "Con_vert"
 msgstr ""
 
-#: ../gramps/gui/glade/dbman.glade:336
+#: ../gramps/gui/glade/dbman.glade:329
 msgid "Re_pair"
 msgstr ""
 
@@ -13303,8 +13313,8 @@ msgstr ""
 
 #. widget
 #: ../gramps/gui/glade/dialog.glade:859
-#: ../gramps/gui/plug/report/_bookdialog.py:624
-#: ../gramps/gui/views/listview.py:1022
+#: ../gramps/gui/plug/report/_bookdialog.py:625
+#: ../gramps/gui/views/listview.py:1024
 #: ../gramps/gui/widgets/grampletpane.py:578
 #: ../gramps/plugins/tool/eventcmp.py:400
 msgid "_Save"
@@ -13314,7 +13324,7 @@ msgstr ""
 msgid "Do not ask again"
 msgstr ""
 
-#: ../gramps/gui/glade/displaystate.glade:8
+#: ../gramps/gui/glade/displaystate.glade:7
 msgid "Gramps Warnings"
 msgstr ""
 
@@ -13562,6 +13572,7 @@ msgstr ""
 
 #: ../gramps/gui/glade/editcitation.glade:360
 #: ../gramps/gui/glade/editevent.glade:390
+#: ../gramps/gui/glade/editeventref.glade:465
 #: ../gramps/gui/glade/editplace.glade:331
 #: ../gramps/gui/glade/editplaceref.glade:478
 #: ../gramps/gui/glade/editrepository.glade:234
@@ -13693,13 +13704,13 @@ msgstr ""
 msgid "_Role:"
 msgstr ""
 
-#: ../gramps/gui/glade/editeventref.glade:500
+#: ../gramps/gui/glade/editeventref.glade:538
 msgid ""
 "<b>Note:</b> Any changes in the shared event information will be reflected "
 "in the event itself, for all participants in the event."
 msgstr ""
 
-#: ../gramps/gui/glade/editeventref.glade:586
+#: ../gramps/gui/glade/editeventref.glade:624
 #: ../gramps/gui/glade/editplaceref.glade:627
 #: ../gramps/gui/glade/editreporef.glade:460
 msgid "Shared information"
@@ -14485,7 +14496,7 @@ msgstr ""
 
 #. name, click?, width, toggle
 #: ../gramps/gui/glade/mergedata.glade:173
-#: ../gramps/gui/glade/mergedata.glade:189 ../gramps/gui/plug/_windows.py:1089
+#: ../gramps/gui/glade/mergedata.glade:189 ../gramps/gui/plug/_windows.py:1097
 #: ../gramps/plugins/tool/changenames.py:196
 #: ../gramps/plugins/tool/patchnames.py:397
 msgid "Select"
@@ -14598,7 +14609,7 @@ msgstr ""
 
 #: ../gramps/gui/glade/mergenote.glade:278
 #: ../gramps/gui/glade/mergenote.glade:294
-#: ../gramps/gui/views/listview.py:1026
+#: ../gramps/gui/views/listview.py:1028
 msgid "Format:"
 msgstr ""
 
@@ -14760,35 +14771,35 @@ msgstr ""
 msgid "Author's email:"
 msgstr ""
 
-#: ../gramps/gui/glade/reorder.glade:89
+#: ../gramps/gui/glade/reorder.glade:87
 msgid "Parent relationships"
 msgstr ""
 
-#: ../gramps/gui/glade/reorder.glade:119 ../gramps/gui/glade/reorder.glade:262
+#: ../gramps/gui/glade/reorder.glade:117 ../gramps/gui/glade/reorder.glade:260
 msgid "Arrow top"
 msgstr ""
 
-#: ../gramps/gui/glade/reorder.glade:126
+#: ../gramps/gui/glade/reorder.glade:124
 msgid "Move parent up"
 msgstr ""
 
-#: ../gramps/gui/glade/reorder.glade:149 ../gramps/gui/glade/reorder.glade:292
+#: ../gramps/gui/glade/reorder.glade:147 ../gramps/gui/glade/reorder.glade:290
 msgid "Arrow bottom"
 msgstr ""
 
-#: ../gramps/gui/glade/reorder.glade:156
+#: ../gramps/gui/glade/reorder.glade:154
 msgid "Move parent down"
 msgstr ""
 
-#: ../gramps/gui/glade/reorder.glade:207
+#: ../gramps/gui/glade/reorder.glade:205
 msgid "Family relationships"
 msgstr ""
 
-#: ../gramps/gui/glade/reorder.glade:269
+#: ../gramps/gui/glade/reorder.glade:267
 msgid "Move family up"
 msgstr ""
 
-#: ../gramps/gui/glade/reorder.glade:299
+#: ../gramps/gui/glade/reorder.glade:297
 msgid "Move family down"
 msgstr ""
 
@@ -15108,7 +15119,7 @@ msgid "Install Selected _Addons"
 msgstr ""
 
 #: ../gramps/gui/glade/updateaddons.glade:73
-#: ../gramps/gui/plug/_windows.py:1070
+#: ../gramps/gui/plug/_windows.py:1078
 msgid "Available Gramps Updates for Addons"
 msgstr ""
 
@@ -15423,7 +15434,7 @@ msgid "Merge Families"
 msgstr ""
 
 #: ../gramps/gui/merge/mergefamily.py:227
-#: ../gramps/gui/merge/mergeperson.py:342
+#: ../gramps/gui/merge/mergeperson.py:350
 #: ../gramps/plugins/lib/libpersonview.py:427
 msgid "Cannot merge people"
 msgstr ""
@@ -15514,7 +15525,7 @@ msgstr ""
 
 #: ../gramps/gui/merge/mergeperson.py:249
 #: ../gramps/gui/selectors/selectperson.py:100
-#: ../gramps/gui/widgets/reorderfam.py:89
+#: ../gramps/gui/widgets/reorderfam.py:90
 #: ../gramps/plugins/gramplet/children.py:98
 #: ../gramps/plugins/lib/libpersonview.py:105
 #: ../gramps/plugins/textreport/familygroup.py:566
@@ -15526,6 +15537,19 @@ msgstr ""
 msgid "No spouses or children found"
 msgstr ""
 
+#. Add column with the warning text
+#: ../gramps/gui/merge/mergeperson.py:343 ../gramps/plugins/tool/verify.py:563
+msgid "Warning"
+msgstr ""
+
+#: ../gramps/gui/merge/mergeperson.py:344
+msgid ""
+"The persons have been merged.\n"
+"However, the families for this merge were too complex to automatically "
+"handle.  We recommend that you go to Relationships view and see if "
+"additional manual merging of families is necessary."
+msgstr ""
+
 #: ../gramps/gui/merge/mergeplace.py:53
 msgid "manual|Merge_Places"
 msgstr ""
@@ -15619,8 +15643,8 @@ msgstr ""
 msgid "Save As"
 msgstr ""
 
-#: ../gramps/gui/plug/_guioptions.py:1730 ../gramps/gui/plug/_windows.py:434
-#: ../gramps/gui/plug/report/_bookdialog.py:625
+#: ../gramps/gui/plug/_guioptions.py:1730 ../gramps/gui/plug/_windows.py:442
+#: ../gramps/gui/plug/report/_bookdialog.py:626
 #: ../gramps/gui/plug/report/_fileentry.py:66
 msgid "_Open"
 msgstr ""
@@ -15630,193 +15654,193 @@ msgstr ""
 msgid "Style Editor"
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:87
+#: ../gramps/gui/plug/_windows.py:90
 msgid "Hidden"
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:89
+#: ../gramps/gui/plug/_windows.py:92
 msgid "Visible"
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:94
+#: ../gramps/gui/plug/_windows.py:97
 msgid "Plugin Manager"
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:140 ../gramps/gui/plug/_windows.py:194
+#: ../gramps/gui/plug/_windows.py:144 ../gramps/gui/plug/_windows.py:198
 msgid "Info"
 msgstr ""
 
 #. id_col
-#: ../gramps/gui/plug/_windows.py:143 ../gramps/gui/plug/_windows.py:197
+#: ../gramps/gui/plug/_windows.py:147 ../gramps/gui/plug/_windows.py:201
 msgid "Hide/Unhide"
 msgstr ""
 
 #. id_col
-#: ../gramps/gui/plug/_windows.py:151 ../gramps/gui/plug/_windows.py:206
+#: ../gramps/gui/plug/_windows.py:155 ../gramps/gui/plug/_windows.py:210
 msgid "Load"
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:157
+#: ../gramps/gui/plug/_windows.py:161
 msgid "Registered Plugins"
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:170
+#: ../gramps/gui/plug/_windows.py:174
 msgid "Loaded"
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:175
+#: ../gramps/gui/plug/_windows.py:179
 msgid "File"
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:184
+#: ../gramps/gui/plug/_windows.py:188
 msgid "Message"
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:212
+#: ../gramps/gui/plug/_windows.py:216
 msgid "Loaded Plugins"
 msgstr ""
 
 #. self.addon_list.connect('button-press-event', self.button_press)
-#: ../gramps/gui/plug/_windows.py:231
+#: ../gramps/gui/plug/_windows.py:235
 msgid "Addon Name"
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:246
+#: ../gramps/gui/plug/_windows.py:250
 msgid "Path to Addon:"
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:266
+#: ../gramps/gui/plug/_windows.py:270
 msgid "Install Addon"
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:269
+#: ../gramps/gui/plug/_windows.py:273
 msgid "Install All Addons"
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:272
+#: ../gramps/gui/plug/_windows.py:276
 msgid "Refresh Addon List"
 msgstr ""
 
 #. Only show the "Reload" button when in debug mode
 #. (without -O on the command line)
-#: ../gramps/gui/plug/_windows.py:285
+#: ../gramps/gui/plug/_windows.py:289
 msgid "Reload"
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:308
+#: ../gramps/gui/plug/_windows.py:316
 msgid "Refreshing Addon List"
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:310 ../gramps/gui/plug/_windows.py:315
-#: ../gramps/gui/plug/_windows.py:410
+#: ../gramps/gui/plug/_windows.py:318 ../gramps/gui/plug/_windows.py:323
+#: ../gramps/gui/plug/_windows.py:418
 msgid "Reading gramps-project.org..."
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:333
+#: ../gramps/gui/plug/_windows.py:341
 msgid "Checking addon..."
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:341
+#: ../gramps/gui/plug/_windows.py:349
 msgid "Unknown Help URL"
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:352
+#: ../gramps/gui/plug/_windows.py:360
 msgid "Unknown URL"
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:388
+#: ../gramps/gui/plug/_windows.py:396
 msgid "Install all Addons"
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:388
+#: ../gramps/gui/plug/_windows.py:396
 msgid "Installing..."
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:408
+#: ../gramps/gui/plug/_windows.py:416
 msgid "Installing Addon"
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:430
+#: ../gramps/gui/plug/_windows.py:438
 msgid "Load Addon"
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:492
+#: ../gramps/gui/plug/_windows.py:500
 #: ../gramps/plugins/tool/dateparserdisplaytest.py:188
 msgid "Fail"
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:507 ../gramps/gui/widgets/grampletbar.py:548
+#: ../gramps/gui/plug/_windows.py:515 ../gramps/gui/widgets/grampletbar.py:548
 msgid "OK"
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:611
+#: ../gramps/gui/plug/_windows.py:619
 msgid "Plugin name"
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:613
+#: ../gramps/gui/plug/_windows.py:621
 msgid "Version"
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:614
+#: ../gramps/gui/plug/_windows.py:622
 msgid "Authors"
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:616
+#: ../gramps/gui/plug/_windows.py:624
 #: ../gramps/gui/plug/report/_reportdialog.py:471
 msgid "Filename"
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:619
+#: ../gramps/gui/plug/_windows.py:627
 msgid "Detailed Info"
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:678
+#: ../gramps/gui/plug/_windows.py:686
 msgid "Plugin Error"
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:743
+#: ../gramps/gui/plug/_windows.py:751
 msgid "_Execute"
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:1039
+#: ../gramps/gui/plug/_windows.py:1047
 #: ../gramps/plugins/tool/ownereditor.py:163
 msgid "Main window"
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:1106
+#: ../gramps/gui/plug/_windows.py:1114
 #, python-format
 msgid "%(adjective)s: %(addon)s"
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:1167
+#: ../gramps/gui/plug/_windows.py:1175
 msgid "Downloading and installing selected addons..."
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:1202
+#: ../gramps/gui/plug/_windows.py:1210
 msgid "Installation Errors"
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:1203
+#: ../gramps/gui/plug/_windows.py:1211
 msgid "The following addons had errors: "
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:1207 ../gramps/gui/plug/_windows.py:1215
+#: ../gramps/gui/plug/_windows.py:1215 ../gramps/gui/plug/_windows.py:1223
 msgid "Done downloading and installing addons"
 msgstr ""
 
 #. translators: leave all/any {...} untranslated
-#: ../gramps/gui/plug/_windows.py:1209
+#: ../gramps/gui/plug/_windows.py:1217
 #, python-brace-format
 msgid "{number_of} addon was installed."
 msgid_plural "{number_of} addons were installed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gramps/gui/plug/_windows.py:1212
-msgid "You need to restart Gramps to see new views."
+#: ../gramps/gui/plug/_windows.py:1220
+msgid "You need to restart Gramps to use the new addons."
 msgstr ""
 
-#: ../gramps/gui/plug/_windows.py:1216
+#: ../gramps/gui/plug/_windows.py:1224
 msgid "No addons were installed."
 msgstr ""
 
@@ -16090,9 +16114,9 @@ msgid "Web Connect"
 msgstr ""
 
 #: ../gramps/gui/plug/quick/_quickreports.py:139
-#: ../gramps/gui/plug/quick/_textbufdoc.py:76
+#: ../gramps/gui/plug/quick/_textbufdoc.py:74
+#: ../gramps/gui/plug/quick/_textbufdoc.py:154
 #: ../gramps/gui/plug/quick/_textbufdoc.py:156
-#: ../gramps/gui/plug/quick/_textbufdoc.py:158
 #: ../gramps/plugins/gramplet/gramplet.gpr.py:216
 #: ../gramps/plugins/gramplet/gramplet.gpr.py:223
 #: ../gramps/plugins/lib/libpersonview.py:382
@@ -16121,57 +16145,57 @@ msgstr ""
 msgid "Available Books"
 msgstr ""
 
-#: ../gramps/gui/plug/report/_bookdialog.py:239
+#: ../gramps/gui/plug/report/_bookdialog.py:240
 msgid "Discard Unsaved Changes"
 msgstr ""
 
-#: ../gramps/gui/plug/report/_bookdialog.py:240
+#: ../gramps/gui/plug/report/_bookdialog.py:241
 msgid "You have made changes which have not been saved."
 msgstr ""
 
-#: ../gramps/gui/plug/report/_bookdialog.py:241
-#: ../gramps/gui/plug/report/_bookdialog.py:737
+#: ../gramps/gui/plug/report/_bookdialog.py:242
+#: ../gramps/gui/plug/report/_bookdialog.py:738
 msgid "Proceed"
 msgstr ""
 
-#: ../gramps/gui/plug/report/_bookdialog.py:300
+#: ../gramps/gui/plug/report/_bookdialog.py:301
 msgid "Name of the book. MANDATORY"
 msgstr ""
 
-#: ../gramps/gui/plug/report/_bookdialog.py:322
+#: ../gramps/gui/plug/report/_bookdialog.py:323
 msgid "Manage Books"
 msgstr ""
 
-#: ../gramps/gui/plug/report/_bookdialog.py:361
+#: ../gramps/gui/plug/report/_bookdialog.py:362
 msgid "New Book"
 msgstr ""
 
-#: ../gramps/gui/plug/report/_bookdialog.py:364
+#: ../gramps/gui/plug/report/_bookdialog.py:365
 msgid "_Available items"
 msgstr ""
 
-#: ../gramps/gui/plug/report/_bookdialog.py:368
+#: ../gramps/gui/plug/report/_bookdialog.py:369
 msgid "Current _book"
 msgstr ""
 
-#: ../gramps/gui/plug/report/_bookdialog.py:376
+#: ../gramps/gui/plug/report/_bookdialog.py:377
 #: ../gramps/plugins/drawreport/statisticschart.py:307
 msgid "Item name"
 msgstr ""
 
-#: ../gramps/gui/plug/report/_bookdialog.py:379
+#: ../gramps/gui/plug/report/_bookdialog.py:380
 msgid "Subject"
 msgstr ""
 
-#: ../gramps/gui/plug/report/_bookdialog.py:393
+#: ../gramps/gui/plug/report/_bookdialog.py:394
 msgid "Book selection list"
 msgstr ""
 
-#: ../gramps/gui/plug/report/_bookdialog.py:445
+#: ../gramps/gui/plug/report/_bookdialog.py:446
 msgid "Different database"
 msgstr ""
 
-#: ../gramps/gui/plug/report/_bookdialog.py:446
+#: ../gramps/gui/plug/report/_bookdialog.py:447
 #, python-format
 msgid ""
 "This book was created with the references to database %s.\n"
@@ -16182,62 +16206,62 @@ msgid ""
 "person of the currently opened database."
 msgstr ""
 
-#: ../gramps/gui/plug/report/_bookdialog.py:552
+#: ../gramps/gui/plug/report/_bookdialog.py:553
 msgid "No selected book item"
 msgstr ""
 
-#: ../gramps/gui/plug/report/_bookdialog.py:553
+#: ../gramps/gui/plug/report/_bookdialog.py:554
 msgid "Please select a book item to configure."
 msgstr ""
 
-#: ../gramps/gui/plug/report/_bookdialog.py:618
+#: ../gramps/gui/plug/report/_bookdialog.py:619
 #: ../gramps/gui/views/bookmarks.py:252 ../gramps/gui/views/tags.py:414
 msgid "_Up"
 msgstr ""
 
-#: ../gramps/gui/plug/report/_bookdialog.py:619
+#: ../gramps/gui/plug/report/_bookdialog.py:620
 #: ../gramps/gui/views/bookmarks.py:253 ../gramps/gui/views/tags.py:415
 msgid "_Down"
 msgstr ""
 
-#: ../gramps/gui/plug/report/_bookdialog.py:620
+#: ../gramps/gui/plug/report/_bookdialog.py:621
 msgid "Setup"
 msgstr ""
 
-#: ../gramps/gui/plug/report/_bookdialog.py:709
-#: ../gramps/gui/plug/report/_bookdialog.py:720
-msgid "No items"
-msgstr ""
-
 #: ../gramps/gui/plug/report/_bookdialog.py:710
 #: ../gramps/gui/plug/report/_bookdialog.py:721
+msgid "No items"
+msgstr ""
+
+#: ../gramps/gui/plug/report/_bookdialog.py:711
+#: ../gramps/gui/plug/report/_bookdialog.py:722
 msgid "This book has no items."
 msgstr ""
 
-#: ../gramps/gui/plug/report/_bookdialog.py:727
+#: ../gramps/gui/plug/report/_bookdialog.py:728
 msgid "No book name"
 msgstr ""
 
-#: ../gramps/gui/plug/report/_bookdialog.py:728
+#: ../gramps/gui/plug/report/_bookdialog.py:729
 msgid ""
 "You are about to save away a book with no name.\n"
 "\n"
 "Please give it a name before saving it away."
 msgstr ""
 
-#: ../gramps/gui/plug/report/_bookdialog.py:734
+#: ../gramps/gui/plug/report/_bookdialog.py:735
 msgid "Book name already exists"
 msgstr ""
 
-#: ../gramps/gui/plug/report/_bookdialog.py:735
+#: ../gramps/gui/plug/report/_bookdialog.py:736
 msgid "You are about to save away a book with a name which already exists."
 msgstr ""
 
-#: ../gramps/gui/plug/report/_bookdialog.py:925
+#: ../gramps/gui/plug/report/_bookdialog.py:926
 msgid "Generate Book"
 msgstr ""
 
-#: ../gramps/gui/plug/report/_bookdialog.py:968
+#: ../gramps/gui/plug/report/_bookdialog.py:969
 msgid "Gramps Book"
 msgstr ""
 
@@ -16601,7 +16625,7 @@ msgid "Spelling checker initialization failed: %s"
 msgstr ""
 
 #: ../gramps/gui/tipofday.py:67 ../gramps/gui/tipofday.py:68
-#: ../gramps/gui/tipofday.py:121 ../gramps/gui/viewmanager.py:506
+#: ../gramps/gui/tipofday.py:121 ../gramps/gui/viewmanager.py:507
 msgid "Tip of the Day"
 msgstr ""
 
@@ -16625,13 +16649,13 @@ msgstr ""
 msgid "Undo History"
 msgstr ""
 
-#: ../gramps/gui/undohistory.py:84 ../gramps/gui/viewmanager.py:594
-#: ../gramps/gui/viewmanager.py:1238
+#: ../gramps/gui/undohistory.py:84 ../gramps/gui/viewmanager.py:595
+#: ../gramps/gui/viewmanager.py:1239
 msgid "_Undo"
 msgstr ""
 
-#: ../gramps/gui/undohistory.py:86 ../gramps/gui/viewmanager.py:599
-#: ../gramps/gui/viewmanager.py:1255
+#: ../gramps/gui/undohistory.py:86 ../gramps/gui/viewmanager.py:600
+#: ../gramps/gui/viewmanager.py:1256
 msgid "_Redo"
 msgstr ""
 
@@ -16706,303 +16730,233 @@ msgstr ""
 msgid "Cannot open new citation editor"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:438 ../gramps/gui/viewmanager.py:1212
+#: ../gramps/gui/viewmanager.py:439 ../gramps/gui/viewmanager.py:1213
 msgid "No Family Tree"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:460
+#: ../gramps/gui/viewmanager.py:461
 msgid "Connect to a recent database"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:478
+#: ../gramps/gui/viewmanager.py:479
 msgid "_Family Trees"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:479
+#: ../gramps/gui/viewmanager.py:480
 msgid "_Manage Family Trees..."
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:480
+#: ../gramps/gui/viewmanager.py:481
 msgid "Manage databases"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:481
+#: ../gramps/gui/viewmanager.py:482
 msgid "Open _Recent"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:482
+#: ../gramps/gui/viewmanager.py:483
 msgid "Open an existing database"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:483
+#: ../gramps/gui/viewmanager.py:484
 msgid "_Quit"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:485
+#: ../gramps/gui/viewmanager.py:486
 msgid "_View"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:487
+#: ../gramps/gui/viewmanager.py:488
 msgid "_Preferences..."
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:490
+#: ../gramps/gui/viewmanager.py:491
 msgid "Gramps _Home Page"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:492
+#: ../gramps/gui/viewmanager.py:493
 msgid "Gramps _Mailing Lists"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:494
+#: ../gramps/gui/viewmanager.py:495
 msgid "_Report a Bug"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:496
+#: ../gramps/gui/viewmanager.py:497
 msgid "_Extra Reports/Tools"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:498
+#: ../gramps/gui/viewmanager.py:499
 msgid "_About"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:500
+#: ../gramps/gui/viewmanager.py:501
 msgid "_Plugin Manager"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:502
+#: ../gramps/gui/viewmanager.py:503
 msgid "_FAQ"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:503
+#: ../gramps/gui/viewmanager.py:504
 msgid "_Key Bindings"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:504
+#: ../gramps/gui/viewmanager.py:505
 msgid "_User Manual"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:512
+#: ../gramps/gui/viewmanager.py:513
 msgid "Close the current database"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:513
+#: ../gramps/gui/viewmanager.py:514
 msgid "_Export..."
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:515
+#: ../gramps/gui/viewmanager.py:516
 msgid "Make Backup..."
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:516
+#: ../gramps/gui/viewmanager.py:517
 msgid "Make a Gramps XML backup of the database"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:518
+#: ../gramps/gui/viewmanager.py:519
 msgid "_Abandon Changes and Quit"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:519 ../gramps/gui/viewmanager.py:522
+#: ../gramps/gui/viewmanager.py:520 ../gramps/gui/viewmanager.py:523
 msgid "_Reports"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:520
+#: ../gramps/gui/viewmanager.py:521
 msgid "Open the reports dialog"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:521
+#: ../gramps/gui/viewmanager.py:522
 msgid "_Go"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:523
+#: ../gramps/gui/viewmanager.py:524
 msgid "Books..."
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:524
+#: ../gramps/gui/viewmanager.py:525
 msgid "_Windows"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:571
+#: ../gramps/gui/viewmanager.py:572
 msgid "Clip_board"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:572
+#: ../gramps/gui/viewmanager.py:573
 msgid "Open the Clipboard dialog"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:573
+#: ../gramps/gui/viewmanager.py:574
 msgid "_Import..."
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:575 ../gramps/gui/viewmanager.py:578
+#: ../gramps/gui/viewmanager.py:576 ../gramps/gui/viewmanager.py:579
 msgid "_Tools"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:576
+#: ../gramps/gui/viewmanager.py:577
 msgid "Open the tools dialog"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:577
+#: ../gramps/gui/viewmanager.py:578
 msgid "_Bookmarks"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:579
+#: ../gramps/gui/viewmanager.py:580
 msgid "_Configure..."
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:580
+#: ../gramps/gui/viewmanager.py:581
 msgid "Configure the active view"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:585
+#: ../gramps/gui/viewmanager.py:586
 msgid "_Navigator"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:587
+#: ../gramps/gui/viewmanager.py:588
 msgid "_Toolbar"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:589
+#: ../gramps/gui/viewmanager.py:590
 msgid "F_ull Screen"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:605
+#: ../gramps/gui/viewmanager.py:606
 msgid "Undo History..."
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:628
+#: ../gramps/gui/viewmanager.py:629
 #, python-format
 msgid "Key %s is not bound"
 msgstr ""
 
 #. registering plugins
-#: ../gramps/gui/viewmanager.py:735
+#: ../gramps/gui/viewmanager.py:736
 msgid "Registering plugins..."
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:742
+#: ../gramps/gui/viewmanager.py:743
 msgid "Ready"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:787
+#: ../gramps/gui/viewmanager.py:788
 msgid "Abort changes?"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:788
+#: ../gramps/gui/viewmanager.py:789
 msgid ""
 "Aborting changes will return the database to the state it was before you "
 "started this editing session."
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:790
+#: ../gramps/gui/viewmanager.py:791
 msgid "Abort changes"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:801
+#: ../gramps/gui/viewmanager.py:802
 msgid "Cannot abandon session's changes"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:802
+#: ../gramps/gui/viewmanager.py:803
 msgid ""
 "Changes cannot be completely abandoned because the number of changes made in "
 "the session exceeded the limit."
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:963
+#: ../gramps/gui/viewmanager.py:964
 msgid "View failed to load. Check error output."
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:1115
+#: ../gramps/gui/viewmanager.py:1116
 msgid "Import Statistics"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:1182
+#: ../gramps/gui/viewmanager.py:1183
 msgid "Read Only"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:1289
-msgid "Gramps XML Backup"
-msgstr ""
-
-#: ../gramps/gui/viewmanager.py:1320
-#: ../gramps/plugins/importer/importgedcom.glade:289
-msgid "File:"
-msgstr ""
-
-#: ../gramps/gui/viewmanager.py:1352
-msgid "Media:"
-msgstr ""
-
-#. #################
-#. --------------------
-#. ###############################
-#. What to include
-#. ###############################
-#: ../gramps/gui/viewmanager.py:1358
-#: ../gramps/plugins/drawreport/ancestortree.py:962
-#: ../gramps/plugins/drawreport/descendtree.py:1671
-#: ../gramps/plugins/graph/gvfamilylines.py:189
-#: ../gramps/plugins/graph/gvrelgraph.py:692
-#: ../gramps/plugins/textreport/detancestralreport.py:852
-#: ../gramps/plugins/textreport/detdescendantreport.py:1061
-#: ../gramps/plugins/textreport/detdescendantreport.py:1085
-#: ../gramps/plugins/textreport/indivcomplete.py:1067
-msgid "Include"
-msgstr ""
-
-#: ../gramps/gui/viewmanager.py:1359
-#: ../gramps/plugins/gramplet/statsgramplet.py:139
-#: ../gramps/plugins/webreport/narrativeweb.py:8121
-msgid "Megabyte|MB"
-msgstr ""
-
-#: ../gramps/gui/viewmanager.py:1361
-msgid "Exclude"
-msgstr ""
-
-#: ../gramps/gui/viewmanager.py:1382
-msgid "Backup file already exists! Overwrite?"
-msgstr ""
-
-#: ../gramps/gui/viewmanager.py:1383
-#, python-format
-msgid "The file '%s' exists."
-msgstr ""
-
-#: ../gramps/gui/viewmanager.py:1384
-msgid "Proceed and overwrite"
-msgstr ""
-
-#: ../gramps/gui/viewmanager.py:1385
-msgid "Cancel the backup"
-msgstr ""
-
-#: ../gramps/gui/viewmanager.py:1393
-msgid "Making backup..."
-msgstr ""
-
-#: ../gramps/gui/viewmanager.py:1406
-#, python-format
-msgid "Backup saved to '%s'"
-msgstr ""
-
-#: ../gramps/gui/viewmanager.py:1409
-msgid "Backup aborted"
-msgstr ""
-
-#: ../gramps/gui/viewmanager.py:1459
+#: ../gramps/gui/viewmanager.py:1302
 msgid "Autobackup..."
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:1464
+#: ../gramps/gui/viewmanager.py:1307
 msgid "Error saving backup data"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:1674
+#: ../gramps/gui/viewmanager.py:1517
 msgid "Failed Loading View"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:1675
+#: ../gramps/gui/viewmanager.py:1518
 #, python-format
 msgid ""
 "The view %(name)s did not load and reported an error.\n"
@@ -17017,11 +16971,11 @@ msgid ""
 "by using the Plugin Manager on the Help menu."
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:1767
+#: ../gramps/gui/viewmanager.py:1610
 msgid "Failed Loading Plugin"
 msgstr ""
 
-#: ../gramps/gui/viewmanager.py:1768
+#: ../gramps/gui/viewmanager.py:1611
 #, python-format
 msgid ""
 "The plugin %(name)s did not load and reported an error.\n"
@@ -17036,6 +16990,76 @@ msgid ""
 "by using the Plugin Manager on the Help menu."
 msgstr ""
 
+#: ../gramps/gui/viewmanager.py:1690
+msgid "Gramps XML Backup"
+msgstr ""
+
+#: ../gramps/gui/viewmanager.py:1719
+#: ../gramps/plugins/importer/importgedcom.glade:289
+msgid "File:"
+msgstr ""
+
+#: ../gramps/gui/viewmanager.py:1751
+msgid "Media:"
+msgstr ""
+
+#. #################
+#. --------------------
+#. ###############################
+#. What to include
+#. ###############################
+#: ../gramps/gui/viewmanager.py:1757
+#: ../gramps/plugins/drawreport/ancestortree.py:962
+#: ../gramps/plugins/drawreport/descendtree.py:1671
+#: ../gramps/plugins/graph/gvfamilylines.py:189
+#: ../gramps/plugins/graph/gvrelgraph.py:692
+#: ../gramps/plugins/textreport/detancestralreport.py:852
+#: ../gramps/plugins/textreport/detdescendantreport.py:1061
+#: ../gramps/plugins/textreport/detdescendantreport.py:1085
+#: ../gramps/plugins/textreport/indivcomplete.py:1067
+msgid "Include"
+msgstr ""
+
+#: ../gramps/gui/viewmanager.py:1758
+#: ../gramps/plugins/gramplet/statsgramplet.py:139
+#: ../gramps/plugins/webreport/narrativeweb.py:8121
+msgid "Megabyte|MB"
+msgstr ""
+
+#: ../gramps/gui/viewmanager.py:1760
+msgid "Exclude"
+msgstr ""
+
+#: ../gramps/gui/viewmanager.py:1780
+msgid "Backup file already exists! Overwrite?"
+msgstr ""
+
+#: ../gramps/gui/viewmanager.py:1781
+#, python-format
+msgid "The file '%s' exists."
+msgstr ""
+
+#: ../gramps/gui/viewmanager.py:1782
+msgid "Proceed and overwrite"
+msgstr ""
+
+#: ../gramps/gui/viewmanager.py:1783
+msgid "Cancel the backup"
+msgstr ""
+
+#: ../gramps/gui/viewmanager.py:1798
+msgid "Making backup..."
+msgstr ""
+
+#: ../gramps/gui/viewmanager.py:1811
+#, python-format
+msgid "Backup saved to '%s'"
+msgstr ""
+
+#: ../gramps/gui/viewmanager.py:1814
+msgid "Backup aborted"
+msgstr ""
+
 #: ../gramps/gui/views/bookmarks.py:65
 msgid "manual|Bookmarks"
 msgstr ""
@@ -17129,19 +17153,19 @@ msgstr ""
 msgid "Column clicked, sorting..."
 msgstr ""
 
-#: ../gramps/gui/views/listview.py:1018
+#: ../gramps/gui/views/listview.py:1020
 msgid "Export View as Spreadsheet"
 msgstr ""
 
-#: ../gramps/gui/views/listview.py:1031
+#: ../gramps/gui/views/listview.py:1033
 msgid "CSV"
 msgstr ""
 
-#: ../gramps/gui/views/listview.py:1032
+#: ../gramps/gui/views/listview.py:1034
 msgid "OpenDocument Spreadsheet"
 msgstr ""
 
-#: ../gramps/gui/views/listview.py:1220
+#: ../gramps/gui/views/listview.py:1222
 msgid "Columns"
 msgstr ""
 
@@ -17529,7 +17553,7 @@ msgstr ""
 msgid "Reorder Relationships"
 msgstr ""
 
-#: ../gramps/gui/widgets/reorderfam.py:167
+#: ../gramps/gui/widgets/reorderfam.py:168
 #, python-format
 msgid "Reorder Relationships: %s"
 msgstr ""
@@ -22025,7 +22049,7 @@ msgstr ""
 #: ../gramps/plugins/importer/importcsv.py:125
 #: ../gramps/plugins/importer/importgedcom.py:152
 #: ../gramps/plugins/importer/importgeneweb.py:161
-#: ../gramps/plugins/importer/importprogen.py:85
+#: ../gramps/plugins/importer/importprogen.py:92
 #: ../gramps/plugins/importer/importvcard.py:74
 msgid "Results"
 msgstr ""
@@ -22033,7 +22057,7 @@ msgstr ""
 #: ../gramps/plugins/importer/importcsv.py:125
 #: ../gramps/plugins/importer/importgedcom.py:152
 #: ../gramps/plugins/importer/importgeneweb.py:161
-#: ../gramps/plugins/importer/importprogen.py:85
+#: ../gramps/plugins/importer/importprogen.py:92
 #: ../gramps/plugins/importer/importvcard.py:74
 msgid "done"
 msgstr ""
@@ -22446,8 +22470,8 @@ msgid ""
 msgstr ""
 
 #: ../gramps/plugins/importer/importgrdb.py:61
-#: ../gramps/plugins/importer/importprogen.py:74
-#: ../gramps/plugins/importer/importprogen.py:83
+#: ../gramps/plugins/importer/importprogen.py:81
+#: ../gramps/plugins/importer/importprogen.py:90
 #: ../gramps/plugins/importer/importxml.py:440
 #: ../gramps/plugins/importer/importxml.py:443
 #, python-format
@@ -22465,62 +22489,80 @@ msgid ""
 "into that version. Please refer to:%(gramps_wiki_migrate_two_to_three_url)s"
 msgstr ""
 
-#: ../gramps/plugins/importer/importprogen.py:80
+#: ../gramps/plugins/importer/importprogen.py:87
+#: ../gramps/plugins/importer/importprogen.py:511
 msgid "Pro-Gen data error"
 msgstr ""
 
-#: ../gramps/plugins/importer/importprogen.py:174
+#: ../gramps/plugins/importer/importprogen.py:180
 msgid "Not a Pro-Gen file"
 msgstr ""
 
-#: ../gramps/plugins/importer/importprogen.py:392
+#: ../gramps/plugins/importer/importprogen.py:390
 #, python-format
 msgid "Field '%(fldname)s' not found"
 msgstr ""
 
-#: ../gramps/plugins/importer/importprogen.py:468
+#: ../gramps/plugins/importer/importprogen.py:454
 #, python-format
-msgid "Cannot find DEF file: %(deffname)s"
+msgid "Cannot find DEF file: %(dname)s"
+msgstr ""
+
+#. Raise a error message
+#: ../gramps/plugins/importer/importprogen.py:510
+msgid "Not a supported Pro-Gen import file language"
 msgstr ""
 
-#. print self.def_.diag()
 #. TODO no-parent
 #: ../gramps/plugins/importer/importprogen.py:515
 msgid "Import from Pro-Gen"
 msgstr ""
 
-#: ../gramps/plugins/importer/importprogen.py:521
+#: ../gramps/plugins/importer/importprogen.py:516
+msgid "Initializing"
+msgstr ""
+
+#: ../gramps/plugins/importer/importprogen.py:522
 msgid "Pro-Gen import"
 msgstr ""
 
-#: ../gramps/plugins/importer/importprogen.py:750
+#: ../gramps/plugins/importer/importprogen.py:583
 #, python-format
-msgid "date did not match: '%(text)s' (%(msg)s)"
+msgid "Import from Pro-Gen (%s)"
+msgstr ""
+
+#. Hmmm. Just use the plain text.
+#: ../gramps/plugins/importer/importprogen.py:1061
+#, python-format
+msgid "Date did not match: '%(text)s' (%(msg)s)"
 msgstr ""
 
 #. The records are numbered 1..N
-#: ../gramps/plugins/importer/importprogen.py:830
+#: ../gramps/plugins/importer/importprogen.py:1118
 msgid "Importing individuals"
 msgstr ""
 
 #. The records are numbered 1..N
-#: ../gramps/plugins/importer/importprogen.py:1105
+#: ../gramps/plugins/importer/importprogen.py:1501
 msgid "Importing families"
 msgstr ""
 
+#. We have seen some case insensitivity in DEF files ...
+#. F13: Father
+#. F14: Mother
 #. The records are numbered 1..N
-#: ../gramps/plugins/importer/importprogen.py:1282
+#: ../gramps/plugins/importer/importprogen.py:1768
 msgid "Adding children"
 msgstr ""
 
-#: ../gramps/plugins/importer/importprogen.py:1293
+#: ../gramps/plugins/importer/importprogen.py:1785
 #, python-format
-msgid "cannot find father for I%(person)s (father=%(id)d)"
+msgid "Cannot find father for I%(person)s (Father=%(id)d)"
 msgstr ""
 
-#: ../gramps/plugins/importer/importprogen.py:1296
+#: ../gramps/plugins/importer/importprogen.py:1788
 #, python-format
-msgid "cannot find mother for I%(person)s (mother=%(mother)d)"
+msgid "Cannot find mother for I%(person)s (Mother=%(mother)d)"
 msgstr ""
 
 #: ../gramps/plugins/importer/importvcard.py:226
@@ -30097,6 +30139,10 @@ msgstr ""
 msgid "Merge candidates"
 msgstr ""
 
+#: ../gramps/plugins/tool/finddupes.py:583
+msgid "Merge persons"
+msgstr ""
+
 #: ../gramps/plugins/tool/findloop.py:56
 msgid "manual|Find_database_loop"
 msgstr ""
@@ -31103,11 +31149,6 @@ msgstr ""
 msgid "Data Verification Results"
 msgstr ""
 
-#. Add column with the warning text
-#: ../gramps/plugins/tool/verify.py:563
-msgid "Warning"
-msgstr ""
-
 #: ../gramps/plugins/tool/verify.py:666
 msgid "_Show all"
 msgstr ""