diff --git a/po/ChangeLog b/po/ChangeLog
index f4eb55eb0..5c8d48434 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,6 @@
+2007-10-10 Stephane Charette <stephanecharette@gmail.com>
+	* gramps.pot: rebuilt
+
 2007-10-10 Mirko Leonhaeuser <mirko@leonhaeuser.de>
 	* de.po: fixes to de.po (100% coverage)
 
diff --git a/po/gramps.pot b/po/gramps.pot
index d751ce8ae..511695209 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: 2007-07-04 22:59-0700\n"
+"POT-Creation-Date: 2007-10-10 23:43-0700\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"
@@ -69,7 +69,8 @@ msgstr ""
 
 #: ../src/ArgHandler.py:334 ../src/DbLoader.py:122 ../src/DbLoader.py:129
 #: ../src/DbLoader.py:237 ../src/DbLoader.py:245 ../src/DbLoader.py:325
-#: ../src/DbLoader.py:348 ../src/DbLoader.py:430
+#: ../src/DbLoader.py:348 ../src/DbLoader.py:430 ../src/DbLoader.py:461
+#: ../src/DbLoader.py:465
 #, python-format
 msgid "Could not open file: %s"
 msgstr ""
@@ -86,11 +87,11 @@ msgstr ""
 msgid "GRAMPS: Create GRAMPS database"
 msgstr ""
 
-#: ../src/ArgHandler.py:769 ../src/DbLoader.py:532
+#: ../src/ArgHandler.py:769 ../src/DbLoader.py:534
 msgid "All files"
 msgstr ""
 
-#: ../src/ArgHandler.py:778 ../src/DbLoader.py:552
+#: ../src/ArgHandler.py:778 ../src/DbLoader.py:554
 msgid "GRAMPS databases"
 msgstr ""
 
@@ -129,12 +130,12 @@ msgstr ""
 msgid "Email:"
 msgstr ""
 
-#: ../src/Bookmarks.py:176 ../src/Bookmarks.py:182
+#: ../src/Bookmarks.py:180 ../src/Bookmarks.py:186
 msgid "Edit Bookmarks"
 msgstr ""
 
 #. Add column with object name
-#: ../src/Bookmarks.py:188 ../src/GrampsCfg.py:143 ../src/ScratchPad.py:171
+#: ../src/Bookmarks.py:192 ../src/GrampsCfg.py:143 ../src/ScratchPad.py:171
 #: ../src/ScratchPad.py:243 ../src/ScratchPad.py:320 ../src/ScratchPad.py:376
 #: ../src/ScratchPad.py:409 ../src/ScratchPad.py:466 ../src/ScratchPad.py:498
 #: ../src/ScratchPad.py:515 ../src/ScratchPad.py:516 ../src/ScratchPad.py:535
@@ -147,9 +148,9 @@ msgstr ""
 #: ../src/DisplayTabs/_BackRefList.py:58
 #: ../src/DisplayTabs/_NameEmbedList.py:59
 #: ../src/DisplayTabs/_PersonRefEmbedList.py:52
-#: ../src/Editors/_EditFamily.py:96 ../src/Editors/_EditName.py:206
+#: ../src/Editors/_EditFamily.py:96 ../src/Editors/_EditName.py:228
 #: ../src/Selectors/_SelectPerson.py:106 ../src/plugins/BookReport.py:659
-#: ../src/plugins/IndivComplete.py:477 ../src/plugins/NarrativeWeb.py:604
+#: ../src/plugins/IndivComplete.py:478 ../src/plugins/NarrativeWeb.py:604
 #: ../src/plugins/NarrativeWeb.py:664 ../src/plugins/PatchNames.py:209
 #: ../src/plugins/RelCalc.py:56 ../src/plugins/RelCalc.py:110
 #: ../src/plugins/RemoveUnused.py:180 ../src/plugins/TimeLine.py:440
@@ -164,9 +165,9 @@ msgstr ""
 
 #. GRAMPS ID
 #. Add column with object gramps_id
-#: ../src/Bookmarks.py:188 ../src/PageView.py:356 ../src/PageView.py:530
+#: ../src/Bookmarks.py:192 ../src/PageView.py:354 ../src/PageView.py:528
 #: ../src/Merge/_MergePerson.py:124 ../src/DataViews/_EventView.py:55
-#: ../src/DataViews/_FamilyList.py:51 ../src/DataViews/_RelationView.py:519
+#: ../src/DataViews/_FamilyList.py:51 ../src/DataViews/_RelationView.py:526
 #: ../src/DataViews/_MediaView.py:69 ../src/DataViews/_PersonView.py:72
 #: ../src/DataViews/_PlaceView.py:62 ../src/DataViews/_RepositoryView.py:63
 #: ../src/DataViews/_SourceView.py:62 ../src/DisplayTabs/_BackRefList.py:57
@@ -368,23 +369,23 @@ msgid ""
 "to gramps-bugs@lists.sourceforge.net."
 msgstr ""
 
-#: ../src/DbLoader.py:541
+#: ../src/DbLoader.py:543
 msgid "All GRAMPS files"
 msgstr ""
 
-#: ../src/DbLoader.py:561
+#: ../src/DbLoader.py:563
 msgid "GRAMPS XML databases"
 msgstr ""
 
-#: ../src/DbLoader.py:570
+#: ../src/DbLoader.py:572
 msgid "GEDCOM files"
 msgstr ""
 
-#: ../src/DbLoader.py:610
+#: ../src/DbLoader.py:612
 msgid "Automatically detected"
 msgstr ""
 
-#: ../src/DbLoader.py:619
+#: ../src/DbLoader.py:621
 msgid "Select file _type:"
 msgstr ""
 
@@ -413,7 +414,7 @@ msgstr ""
 msgid "Selecting the file name"
 msgstr ""
 
-#: ../src/Exporter.py:137
+#: ../src/Exporter.py:146
 msgid ""
 "Under normal circumstances, GRAMPS does not require you to directly save "
 "your changes. All changes you make are immediately saved to the database.\n"
@@ -427,7 +428,7 @@ msgid ""
 "button at any time and your present database will still be intact."
 msgstr ""
 
-#: ../src/Exporter.py:162
+#: ../src/Exporter.py:172
 #, python-format
 msgid ""
 "The data will be saved as follows:\n"
@@ -439,15 +440,22 @@ msgid ""
 "Press OK to proceed, Cancel to abort, or Back to revisit your options."
 msgstr ""
 
-#: ../src/Exporter.py:167 ../src/plugins/MediaManager.py:258
+#: ../src/Exporter.py:180
+msgid ""
+"You have selected an invalid file name.\n"
+"\n"
+"Please, press Back, and choose a valid file name."
+msgstr ""
+
+#: ../src/Exporter.py:184 ../src/plugins/MediaManager.py:258
 msgid "Final confirmation"
 msgstr ""
 
-#: ../src/Exporter.py:204
+#: ../src/Exporter.py:221
 msgid "Your data has been saved"
 msgstr ""
 
-#: ../src/Exporter.py:206
+#: ../src/Exporter.py:223
 msgid ""
 "The copy of your data has been successfully saved. You may press OK button "
 "now to continue.\n"
@@ -457,11 +465,11 @@ msgid ""
 "not alter the copy you have just made. "
 msgstr ""
 
-#: ../src/Exporter.py:214
+#: ../src/Exporter.py:231
 msgid "Saving failed"
 msgstr ""
 
-#: ../src/Exporter.py:216
+#: ../src/Exporter.py:233
 msgid ""
 "There was an error while saving your data. You may try starting the export "
 "again.\n"
@@ -470,21 +478,21 @@ msgid ""
 "data that failed to save."
 msgstr ""
 
-#: ../src/Exporter.py:354
+#: ../src/Exporter.py:371
 #, python-format
 msgid "Could not write file: %s"
 msgstr ""
 
-#: ../src/Exporter.py:355
+#: ../src/Exporter.py:372
 #, python-format
 msgid "System message was: %s"
 msgstr ""
 
-#: ../src/Exporter.py:364
+#: ../src/Exporter.py:381
 msgid "GRAMPS _GRDB database"
 msgstr ""
 
-#: ../src/Exporter.py:365
+#: ../src/Exporter.py:382
 msgid ""
 "The GRAMPS GRDB database is a format that GRAMPS uses to store information. "
 "Selecting this option will allow you to make a copy of the current database."
@@ -494,7 +502,7 @@ msgstr ""
 msgid "Father's surname"
 msgstr ""
 
-#: ../src/GrampsCfg.py:60 ../src/plugins/Check.py:968
+#: ../src/GrampsCfg.py:60 ../src/plugins/Check.py:1181
 #: ../src/RelLib/_ChildRefType.py:47
 #: ../src/Filters/SideBar/_EventSidebarFilter.py:148
 #: ../src/Filters/SideBar/_FamilySidebarFilter.py:202
@@ -588,14 +596,14 @@ msgstr ""
 
 #: ../src/GrampsCfg.py:158 ../src/gramps_main.py:97 ../src/ToolTips.py:193
 #: ../src/Editors/_EditPerson.py:107 ../src/plugins/EventCmp.py:268
-#: ../src/FilterEditor/_EditRule.py:228
+#: ../src/FilterEditor/_EditRule.py:229
 msgid "Person"
 msgstr ""
 
 #: ../src/GrampsCfg.py:159 ../src/ScratchPad.py:519 ../src/ToolTips.py:223
-#: ../src/DataViews/_RelationView.py:439 ../src/DataViews/_RelationView.py:956
+#: ../src/DataViews/_RelationView.py:446 ../src/DataViews/_RelationView.py:963
 #: ../src/Editors/_EditFamily.py:459 ../src/RelLib/_EventRoleType.py:57
-#: ../src/FilterEditor/_EditRule.py:229
+#: ../src/FilterEditor/_EditRule.py:230
 msgid "Family"
 msgstr ""
 
@@ -605,29 +613,29 @@ msgstr ""
 #: ../src/DisplayTabs/_FamilyLdsEmbedList.py:53
 #: ../src/DisplayTabs/_LdsEmbedList.py:55 ../src/plugins/NarrativeWeb.py:714
 #: ../src/Filters/SideBar/_EventSidebarFilter.py:89
-#: ../src/FilterEditor/_EditRule.py:231
+#: ../src/FilterEditor/_EditRule.py:232
 msgid "Place"
 msgstr ""
 
 #: ../src/GrampsCfg.py:161 ../src/Utils.py:213 ../src/Utils.py:215
-#: ../src/Editors/_EditSource.py:72 ../src/FilterEditor/_EditRule.py:232
+#: ../src/Editors/_EditSource.py:72 ../src/FilterEditor/_EditRule.py:233
 msgid "Source"
 msgstr ""
 
 #: ../src/GrampsCfg.py:162 ../src/ScratchPad.py:569 ../src/ScratchPad.py:582
