diff --git a/po/is.po b/po/is.po
index d9682b486..63a31f998 100644
--- a/po/is.po
+++ b/po/is.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-02 11:13+0200\n"
-"PO-Revision-Date: 2015-10-01 12:20+0000\n"
+"POT-Creation-Date: 2015-10-10 15:17+0200\n"
+"PO-Revision-Date: 2015-10-12 07:34+0000\n"
 "Last-Translator: Sveinn í Felli <sv1@fellsnet.is>\n"
 "Language-Team: Icelandic <translation-team-is@lists.sourceforge.net>\n"
 "Language: is\n"
@@ -1692,7 +1692,7 @@ msgstr "Lifandi"
 msgid "Private Record"
 msgstr "Einkafærsla"
 
-#: ../gramps/gen/const.py:190
+#: ../gramps/gen/const.py:194
 msgid ""
 "Gramps\n"
 " (Genealogical Research and Analysis Management Programming System)\n"
@@ -1702,7 +1702,7 @@ msgstr ""
 " (Genealogical Research and Analysis Management Programming System)\n"
 "er þægilegt ættfræðiforrit."
 
-#: ../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 "ekkert"
@@ -1766,7 +1766,7 @@ msgstr "{long_month} {year}"
 #. (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 "{long_month} {year}"
 
@@ -1776,7 +1776,7 @@ msgstr "{long_month} {year}"
 #. (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 "{long_month} {year}"
 
@@ -1786,7 +1786,7 @@ msgstr "{long_month} {year}"
 #. (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 "{long_month} {year}"
 
@@ -1796,7 +1796,7 @@ msgstr "{long_month} {year}"
 #. (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 "{long_month} {year}"
 
@@ -1805,7 +1805,7 @@ msgstr "{long_month} {year}"
 #. (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 "{long_month} {year}"
 
@@ -1814,7 +1814,7 @@ msgstr "{long_month} {year}"
 #. (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 "{long_month} {year}"
 
@@ -1823,7 +1823,7 @@ msgstr "{long_month} {year}"
 #. (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 "{long_month} {year}"
 
@@ -1832,7 +1832,7 @@ msgstr "{long_month} {year}"
 #. (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 "{long_month} {year}"
 
@@ -1841,7 +1841,7 @@ msgstr "{long_month} {year}"
 #. (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 "{long_month} {year}"
 
@@ -3033,7 +3033,7 @@ msgstr "Bindi/síða:"
 #: ../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
@@ -3271,7 +3271,7 @@ msgstr "Samsvarar tilvitnunum sem merktar eru sem einka"
 #: ../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 "Stig áreiðanleika:"
 
@@ -3415,7 +3415,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 "Merki:"
 
@@ -3596,7 +3596,7 @@ msgid "Matches events with data of a particular value"
 msgstr "Samsvarar atburðum með gögnum sem hafa ákveðið gildi"
 
 #: ../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 "Vikudagur:"
 
@@ -3693,7 +3693,7 @@ msgid "Matches events matched by the specified filter name"
 msgstr "Samsvarar atburðum sem samsvara tilteknu síuheiti"
 
 #: ../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 "Taka með atburði fjölskyldu:"
 
@@ -4576,7 +4576,7 @@ msgid "Main Participants:"
 msgstr "Helstu þátttakendur:"
 
 #: ../gramps/gen/filters/rules/person/_hasevent.py:53
-#: ../gramps/gui/editors/filtereditor.py:569
+#: ../gramps/gui/editors/filtereditor.py:570
 msgid "Primary Role:"
 msgstr "Helsta hlutverk:"
 
@@ -4802,7 +4802,7 @@ msgid "Matches people with the particular tag"
 msgstr "Samsvarar fólki með ákveðið merki"
 
 #: ../gramps/gen/filters/rules/person/_hastextmatchingsubstringof.py:47
-#: ../gramps/gui/editors/filtereditor.py:562
+#: ../gramps/gui/editors/filtereditor.py:563
 msgid "Case sensitive:"
 msgstr "Næmt fyrir há- og lágstöfum:"
 
@@ -4850,7 +4850,7 @@ msgstr "Samsvarar einstaklingum sem  vantar eiginnafn eða kenninafn"
 #: ../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 "Innifalið:"
 
@@ -5601,7 +5601,7 @@ msgstr "Samsvarar gagnasöfnum með ákveðinn fjölda tilvísana"
 #: ../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 "Heiti:"
 
