diff --git a/po/gramps.pot b/po/gramps.pot
index 9c4df5d70..f3d0a777d 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: 2015-10-02 11:13+0200\n"
+"POT-Creation-Date: 2015-10-10 15:17+0200\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"
@@ -1342,14 +1342,14 @@ msgstr ""
 msgid "Private Record"
 msgstr ""
 
-#: ../gramps/gen/const.py:190
+#: ../gramps/gen/const.py:194
 msgid ""
 "Gramps\n"
 " (Genealogical Research and Analysis Management Programming System)\n"
 "is a personal genealogy program."
 msgstr ""
 
-#: ../gramps/gen/const.py:220 ../gramps/gen/const.py:221
+#: ../gramps/gen/const.py:224 ../gramps/gen/const.py:225
 #: ../gramps/gen/lib/date.py:1839 ../gramps/gen/lib/date.py:1853
 msgid "none"
 msgstr ""
@@ -1413,7 +1413,7 @@ msgstr ""
 #. (where X is one of the month-name inflections you defined)
 #. else leave it untranslated
 #: ../gramps/gen/datehandler/_datedisplay.py:168
-#, python-brace-format
+#, python-format
 msgid "from|{long_month} {year}"
 msgstr ""
 
@@ -1423,7 +1423,7 @@ msgstr ""
 #. (where X is one of the month-name inflections you defined)
 #. else leave it untranslated
 #: ../gramps/gen/datehandler/_datedisplay.py:176
-#, python-brace-format
+#, python-format
 msgid "to|{long_month} {year}"
 msgstr ""
 
@@ -1433,7 +1433,7 @@ msgstr ""
 #. (where X is one of the month-name inflections you defined)
 #. else leave it untranslated
 #: ../gramps/gen/datehandler/_datedisplay.py:184
-#, python-brace-format
+#, python-format
 msgid "between|{long_month} {year}"
 msgstr ""
 
@@ -1443,7 +1443,7 @@ msgstr ""
 #. (where X is one of the month-name inflections you defined)
 #. else leave it untranslated
 #: ../gramps/gen/datehandler/_datedisplay.py:192
-#, python-brace-format
+#, python-format
 msgid "and|{long_month} {year}"
 msgstr ""
 
@@ -1452,7 +1452,7 @@ msgstr ""
 #. (where X is one of the month-name inflections you defined)
 #. else leave it untranslated
 #: ../gramps/gen/datehandler/_datedisplay.py:199
-#, python-brace-format
+#, python-format
 msgid "before|{long_month} {year}"
 msgstr ""
 
@@ -1461,7 +1461,7 @@ msgstr ""
 #. (where X is one of the month-name inflections you defined)
 #. else leave it untranslated
 #: ../gramps/gen/datehandler/_datedisplay.py:206
-#, python-brace-format
+#, python-format
 msgid "after|{long_month} {year}"
 msgstr ""
 
@@ -1470,7 +1470,7 @@ msgstr ""
 #. (where X is one of the month-name inflections you defined)
 #. else leave it untranslated
 #: ../gramps/gen/datehandler/_datedisplay.py:213
-#, python-brace-format
+#, python-format
 msgid "about|{long_month} {year}"
 msgstr ""
 
@@ -1479,7 +1479,7 @@ msgstr ""
 #. (where X is one of the month-name inflections you defined)
 #. else leave it untranslated
 #: ../gramps/gen/datehandler/_datedisplay.py:220
-#, python-brace-format
+#, python-format
 msgid "estimated|{long_month} {year}"
 msgstr ""
 
@@ -1488,7 +1488,7 @@ msgstr ""
 #. (where X is one of the month-name inflections you defined)
 #. else leave it untranslated
 #: ../gramps/gen/datehandler/_datedisplay.py:227
-#, python-brace-format
+#, python-format
 msgid "calculated|{long_month} {year}"
 msgstr ""
 
@@ -2654,7 +2654,7 @@ msgstr ""
 #: ../gramps/gen/filters/rules/person/_hasevent.py:49
 #: ../gramps/gen/filters/rules/person/_hasfamilyevent.py:49
 #: ../gramps/gen/filters/rules/place/_hascitation.py:49
-#: ../gramps/gui/editors/filtereditor.py:578
+#: ../gramps/gui/editors/filtereditor.py:579
 #: ../gramps/gui/glade/mergecitation.glade:246
 #: ../gramps/gui/glade/mergecitation.glade:262
 #: ../gramps/gui/glade/mergeevent.glade:246
@@ -2889,7 +2889,7 @@ msgstr ""
 #: ../gramps/gen/filters/rules/person/_matchessourceconfidence.py:43
 #: ../gramps/gen/filters/rules/place/_hascitation.py:50
 #: ../gramps/gen/filters/rules/place/_matchessourceconfidence.py:43
-#: ../gramps/gui/editors/filtereditor.py:575
+#: ../gramps/gui/editors/filtereditor.py:576
 msgid "Confidence level:"
 msgstr ""
 
@@ -3026,7 +3026,7 @@ msgstr ""
 #: ../gramps/gen/filters/rules/place/_hastag.py:48
 #: ../gramps/gen/filters/rules/repository/_hastag.py:48
 #: ../gramps/gen/filters/rules/source/_hastag.py:48
-#: ../gramps/gui/editors/filtereditor.py:571
+#: ../gramps/gui/editors/filtereditor.py:572
 msgid "Tag:"
 msgstr ""
 
@@ -3195,7 +3195,7 @@ msgid "Matches events with data of a particular value"
 msgstr ""
 
 #: ../gramps/gen/filters/rules/event/_hasdayofweek.py:44
-#: ../gramps/gui/editors/filtereditor.py:580
+#: ../gramps/gui/editors/filtereditor.py:581
 msgid "Day of Week:"
 msgstr ""
 
@@ -3288,7 +3288,7 @@ msgid "Matches events matched by the specified filter name"
 msgstr ""
 
 #: ../gramps/gen/filters/rules/event/_matchespersonfilter.py:50
-#: ../gramps/gui/editors/filtereditor.py:566
+#: ../gramps/gui/editors/filtereditor.py:567
 msgid "Include Family events:"
 msgstr ""
 
@@ -4115,7 +4115,7 @@ msgid "Main Participants:"
 msgstr ""
 
 #: ../gramps/gen/filters/rules/person/_hasevent.py:53
-#: ../gramps/gui/editors/filtereditor.py:569
+#: ../gramps/gui/editors/filtereditor.py:570
 msgid "Primary Role:"
 msgstr ""
 
@@ -4337,7 +4337,7 @@ msgid "Matches people with the particular tag"
 msgstr ""
 
 #: ../gramps/gen/filters/rules/person/_hastextmatchingsubstringof.py:47