-#: ../src/Editors/_EditPerson.py:425 ../src/FilterEditor/_EditRule.py:233
+#: ../src/Editors/_EditPerson.py:425 ../src/FilterEditor/_EditRule.py:234
 msgid "Media Object"
 msgstr ""
 
 #: ../src/GrampsCfg.py:163 ../src/ScratchPad.py:230
 #: ../src/Filters/SideBar/_PersonSidebarFilter.py:115
-#: ../src/FilterEditor/_EditRule.py:230
+#: ../src/FilterEditor/_EditRule.py:231
 msgid "Event"
 msgstr ""
 
 #: ../src/GrampsCfg.py:164 ../src/ToolTips.py:142
 #: ../src/Editors/_EditRepository.py:64 ../src/Editors/_EditRepository.py:66
-#: ../src/FilterEditor/_EditRule.py:234
+#: ../src/FilterEditor/_EditRule.py:235
 msgid "Repository"
 msgstr ""
 
@@ -972,96 +980,96 @@ msgstr ""
 msgid "Given name"
 msgstr ""
 
-#: ../src/PageView.py:223 ../src/ViewManager.py:1041
+#: ../src/PageView.py:221 ../src/ViewManager.py:1041
 #, python-format
 msgid "%s has been bookmarked"
 msgstr ""
 
-#: ../src/PageView.py:227 ../src/PageView.py:516 ../src/ViewManager.py:1044
+#: ../src/PageView.py:225 ../src/PageView.py:514 ../src/ViewManager.py:1044
 #: ../src/DataViews/_FamilyList.py:116
 msgid "Could Not Set a Bookmark"
 msgstr ""
 
-#: ../src/PageView.py:228 ../src/ViewManager.py:1045
+#: ../src/PageView.py:226 ../src/ViewManager.py:1045
 #: ../src/DataViews/_FamilyList.py:117
 msgid "A bookmark could not be set because no one was selected."
 msgstr ""
 
-#: ../src/PageView.py:251
+#: ../src/PageView.py:249
 msgid "_Add bookmark"
 msgstr ""
 
-#: ../src/PageView.py:253
+#: ../src/PageView.py:251
 msgid "_Edit bookmarks"
 msgstr ""
 
-#: ../src/PageView.py:282
+#: ../src/PageView.py:280
 msgid "_Forward"
 msgstr ""
 
-#: ../src/PageView.py:283
+#: ../src/PageView.py:281
 msgid "Go to the next person in the history"
 msgstr ""
 
-#: ../src/PageView.py:290
+#: ../src/PageView.py:288
 msgid "_Back"
 msgstr ""
 
-#: ../src/PageView.py:291
+#: ../src/PageView.py:289
 msgid "Go to the previous person in the history"
 msgstr ""
 
-#: ../src/PageView.py:295 ../src/DataViews/_PedigreeView.py:605
+#: ../src/PageView.py:293 ../src/DataViews/_PedigreeView.py:605
 msgid "_Home"
 msgstr ""
 
-#: ../src/PageView.py:297 ../src/DataViews/_PedigreeView.py:606
+#: ../src/PageView.py:295 ../src/DataViews/_PedigreeView.py:606
 msgid "Go to the default person"
 msgstr ""
 
-#: ../src/PageView.py:298
+#: ../src/PageView.py:296
 msgid "Person Filter Editor"
 msgstr ""
 
-#: ../src/PageView.py:303
+#: ../src/PageView.py:301
 msgid "Set _Home Person"
 msgstr ""
 
-#: ../src/PageView.py:347 ../src/PageView.py:350 ../src/PageView.py:521
-#: ../src/PageView.py:524
+#: ../src/PageView.py:345 ../src/PageView.py:348 ../src/PageView.py:519
+#: ../src/PageView.py:522
 msgid "Jump to by GRAMPS ID"
 msgstr ""
 
-#: ../src/PageView.py:374 ../src/PageView.py:548
+#: ../src/PageView.py:372 ../src/PageView.py:546
 #, python-format
 msgid "Error: %s is not a valid GRAMPS ID"
 msgstr ""
 
-#: ../src/PageView.py:517
+#: ../src/PageView.py:515
 msgid "A bookmark could not be set because nothing was selected."
 msgstr ""
 
-#: ../src/PageView.py:808 ../src/DataViews/_PersonView.py:156
+#: ../src/PageView.py:812 ../src/DataViews/_PersonView.py:156
 msgid "_Add"
 msgstr ""
 
-#: ../src/PageView.py:810 ../src/DataViews/_PersonView.py:158
+#: ../src/PageView.py:814 ../src/DataViews/_PersonView.py:158
 msgid "_Remove"
 msgstr ""
 
-#: ../src/PageView.py:812 ../src/ViewManager.py:389
+#: ../src/PageView.py:816 ../src/ViewManager.py:389
 #: ../src/DataViews/_FamilyList.py:102 ../src/DataViews/_MediaView.py:194
 #: ../src/DataViews/_PersonView.py:160 ../src/DataViews/_PlaceView.py:118
 #: ../src/DataViews/_RepositoryView.py:121 ../src/DataViews/_SourceView.py:114
 msgid "_Column Editor"
 msgstr ""
 
-#: ../src/PageView.py:818 ../src/ViewManager.py:330 ../src/ViewManager.py:388
+#: ../src/PageView.py:822 ../src/ViewManager.py:330 ../src/ViewManager.py:388
 #: ../src/DataViews/_PersonView.py:148
 msgid "_Edit"
 msgstr ""
 
-#: ../src/PageView.py:823
+#: ../src/PageView.py:827
 msgid "_Filter"
 msgstr ""
 
@@ -1137,33 +1145,33 @@ msgstr ""
 msgid "gender unknown,unknown relation|partner"
 msgstr ""
 
-#: ../src/Relationship.py:334 ../src/DataViews/_PedigreeView.py:1271
+#: ../src/Relationship.py:334 ../src/DataViews/_PedigreeView.py:1277
 #: ../src/plugins/rel_pl.py:475
 msgid "Relationship loop detected"
 msgstr ""
 
 #: ../src/Reorder.py:32 ../src/ToolTips.py:228
 #: ../src/Merge/_MergePerson.py:155 ../src/DataViews/_FamilyList.py:52
-#: ../src/DataViews/_RelationView.py:697 ../src/Selectors/_SelectFamily.py:54
+#: ../src/DataViews/_RelationView.py:704 ../src/Selectors/_SelectFamily.py:54
 #: ../src/plugins/FamilyGroup.py:247 ../src/plugins/FamilyGroup.py:258
 #: ../src/plugins/IndivComplete.py:236 ../src/plugins/IndivComplete.py:238
-#: ../src/plugins/IndivComplete.py:523 ../src/plugins/NarrativeWeb.py:1863
+#: ../src/plugins/IndivComplete.py:524 ../src/plugins/NarrativeWeb.py:1863
 #: ../src/Filters/SideBar/_FamilySidebarFilter.py:104
 msgid "Father"
 msgstr ""
 
 #: ../src/Reorder.py:32 ../src/ToolTips.py:233
 #: ../src/Merge/_MergePerson.py:157 ../src/DataViews/_FamilyList.py:53
-#: ../src/DataViews/_RelationView.py:698 ../src/Selectors/_SelectFamily.py:55
+#: ../src/DataViews/_RelationView.py:705 ../src/Selectors/_SelectFamily.py:55
 #: ../src/plugins/FamilyGroup.py:264 ../src/plugins/FamilyGroup.py:275
 #: ../src/plugins/IndivComplete.py:245 ../src/plugins/IndivComplete.py:247
-#: ../src/plugins/IndivComplete.py:528 ../src/plugins/NarrativeWeb.py:1868
+#: ../src/plugins/IndivComplete.py:529 ../src/plugins/NarrativeWeb.py:1868
 #: ../src/Filters/SideBar/_FamilySidebarFilter.py:105
 msgid "Mother"
 msgstr ""
 
 #: ../src/Reorder.py:33 ../src/Merge/_MergePerson.py:171
-#: ../src/DataViews/_RelationView.py:317 ../src/DataViews/_RelationView.py:958
+#: ../src/DataViews/_RelationView.py:320 ../src/DataViews/_RelationView.py:965
 #: ../src/DataViews/_PersonView.py:78 ../src/plugins/FamilyGroup.py:569
 #: ../src/plugins/FamilyGroup.py:820 ../src/plugins/RelCalc.py:63
 msgid "Spouse"
@@ -1183,10 +1191,10 @@ msgstr ""
 msgid "Reorder Relationships: %s"
 msgstr ""
 
-#: ../src/ScratchPad.py:79 ../src/DataViews/_RelationView.py:376
-#: ../src/DataViews/_RelationView.py:759
+#: ../src/ScratchPad.py:79 ../src/DataViews/_RelationView.py:380
+#: ../src/DataViews/_RelationView.py:766
 #: ../src/DisplayTabs/_PersonRefEmbedList.py:110
-#: ../src/Editors/_EditPerson.py:755 ../src/plugins/Check.py:930
+#: ../src/Editors/_EditPerson.py:755 ../src/plugins/Check.py:1143
 #: ../src/plugins/NarrativeWeb.py:1624 ../src/PluginUtils/_PluginMgr.py:183
 #: ../src/PluginUtils/_PluginMgr.py:185 ../src/PluginUtils/_PluginMgr.py:186
 #: ../src/PluginUtils/_PluginMgr.py:216 ../src/PluginUtils/_PluginMgr.py:217
@@ -1372,7 +1380,7 @@ msgid "Person Link"
 msgstr ""
 
 #: ../src/ScratchPad.py:673 ../src/ToolTips.py:195
-#: ../src/Merge/_MergePerson.py:128 ../src/DataViews/_RelationView.py:529
+#: ../src/Merge/_MergePerson.py:128 ../src/DataViews/_RelationView.py:536
 #: ../src/plugins/FamilyGroup.py:527 ../src/plugins/FamilyGroup.py:529
 #: ../src/RelLib/_ChildRefType.py:48 ../src/RelLib/_EventType.py:90
 msgid "Birth"
@@ -1418,11 +1426,11 @@ msgstr ""
 msgid "Set your locale appropriately to use spelling checker."
 msgstr ""
 
-#: ../src/Spell.py:56
+#: ../src/Spell.py:58
 msgid "Spelling checker is not installed"
 msgstr ""
 
-#: ../src/Spell.py:62
+#: ../src/Spell.py:64
 #, python-format
 msgid "Spelling checker is not available for %s"
 msgstr ""
@@ -1562,9 +1570,9 @@ msgstr ""
 msgid "%s and %s"
 msgstr ""
 
-#: ../src/Utils.py:218 ../src/Utils.py:220 ../src/plugins/NarrativeWeb.py:2854
-#: ../src/plugins/NarrativeWeb.py:2855 ../src/plugins/NarrativeWeb.py:2977
-#: ../src/plugins/NarrativeWeb.py:2983 ../src/plugins/NarrativeWeb.py:2989
+#: ../src/Utils.py:218 ../src/Utils.py:220 ../src/plugins/NarrativeWeb.py:2856
+#: ../src/plugins/NarrativeWeb.py:2857 ../src/plugins/NarrativeWeb.py:2979
+#: ../src/plugins/NarrativeWeb.py:2985 ../src/plugins/NarrativeWeb.py:2991
 #: ../src/ReportBase/_ReportUtils.py:1144
 #: ../src/ReportBase/_ReportUtils.py:1268
 msgid "Private"