@@ -5919,7 +5919,7 @@ msgid "None"
 msgstr "Ekkert"
 
 #: ../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
@@ -5962,7 +5962,7 @@ msgstr "Fóstur"
 #: ../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
@@ -6000,7 +6000,7 @@ msgid "between"
 msgstr "á milli"
 
 #: ../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
@@ -6189,7 +6189,7 @@ msgstr "Aðsetur"
 msgid "Other"
 msgstr "Annað"
 
-#: ../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
@@ -6324,7 +6324,7 @@ msgstr "Starfslok"
 msgid "Will"
 msgstr "Erfðaskrá"
 
-#: ../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
@@ -6607,7 +6607,7 @@ msgstr "Hætt við"
 #: ../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
@@ -7178,12 +7178,12 @@ msgid "Merge Family"
 msgstr "Sameina fjölskyldu"
 
 #: ../gramps/gen/merge/mergemediaquery.py:59
-#: ../gramps/gui/merge/mergemedia.py:67
+#: ../gramps/gui/merge/mergemedia.py:66
 msgid "Merge Media Objects"
 msgstr "Sameina gagnahluta"
 
 #: ../gramps/gen/merge/mergenotequery.py:58
-#: ../gramps/gui/merge/mergenote.py:67
+#: ../gramps/gui/merge/mergenote.py:66
 msgid "Merge Notes"
 msgstr "Sameina minnispunkta"
 
@@ -7213,12 +7213,12 @@ msgstr ""
 "sameiningu."
 
 #: ../gramps/gen/merge/mergeplacequery.py:60
-#: ../gramps/gui/merge/mergeplace.py:78
+#: ../gramps/gui/merge/mergeplace.py:77
 msgid "Merge Places"
 msgstr "Sameina staði"
 
 #: ../gramps/gen/merge/mergerepositoryquery.py:59
-#: ../gramps/gui/merge/mergerepository.py:68
+#: ../gramps/gui/merge/mergerepository.py:67
 msgid "Merge Repositories"
 msgstr "Sameina gagnasöfn"
 
@@ -8706,7 +8706,7 @@ msgstr "%(west_longitude)s V"
 
 #: ../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
@@ -8715,7 +8715,7 @@ msgstr "karl"
 
 #: ../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
@@ -8971,15 +8971,15 @@ msgstr "Staður tilv."
 #: ../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
@@ -9141,7 +9141,7 @@ msgstr "Gagnasafn"
 #: ../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
@@ -10363,8 +10363,8 @@ msgstr "Enginn virkur minnispunktur"
 
 #: ../gramps/gui/editors/addmedia.py:71
 #, fuzzy
-msgid "Select_a_media_object_selector"
-msgstr "Veldu gagnahlut"
+msgid "manual|Select_a_media_object_selector"
+msgstr "Sameina_gagnahluta"
 
 #: ../gramps/gui/editors/addmedia.py:105
 msgid "Select a media object"
@@ -10530,7 +10530,7 @@ msgstr "_Eigindi"
 #: ../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
@@ -10541,7 +10541,7 @@ msgstr "_Eigindi"
 #: ../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
@@ -10549,7 +10549,7 @@ msgstr "_Eigindi"
 #: ../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
@@ -10707,7 +10707,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
@@ -10729,7 +10729,7 @@ msgstr "Faðir"
 #: ../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
@@ -11206,26 +11206,9 @@ msgstr "_Internet"
 msgid "_Jump to"
 msgstr "_Hoppa í"
 
-#. -------------------------------------------------------------------------
-#.
-#. 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 "%s_-_Setja_inn_og_breyta_gögnum:_nánar_-_3_hluti"
-
 #: ../gramps/gui/editors/editaddress.py:63
 #, fuzzy
-msgid "Address_Editor_dialog"
+msgid "manual|Address_Editor_dialog"
 msgstr "Heimilisfangaritill"
 
 #: ../gramps/gui/editors/editaddress.py:92
@@ -11235,7 +11218,7 @@ msgstr "Heimilisfangaritill"
 
 #: ../gramps/gui/editors/editattribute.py:62
 #, fuzzy
-msgid "Attribute_Editor_dialog"
+msgid "manual|Attribute_Editor_dialog"
 msgstr "Eigindaritill"
 
 #: ../gramps/gui/editors/editattribute.py:96