-#: ../gramps/gui/editors/filtereditor.py:562
+#: ../gramps/gui/editors/filtereditor.py:563
 msgid "Case sensitive:"
 msgstr ""
 
@@ -4384,7 +4384,7 @@ msgstr ""
 #: ../gramps/gen/filters/rules/person/_isancestorof.py:44
 #: ../gramps/gen/filters/rules/person/_isdescendantfamilyof.py:49
 #: ../gramps/gen/filters/rules/person/_isdescendantof.py:45
-#: ../gramps/gui/editors/filtereditor.py:560
+#: ../gramps/gui/editors/filtereditor.py:561
 msgid "Inclusive:"
 msgstr ""
 
@@ -5089,7 +5089,7 @@ msgstr ""
 #: ../gramps/gen/filters/rules/repository/_hasrepo.py:46
 #: ../gramps/gui/glade/mergerepository.glade:213
 #: ../gramps/gui/glade/mergerepository.glade:229
-#: ../gramps/gui/merge/mergerepository.py:47
+#: ../gramps/gui/merge/mergerepository.py:46
 msgid "repo|Name:"
 msgstr ""
 
@@ -5393,7 +5393,7 @@ msgid "None"
 msgstr ""
 
 #: ../gramps/gen/lib/childreftype.py:73 ../gramps/gen/lib/eventtype.py:171
-#: ../gramps/gui/merge/mergeperson.py:185
+#: ../gramps/gui/merge/mergeperson.py:184
 #: ../gramps/plugins/gramplet/ancestor.py:62
 #: ../gramps/plugins/gramplet/descendant.py:68
 #: ../gramps/plugins/quickview/all_relations.py:270
@@ -5436,7 +5436,7 @@ msgstr ""
 #: ../gramps/gen/mime/_winmime.py:57 ../gramps/gen/utils/db.py:522
 #: ../gramps/gui/editors/editperson.py:352
 #: ../gramps/gui/filters/sidebar/_personsidebarfilter.py:89
-#: ../gramps/gui/merge/mergeperson.py:62
+#: ../gramps/gui/merge/mergeperson.py:61
 #: ../gramps/gui/views/treemodels/peoplemodel.py:98
 #: ../gramps/plugins/textreport/indivcomplete.py:592
 #: ../gramps/plugins/tool/dumpgenderstats.py:35
@@ -5474,7 +5474,7 @@ msgid "between"
 msgstr ""
 
 #: ../gramps/gen/lib/date.py:295 ../gramps/gen/lib/date.py:335
-#: ../gramps/gen/lib/date.py:350 ../gramps/gui/merge/mergefamily.py:151
+#: ../gramps/gen/lib/date.py:350 ../gramps/gui/merge/mergefamily.py:150
 #: ../gramps/plugins/quickview/all_relations.py:282
 #: ../gramps/plugins/view/relview.py:975
 #: ../gramps/plugins/webreport/narrativeweb.py:1146
@@ -5663,7 +5663,7 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:172 ../gramps/gui/merge/mergeperson.py:189
+#: ../gramps/gen/lib/eventtype.py:172 ../gramps/gui/merge/mergeperson.py:188
 #: ../gramps/plugins/textreport/familygroup.py:319
 #: ../gramps/plugins/textreport/familygroup.py:517
 #: ../gramps/plugins/textreport/familygroup.py:519
@@ -5798,7 +5798,7 @@ msgstr ""
 msgid "Will"
 msgstr ""
 
-#: ../gramps/gen/lib/eventtype.py:204 ../gramps/gui/merge/mergeperson.py:244
+#: ../gramps/gen/lib/eventtype.py:204 ../gramps/gui/merge/mergeperson.py:243
 #: ../gramps/plugins/export/exportcsv.py:498
 #: ../gramps/plugins/importer/importcsv.py:219
 #: ../gramps/plugins/textreport/familygroup.py:397
@@ -6081,7 +6081,7 @@ msgstr ""
 #: ../gramps/gen/lib/ldsord.py:105
 #: ../gramps/gui/filters/sidebar/_familysidebarfilter.py:114
 #: ../gramps/gui/glade/editchildref.glade:250
-#: ../gramps/gui/merge/mergeperson.py:248
+#: ../gramps/gui/merge/mergeperson.py:247
 #: ../gramps/plugins/export/exportcsv.py:541
 #: ../gramps/plugins/gramplet/children.py:81
 #: ../gramps/plugins/gramplet/children.py:181
@@ -6650,12 +6650,12 @@ msgid "Merge Family"
 msgstr ""
 
 #: ../gramps/gen/merge/mergemediaquery.py:59
-#: ../gramps/gui/merge/mergemedia.py:67
+#: ../gramps/gui/merge/mergemedia.py:66
 msgid "Merge Media Objects"
 msgstr ""
 
 #: ../gramps/gen/merge/mergenotequery.py:58
-#: ../gramps/gui/merge/mergenote.py:67
+#: ../gramps/gui/merge/mergenote.py:66
 msgid "Merge Notes"
 msgstr ""
 
@@ -6681,12 +6681,12 @@ msgid "Multiple families get merged. This is unusual, the merge is aborted."
 msgstr ""
 
 #: ../gramps/gen/merge/mergeplacequery.py:60
-#: ../gramps/gui/merge/mergeplace.py:78
+#: ../gramps/gui/merge/mergeplace.py:77
 msgid "Merge Places"
 msgstr ""
 
 #: ../gramps/gen/merge/mergerepositoryquery.py:59
-#: ../gramps/gui/merge/mergerepository.py:68
+#: ../gramps/gui/merge/mergerepository.py:67
 msgid "Merge Repositories"
 msgstr ""
 
@@ -8158,7 +8158,7 @@ msgstr ""
 
 #: ../gramps/gen/utils/string.py:46 ../gramps/gui/editors/editperson.py:351
 #: ../gramps/gui/filters/sidebar/_personsidebarfilter.py:89
-#: ../gramps/gui/merge/mergeperson.py:62
+#: ../gramps/gui/merge/mergeperson.py:61
 #: ../gramps/gui/views/treemodels/peoplemodel.py:98
 #: ../gramps/plugins/tool/dumpgenderstats.py:35
 #: ../gramps/plugins/webreport/narrativeweb.py:5404
@@ -8167,7 +8167,7 @@ msgstr ""
 
 #: ../gramps/gen/utils/string.py:47 ../gramps/gui/editors/editperson.py:350
 #: ../gramps/gui/filters/sidebar/_personsidebarfilter.py:89
-#: ../gramps/gui/merge/mergeperson.py:62
+#: ../gramps/gui/merge/mergeperson.py:61
 #: ../gramps/gui/views/treemodels/peoplemodel.py:98
 #: ../gramps/plugins/tool/dumpgenderstats.py:35
 #: ../gramps/plugins/webreport/narrativeweb.py:5405