@@ -1885,14 +1893,14 @@ msgstr ""
 
 #. Gender
 #: ../src/Merge/_MergePerson.py:125 ../src/DataViews/_PersonView.py:73
-#: ../src/Editors/_EditFamily.py:97 ../src/plugins/IndivComplete.py:488
+#: ../src/Editors/_EditFamily.py:97 ../src/plugins/IndivComplete.py:489
 #: ../src/plugins/NarrativeWeb.py:1741 ../src/plugins/RelCalc.py:58
 #: ../src/plugins/StatisticsChart.py:102
 #: ../src/Filters/SideBar/_PersonSidebarFilter.py:110
 msgid "Gender"
 msgstr ""
 
-#: ../src/Merge/_MergePerson.py:131 ../src/DataViews/_RelationView.py:540
+#: ../src/Merge/_MergePerson.py:131 ../src/DataViews/_RelationView.py:547
 #: ../src/plugins/FamilyGroup.py:533 ../src/plugins/FamilyGroup.py:535
 #: ../src/RelLib/_EventType.py:91
 msgid "Death"
@@ -1903,9 +1911,9 @@ msgid "Alternate Names"
 msgstr ""
 
 #. Go over parents and build their menu
-#: ../src/Merge/_MergePerson.py:150 ../src/DataViews/_RelationView.py:426
-#: ../src/DataViews/_RelationView.py:696
-#: ../src/DataViews/_PedigreeView.py:1572 ../src/plugins/NarrativeWeb.py:1836
+#: ../src/Merge/_MergePerson.py:150 ../src/DataViews/_RelationView.py:433
+#: ../src/DataViews/_RelationView.py:703
+#: ../src/DataViews/_PedigreeView.py:1578 ../src/plugins/NarrativeWeb.py:1836
 msgid "Parents"
 msgstr ""
 
@@ -1918,11 +1926,11 @@ msgid "No parents found"
 msgstr ""
 
 #. Go over spouses and build their menu
-#: ../src/Merge/_MergePerson.py:161 ../src/DataViews/_PedigreeView.py:1458
+#: ../src/Merge/_MergePerson.py:161 ../src/DataViews/_PedigreeView.py:1464
 msgid "Spouses"
 msgstr ""
 
-#: ../src/Merge/_MergePerson.py:177 ../src/DataViews/_RelationView.py:899
+#: ../src/Merge/_MergePerson.py:177 ../src/DataViews/_RelationView.py:906
 #: ../src/plugins/FamilyGroup.py:432 ../src/RelLib/_EventType.py:123
 msgid "Marriage"
 msgstr ""
@@ -2016,152 +2024,152 @@ msgstr ""
 msgid "Select Family List Columns"
 msgstr ""
 
-#: ../src/DataViews/_RelationView.py:309
+#: ../src/DataViews/_RelationView.py:312
 msgid "_Reorder"
 msgstr ""
 
-#: ../src/DataViews/_RelationView.py:310
+#: ../src/DataViews/_RelationView.py:313
 msgid "Reorder the relationships"
 msgstr ""
 
-#: ../src/DataViews/_RelationView.py:315 ../src/DisplayTabs/_ButtonTab.py:61
+#: ../src/DataViews/_RelationView.py:318 ../src/DisplayTabs/_ButtonTab.py:61
 #: ../src/plugins/BookReport.py:870
 msgid "Edit"
 msgstr ""
 
-#: ../src/DataViews/_RelationView.py:316
+#: ../src/DataViews/_RelationView.py:319
 msgid "Edits the active person"
 msgstr ""
 
-#: ../src/DataViews/_RelationView.py:318
+#: ../src/DataViews/_RelationView.py:321
 msgid "Adds a new relationship"
 msgstr ""
 
-#: ../src/DataViews/_RelationView.py:319 ../src/DisplayTabs/_ButtonTab.py:59
+#: ../src/DataViews/_RelationView.py:322 ../src/DisplayTabs/_ButtonTab.py:59
 msgid "Add"
 msgstr ""
 
-#: ../src/DataViews/_RelationView.py:320
+#: ../src/DataViews/_RelationView.py:323
 msgid "Adds a new set of parents"
 msgstr ""
 
-#: ../src/DataViews/_RelationView.py:321 ../src/DisplayTabs/_ButtonTab.py:62
+#: ../src/DataViews/_RelationView.py:324 ../src/DisplayTabs/_ButtonTab.py:62
 #: ../src/DisplayTabs/_EmbeddedList.py:102
-#: ../src/DisplayTabs/_GalleryTab.py:97 ../src/Editors/_EditFamily.py:120
+#: ../src/DisplayTabs/_GalleryTab.py:101 ../src/Editors/_EditFamily.py:120
 msgid "Share"
 msgstr ""
 
-#: ../src/DataViews/_RelationView.py:322
+#: ../src/DataViews/_RelationView.py:325
 msgid "Adds an existing set of parents"
 msgstr ""
 
-#: ../src/DataViews/_RelationView.py:328
+#: ../src/DataViews/_RelationView.py:331
 msgid "Show details"
 msgstr ""
 
-#: ../src/DataViews/_RelationView.py:331
+#: ../src/DataViews/_RelationView.py:334
 msgid "Show siblings"
 msgstr ""
 
-#: ../src/DataViews/_RelationView.py:501 ../src/DataViews/_RelationView.py:754
-#: ../src/DataViews/_RelationView.py:866
+#: ../src/DataViews/_RelationView.py:508 ../src/DataViews/_RelationView.py:761
+#: ../src/DataViews/_RelationView.py:873
 #, python-format
 msgid "Edit %s"
 msgstr ""
 
-#: ../src/DataViews/_RelationView.py:585 ../src/DataViews/_RelationView.py:612
+#: ../src/DataViews/_RelationView.py:592 ../src/DataViews/_RelationView.py:619
 #, python-format
 msgid "%(date)s in %(place)s"
 msgstr ""
 
-#: ../src/DataViews/_RelationView.py:648
+#: ../src/DataViews/_RelationView.py:655
 msgid "Add parents"
 msgstr ""
 
-#: ../src/DataViews/_RelationView.py:649
+#: ../src/DataViews/_RelationView.py:656
 msgid "Select existing parents"
 msgstr ""
 
-#: ../src/DataViews/_RelationView.py:650
+#: ../src/DataViews/_RelationView.py:657
 msgid "Edit parents"
 msgstr ""
 
-#: ../src/DataViews/_RelationView.py:651
+#: ../src/DataViews/_RelationView.py:658
 msgid "Remove parents"
 msgstr ""
 
-#: ../src/DataViews/_RelationView.py:653
+#: ../src/DataViews/_RelationView.py:660
 msgid "Add spouse"
 msgstr ""
 
-#: ../src/DataViews/_RelationView.py:654
+#: ../src/DataViews/_RelationView.py:661
 msgid "Select spouse"
 msgstr ""
 
-#: ../src/DataViews/_RelationView.py:655
+#: ../src/DataViews/_RelationView.py:662
 msgid "Edit family"
 msgstr ""
 
-#: ../src/DataViews/_RelationView.py:656
+#: ../src/DataViews/_RelationView.py:663
 msgid "Remove from family"
 msgstr ""
 
-#: ../src/DataViews/_RelationView.py:665
+#: ../src/DataViews/_RelationView.py:672
 msgid "Reorder families"
 msgstr ""
 
 #. Go over siblings and build their menu
-#: ../src/DataViews/_RelationView.py:711
-#: ../src/DataViews/_PedigreeView.py:1492 ../src/plugins/NarrativeWeb.py:1873
+#: ../src/DataViews/_RelationView.py:718
+#: ../src/DataViews/_PedigreeView.py:1498 ../src/plugins/NarrativeWeb.py:1873
 msgid "Siblings"
 msgstr ""
 
-#: ../src/DataViews/_RelationView.py:842
+#: ../src/DataViews/_RelationView.py:849
 #, python-format
 msgid "b. %s, d. %s"
 msgstr ""
 
-#: ../src/DataViews/_RelationView.py:844
+#: ../src/DataViews/_RelationView.py:851
 #, python-format
 msgid "b. %s"
 msgstr ""
 
-#: ../src/DataViews/_RelationView.py:846
+#: ../src/DataViews/_RelationView.py:853
 #, python-format
 msgid "d. %s"
 msgstr ""
 
-#: ../src/DataViews/_RelationView.py:886
+#: ../src/DataViews/_RelationView.py:893
 #, python-format
 msgid "Relationship type: %s"
 msgstr ""
 
-#: ../src/DataViews/_RelationView.py:926
+#: ../src/DataViews/_RelationView.py:933
 #, python-format
 msgid "%(event_type)s: %(date)s in %(place)s"
 msgstr ""
 
-#: ../src/DataViews/_RelationView.py:930
+#: ../src/DataViews/_RelationView.py:937
 #, python-format
 msgid "%(event_type)s: %(date)s"
 msgstr ""
 
-#: ../src/DataViews/_RelationView.py:934
+#: ../src/DataViews/_RelationView.py:941
 #, python-format
 msgid "%(event_type)s: %(place)s"
 msgstr ""
 
-#: ../src/DataViews/_RelationView.py:945
+#: ../src/DataViews/_RelationView.py:952
 msgid "Broken family detected"
 msgstr ""
 
-#: ../src/DataViews/_RelationView.py:946
+#: ../src/DataViews/_RelationView.py:953
 msgid "Please run the Check and Repair Database tool"
 msgstr ""
 
 #. Go over children and build their menu
-#: ../src/DataViews/_RelationView.py:969
-#: ../src/DataViews/_PedigreeView.py:1535 ../src/Editors/_EditFamily.py:112
+#: ../src/DataViews/_RelationView.py:976
+#: ../src/DataViews/_PedigreeView.py:1541 ../src/Editors/_EditFamily.py:112
 #: ../src/plugins/FamilyGroup.py:634 ../src/plugins/IndivComplete.py:354
 #: ../src/plugins/NarrativeWeb.py:1902
 msgid "Children"
@@ -2179,7 +2187,7 @@ msgstr ""
 msgid "Delete the selected media object"
 msgstr ""
 
-#: ../src/DataViews/_MediaView.py:184 ../src/DisplayTabs/_GalleryTab.py:392
+#: ../src/DataViews/_MediaView.py:184 ../src/DisplayTabs/_GalleryTab.py:441
 msgid "Drag Media Object"
 msgstr ""
 
@@ -2259,19 +2267,19 @@ msgstr ""
 msgid "crem."
 msgstr ""
 
-#: ../src/DataViews/_PedigreeView.py:974
+#: ../src/DataViews/_PedigreeView.py:980
 msgid "Jump to child..."
 msgstr ""
 
-#: ../src/DataViews/_PedigreeView.py:984
+#: ../src/DataViews/_PedigreeView.py:990
 msgid "Jump to father"
 msgstr ""
 