@@ -11256,39 +11239,9 @@ msgstr "Get ekki vistað eigindi"
 msgid "The attribute type cannot be empty"
 msgstr "Tegund eiginda getur ekki verið auð"
 
-#. -------------------------------------------------------------------------
-#.
-#. 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 "%s_-_Setja_inn_og_breyta_gögnum:_nánar_-_1_hluti"
-
 #: ../gramps/gui/editors/editchildref.py:68
 #, fuzzy
-msgid "Child_Reference_Editor"
+msgid "manual|Child_Reference_Editor"
 msgstr "Ritill fyrir tilvísanir barna"
 
 #: ../gramps/gui/editors/editchildref.py:103
@@ -11300,28 +11253,10 @@ msgstr "Ritill fyrir tilvísanir barna"
 msgid "Child Reference"
 msgstr "Tilvísun barns"
 
-#. -------------------------------------------------------------------------
-#.
-#. 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
-#, fuzzy, python-format
-msgid "%s_-_Entering_and_editing_data:_detailed_-_part_2"
-msgstr "%s_-_Setja_inn_og_breyta_gögnum:_nánar_-_3_hluti"
-
 #: ../gramps/gui/editors/editcitation.py:69
 #, fuzzy
-msgid "New_Citation_dialog"
-msgstr "Ný tilvitnun"
+msgid "manual|New_Citation_dialog"
+msgstr "Sameina_tilvitnanir"
 
 #: ../gramps/gui/editors/editcitation.py:128
 #: ../gramps/gui/editors/editcitation.py:134
@@ -11353,7 +11288,7 @@ msgstr "Gat ekki vistað tilvitnun. Auðkennið er þegar til staðar."
 #: ../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
@@ -11495,7 +11430,7 @@ msgstr "Eyða atburði (%s)"
 
 #: ../gramps/gui/editors/editeventref.py:57
 #, fuzzy
-msgid "Event_Reference_Editor_dialog"
+msgid "manual|Event_Reference_Editor_dialog"
 msgstr "Ritill fyrir tilvísanir atburða"
 
 #: ../gramps/gui/editors/editeventref.py:78
@@ -11520,9 +11455,8 @@ msgid "Add Event"
 msgstr "Bæta við atburði"
 
 #: ../gramps/gui/editors/editfamily.py:92
-#, fuzzy
-msgid "Family_Editor_dialog"
-msgstr "Ritill fyrir síun fjölskyldna"
+msgid "manual|Family_Editor_dialog"
+msgstr ""
 
 #: ../gramps/gui/editors/editfamily.py:112
 msgid "Create a new person and add the child to the family"
@@ -11554,8 +11488,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
@@ -11575,7 +11509,7 @@ msgid "Maternal"
 msgstr "Móður"
 
 #: ../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
@@ -11595,7 +11529,7 @@ msgid "Birth Date"
 msgstr "Fæðingardagur"
 
 #: ../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
@@ -11605,13 +11539,13 @@ msgid "Death Date"
 msgstr "Dánardægur"
 
 #: ../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 "Fæðingarstaður"
 
 #: ../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 "Dánarstaður"
@@ -11782,7 +11716,7 @@ msgstr "Bæta við fjölskyldu"
 
 #: ../gramps/gui/editors/editldsord.py:67
 #, fuzzy
-msgid "LDS_Ordinance_Editor"
+msgid "manual|LDS_Ordinance_Editor"
 msgstr "Ritill fyrir SDH kirkjuskipun"
 
 #: ../gramps/gui/editors/editldsord.py:160
@@ -11817,7 +11751,7 @@ msgstr "SDH kirkjuskipun"
 
 #: ../gramps/gui/editors/editlink.py:49
 #, fuzzy
-msgid "Link_Editor"
+msgid "manual|Link_Editor"
 msgstr "Tenglaritill"
 
 #: ../gramps/gui/editors/editlink.py:86 ../gramps/gui/editors/editlink.py:231
@@ -11834,8 +11768,8 @@ msgstr "Staðsetningaritill"
 
 #: ../gramps/gui/editors/editmedia.py:69
 #, fuzzy
-msgid "New_Media_dialog"
-msgstr "Ný gögn"
+msgid "manual|New_Media_dialog"
+msgstr "Gagnastjórnun..."
 
 #: ../gramps/gui/editors/editmedia.py:100
 #: ../gramps/gui/editors/editmediaref.py:407
@@ -11897,7 +11831,7 @@ msgstr "Fjarlægja gagnahlut"
 
 #: ../gramps/gui/editors/editmediaref.py:72
 #, fuzzy