@@ -8423,15 +8423,15 @@ msgstr ""
 #: ../gramps/gui/editors/displaytabs/placerefembedlist.py:59
 #: ../gramps/gui/editors/editfamily.py:124
 #: ../gramps/gui/editors/editname.py:311
-#: ../gramps/gui/editors/filtereditor.py:797
-#: ../gramps/gui/editors/filtereditor.py:951
+#: ../gramps/gui/editors/filtereditor.py:798
+#: ../gramps/gui/editors/filtereditor.py:952
 #: ../gramps/gui/filters/sidebar/_personsidebarfilter.py:126
 #: ../gramps/gui/filters/sidebar/_placesidebarfilter.py:101
 #: ../gramps/gui/filters/sidebar/_reposidebarfilter.py:100
 #: ../gramps/gui/plug/_guioptions.py:1143 ../gramps/gui/plug/_windows.py:127
 #: ../gramps/gui/plug/_windows.py:1083
 #: ../gramps/gui/plug/report/_bookdialog.py:420
-#: ../gramps/gui/selectors/selectperson.py:96
+#: ../gramps/gui/selectors/selectperson.py:94
 #: ../gramps/gui/selectors/selectplace.py:71
 #: ../gramps/gui/views/bookmarks.py:218 ../gramps/gui/views/tags.py:397
 #: ../gramps/gui/views/treemodels/peoplemodel.py:615
@@ -8593,7 +8593,7 @@ msgstr ""
 #: ../gramps/gui/filters/sidebar/_notesidebarfilter.py:98
 #: ../gramps/gui/filters/sidebar/_placesidebarfilter.py:102
 #: ../gramps/gui/filters/sidebar/_reposidebarfilter.py:101
-#: ../gramps/gui/merge/mergeperson.py:240 ../gramps/gui/plug/_windows.py:120
+#: ../gramps/gui/merge/mergeperson.py:239 ../gramps/gui/plug/_windows.py:120
 #: ../gramps/gui/plug/_windows.py:236 ../gramps/gui/plug/_windows.py:1082
 #: ../gramps/gui/plug/report/_bookdialog.py:421
 #: ../gramps/gui/plug/report/_bookdialog.py:425
@@ -9778,7 +9778,7 @@ msgid "No active note"
 msgstr ""
 
 #: ../gramps/gui/editors/addmedia.py:71
-msgid "Select_a_media_object_selector"
+msgid "manual|Select_a_media_object_selector"
 msgstr ""
 
 #: ../gramps/gui/editors/addmedia.py:105
@@ -9945,7 +9945,7 @@ msgstr ""
 #: ../gramps/gui/editors/displaytabs/placerefembedlist.py:58
 #: ../gramps/gui/editors/displaytabs/repoembedlist.py:66
 #: ../gramps/gui/editors/editfamily.py:123
-#: ../gramps/gui/editors/filtereditor.py:954
+#: ../gramps/gui/editors/filtereditor.py:955
 #: ../gramps/gui/filters/sidebar/_citationsidebarfilter.py:104
 #: ../gramps/gui/filters/sidebar/_citationsidebarfilter.py:111
 #: ../gramps/gui/filters/sidebar/_eventsidebarfilter.py:100
@@ -9956,7 +9956,7 @@ msgstr ""
 #: ../gramps/gui/filters/sidebar/_placesidebarfilter.py:100
 #: ../gramps/gui/filters/sidebar/_reposidebarfilter.py:99
 #: ../gramps/gui/filters/sidebar/_sourcesidebarfilter.py:86
-#: ../gramps/gui/merge/mergeperson.py:179
+#: ../gramps/gui/merge/mergeperson.py:178
 #: ../gramps/gui/plug/_guioptions.py:1144
 #: ../gramps/gui/plug/_guioptions.py:1321
 #: ../gramps/gui/selectors/selectcitation.py:76
@@ -9964,7 +9964,7 @@ msgstr ""
 #: ../gramps/gui/selectors/selectfamily.py:70
 #: ../gramps/gui/selectors/selectnote.py:76
 #: ../gramps/gui/selectors/selectobject.py:81
-#: ../gramps/gui/selectors/selectperson.py:97
+#: ../gramps/gui/selectors/selectperson.py:95
 #: ../gramps/gui/selectors/selectplace.py:72
 #: ../gramps/gui/selectors/selectrepository.py:71
 #: ../gramps/gui/selectors/selectsource.py:72
@@ -10122,7 +10122,7 @@ msgstr ""
 #: ../gramps/gui/editors/displaytabs/eventembedlist.py:60
 #: ../gramps/gui/filters/sidebar/_familysidebarfilter.py:112
 #: ../gramps/gui/glade/editfamily.glade:192
-#: ../gramps/gui/merge/mergeperson.py:221
+#: ../gramps/gui/merge/mergeperson.py:220
 #: ../gramps/gui/selectors/selectfamily.py:71
 #: ../gramps/gui/widgets/reorderfam.py:83
 #: ../gramps/plugins/gramplet/persondetails.py:184
@@ -10144,7 +10144,7 @@ msgstr ""
 #: ../gramps/gui/editors/displaytabs/eventembedlist.py:61
 #: ../gramps/gui/filters/sidebar/_familysidebarfilter.py:113
 #: ../gramps/gui/glade/editfamily.glade:470
-#: ../gramps/gui/merge/mergeperson.py:223
+#: ../gramps/gui/merge/mergeperson.py:222
 #: ../gramps/gui/selectors/selectfamily.py:72
 #: ../gramps/gui/widgets/reorderfam.py:84
 #: ../gramps/plugins/gramplet/persondetails.py:185
@@ -10621,25 +10621,8 @@ msgstr ""
 msgid "_Jump to"
 msgstr ""
 
-#. -------------------------------------------------------------------------
-#.
-#. Constants
-#.
-#. -------------------------------------------------------------------------
-#. -------------------------------------------------------------------------
-#.
-#. Classes
-#.
-#. -------------------------------------------------------------------------
-#: ../gramps/gui/editors/editaddress.py:62
-#: ../gramps/gui/editors/editattribute.py:61
-#: ../gramps/gui/editors/editname.py:64
-#, python-format
-msgid "%s_-_Entering_and_editing_data:_detailed_-_part_3"
-msgstr ""
-
 #: ../gramps/gui/editors/editaddress.py:63
-msgid "Address_Editor_dialog"
+msgid "manual|Address_Editor_dialog"
 msgstr ""
 
 #: ../gramps/gui/editors/editaddress.py:92
@@ -10648,7 +10631,7 @@ msgid "Address Editor"
 msgstr ""
 
 #: ../gramps/gui/editors/editattribute.py:62