-#: ../src/DataViews/_PedigreeView.py:993
+#: ../src/DataViews/_PedigreeView.py:999
 msgid "Jump to mother"
 msgstr ""
 
-#: ../src/DataViews/_PedigreeView.py:1272
+#: ../src/DataViews/_PedigreeView.py:1278
 msgid "A person was found to be his/her own ancestor."
 msgstr ""
 
@@ -2280,56 +2288,56 @@ msgstr ""
 #. FIXME: revert to stock item when German gtk translation is fixed
 #. (gtk.STOCK_HOME,self.parent.on_home_clicked,1),
 #. FIXME: remove when German gtk translation is fixed
-#: ../src/DataViews/_PedigreeView.py:1315
-#: ../src/DataViews/_PedigreeView.py:1324 ../src/plugins/NarrativeWeb.py:343
+#: ../src/DataViews/_PedigreeView.py:1321
+#: ../src/DataViews/_PedigreeView.py:1330 ../src/plugins/NarrativeWeb.py:343
 #: ../src/plugins/NarrativeWeb.py:1127 ../src/plugins/NarrativeWeb.py:1129
 msgid "Home"
 msgstr ""
 
-#: ../src/DataViews/_PedigreeView.py:1338
+#: ../src/DataViews/_PedigreeView.py:1344
 msgid "Show images"
 msgstr ""
 
-#: ../src/DataViews/_PedigreeView.py:1347
+#: ../src/DataViews/_PedigreeView.py:1353
 msgid "Show marriage data"
 msgstr ""
 
-#: ../src/DataViews/_PedigreeView.py:1356
+#: ../src/DataViews/_PedigreeView.py:1362
 msgid "Tree style"
 msgstr ""
 
-#: ../src/DataViews/_PedigreeView.py:1363
+#: ../src/DataViews/_PedigreeView.py:1369
 msgid "Version A"
 msgstr ""
 
-#: ../src/DataViews/_PedigreeView.py:1370
+#: ../src/DataViews/_PedigreeView.py:1376
 msgid "Version B"
 msgstr ""
 
-#: ../src/DataViews/_PedigreeView.py:1382
+#: ../src/DataViews/_PedigreeView.py:1388
 msgid "Tree size"
 msgstr ""
 
-#: ../src/DataViews/_PedigreeView.py:1389
+#: ../src/DataViews/_PedigreeView.py:1395
 msgid "Automatic"
 msgstr ""
 
-#: ../src/DataViews/_PedigreeView.py:1397
+#: ../src/DataViews/_PedigreeView.py:1403
 #, python-format
 msgid "%d generations"
 msgstr ""
 
-#: ../src/DataViews/_PedigreeView.py:1410
-#: ../src/DataViews/_PedigreeView.py:1430
+#: ../src/DataViews/_PedigreeView.py:1416
+#: ../src/DataViews/_PedigreeView.py:1436
 msgid "People Menu"
 msgstr ""
 
 #. Go over parents and build their menu
-#: ../src/DataViews/_PedigreeView.py:1609
+#: ../src/DataViews/_PedigreeView.py:1615
 msgid "Related"
 msgstr ""
 
-#: ../src/DataViews/_PedigreeView.py:1660
+#: ../src/DataViews/_PedigreeView.py:1666
 msgid "Family Menu"
 msgstr ""
 
@@ -2422,15 +2430,15 @@ msgstr ""
 msgid "Delete Person (%s)"
 msgstr ""
 
-#: ../src/DataViews/_PersonView.py:840
+#: ../src/DataViews/_PersonView.py:846
 msgid "Go to default person"
 msgstr ""
 
-#: ../src/DataViews/_PersonView.py:845
+#: ../src/DataViews/_PersonView.py:851
 msgid "Edit selected person"
 msgstr ""
 
-#: ../src/DataViews/_PersonView.py:851
+#: ../src/DataViews/_PersonView.py:857
 msgid "Delete selected person"
 msgstr ""
 
@@ -2630,7 +2638,7 @@ msgstr ""
 #: ../src/GrampsDb/_WriteGedcom.py:530 ../src/GrampsDb/_WriteGedcom.py:1457
 #: ../src/plugins/ExportVCalendar.py:203 ../src/plugins/ExportVCalendar.py:207
 #: ../src/plugins/ExportVCard.py:182 ../src/plugins/ExportVCard.py:186
-#: ../src/plugins/NarrativeWeb.py:2197 ../src/plugins/WriteCD.py:167
+#: ../src/plugins/NarrativeWeb.py:2199 ../src/plugins/WriteCD.py:167
 #: ../src/plugins/WriteCD.py:180 ../src/plugins/WriteGeneWeb.py:256
 #: ../src/plugins/WriteGeneWeb.py:260
 #, python-format
@@ -2802,17 +2810,21 @@ msgstr ""
 msgid "Temple"
 msgstr ""
 
-#: ../src/DisplayTabs/_GalleryTab.py:72 ../src/plugins/NarrativeWeb.py:351
+#: ../src/DisplayTabs/_GalleryTab.py:73 ../src/plugins/NarrativeWeb.py:351
 #: ../src/plugins/NarrativeWeb.py:400 ../src/plugins/NarrativeWeb.py:842
 #: ../src/plugins/NarrativeWeb.py:1265 ../src/plugins/NarrativeWeb.py:1267
 msgid "Gallery"
 msgstr ""
 
-#: ../src/DisplayTabs/_GalleryTab.py:109
+#: ../src/DisplayTabs/_GalleryTab.py:113
 #, python-format
 msgid "Open with %s"
 msgstr ""
 
+#: ../src/DisplayTabs/_GalleryTab.py:220
+msgid "Unexisting media found in the Gallery"
+msgstr ""
+
 #: ../src/DisplayTabs/_LdsEmbedList.py:61
 msgid "LDS"
 msgstr ""
@@ -3113,7 +3125,7 @@ msgstr ""
 msgid "Add Family"
 msgstr ""
 
-#: ../src/Editors/_EditFamily.py:871 ../src/GrampsDb/_DbUtils.py:96
+#: ../src/Editors/_EditFamily.py:871 ../src/GrampsDb/_DbUtils.py:97
 msgid "Remove Family"
 msgstr ""
 
@@ -3155,7 +3167,7 @@ msgid "New Media"
 msgstr ""
 
 #: ../src/Editors/_EditMedia.py:190 ../src/Editors/_EditMedia.py:249
-#: ../src/Editors/_EditMediaRef.py:219
+#: ../src/Editors/_EditMediaRef.py:222
 msgid "Edit Media Object"
 msgstr ""
 
@@ -3171,30 +3183,49 @@ msgstr ""
 msgid "Media Reference Editor"
 msgstr ""
 
-#: ../src/Editors/_EditName.py:71 ../src/Editors/_EditName.py:209
+#: ../src/Editors/_EditName.py:71 ../src/Editors/_EditName.py:231
 msgid "Name Editor"
 msgstr ""
 
-#: ../src/Editors/_EditName.py:208
+#: ../src/Editors/_EditName.py:230
 msgid "New Name"
 msgstr ""
 
-#: ../src/Editors/_EditName.py:241
+#: ../src/Editors/_EditName.py:294
+msgid "Break global name grouping?"
+msgstr ""
+
+#: ../src/Editors/_EditName.py:295
+#, python-format
+msgid ""
+"All people with the name of %(surname)s will no longer be grouped with the "
+"name of %(group_name)s."
+msgstr ""
+
+#: ../src/Editors/_EditName.py:299
+msgid "Continue"
+msgstr ""
+
+#: ../src/Editors/_EditName.py:300
+msgid "Return to Name Editor"
+msgstr ""
+
+#: ../src/Editors/_EditName.py:325
 msgid "Group all people with the same name?"
 msgstr ""
 
-#: ../src/Editors/_EditName.py:242
+#: ../src/Editors/_EditName.py:326
 #, python-format
 msgid ""
 "You have the choice of grouping all people with the name of %(surname)s with "
 "the name of %(group_name)s, or just mapping this particular name."
 msgstr ""
 
-#: ../src/Editors/_EditName.py:246
+#: ../src/Editors/_EditName.py:331
 msgid "Group all"
 msgstr ""
 
-#: ../src/Editors/_EditName.py:247
+#: ../src/Editors/_EditName.py:332
 msgid "Group this name only"
 msgstr ""
 
@@ -3258,11 +3289,11 @@ msgid ""
 "Please specify the gender."
 msgstr ""
 
-#: ../src/Editors/_EditPerson.py:753 ../src/plugins/IndivComplete.py:490
+#: ../src/Editors/_EditPerson.py:753 ../src/plugins/IndivComplete.py:491
 msgid "Male"
 msgstr ""
 
-#: ../src/Editors/_EditPerson.py:754 ../src/plugins/IndivComplete.py:492
+#: ../src/Editors/_EditPerson.py:754 ../src/plugins/IndivComplete.py:493
 msgid "Female"
 msgstr ""
 
@@ -3408,23 +3439,23 @@ msgstr ""
 msgid "Internet Address Editor"
 msgstr ""
 
-#: ../src/GrampsDb/_DbUtils.py:115
+#: ../src/GrampsDb/_DbUtils.py:116
 msgid "Remove father from family"
 msgstr ""
 
-#: ../src/GrampsDb/_DbUtils.py:117
+#: ../src/GrampsDb/_DbUtils.py:118
 msgid "Remove mother from family"
 msgstr ""
 
-#: ../src/GrampsDb/_DbUtils.py:120
+#: ../src/GrampsDb/_DbUtils.py:121
 msgid "Family unchanged"
 msgstr ""
 
-#: ../src/GrampsDb/_DbUtils.py:166
+#: ../src/GrampsDb/_DbUtils.py:167
 msgid "Remove child from family"
 msgstr ""
 
-#: ../src/GrampsDb/_DbUtils.py:192
+#: ../src/GrampsDb/_DbUtils.py:193
 msgid "Add child to family"
 msgstr ""
 
@@ -3435,30 +3466,30 @@ msgstr ""
 #. witness name recorded
 #. Add name and comment to the event note
 #. Parse witnesses created by older gramps
-#: ../src/GrampsDb/_GrampsBSDDB.py:1919 ../src/GrampsDb/_ReadXML.py:723
-#: ../src/GrampsDb/_ReadXML.py:1564
+#: ../src/GrampsDb/_GrampsBSDDB.py:1922 ../src/GrampsDb/_ReadXML.py:725
+#: ../src/GrampsDb/_ReadXML.py:1591
 #, python-format
 msgid "Witness name: %s"
 msgstr ""
 
-#: ../src/GrampsDb/_GrampsBSDDB.py:1921 ../src/GrampsDb/_ReadXML.py:1458
-#: ../src/GrampsDb/_ReadXML.py:1462
+#: ../src/GrampsDb/_GrampsBSDDB.py:1924 ../src/GrampsDb/_ReadXML.py:1485
+#: ../src/GrampsDb/_ReadXML.py:1489
 #, python-format
 msgid "Witness comment: %s"
 msgstr ""
 
 #. Broken witness: dangling witness handle
 #. with no corresponding person in the db