-msgid "Media_Reference_Editor_dialog"
+msgid "manual|Media_Reference_Editor_dialog"
 msgstr "Ritill fyrir tilvísanir gagna"
 
 #: ../gramps/gui/editors/editmediaref.py:96
@@ -11918,7 +11852,7 @@ msgstr "Nafnaritill"
 
 #: ../gramps/gui/editors/editname.py:163
 #, fuzzy
-msgid "Name_Editor"
+msgid "manual|Name_Editor"
 msgstr "Nafnaritill"
 
 #: ../gramps/gui/editors/editname.py:175
@@ -11972,7 +11906,7 @@ msgstr "Einungis hópa þetta nafn"
 
 #: ../gramps/gui/editors/editnote.py:67
 #, fuzzy
-msgid "Editing_information_about_notes"
+msgid "manual|Editing_information_about_notes"
 msgstr "Breyta_upplýsingum_um_atburði"
 
 #: ../gramps/gui/editors/editnote.py:150
@@ -12041,7 +11975,8 @@ msgid "New Person"
 msgstr "Nýr einstaklingur"
 
 #: ../gramps/gui/editors/editperson.py:246
-msgid "manpage section id|Editing_information_about_people"
+#, fuzzy
+msgid "manual|Editing_information_about_people"
 msgstr "Breyta_upplýsingum_um_fólk"
 
 #: ../gramps/gui/editors/editperson.py:607
@@ -12121,7 +12056,7 @@ msgstr "Óþe_kkt"
 
 #: ../gramps/gui/editors/editpersonref.py:68
 #, fuzzy
-msgid "Person_Reference_Editor"
+msgid "manual|Person_Reference_Editor"
 msgstr "Ritill fyrir tilvísanir einstaklinga"
 
 #: ../gramps/gui/editors/editpersonref.py:97
@@ -12142,13 +12077,12 @@ msgid "You must either select a person or Cancel the edit"
 msgstr "Þú verður að velja einstakling eða hætta við breytingarnar"
 
 #: ../gramps/gui/editors/editplace.py:69
-#, fuzzy
-msgid "Place_Editor_dialog"
-msgstr "Ritill fyrir staðarheiti"
+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 "Staðarheiti:"
 
@@ -12163,65 +12097,65 @@ msgstr "Staður: %s"
 msgid "New Place"
 msgstr "Nýr staður"
 
-#: ../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 "Ógild breiddargráða (form: 18\\u00b09'"
 
-#: ../gramps/gui/editors/editplace.py:180
-#: ../gramps/gui/editors/editplaceref.py:170
+#: ../gramps/gui/editors/editplace.py:182
+#: ../gramps/gui/editors/editplaceref.py:172
 msgid "48.21\"S, -18.2412 or -18:9:48.21)"
 msgstr "48.21\"S, -18.2412 eða -18:9:48.21)"
 
-#: ../gramps/gui/editors/editplace.py:182
-#: ../gramps/gui/editors/editplaceref.py:172
+#: ../gramps/gui/editors/editplace.py:184
+#: ../gramps/gui/editors/editplaceref.py:174
 msgid "Invalid longitude (syntax: 18\\u00b09'"
 msgstr "Ógild lengdargráða (form: 18\\u00b09'"
 
-#: ../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 "48.21\"E, -18.2412 eða -18:9:48.21)"
 
-#: ../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 "Breyta stað"
 
-#: ../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 "Get ekki vistað stað. Ekkert heiti var sett inn."
 
-#: ../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 "Þú verður að setja inn nafn áður en vistað er."
 
-#: ../gramps/gui/editors/editplace.py:294
+#: ../gramps/gui/editors/editplace.py:296
 msgid "Cannot save place. ID already exists."
 msgstr "Gat ekki vistað stað. Auðkennið er þegar til staðar."
 
-#: ../gramps/gui/editors/editplace.py:308
+#: ../gramps/gui/editors/editplace.py:310
 #, python-format
 msgid "Add Place (%s)"
 msgstr "Bæta við stað (%s)"
 
-#: ../gramps/gui/editors/editplace.py:313
+#: ../gramps/gui/editors/editplace.py:315
 #, python-format
 msgid "Edit Place (%s)"
 msgstr "Breyta stað (%s)"
 