-msgid "Attribute_Editor_dialog"
+msgid "manual|Attribute_Editor_dialog"
 msgstr ""
 
 #: ../gramps/gui/editors/editattribute.py:96
@@ -10669,38 +10652,8 @@ msgstr ""
 msgid "The attribute type cannot be empty"
 msgstr ""
 
-#. -------------------------------------------------------------------------
-#.
-#. Constants
-#.
-#. -------------------------------------------------------------------------
-#. -------------------------------------------------------------------------
-#.
-#. Constants
-#.
-#. -------------------------------------------------------------------------
-#. This dialog changes depending on the string pass for the title.
-#. https://gramps-project.org/wiki/index.php?title=Gramps_4.2_Wiki_Manual_-_Entering_and_editing_data:_detailed_-_part_1#Select_Child_selector
-#. https://gramps-project.org/wiki/index.php?title=Gramps_4.2_Wiki_Manual_-_Entering_and_editing_data:_detailed_-_part_1#Select_Father_selector
-#. https://gramps-project.org/wiki/index.php?title=Gramps_4.2_Wiki_Manual_-_Entering_and_editing_data:_detailed_-_part_1#Select_Mother_selector
-#: ../gramps/gui/editors/editchildref.py:67
-#: ../gramps/gui/editors/editdate.py:98 ../gramps/gui/editors/editfamily.py:91
-#: ../gramps/gui/editors/editldsord.py:66
-#: ../gramps/gui/editors/editperson.py:87
-#: ../gramps/gui/editors/editpersonref.py:67
-#: ../gramps/gui/editors/editurl.py:46
-#: ../gramps/gui/selectors/selectevent.py:45
-#: ../gramps/gui/selectors/selectnote.py:48
-#: ../gramps/gui/selectors/selectobject.py:59
-#: ../gramps/gui/selectors/selectperson.py:51
-#: ../gramps/gui/selectors/selectperson.py:55
-#: ../gramps/gui/selectors/selectperson.py:59
-#, python-format
-msgid "%s_-_Entering_and_editing_data:_detailed_-_part_1"
-msgstr ""
-
 #: ../gramps/gui/editors/editchildref.py:68
-msgid "Child_Reference_Editor"
+msgid "manual|Child_Reference_Editor"
 msgstr ""
 
 #: ../gramps/gui/editors/editchildref.py:103
@@ -10712,26 +10665,8 @@ msgstr ""
 msgid "Child Reference"
 msgstr ""
 
-#. -------------------------------------------------------------------------
-#.
-#. Constants
-#.
-#. -------------------------------------------------------------------------
-#: ../gramps/gui/editors/editcitation.py:68
-#: ../gramps/gui/editors/editeventref.py:56
-#: ../gramps/gui/editors/editlink.py:48 ../gramps/gui/editors/editmedia.py:68
-#: ../gramps/gui/editors/editmediaref.py:71
-#: ../gramps/gui/editors/editnote.py:66
-#: ../gramps/gui/editors/editplacename.py:48
-#: ../gramps/gui/selectors/selectcitation.py:50
-#: ../gramps/gui/selectors/selectplace.py:46
-#: ../gramps/gui/selectors/selectrepository.py:45
-#, python-format
-msgid "%s_-_Entering_and_editing_data:_detailed_-_part_2"
-msgstr ""
-
 #: ../gramps/gui/editors/editcitation.py:69
-msgid "New_Citation_dialog"
+msgid "manual|New_Citation_dialog"
 msgstr ""
 
 #: ../gramps/gui/editors/editcitation.py:128
@@ -10764,7 +10699,7 @@ msgstr ""
 #: ../gramps/gui/editors/editevent.py:251
 #: ../gramps/gui/editors/editmedia.py:300
 #: ../gramps/gui/editors/editperson.py:849
-#: ../gramps/gui/editors/editplace.py:295
+#: ../gramps/gui/editors/editplace.py:297
 #: ../gramps/gui/editors/editreference.py:287
 #: ../gramps/gui/editors/editrepository.py:191
 #: ../gramps/gui/editors/editsource.py:211
@@ -10901,7 +10836,7 @@ msgid "Delete Event (%s)"
 msgstr ""
 
 #: ../gramps/gui/editors/editeventref.py:57
-msgid "Event_Reference_Editor_dialog"
+msgid "manual|Event_Reference_Editor_dialog"
 msgstr ""
 
 #: ../gramps/gui/editors/editeventref.py:78
@@ -10926,7 +10861,7 @@ msgid "Add Event"
 msgstr ""
 
 #: ../gramps/gui/editors/editfamily.py:92
-msgid "Family_Editor_dialog"
+msgid "manual|Family_Editor_dialog"
 msgstr ""
 
 #: ../gramps/gui/editors/editfamily.py:112
@@ -10959,8 +10894,8 @@ msgstr ""
 
 #: ../gramps/gui/editors/editfamily.py:125
 #: ../gramps/gui/filters/sidebar/_personsidebarfilter.py:128
-#: ../gramps/gui/merge/mergeperson.py:181
-#: ../gramps/gui/selectors/selectperson.py:98
+#: ../gramps/gui/merge/mergeperson.py:180
+#: ../gramps/gui/selectors/selectperson.py:96
 #: ../gramps/plugins/drawreport/statisticschart.py:331
 #: ../gramps/plugins/export/exportcsv.py:381
 #: ../gramps/plugins/importer/importcsv.py:159
@@ -10980,7 +10915,7 @@ msgid "Maternal"
 msgstr ""
 
 #: ../gramps/gui/editors/editfamily.py:128
-#: ../gramps/gui/selectors/selectperson.py:99
+#: ../gramps/gui/selectors/selectperson.py:97
 #: ../gramps/plugins/gramplet/children.py:82
 #: ../gramps/plugins/gramplet/children.py:182
 #: ../gramps/plugins/lib/libpersonview.py:101
@@ -11000,7 +10935,7 @@ msgid "Birth Date"
 msgstr ""
 
 #: ../gramps/gui/editors/editfamily.py:129
-#: ../gramps/gui/selectors/selectperson.py:101
+#: ../gramps/gui/selectors/selectperson.py:99
 #: ../gramps/plugins/gramplet/children.py:84
 #: ../gramps/plugins/gramplet/children.py:184
 #: ../gramps/plugins/lib/libpersonview.py:103
@@ -11010,13 +10945,13 @@ msgid "Death Date"
 msgstr ""
 
 #: ../gramps/gui/editors/editfamily.py:130
-#: ../gramps/gui/selectors/selectperson.py:100
+#: ../gramps/gui/selectors/selectperson.py:98
 #: ../gramps/plugins/lib/libpersonview.py:102
 msgid "Birth Place"
 msgstr ""
 
 #: ../gramps/gui/editors/editfamily.py:131