-#: ../src/GrampsDb/_GrampsBSDDB.py:1942
+#: ../src/GrampsDb/_GrampsBSDDB.py:1945
 msgid ""
 "Broken witness reference detected while upgrading database to version 9."
 msgstr ""
 
-#: ../src/GrampsDb/_GrampsDbBase.py:456
+#: ../src/GrampsDb/_GrampsDbBase.py:457
 msgid "Out of disk space"
 msgstr ""
 
-#: ../src/GrampsDb/_GrampsDbBase.py:457
+#: ../src/GrampsDb/_GrampsDbBase.py:458
 #, python-format
 msgid ""
 "Your data cannot be saved because you are out of disk space. Please free up "
@@ -3467,13 +3498,13 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/GrampsDb/_GrampsDbBase.py:1433 ../src/GrampsDb/_GrampsDbBase.py:1503
-#: ../src/GrampsDb/_GrampsDbBase.py:1544
+#: ../src/GrampsDb/_GrampsDbBase.py:1478 ../src/GrampsDb/_GrampsDbBase.py:1548
+#: ../src/GrampsDb/_GrampsDbBase.py:1589
 #, python-format
 msgid "_Undo %s"
 msgstr ""
 
-#: ../src/GrampsDb/_GrampsDbBase.py:1510 ../src/GrampsDb/_GrampsDbBase.py:1552
+#: ../src/GrampsDb/_GrampsDbBase.py:1555 ../src/GrampsDb/_GrampsDbBase.py:1597
 #, python-format
 msgid "_Redo %s"
 msgstr ""
@@ -3526,7 +3557,7 @@ msgstr ""
 msgid "Invalid GEDCOM syntax at line %d was ignored."
 msgstr ""
 
-#: ../src/GrampsDb/_ReadGedcom.py:531 ../src/GrampsDb/_ReadGedcom.py:2247
+#: ../src/GrampsDb/_ReadGedcom.py:531 ../src/GrampsDb/_ReadGedcom.py:2245
 #, python-format
 msgid "Import from %s"
 msgstr ""
@@ -3544,7 +3575,7 @@ msgstr ""
 msgid "GEDCOM import"
 msgstr ""
 
-#: ../src/GrampsDb/_ReadGedcom.py:1008 ../src/GrampsDb/_ReadGedcom.py:2766
+#: ../src/GrampsDb/_ReadGedcom.py:1008 ../src/GrampsDb/_ReadGedcom.py:2764
 #, python-format
 msgid "Could not import %s"
 msgstr ""
@@ -3584,43 +3615,43 @@ msgstr ""
 msgid "Could not copy file"
 msgstr ""
 
-#: ../src/GrampsDb/_ReadXML.py:636
+#: ../src/GrampsDb/_ReadXML.py:638
 msgid "GRAMPS XML import"
 msgstr ""
 
-#: ../src/GrampsDb/_WriteGedcom.py:294 ../src/plugins/Calendar.py:630
+#: ../src/GrampsDb/_WriteGedcom.py:294 ../src/plugins/Calendar.py:671
 #: ../src/plugins/EventCmp.py:164 ../src/plugins/ExportVCalendar.py:88
 #: ../src/plugins/ExportVCard.py:86 ../src/plugins/GraphViz.py:697
-#: ../src/plugins/IndivComplete.py:589 ../src/plugins/NarrativeWeb.py:2487
+#: ../src/plugins/IndivComplete.py:590 ../src/plugins/NarrativeWeb.py:2489
 #: ../src/plugins/StatisticsChart.py:844 ../src/plugins/TimeLine.py:417
 #: ../src/plugins/WriteFtree.py:90 ../src/plugins/WriteGeneWeb.py:92
 msgid "Entire Database"
 msgstr ""
 
-#: ../src/GrampsDb/_WriteGedcom.py:301 ../src/plugins/Calendar.py:635
+#: ../src/GrampsDb/_WriteGedcom.py:301 ../src/plugins/Calendar.py:676
 #: ../src/plugins/DescendReport.py:153 ../src/plugins/ExportVCalendar.py:95
 #: ../src/plugins/ExportVCard.py:93 ../src/plugins/GraphViz.py:701
-#: ../src/plugins/IndivComplete.py:593 ../src/plugins/NarrativeWeb.py:2491
+#: ../src/plugins/IndivComplete.py:594 ../src/plugins/NarrativeWeb.py:2493
 #: ../src/plugins/StatisticsChart.py:848 ../src/plugins/TimeLine.py:421
 #: ../src/plugins/WriteFtree.py:97 ../src/plugins/WriteGeneWeb.py:99
 #, python-format
 msgid "Descendants of %s"
 msgstr ""
 
-#: ../src/GrampsDb/_WriteGedcom.py:307 ../src/plugins/Calendar.py:645
+#: ../src/GrampsDb/_WriteGedcom.py:307 ../src/plugins/Calendar.py:686
 #: ../src/plugins/ExportVCalendar.py:101 ../src/plugins/ExportVCard.py:99
-#: ../src/plugins/GraphViz.py:705 ../src/plugins/IndivComplete.py:597
-#: ../src/plugins/NarrativeWeb.py:2499 ../src/plugins/StatisticsChart.py:852
+#: ../src/plugins/GraphViz.py:705 ../src/plugins/IndivComplete.py:598
+#: ../src/plugins/NarrativeWeb.py:2501 ../src/plugins/StatisticsChart.py:852
 #: ../src/plugins/TimeLine.py:425 ../src/plugins/WriteFtree.py:103
 #: ../src/plugins/WriteGeneWeb.py:105
 #, python-format
 msgid "Ancestors of %s"
 msgstr ""
 
-#: ../src/GrampsDb/_WriteGedcom.py:313 ../src/plugins/Calendar.py:650
+#: ../src/GrampsDb/_WriteGedcom.py:313 ../src/plugins/Calendar.py:691
 #: ../src/plugins/ExportVCalendar.py:107 ../src/plugins/ExportVCard.py:105
-#: ../src/plugins/GraphViz.py:709 ../src/plugins/IndivComplete.py:601
-#: ../src/plugins/NarrativeWeb.py:2503 ../src/plugins/StatisticsChart.py:856
+#: ../src/plugins/GraphViz.py:709 ../src/plugins/IndivComplete.py:602
+#: ../src/plugins/NarrativeWeb.py:2505 ../src/plugins/StatisticsChart.py:856
 #: ../src/plugins/TimeLine.py:429 ../src/plugins/WriteFtree.py:109
 #: ../src/plugins/WriteGeneWeb.py:111
 #, python-format
@@ -3687,11 +3718,11 @@ msgstr ""
 #.
 #.
 #. -------------------------------------------------------------------------
-#: ../src/GrampsDb/_WriteXML.py:1064
+#: ../src/GrampsDb/_WriteXML.py:1089
 msgid "GRAMPS _XML database"
 msgstr ""
 
-#: ../src/GrampsDb/_WriteXML.py:1065
+#: ../src/GrampsDb/_WriteXML.py:1090
 msgid ""
 "The GRAMPS XML database is a format used by older versions of GRAMPS. It is "
 "read-write compatible with the present GRAMPS database format."
@@ -3915,7 +3946,7 @@ msgstr ""
 #: ../src/plugins/AncestorChart2.py:490 ../src/plugins/AncestorReport.py:303
 #: ../src/plugins/DescendChart.py:440 ../src/plugins/DetAncestralReport.py:812
 #: ../src/plugins/DetDescendantReport.py:843 ../src/plugins/FamilyGroup.py:876
-#: ../src/plugins/FanChart.py:452 ../src/plugins/IndivComplete.py:668
+#: ../src/plugins/FanChart.py:452 ../src/plugins/IndivComplete.py:669
 msgid "The basic style used for the text display."
 msgstr ""
 
@@ -3928,17 +3959,17 @@ msgid "Ancestor Graph"
 msgstr ""
 
 #: ../src/plugins/AncestorChart2.py:514 ../src/plugins/AncestorReport.py:334
-#: ../src/plugins/BookReport.py:1182 ../src/plugins/Calendar.py:1198
-#: ../src/plugins/Calendar.py:1210 ../src/plugins/ChangeNames.py:204
+#: ../src/plugins/BookReport.py:1182 ../src/plugins/Calendar.py:1271
+#: ../src/plugins/Calendar.py:1283 ../src/plugins/ChangeNames.py:204
 #: ../src/plugins/ChangeTypes.py:208 ../src/plugins/Checkpoint.py:442
-#: ../src/plugins/Check.py:1091 ../src/plugins/CountAncestors.py:142
+#: ../src/plugins/Check.py:1340 ../src/plugins/CountAncestors.py:142
 #: ../src/plugins/Desbrowser.py:161 ../src/plugins/DescendChart.py:464
 #: ../src/plugins/DescendReport.py:259 ../src/plugins/Eval.py:130
 #: ../src/plugins/EventCmp.py:479 ../src/plugins/FamilyGroup.py:909
 #: ../src/plugins/FanChart.py:468 ../src/plugins/GraphViz.py:1255
-#: ../src/plugins/GraphViz.py:1269 ../src/plugins/IndivComplete.py:683
+#: ../src/plugins/GraphViz.py:1269 ../src/plugins/IndivComplete.py:684
 #: ../src/plugins/Leak.py:131 ../src/plugins/FindDupes.py:699
-#: ../src/plugins/NarrativeWeb.py:3005 ../src/plugins/PatchNames.py:357
+#: ../src/plugins/NarrativeWeb.py:3007 ../src/plugins/PatchNames.py:357
 #: ../src/plugins/Rebuild.py:125 ../src/plugins/RelCalc.py:228
 #: ../src/plugins/RemoveUnused.py:406 ../src/plugins/ReorderIds.py:227
 #: ../src/plugins/SoundGen.py:145 ../src/plugins/StatisticsChart.py:980
@@ -3965,7 +3996,7 @@ msgstr ""
 #: ../src/plugins/AncestorReport.py:280 ../src/plugins/DescendReport.py:222
 #: ../src/plugins/DetAncestralReport.py:766
 #: ../src/plugins/DetDescendantReport.py:797 ../src/plugins/FamilyGroup.py:867
-#: ../src/plugins/IndivComplete.py:636 ../src/plugins/SimpleBookTitle.py:271
+#: ../src/plugins/IndivComplete.py:637 ../src/plugins/SimpleBookTitle.py:271
 #: ../src/plugins/StatisticsChart.py:829 ../src/plugins/TimeLine.py:404
 msgid "The style used for the title of the page."
 msgstr ""
@@ -4066,164 +4097,183 @@ msgstr ""
 msgid "Creates a book containing several reports."
 msgstr ""
 