-#: ../gramps/gui/editors/editplace.py:338
+#: ../gramps/gui/editors/editplace.py:340
 #, python-format
 msgid "Delete Place (%s)"
 msgstr "Fjarlægja stað (%s)"
 
 #: ../gramps/gui/editors/editplacename.py:49
 #, fuzzy
-msgid "Place_Name_Editor_dialog"
+msgid "manual|Place_Name_Editor_dialog"
 msgstr "Ritill fyrir staðarheiti"
 
 #: ../gramps/gui/editors/editplacename.py:101
@@ -12246,11 +12180,11 @@ msgstr "Nafn staðarins getur ekki verið autt"
 msgid "Place Reference Editor"
 msgstr "Ritill fyrir tilvísanir staða"
 
-#: ../gramps/gui/editors/editplaceref.py:282
+#: ../gramps/gui/editors/editplaceref.py:284
 msgid "Modify Place"
 msgstr "Breyta stað"
 
-#: ../gramps/gui/editors/editplaceref.py:287
+#: ../gramps/gui/editors/editplaceref.py:289
 msgid "Add Place"
 msgstr "Bæta við stað"
 
@@ -12299,8 +12233,8 @@ msgstr "Bæta við gagnasafni"
 
 #: ../gramps/gui/editors/editrepository.py:60
 #, fuzzy
-msgid "New_Repositories_dialog"
-msgstr "_Gagnarsöfn"
+msgid "manual|New_Repositories_dialog"
+msgstr "Sameina_gagnasöfn"
 
 #: ../gramps/gui/editors/editrepository.py:94
 msgid "Edit Repository"
@@ -12334,8 +12268,8 @@ msgstr "Eyða gagnasafni (%s)"
 
 #: ../gramps/gui/editors/editsource.py:64
 #, fuzzy
-msgid "New_Source_dialog"
-msgstr "Ný heimild"
+msgid "manual|New_Source_dialog"
+msgstr "Sameina_heimildir"
 
 #: ../gramps/gui/editors/editsource.py:88
 msgid "New Source"
@@ -12518,7 +12452,7 @@ msgstr "Í _lagi"
 
 #: ../gramps/gui/editors/editurl.py:47
 #, fuzzy
-msgid "Internet_Address_Editor"
+msgid "manual|Internet_Address_Editor"
 msgstr "Ritill fyrir internetslóðir"
 
 #: ../gramps/gui/editors/editurl.py:70 ../gramps/gui/editors/editurl.py:101
@@ -12600,31 +12534,31 @@ msgstr "Veldu %s af lista"
 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 "Taka með upphaflegan einstakling"
 
-#: ../gramps/gui/editors/filtereditor.py:563
+#: ../gramps/gui/editors/filtereditor.py:564
 msgid "Use exact case of letters"
 msgstr "Nota nákvæma stafstöðu"
 
-#: ../gramps/gui/editors/filtereditor.py:564
+#: ../gramps/gui/editors/filtereditor.py:565
 msgid "Regular-Expression matching:"
 msgstr "Samsvörun við reglulegar segðir:"
 
-#: ../gramps/gui/editors/filtereditor.py:565
+#: ../gramps/gui/editors/filtereditor.py:566
 msgid "Use regular expression"
 msgstr "Nota reglulegar segðir"
 
-#: ../gramps/gui/editors/filtereditor.py:567
+#: ../gramps/gui/editors/filtereditor.py:568
 msgid "Also family events where person is wife/husband"
 msgstr "Einnig atburðir fjölskyldu þar sem viðkomandi er eiginmaður/eiginkona"
 
-#: ../gramps/gui/editors/filtereditor.py:570
+#: ../gramps/gui/editors/filtereditor.py:571
 msgid "Only include primary participants"
 msgstr "Aðeins taka með aðalþáttakendur"
 
-#: ../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
@@ -12637,7 +12571,7 @@ msgstr "Aðeins taka með aðalþáttakendur"
 msgid "Use regular expressions"
 msgstr "Nota reglulegar segðir"
 
-#: ../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 "
@@ -12648,44 +12582,44 @@ msgid ""
 "a line."
 msgstr ""
 
-#: ../gramps/gui/editors/filtereditor.py:622
+#: ../gramps/gui/editors/filtereditor.py:623
 msgid "Rule Name"
 msgstr "Heiti reglu"
 
-#: ../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 "Engin regla valin"
 
-#: ../gramps/gui/editors/filtereditor.py:793
+#: ../gramps/gui/editors/filtereditor.py:794
 msgid "Define filter"
 msgstr "Skilgreina síu"
 