-#: ../gramps/gui/selectors/selectperson.py:102
+#: ../gramps/gui/selectors/selectperson.py:100
 #: ../gramps/plugins/lib/libpersonview.py:104
 msgid "Death Place"
 msgstr ""
@@ -11184,7 +11119,7 @@ msgid "Add Family"
 msgstr ""
 
 #: ../gramps/gui/editors/editldsord.py:67
-msgid "LDS_Ordinance_Editor"
+msgid "manual|LDS_Ordinance_Editor"
 msgstr ""
 
 #: ../gramps/gui/editors/editldsord.py:160
@@ -11218,7 +11153,7 @@ msgid "LDS Ordinance"
 msgstr ""
 
 #: ../gramps/gui/editors/editlink.py:49
-msgid "Link_Editor"
+msgid "manual|Link_Editor"
 msgstr ""
 
 #: ../gramps/gui/editors/editlink.py:86 ../gramps/gui/editors/editlink.py:231
@@ -11234,7 +11169,7 @@ msgid "Location Editor"
 msgstr ""
 
 #: ../gramps/gui/editors/editmedia.py:69
-msgid "New_Media_dialog"
+msgid "manual|New_Media_dialog"
 msgstr ""
 
 #: ../gramps/gui/editors/editmedia.py:100
@@ -11294,7 +11229,7 @@ msgid "Remove Media Object"
 msgstr ""
 
 #: ../gramps/gui/editors/editmediaref.py:72
-msgid "Media_Reference_Editor_dialog"
+msgid "manual|Media_Reference_Editor_dialog"
 msgstr ""
 
 #: ../gramps/gui/editors/editmediaref.py:96
@@ -11314,7 +11249,7 @@ msgid "Name Editor"
 msgstr ""
 
 #: ../gramps/gui/editors/editname.py:163
-msgid "Name_Editor"
+msgid "manual|Name_Editor"
 msgstr ""
 
 #: ../gramps/gui/editors/editname.py:175
@@ -11365,7 +11300,7 @@ msgid "Group this name only"
 msgstr ""
 
 #: ../gramps/gui/editors/editnote.py:67
-msgid "Editing_information_about_notes"
+msgid "manual|Editing_information_about_notes"
 msgstr ""
 
 #: ../gramps/gui/editors/editnote.py:150
@@ -11432,7 +11367,7 @@ msgid "New Person"
 msgstr ""
 
 #: ../gramps/gui/editors/editperson.py:246
-msgid "manpage section id|Editing_information_about_people"
+msgid "manual|Editing_information_about_people"
 msgstr ""
 
 #: ../gramps/gui/editors/editperson.py:607
@@ -11507,7 +11442,7 @@ msgid "_Unknown"
 msgstr ""
 
 #: ../gramps/gui/editors/editpersonref.py:68
-msgid "Person_Reference_Editor"
+msgid "manual|Person_Reference_Editor"
 msgstr ""
 
 #: ../gramps/gui/editors/editpersonref.py:97
@@ -11528,12 +11463,12 @@ msgid "You must either select a person or Cancel the edit"
 msgstr ""
 
 #: ../gramps/gui/editors/editplace.py:69
-msgid "Place_Editor_dialog"
+msgid "manual|Place_Editor_dialog"
 msgstr ""
 
 #: ../gramps/gui/editors/editplace.py:93
 #: ../gramps/gui/glade/editplace.glade:288
-#: ../gramps/gui/merge/mergeplace.py:56
+#: ../gramps/gui/merge/mergeplace.py:55
 msgid "place|Name:"
 msgstr ""
 
@@ -11548,64 +11483,64 @@ msgstr ""
 msgid "New Place"
 msgstr ""
 
-#: ../gramps/gui/editors/editplace.py:179
-#: ../gramps/gui/editors/editplaceref.py:169
+#: ../gramps/gui/editors/editplace.py:181
+#: ../gramps/gui/editors/editplaceref.py:171
 msgid "Invalid latitude (syntax: 18\\u00b09'"
 msgstr ""
 
-#: ../gramps/gui/editors/editplace.py:180
-#: ../gramps/gui/editors/editplaceref.py:170
-msgid "48.21\"S, -18.2412 or -18:9:48.21)"
-msgstr ""
-
 #: ../gramps/gui/editors/editplace.py:182
 #: ../gramps/gui/editors/editplaceref.py:172
+msgid "48.21\"S, -18.2412 or -18:9:48.21)"
+msgstr ""
+
+#: ../gramps/gui/editors/editplace.py:184
+#: ../gramps/gui/editors/editplaceref.py:174
 msgid "Invalid longitude (syntax: 18\\u00b09'"
 msgstr ""
 
-#: ../gramps/gui/editors/editplace.py:183
-#: ../gramps/gui/editors/editplaceref.py:173
+#: ../gramps/gui/editors/editplace.py:185
+#: ../gramps/gui/editors/editplaceref.py:175
 msgid "48.21\"E, -18.2412 or -18:9:48.21)"
 msgstr ""
 
-#: ../gramps/gui/editors/editplace.py:193
+#: ../gramps/gui/editors/editplace.py:195
 #: ../gramps/plugins/lib/maps/geography.py:853
 #: ../gramps/plugins/view/geoplaces.py:322
 #: ../gramps/plugins/view/geoplaces.py:348
 msgid "Edit Place"
 msgstr ""
 
-#: ../gramps/gui/editors/editplace.py:284
-#: ../gramps/gui/editors/editplaceref.py:275
+#: ../gramps/gui/editors/editplace.py:286
+#: ../gramps/gui/editors/editplaceref.py:277
 msgid "Cannot save place. Name not entered."
 msgstr ""
 
-#: ../gramps/gui/editors/editplace.py:285
-#: ../gramps/gui/editors/editplaceref.py:276
+#: ../gramps/gui/editors/editplace.py:287
+#: ../gramps/gui/editors/editplaceref.py:278
 msgid "You must enter a name before saving."
 msgstr ""
 
-#: ../gramps/gui/editors/editplace.py:294
+#: ../gramps/gui/editors/editplace.py:296
 msgid "Cannot save place. ID already exists."
 msgstr ""
 
-#: ../gramps/gui/editors/editplace.py:308
+#: ../gramps/gui/editors/editplace.py:310
 #, python-format
 msgid "Add Place (%s)"
 msgstr ""
 
-#: ../gramps/gui/editors/editplace.py:313
+#: ../gramps/gui/editors/editplace.py:315
 #, python-format
 msgid "Edit Place (%s)"
 msgstr ""
 
-#: ../gramps/gui/editors/editplace.py:338
+#: ../gramps/gui/editors/editplace.py:340
 #, python-format
 msgid "Delete Place (%s)"
 msgstr ""
 
 #: ../gramps/gui/editors/editplacename.py:49