-#: ../src/plugins/Calendar.py:327
+#. initialize the dict to fill:
+#: ../src/plugins/Calendar.py:199 ../src/plugins/Calendar.py:1270
+msgid "Calendar"
+msgstr ""
+
+#. generate the report:
+#: ../src/plugins/Calendar.py:207 ../src/plugins/Calendar.py:397
+msgid "Formating months..."
+msgstr ""
+
+#: ../src/plugins/Calendar.py:297
+msgid "Filtering data..."
+msgstr ""
+
+#: ../src/plugins/Calendar.py:363
 #, python-format
 msgid ""
 "%(spouse)s and\n"
 " %(person)s, %(nyears)d"
 msgstr ""
 
-#: ../src/plugins/Calendar.py:640 ../src/plugins/NarrativeWeb.py:2495
+#: ../src/plugins/Calendar.py:373 ../src/plugins/Calendar.py:1282
+msgid "Birthday and Anniversary Report"
+msgstr ""
+
+#: ../src/plugins/Calendar.py:681 ../src/plugins/NarrativeWeb.py:2497
 #, python-format
 msgid "Descendant Families of %s"
 msgstr ""
 
-#: ../src/plugins/Calendar.py:655
+#: ../src/plugins/Calendar.py:696
 msgid "People with a Calendar attribute"
 msgstr ""
 
-#: ../src/plugins/Calendar.py:707 ../src/plugins/Calendar.py:829
+#: ../src/plugins/Calendar.py:751 ../src/plugins/Calendar.py:889
 #: ../src/ReportBase/_BareReportDialog.py:450
 #: ../src/FilterEditor/_FilterEditor.py:109
 msgid "Filter"
 msgstr ""
 
-#: ../src/plugins/Calendar.py:710 ../src/plugins/Calendar.py:839
+#: ../src/plugins/Calendar.py:754 ../src/plugins/Calendar.py:899
 msgid "Text 1"
 msgstr ""
 
-#: ../src/plugins/Calendar.py:715 ../src/plugins/Calendar.py:722
-#: ../src/plugins/Calendar.py:729 ../src/plugins/Calendar.py:837
-#: ../src/plugins/Calendar.py:844 ../src/plugins/Calendar.py:851
-#: ../src/plugins/Calendar.py:858
+#: ../src/plugins/Calendar.py:759 ../src/plugins/Calendar.py:766
+#: ../src/plugins/Calendar.py:773 ../src/plugins/Calendar.py:897
+#: ../src/plugins/Calendar.py:904 ../src/plugins/Calendar.py:911
+#: ../src/plugins/Calendar.py:918
 msgid "Text Options"
 msgstr ""
 
-#: ../src/plugins/Calendar.py:717 ../src/plugins/Calendar.py:846
+#: ../src/plugins/Calendar.py:761 ../src/plugins/Calendar.py:906
 msgid "Text 2"
 msgstr ""
 
-#: ../src/plugins/Calendar.py:724 ../src/plugins/Calendar.py:853
+#: ../src/plugins/Calendar.py:768 ../src/plugins/Calendar.py:913
 msgid "Text 3"
 msgstr ""
 
-#: ../src/plugins/Calendar.py:731
+#: ../src/plugins/Calendar.py:775
 msgid "Year of calendar"
 msgstr ""
 
-#: ../src/plugins/Calendar.py:737 ../src/plugins/Calendar.py:866
+#: ../src/plugins/Calendar.py:781 ../src/plugins/Calendar.py:926
+msgid "First day of week"
+msgstr ""
+
+#: ../src/plugins/Calendar.py:788 ../src/plugins/Calendar.py:933
 msgid "Country for holidays"
 msgstr ""
 
-#: ../src/plugins/Calendar.py:744 ../src/plugins/Calendar.py:873
+#: ../src/plugins/Calendar.py:795 ../src/plugins/Calendar.py:940
 msgid "Birthday surname"
 msgstr ""
 
-#: ../src/plugins/Calendar.py:750 ../src/plugins/Calendar.py:879
+#: ../src/plugins/Calendar.py:801 ../src/plugins/Calendar.py:946
 msgid "Wives use husband's surname"
 msgstr ""
 
-#: ../src/plugins/Calendar.py:753 ../src/plugins/Calendar.py:882
+#: ../src/plugins/Calendar.py:804 ../src/plugins/Calendar.py:949
 msgid "Wives use their own surname"
 msgstr ""
 
-#: ../src/plugins/Calendar.py:758 ../src/plugins/Calendar.py:887
+#: ../src/plugins/Calendar.py:809 ../src/plugins/Calendar.py:954
+#: ../data/gramps.schemas.in.h:81
+msgid "Name display format"
+msgstr ""
+
+#: ../src/plugins/Calendar.py:815 ../src/plugins/Calendar.py:960
 msgid "Only include living people"
 msgstr ""
 
-#: ../src/plugins/Calendar.py:764 ../src/plugins/Calendar.py:893
+#: ../src/plugins/Calendar.py:821 ../src/plugins/Calendar.py:966
 msgid "Include birthdays"
 msgstr ""
 
-#: ../src/plugins/Calendar.py:770 ../src/plugins/Calendar.py:899
+#: ../src/plugins/Calendar.py:827 ../src/plugins/Calendar.py:972
 msgid "Include anniversaries"
 msgstr ""
 
-#: ../src/plugins/Calendar.py:776
+#: ../src/plugins/Calendar.py:833
 msgid "Title text and background color."
 msgstr ""
 
-#: ../src/plugins/Calendar.py:784
+#: ../src/plugins/Calendar.py:841
 msgid "Border lines of calendar boxes."
 msgstr ""
 
-#: ../src/plugins/Calendar.py:788
+#: ../src/plugins/Calendar.py:845
 msgid "Calendar day numbers."
 msgstr ""
 
-#: ../src/plugins/Calendar.py:794
+#: ../src/plugins/Calendar.py:851
 msgid "Daily text display."
 msgstr ""
 
-#: ../src/plugins/Calendar.py:799
+#: ../src/plugins/Calendar.py:856
 msgid "Days of the week text."
 msgstr ""
 
-#: ../src/plugins/Calendar.py:807
+#: ../src/plugins/Calendar.py:864
 msgid "Text at bottom, line 1."
 msgstr ""
 
-#: ../src/plugins/Calendar.py:812
+#: ../src/plugins/Calendar.py:869
 msgid "Text at bottom, line 2."
 msgstr ""
 
-#: ../src/plugins/Calendar.py:817
+#: ../src/plugins/Calendar.py:874
 msgid "Text at bottom, line 3."
 msgstr ""
 
-#: ../src/plugins/Calendar.py:832
+#: ../src/plugins/Calendar.py:892
 msgid "Title text"
 msgstr ""
 
-#: ../src/plugins/Calendar.py:860
+#: ../src/plugins/Calendar.py:920
 msgid "Year of report"
 msgstr ""
 
-#: ../src/plugins/Calendar.py:905
+#: ../src/plugins/Calendar.py:978
 msgid "Title text style"
 msgstr ""
 
-#: ../src/plugins/Calendar.py:912
+#: ../src/plugins/Calendar.py:985
 msgid "Data text style"
 msgstr ""
 
-#: ../src/plugins/Calendar.py:918
+#: ../src/plugins/Calendar.py:991
 msgid "Month text style"
 msgstr ""
 
-#: ../src/plugins/Calendar.py:924
+#: ../src/plugins/Calendar.py:997
 msgid "Day text style"
 msgstr ""
 
-#: ../src/plugins/Calendar.py:932
+#: ../src/plugins/Calendar.py:1005
 msgid "Extra text style, line 1."
 msgstr ""
 
-#: ../src/plugins/Calendar.py:938
+#: ../src/plugins/Calendar.py:1011
 msgid "Extra text style, line 2."
 msgstr ""
 
-#: ../src/plugins/Calendar.py:944
+#: ../src/plugins/Calendar.py:1017
 msgid "Extra text style, line 3."
 msgstr ""
 
-#: ../src/plugins/Calendar.py:1167
+#: ../src/plugins/Calendar.py:1240
 msgid "Don't include holidays"
 msgstr ""
 
-#: ../src/plugins/Calendar.py:1197
-msgid "Calendar"
-msgstr ""
-
-#: ../src/plugins/Calendar.py:1201
+#: ../src/plugins/Calendar.py:1274
 msgid "Produces a graphical calendar"
 msgstr ""
 
-#: ../src/plugins/Calendar.py:1209
-msgid "Birthday and Anniversary Report"
-msgstr ""
-
-#: ../src/plugins/Calendar.py:1213
+#: ../src/plugins/Calendar.py:1286
 msgid "Produces a report of birthdays and anniversaries"
 msgstr ""
 
@@ -4385,44 +4435,44 @@ msgstr ""
 msgid "Store a snapshot of the current database into a revision control system"
 msgstr ""
 
-#: ../src/plugins/Check.py:188
+#: ../src/plugins/Check.py:191
 msgid "Check Integrity"
 msgstr ""
 
-#: ../src/plugins/Check.py:222
+#: ../src/plugins/Check.py:234
 msgid "Checking database"
 msgstr ""
 
-#: ../src/plugins/Check.py:239
+#: ../src/plugins/Check.py:251
 msgid "Looking for invalid name format references"
 msgstr ""
 
-#: ../src/plugins/Check.py:287
+#: ../src/plugins/Check.py:299
 msgid "Looking for duplicate spouses"
 msgstr ""
 
-#: ../src/plugins/Check.py:305
+#: ../src/plugins/Check.py:317
 msgid "Looking for character encoding errors"
 msgstr ""
 
-#: ../src/plugins/Check.py:332
+#: ../src/plugins/Check.py:344
 msgid "Looking for broken family links"
 msgstr ""
 
-#: ../src/plugins/Check.py:455
+#: ../src/plugins/Check.py:467
 msgid "Looking for unused objects"
 msgstr ""
 
-#: ../src/plugins/Check.py:514 ../src/plugins/WriteCD.py:246
+#: ../src/plugins/Check.py:526 ../src/plugins/WriteCD.py:246
 #: ../src/plugins/WritePkg.py:147
 msgid "Select file"
 msgstr ""
 
-#: ../src/plugins/Check.py:533 ../src/plugins/WriteCD.py:271
+#: ../src/plugins/Check.py:545 ../src/plugins/WriteCD.py:271
 msgid "Media object could not be found"
 msgstr ""
 
-#: ../src/plugins/Check.py:534
+#: ../src/plugins/Check.py:546
 #, python-format
 msgid ""
 "The file:\n"
@@ -4433,226 +4483,275 @@ msgid ""
 "select a new file."
 msgstr ""
 
-#: ../src/plugins/Check.py:553
-msgid "Looking for empty families"
+#: ../src/plugins/Check.py:584
+msgid "Looking for empty people records"
 msgstr ""
 
-#: ../src/plugins/Check.py:578
-msgid "Looking for broken parent relationships"
+#: ../src/plugins/Check.py:592
+msgid "Looking for empty family records"
+msgstr ""
+
+#: ../src/plugins/Check.py:600
+msgid "Looking for empty event records"
+msgstr ""
+
+#: ../src/plugins/Check.py:608
+msgid "Looking for empty source records"
+msgstr ""
+
+#: ../src/plugins/Check.py:616
+msgid "Looking for empty place records"
 msgstr ""
 
 #: ../src/plugins/Check.py:623