-#: ../gramps/gui/editors/filtereditor.py:797
+#: ../gramps/gui/editors/filtereditor.py:798
 #: ../gramps/gui/glade/rule.glade:938
 msgid "Values"
 msgstr "Gildi"
 
-#: ../gramps/gui/editors/filtereditor.py:896
+#: ../gramps/gui/editors/filtereditor.py:897
 msgid "Add Rule"
 msgstr "Bæta við reglu"
 
-#: ../gramps/gui/editors/filtereditor.py:908
+#: ../gramps/gui/editors/filtereditor.py:909
 msgid "Edit Rule"
 msgstr "Breyta reglu"
 
-#: ../gramps/gui/editors/filtereditor.py:943
+#: ../gramps/gui/editors/filtereditor.py:944
 msgid "Filter Test"
 msgstr "Prófa síu"
 
-#: ../gramps/gui/editors/filtereditor.py:1082
+#: ../gramps/gui/editors/filtereditor.py:1083
 msgid "Comment"
 msgstr "Athugasemd"
 
 #. #########################
 #. ###############################
-#: ../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
@@ -12709,22 +12643,22 @@ msgstr "Athugasemd"
 msgid "Filter"
 msgstr "Síun"
 
-#: ../gramps/gui/editors/filtereditor.py:1090
+#: ../gramps/gui/editors/filtereditor.py:1091
 msgid "Custom Filter Editor"
 msgstr "Ritill fyrir sérsniðna síu"
 
-#: ../gramps/gui/editors/filtereditor.py:1157
+#: ../gramps/gui/editors/filtereditor.py:1158
 msgid "Delete Filter?"
 msgstr "Eyða síu?"
 
-#: ../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 "Eyða síu"
 
@@ -15392,67 +15326,67 @@ msgstr "Sía %s af klippispjaldi"
 msgid "Created on %(year)4d/%(month)02d/%(day)02d"
 msgstr "Útbúið %(year)4d/%(month)02d/%(day)02d"
 
-#: ../gramps/gui/merge/mergecitation.py:47
+#: ../gramps/gui/merge/mergecitation.py:46
 msgid "manual|Merge_Citations"
 msgstr "Sameina_tilvitnanir"
 
-#: ../gramps/gui/merge/mergecitation.py:69
+#: ../gramps/gui/merge/mergecitation.py:68
 #: ../gramps/plugins/tool/tools.gpr.py:462
 msgid "Merge Citations"
 msgstr "Sameina tilvitnanir"
 
-#: ../gramps/gui/merge/mergeevent.py:46
+#: ../gramps/gui/merge/mergeevent.py:45
 msgid "manual|Merge_Events"
 msgstr "Sameina_atburði"
 
-#: ../gramps/gui/merge/mergeevent.py:68
+#: ../gramps/gui/merge/mergeevent.py:67
 msgid "Merge Events"
 msgstr "Sameina atburði"
 
-#: ../gramps/gui/merge/mergefamily.py:47
+#: ../gramps/gui/merge/mergefamily.py:46
 msgid "manual|Merge_Families"
 msgstr "Sameina_fjölskyldur"
 
-#: ../gramps/gui/merge/mergefamily.py:69
+#: ../gramps/gui/merge/mergefamily.py:68
 msgid "Merge Families"
 msgstr "Sameina fjölskyldur"
 
-#: ../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 "Get ekki sameinað einstaklinga"
 
-#: ../gramps/gui/merge/mergemedia.py:45
+#: ../gramps/gui/merge/mergemedia.py:44
 msgid "manual|Merge_Media_Objects"
 msgstr "Sameina_gagnahluta"
 
-#: ../gramps/gui/merge/mergenote.py:45
+#: ../gramps/gui/merge/mergenote.py:44
 msgid "manual|Merge_Notes"
 msgstr "Sameina_minnispunkta"
 
-#: ../gramps/gui/merge/mergenote.py:94
+#: ../gramps/gui/merge/mergenote.py:93
 msgid "flowed"
 msgstr "flæðitexti"
 
-#: ../gramps/gui/merge/mergenote.py:94
+#: ../gramps/gui/merge/mergenote.py:93
 msgid "preformatted"
 msgstr "forsniðið"
 
-#: ../gramps/gui/merge/mergeperson.py:59
+#: ../gramps/gui/merge/mergeperson.py:58
 msgid "manual|Merge_People"
 msgstr "Sameina_einstaklinga"
 