-msgid "Place_Name_Editor_dialog"
+msgid "manual|Place_Name_Editor_dialog"
 msgstr ""
 
 #: ../gramps/gui/editors/editplacename.py:101
@@ -11630,11 +11565,11 @@ msgstr ""
 msgid "Place Reference Editor"
 msgstr ""
 
-#: ../gramps/gui/editors/editplaceref.py:282
+#: ../gramps/gui/editors/editplaceref.py:284
 msgid "Modify Place"
 msgstr ""
 
-#: ../gramps/gui/editors/editplaceref.py:287
+#: ../gramps/gui/editors/editplaceref.py:289
 msgid "Add Place"
 msgstr ""
 
@@ -11682,7 +11617,7 @@ msgid "Add Repository"
 msgstr ""
 
 #: ../gramps/gui/editors/editrepository.py:60
-msgid "New_Repositories_dialog"
+msgid "manual|New_Repositories_dialog"
 msgstr ""
 
 #: ../gramps/gui/editors/editrepository.py:94
@@ -11714,7 +11649,7 @@ msgid "Delete Repository (%s)"
 msgstr ""
 
 #: ../gramps/gui/editors/editsource.py:64
-msgid "New_Source_dialog"
+msgid "manual|New_Source_dialog"
 msgstr ""
 
 #: ../gramps/gui/editors/editsource.py:88
@@ -11894,7 +11829,7 @@ msgid "_OK"
 msgstr ""
 
 #: ../gramps/gui/editors/editurl.py:47
-msgid "Internet_Address_Editor"
+msgid "manual|Internet_Address_Editor"
 msgstr ""
 
 #: ../gramps/gui/editors/editurl.py:70 ../gramps/gui/editors/editurl.py:101
@@ -11974,31 +11909,31 @@ msgstr ""
 msgid "Give or select a source ID, leave empty to find objects with no source."
 msgstr ""
 
-#: ../gramps/gui/editors/filtereditor.py:561
+#: ../gramps/gui/editors/filtereditor.py:562
 msgid "Include original person"
 msgstr ""
 
-#: ../gramps/gui/editors/filtereditor.py:563
+#: ../gramps/gui/editors/filtereditor.py:564
 msgid "Use exact case of letters"
 msgstr ""
 
-#: ../gramps/gui/editors/filtereditor.py:564
+#: ../gramps/gui/editors/filtereditor.py:565
 msgid "Regular-Expression matching:"
 msgstr ""
 
-#: ../gramps/gui/editors/filtereditor.py:565
+#: ../gramps/gui/editors/filtereditor.py:566
 msgid "Use regular expression"
 msgstr ""
 
-#: ../gramps/gui/editors/filtereditor.py:567
+#: ../gramps/gui/editors/filtereditor.py:568
 msgid "Also family events where person is wife/husband"
 msgstr ""
 
-#: ../gramps/gui/editors/filtereditor.py:570
+#: ../gramps/gui/editors/filtereditor.py:571
 msgid "Only include primary participants"
 msgstr ""
 
-#: ../gramps/gui/editors/filtereditor.py:594
+#: ../gramps/gui/editors/filtereditor.py:595
 #: ../gramps/gui/filters/sidebar/_citationsidebarfilter.py:76
 #: ../gramps/gui/filters/sidebar/_eventsidebarfilter.py:77
 #: ../gramps/gui/filters/sidebar/_familysidebarfilter.py:87
@@ -12011,7 +11946,7 @@ msgstr ""
 msgid "Use regular expressions"
 msgstr ""
 
-#: ../gramps/gui/editors/filtereditor.py:595
+#: ../gramps/gui/editors/filtereditor.py:596
 msgid ""
 "Interpret the contents of string fields as regular expressions.\n"
 "A decimal point will match any character. A question mark will match zero or "
@@ -12022,44 +11957,44 @@ msgid ""
 "a line."
 msgstr ""
 
-#: ../gramps/gui/editors/filtereditor.py:622
+#: ../gramps/gui/editors/filtereditor.py:623
 msgid "Rule Name"
 msgstr ""
 
-#: ../gramps/gui/editors/filtereditor.py:746
-#: ../gramps/gui/editors/filtereditor.py:750
+#: ../gramps/gui/editors/filtereditor.py:747
+#: ../gramps/gui/editors/filtereditor.py:751
 #: ../gramps/gui/glade/rule.glade:885
 msgid "No rule selected"
 msgstr ""
 
-#: ../gramps/gui/editors/filtereditor.py:793
+#: ../gramps/gui/editors/filtereditor.py:794
 msgid "Define filter"
 msgstr ""
 
-#: ../gramps/gui/editors/filtereditor.py:797
+#: ../gramps/gui/editors/filtereditor.py:798
 #: ../gramps/gui/glade/rule.glade:938
 msgid "Values"
 msgstr ""
 
-#: ../gramps/gui/editors/filtereditor.py:896
+#: ../gramps/gui/editors/filtereditor.py:897
 msgid "Add Rule"
 msgstr ""
 
-#: ../gramps/gui/editors/filtereditor.py:908
+#: ../gramps/gui/editors/filtereditor.py:909
 msgid "Edit Rule"
 msgstr ""
 
-#: ../gramps/gui/editors/filtereditor.py:943
+#: ../gramps/gui/editors/filtereditor.py:944
 msgid "Filter Test"
 msgstr ""
 
-#: ../gramps/gui/editors/filtereditor.py:1082
+#: ../gramps/gui/editors/filtereditor.py:1083
 msgid "Comment"
 msgstr ""
 
 #. #########################
 #. ###############################
-#: ../gramps/gui/editors/filtereditor.py:1082
+#: ../gramps/gui/editors/filtereditor.py:1083
 #: ../gramps/plugins/drawreport/calendarreport.py:468
 #: ../gramps/plugins/drawreport/statisticschart.py:948
 #: ../gramps/plugins/drawreport/timeline.py:385
@@ -12083,22 +12018,22 @@ msgstr ""
 msgid "Filter"
 msgstr ""
 
-#: ../gramps/gui/editors/filtereditor.py:1090
+#: ../gramps/gui/editors/filtereditor.py:1091
 msgid "Custom Filter Editor"
 msgstr ""
 
-#: ../gramps/gui/editors/filtereditor.py:1157
+#: ../gramps/gui/editors/filtereditor.py:1158
 msgid "Delete Filter?"
 msgstr ""
 
-#: ../gramps/gui/editors/filtereditor.py:1158
+#: ../gramps/gui/editors/filtereditor.py:1159
 msgid ""
 "This filter is currently being used as the base for other filters. "
 "Deletingthis filter will result in removing all other filters that depend on "
 "it."
 msgstr ""
 