+msgid "Looking for empty media records"
+msgstr ""
+
+#: ../src/plugins/Check.py:632
+msgid "Looking for empty repository records"
+msgstr ""
+
+#: ../src/plugins/Check.py:675
+msgid "Looking for families with no parents or children"
+msgstr ""
+
+#: ../src/plugins/Check.py:702
+msgid "Looking for broken parent relationships"
+msgstr ""
+
+#: ../src/plugins/Check.py:733
 msgid "Looking for event problems"
 msgstr ""
 
-#: ../src/plugins/Check.py:703
+#: ../src/plugins/Check.py:813
 msgid "Looking for person reference problems"
 msgstr ""
 
-#: ../src/plugins/Check.py:719
+#: ../src/plugins/Check.py:829
 msgid "Looking for repository reference problems"
 msgstr ""
 
-#: ../src/plugins/Check.py:736
+#: ../src/plugins/Check.py:846
 msgid "Looking for place reference problems"
 msgstr ""
 
-#: ../src/plugins/Check.py:782
+#: ../src/plugins/Check.py:892
 msgid "Looking for source reference problems"
 msgstr ""
 
-#: ../src/plugins/Check.py:910
+#: ../src/plugins/Check.py:999
+msgid "Looking for media object reference problems"
+msgstr ""
+
+#: ../src/plugins/Check.py:1123
 msgid "No errors were found"
 msgstr ""
 
-#: ../src/plugins/Check.py:911
+#: ../src/plugins/Check.py:1124
 msgid "The database has passed internal checks"
 msgstr ""
 
-#: ../src/plugins/Check.py:917
+#: ../src/plugins/Check.py:1130
 msgid "1 broken child/family link was fixed\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:919
+#: ../src/plugins/Check.py:1132
 #, python-format
 msgid "%d broken child/family links were found\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:925
+#: ../src/plugins/Check.py:1138
 msgid "Non existing child"
 msgstr ""
 
-#: ../src/plugins/Check.py:932
+#: ../src/plugins/Check.py:1145
 #, python-format
 msgid "%s was removed from the family of %s\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:936
+#: ../src/plugins/Check.py:1149
 msgid "1 broken spouse/family link was fixed\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:938
+#: ../src/plugins/Check.py:1151
 #, python-format
 msgid "%d broken spouse/family links were found\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:944 ../src/plugins/Check.py:963
+#: ../src/plugins/Check.py:1157 ../src/plugins/Check.py:1176
 msgid "Non existing person"
 msgstr ""
 
-#: ../src/plugins/Check.py:951 ../src/plugins/Check.py:970
+#: ../src/plugins/Check.py:1164 ../src/plugins/Check.py:1183
 #, python-format
 msgid "%s was restored to the family of %s\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:955
+#: ../src/plugins/Check.py:1168
 msgid "1 duplicate spouse/family link was found\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:957
+#: ../src/plugins/Check.py:1170
 #, python-format
 msgid "%d duplicate spouse/family links were found\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:973
-msgid "1 empty family was found\n"
+#: ../src/plugins/Check.py:1186
+msgid "1 family with no parents or children found, removed.\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:976
+#: ../src/plugins/Check.py:1189
 #, python-format
-msgid "%d empty families were found\n"
+msgid "%d families with no parents or children, removed.\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:978
+#: ../src/plugins/Check.py:1192
 msgid "1 corrupted family relationship fixed\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:980
+#: ../src/plugins/Check.py:1194
 #, python-format
 msgid "%d corrupted family relationship fixed\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:982
+#: ../src/plugins/Check.py:1197
 msgid "1 person was referenced but not found\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:984
+#: ../src/plugins/Check.py:1199
 #, python-format
 msgid "%d persons were referenced, but not found\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:987
+#: ../src/plugins/Check.py:1202
 msgid "1 repository was referenced but not found\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:989
+#: ../src/plugins/Check.py:1204
 #, python-format
 msgid "%d repositories were referenced, but not found\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:991
+#: ../src/plugins/Check.py:1207
 msgid "1 media object was referenced, but not found\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:993
+#: ../src/plugins/Check.py:1209 ../src/plugins/Check.py:1254
 #, python-format
 msgid "%d media objects were referenced, but not found\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:995
+#: ../src/plugins/Check.py:1212
 msgid "Reference to 1 missing media object was kept\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:997
+#: ../src/plugins/Check.py:1214
 #, python-format
 msgid "References to %d media objects were kept\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:999
+#: ../src/plugins/Check.py:1217
 msgid "1 missing media object was replaced\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:1001
+#: ../src/plugins/Check.py:1219
 #, python-format
 msgid "%d missing media objects were replaced\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:1003
+#: ../src/plugins/Check.py:1222
 msgid "1 missing media object was removed\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:1005
+#: ../src/plugins/Check.py:1224
 #, python-format
 msgid "%d missing media objects were removed\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:1007
+#: ../src/plugins/Check.py:1227
 msgid "1 invalid event reference was removed\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:1009
+#: ../src/plugins/Check.py:1229
 #, python-format
 msgid "%d invalid event references were removed\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:1011
+#: ../src/plugins/Check.py:1232
 msgid "1 invalid birth event name was fixed\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:1013
+#: ../src/plugins/Check.py:1234
 #, python-format
 msgid "%d invalid birth event names were fixed\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:1015
+#: ../src/plugins/Check.py:1237
 msgid "1 invalid death event name was fixed\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:1017
+#: ../src/plugins/Check.py:1239
 #, python-format
 msgid "%d invalid death event names were fixed\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:1019
+#: ../src/plugins/Check.py:1242
 msgid "1 place was referenced but not found\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:1021
+#: ../src/plugins/Check.py:1244
 #, python-format
 msgid "%d places were referenced, but not found\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:1023
+#: ../src/plugins/Check.py:1247
 msgid "1 source was referenced but not found\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:1025
+#: ../src/plugins/Check.py:1249
 #, python-format
 msgid "%d sources were referenced, but not found\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:1027
+#: ../src/plugins/Check.py:1252
+msgid "1 media object was referenced but not found\n"
+msgstr ""
+
+#: ../src/plugins/Check.py:1258
 msgid "1 invalid name format reference was removed\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:1029
+#: ../src/plugins/Check.py:1260
 #, python-format
 msgid "%d invalid name format references were removed\n"
 msgstr ""
 
-#: ../src/plugins/Check.py:1059
+#: ../src/plugins/Check.py:1264
+#, python-format
+msgid ""
+"%d empty objects removed:\n"
+"   %d person objects\n"
+"   %d family objects\n"
+"   %d event objects\n"
+"   %d source objects\n"
+"   %d media objects\n"
+"   %d place objects\n"
+"   %d repository objects\n"
+msgstr ""
+
+#: ../src/plugins/Check.py:1308
 msgid "Integrity Check Results"
 msgstr ""
 
-#: ../src/plugins/Check.py:1064
+#: ../src/plugins/Check.py:1313
 msgid "Check and Repair"
 msgstr ""
 
-#: ../src/plugins/Check.py:1090
+#: ../src/plugins/Check.py:1339
 msgid "Check and repair database"
 msgstr ""
 
-#: ../src/plugins/Check.py:1094
+#: ../src/plugins/Check.py:1343
 msgid ""
 "Checks the database for integrity problems, fixing the problems that it can"
 msgstr ""
@@ -5737,39 +5836,39 @@ msgstr ""
 msgid "Individual Facts"
 msgstr ""
 
-#: ../src/plugins/IndivComplete.py:451
+#: ../src/plugins/IndivComplete.py:452
 #, python-format
 msgid "Summary of %s"
 msgstr ""
 
-#: ../src/plugins/IndivComplete.py:471 ../src/plugins/NarrativeWeb.py:381
+#: ../src/plugins/IndivComplete.py:472 ../src/plugins/NarrativeWeb.py:381
 #: ../src/plugins/NarrativeWeb.py:414 ../src/plugins/NarrativeWeb.py:426
 #: ../src/plugins/NarrativeWeb.py:1099 ../src/plugins/NarrativeWeb.py:1146
 #: ../src/plugins/NarrativeWeb.py:1369 ../src/ReportBase/_ReportUtils.py:1335
 msgid "Could not add photo to page"
 msgstr ""
 
-#: ../src/plugins/IndivComplete.py:472 ../src/ReportBase/_ReportUtils.py:1336
+#: ../src/plugins/IndivComplete.py:473 ../src/ReportBase/_ReportUtils.py:1336
 msgid "File does not exist"
 msgstr ""
 
-#: ../src/plugins/IndivComplete.py:615
+#: ../src/plugins/IndivComplete.py:616
 msgid "Include Source Information"
 msgstr ""
 
-#: ../src/plugins/IndivComplete.py:648
+#: ../src/plugins/IndivComplete.py:649
 msgid "The style used for category labels."
 msgstr ""
 
-#: ../src/plugins/IndivComplete.py:659
+#: ../src/plugins/IndivComplete.py:660
 msgid "The style used for the spouse's name."
 msgstr ""
 
-#: ../src/plugins/IndivComplete.py:682
+#: ../src/plugins/IndivComplete.py:683
 msgid "Complete Individual Report"
 msgstr ""
 
-#: ../src/plugins/IndivComplete.py:686
+#: ../src/plugins/IndivComplete.py:687
 msgid "Produces a complete report on the selected people."
 msgstr ""
 
@@ -6214,211 +6313,216 @@ msgstr ""
 msgid "%(description)s,&nbsp;&nbsp;%(date)s&nbsp;&nbsp;"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2047
+#: ../src/plugins/NarrativeWeb.py:2045
+#, python-format
+msgid "%(description)s&nbsp;&nbsp;at&nbsp;&nbsp;%(place)s"
+msgstr ""
+
+#: ../src/plugins/NarrativeWeb.py:2049
 #, python-format
 msgid "%(date)s&nbsp;&nbsp;at&nbsp;&nbsp;%(place)s"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2157
+#: ../src/plugins/NarrativeWeb.py:2159
 #, python-format
 msgid "Neither %s nor %s are directories"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2164 ../src/plugins/NarrativeWeb.py:2168
-#: ../src/plugins/NarrativeWeb.py:2181 ../src/plugins/NarrativeWeb.py:2185
+#: ../src/plugins/NarrativeWeb.py:2166 ../src/plugins/NarrativeWeb.py:2170
+#: ../src/plugins/NarrativeWeb.py:2183 ../src/plugins/NarrativeWeb.py:2187
 #, python-format
 msgid "Could not create the directory: %s"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2191
+#: ../src/plugins/NarrativeWeb.py:2193
 msgid "Invalid file name"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2192
+#: ../src/plugins/NarrativeWeb.py:2194
 msgid "The archive file must be a file, not a directory"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2201
+#: ../src/plugins/NarrativeWeb.py:2203
 msgid "Generate HTML reports"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2250
+#: ../src/plugins/NarrativeWeb.py:2252
 msgid "Filtering"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2257
+#: ../src/plugins/NarrativeWeb.py:2259
 msgid "Applying privacy filter"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2265