-#: ../gramps/gui/merge/mergeperson.py:90
+#: ../gramps/gui/merge/mergeperson.py:89
 msgid "Merge People"
 msgstr "Sameina einstaklinga"
 
-#: ../gramps/gui/merge/mergeperson.py:194
+#: ../gramps/gui/merge/mergeperson.py:193
 #: ../gramps/plugins/textreport/indivcomplete.py:334
 msgid "Alternate Names"
 msgstr "Önnur nöfn"
 
-#: ../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
@@ -15470,7 +15404,7 @@ msgstr "Atburðir"
 
 #. 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
@@ -15484,25 +15418,25 @@ msgstr "Atburðir"
 msgid "Parents"
 msgstr "Foreldrar"
 
-#: ../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 "Auðkenni fjölskyldu"
 
-#: ../gramps/gui/merge/mergeperson.py:225
+#: ../gramps/gui/merge/mergeperson.py:224
 msgid "No parents found"
 msgstr "Engir foreldrar fundust"
 
 #. 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 "Makar"
 
-#: ../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
@@ -15511,29 +15445,29 @@ msgstr "Makar"
 msgid "Spouse"
 msgstr "Maki"
 
-#: ../gramps/gui/merge/mergeperson.py:251
+#: ../gramps/gui/merge/mergeperson.py:250
 msgid "No spouses or children found"
 msgstr "Engir makar eða börn fundust"
 
-#: ../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 "Heimilisföng"
 
-#: ../gramps/gui/merge/mergeplace.py:54
+#: ../gramps/gui/merge/mergeplace.py:53
 msgid "manual|Merge_Places"
 msgstr "Sameina_staði"
 
-#: ../gramps/gui/merge/mergerepository.py:45
+#: ../gramps/gui/merge/mergerepository.py:44
 msgid "manual|Merge_Repositories"
 msgstr "Sameina_gagnasöfn"
 
-#: ../gramps/gui/merge/mergesource.py:46
+#: ../gramps/gui/merge/mergesource.py:45
 msgid "manual|Merge_Sources"
 msgstr "Sameina_heimildir"
 
-#: ../gramps/gui/merge/mergesource.py:68
+#: ../gramps/gui/merge/mergesource.py:67
 msgid "Merge Sources"
 msgstr "Sameina heimildir"
 
@@ -15624,7 +15558,7 @@ msgid "Also include %s?"
 msgstr "Einnig taka með %s?"
 
 #: ../gramps/gui/plug/_guioptions.py:1222
-#: ../gramps/gui/selectors/selectperson.py:89
+#: ../gramps/gui/selectors/selectperson.py:87
 msgid "Select Person"
 msgstr "Veldu einstakling"
 
@@ -16533,7 +16467,7 @@ msgstr ""
 
 #: ../gramps/gui/selectors/selectcitation.py:51
 #, fuzzy
-msgid "Select_Source_or_Citation_selector"
+msgid "manual|Select_Source_or_Citation_selector"
 msgstr "Veldu heimild eða tilvitnun"
 
 #: ../gramps/gui/selectors/selectcitation.py:68
@@ -16550,7 +16484,7 @@ msgstr "Heimild: Titill eða tilvitnun: Bindi/síða"
 #: ../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
@@ -16559,27 +16493,17 @@ msgstr "Síðasta breyting"
 
 #: ../gramps/gui/selectors/selectevent.py:46
 #, fuzzy
-msgid "Select_Event_selector"
-msgstr "Veldu atburð"
+msgid "manual|Select_Event_selector"
+msgstr "Sameina_atburði"
 
 #: ../gramps/gui/selectors/selectevent.py:63
 msgid "Select Event"
 msgstr "Veldu atburð"
 
-#. -------------------------------------------------------------------------
-#.
-#. Constants
-#.
-#. -------------------------------------------------------------------------
-#: ../gramps/gui/selectors/selectfamily.py:45
-#, fuzzy, python-format
-msgid "%s_-_Categories"
-msgstr "Flokkar"
-
 #: ../gramps/gui/selectors/selectfamily.py:46
 #, fuzzy
-msgid "Select_Family_selector"
-msgstr "Veldu fjölskyldu"
+msgid "manual|Select_Family_selector"
+msgstr "Sameina_fjölskyldur"
 
 #: ../gramps/gui/selectors/selectfamily.py:63
 msgid "Select Family"