-#: ../gramps/gui/editors/filtereditor.py:1162
+#: ../gramps/gui/editors/filtereditor.py:1163
 msgid "Delete Filter"
 msgstr ""
 
@@ -14648,67 +14583,67 @@ msgstr ""
 msgid "Created on %(year)4d/%(month)02d/%(day)02d"
 msgstr ""
 
-#: ../gramps/gui/merge/mergecitation.py:47
+#: ../gramps/gui/merge/mergecitation.py:46
 msgid "manual|Merge_Citations"
 msgstr ""
 
-#: ../gramps/gui/merge/mergecitation.py:69
+#: ../gramps/gui/merge/mergecitation.py:68
 #: ../gramps/plugins/tool/tools.gpr.py:462
 msgid "Merge Citations"
 msgstr ""
 
-#: ../gramps/gui/merge/mergeevent.py:46
+#: ../gramps/gui/merge/mergeevent.py:45
 msgid "manual|Merge_Events"
 msgstr ""
 
-#: ../gramps/gui/merge/mergeevent.py:68
+#: ../gramps/gui/merge/mergeevent.py:67
 msgid "Merge Events"
 msgstr ""
 
-#: ../gramps/gui/merge/mergefamily.py:47
+#: ../gramps/gui/merge/mergefamily.py:46
 msgid "manual|Merge_Families"
 msgstr ""
 
-#: ../gramps/gui/merge/mergefamily.py:69
+#: ../gramps/gui/merge/mergefamily.py:68
 msgid "Merge Families"
 msgstr ""
 
-#: ../gramps/gui/merge/mergefamily.py:223
-#: ../gramps/gui/merge/mergeperson.py:329
+#: ../gramps/gui/merge/mergefamily.py:222
+#: ../gramps/gui/merge/mergeperson.py:328
 #: ../gramps/plugins/lib/libpersonview.py:419
 msgid "Cannot merge people"
 msgstr ""
 
-#: ../gramps/gui/merge/mergemedia.py:45
+#: ../gramps/gui/merge/mergemedia.py:44
 msgid "manual|Merge_Media_Objects"
 msgstr ""
 
-#: ../gramps/gui/merge/mergenote.py:45
+#: ../gramps/gui/merge/mergenote.py:44
 msgid "manual|Merge_Notes"
 msgstr ""
 
-#: ../gramps/gui/merge/mergenote.py:94
+#: ../gramps/gui/merge/mergenote.py:93
 msgid "flowed"
 msgstr ""
 
-#: ../gramps/gui/merge/mergenote.py:94
+#: ../gramps/gui/merge/mergenote.py:93
 msgid "preformatted"
 msgstr ""
 
-#: ../gramps/gui/merge/mergeperson.py:59
+#: ../gramps/gui/merge/mergeperson.py:58
 msgid "manual|Merge_People"
 msgstr ""
 
-#: ../gramps/gui/merge/mergeperson.py:90
+#: ../gramps/gui/merge/mergeperson.py:89
 msgid "Merge People"
 msgstr ""
 
-#: ../gramps/gui/merge/mergeperson.py:194
+#: ../gramps/gui/merge/mergeperson.py:193
 #: ../gramps/plugins/textreport/indivcomplete.py:334
 msgid "Alternate Names"
 msgstr ""
 
-#: ../gramps/gui/merge/mergeperson.py:201
+#: ../gramps/gui/merge/mergeperson.py:200
 #: ../gramps/plugins/gramplet/gramplet.gpr.py:449
 #: ../gramps/plugins/gramplet/gramplet.gpr.py:463
 #: ../gramps/plugins/quickview/filterbyname.py:96
@@ -14726,7 +14661,7 @@ msgstr ""
 
 #. Go over parents and build their menu
 #. don't show rest
-#: ../gramps/gui/merge/mergeperson.py:216
+#: ../gramps/gui/merge/mergeperson.py:215
 #: ../gramps/gui/widgets/fanchart.py:1768
 #: ../gramps/plugins/quickview/all_relations.py:305
 #: ../gramps/plugins/tool/notrelated.py:126
@@ -14740,25 +14675,25 @@ msgstr ""
 msgid "Parents"
 msgstr ""
 
-#: ../gramps/gui/merge/mergeperson.py:219
-#: ../gramps/gui/merge/mergeperson.py:233
+#: ../gramps/gui/merge/mergeperson.py:218
+#: ../gramps/gui/merge/mergeperson.py:232
 msgid "Family ID"
 msgstr ""
 
-#: ../gramps/gui/merge/mergeperson.py:225
+#: ../gramps/gui/merge/mergeperson.py:224
 msgid "No parents found"
 msgstr ""
 
 #. Go over spouses and build their menu
-#: ../gramps/gui/merge/mergeperson.py:227
+#: ../gramps/gui/merge/mergeperson.py:226
 #: ../gramps/gui/widgets/fanchart.py:1654
 #: ../gramps/plugins/textreport/kinshipreport.py:124
 #: ../gramps/plugins/view/pedigreeview.py:1661
 msgid "Spouses"
 msgstr ""
 
-#: ../gramps/gui/merge/mergeperson.py:237
-#: ../gramps/gui/selectors/selectperson.py:103
+#: ../gramps/gui/merge/mergeperson.py:236
+#: ../gramps/gui/selectors/selectperson.py:101
 #: ../gramps/gui/widgets/reorderfam.py:89
 #: ../gramps/plugins/gramplet/children.py:86
 #: ../gramps/plugins/lib/libpersonview.py:105
@@ -14767,29 +14702,29 @@ msgstr ""
 msgid "Spouse"
 msgstr ""
 
-#: ../gramps/gui/merge/mergeperson.py:251
+#: ../gramps/gui/merge/mergeperson.py:250
 msgid "No spouses or children found"
 msgstr ""
 
-#: ../gramps/gui/merge/mergeperson.py:255
+#: ../gramps/gui/merge/mergeperson.py:254
 #: ../gramps/plugins/textreport/indivcomplete.py:361
 #: ../gramps/plugins/webreport/narrativeweb.py:1362
 msgid "Addresses"
 msgstr ""
 
-#: ../gramps/gui/merge/mergeplace.py:54
+#: ../gramps/gui/merge/mergeplace.py:53
 msgid "manual|Merge_Places"
 msgstr ""
 
-#: ../gramps/gui/merge/mergerepository.py:45
+#: ../gramps/gui/merge/mergerepository.py:44
 msgid "manual|Merge_Repositories"
 msgstr ""
 
-#: ../gramps/gui/merge/mergesource.py:46
+#: ../gramps/gui/merge/mergesource.py:45
 msgid "manual|Merge_Sources"
 msgstr ""
 