+#: ../src/plugins/NarrativeWeb.py:2267
 msgid "Filtering living people"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2294
+#: ../src/plugins/NarrativeWeb.py:2296
 msgid "Creating individual pages"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2318
+#: ../src/plugins/NarrativeWeb.py:2320
 msgid "Creating surname pages"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2340
+#: ../src/plugins/NarrativeWeb.py:2342
 msgid "Creating source pages"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2353
+#: ../src/plugins/NarrativeWeb.py:2355
 msgid "Creating place pages"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2367
+#: ../src/plugins/NarrativeWeb.py:2369
 msgid "Creating media pages"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2459
+#: ../src/plugins/NarrativeWeb.py:2461
 msgid "My Family Tree"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2512
+#: ../src/plugins/NarrativeWeb.py:2514
 msgid "Do not include records marked private"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2513
+#: ../src/plugins/NarrativeWeb.py:2515
 msgid "Restrict information on living people"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2514
+#: ../src/plugins/NarrativeWeb.py:2516
 msgid "Years to restrict from person's death"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2515
+#: ../src/plugins/NarrativeWeb.py:2517
 msgid "Web site title"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2516
+#: ../src/plugins/NarrativeWeb.py:2518
 msgid "File extension"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2517
+#: ../src/plugins/NarrativeWeb.py:2519
 msgid "Publisher contact/Note ID"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2518
+#: ../src/plugins/NarrativeWeb.py:2520
 msgid "Include images and media objects"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2519
+#: ../src/plugins/NarrativeWeb.py:2521
 msgid "Include download page"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2520
+#: ../src/plugins/NarrativeWeb.py:2522
 msgid "Include ancestor graph"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2538
+#: ../src/plugins/NarrativeWeb.py:2540
 msgid "Suppress GRAMPS ID"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2579
+#: ../src/plugins/NarrativeWeb.py:2581
 msgid "Standard copyright"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2580
+#: ../src/plugins/NarrativeWeb.py:2582
 msgid "Creative Commons - By attribution"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2581
+#: ../src/plugins/NarrativeWeb.py:2583
 msgid "Creative Commons - By attribution, No derivations"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2582
+#: ../src/plugins/NarrativeWeb.py:2584
 msgid "Creative Commons - By attribution, Share-alike"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2583
+#: ../src/plugins/NarrativeWeb.py:2585
 msgid "Creative Commons - By attribution, Non-commercial"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2584
+#: ../src/plugins/NarrativeWeb.py:2586
 msgid "Creative Commons - By attribution, Non-commercial, No derivations"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2585
+#: ../src/plugins/NarrativeWeb.py:2587
 msgid "Creative Commons - By attribution, Non-commercial, Share-alike"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2586
+#: ../src/plugins/NarrativeWeb.py:2588
 msgid "No copyright notice"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2620
+#: ../src/plugins/NarrativeWeb.py:2622
 msgid "Character set encoding"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2621
+#: ../src/plugins/NarrativeWeb.py:2623
 msgid "Stylesheet"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2622
+#: ../src/plugins/NarrativeWeb.py:2624
 msgid "Copyright"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2623
+#: ../src/plugins/NarrativeWeb.py:2625
 msgid "Ancestor graph generations"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2626
+#: ../src/plugins/NarrativeWeb.py:2628
 msgid "Page Generation"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2652
+#: ../src/plugins/NarrativeWeb.py:2654
 msgid "Home Media/Note ID"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2654
+#: ../src/plugins/NarrativeWeb.py:2656
 msgid "Introduction Media/Note ID"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2657
+#: ../src/plugins/NarrativeWeb.py:2659
 msgid "HTML user header"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2658
+#: ../src/plugins/NarrativeWeb.py:2660
 msgid "HTML user footer"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2663
+#: ../src/plugins/NarrativeWeb.py:2665
 msgid "Privacy"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2731 ../src/plugins/NarrativeWeb.py:2795
+#: ../src/plugins/NarrativeWeb.py:2733 ../src/plugins/NarrativeWeb.py:2797
 msgid "Generate Web Site"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2763
+#: ../src/plugins/NarrativeWeb.py:2765
 msgid "Store web pages in .tar.gz archive"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2775 ../src/ReportBase/_ReportDialog.py:265
+#: ../src/plugins/NarrativeWeb.py:2777 ../src/ReportBase/_ReportDialog.py:265
 msgid "Filename"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2784 ../src/ReportBase/_ReportDialog.py:263
+#: ../src/plugins/NarrativeWeb.py:2786 ../src/ReportBase/_ReportDialog.py:263
 msgid "Directory"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2795 ../src/ReportBase/_Constants.py:55
+#: ../src/plugins/NarrativeWeb.py:2797 ../src/ReportBase/_Constants.py:55
 msgid "Web Page"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:2800
+#: ../src/plugins/NarrativeWeb.py:2802
 msgid "Target Directory"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:3004
+#: ../src/plugins/NarrativeWeb.py:3006
 msgid "Narrative Web Site"
 msgstr ""
 
-#: ../src/plugins/NarrativeWeb.py:3008
+#: ../src/plugins/NarrativeWeb.py:3010
 msgid "Generates web (HTML) pages for individuals, or a set of individuals."
 msgstr ""
 
@@ -10505,7 +10609,7 @@ msgstr ""
 #: ../src/Filters/Rules/Person/_HasEvent.py:48
 #: ../src/Filters/Rules/Person/_HasFamilyEvent.py:51
 #: ../src/Filters/Rules/Family/_HasEvent.py:47
-#: ../src/FilterEditor/_EditRule.py:418 ../src/glade/gramps.glade.h:95
+#: ../src/FilterEditor/_EditRule.py:419 ../src/glade/gramps.glade.h:95
 msgid "Place:"
 msgstr ""
 
@@ -10547,7 +10651,7 @@ msgstr ""
 #: ../src/Filters/Rules/Person/_IsMoreThanNthGenerationDescendantOf.py:46
 #: ../src/Filters/Rules/Person/_MatchIdOf.py:45
 #: ../src/Filters/Rules/Person/_RelationshipPathBetween.py:46
-#: ../src/FilterEditor/_EditRule.py:422 ../src/glade/edit_person.glade.h:15
+#: ../src/FilterEditor/_EditRule.py:423 ../src/glade/edit_person.glade.h:15
 #: ../src/glade/gramps.glade.h:73
 msgid "ID:"
 msgstr ""
@@ -10591,13 +10695,13 @@ msgstr ""
 
 #: ../src/Filters/Rules/_HasTextMatchingSubstringOf.py:44
 #: ../src/Filters/Rules/Person/_HasTextMatchingSubstringOf.py:45
-#: ../src/FilterEditor/_EditRule.py:433
+#: ../src/FilterEditor/_EditRule.py:434
 msgid "Case sensitive:"
 msgstr ""
 
 #: ../src/Filters/Rules/_HasTextMatchingSubstringOf.py:45
 #: ../src/Filters/Rules/Person/_HasTextMatchingSubstringOf.py:46
-#: ../src/FilterEditor/_EditRule.py:435
+#: ../src/FilterEditor/_EditRule.py:436
 msgid "Regular-Expression matching:"
 msgstr ""
 
@@ -10625,7 +10729,7 @@ msgstr ""
 #: ../src/Filters/Rules/Person/_IsParentOfFilterMatch.py:46
 #: ../src/Filters/Rules/Person/_IsSiblingOfFilterMatch.py:45
 #: ../src/Filters/Rules/Person/_IsSpouseOfFilterMatch.py:46
-#: ../src/FilterEditor/_EditRule.py:426
+#: ../src/FilterEditor/_EditRule.py:427
 msgid "Filter name:"
 msgstr ""
 
@@ -10893,7 +10997,7 @@ msgid "Family filters"
 msgstr ""
 
 #: ../src/Filters/Rules/Person/_HasSourceOf.py:45
-#: ../src/FilterEditor/_EditRule.py:424
+#: ../src/FilterEditor/_EditRule.py:425
 msgid "Source ID:"
 msgstr ""
 
@@ -10964,7 +11068,7 @@ msgstr ""
 #: ../src/Filters/Rules/Person/_IsAncestorOf.py:45
 #: ../src/Filters/Rules/Person/_IsDescendantFamilyOf.py:50
 #: ../src/Filters/Rules/Person/_IsDescendantOf.py:46
-#: ../src/FilterEditor/_EditRule.py:431
+#: ../src/FilterEditor/_EditRule.py:432
 msgid "Inclusive:"
 msgstr ""
 
@@ -11044,7 +11148,7 @@ msgstr ""
 #: ../src/Filters/Rules/Person/_IsLessThanNthGenerationDescendantOf.py:46
 #: ../src/Filters/Rules/Person/_IsMoreThanNthGenerationAncestorOf.py:46
 #: ../src/Filters/Rules/Person/_IsMoreThanNthGenerationDescendantOf.py:46
-#: ../src/FilterEditor/_EditRule.py:420
+#: ../src/FilterEditor/_EditRule.py:421
 msgid "Number of generations:"
 msgstr ""
 
@@ -11993,36 +12097,36 @@ msgstr ""
 msgid "Edit Rule"
 msgstr ""
 
-#: ../src/FilterEditor/_EditRule.py:248
+#: ../src/FilterEditor/_EditRule.py:249
 msgid "Select..."
 msgstr ""
 
-#: ../src/FilterEditor/_EditRule.py:254
+#: ../src/FilterEditor/_EditRule.py:255
 #, python-format
 msgid "Select %s from a list"
 msgstr ""
 
-#: ../src/FilterEditor/_EditRule.py:302
+#: ../src/FilterEditor/_EditRule.py:303
 msgid "Not a valid ID"
 msgstr ""
 
-#: ../src/FilterEditor/_EditRule.py:432
+#: ../src/FilterEditor/_EditRule.py:433
 msgid "Include original person"
 msgstr ""
 
-#: ../src/FilterEditor/_EditRule.py:434
+#: ../src/FilterEditor/_EditRule.py:435
 msgid "Use exact case of letters"
 msgstr ""
 
-#: ../src/FilterEditor/_EditRule.py:436
+#: ../src/FilterEditor/_EditRule.py:437
 msgid "Use regular expression"
 msgstr ""
 
-#: ../src/FilterEditor/_EditRule.py:449
+#: ../src/FilterEditor/_EditRule.py:450
 msgid "Rule Name"
 msgstr ""
 
-#: ../src/FilterEditor/_EditRule.py:530 ../src/FilterEditor/_EditRule.py:541
+#: ../src/FilterEditor/_EditRule.py:531 ../src/FilterEditor/_EditRule.py:542
 #: ../src/glade/rule.glade.h:20
 msgid "No rule selected"
 msgstr ""
@@ -13709,10 +13813,6 @@ msgstr ""
 msgid "Load last database on startup"
 msgstr ""
 
-#: ../data/gramps.schemas.in.h:81
-msgid "Name display format"
-msgstr ""
-
 #: ../data/gramps.schemas.in.h:82
 msgid "Preferred format for graphical reports"
 msgstr ""