@@ -16587,8 +16511,8 @@ msgstr "Veldu fjölskyldu"
 
 #: ../gramps/gui/selectors/selectnote.py:49
 #, fuzzy
-msgid "Select_Note_selector"
-msgstr "Veldu minnispunkt"
+msgid "manual|Select_Note_selector"
+msgstr "Sameina_minnispunkta"
 
 #: ../gramps/gui/selectors/selectnote.py:68
 msgid "Select Note"
@@ -16596,50 +16520,38 @@ msgstr "Veldu minnispunkt"
 
 #: ../gramps/gui/selectors/selectobject.py:60
 #, fuzzy
-msgid "Select_Media_Object_selector"
-msgstr "Veldu gagnahluta"
+msgid "manual|Select_Media_Object_selector"
+msgstr "Sameina_gagnahluta"
 
 #: ../gramps/gui/selectors/selectobject.py:70
 msgid "Select Media Object"
 msgstr "Veldu gagnahluta"
 
-#: ../gramps/gui/selectors/selectperson.py:52
-#, fuzzy
-msgid "Select_Child_selector"
-msgstr "Veldu barn"
+#: ../gramps/gui/selectors/selectperson.py:54
+msgid "manual|Select_Child_selector"
+msgstr ""
 
 #: ../gramps/gui/selectors/selectperson.py:56
-#, fuzzy
-msgid "Select_Father_selector"
-msgstr "Veldu föður"
+msgid "manual|Select_Father_selector"
+msgstr ""
 
-#: ../gramps/gui/selectors/selectperson.py:60
-#, fuzzy
-msgid "Select_Mother_selector"
-msgstr "Veldu móður"
+#: ../gramps/gui/selectors/selectperson.py:58
+msgid "manual|Select_Mother_selector"
+msgstr ""
 
 #: ../gramps/gui/selectors/selectplace.py:47
 #, fuzzy
-msgid "Select_Place_selector"
-msgstr "Veldu stað"
+msgid "manual|Select_Place_selector"
+msgstr "Sameina_staði"
 
 #: ../gramps/gui/selectors/selectplace.py:64
 msgid "Select Place"
 msgstr "Veldu stað"
 
 #: ../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"
-msgstr "Gagnasöfn"
+#, fuzzy
+msgid "manual|Repositories"
+msgstr "Sameina_gagnasöfn"
 
 #: ../gramps/gui/selectors/selectrepository.py:63
 msgid "Select Repository"
@@ -16650,14 +16562,11 @@ msgstr "Veldu gagnasafn"
 #. Constants
 #.
 #. -------------------------------------------------------------------------
-#: ../gramps/gui/selectors/selectsource.py:45
-#, python-format
-msgid "%s_-_xxx"
-msgstr ""
-
+#. FIXME
 #: ../gramps/gui/selectors/selectsource.py:46
-msgid "xxxx"
-msgstr ""
+#, fuzzy
+msgid "manual|xxxx"
+msgstr "Merki"
 
 #: ../gramps/gui/selectors/selectsource.py:63
 msgid "Select Source"
@@ -27148,7 +27057,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 "Nýr staður með auðum færslum"
 
@@ -27530,6 +27439,19 @@ msgstr "Einstaklingar"
 msgid "Sources"
 msgstr "Heimildir"
 
+#: ../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 "Gagnasöfn"
+
 #: ../gramps/plugins/quickview/filterbyname.py:120
 #: ../gramps/plugins/quickview/filterbyname.py:122
 #, python-format
@@ -34195,11 +34117,14 @@ msgstr "Ekkert stílblað"
 #~ msgid "%(new_DB_name)s (copied %(date_string)s)"
 #~ msgstr "%(new_DB_name)s (afritaði %(date_string)s)"
 
+#~ msgid "%s_-_Entering_and_editing_data:_detailed_-_part_3"
+#~ msgstr "%s_-_Setja_inn_og_breyta_gögnum:_nánar_-_3_hluti"
+
 #~ msgid "manpage section id|Name_Editor"
 #~ msgstr "Nafnaritill"
 
-#~ msgid "manual|Tags"
-#~ msgstr "Merki"
+#~ msgid "%s_-_Entering_and_editing_data:_detailed_-_part_1"
+#~ msgstr "%s_-_Setja_inn_og_breyta_gögnum:_nánar_-_1_hluti"
 
 #~ msgid "Obtaining all rows"
 #~ msgstr "Næ í allar raðir"