-#: ../gramps/gui/merge/mergesource.py:68
+#: ../gramps/gui/merge/mergesource.py:67
 msgid "Merge Sources"
 msgstr ""
 
@@ -14880,7 +14815,7 @@ msgid "Also include %s?"
 msgstr ""
 
 #: ../gramps/gui/plug/_guioptions.py:1222
-#: ../gramps/gui/selectors/selectperson.py:89
+#: ../gramps/gui/selectors/selectperson.py:87
 msgid "Select Person"
 msgstr ""
 
@@ -15753,7 +15688,7 @@ msgid "You must select an active person for this tool to work properly."
 msgstr ""
 
 #: ../gramps/gui/selectors/selectcitation.py:51
-msgid "Select_Source_or_Citation_selector"
+msgid "manual|Select_Source_or_Citation_selector"
 msgstr ""
 
 #: ../gramps/gui/selectors/selectcitation.py:68
@@ -15770,7 +15705,7 @@ msgstr ""
 #: ../gramps/gui/selectors/selectfamily.py:73
 #: ../gramps/gui/selectors/selectnote.py:79
 #: ../gramps/gui/selectors/selectobject.py:83
-#: ../gramps/gui/selectors/selectperson.py:104
+#: ../gramps/gui/selectors/selectperson.py:102
 #: ../gramps/gui/selectors/selectplace.py:75
 #: ../gramps/gui/selectors/selectrepository.py:72
 #: ../gramps/gui/selectors/selectsource.py:73
@@ -15778,25 +15713,15 @@ msgid "Last Change"
 msgstr ""
 
 #: ../gramps/gui/selectors/selectevent.py:46
-msgid "Select_Event_selector"
+msgid "manual|Select_Event_selector"
 msgstr ""
 
 #: ../gramps/gui/selectors/selectevent.py:63
 msgid "Select Event"
 msgstr ""
 
-#. -------------------------------------------------------------------------
-#.
-#. Constants
-#.
-#. -------------------------------------------------------------------------
-#: ../gramps/gui/selectors/selectfamily.py:45
-#, python-format
-msgid "%s_-_Categories"
-msgstr ""
-
 #: ../gramps/gui/selectors/selectfamily.py:46
-msgid "Select_Family_selector"
+msgid "manual|Select_Family_selector"
 msgstr ""
 
 #: ../gramps/gui/selectors/selectfamily.py:63
@@ -15804,7 +15729,7 @@ msgid "Select Family"
 msgstr ""
 
 #: ../gramps/gui/selectors/selectnote.py:49
-msgid "Select_Note_selector"
+msgid "manual|Select_Note_selector"
 msgstr ""
 
 #: ../gramps/gui/selectors/selectnote.py:68
@@ -15812,27 +15737,27 @@ msgid "Select Note"
 msgstr ""
 
 #: ../gramps/gui/selectors/selectobject.py:60
-msgid "Select_Media_Object_selector"
+msgid "manual|Select_Media_Object_selector"
 msgstr ""
 
 #: ../gramps/gui/selectors/selectobject.py:70
 msgid "Select Media Object"
 msgstr ""
 
-#: ../gramps/gui/selectors/selectperson.py:52
-msgid "Select_Child_selector"
+#: ../gramps/gui/selectors/selectperson.py:54
+msgid "manual|Select_Child_selector"
 msgstr ""
 
 #: ../gramps/gui/selectors/selectperson.py:56
-msgid "Select_Father_selector"
+msgid "manual|Select_Father_selector"
 msgstr ""
 
-#: ../gramps/gui/selectors/selectperson.py:60
-msgid "Select_Mother_selector"
+#: ../gramps/gui/selectors/selectperson.py:58
+msgid "manual|Select_Mother_selector"
 msgstr ""
 
 #: ../gramps/gui/selectors/selectplace.py:47
-msgid "Select_Place_selector"
+msgid "manual|Select_Place_selector"
 msgstr ""
 
 #: ../gramps/gui/selectors/selectplace.py:64
@@ -15840,17 +15765,7 @@ msgid "Select Place"
 msgstr ""
 
 #: ../gramps/gui/selectors/selectrepository.py:46
-#: ../gramps/plugins/quickview/filterbyname.py:105
-#: ../gramps/plugins/textreport/tagreport.py:613
-#: ../gramps/plugins/view/repoview.py:129
-#: ../gramps/plugins/view/view.gpr.py:236
-#: ../gramps/plugins/view/view.gpr.py:244
-#: ../gramps/plugins/webreport/narrativeweb.py:1762
-#: ../gramps/plugins/webreport/narrativeweb.py:1873
-#: ../gramps/plugins/webreport/narrativeweb.py:2719
-#: ../gramps/plugins/webreport/narrativeweb.py:6596
-#: ../gramps/plugins/webreport/narrativeweb.py:6663
-msgid "Repositories"
+msgid "manual|Repositories"
 msgstr ""
 
 #: ../gramps/gui/selectors/selectrepository.py:63
@@ -15862,13 +15777,9 @@ msgstr ""
 #. Constants
 #.
 #. -------------------------------------------------------------------------
-#: ../gramps/gui/selectors/selectsource.py:45
-#, python-format
-msgid "%s_-_xxx"
-msgstr ""
-
+#. FIXME
 #: ../gramps/gui/selectors/selectsource.py:46
-msgid "xxxx"
+msgid "manual|xxxx"
 msgstr ""
 
 #: ../gramps/gui/selectors/selectsource.py:63
@@ -26048,7 +25959,7 @@ msgstr ""
 
 #. here, we could add value from geography names services ...
 #. if we found no place, we must create a default place.
-#: ../gramps/plugins/lib/maps/placeselection.py:202
+#: ../gramps/plugins/lib/maps/placeselection.py:205
 msgid "New place with empty fields"
 msgstr ""
 
@@ -26427,6 +26338,19 @@ msgstr ""
 msgid "Sources"
 msgstr ""
 
+#: ../gramps/plugins/quickview/filterbyname.py:105
+#: ../gramps/plugins/textreport/tagreport.py:613
+#: ../gramps/plugins/view/repoview.py:129
+#: ../gramps/plugins/view/view.gpr.py:236
+#: ../gramps/plugins/view/view.gpr.py:244
+#: ../gramps/plugins/webreport/narrativeweb.py:1762
+#: ../gramps/plugins/webreport/narrativeweb.py:1873
+#: ../gramps/plugins/webreport/narrativeweb.py:2719
+#: ../gramps/plugins/webreport/narrativeweb.py:6596
+#: ../gramps/plugins/webreport/narrativeweb.py:6663
+msgid "Repositories"
+msgstr ""
+
 #: ../gramps/plugins/quickview/filterbyname.py:120
 #: ../gramps/plugins/quickview/filterbyname.py:122
 #, python-format