diff --git a/po/fi.po b/po/fi.po
index a78e561c5..3e22d91dd 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Gramps50_fi_master_POT_2016-07-29\n"
+"Project-Id-Version: Gramps50_fi_master_POT_2016-09-10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-22 15:34+0200\n"
-"PO-Revision-Date: 2016-08-26 11:54+0200\n"
+"POT-Creation-Date: 2016-09-10 10:45-0700\n"
+"PO-Revision-Date: 2016-09-11 22:07+0200\n"
 "Last-Translator: Matti Niemelä <niememat@gmail.com>\n"
 "Language-Team: Matti Niemelä <niememat@gmail.com>\n"
 "Language: fi\n"
@@ -1175,7 +1175,7 @@ msgstr "Gramps Sukupuut:"
 #: ../gramps/cli/arghandler.py:441 ../gramps/cli/arghandler.py:442
 #: ../gramps/cli/arghandler.py:444 ../gramps/cli/clidbman.py:68
 #: ../gramps/cli/clidbman.py:171 ../gramps/cli/clidbman.py:192
-#: ../gramps/gui/clipboard.py:970 ../gramps/gui/configure.py:1458
+#: ../gramps/gui/clipboard.py:970 ../gramps/gui/configure.py:1466
 msgid "Family Tree"
 msgstr "Sukupuu"
 
@@ -1654,7 +1654,7 @@ msgstr ""
 "    %s\n"
 "\n"
 
-#: ../gramps/cli/clidbman.py:539 ../gramps/gui/configure.py:1349
+#: ../gramps/cli/clidbman.py:539 ../gramps/gui/configure.py:1357
 msgid "Never"
 msgstr "Ei koskaan"
 
@@ -1690,9 +1690,9 @@ msgstr "Lukittu %s toimesta"
 #: ../gramps/plugins/gramplet/relativegramplet.py:135
 #: ../gramps/plugins/graph/gvfamilylines.py:259
 #: ../gramps/plugins/graph/gvrelgraph.py:788
-#: ../gramps/plugins/lib/maps/geography.py:807
-#: ../gramps/plugins/lib/maps/geography.py:817
-#: ../gramps/plugins/lib/maps/geography.py:818
+#: ../gramps/plugins/lib/maps/geography.py:815
+#: ../gramps/plugins/lib/maps/geography.py:825
+#: ../gramps/plugins/lib/maps/geography.py:826
 #: ../gramps/plugins/quickview/all_relations.py:277
 #: ../gramps/plugins/quickview/all_relations.py:294
 #: ../gramps/plugins/textreport/descendreport.py:313
@@ -1729,9 +1729,13 @@ msgstr "Lukittu %s toimesta"
 #: ../gramps/plugins/view/geoperson.py:480
 #: ../gramps/plugins/view/relview.py:458 ../gramps/plugins/view/relview.py:998
 #: ../gramps/plugins/view/relview.py:1055
-#: ../gramps/plugins/webreport/narrativeweb.py:355
-#: ../gramps/plugins/webreport/narrativeweb.py:2558
-#: ../gramps/plugins/webreport/narrativeweb.py:2757
+#: ../gramps/plugins/webreport/narrativeweb.py:2147
+#: ../gramps/plugins/webreport/narrativeweb.py:2176
+#: ../gramps/plugins/webreport/narrativeweb.py:2181
+#: ../gramps/plugins/webreport/narrativeweb.py:2188
+#: ../gramps/plugins/webreport/narrativeweb.py:2583
+#: ../gramps/plugins/webreport/narrativeweb.py:2681
+#: ../gramps/plugins/webreport/narrativeweb.py:2784
 msgid "Unknown"
 msgstr "Tuntematon"
 
@@ -1959,7 +1963,6 @@ msgstr ""
 msgid "Failed to write report. "
 msgstr "Raportin kirjoitus epäonnistui. "
 
-# 20160720muutettu/uusi
 #: ../gramps/cli/plug/__init__.py:793
 #, python-format
 msgid "Failed to make '%s' report."
@@ -1986,28 +1989,28 @@ msgstr ""
 "%(gramps_bugtracker_url)s\n"
 "\n"
 
-#: ../gramps/gen/config.py:299
+#: ../gramps/gen/config.py:300
 msgid "Imported %Y/%m/%d %H:%M:%S"
 msgstr "Tuotu %Y/%m/%d %H:%M:%S"
 
-#: ../gramps/gen/config.py:313
+#: ../gramps/gen/config.py:314
 msgid "Missing Given Name"
 msgstr "Etunimi puuttuu"
 
-#: ../gramps/gen/config.py:314
+#: ../gramps/gen/config.py:315
 msgid "Missing Record"
 msgstr "Tietue puuttuu"
 
-#: ../gramps/gen/config.py:315
+#: ../gramps/gen/config.py:316
 msgid "Missing Surname"
 msgstr "Sukunimi puuttuu"
 
 # muutettu20160501
-#: ../gramps/gen/config.py:322 ../gramps/gen/config.py:324
+#: ../gramps/gen/config.py:323 ../gramps/gen/config.py:325
 msgid "[Living]"
 msgstr "[Elossa]"
 
-#: ../gramps/gen/config.py:323
+#: ../gramps/gen/config.py:324
 msgid "Private Record"
 msgstr "Yksityinen tietue"
 
@@ -2564,31 +2567,31 @@ msgid "alternative month names for December||"
 msgstr "Joulukuu"
 
 #. Must appear in the order indexed by Date.CAL_... numeric constants
-#: ../gramps/gen/datehandler/_datestrings.py:131 ../gramps/gen/lib/date.py:602
+#: ../gramps/gen/datehandler/_datestrings.py:131 ../gramps/gen/lib/date.py:608
 msgid "calendar|Gregorian"
 msgstr "gregoriaaninen"
 
-#: ../gramps/gen/datehandler/_datestrings.py:132 ../gramps/gen/lib/date.py:603
+#: ../gramps/gen/datehandler/_datestrings.py:132 ../gramps/gen/lib/date.py:609
 msgid "calendar|Julian"
 msgstr "juliaaninen"
 
-#: ../gramps/gen/datehandler/_datestrings.py:133 ../gramps/gen/lib/date.py:604
+#: ../gramps/gen/datehandler/_datestrings.py:133 ../gramps/gen/lib/date.py:610
 msgid "calendar|Hebrew"
 msgstr "juutalainen"
 
-#: ../gramps/gen/datehandler/_datestrings.py:134 ../gramps/gen/lib/date.py:605
+#: ../gramps/gen/datehandler/_datestrings.py:134 ../gramps/gen/lib/date.py:611
 msgid "calendar|French Republican"
 msgstr "Ranskan vallankumous"
 
-#: ../gramps/gen/datehandler/_datestrings.py:135 ../gramps/gen/lib/date.py:606
+#: ../gramps/gen/datehandler/_datestrings.py:135 ../gramps/gen/lib/date.py:612
 msgid "calendar|Persian"
 msgstr "persialainen"
 
-#: ../gramps/gen/datehandler/_datestrings.py:136 ../gramps/gen/lib/date.py:607
+#: ../gramps/gen/datehandler/_datestrings.py:136 ../gramps/gen/lib/date.py:613
 msgid "calendar|Islamic"
 msgstr "islamilainen"
 
-#: ../gramps/gen/datehandler/_datestrings.py:137 ../gramps/gen/lib/date.py:608
+#: ../gramps/gen/datehandler/_datestrings.py:137 ../gramps/gen/lib/date.py:614
 msgid "calendar|Swedish"
 msgstr "ruotsalainen"
 
@@ -3119,7 +3122,7 @@ msgstr ""
 "%(wiki_backup_html_start)stehdä varmuuskopio%(html_end)s sukupuustasi."
 
 #: ../gramps/gen/db/generic.py:181 ../gramps/gen/db/generic.py:220
-#: ../gramps/gen/db/generic.py:909 ../gramps/plugins/db/bsddb/undoredo.py:245
+#: ../gramps/gen/db/generic.py:906 ../gramps/plugins/db/bsddb/undoredo.py:245
 #: ../gramps/plugins/db/bsddb/undoredo.py:282
 #: ../gramps/plugins/db/bsddb/write.py:2326
 #, python-format
@@ -3133,69 +3136,81 @@ msgstr "_Peru %s"
 msgid "_Redo %s"
 msgstr "_Tee uudelleen %s"
 
-#: ../gramps/gen/db/generic.py:2066 ../gramps/plugins/db/bsddb/read.py:2070
+#: ../gramps/gen/db/generic.py:2063 ../gramps/plugins/db/bsddb/read.py:2070
 #: ../gramps/plugins/db/bsddb/write.py:2523
 msgid "Number of people"
 msgstr "Henkilöiden määrä"
 
-#: ../gramps/gen/db/generic.py:2067 ../gramps/plugins/db/bsddb/read.py:2071
+#: ../gramps/gen/db/generic.py:2064 ../gramps/plugins/db/bsddb/read.py:2071
 #: ../gramps/plugins/db/bsddb/write.py:2524
 #: ../gramps/plugins/gramplet/statsgramplet.py:116
+#: ../gramps/plugins/webreport/narrativeweb.py:8101
+#: ../gramps/plugins/webreport/narrativeweb.py:8167
 msgid "Number of families"
 msgstr "Perheitä"
 
-#: ../gramps/gen/db/generic.py:2068 ../gramps/plugins/db/bsddb/read.py:2072
+#: ../gramps/gen/db/generic.py:2065 ../gramps/plugins/db/bsddb/read.py:2072
 #: ../gramps/plugins/db/bsddb/write.py:2525
+#: ../gramps/plugins/webreport/narrativeweb.py:8128
+#: ../gramps/plugins/webreport/narrativeweb.py:8179
 msgid "Number of sources"
 msgstr "Lähteiden määrä"
 
-#: ../gramps/gen/db/generic.py:2069 ../gramps/plugins/db/bsddb/read.py:2073
+#: ../gramps/gen/db/generic.py:2066 ../gramps/plugins/db/bsddb/read.py:2073
 #: ../gramps/plugins/db/bsddb/write.py:2526
+#: ../gramps/plugins/webreport/narrativeweb.py:8132
+#: ../gramps/plugins/webreport/narrativeweb.py:8182
 msgid "Number of citations"
 msgstr "Lainausten määrä"
 
-#: ../gramps/gen/db/generic.py:2070 ../gramps/plugins/db/bsddb/read.py:2074
+#: ../gramps/gen/db/generic.py:2067 ../gramps/plugins/db/bsddb/read.py:2074
 #: ../gramps/plugins/db/bsddb/write.py:2527
+#: ../gramps/plugins/webreport/narrativeweb.py:8121
+#: ../gramps/plugins/webreport/narrativeweb.py:8173
 msgid "Number of events"
 msgstr "Tapahtumien määrä"
 
-#: ../gramps/gen/db/generic.py:2071 ../gramps/plugins/db/bsddb/read.py:2075
+#: ../gramps/gen/db/generic.py:2068 ../gramps/plugins/db/bsddb/read.py:2075
 #: ../gramps/plugins/db/bsddb/write.py:2528
 msgid "Number of media"
 msgstr "Median määrä"
 
-#: ../gramps/gen/db/generic.py:2072 ../gramps/plugins/db/bsddb/read.py:2076
+#: ../gramps/gen/db/generic.py:2069 ../gramps/plugins/db/bsddb/read.py:2076
 #: ../gramps/plugins/db/bsddb/write.py:2529
+#: ../gramps/plugins/webreport/narrativeweb.py:8124
+#: ../gramps/plugins/webreport/narrativeweb.py:8176
 msgid "Number of places"
 msgstr "Paikkojen määrä"
 
-#: ../gramps/gen/db/generic.py:2073 ../gramps/plugins/db/bsddb/read.py:2077
+#: ../gramps/gen/db/generic.py:2070 ../gramps/plugins/db/bsddb/read.py:2077
 #: ../gramps/plugins/db/bsddb/write.py:2530
+#: ../gramps/plugins/webreport/narrativeweb.py:8136
+#: ../gramps/plugins/webreport/narrativeweb.py:8185
 msgid "Number of repositories"
 msgstr "Arkistojen määrä"
 
-#: ../gramps/gen/db/generic.py:2074 ../gramps/plugins/db/bsddb/read.py:2078
+#: ../gramps/gen/db/generic.py:2071 ../gramps/plugins/db/bsddb/read.py:2078
 #: ../gramps/plugins/db/bsddb/write.py:2531
 msgid "Number of notes"
 msgstr "Lisätietojen määrä"
 
-#: ../gramps/gen/db/generic.py:2075 ../gramps/plugins/db/bsddb/read.py:2079
+#: ../gramps/gen/db/generic.py:2072 ../gramps/plugins/db/bsddb/read.py:2079
 #: ../gramps/plugins/db/bsddb/write.py:2532
 msgid "Number of tags"
 msgstr "Tagien määrä"
 
 # muutettu20160501
-#: ../gramps/gen/db/generic.py:2076 ../gramps/plugins/db/bsddb/write.py:2533
+#: ../gramps/gen/db/generic.py:2073 ../gramps/plugins/db/bsddb/write.py:2533
 msgid "Data version"
 msgstr "Tietokantaversio"
 
 # muutettu20160501
-#: ../gramps/gen/db/generic.py:2077
+#: ../gramps/gen/db/generic.py:2074
 msgid "Backups, count"
 msgstr "Varmuuskopioita yhteensä"
 
 # muutettu20160501
-#: ../gramps/gen/db/generic.py:2078
+#: ../gramps/gen/db/generic.py:2075
 msgid "Backups, last"
 msgstr "Viimeisin varmuuskopio"
 
@@ -3213,13 +3228,13 @@ msgid "Surname, Given Suffix"
 msgstr "Sukunimi, Etunimi Loppuliite"
 
 #: ../gramps/gen/display/name.py:356 ../gramps/gen/utils/keyword.py:55
-#: ../gramps/gui/configure.py:642 ../gramps/gui/configure.py:644
-#: ../gramps/gui/configure.py:649 ../gramps/gui/configure.py:651
-#: ../gramps/gui/configure.py:653 ../gramps/gui/configure.py:654
-#: ../gramps/gui/configure.py:655 ../gramps/gui/configure.py:656
-#: ../gramps/gui/configure.py:658 ../gramps/gui/configure.py:659
-#: ../gramps/gui/configure.py:660 ../gramps/gui/configure.py:661
-#: ../gramps/gui/configure.py:662 ../gramps/gui/configure.py:663
+#: ../gramps/gui/configure.py:643 ../gramps/gui/configure.py:645
+#: ../gramps/gui/configure.py:650 ../gramps/gui/configure.py:652
+#: ../gramps/gui/configure.py:654 ../gramps/gui/configure.py:655
+#: ../gramps/gui/configure.py:656 ../gramps/gui/configure.py:657
+#: ../gramps/gui/configure.py:659 ../gramps/gui/configure.py:660
+#: ../gramps/gui/configure.py:661 ../gramps/gui/configure.py:662
+#: ../gramps/gui/configure.py:663 ../gramps/gui/configure.py:664
 #: ../gramps/plugins/export/exportcsv.py:353
 #: ../gramps/plugins/importer/importcsv.py:160
 msgid "Given"
@@ -5405,6 +5420,8 @@ msgstr "Poimii henkilön kahteen tai useampaan kertaan olevat esivanhemmat"
 #: ../gramps/plugins/gramplet/statsgramplet.py:107
 #: ../gramps/plugins/graph/gvfamilylines.py:255
 #: ../gramps/plugins/graph/gvrelgraph.py:784
+#: ../gramps/plugins/webreport/narrativeweb.py:8094
+#: ../gramps/plugins/webreport/narrativeweb.py:8160
 msgid "Females"
 msgstr "Naiset"
 
@@ -5475,6 +5492,8 @@ msgstr ""
 #: ../gramps/plugins/gramplet/statsgramplet.py:104
 #: ../gramps/plugins/graph/gvfamilylines.py:251
 #: ../gramps/plugins/graph/gvrelgraph.py:780
+#: ../gramps/plugins/webreport/narrativeweb.py:8092
+#: ../gramps/plugins/webreport/narrativeweb.py:8158
 msgid "Males"
 msgstr "Miehet"
 
@@ -6287,10 +6306,11 @@ msgstr "Kasti"
 #: ../gramps/plugins/textreport/placereport.py:298
 #: ../gramps/plugins/tool/sortevents.py:57
 #: ../gramps/plugins/view/eventview.py:82
-#: ../gramps/plugins/webreport/narrativeweb.py:332
-#: ../gramps/plugins/webreport/narrativeweb.py:998
-#: ../gramps/plugins/webreport/narrativeweb.py:1285
-#: ../gramps/plugins/webreport/narrativeweb.py:2434
+#: ../gramps/plugins/webreport/narrativeweb.py:992
+#: ../gramps/plugins/webreport/narrativeweb.py:1280
+#: ../gramps/plugins/webreport/narrativeweb.py:2459
+#: ../gramps/plugins/webreport/narrativeweb.py:3103
+#: ../gramps/plugins/webreport/narrativeweb.py:5862
 msgid "Description"
 msgstr "Kuvaus"
 
@@ -6311,8 +6331,8 @@ msgid "Social Security Number"
 msgstr "Henkilötunnus"
 
 #: ../gramps/gen/lib/attrtype.py:70 ../gramps/gen/utils/keyword.py:72
-#: ../gramps/gui/configure.py:645 ../gramps/gui/configure.py:647
-#: ../gramps/gui/configure.py:652 ../gramps/gui/configure.py:659
+#: ../gramps/gui/configure.py:646 ../gramps/gui/configure.py:648
+#: ../gramps/gui/configure.py:653 ../gramps/gui/configure.py:660
 #: ../gramps/plugins/tool/patchnames.py:430
 msgid "Nickname"
 msgstr "Lempinimi"
@@ -6350,7 +6370,7 @@ msgstr "Todistaja"
 msgid "Time"
 msgstr "Aikajana"
 
-#: ../gramps/gen/lib/childreftype.py:67 ../gramps/gui/configure.py:79
+#: ../gramps/gen/lib/childreftype.py:67 ../gramps/gui/configure.py:80
 #: ../gramps/gui/filters/sidebar/_citationsidebarfilter.py:209
 #: ../gramps/gui/filters/sidebar/_eventsidebarfilter.py:175
 #: ../gramps/gui/filters/sidebar/_familysidebarfilter.py:199
@@ -6375,9 +6395,8 @@ msgstr "Tyhjä"
 #: ../gramps/plugins/textreport/familygroup.py:525
 #: ../gramps/plugins/textreport/tagreport.py:166
 #: ../gramps/plugins/view/relview.py:602
-#: ../gramps/plugins/webreport/narrativeweb.py:326
-#: ../gramps/plugins/webreport/narrativeweb.py:3219
-#: ../gramps/plugins/webreport/narrativeweb.py:6054
+#: ../gramps/plugins/webreport/narrativeweb.py:3252
+#: ../gramps/plugins/webreport/narrativeweb.py:6128
 msgid "Birth"
 msgstr "Syntymä"
 
@@ -6403,7 +6422,7 @@ msgstr "Kasvattilapsi"
 #. string if the person is None
 #.
 #. -------------------------------------------------------------------------
-#: ../gramps/gen/lib/date.py:273 ../gramps/gen/lib/date.py:415
+#: ../gramps/gen/lib/date.py:273 ../gramps/gen/lib/date.py:421
 #: ../gramps/gen/mime/_pythonmime.py:48 ../gramps/gen/mime/_pythonmime.py:56
 #: ../gramps/gen/mime/_winmime.py:57 ../gramps/gen/utils/db.py:523
 #: ../gramps/gui/editors/editperson.py:352
@@ -6413,7 +6432,7 @@ msgstr "Kasvattilapsi"
 #: ../gramps/plugins/textreport/indivcomplete.py:613
 #: ../gramps/plugins/tool/dumpgenderstats.py:35
 #: ../gramps/plugins/view/relview.py:638
-#: ../gramps/plugins/webreport/narrativeweb.py:6246
+#: ../gramps/plugins/webreport/narrativeweb.py:6327
 msgid "unknown"
 msgstr "tuntematon"
 
@@ -6449,7 +6468,7 @@ msgstr "välillä"
 #: ../gramps/gen/lib/date.py:359 ../gramps/gui/merge/mergefamily.py:150
 #: ../gramps/plugins/quickview/all_relations.py:282
 #: ../gramps/plugins/view/relview.py:978
-#: ../gramps/plugins/webreport/narrativeweb.py:1201
+#: ../gramps/plugins/webreport/narrativeweb.py:1195
 msgid "and"
 msgstr "ja"
 
@@ -6464,7 +6483,7 @@ msgstr "enemmän kuin"
 #. translators: leave all/any {...} untranslated
 #. round up years
 #. translators: leave all/any {...} untranslated
-#: ../gramps/gen/lib/date.py:420 ../gramps/gen/lib/date.py:427
+#: ../gramps/gen/lib/date.py:426 ../gramps/gen/lib/date.py:433
 #, python-brace-format
 msgid "{number_of} year"
 msgid_plural "{number_of} years"
@@ -6474,7 +6493,7 @@ msgstr[1] "{number_of} vuotta"
 #. translators: needed for Arabic, ignore otherwise
 #. ok we have the children.  Make a title off of them
 #. translators: needed for Arabic, ignore otherwise
-#: ../gramps/gen/lib/date.py:434 ../gramps/gen/lib/date.py:445
+#: ../gramps/gen/lib/date.py:440 ../gramps/gen/lib/date.py:451
 #: ../gramps/gen/plug/report/endnotes.py:118
 #: ../gramps/gen/plug/report/endnotes.py:197
 #: ../gramps/gen/plug/report/endnotes.py:204
@@ -6491,7 +6510,7 @@ msgid ", "
 msgstr " "
 
 #. translators: leave all/any {...} untranslated
-#: ../gramps/gen/lib/date.py:436
+#: ../gramps/gen/lib/date.py:442
 #, python-brace-format
 msgid "{number_of} month"
 msgid_plural "{number_of} months"
@@ -6499,54 +6518,54 @@ msgstr[0] "{number_of} kuukausi"
 msgstr[1] "{number_of} kuukautta"
 
 #. translators: leave all/any {...} untranslated
-#: ../gramps/gen/lib/date.py:447
+#: ../gramps/gen/lib/date.py:453
 #, python-brace-format
 msgid "{number_of} day"
 msgid_plural "{number_of} days"
 msgstr[0] "{number_of} päivä"
 msgstr[1] "{number_of} päivää"
 
-#: ../gramps/gen/lib/date.py:454
+#: ../gramps/gen/lib/date.py:460
 msgid "0 days"
 msgstr "0 päivää"
 
-#: ../gramps/gen/lib/date.py:1867
+#: ../gramps/gen/lib/date.py:1873
 msgid "date-quality|none"
 msgstr "ei valintaa"
 
-#: ../gramps/gen/lib/date.py:1868
+#: ../gramps/gen/lib/date.py:1874
 msgid "calculated"
 msgstr "laskettuna"
 
-#: ../gramps/gen/lib/date.py:1868
+#: ../gramps/gen/lib/date.py:1874
 msgid "estimated"
 msgstr "arvioitu"
 
-#: ../gramps/gen/lib/date.py:1882
+#: ../gramps/gen/lib/date.py:1888
 msgid "date-modifier|none"
 msgstr "ei valintaa"
 
-#: ../gramps/gen/lib/date.py:1883 ../gramps/plugins/lib/libsubstkeyword.py:315
+#: ../gramps/gen/lib/date.py:1889 ../gramps/plugins/lib/libsubstkeyword.py:315
 msgid "about"
 msgstr "noin"
 
-#: ../gramps/gen/lib/date.py:1883 ../gramps/plugins/lib/libsubstkeyword.py:314
+#: ../gramps/gen/lib/date.py:1889 ../gramps/plugins/lib/libsubstkeyword.py:314
 msgid "after"
 msgstr "jälkeen"
 
-#: ../gramps/gen/lib/date.py:1883 ../gramps/plugins/lib/libsubstkeyword.py:314
+#: ../gramps/gen/lib/date.py:1889 ../gramps/plugins/lib/libsubstkeyword.py:314
 msgid "before"
 msgstr "ennen"
 
-#: ../gramps/gen/lib/date.py:1884
+#: ../gramps/gen/lib/date.py:1890
 msgid "range"
 msgstr "aikavälillä"
 
-#: ../gramps/gen/lib/date.py:1884
+#: ../gramps/gen/lib/date.py:1890
 msgid "span"
 msgstr "ajanjaksona"
 
-#: ../gramps/gen/lib/date.py:1884
+#: ../gramps/gen/lib/date.py:1890
 msgid "textonly"
 msgstr "vain tekstinä"
 
@@ -6592,7 +6611,7 @@ msgstr "Elinkaaren tapahtumat"
 #. show "> Family: ..." and nothing else
 #. show "V Family: ..." and the rest
 #: ../gramps/gen/lib/eventtype.py:139 ../gramps/gui/clipboard.py:771
-#: ../gramps/gui/configure.py:533
+#: ../gramps/gui/configure.py:534
 #: ../gramps/gui/editors/displaytabs/eventembedlist.py:59
 #: ../gramps/gui/editors/displaytabs/personeventembedlist.py:52
 #: ../gramps/gui/editors/editfamily.py:501
@@ -6610,7 +6629,7 @@ msgstr "Elinkaaren tapahtumat"
 #: ../gramps/plugins/quickview/references.py:86
 #: ../gramps/plugins/view/relview.py:1370
 #: ../gramps/plugins/view/relview.py:1394
-#: ../gramps/plugins/webreport/narrativeweb.py:3472
+#: ../gramps/plugins/webreport/narrativeweb.py:3509
 msgid "Family"
 msgstr "Perhe"
 
@@ -6636,8 +6655,8 @@ msgstr "Oikeudellinen"
 
 #: ../gramps/gen/lib/eventtype.py:153 ../gramps/gen/lib/eventtype.py:195
 #: ../gramps/plugins/gramplet/gramplet.gpr.py:439
-#: ../gramps/plugins/webreport/narrativeweb.py:3048
-#: ../gramps/plugins/webreport/narrativeweb.py:7835
+#: ../gramps/plugins/webreport/narrativeweb.py:3081
+#: ../gramps/plugins/webreport/narrativeweb.py:7922
 msgid "Residence"
 msgstr "Asuinpaikka"
 
@@ -6654,9 +6673,8 @@ msgstr "Muu"
 #: ../gramps/plugins/textreport/familygroup.py:531
 #: ../gramps/plugins/textreport/tagreport.py:172
 #: ../gramps/plugins/view/relview.py:611 ../gramps/plugins/view/relview.py:636
-#: ../gramps/plugins/webreport/narrativeweb.py:330
-#: ../gramps/plugins/webreport/narrativeweb.py:3223
-#: ../gramps/plugins/webreport/narrativeweb.py:6058
+#: ../gramps/plugins/webreport/narrativeweb.py:3256
+#: ../gramps/plugins/webreport/narrativeweb.py:6132
 msgid "Death"
 msgstr "Kuolema"
 
@@ -6789,7 +6807,7 @@ msgstr "Testamentti"
 #: ../gramps/plugins/textreport/familygroup.py:401
 #: ../gramps/plugins/textreport/familygroup.py:410
 #: ../gramps/plugins/textreport/familygroup.py:601
-#: ../gramps/plugins/webreport/narrativeweb.py:3473
+#: ../gramps/plugins/webreport/narrativeweb.py:3510
 msgid "Marriage"
 msgstr "Avioliitto"
 
@@ -6814,7 +6832,7 @@ msgid "Engagement"
 msgstr "Kihlaus"
 
 #: ../gramps/gen/lib/eventtype.py:204
-#: ../gramps/plugins/webreport/narrativeweb.py:3474
+#: ../gramps/plugins/webreport/narrativeweb.py:3511
 msgid "Divorce"
 msgstr "Avioero"
 
@@ -7035,7 +7053,7 @@ msgid "Unmarried"
 msgstr "Avoliitto"
 
 #: ../gramps/gen/lib/familyreltype.py:51
-#: ../gramps/plugins/webreport/webcal.py:2003
+#: ../gramps/plugins/webreport/webcal.py:2022
 msgid "Married"
 msgstr "Avioliitto"
 
@@ -7149,13 +7167,13 @@ msgstr "Kesken"
 #: ../gramps/plugins/textreport/tagreport.py:553
 #: ../gramps/plugins/view/mediaview.py:129
 #: ../gramps/plugins/view/view.gpr.py:80 ../gramps/plugins/view/view.gpr.py:88
-#: ../gramps/plugins/webreport/narrativeweb.py:1865
-#: ../gramps/plugins/webreport/narrativeweb.py:1929
-#: ../gramps/plugins/webreport/narrativeweb.py:1990
-#: ../gramps/plugins/webreport/narrativeweb.py:2037
-#: ../gramps/plugins/webreport/narrativeweb.py:2337
-#: ../gramps/plugins/webreport/narrativeweb.py:5013
-#: ../gramps/plugins/webreport/narrativeweb.py:5210
+#: ../gramps/plugins/webreport/narrativeweb.py:1880
+#: ../gramps/plugins/webreport/narrativeweb.py:1946
+#: ../gramps/plugins/webreport/narrativeweb.py:2015
+#: ../gramps/plugins/webreport/narrativeweb.py:2062
+#: ../gramps/plugins/webreport/narrativeweb.py:2362
+#: ../gramps/plugins/webreport/narrativeweb.py:5081
+#: ../gramps/plugins/webreport/narrativeweb.py:5280
 msgid "Media"
 msgstr "Media"
 
@@ -7181,10 +7199,13 @@ msgstr "Media"
 #: ../gramps/plugins/textreport/familygroup.py:739
 #: ../gramps/plugins/tool/findloop.py:103
 #: ../gramps/plugins/tool/findloop.py:107
-#: ../gramps/plugins/webreport/narrativeweb.py:4135
-#: ../gramps/plugins/webreport/narrativeweb.py:4343
-#: ../gramps/plugins/webreport/narrativeweb.py:4886
-#: ../gramps/plugins/webreport/narrativeweb.py:7740
+#: ../gramps/plugins/webreport/narrativeweb.py:2909
+#: ../gramps/plugins/webreport/narrativeweb.py:4196
+#: ../gramps/plugins/webreport/narrativeweb.py:4407
+#: ../gramps/plugins/webreport/narrativeweb.py:4955
+#: ../gramps/plugins/webreport/narrativeweb.py:5460
+#: ../gramps/plugins/webreport/narrativeweb.py:7289
+#: ../gramps/plugins/webreport/narrativeweb.py:7825
 msgid "Gramps ID"
 msgstr "Gramps ID"
 
@@ -7192,15 +7213,10 @@ msgstr "Gramps ID"
 msgid "MIME"
 msgstr "MIME"
 
-# uusi
 #: ../gramps/gen/lib/media.py:198
 msgid "Checksum"
 msgstr "Tarkistussumma"
 
-#. there is no need to add an ending "</script>",
-#. as it will be added automatically by libhtml()
-#. Translatable strings for variables within this plugin
-#. gettext carries a huge footprint with it.
 #: ../gramps/gen/lib/media.py:199 ../gramps/gen/lib/person.py:257
 #: ../gramps/plugins/gramplet/gramplet.gpr.py:565
 #: ../gramps/plugins/gramplet/gramplet.gpr.py:579
@@ -7210,10 +7226,9 @@ msgstr "Tarkistussumma"
 #: ../gramps/plugins/gramplet/gramplet.gpr.py:635
 #: ../gramps/plugins/textreport/indivcomplete.py:423
 #: ../gramps/plugins/textreport/indivcomplete.py:642
-#: ../gramps/plugins/webreport/narrativeweb.py:325
-#: ../gramps/plugins/webreport/narrativeweb.py:804
-#: ../gramps/plugins/webreport/narrativeweb.py:1365
-#: ../gramps/plugins/webreport/narrativeweb.py:1616
+#: ../gramps/plugins/webreport/narrativeweb.py:798
+#: ../gramps/plugins/webreport/narrativeweb.py:1361
+#: ../gramps/plugins/webreport/narrativeweb.py:1617
 msgid "Attributes"
 msgstr "Ominaisuudet"
 
@@ -7247,9 +7262,9 @@ msgstr "Lainaukset"
 #: ../gramps/plugins/view/noteview.py:110
 #: ../gramps/plugins/view/view.gpr.py:95
 #: ../gramps/plugins/view/view.gpr.py:103
-#: ../gramps/plugins/webreport/narrativeweb.py:338
-#: ../gramps/plugins/webreport/narrativeweb.py:999
-#: ../gramps/plugins/webreport/narrativeweb.py:1633
+#: ../gramps/plugins/webreport/narrativeweb.py:993
+#: ../gramps/plugins/webreport/narrativeweb.py:1634
+#: ../gramps/plugins/webreport/narrativeweb.py:7062
 msgid "Notes"
 msgstr "Lisätiedot"
 
@@ -7312,14 +7327,15 @@ msgstr "Viimeisin muutos"
 #: ../gramps/plugins/view/citationtreeview.py:95
 #: ../gramps/plugins/view/eventview.py:85
 #: ../gramps/plugins/view/mediaview.py:98
-#: ../gramps/plugins/webreport/narrativeweb.py:331
-#: ../gramps/plugins/webreport/narrativeweb.py:996
-#: ../gramps/plugins/webreport/narrativeweb.py:1283
-#: ../gramps/plugins/webreport/narrativeweb.py:1312
-#: ../gramps/plugins/webreport/narrativeweb.py:2563
-#: ../gramps/plugins/webreport/narrativeweb.py:4134
-#: ../gramps/plugins/webreport/narrativeweb.py:5046
-#: ../gramps/plugins/webreport/narrativeweb.py:6679
+#: ../gramps/plugins/webreport/narrativeweb.py:990
+#: ../gramps/plugins/webreport/narrativeweb.py:1277
+#: ../gramps/plugins/webreport/narrativeweb.py:1307
+#: ../gramps/plugins/webreport/narrativeweb.py:1474
+#: ../gramps/plugins/webreport/narrativeweb.py:2588
+#: ../gramps/plugins/webreport/narrativeweb.py:4195
+#: ../gramps/plugins/webreport/narrativeweb.py:5114
+#: ../gramps/plugins/webreport/narrativeweb.py:5483
+#: ../gramps/plugins/webreport/narrativeweb.py:6775
 msgid "Date"
 msgstr "Päivämäärä"
 
@@ -7398,7 +7414,7 @@ msgstr "Yksityinen"
 #. Handle
 #. Add column with object name
 #: ../gramps/gen/lib/name.py:199 ../gramps/gui/clipboard.py:589
-#: ../gramps/gui/configure.py:512
+#: ../gramps/gui/configure.py:513
 #: ../gramps/gui/editors/displaytabs/backreflist.py:61
 #: ../gramps/gui/editors/displaytabs/nameembedlist.py:73
 #: ../gramps/gui/editors/displaytabs/personrefembedlist.py:64
@@ -7436,7 +7452,7 @@ msgstr "Yksityinen"
 #: ../gramps/plugins/tool/notrelated.py:124
 #: ../gramps/plugins/tool/removeunused.py:200
 #: ../gramps/plugins/tool/verify.py:547 ../gramps/plugins/view/repoview.py:85
-#: ../gramps/plugins/webreport/narrativeweb.py:7471
+#: ../gramps/plugins/webreport/narrativeweb.py:7574
 msgid "Name"
 msgstr "Nimi"
 
@@ -7445,21 +7461,21 @@ msgid "Given name"
 msgstr "Etunimi"
 
 #: ../gramps/gen/lib/name.py:205
-#: ../gramps/plugins/webreport/narrativeweb.py:1859
-#: ../gramps/plugins/webreport/narrativeweb.py:1909
-#: ../gramps/plugins/webreport/narrativeweb.py:1912
-#: ../gramps/plugins/webreport/narrativeweb.py:1972
-#: ../gramps/plugins/webreport/narrativeweb.py:4435
-#: ../gramps/plugins/webreport/narrativeweb.py:4484
+#: ../gramps/plugins/webreport/narrativeweb.py:1874
+#: ../gramps/plugins/webreport/narrativeweb.py:1926
+#: ../gramps/plugins/webreport/narrativeweb.py:1929
+#: ../gramps/plugins/webreport/narrativeweb.py:1997
+#: ../gramps/plugins/webreport/narrativeweb.py:4499
+#: ../gramps/plugins/webreport/narrativeweb.py:4549
 msgid "Surnames"
 msgstr "Sukunimet"
 
 #: ../gramps/gen/lib/name.py:206 ../gramps/gen/utils/keyword.py:60
-#: ../gramps/gui/configure.py:642 ../gramps/gui/configure.py:644
-#: ../gramps/gui/configure.py:646 ../gramps/gui/configure.py:648
-#: ../gramps/gui/configure.py:649 ../gramps/gui/configure.py:654
-#: ../gramps/gui/configure.py:656 ../gramps/gui/configure.py:661
-#: ../gramps/gui/configure.py:663 ../gramps/gui/glade/editperson.glade:230
+#: ../gramps/gui/configure.py:643 ../gramps/gui/configure.py:645
+#: ../gramps/gui/configure.py:647 ../gramps/gui/configure.py:649
+#: ../gramps/gui/configure.py:650 ../gramps/gui/configure.py:655
+#: ../gramps/gui/configure.py:657 ../gramps/gui/configure.py:662
+#: ../gramps/gui/configure.py:664 ../gramps/gui/glade/editperson.glade:230
 #: ../gramps/plugins/export/exportcsv.py:354
 #: ../gramps/plugins/importer/importcsv.py:167
 msgid "Suffix"
@@ -7484,7 +7500,7 @@ msgstr "Loppuliite"
 #: ../gramps/plugins/textreport/tagreport.py:739
 #: ../gramps/plugins/view/mediaview.py:94
 #: ../gramps/plugins/view/sourceview.py:82
-#: ../gramps/plugins/webreport/narrativeweb.py:3006
+#: ../gramps/plugins/webreport/narrativeweb.py:3036
 msgid "Title"
 msgstr "Nimike"
 
@@ -7541,13 +7557,13 @@ msgstr "Nimike"
 #: ../gramps/plugins/view/eventview.py:84
 #: ../gramps/plugins/view/mediaview.py:96
 #: ../gramps/plugins/view/noteview.py:81 ../gramps/plugins/view/repoview.py:87
-#: ../gramps/plugins/webreport/narrativeweb.py:350
-#: ../gramps/plugins/webreport/narrativeweb.py:1311
-#: ../gramps/plugins/webreport/narrativeweb.py:1631
-#: ../gramps/plugins/webreport/narrativeweb.py:2433
-#: ../gramps/plugins/webreport/narrativeweb.py:3007
-#: ../gramps/plugins/webreport/narrativeweb.py:4133
-#: ../gramps/plugins/webreport/narrativeweb.py:7747
+#: ../gramps/plugins/webreport/narrativeweb.py:1306
+#: ../gramps/plugins/webreport/narrativeweb.py:1632
+#: ../gramps/plugins/webreport/narrativeweb.py:2458
+#: ../gramps/plugins/webreport/narrativeweb.py:3038
+#: ../gramps/plugins/webreport/narrativeweb.py:4194
+#: ../gramps/plugins/webreport/narrativeweb.py:7745
+#: ../gramps/plugins/webreport/narrativeweb.py:7833
 msgid "Type"
 msgstr "Tyyppi"
 
@@ -7618,7 +7634,7 @@ msgid "Surname|Taken"
 msgstr "Otettu"
 
 #: ../gramps/gen/lib/nameorigintype.py:79 ../gramps/gen/utils/keyword.py:65
-#: ../gramps/gui/configure.py:655
+#: ../gramps/gui/configure.py:656
 msgid "Patronymic"
 msgstr "Patronyymi"
 
@@ -7659,7 +7675,7 @@ msgstr "Syntymänimi"
 msgid "Married Name"
 msgstr "Avionimi"
 
-#: ../gramps/gen/lib/notetype.py:73 ../gramps/gui/configure.py:1394
+#: ../gramps/gen/lib/notetype.py:73 ../gramps/gui/configure.py:1402
 #: ../gramps/gui/editors/editeventref.py:89
 #: ../gramps/gui/editors/editmediaref.py:106
 #: ../gramps/gui/editors/editplaceref.py:70
@@ -7692,7 +7708,7 @@ msgstr "Lähdeteksti"
 
 #. 8
 #: ../gramps/gen/lib/notetype.py:77 ../gramps/gui/clipboard.py:490
-#: ../gramps/gui/configure.py:539 ../gramps/gui/editors/editcitation.py:119
+#: ../gramps/gui/configure.py:540 ../gramps/gui/editors/editcitation.py:119
 #: ../gramps/gui/editors/editcitation.py:125
 #: ../gramps/gui/editors/editlink.py:98
 #: ../gramps/gui/editors/filtereditor.py:301
@@ -7799,7 +7815,7 @@ msgstr "Painike"
 #: ../gramps/plugins/lib/libpersonview.py:100
 #: ../gramps/plugins/quickview/siblings.py:48
 #: ../gramps/plugins/textreport/indivcomplete.py:863
-#: ../gramps/plugins/webreport/narrativeweb.py:7201
+#: ../gramps/plugins/webreport/narrativeweb.py:7300
 msgid "Gender"
 msgstr "Sukupuoli"
 
@@ -7833,12 +7849,12 @@ msgstr "Tapahtumaviitteet"
 #: ../gramps/plugins/tool/verify.glade:753
 #: ../gramps/plugins/view/familyview.py:114
 #: ../gramps/plugins/view/view.gpr.py:50 ../gramps/plugins/view/view.gpr.py:58
-#: ../gramps/plugins/webreport/narrativeweb.py:655
-#: ../gramps/plugins/webreport/narrativeweb.py:703
-#: ../gramps/plugins/webreport/narrativeweb.py:1860
-#: ../gramps/plugins/webreport/narrativeweb.py:1917
-#: ../gramps/plugins/webreport/narrativeweb.py:1973
-#: ../gramps/plugins/webreport/narrativeweb.py:3415
+#: ../gramps/plugins/webreport/narrativeweb.py:647
+#: ../gramps/plugins/webreport/narrativeweb.py:695
+#: ../gramps/plugins/webreport/narrativeweb.py:1875
+#: ../gramps/plugins/webreport/narrativeweb.py:1934
+#: ../gramps/plugins/webreport/narrativeweb.py:1998
+#: ../gramps/plugins/webreport/narrativeweb.py:3452
 msgid "Families"
 msgstr "Perheet"
 
@@ -7848,7 +7864,7 @@ msgstr "Yksinhuoltaja perheet"
 
 #: ../gramps/gen/lib/person.py:256 ../gramps/gui/merge/mergeperson.py:254
 #: ../gramps/plugins/textreport/indivcomplete.py:371
-#: ../gramps/plugins/webreport/narrativeweb.py:1432
+#: ../gramps/plugins/webreport/narrativeweb.py:1430
 msgid "Addresses"
 msgstr "Osoitteet"
 
@@ -7872,14 +7888,16 @@ msgstr "Todennäköisesti elossa"
 msgid "Merged Gramps ID"
 msgstr "Sulautettu Gramps ID"
 
-#: ../gramps/gen/lib/placetype.py:65 ../gramps/gui/configure.py:517
+#: ../gramps/gen/lib/placetype.py:65 ../gramps/gui/configure.py:518
 #: ../gramps/gui/editors/displaytabs/addrembedlist.py:76
 #: ../gramps/gui/editors/displaytabs/locationembedlist.py:59
 #: ../gramps/gui/views/treemodels/placemodel.py:282
 #: ../gramps/plugins/lib/maps/placeselection.py:132
 #: ../gramps/plugins/view/repoview.py:93
-#: ../gramps/plugins/webreport/narrativeweb.py:329
-#: ../gramps/plugins/webreport/narrativeweb.py:3786
+#: ../gramps/plugins/webreport/narrativeweb.py:1481
+#: ../gramps/plugins/webreport/narrativeweb.py:2941
+#: ../gramps/plugins/webreport/narrativeweb.py:2967
+#: ../gramps/plugins/webreport/narrativeweb.py:3827
 msgid "Country"
 msgstr "Valtio tai Liittovaltio"
 
@@ -7887,7 +7905,6 @@ msgstr "Valtio tai Liittovaltio"
 #: ../gramps/gui/editors/displaytabs/locationembedlist.py:58
 #: ../gramps/gui/views/treemodels/placemodel.py:282
 #: ../gramps/plugins/lib/maps/placeselection.py:133
-#: ../gramps/plugins/webreport/narrativeweb.py:3785
 msgid "State"
 msgstr "Lääni tai Osavaltio"
 
@@ -7895,15 +7912,19 @@ msgstr "Lääni tai Osavaltio"
 #: ../gramps/gui/editors/displaytabs/locationembedlist.py:57
 #: ../gramps/gui/views/treemodels/placemodel.py:282
 #: ../gramps/plugins/lib/maps/placeselection.py:134
-#: ../gramps/plugins/webreport/narrativeweb.py:328
+#: ../gramps/plugins/webreport/narrativeweb.py:1479
+#: ../gramps/plugins/webreport/narrativeweb.py:2938
+#: ../gramps/plugins/webreport/narrativeweb.py:2964
 msgid "County"
 msgstr "Maakunta"
 
-#: ../gramps/gen/lib/placetype.py:68 ../gramps/gui/configure.py:515
+#: ../gramps/gen/lib/placetype.py:68 ../gramps/gui/configure.py:516
 #: ../gramps/gui/editors/displaytabs/addrembedlist.py:74
 #: ../gramps/gui/editors/displaytabs/locationembedlist.py:56
 #: ../gramps/plugins/view/repoview.py:91
-#: ../gramps/plugins/webreport/narrativeweb.py:327
+#: ../gramps/plugins/webreport/narrativeweb.py:1477
+#: ../gramps/plugins/webreport/narrativeweb.py:2936
+#: ../gramps/plugins/webreport/narrativeweb.py:2962
 msgid "City"
 msgstr "Paikkakunta"
 
@@ -7911,12 +7932,13 @@ msgstr "Paikkakunta"
 msgid "Parish"
 msgstr "Seurakunta"
 
-#: ../gramps/gen/lib/placetype.py:70 ../gramps/gui/configure.py:514
+#: ../gramps/gen/lib/placetype.py:70 ../gramps/gui/configure.py:515
 #: ../gramps/gui/editors/displaytabs/addrembedlist.py:73
 #: ../gramps/gui/editors/displaytabs/locationembedlist.py:55
 #: ../gramps/plugins/view/repoview.py:90
-#: ../gramps/plugins/webreport/narrativeweb.py:336
-#: ../gramps/plugins/webreport/narrativeweb.py:1477
+#: ../gramps/plugins/webreport/narrativeweb.py:1476
+#: ../gramps/plugins/webreport/narrativeweb.py:2935
+#: ../gramps/plugins/webreport/narrativeweb.py:2961
 msgid "Locality"
 msgstr "Taajama"
 
@@ -7924,7 +7946,9 @@ msgstr "Taajama"
 #: ../gramps/gui/editors/displaytabs/addrembedlist.py:72
 #: ../gramps/gui/editors/displaytabs/locationembedlist.py:54
 #: ../gramps/plugins/view/repoview.py:89
-#: ../gramps/plugins/webreport/narrativeweb.py:349
+#: ../gramps/plugins/webreport/narrativeweb.py:1475
+#: ../gramps/plugins/webreport/narrativeweb.py:2934
+#: ../gramps/plugins/webreport/narrativeweb.py:2960
 msgid "Street"
 msgstr "Katu"
 
@@ -7977,8 +8001,8 @@ msgid "Building"
 msgstr "Rakennus tai Torppa"
 
 #: ../gramps/gen/lib/placetype.py:84 ../gramps/plugins/gramplet/leak.py:89
-#: ../gramps/plugins/webreport/narrativeweb.py:3004
-#: ../gramps/plugins/webreport/narrativeweb.py:4789
+#: ../gramps/plugins/webreport/narrativeweb.py:3034
+#: ../gramps/plugins/webreport/narrativeweb.py:4858
 msgid "Number"
 msgstr "Kutsunumero"
 
@@ -8308,7 +8332,9 @@ msgstr "Sivupalkki"
 #. add miscellaneous column
 #: ../gramps/gen/plug/_pluginreg.py:512
 #: ../gramps/plugins/gramplet/faqgramplet.py:135
-#: ../gramps/plugins/webreport/narrativeweb.py:2040
+#: ../gramps/plugins/webreport/narrativeweb.py:2065
+#: ../gramps/plugins/webreport/narrativeweb.py:8120
+#: ../gramps/plugins/webreport/narrativeweb.py:8172
 msgid "Miscellaneous"
 msgstr "Muut"
 
@@ -8401,7 +8427,7 @@ msgstr "Tiedosto %s on jo käytössä, sulje se ensin."
 #: ../gramps/plugins/lib/libhtmlbackend.py:253
 #: ../gramps/plugins/lib/libhtmlbackend.py:259
 #: ../gramps/plugins/lib/libhtmlbackend.py:263
-#: ../gramps/plugins/webreport/narrativeweb.py:8136
+#: ../gramps/plugins/webreport/narrativeweb.py:8405
 #, python-format
 msgid "Could not create %s"
 msgstr "Kohdetta %s ei voitu luoda"
@@ -8426,22 +8452,22 @@ msgid "TrueType / FreeSans"
 msgstr "TrueType / FreeSans"
 
 #: ../gramps/gen/plug/docgen/graphdoc.py:69
-#: ../gramps/plugins/view/pedigreeview.py:2036
+#: ../gramps/plugins/view/pedigreeview.py:2063
 msgid "Vertical (↓)"
 msgstr "Alaspäin (↓)"
 
 #: ../gramps/gen/plug/docgen/graphdoc.py:70
-#: ../gramps/plugins/view/pedigreeview.py:2037
+#: ../gramps/plugins/view/pedigreeview.py:2064
 msgid "Vertical (↑)"
 msgstr "Ylöspäin (↑)"
 
 #: ../gramps/gen/plug/docgen/graphdoc.py:71
-#: ../gramps/plugins/view/pedigreeview.py:2038
+#: ../gramps/plugins/view/pedigreeview.py:2065
 msgid "Horizontal (→)"
 msgstr "Oikealle (→)"
 
 #: ../gramps/gen/plug/docgen/graphdoc.py:72
-#: ../gramps/plugins/view/pedigreeview.py:2039
+#: ../gramps/plugins/view/pedigreeview.py:2066
 msgid "Horizontal (←)"
 msgstr "Vasemmalle (←)"
 
@@ -8499,18 +8525,33 @@ msgstr "Ylhäällä"
 msgid "Bottom"
 msgstr "Alhaalla"
 
+# 20160910uusi/muutettu
+#: ../gramps/gen/plug/docgen/graphdoc.py:90
+msgid "Straight"
+msgstr "Suora"
+
+# 20160910uusi/muutettu
+#: ../gramps/gen/plug/docgen/graphdoc.py:91
+msgid "Curved"
+msgstr "Kaareva"
+
+# 20160910uusi/muutettu
+#: ../gramps/gen/plug/docgen/graphdoc.py:92
+msgid "Orthogonal"
+msgstr "Suorakulmainen"
+
 #. ###############################
-#: ../gramps/gen/plug/docgen/graphdoc.py:132
+#: ../gramps/gen/plug/docgen/graphdoc.py:136
 msgid "Graphviz Layout"
 msgstr "Graphviz pohja"
 
 #. ###############################
-#: ../gramps/gen/plug/docgen/graphdoc.py:134
+#: ../gramps/gen/plug/docgen/graphdoc.py:138
 #: ../gramps/gui/widgets/styledtexteditor.py:482
 msgid "Font family"
 msgstr "Kirjasintyyppi"
 
-#: ../gramps/gen/plug/docgen/graphdoc.py:137
+#: ../gramps/gen/plug/docgen/graphdoc.py:141
 msgid ""
 "Choose the font family. If international characters don't show, use FreeSans "
 "font. FreeSans is available from: http://www.nongnu.org/freefont/"
@@ -8519,28 +8560,28 @@ msgstr ""
 "FreeSans-kirjasinta. FreeSans on saatavilla osoitteesta: http://www.nongnu."
 "org/freefont/"
 
-#: ../gramps/gen/plug/docgen/graphdoc.py:143
+#: ../gramps/gen/plug/docgen/graphdoc.py:147
 #: ../gramps/gui/widgets/styledtexteditor.py:494
 msgid "Font size"
 msgstr "Kirjasinkoko"
 
-#: ../gramps/gen/plug/docgen/graphdoc.py:144
+#: ../gramps/gen/plug/docgen/graphdoc.py:148
 msgid "The font size, in points."
 msgstr "Kirjasimen koko pisteinä."
 
-#: ../gramps/gen/plug/docgen/graphdoc.py:147
+#: ../gramps/gen/plug/docgen/graphdoc.py:151
 msgid "Graph Direction"
 msgstr "Kaavion suunta"
 
-#: ../gramps/gen/plug/docgen/graphdoc.py:150
+#: ../gramps/gen/plug/docgen/graphdoc.py:154
 msgid "Whether graph goes from top to bottom or left to right."
 msgstr "Onko kaavio ylhäältä alas vai vasemmalta oikealle."
 
-#: ../gramps/gen/plug/docgen/graphdoc.py:154
+#: ../gramps/gen/plug/docgen/graphdoc.py:158
 msgid "Number of Horizontal Pages"
 msgstr "Sivujen määrä vaakasuunnassa"
 
-#: ../gramps/gen/plug/docgen/graphdoc.py:155
+#: ../gramps/gen/plug/docgen/graphdoc.py:159
 msgid ""
 "Graphviz can create very large graphs by spreading the graph across a "
 "rectangular array of pages. This controls the number pages in the array "
@@ -8550,11 +8591,11 @@ msgstr ""
 "sivulle. Tämä asetus määrittää sivujen määrän vaakasuunnassa. Vain "
 "Ghostscript:llä luoduille dot ja pdf tiedostoille."
 
-#: ../gramps/gen/plug/docgen/graphdoc.py:162
+#: ../gramps/gen/plug/docgen/graphdoc.py:166
 msgid "Number of Vertical Pages"
 msgstr "Sivujen määrä pystysuunnassa"
 
-#: ../gramps/gen/plug/docgen/graphdoc.py:163
+#: ../gramps/gen/plug/docgen/graphdoc.py:167
 msgid ""
 "Graphviz can create very large graphs by spreading the graph across a "
 "rectangular array of pages. This controls the number pages in the array "
@@ -8564,11 +8605,11 @@ msgstr ""
 "sivulle. Tämä asetus määrittää sivujen määrän pystysuunnassa. Vain "
 "Ghostscript:llä luoduille dot ja pdf tiedostoille."
 
-#: ../gramps/gen/plug/docgen/graphdoc.py:170
+#: ../gramps/gen/plug/docgen/graphdoc.py:174
 msgid "Paging Direction"
 msgstr "Sivutussuunta"
 
-#: ../gramps/gen/plug/docgen/graphdoc.py:173
+#: ../gramps/gen/plug/docgen/graphdoc.py:177
 msgid ""
 "The order in which the graph pages are output. This option only applies if "
 "the horizontal pages or vertical pages are greater than 1."
@@ -8576,17 +8617,27 @@ msgstr ""
 "Sivujen järjestys tulostuksessa. Tällä on vaikutusta vain jos sivuja on "
 "enemmän kuin yksi."
 
+# 20160910uusi/muutettu
+#: ../gramps/gen/plug/docgen/graphdoc.py:182
+msgid "Connecting lines"
+msgstr "Yhdyslinjat"
+
+# 20160910uusi/muutettu
+#: ../gramps/gen/plug/docgen/graphdoc.py:185
+msgid "How the lines between objects will be drawn."
+msgstr "Miten piirretään viivat kohteiden välillä"
+
 #. ###############################
-#: ../gramps/gen/plug/docgen/graphdoc.py:191
+#: ../gramps/gen/plug/docgen/graphdoc.py:201
 msgid "Graphviz Options"
 msgstr "Graphviz asetukset"
 
 #. ###############################
-#: ../gramps/gen/plug/docgen/graphdoc.py:194
+#: ../gramps/gen/plug/docgen/graphdoc.py:204
 msgid "Aspect ratio"
 msgstr "Sivujen suhde"
 
-#: ../gramps/gen/plug/docgen/graphdoc.py:197
+#: ../gramps/gen/plug/docgen/graphdoc.py:207
 msgid ""
 "Affects node spacing and scaling of the graph.\n"
 "If the graph is smaller than the print area:\n"
@@ -8616,11 +8667,11 @@ msgstr ""
 "  Laajennus supistaa kaaviota tasaisesti, jotta kaavio sopii "
 "tulostusalueeseen."
 
-#: ../gramps/gen/plug/docgen/graphdoc.py:213
+#: ../gramps/gen/plug/docgen/graphdoc.py:223
 msgid "DPI"
 msgstr "DPI"
 
-#: ../gramps/gen/plug/docgen/graphdoc.py:214
+#: ../gramps/gen/plug/docgen/graphdoc.py:224
 msgid ""
 "Dots per inch.  When creating images such as .gif or .png files for the web, "
 "try numbers such as 100 or 300 DPI.  PostScript and PDF files always use 72 "
@@ -8630,11 +8681,11 @@ msgstr ""
 "kokeile arvoja kuten 100 tai 300 DPI. Kun luot PostScript tai PDF tiedostot "
 "käyttävät aina 72 DPI:tä."
 
-#: ../gramps/gen/plug/docgen/graphdoc.py:221
+#: ../gramps/gen/plug/docgen/graphdoc.py:231
 msgid "Node spacing"
 msgstr "Kaavion elementtien välistys"
 
-#: ../gramps/gen/plug/docgen/graphdoc.py:222
+#: ../gramps/gen/plug/docgen/graphdoc.py:232
 msgid ""
 "The minimum amount of free space, in inches, between individual nodes.  For "
 "vertical graphs, this corresponds to spacing between columns.  For "
@@ -8644,11 +8695,11 @@ msgstr ""
 "välillä, tuumissa. Pystysuuntaisissa kaavioissa tämä vastaa "
 "sarakevälistystä, vaakasuuntaisissa kaavioissa tämä vastaa rivivälistystä."
 
-#: ../gramps/gen/plug/docgen/graphdoc.py:229
+#: ../gramps/gen/plug/docgen/graphdoc.py:239
 msgid "Rank spacing"
 msgstr "Tasovälistys"
 
-#: ../gramps/gen/plug/docgen/graphdoc.py:230
+#: ../gramps/gen/plug/docgen/graphdoc.py:240
 msgid ""
 "The minimum amount of free space, in inches, between ranks.  For vertical "
 "graphs, this corresponds to spacing between rows.  For horizontal graphs, "
@@ -8658,11 +8709,11 @@ msgstr ""
 "Pystysuuntaisissa kaavioissa tämä vastaa rivivälistystä, vaakasuuntaisissa "
 "kaavioissa tämä vastaa sarakevälistystä."
 
-#: ../gramps/gen/plug/docgen/graphdoc.py:237
+#: ../gramps/gen/plug/docgen/graphdoc.py:247
 msgid "Use subgraphs"
 msgstr "Käytä alikaavioita"
 
-#: ../gramps/gen/plug/docgen/graphdoc.py:238
+#: ../gramps/gen/plug/docgen/graphdoc.py:248
 msgid ""
 "Subgraphs can help Graphviz position spouses together, but with non-trivial "
 "graphs will result in longer lines and larger graphs."
@@ -8673,8 +8724,8 @@ msgstr ""
 
 #. ###############################
 #. 3
-#: ../gramps/gen/plug/docgen/graphdoc.py:245 ../gramps/gui/clipboard.py:394
-#: ../gramps/gui/configure.py:547 ../gramps/gui/editors/editlink.py:93
+#: ../gramps/gen/plug/docgen/graphdoc.py:255 ../gramps/gui/clipboard.py:394
+#: ../gramps/gui/configure.py:548 ../gramps/gui/editors/editlink.py:93
 #: ../gramps/gui/editors/editmedia.py:98
 #: ../gramps/gui/editors/editmedia.py:183
 #: ../gramps/gui/editors/editmediaref.py:145
@@ -8705,64 +8756,64 @@ msgid "Note"
 msgstr "Lisätieto"
 
 #. ###############################
-#: ../gramps/gen/plug/docgen/graphdoc.py:248
+#: ../gramps/gen/plug/docgen/graphdoc.py:258
 msgid "Note to add to the graph"
 msgstr "Kaavioon lisättävä teksti"
 
-#: ../gramps/gen/plug/docgen/graphdoc.py:250
+#: ../gramps/gen/plug/docgen/graphdoc.py:260
 msgid "This text will be added to the graph."
 msgstr "Annettu teksti lisätään kaavioon."
 
-#: ../gramps/gen/plug/docgen/graphdoc.py:253
+#: ../gramps/gen/plug/docgen/graphdoc.py:263
 msgid "Note location"
 msgstr "Tekstin sijainti"
 
-#: ../gramps/gen/plug/docgen/graphdoc.py:256
+#: ../gramps/gen/plug/docgen/graphdoc.py:266
 msgid "Whether note will appear on top or bottom of the page."
 msgstr "Tuleeko teksti sivun ylä- vai alaosaan."
 
-#: ../gramps/gen/plug/docgen/graphdoc.py:260
+#: ../gramps/gen/plug/docgen/graphdoc.py:270
 msgid "Note size"
 msgstr "Lisätiedon koko"
 
-#: ../gramps/gen/plug/docgen/graphdoc.py:261
+#: ../gramps/gen/plug/docgen/graphdoc.py:271
 msgid "The size of note text, in points."
 msgstr "Tekstin koko pisteinä."
 
-#: ../gramps/gen/plug/docgen/graphdoc.py:950
+#: ../gramps/gen/plug/docgen/graphdoc.py:961
 msgid "PDF (Ghostscript)"
 msgstr "PDF (Ghostscript)"
 
-#: ../gramps/gen/plug/docgen/graphdoc.py:956
+#: ../gramps/gen/plug/docgen/graphdoc.py:967
 msgid "PDF (Graphviz)"
 msgstr "PDF (Graphviz)"
 
-#: ../gramps/gen/plug/docgen/graphdoc.py:962
+#: ../gramps/gen/plug/docgen/graphdoc.py:973
 #: ../gramps/plugins/docgen/docgen.gpr.py:158
 msgid "PostScript"
 msgstr "PostScript"
 
-#: ../gramps/gen/plug/docgen/graphdoc.py:968
+#: ../gramps/gen/plug/docgen/graphdoc.py:979
 msgid "Structured Vector Graphics (SVG)"
 msgstr "SVG (Strukturoitu Vektori-Grafiikka)"
 
-#: ../gramps/gen/plug/docgen/graphdoc.py:974
+#: ../gramps/gen/plug/docgen/graphdoc.py:985
 msgid "Compressed Structured Vector Graphs (SVGZ)"
 msgstr "Pakattu Strukturoitu Vektori-Grafiikka (SVG)"
 
-#: ../gramps/gen/plug/docgen/graphdoc.py:980
+#: ../gramps/gen/plug/docgen/graphdoc.py:991
 msgid "JPEG image"
 msgstr "JPEG-kuva"
 
-#: ../gramps/gen/plug/docgen/graphdoc.py:986
+#: ../gramps/gen/plug/docgen/graphdoc.py:997
 msgid "GIF image"
 msgstr "GIF-kuva"
 
-#: ../gramps/gen/plug/docgen/graphdoc.py:992
+#: ../gramps/gen/plug/docgen/graphdoc.py:1003
 msgid "PNG image"
 msgstr "PNG-kuva"
 
-#: ../gramps/gen/plug/docgen/graphdoc.py:998
+#: ../gramps/gen/plug/docgen/graphdoc.py:1009
 msgid "Graphviz File"
 msgstr "Graphviz tiedosto"
 
@@ -8824,7 +8875,7 @@ msgid "Graphs"
 msgstr "Kaaviot"
 
 #: ../gramps/gen/plug/report/_constants.py:53 ../gramps/gui/clipboard.py:637
-#: ../gramps/gui/clipboard.py:645 ../gramps/gui/configure.py:1195
+#: ../gramps/gui/clipboard.py:645 ../gramps/gui/configure.py:1196
 #: ../gramps/gui/filters/sidebar/_notesidebarfilter.py:101
 #: ../gramps/plugins/textreport/custombooktext.py:132
 #: ../gramps/plugins/textreport/tagreport.py:507
@@ -8871,13 +8922,13 @@ msgid "The translation to be used for the report."
 msgstr "Raportissa käytettävä käännös."
 
 #. label for the combo
-#: ../gramps/gen/plug/report/stdoptions.py:68 ../gramps/gui/configure.py:976
-#: ../gramps/plugins/webreport/webcal.py:1628
+#: ../gramps/gen/plug/report/stdoptions.py:68 ../gramps/gui/configure.py:977
+#: ../gramps/plugins/webreport/webcal.py:1643
 msgid "Name format"
 msgstr "Nimen muoto"
 
 #: ../gramps/gen/plug/report/stdoptions.py:73
-#: ../gramps/plugins/webreport/webcal.py:1632
+#: ../gramps/plugins/webreport/webcal.py:1647
 msgid "Select the format to display names"
 msgstr "Valitse nimien näyttömuoto"
 
@@ -8893,22 +8944,18 @@ msgstr "Lisätäänkö yksityisiksi merkityt tiedot"
 msgid "Living People"
 msgstr "Elävät henkilöt"
 
-# uusi20160501
 #: ../gramps/gen/plug/report/stdoptions.py:169
 msgid "'living people'|Included, and all data"
 msgstr "Mukana, ja kaikki tiedot"
 
-# uusi20160501
 #: ../gramps/gen/plug/report/stdoptions.py:173
 msgid "'living people'|Full names, but data removed"
 msgstr "Koko nimet, mutta tiedot poistetaan"
 
-# uusi20160501
 #: ../gramps/gen/plug/report/stdoptions.py:175
 msgid "'living people'|Given names replaced, and data removed"
 msgstr "Korvataan etunimet ja tiedot poistetaan"
 
-# uusi20160501
 #: ../gramps/gen/plug/report/stdoptions.py:177
 msgid "'living people'|Complete names replaced, and data removed"
 msgstr "Täydelliset nimet korvataan ja tiedot poistetaan"
@@ -8940,10 +8987,10 @@ msgstr ""
 #: ../gramps/gen/plug/report/utils.py:155
 #: ../gramps/plugins/textreport/indivcomplete.py:850
 #: ../gramps/plugins/textreport/simplebooktitle.py:106
-#: ../gramps/plugins/webreport/narrativeweb.py:2083
-#: ../gramps/plugins/webreport/narrativeweb.py:2298
-#: ../gramps/plugins/webreport/narrativeweb.py:2363
-#: ../gramps/plugins/webreport/narrativeweb.py:2371
+#: ../gramps/plugins/webreport/narrativeweb.py:2108
+#: ../gramps/plugins/webreport/narrativeweb.py:2323
+#: ../gramps/plugins/webreport/narrativeweb.py:2388
+#: ../gramps/plugins/webreport/narrativeweb.py:2396
 msgid "Could not add photo to page"
 msgstr "Kuvan lisäys sivulle epäonnistui"
 
@@ -9121,7 +9168,7 @@ msgstr ""
 "ja käynnistä Gramps."
 
 #: ../gramps/gen/relationship.py:860
-#: ../gramps/plugins/view/pedigreeview.py:1500
+#: ../gramps/plugins/view/pedigreeview.py:1512
 msgid "Relationship loop detected"
 msgstr "Suhteessa havaittu silmukka"
 
@@ -9593,28 +9640,28 @@ msgstr "Titteli"
 msgid "GIVEN"
 msgstr "ETUNIMI"
 
-#: ../gramps/gen/utils/keyword.py:56 ../gramps/gui/configure.py:649
-#: ../gramps/gui/configure.py:656 ../gramps/gui/configure.py:658
-#: ../gramps/gui/configure.py:659 ../gramps/gui/configure.py:660
-#: ../gramps/gui/configure.py:661 ../gramps/gui/configure.py:662
+#: ../gramps/gen/utils/keyword.py:56 ../gramps/gui/configure.py:650
+#: ../gramps/gui/configure.py:657 ../gramps/gui/configure.py:659
+#: ../gramps/gui/configure.py:660 ../gramps/gui/configure.py:661
+#: ../gramps/gui/configure.py:662 ../gramps/gui/configure.py:663
 msgid "SURNAME"
 msgstr "SUKUNIMI"
 
 #. show surname and first name
 #: ../gramps/gen/utils/keyword.py:56 ../gramps/gui/clipboard.py:621
-#: ../gramps/gui/configure.py:642 ../gramps/gui/configure.py:644
-#: ../gramps/gui/configure.py:646 ../gramps/gui/configure.py:648
-#: ../gramps/gui/configure.py:651 ../gramps/gui/configure.py:652
-#: ../gramps/gui/configure.py:653 ../gramps/gui/configure.py:654
+#: ../gramps/gui/configure.py:643 ../gramps/gui/configure.py:645
+#: ../gramps/gui/configure.py:647 ../gramps/gui/configure.py:649
+#: ../gramps/gui/configure.py:652 ../gramps/gui/configure.py:653
+#: ../gramps/gui/configure.py:654 ../gramps/gui/configure.py:655
 #: ../gramps/gui/editors/displaytabs/surnametab.py:74
 #: ../gramps/gui/plug/_guioptions.py:88 ../gramps/gui/plug/_guioptions.py:1493
 #: ../gramps/plugins/drawreport/statisticschart.py:334
 #: ../gramps/plugins/export/exportcsv.py:353
 #: ../gramps/plugins/importer/importcsv.py:157
 #: ../gramps/plugins/quickview/filterbyname.py:354
-#: ../gramps/plugins/webreport/narrativeweb.py:3187
-#: ../gramps/plugins/webreport/narrativeweb.py:4484
-#: ../gramps/plugins/webreport/narrativeweb.py:6048
+#: ../gramps/plugins/webreport/narrativeweb.py:3220
+#: ../gramps/plugins/webreport/narrativeweb.py:4548
+#: ../gramps/plugins/webreport/narrativeweb.py:6122
 msgid "Surname"
 msgstr "Sukunimi"
 
@@ -9630,9 +9677,9 @@ msgstr "Kutsumanimi"
 msgid "Name|COMMON"
 msgstr "YLEISNIMI"
 
-#: ../gramps/gen/utils/keyword.py:58 ../gramps/gui/configure.py:646
-#: ../gramps/gui/configure.py:648 ../gramps/gui/configure.py:651
-#: ../gramps/gui/configure.py:652 ../gramps/gui/configure.py:658
+#: ../gramps/gen/utils/keyword.py:58 ../gramps/gui/configure.py:647
+#: ../gramps/gui/configure.py:649 ../gramps/gui/configure.py:652
+#: ../gramps/gui/configure.py:653 ../gramps/gui/configure.py:659
 msgid "Name|Common"
 msgstr "Yleisnimi"
 
@@ -9714,7 +9761,7 @@ msgstr "Patronyymi[yle]"
 msgid "RAWSURNAMES"
 msgstr "RAWSUKUNIMET"
 
-#: ../gramps/gen/utils/keyword.py:69 ../gramps/gui/configure.py:663
+#: ../gramps/gen/utils/keyword.py:69 ../gramps/gui/configure.py:664
 msgid "Rawsurnames"
 msgstr "Rawsukunimet"
 
@@ -9776,7 +9823,7 @@ msgstr "%(west_longitude)s L"
 #: ../gramps/gui/merge/mergeperson.py:61
 #: ../gramps/gui/views/treemodels/peoplemodel.py:97
 #: ../gramps/plugins/tool/dumpgenderstats.py:35
-#: ../gramps/plugins/webreport/narrativeweb.py:6244
+#: ../gramps/plugins/webreport/narrativeweb.py:6325
 msgid "male"
 msgstr "mies"
 
@@ -9785,7 +9832,7 @@ msgstr "mies"
 #: ../gramps/gui/merge/mergeperson.py:61
 #: ../gramps/gui/views/treemodels/peoplemodel.py:97
 #: ../gramps/plugins/tool/dumpgenderstats.py:35
-#: ../gramps/plugins/webreport/narrativeweb.py:6245
+#: ../gramps/plugins/webreport/narrativeweb.py:6326
 msgid "female"
 msgstr "nainen"
 
@@ -9862,7 +9909,7 @@ msgstr "Tuntematon, puuttui %(time)s (%(count)d)"
 msgid "Objects referenced by this note were missing in a file imported on %s."
 msgstr "Tuontitiedostossa %s ei ollut tämän lisätiedon viittaamia objekteja."
 
-#: ../gramps/grampsapp.py:154
+#: ../gramps/grampsapp.py:155
 #, python-format
 msgid ""
 "Your Python version does not meet the requirements. At least python %(v1)d."
@@ -9875,16 +9922,16 @@ msgstr ""
 "\n"
 "Gramps suljetaan nyt."
 
-#: ../gramps/grampsapp.py:410 ../gramps/grampsapp.py:417
-#: ../gramps/grampsapp.py:461
+#: ../gramps/grampsapp.py:411 ../gramps/grampsapp.py:418
+#: ../gramps/grampsapp.py:462
 msgid "Configuration error:"
 msgstr "Kokoonpanon virhe:"
 
-#: ../gramps/grampsapp.py:414
+#: ../gramps/grampsapp.py:415
 msgid "Error reading configuration"
 msgstr "Virhe kokoonpanon lukemisessa"
 
-#: ../gramps/grampsapp.py:418
+#: ../gramps/grampsapp.py:419
 #, python-format
 msgid ""
 "A definition for the MIME-type %s could not be found \n"
@@ -9933,19 +9980,19 @@ msgid "manual|Using_the_Clipboard"
 msgstr "Leikep.C3.B6yd.C3.A4n_k.C3.A4ytt.C3.B6"
 
 #. We encounter a PLAC, having previously encountered an ADDR
-#: ../gramps/gui/clipboard.py:303 ../gramps/gui/configure.py:513
+#: ../gramps/gui/clipboard.py:303 ../gramps/gui/configure.py:514
 #: ../gramps/gui/editors/editaddress.py:168
 #: ../gramps/gui/filters/sidebar/_reposidebarfilter.py:106
 #: ../gramps/plugins/gramplet/repositorydetails.py:133
-#: ../gramps/plugins/lib/libgedcom.py:5609
-#: ../gramps/plugins/lib/libgedcom.py:5775
+#: ../gramps/plugins/lib/libgedcom.py:5426
+#: ../gramps/plugins/lib/libgedcom.py:5593
 #: ../gramps/plugins/textreport/familygroup.py:347
-#: ../gramps/plugins/webreport/narrativeweb.py:7834
+#: ../gramps/plugins/webreport/narrativeweb.py:7921
 msgid "Address"
 msgstr "Osoite"
 
 #. 0 this order range above
-#: ../gramps/gui/clipboard.py:340 ../gramps/gui/configure.py:543
+#: ../gramps/gui/clipboard.py:340 ../gramps/gui/configure.py:544
 #: ../gramps/gui/editors/editlink.py:90
 #: ../gramps/gui/editors/filtereditor.py:295
 #: ../gramps/gui/filters/sidebar/_personsidebarfilter.py:133
@@ -9955,13 +10002,12 @@ msgstr "Osoite"
 #: ../gramps/plugins/quickview/quickview.gpr.py:201
 #: ../gramps/plugins/quickview/references.py:87
 #: ../gramps/plugins/textreport/placereport.py:457
-#: ../gramps/plugins/webreport/narrativeweb.py:333
-#: ../gramps/plugins/webreport/narrativeweb.py:995
+#: ../gramps/plugins/webreport/narrativeweb.py:989
 msgid "Event"
 msgstr "Tapahtuma"
 
 #. 5
-#: ../gramps/gui/clipboard.py:367 ../gramps/gui/configure.py:535
+#: ../gramps/gui/clipboard.py:367 ../gramps/gui/configure.py:536
 #: ../gramps/gui/editors/displaytabs/eventembedlist.py:81
 #: ../gramps/gui/editors/displaytabs/familyldsembedlist.py:55
 #: ../gramps/gui/editors/displaytabs/ldsembedlist.py:65
@@ -9989,10 +10035,9 @@ msgstr "Tapahtuma"
 #: ../gramps/plugins/textreport/indivcomplete.py:659
 #: ../gramps/plugins/tool/sortevents.py:58
 #: ../gramps/plugins/view/eventview.py:86
-#: ../gramps/plugins/webreport/narrativeweb.py:342
-#: ../gramps/plugins/webreport/narrativeweb.py:997
-#: ../gramps/plugins/webreport/narrativeweb.py:1284
-#: ../gramps/plugins/webreport/narrativeweb.py:1314
+#: ../gramps/plugins/webreport/narrativeweb.py:991
+#: ../gramps/plugins/webreport/narrativeweb.py:1279
+#: ../gramps/plugins/webreport/narrativeweb.py:1309
 msgid "Place"
 msgstr "Paikka"
 
@@ -10062,7 +10107,7 @@ msgstr "%(frel)s %(mrel)s"
 #.
 #. ------------------------------------------------------------------------
 #. functions for the actual quickreports
-#: ../gramps/gui/clipboard.py:743 ../gramps/gui/configure.py:531
+#: ../gramps/gui/clipboard.py:743 ../gramps/gui/configure.py:532
 #: ../gramps/gui/editors/editlink.py:94
 #: ../gramps/gui/editors/filtereditor.py:293
 #: ../gramps/gui/glade/editpersonref.glade:211
@@ -10089,15 +10134,14 @@ msgstr "%(frel)s %(mrel)s"
 #: ../gramps/plugins/textreport/placereport.py:297
 #: ../gramps/plugins/textreport/placereport.py:457
 #: ../gramps/plugins/tool/eventcmp.py:251
-#: ../gramps/plugins/webreport/narrativeweb.py:343
-#: ../gramps/plugins/webreport/narrativeweb.py:3471
-#: ../gramps/plugins/webreport/narrativeweb.py:4136
-#: ../gramps/plugins/webreport/narrativeweb.py:6964
+#: ../gramps/plugins/webreport/narrativeweb.py:3508
+#: ../gramps/plugins/webreport/narrativeweb.py:4197
+#: ../gramps/plugins/webreport/narrativeweb.py:7060
 msgid "Person"
 msgstr "Henkilö"
 
 #. 7
-#: ../gramps/gui/clipboard.py:800 ../gramps/gui/configure.py:537
+#: ../gramps/gui/clipboard.py:800 ../gramps/gui/configure.py:538
 #: ../gramps/gui/editors/displaytabs/nameembedlist.py:78
 #: ../gramps/gui/editors/editlink.py:97 ../gramps/gui/editors/editsource.py:86
 #: ../gramps/gui/editors/filtereditor.py:297
@@ -10116,7 +10160,7 @@ msgid "Source"
 msgstr "Lähde"
 
 #. 6
-#: ../gramps/gui/clipboard.py:827 ../gramps/gui/configure.py:545
+#: ../gramps/gui/clipboard.py:827 ../gramps/gui/configure.py:546
 #: ../gramps/gui/editors/editlink.py:96
 #: ../gramps/gui/editors/editrepository.py:77
 #: ../gramps/gui/editors/editrepository.py:79
@@ -10133,9 +10177,8 @@ msgstr "Arkisto"
 #: ../gramps/plugins/gramplet/attributes.py:57
 #: ../gramps/plugins/lib/libmetadata.py:171
 #: ../gramps/plugins/tool/patchnames.py:406
-#: ../gramps/plugins/webreport/narrativeweb.py:352
-#: ../gramps/plugins/webreport/narrativeweb.py:1375
-#: ../gramps/plugins/webreport/narrativeweb.py:1632
+#: ../gramps/plugins/webreport/narrativeweb.py:1372
+#: ../gramps/plugins/webreport/narrativeweb.py:1633
 msgid "Value"
 msgstr "Arvo"
 
@@ -10170,16 +10213,16 @@ msgstr "Puunäkymä: ensimmäistä saraketta \"%s\" ei voi vaihtaa"
 msgid "Drag and drop the columns to change the order"
 msgstr "Raahaa ja pudota sarakkeita järjestyksen muuttamiseksi"
 
-#: ../gramps/gui/columnorder.py:107 ../gramps/gui/configure.py:1499
-#: ../gramps/gui/configure.py:1522 ../gramps/gui/plug/_dialogs.py:124
+#: ../gramps/gui/columnorder.py:107 ../gramps/gui/configure.py:1507
+#: ../gramps/gui/configure.py:1530 ../gramps/gui/plug/_dialogs.py:124
 #: ../gramps/gui/viewmanager.py:1417
-#: ../gramps/plugins/lib/maps/geography.py:978
-#: ../gramps/plugins/lib/maps/geography.py:1232
+#: ../gramps/plugins/lib/maps/geography.py:986
+#: ../gramps/plugins/lib/maps/geography.py:1240
 msgid "_Apply"
 msgstr "_Käytä"
 
 #. #################
-#: ../gramps/gui/columnorder.py:128 ../gramps/gui/configure.py:1106
+#: ../gramps/gui/columnorder.py:128 ../gramps/gui/configure.py:1107
 #: ../gramps/plugins/drawreport/ancestortree.py:855
 #: ../gramps/plugins/drawreport/descendtree.py:1563
 msgid "Display"
@@ -10189,24 +10232,24 @@ msgstr "Näyttö"
 msgid "Column Name"
 msgstr "Sarakkeen nimi"
 
-#: ../gramps/gui/configure.py:78
+#: ../gramps/gui/configure.py:79
 msgid "Father's surname"
 msgstr "Isän sukunimi"
 
-#: ../gramps/gui/configure.py:80
+#: ../gramps/gui/configure.py:81
 msgid "Combination of mother's and father's surname"
 msgstr "Yhdistelmä isän ja äidin sukunimistä"
 
-#: ../gramps/gui/configure.py:81
+#: ../gramps/gui/configure.py:82
 msgid "Icelandic style"
 msgstr "Islantilaisittain"
 
-#: ../gramps/gui/configure.py:103 ../gramps/gui/configure.py:105
+#: ../gramps/gui/configure.py:104 ../gramps/gui/configure.py:106
 msgid "Display Name Editor"
 msgstr "Näytä nimimuokkain"
 
 #. self.window.connect('response', self.close)
-#: ../gramps/gui/configure.py:104 ../gramps/gui/configure.py:178
+#: ../gramps/gui/configure.py:105 ../gramps/gui/configure.py:179
 #: ../gramps/gui/glade/book.glade:469 ../gramps/gui/glade/book.glade:543
 #: ../gramps/gui/glade/clipboard.glade:73 ../gramps/gui/glade/dialog.glade:20
 #: ../gramps/gui/glade/dialog.glade:140
@@ -10225,7 +10268,7 @@ msgstr "Näytä nimimuokkain"
 msgid "_Close"
 msgstr "_Sulje"
 
-#: ../gramps/gui/configure.py:107
+#: ../gramps/gui/configure.py:108
 msgid ""
 "The following keywords are replaced with the appropriate name parts:<tt>\n"
 "  <b>Given</b>   - given name (first name)     <b>Surname</b>  - surnames "
@@ -10286,22 +10329,22 @@ msgstr ""
 "     <i>Dr.</i>: Titteli, <i>Sr</i>: Loppuliite, <i>Ed</i>: Lempinimi, "
 "<i>Underhills</i>: Perhelempinimi, <i>Jose</i>: Kutsumanimi.\n"
 
-#: ../gramps/gui/configure.py:136
+#: ../gramps/gui/configure.py:137
 msgid " Name Editor"
 msgstr " Nimimuokkain"
 
-#: ../gramps/gui/configure.py:154 ../gramps/gui/configure.py:1577
+#: ../gramps/gui/configure.py:155 ../gramps/gui/configure.py:1585
 #: ../gramps/gui/views/pageview.py:574
 msgid "Preferences"
 msgstr "Asetukset"
 
 #. parent-OK
-#: ../gramps/gui/configure.py:230 ../gramps/gui/configure.py:236
-#: ../gramps/gui/configure.py:801
+#: ../gramps/gui/configure.py:231 ../gramps/gui/configure.py:237
+#: ../gramps/gui/configure.py:802
 msgid "Invalid or incomplete format definition."
 msgstr "Viallinen tai puutteellinen muotoilumääritelmä"
 
-#: ../gramps/gui/configure.py:510
+#: ../gramps/gui/configure.py:511
 msgid ""
 "Enter your information so people can contact you when you distribute your "
 "Family Tree"
@@ -10309,73 +10352,75 @@ msgstr ""
 "Anna yhteystietosi sen varalta, että muut haluavat ottaa yhteyttä sinuun "
 "sukupuusi vuoksi"
 
-#: ../gramps/gui/configure.py:516
+#: ../gramps/gui/configure.py:517
 #: ../gramps/gui/editors/displaytabs/addrembedlist.py:75
 #: ../gramps/plugins/view/repoview.py:92
 msgid "State/County"
 msgstr "Lääni tai Osavaltio"
 
-#: ../gramps/gui/configure.py:518 ../gramps/plugins/view/repoview.py:94
+#: ../gramps/gui/configure.py:519 ../gramps/plugins/view/repoview.py:94
 msgid "ZIP/Postal Code"
 msgstr "Postinumero"
 
-#: ../gramps/gui/configure.py:519
+#: ../gramps/gui/configure.py:520
 #: ../gramps/plugins/gramplet/repositorydetails.py:121
-#: ../gramps/plugins/webreport/narrativeweb.py:344
+#: ../gramps/plugins/lib/libgedcom.py:3948
+#: ../gramps/plugins/lib/libgedcom.py:5700
+#: ../gramps/plugins/webreport/narrativeweb.py:1482
 msgid "Phone"
 msgstr "Puhelin"
 
-#: ../gramps/gui/configure.py:520 ../gramps/gui/plug/_windows.py:615
+#: ../gramps/gui/configure.py:521 ../gramps/gui/plug/_windows.py:615
 #: ../gramps/plugins/view/repoview.py:95
 msgid "Email"
 msgstr "Sähköposti"
 
-#: ../gramps/gui/configure.py:521
+#: ../gramps/gui/configure.py:522
 msgid "Researcher"
 msgstr "Tutkija"
 
-#: ../gramps/gui/configure.py:541 ../gramps/gui/editors/editperson.py:647
+#: ../gramps/gui/configure.py:542 ../gramps/gui/editors/editperson.py:647
 #: ../gramps/gui/widgets/photo.py:86
 msgid "Media Object"
 msgstr "Mediatiedosto"
 
-#: ../gramps/gui/configure.py:549
+#: ../gramps/gui/configure.py:550
 msgid "ID Formats"
 msgstr "ID muodot"
 
-#: ../gramps/gui/configure.py:559
+#: ../gramps/gui/configure.py:560
 msgid "Set the colors used for boxes in the graphical views"
 msgstr "Aseta graafisissa näkymissä käytettävät laatikoiden värit"
 
-#: ../gramps/gui/configure.py:561
+#: ../gramps/gui/configure.py:562
 msgid "Gender Male Alive"
 msgstr "Elävä mies"
 
-#: ../gramps/gui/configure.py:563
+#: ../gramps/gui/configure.py:564
 msgid "Border Male Alive"
 msgstr "Elävän miehen reunaviiva"
 
-#: ../gramps/gui/configure.py:565
+#: ../gramps/gui/configure.py:566
 msgid "Gender Male Death"
 msgstr "Kuollut mies"
 
-#: ../gramps/gui/configure.py:567
+#: ../gramps/gui/configure.py:568
 msgid "Border Male Death"
 msgstr "Kuolleen miehen reunaviiva"
 
-#: ../gramps/gui/configure.py:569
+#: ../gramps/gui/configure.py:570
 msgid "Gender Female Alive"
 msgstr "Elävä nainen"
 
-#: ../gramps/gui/configure.py:571
+#: ../gramps/gui/configure.py:572
 msgid "Border Female Alive"
 msgstr "Elävän naisen reunaviiva"
 
-#: ../gramps/gui/configure.py:573
+#: ../gramps/gui/configure.py:574
 msgid "Gender Female Death"
 msgstr "Kuollut nainen"
 
-#: ../gramps/gui/configure.py:575
+#: ../gramps/gui/configure.py:576
 msgid "Border Female Death"
 msgstr "Kuolleen naisen reunaviiva"
 
@@ -10387,78 +10432,78 @@ msgstr "Kuolleen naisen reunaviiva"
 #. #                        'preferences.color-gender-other-death')
 #. #        self.add_color(grid, _('Border Other Death'), 8,
 #. #                        'preferences.bordercolor-gender-other-death')
-#: ../gramps/gui/configure.py:585
+#: ../gramps/gui/configure.py:586
 msgid "Gender Unknown Alive"
 msgstr "Elossa sukupuoli tuntematon"
 
-#: ../gramps/gui/configure.py:587
+#: ../gramps/gui/configure.py:588
 msgid "Border Unknown Alive"
 msgstr "Sukup. tuntem. elossa reunaviiva"
 
-#: ../gramps/gui/configure.py:589
+#: ../gramps/gui/configure.py:590
 msgid "Gender Unknown Death"
 msgstr "Sukupuoli tuntematon kuollut"
 
-#: ../gramps/gui/configure.py:591
+#: ../gramps/gui/configure.py:592
 msgid "Border Unknown Death"
 msgstr "Sukup. tuntem. kuollut reunaviiva"
 
-#: ../gramps/gui/configure.py:593
+#: ../gramps/gui/configure.py:594
 msgid "Colors"
 msgstr "Värit"
 
-#: ../gramps/gui/configure.py:601
+#: ../gramps/gui/configure.py:602
 msgid "Suppress warning when adding parents to a child."
 msgstr "Älä näytä varoitusta lisättäessä vanhempia lapselle"
 
-#: ../gramps/gui/configure.py:605
+#: ../gramps/gui/configure.py:606
 msgid "Suppress warning when canceling with changed data."
 msgstr "Älä näytä varoitusta perumisesta kun tietoja on muutettu"
 
-#: ../gramps/gui/configure.py:609
+#: ../gramps/gui/configure.py:610
 msgid "Suppress warning about missing researcher when exporting to GEDCOM."
 msgstr ""
 "Älä näytä varoitusta puuttuvista tutkijan tiedoista GEDCOMiin vietäessä"
 
-#: ../gramps/gui/configure.py:614
+#: ../gramps/gui/configure.py:615
 msgid "Show plugin status dialog on plugin load error."
 msgstr "Näytä laajennusten tila kun laajennusten lataaminen epäonnistuu"
 
-#: ../gramps/gui/configure.py:617
+#: ../gramps/gui/configure.py:618
 msgid "Warnings"
 msgstr "Varoitukset"
 
-#: ../gramps/gui/configure.py:643 ../gramps/gui/configure.py:657
+#: ../gramps/gui/configure.py:644 ../gramps/gui/configure.py:658
 msgid "Common"
 msgstr "Yleisnimi"
 
-#: ../gramps/gui/configure.py:650 ../gramps/plugins/export/exportcsv.py:354
+#: ../gramps/gui/configure.py:651 ../gramps/plugins/export/exportcsv.py:354
 #: ../gramps/plugins/importer/importcsv.py:163
 msgid "Call"
 msgstr "Kutsumanimi"
 
-#: ../gramps/gui/configure.py:655
+#: ../gramps/gui/configure.py:656
 msgid "NotPatronymic"
 msgstr "Eipatronyymi"
 
-#: ../gramps/gui/configure.py:732
+#: ../gramps/gui/configure.py:733
 msgid "Enter to save, Esc to cancel editing"
 msgstr "Enter tallettaa ja Esc peruuttaa päivityksen"
 
-#: ../gramps/gui/configure.py:779
+#: ../gramps/gui/configure.py:780
 msgid "This format exists already."
 msgstr "Muotoilu on jo olemassa"
 
-#: ../gramps/gui/configure.py:818
+#: ../gramps/gui/configure.py:819
 msgid "Format"
 msgstr "Muotoilu"
 
-#: ../gramps/gui/configure.py:828
+#: ../gramps/gui/configure.py:829
 msgid "Example"
 msgstr "Esimerkki"
 
 #. show an add button
-#: ../gramps/gui/configure.py:848
+#: ../gramps/gui/configure.py:849
 #: ../gramps/gui/editors/displaytabs/embeddedlist.py:151
 #: ../gramps/gui/editors/displaytabs/embeddedlist.py:158
 #: ../gramps/gui/editors/displaytabs/eventembedlist.py:314
@@ -10468,11 +10513,11 @@ msgstr "Esimerkki"
 #: ../gramps/gui/editors/editfamily.py:149
 #: ../gramps/gui/plug/report/_bookdialog.py:652
 #: ../gramps/gui/views/tags.py:416 ../gramps/gui/widgets/fanchart.py:1777
-#: ../gramps/plugins/view/pedigreeview.py:1603
+#: ../gramps/plugins/view/pedigreeview.py:1615
 msgid "_Add"
 msgstr "_Lisää..."
 
-#: ../gramps/gui/configure.py:851
+#: ../gramps/gui/configure.py:852
 #: ../gramps/gui/editors/displaytabs/embeddedlist.py:153
 #: ../gramps/gui/editors/displaytabs/embeddedlist.py:159
 #: ../gramps/gui/editors/displaytabs/eventembedlist.py:315
@@ -10481,12 +10526,12 @@ msgstr "_Lisää..."
 #: ../gramps/gui/editors/displaytabs/webembedlist.py:116
 #: ../gramps/gui/glade/editlink.glade:223 ../gramps/gui/viewmanager.py:478
 #: ../gramps/gui/views/tags.py:417 ../gramps/gui/widgets/fanchart.py:1578
-#: ../gramps/plugins/view/pedigreeview.py:1644
-#: ../gramps/plugins/view/pedigreeview.py:1892
+#: ../gramps/plugins/view/pedigreeview.py:1656
+#: ../gramps/plugins/view/pedigreeview.py:1904
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: ../gramps/gui/configure.py:855
+#: ../gramps/gui/configure.py:856
 #: ../gramps/gui/editors/displaytabs/embeddedlist.py:154
 #: ../gramps/gui/editors/displaytabs/embeddedlist.py:160
 #: ../gramps/gui/editors/displaytabs/nameembedlist.py:124
@@ -10498,7 +10543,7 @@ msgstr "_Muokkaa"
 msgid "_Remove"
 msgstr "_Poista"
 
-#: ../gramps/gui/configure.py:980
+#: ../gramps/gui/configure.py:981
 #: ../gramps/gui/editors/displaytabs/buttontab.py:70
 #: ../gramps/gui/glade/editfamily.glade:286
 #: ../gramps/gui/glade/editfamily.glade:594
@@ -10511,149 +10556,149 @@ msgstr "_Poista"
 msgid "Edit"
 msgstr "Muokkaa"
 
-#: ../gramps/gui/configure.py:990
+#: ../gramps/gui/configure.py:991
 msgid "Consider single pa/matronymic as surname"
 msgstr ""
 "Harkitse sukunimeksi isäpuoleista patronyymiä tai äidinpuolesta matronyymiä"
 
-#: ../gramps/gui/configure.py:1004
+#: ../gramps/gui/configure.py:1005
 msgid "Date format"
 msgstr "Päivämäärän muoto"
 
-#: ../gramps/gui/configure.py:1012
+#: ../gramps/gui/configure.py:1013
 msgid "Years"
 msgstr "Vuodet"
 
-#: ../gramps/gui/configure.py:1013
+#: ../gramps/gui/configure.py:1014
 msgid "Years, Months"
 msgstr "Vuodet, Kuukaudet"
 
-#: ../gramps/gui/configure.py:1014
+#: ../gramps/gui/configure.py:1015
 msgid "Years, Months, Days"
 msgstr "Vuodet, Kuukaudet, Päivät"
 
-#: ../gramps/gui/configure.py:1026
+#: ../gramps/gui/configure.py:1027
 msgid "Age display precision (requires restart)"
 msgstr "Ikänäytön tarkkuus (tulee voimaan uudelleen käynnistettäessä)"
 
-#: ../gramps/gui/configure.py:1039
+#: ../gramps/gui/configure.py:1040
 msgid "Calendar on reports"
 msgstr "Kalenteriraportti"
 
-#: ../gramps/gui/configure.py:1052
+#: ../gramps/gui/configure.py:1053
 msgid "Surname guessing"
 msgstr "Sukunimen arvaus"
 
-#: ../gramps/gui/configure.py:1065
+#: ../gramps/gui/configure.py:1066
 msgid "Default family relationship"
 msgstr "Oletusarvoinen perhesuhde"
 
-#: ../gramps/gui/configure.py:1072
+#: ../gramps/gui/configure.py:1073
 msgid "Height multiple surname box (pixels)"
 msgstr "Monen sukunimen laatikon korkeus (pikseleinä)"
 
-#: ../gramps/gui/configure.py:1079
+#: ../gramps/gui/configure.py:1080
 msgid "Active person's name and ID"
 msgstr "Aktiivisen henkilön nimi ja ID"
 
-#: ../gramps/gui/configure.py:1080
+#: ../gramps/gui/configure.py:1081
 msgid "Relationship to home person"
 msgstr "Suhde kotihenkilöön (koettiin)"
 
-#: ../gramps/gui/configure.py:1089
+#: ../gramps/gui/configure.py:1090
 msgid "Status bar"
 msgstr "Tilapalkki"
 
-#: ../gramps/gui/configure.py:1096
+#: ../gramps/gui/configure.py:1097
 msgid "Show text label beside Navigator buttons (requires restart)"
 msgstr ""
 "Näytä teksti sivupalkin painikkeissa (tulee voimaan uudelleen "
 "käynnistettäessä)"
 
-#: ../gramps/gui/configure.py:1102
+#: ../gramps/gui/configure.py:1103
 msgid "Show close button in gramplet bar tabs"
 msgstr "Näytä suljepainike gramplet-palkin kielekkäänä"
 
-#: ../gramps/gui/configure.py:1115
+#: ../gramps/gui/configure.py:1116
 msgid "Enable automatic place title generation"
 msgstr "Muodosta paikan nimike automaattisesti"
 
-#: ../gramps/gui/configure.py:1127
+#: ../gramps/gui/configure.py:1128
 msgid "Suppress comma after house number"
 msgstr "Jätä pilkku pois talonnumeron jälkeen"
 
-#: ../gramps/gui/configure.py:1132
+#: ../gramps/gui/configure.py:1133
 msgid "Reverse display order"
 msgstr "Käännä näyttöjärjestys"
 
-#: ../gramps/gui/configure.py:1139
+#: ../gramps/gui/configure.py:1140
 msgid "Full place name"
 msgstr "Paikan nimi kokonaan"
 
 # muutettu20160529
-#: ../gramps/gui/configure.py:1140
+#: ../gramps/gui/configure.py:1141
 msgid "-> Hamlet/Village/Town/City"
 msgstr "-> Taloryhmä tai osakylä/Kylä/Kaupunki/Paikkakunta"
 
 # muutettu20160529
-#: ../gramps/gui/configure.py:1141
+#: ../gramps/gui/configure.py:1142
 msgid "Hamlet/Village/Town/City ->"
 msgstr "Taloryhmä tai osakylä/Kylä/Kaupunki/Paikkakunta ->"
 
-#: ../gramps/gui/configure.py:1146
+#: ../gramps/gui/configure.py:1147
 msgid "Restrict"
 msgstr "Rajoita"
 
-#: ../gramps/gui/configure.py:1152
+#: ../gramps/gui/configure.py:1153
 #: ../gramps/gui/editors/displaytabs/placenameembedlist.py:65
 msgid "Language"
 msgstr "Kieli"
 
-#: ../gramps/gui/configure.py:1159
+#: ../gramps/gui/configure.py:1160
 #: ../gramps/plugins/quickview/filterbyname.py:100
 #: ../gramps/plugins/quickview/filterbyname.py:125
 #: ../gramps/plugins/textreport/tagreport.py:403
 #: ../gramps/plugins/view/view.gpr.py:204
 #: ../gramps/plugins/view/view.gpr.py:212
 #: ../gramps/plugins/view/view.gpr.py:227
-#: ../gramps/plugins/webreport/narrativeweb.py:1862
-#: ../gramps/plugins/webreport/narrativeweb.py:1923
-#: ../gramps/plugins/webreport/narrativeweb.py:1981
-#: ../gramps/plugins/webreport/narrativeweb.py:3746
-#: ../gramps/plugins/webreport/narrativeweb.py:3896
+#: ../gramps/plugins/webreport/narrativeweb.py:1877
+#: ../gramps/plugins/webreport/narrativeweb.py:1940
+#: ../gramps/plugins/webreport/narrativeweb.py:2006
+#: ../gramps/plugins/webreport/narrativeweb.py:3787
+#: ../gramps/plugins/webreport/narrativeweb.py:3940
 msgid "Places"
 msgstr "Paikat"
 
-#: ../gramps/gui/configure.py:1175
+#: ../gramps/gui/configure.py:1176
 msgid "Missing surname"
 msgstr "Puuttuva sukunimi"
 
-#: ../gramps/gui/configure.py:1178
+#: ../gramps/gui/configure.py:1179
 msgid "Missing given name"
 msgstr "Puuttuva etunimi"
 
-#: ../gramps/gui/configure.py:1181
+#: ../gramps/gui/configure.py:1182
 msgid "Missing record"
 msgstr "Puuttuva tieto"
 
-#: ../gramps/gui/configure.py:1184
+#: ../gramps/gui/configure.py:1185
 msgid "Private surname"
 msgstr "Yksityinen sukunimi"
 
-#: ../gramps/gui/configure.py:1188
+#: ../gramps/gui/configure.py:1189
 msgid "Private given name"
 msgstr "Yksityinen etunimi"
 
-#: ../gramps/gui/configure.py:1192
+#: ../gramps/gui/configure.py:1193
 msgid "Private record"
 msgstr "Yksityinen tieto"
 
-#: ../gramps/gui/configure.py:1232
+#: ../gramps/gui/configure.py:1233
 msgid "Change is not immediate"
 msgstr "Muutos ei tapahdu välittömästi"
 
 #. parent-OK
-#: ../gramps/gui/configure.py:1233
+#: ../gramps/gui/configure.py:1234
 msgid ""
 "Changing the date format will not take effect until the next time Gramps is "
 "started."
@@ -10661,39 +10706,39 @@ msgstr ""
 "Päivämäärän muodon muutos tulee voimaan vasta kun Gramps on uudelleen "
 "käynnistetty."
 
-#: ../gramps/gui/configure.py:1247
+#: ../gramps/gui/configure.py:1248
 msgid "Date about range"
 msgstr "Noin aikaväli"
 
-#: ../gramps/gui/configure.py:1250
+#: ../gramps/gui/configure.py:1251
 msgid "Date after range"
 msgstr "Aikaväli jälkeen"
 
-#: ../gramps/gui/configure.py:1253
+#: ../gramps/gui/configure.py:1254
 msgid "Date before range"
 msgstr "Aikaväli ennen"
 
-#: ../gramps/gui/configure.py:1256
+#: ../gramps/gui/configure.py:1257
 msgid "Maximum age probably alive"
 msgstr "Korkein todennäköinen elinikä"
 
-#: ../gramps/gui/configure.py:1259
+#: ../gramps/gui/configure.py:1260
 msgid "Maximum sibling age difference"
 msgstr "Suurin mahdollinen sisarusten ikäero"
 
-#: ../gramps/gui/configure.py:1262
+#: ../gramps/gui/configure.py:1263
 msgid "Minimum years between generations"
 msgstr "Pienin mahdollinen vuosimäärä sukupolvien välillä"
 
-#: ../gramps/gui/configure.py:1265
+#: ../gramps/gui/configure.py:1266
 msgid "Average years between generations"
 msgstr "Keskimääräinen vuosimäärä sukupolvien välillä"
 
-#: ../gramps/gui/configure.py:1268
+#: ../gramps/gui/configure.py:1269
 msgid "Markup for invalid date format"
 msgstr "Merkintä virheelliselle päivämäärämuodolle"
 
-#: ../gramps/gui/configure.py:1271
+#: ../gramps/gui/configure.py:1272
 #, python-format
 msgid ""
 "Convenience markups are:\n"
@@ -10724,23 +10769,30 @@ msgstr ""
 "Esimerkiksi: &lt;u&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/u&gt;\n"
 "näyttää <u><b>alleviivatun lihavoidun päiväyksen</b></u>.\n"
 
-#: ../gramps/gui/configure.py:1285
+#: ../gramps/gui/configure.py:1286
 msgid "Dates"
 msgstr "Päivämäärät"
 
-#: ../gramps/gui/configure.py:1295
+# 20160901uusi
+#: ../gramps/gui/configure.py:1297
+msgid "Use alternate Font handler for GUI and Reports (requires restart)"
+msgstr ""
+"Käytä vaihtoehtoista fontin käsittelijää GUI:ssa ja raporteissa (vaatii "
+"uudelleenkäynnistyksen)"
+
+#: ../gramps/gui/configure.py:1303
 msgid "Add default source on GEDCOM import"
 msgstr "Lisää oletuslähde GEDCOM-tuonnissa"
 
-#: ../gramps/gui/configure.py:1299
+#: ../gramps/gui/configure.py:1307
 msgid "Add tag on import"
 msgstr "Lisää oletuslähde tuonnissa"
 
-#: ../gramps/gui/configure.py:1310
+#: ../gramps/gui/configure.py:1318
 msgid "Enable spelling checker"
 msgstr "Aktivoi oikoluku"
 
-#: ../gramps/gui/configure.py:1319
+#: ../gramps/gui/configure.py:1327
 #, python-format
 msgid ""
 "GtkSpell not loaded. Spell checking will not be available.\n"
@@ -10749,120 +10801,120 @@ msgstr ""
 "GtkSpell ohjelma asentamatta. Oikeellisuustarkistukset eivät toimi.\n"
 "Katso miten saat sen mukaan Grampsiin %(gramps_wiki_build_spell_url)s"
 
-#: ../gramps/gui/configure.py:1326
+#: ../gramps/gui/configure.py:1334
 msgid "Display Tip of the Day"
 msgstr "Näytä päivän vihje"
 
-#: ../gramps/gui/configure.py:1331
+#: ../gramps/gui/configure.py:1339
 msgid "Remember last view displayed"
 msgstr "Muista viimeisin näytetty näkymä"
 
-#: ../gramps/gui/configure.py:1336
+#: ../gramps/gui/configure.py:1344
 msgid "Max generations for relationships"
 msgstr "Suurin sukupolvimäärä sukulaisuussuhteelle"
 
-#: ../gramps/gui/configure.py:1342
+#: ../gramps/gui/configure.py:1350
 msgid "Base path for relative media paths"
 msgstr "Peruspolku suhteellisille mediatiedostojen poluille"
 
-#: ../gramps/gui/configure.py:1350
+#: ../gramps/gui/configure.py:1358
 msgid "Once a month"
 msgstr "Kuukausittain"
 
-#: ../gramps/gui/configure.py:1351
+#: ../gramps/gui/configure.py:1359
 msgid "Once a week"
 msgstr "Viikoittain"
 
-#: ../gramps/gui/configure.py:1352
+#: ../gramps/gui/configure.py:1360
 msgid "Once a day"
 msgstr "Päivittäin"
 
-#: ../gramps/gui/configure.py:1353
+#: ../gramps/gui/configure.py:1361
 msgid "Always"
 msgstr "Aina"
 
-#: ../gramps/gui/configure.py:1358
+#: ../gramps/gui/configure.py:1366
 msgid "Check for updates"
 msgstr "Etsi päivityksiä"
 
-#: ../gramps/gui/configure.py:1364
+#: ../gramps/gui/configure.py:1372
 msgid "Updated addons only"
 msgstr "Vain päivitetyt laajennukset"
 
-#: ../gramps/gui/configure.py:1365
+#: ../gramps/gui/configure.py:1373
 msgid "New addons only"
 msgstr "Vain uudet laajennukset"
 
-#: ../gramps/gui/configure.py:1366
+#: ../gramps/gui/configure.py:1374
 msgid "New and updated addons"
 msgstr "Uudet ja päivitetyt laajennukset"
 
-#: ../gramps/gui/configure.py:1376
+#: ../gramps/gui/configure.py:1384
 msgid "What to check"
 msgstr "Mitä tarkistetaan"
 
-#: ../gramps/gui/configure.py:1381
+#: ../gramps/gui/configure.py:1389
 msgid "Where to check"
 msgstr "Missä tarkistetaan"
 
-#: ../gramps/gui/configure.py:1385
+#: ../gramps/gui/configure.py:1393
 msgid "Do not ask about previously notified addons"
 msgstr "Älä kysy aikaisemmin ilmoitetuista laajennuksista"
 
-#: ../gramps/gui/configure.py:1390
+#: ../gramps/gui/configure.py:1398
 msgid "Check now"
 msgstr "Tarkista nyt"
 
-#: ../gramps/gui/configure.py:1400
+#: ../gramps/gui/configure.py:1408
 msgid "Checking Addons Failed"
 msgstr "Laajennusten tarkistus epäonnistui"
 
 #. parent-OK
-#: ../gramps/gui/configure.py:1401
+#: ../gramps/gui/configure.py:1409
 msgid "The addon repository appears to be unavailable. Please try again later."
 msgstr "Laajennukset eivät näytä olevan saatavilla. Yritä myöhemmin."
 
 #. parent-OK
-#: ../gramps/gui/configure.py:1411
+#: ../gramps/gui/configure.py:1419
 msgid "There are no available addons of this type"
 msgstr "Tämäntyyppisiä laajennuksia ei ole saatavilla"
 
-#: ../gramps/gui/configure.py:1412
+#: ../gramps/gui/configure.py:1420
 #, python-format
 msgid "Checked for '%s'"
 msgstr "Tarkistettu '%s'"
 
-#: ../gramps/gui/configure.py:1413
+#: ../gramps/gui/configure.py:1421
 msgid "' and '"
 msgstr "' ja '"
 
 #. List of translated strings used here
 #. Dead code for l10n
-#: ../gramps/gui/configure.py:1418
+#: ../gramps/gui/configure.py:1426
 msgid "new"
 msgstr "uusi"
 
-#: ../gramps/gui/configure.py:1418
+#: ../gramps/gui/configure.py:1426
 msgid "update"
 msgstr "päivitä"
 
-#: ../gramps/gui/configure.py:1437
+#: ../gramps/gui/configure.py:1445
 msgid "Database backend"
 msgstr "Tietokannan taustaosa"
 
-#: ../gramps/gui/configure.py:1445
+#: ../gramps/gui/configure.py:1453
 msgid "Family Tree Database path"
 msgstr "Sukukannan tietokantapolku"
 
-#: ../gramps/gui/configure.py:1454
+#: ../gramps/gui/configure.py:1462
 msgid "Automatically load last Family Tree"
 msgstr "Lataa automaattisesti viimeisin sukupuu"
 
-#: ../gramps/gui/configure.py:1494
+#: ../gramps/gui/configure.py:1502
 msgid "Select media directory"
 msgstr "Valitse mediatiedostojen hakemisto"
 
-#: ../gramps/gui/configure.py:1497 ../gramps/gui/configure.py:1520
+#: ../gramps/gui/configure.py:1505 ../gramps/gui/configure.py:1528
 #: ../gramps/gui/dbloader.py:145 ../gramps/gui/editors/edittaglist.py:117
 #: ../gramps/gui/glade/addmedia.glade:24
 #: ../gramps/gui/glade/baseselector.glade:24
@@ -10914,15 +10966,15 @@ msgstr "Valitse mediatiedostojen hakemisto"
 #: ../gramps/gui/viewmanager.py:1415 ../gramps/gui/views/listview.py:1010
 #: ../gramps/gui/views/navigationview.py:362 ../gramps/gui/views/tags.py:635
 #: ../gramps/gui/widgets/progressdialog.py:437
-#: ../gramps/plugins/lib/maps/geography.py:977
-#: ../gramps/plugins/lib/maps/geography.py:1230
+#: ../gramps/plugins/lib/maps/geography.py:985
+#: ../gramps/plugins/lib/maps/geography.py:1238
 #: ../gramps/plugins/tool/check.py:694 ../gramps/plugins/tool/eventcmp.py:396
 #: ../gramps/plugins/tool/populatesources.py:90
 #: ../gramps/plugins/tool/testcasegenerator.py:296
 msgid "_Cancel"
 msgstr "_Peru"
 
-#: ../gramps/gui/configure.py:1517
+#: ../gramps/gui/configure.py:1525
 msgid "Select database directory"
 msgstr "Valitse tietokannan hakemisto"
 
@@ -11147,8 +11199,7 @@ msgstr "Sukupuun nimi"
 #: ../gramps/plugins/textreport/indivcomplete.py:459
 #: ../gramps/plugins/textreport/indivcomplete.py:657
 #: ../gramps/plugins/textreport/notelinkreport.py:95
-#: ../gramps/plugins/webreport/narrativeweb.py:347
-#: ../gramps/plugins/webreport/narrativeweb.py:1315
+#: ../gramps/plugins/webreport/narrativeweb.py:1310
 msgid "Status"
 msgstr "Tila"
 
@@ -11263,7 +11314,6 @@ msgstr ""
 msgid "Convert the '%s' database?"
 msgstr "Muunnetaanko '%s' tietokanta?"
 
-# uusi20160501
 #: ../gramps/gui/dbman.py:762
 msgid "You wish to convert this database into the new DB-API format?"
 msgstr "Haluatko muuntaa tämän tietokannan uuteen DB-API-muotoon?"
@@ -11291,7 +11341,6 @@ msgstr "Tietokannan muuntaminen epäonnistui. Ehkä se on päivitettävä."
 msgid "Converting the '%s' database"
 msgstr "Muunnetaa '%s' tietokanta"
 
-# uusi20160501
 #. parent-OK
 #: ../gramps/gui/dbman.py:786
 msgid "An attempt to export the database failed."
@@ -11302,13 +11351,11 @@ msgstr "Tietokannan vieminen epäonnistui."
 msgid "Converting data..."
 msgstr "Muunnetaan tiedot..."
 
-# uusi20160501
 #: ../gramps/gui/dbman.py:795 ../gramps/gui/dbman.py:798
 #, python-format
 msgid "(Converted #%d)"
 msgstr "(Muunnettu #%d)"
 
-# uusi20160501
 #. parent-OK
 #: ../gramps/gui/dbman.py:811
 msgid "An attempt to import into the database failed."
@@ -11742,13 +11789,13 @@ msgstr "Siirrä valittu lainaus alaspäin"
 #: ../gramps/plugins/gramplet/citations.py:78
 #: ../gramps/plugins/textreport/tagreport.py:745
 #: ../gramps/plugins/view/sourceview.py:84
-#: ../gramps/plugins/webreport/narrativeweb.py:4790
-#: ../gramps/plugins/webreport/narrativeweb.py:4887
+#: ../gramps/plugins/webreport/narrativeweb.py:4859
+#: ../gramps/plugins/webreport/narrativeweb.py:4956
 msgid "Author"
 msgstr "Tekijä"
 
 #: ../gramps/gui/editors/displaytabs/citationembedlist.py:82
-#: ../gramps/plugins/webreport/narrativeweb.py:2564
+#: ../gramps/plugins/webreport/narrativeweb.py:2590
 msgid "Page"
 msgstr "Sivu"
 
@@ -11801,7 +11848,7 @@ msgstr ""
 #: ../gramps/plugins/textreport/tagreport.py:248
 #: ../gramps/plugins/view/familyview.py:80
 #: ../gramps/plugins/view/relview.py:889
-#: ../gramps/plugins/webreport/narrativeweb.py:7332
+#: ../gramps/plugins/webreport/narrativeweb.py:7432
 msgid "Father"
 msgstr "Isä"
 
@@ -11823,7 +11870,7 @@ msgstr "Isä"
 #: ../gramps/plugins/textreport/tagreport.py:254
 #: ../gramps/plugins/view/familyview.py:81
 #: ../gramps/plugins/view/relview.py:890
-#: ../gramps/plugins/webreport/narrativeweb.py:7346
+#: ../gramps/plugins/webreport/narrativeweb.py:7446
 msgid "Mother"
 msgstr "Äiti"
 
@@ -11902,8 +11949,7 @@ msgstr "%(groupname)s - %(groupnumber)d"
 #: ../gramps/gui/editors/displaytabs/ldsembedlist.py:64
 #: ../gramps/plugins/textreport/indivcomplete.py:460
 #: ../gramps/plugins/textreport/indivcomplete.py:658
-#: ../gramps/plugins/webreport/narrativeweb.py:351
-#: ../gramps/plugins/webreport/narrativeweb.py:1313
+#: ../gramps/plugins/webreport/narrativeweb.py:1308
 msgid "Temple"
 msgstr "Temppeli"
 
@@ -12083,7 +12129,7 @@ msgstr "_Lisätiedot"
 
 #. add personal column
 #: ../gramps/gui/editors/displaytabs/personeventembedlist.py:50
-#: ../gramps/plugins/webreport/narrativeweb.py:2026
+#: ../gramps/plugins/webreport/narrativeweb.py:2051
 msgid "Personal"
 msgstr "Henkilökohtainen"
 
@@ -12259,7 +12305,7 @@ msgid "Move the selected surname downwards"
 msgstr "Siirrä valittu sukunimi alaspäin"
 
 #: ../gramps/gui/editors/displaytabs/surnametab.py:77
-#: ../gramps/plugins/lib/libgedcom.py:598
+#: ../gramps/plugins/lib/libgedcom.py:600
 msgid "Origin"
 msgstr "Alkuperä"
 
@@ -12861,7 +12907,7 @@ msgstr "%(mother)s [%(gramps_id)s]"
 #: ../gramps/gui/editors/editldsord.py:438
 #: ../gramps/plugins/textreport/indivcomplete.py:450
 #: ../gramps/plugins/textreport/indivcomplete.py:654
-#: ../gramps/plugins/webreport/narrativeweb.py:792
+#: ../gramps/plugins/webreport/narrativeweb.py:786
 msgid "LDS Ordinance"
 msgstr "Mormonisakramentti"
 
@@ -13240,7 +13286,7 @@ msgid "48.21\"E, -18.2412 or -18:9:48.21)"
 msgstr "48.21\"E, -18.2412 tai -18:9:48.21)"
 
 #: ../gramps/gui/editors/editplace.py:195
-#: ../gramps/plugins/lib/maps/geography.py:891
+#: ../gramps/plugins/lib/maps/geography.py:899
 #: ../gramps/plugins/view/geoplaces.py:357
 #: ../gramps/plugins/view/geoplaces.py:383
 msgid "Edit Place"
@@ -13727,8 +13773,8 @@ msgstr "Kommentti"
 #: ../gramps/plugins/textreport/indivcomplete.py:995
 #: ../gramps/plugins/textreport/recordsreport.py:218
 #: ../gramps/plugins/tool/sortevents.py:166
-#: ../gramps/plugins/webreport/narrativeweb.py:9354
-#: ../gramps/plugins/webreport/webcal.py:1606
+#: ../gramps/plugins/webreport/narrativeweb.py:9637
+#: ../gramps/plugins/webreport/webcal.py:1621
 msgid "Filter"
 msgstr "Suodin"
 
@@ -13901,7 +13947,7 @@ msgstr "Lähde:"
 #: ../gramps/gui/filters/sidebar/_citationsidebarfilter.py:107
 #: ../gramps/gui/filters/sidebar/_sourcesidebarfilter.py:89
 #: ../gramps/plugins/view/sourceview.py:85
-#: ../gramps/plugins/webreport/narrativeweb.py:4888
+#: ../gramps/plugins/webreport/narrativeweb.py:4957
 msgid "Abbreviation"
 msgstr "Lyhennelmä"
 
@@ -13945,7 +13991,7 @@ msgstr "Pääosalliset"
 #: ../gramps/gui/widgets/reorderfam.py:90
 #: ../gramps/plugins/textreport/tagreport.py:260
 #: ../gramps/plugins/view/familyview.py:82
-#: ../gramps/plugins/webreport/narrativeweb.py:6965
+#: ../gramps/plugins/webreport/narrativeweb.py:7061
 msgid "Relationship"
 msgstr "Suhde"
 
@@ -14350,7 +14396,7 @@ msgstr ""
 #: ../gramps/gui/glade/editrepository.glade:205
 #: ../gramps/gui/glade/editsource.glade:288
 #: ../gramps/gui/glade/editurl.glade:150
-#: ../gramps/plugins/webreport/narrativeweb.py:9525
+#: ../gramps/plugins/webreport/narrativeweb.py:9809
 msgid "Privacy"
 msgstr "Yksityisyys"
 
@@ -15175,8 +15221,7 @@ msgid ""
 "The origin of this family name for this family, eg 'Inherited' or "
 "'Patronymic'."
 msgstr ""
-"Tämän perheen sukunimen alkuperä, esim. \"Periytynyt\", \"Patronyymi\", "
-"\"Talonnimi\",\"Sotilasnimi\""
+"Tämän perheen sukunimen alkuperä, esim. \"Periytynyt\" tai \"Patronyymi\"."
 
 #: ../gramps/gui/glade/editperson.glade:586
 msgid "G_ender:"
@@ -16636,12 +16681,12 @@ msgstr "Vaihtoehtoiset nimet"
 #: ../gramps/plugins/textreport/tagreport.py:320
 #: ../gramps/plugins/view/eventview.py:119
 #: ../gramps/plugins/view/view.gpr.py:35 ../gramps/plugins/view/view.gpr.py:43
-#: ../gramps/plugins/webreport/narrativeweb.py:1861
-#: ../gramps/plugins/webreport/narrativeweb.py:1926
-#: ../gramps/plugins/webreport/narrativeweb.py:1980
-#: ../gramps/plugins/webreport/narrativeweb.py:4099
-#: ../gramps/plugins/webreport/narrativeweb.py:4319
-#: ../gramps/plugins/webreport/narrativeweb.py:7248
+#: ../gramps/plugins/webreport/narrativeweb.py:1876
+#: ../gramps/plugins/webreport/narrativeweb.py:1943
+#: ../gramps/plugins/webreport/narrativeweb.py:2005
+#: ../gramps/plugins/webreport/narrativeweb.py:4160
+#: ../gramps/plugins/webreport/narrativeweb.py:4383
+#: ../gramps/plugins/webreport/narrativeweb.py:7348
 msgid "Events"
 msgstr "Tapahtumat"
 
@@ -16651,13 +16696,12 @@ msgstr "Tapahtumat"
 #: ../gramps/gui/widgets/fanchart.py:1742
 #: ../gramps/plugins/quickview/all_relations.py:305
 #: ../gramps/plugins/tool/notrelated.py:126
-#: ../gramps/plugins/view/pedigreeview.py:1787
+#: ../gramps/plugins/view/pedigreeview.py:1799
 #: ../gramps/plugins/view/relview.py:528 ../gramps/plugins/view/relview.py:852
 #: ../gramps/plugins/view/relview.py:888
-#: ../gramps/plugins/webreport/narrativeweb.py:339
-#: ../gramps/plugins/webreport/narrativeweb.py:3231
-#: ../gramps/plugins/webreport/narrativeweb.py:6066
-#: ../gramps/plugins/webreport/narrativeweb.py:7455
+#: ../gramps/plugins/webreport/narrativeweb.py:3265
+#: ../gramps/plugins/webreport/narrativeweb.py:6141
+#: ../gramps/plugins/webreport/narrativeweb.py:7558
 msgid "Parents"
 msgstr "Vanhemmat"
 
@@ -16675,7 +16719,7 @@ msgstr "Vanhempia ei löytynyt"
 #: ../gramps/gui/merge/mergeperson.py:226
 #: ../gramps/gui/widgets/fanchart.py:1626
 #: ../gramps/plugins/textreport/kinshipreport.py:132
-#: ../gramps/plugins/view/pedigreeview.py:1665
+#: ../gramps/plugins/view/pedigreeview.py:1677
 msgid "Spouses"
 msgstr "Puolisot"
 
@@ -17574,8 +17618,8 @@ msgstr "Tyyli"
 #: ../gramps/plugins/textreport/summary.py:287
 #: ../gramps/plugins/textreport/tableofcontents.py:92
 #: ../gramps/plugins/textreport/tagreport.py:894
-#: ../gramps/plugins/webreport/narrativeweb.py:9328
-#: ../gramps/plugins/webreport/webcal.py:1591
+#: ../gramps/plugins/webreport/narrativeweb.py:9611
+#: ../gramps/plugins/webreport/webcal.py:1606
 msgid "Report Options"
 msgstr "Raporttiasetukset"
 
@@ -17903,7 +17947,6 @@ msgstr ""
 "\n"
 "%s"
 
-# uusi/muutettu20150924
 #: ../gramps/gui/undohistory.py:57
 msgid "11"
 msgstr "11"
@@ -18262,6 +18305,7 @@ msgstr "Ota mukaan"
 
 #: ../gramps/gui/viewmanager.py:1358
 #: ../gramps/plugins/gramplet/statsgramplet.py:137
+#: ../gramps/plugins/webreport/narrativeweb.py:8114
 msgid "Megabyte|MB"
 msgstr "Mbyte"
 
@@ -18406,8 +18450,8 @@ msgstr "Aktiivinen kohde ei ole näkyvissä"
 #. parent-OK
 #: ../gramps/gui/views/listview.py:453
 #: ../gramps/gui/views/navigationview.py:256
-#: ../gramps/plugins/lib/maps/geography.py:202
-#: ../gramps/plugins/lib/maps/geography.py:218
+#: ../gramps/plugins/lib/maps/geography.py:203
+#: ../gramps/plugins/lib/maps/geography.py:219
 #: ../gramps/plugins/view/familyview.py:220
 msgid "Could Not Set a Bookmark"
 msgstr "Kirjanmerkin asetus epäonnistui"
@@ -18489,8 +18533,8 @@ msgid "%s has been bookmarked"
 msgstr "%s on kirjanmerkitty"
 
 #: ../gramps/gui/views/navigationview.py:257
-#: ../gramps/plugins/lib/maps/geography.py:203
-#: ../gramps/plugins/lib/maps/geography.py:219
+#: ../gramps/plugins/lib/maps/geography.py:204
+#: ../gramps/plugins/lib/maps/geography.py:220
 #: ../gramps/plugins/view/familyview.py:221
 msgid "A bookmark could not be set because no one was selected."
 msgstr "Kirjanmerkin asetus epäonnistui, koska mitään ei ollut valittuna."
@@ -18517,7 +18561,7 @@ msgid "Go to the previous object in the history"
 msgstr "Siirry edelliseen kohteeseen historiassa"
 
 #: ../gramps/gui/views/navigationview.py:306
-#: ../gramps/plugins/view/pedigreeview.py:1547
+#: ../gramps/plugins/view/pedigreeview.py:1559
 msgid "_Home"
 msgstr "_Koti"
 
@@ -18714,8 +18758,8 @@ msgid "Collapse this section"
 msgstr "Supista tätä osaa"
 
 #: ../gramps/gui/widgets/fanchart.py:1564
-#: ../gramps/plugins/view/pedigreeview.py:1601
-#: ../gramps/plugins/view/pedigreeview.py:1630
+#: ../gramps/plugins/view/pedigreeview.py:1613
+#: ../gramps/plugins/view/pedigreeview.py:1642
 msgid "People Menu"
 msgstr "Henkilöt-valikko"
 
@@ -18730,15 +18774,15 @@ msgid "Reorder families"
 msgstr "Uudelleen järjestä perheet"
 
 #: ../gramps/gui/widgets/fanchart.py:1614
-#: ../gramps/plugins/view/pedigreeview.py:1652
-#: ../gramps/plugins/view/pedigreeview.py:1900
+#: ../gramps/plugins/view/pedigreeview.py:1664
+#: ../gramps/plugins/view/pedigreeview.py:1912
 msgid "_Copy"
 msgstr "_Kopioi"
 
 #. Go over siblings and build their menu
 #: ../gramps/gui/widgets/fanchart.py:1662
 #: ../gramps/plugins/quickview/quickview.gpr.py:316
-#: ../gramps/plugins/view/pedigreeview.py:1702
+#: ../gramps/plugins/view/pedigreeview.py:1714
 #: ../gramps/plugins/view/relview.py:904
 msgid "Siblings"
 msgstr "Sisarukset"
@@ -18749,15 +18793,15 @@ msgstr "Sisarukset"
 #: ../gramps/plugins/gramplet/gramplet.gpr.py:845
 #: ../gramps/plugins/textreport/familygroup.py:638
 #: ../gramps/plugins/textreport/indivcomplete.py:628
-#: ../gramps/plugins/view/pedigreeview.py:1747
+#: ../gramps/plugins/view/pedigreeview.py:1759
 #: ../gramps/plugins/view/relview.py:1412
-#: ../gramps/plugins/webreport/narrativeweb.py:760
+#: ../gramps/plugins/webreport/narrativeweb.py:753
 msgid "Children"
 msgstr "Lapset"
 
 #. Go over parents and build their menu
 #: ../gramps/gui/widgets/fanchart.py:1788
-#: ../gramps/plugins/view/pedigreeview.py:1837
+#: ../gramps/plugins/view/pedigreeview.py:1849
 msgid "Related"
 msgstr "Sukua"
 
@@ -19252,14 +19296,14 @@ msgid "of %d"
 msgstr " %d"
 
 #: ../gramps/plugins/docgen/htmldoc.py:273
-#: ../gramps/plugins/webreport/narrativeweb.py:9244
-#: ../gramps/plugins/webreport/webcal.py:265
+#: ../gramps/plugins/webreport/narrativeweb.py:9526
+#: ../gramps/plugins/webreport/webcal.py:268
 msgid "Possible destination error"
 msgstr "Mahdollinen kohdevirhe"
 
 #: ../gramps/plugins/docgen/htmldoc.py:274
-#: ../gramps/plugins/webreport/narrativeweb.py:9245
-#: ../gramps/plugins/webreport/webcal.py:266
+#: ../gramps/plugins/webreport/narrativeweb.py:9527
+#: ../gramps/plugins/webreport/webcal.py:269
 msgid ""
 "You appear to have set your target directory to a directory used for data "
 "storage. This could create problems with file management. It is recommended "
@@ -19275,12 +19319,10 @@ msgstr ""
 msgid "Could not create jpeg version of image %(name)s"
 msgstr "Kuvan %(name)s jpeg version luonti epäonnistui"
 
-# uusi/muutettu20160611
 #: ../gramps/plugins/docgen/latexdoc.py:1240
 msgid "PIL (Python Imaging Library) not loaded."
 msgstr "PIL (Python Imaging Library) ei ole ladattu."
 
-# uusi/muutettu20160611
 #: ../gramps/plugins/docgen/latexdoc.py:1241
 msgid ""
 "Production of jpg images from non-jpg images in LaTeX documents will not be "
@@ -19796,13 +19838,13 @@ msgstr "Muotoillaan kuukausia..."
 
 #: ../gramps/plugins/drawreport/calendarreport.py:315
 #: ../gramps/plugins/textreport/birthdayreport.py:259
-#: ../gramps/plugins/webreport/webcal.py:1257
+#: ../gramps/plugins/webreport/webcal.py:1269
 msgid "Applying Filter..."
 msgstr "Käytetään suodinta..."
 
 #: ../gramps/plugins/drawreport/calendarreport.py:322
 #: ../gramps/plugins/textreport/birthdayreport.py:269
-#: ../gramps/plugins/webreport/webcal.py:1262
+#: ../gramps/plugins/webreport/webcal.py:1274
 msgid "Reading database..."
 msgstr "Luetaan tietokantaa..."
 
@@ -19847,7 +19889,7 @@ msgstr[1] ""
 " {person}, {nyears}"
 
 #: ../gramps/plugins/drawreport/calendarreport.py:474
-#: ../gramps/plugins/webreport/webcal.py:1608
+#: ../gramps/plugins/webreport/webcal.py:1623
 msgid "Select filter to restrict people that appear on calendar"
 msgstr "Valitse suodin kalenteriin tuleville henkilöille"
 
@@ -19867,18 +19909,18 @@ msgstr "Raportin keskushenkilö"
 
 #: ../gramps/plugins/drawreport/calendarreport.py:490
 #: ../gramps/plugins/textreport/birthdayreport.py:439
-#: ../gramps/plugins/webreport/webcal.py:1637
+#: ../gramps/plugins/webreport/webcal.py:1652
 msgid "Include only living people"
 msgstr "Ota mukaan vain elossa olevat henkilöt"
 
 #: ../gramps/plugins/drawreport/calendarreport.py:491
-#: ../gramps/plugins/webreport/webcal.py:1638
+#: ../gramps/plugins/webreport/webcal.py:1653
 msgid "Include only living people in the calendar"
 msgstr "Ota kalenteriin mukaan vain elossa olevat henkilöt"
 
 #. #########################
 #: ../gramps/plugins/drawreport/calendarreport.py:497
-#: ../gramps/plugins/webreport/webcal.py:1666
+#: ../gramps/plugins/webreport/webcal.py:1682
 msgid "Content Options"
 msgstr "Sisältöasetukset"
 
@@ -19890,7 +19932,7 @@ msgstr "Kalenterivuosi"
 
 #: ../gramps/plugins/drawreport/calendarreport.py:506
 #: ../gramps/plugins/textreport/birthdayreport.py:443
-#: ../gramps/plugins/webreport/webcal.py:1692
+#: ../gramps/plugins/webreport/webcal.py:1708
 msgid "Country for holidays"
 msgstr "Juhlapyhien valtio"
 
@@ -19902,65 +19944,65 @@ msgstr "Valitse valtio nähdäksesi sen juhlapyhät"
 #. Default selection ????
 #: ../gramps/plugins/drawreport/calendarreport.py:520
 #: ../gramps/plugins/textreport/birthdayreport.py:457
-#: ../gramps/plugins/webreport/webcal.py:1708
+#: ../gramps/plugins/webreport/webcal.py:1724
 msgid "First day of week"
 msgstr "Viikon ensimmäinen päivä"
 
 #: ../gramps/plugins/drawreport/calendarreport.py:525
-#: ../gramps/plugins/webreport/webcal.py:1712
+#: ../gramps/plugins/webreport/webcal.py:1727
 msgid "Select the first day of the week for the calendar"
 msgstr "Valitse viikon ensimmäinen päivä kalenteria varten"
 
 #: ../gramps/plugins/drawreport/calendarreport.py:528
 #: ../gramps/plugins/textreport/birthdayreport.py:465
-#: ../gramps/plugins/webreport/webcal.py:1716
+#: ../gramps/plugins/webreport/webcal.py:1731
 msgid "Birthday surname"
 msgstr "Syntymäpäivä sukunimi"
 
 #: ../gramps/plugins/drawreport/calendarreport.py:529
 #: ../gramps/plugins/textreport/birthdayreport.py:466
-#: ../gramps/plugins/webreport/webcal.py:1717
+#: ../gramps/plugins/webreport/webcal.py:1732
 msgid "Wives use husband's surname (from first family listed)"
 msgstr ""
 "Vaimoilla on aviomiehensä sukunimi (ensimmäisestä listatusta perheestä)"
 
 #: ../gramps/plugins/drawreport/calendarreport.py:530
 #: ../gramps/plugins/textreport/birthdayreport.py:467
-#: ../gramps/plugins/webreport/webcal.py:1719
+#: ../gramps/plugins/webreport/webcal.py:1734
 msgid "Wives use husband's surname (from last family listed)"
 msgstr "Vaimoilla on aviomiehensä sukunimi (viimeisestä listatusta perheestä)"
 
 #: ../gramps/plugins/drawreport/calendarreport.py:531
 #: ../gramps/plugins/textreport/birthdayreport.py:468
-#: ../gramps/plugins/webreport/webcal.py:1721
+#: ../gramps/plugins/webreport/webcal.py:1736
 msgid "Wives use their own surname"
 msgstr "Vaimot käyttävät tyttönimeään"
 
 #: ../gramps/plugins/drawreport/calendarreport.py:532
 #: ../gramps/plugins/textreport/birthdayreport.py:469
-#: ../gramps/plugins/webreport/webcal.py:1722
+#: ../gramps/plugins/webreport/webcal.py:1737
 msgid "Select married women's displayed surname"
 msgstr "Valitse näytettävä sukunimi avioituneille naisille"
 
 #: ../gramps/plugins/drawreport/calendarreport.py:535
 #: ../gramps/plugins/textreport/birthdayreport.py:472
-#: ../gramps/plugins/webreport/webcal.py:1732
+#: ../gramps/plugins/webreport/webcal.py:1747
 msgid "Include birthdays"
 msgstr "Ota mukaan syntymäpäivät"
 
 #: ../gramps/plugins/drawreport/calendarreport.py:536
-#: ../gramps/plugins/webreport/webcal.py:1733
+#: ../gramps/plugins/webreport/webcal.py:1748
 msgid "Include birthdays in the calendar"
 msgstr "Ota kalenteriin mukaan syntymäpäivät"
 
 #: ../gramps/plugins/drawreport/calendarreport.py:539
 #: ../gramps/plugins/textreport/birthdayreport.py:476
-#: ../gramps/plugins/webreport/webcal.py:1736
+#: ../gramps/plugins/webreport/webcal.py:1751
 msgid "Include anniversaries"
 msgstr "Ota mukaan vuosipäivät"
 
 #: ../gramps/plugins/drawreport/calendarreport.py:540
-#: ../gramps/plugins/webreport/webcal.py:1737
+#: ../gramps/plugins/webreport/webcal.py:1752
 msgid "Include anniversaries in the calendar"
 msgstr "Ota kalenteriin mukaan vuosipäivät"
 
@@ -20587,8 +20629,8 @@ msgstr "Määrittää henkilöt, jotka otetaan mukaan raporttiin"
 #: ../gramps/plugins/textreport/indivcomplete.py:1001
 #: ../gramps/plugins/textreport/recordsreport.py:224
 #: ../gramps/plugins/tool/sortevents.py:171
-#: ../gramps/plugins/webreport/narrativeweb.py:9360
-#: ../gramps/plugins/webreport/webcal.py:1612
+#: ../gramps/plugins/webreport/narrativeweb.py:9643
+#: ../gramps/plugins/webreport/webcal.py:1627
 msgid "Filter Person"
 msgstr "Suodinhenkilö"
 
@@ -20748,8 +20790,8 @@ msgstr "Määrittää henkilöt, jotka otetaan mukaan raporttiin"
 #: ../gramps/plugins/drawreport/timeline.py:424
 #: ../gramps/plugins/textreport/recordsreport.py:225
 #: ../gramps/plugins/tool/sortevents.py:172
-#: ../gramps/plugins/webreport/narrativeweb.py:9361
-#: ../gramps/plugins/webreport/webcal.py:1613
+#: ../gramps/plugins/webreport/narrativeweb.py:9644
+#: ../gramps/plugins/webreport/webcal.py:1628
 msgid "The center person for the filter"
 msgstr "Suotimen keskushenkilö"
 
@@ -20955,8 +20997,8 @@ msgstr "Käännä ylätunnisteet"
 #: ../gramps/plugins/export/exportcsv.py:286
 #: ../gramps/plugins/gramplet/placedetails.py:131
 #: ../gramps/plugins/lib/libplaceview.py:89
-#: ../gramps/plugins/webreport/narrativeweb.py:335
-#: ../gramps/plugins/webreport/narrativeweb.py:3787
+#: ../gramps/plugins/webreport/narrativeweb.py:2918
+#: ../gramps/plugins/webreport/narrativeweb.py:3828
 msgid "Latitude"
 msgstr "Leveysaste"
 
@@ -20964,8 +21006,8 @@ msgstr "Leveysaste"
 #: ../gramps/plugins/gramplet/placedetails.py:133
 #: ../gramps/plugins/importer/importcsv.py:235
 #: ../gramps/plugins/lib/libplaceview.py:90
-#: ../gramps/plugins/webreport/narrativeweb.py:337
-#: ../gramps/plugins/webreport/narrativeweb.py:3788
+#: ../gramps/plugins/webreport/narrativeweb.py:2926
+#: ../gramps/plugins/webreport/narrativeweb.py:3829
 msgid "Longitude"
 msgstr "Pituusaste"
 
@@ -21022,14 +21064,14 @@ msgstr "Kuolintiedon lähde"
 #: ../gramps/plugins/export/exportcsv.py:472
 #: ../gramps/plugins/importer/importcsv.py:225
 #: ../gramps/plugins/textreport/familygroup.py:619
-#: ../gramps/plugins/webreport/narrativeweb.py:2697
+#: ../gramps/plugins/webreport/narrativeweb.py:2726
 msgid "Husband"
 msgstr "Aviomies"
 
 #: ../gramps/plugins/export/exportcsv.py:472
 #: ../gramps/plugins/importer/importcsv.py:222
 #: ../gramps/plugins/textreport/familygroup.py:628
-#: ../gramps/plugins/webreport/narrativeweb.py:2695
+#: ../gramps/plugins/webreport/narrativeweb.py:2724
 msgid "Wife"
 msgstr "Vaimo"
 
@@ -21196,6 +21238,8 @@ msgstr "Äidin ja lapsen iän välinen ikäjakauma"
 #: ../gramps/plugins/gramplet/agestats.py:238
 #: ../gramps/plugins/gramplet/gramplet.gpr.py:242
 #: ../gramps/plugins/gramplet/gramplet.gpr.py:249
+#: ../gramps/plugins/webreport/narrativeweb.py:1886
+#: ../gramps/plugins/webreport/narrativeweb.py:8056
 msgid "Statistics"
 msgstr "Tilasto"
 
@@ -21247,7 +21291,7 @@ msgstr ""
 
 #: ../gramps/plugins/gramplet/attributes.py:56
 #: ../gramps/plugins/lib/libmetadata.py:170
-#: ../gramps/plugins/webreport/narrativeweb.py:1374
+#: ../gramps/plugins/webreport/narrativeweb.py:1370
 msgid "Key"
 msgstr "Avain"
 
@@ -21548,7 +21592,7 @@ msgstr "Gramplet näyttää aktiivisen henkilöt jälkeläiset"
 
 #: ../gramps/plugins/gramplet/gramplet.gpr.py:101
 #: ../gramps/plugins/gramplet/gramplet.gpr.py:108
-#: ../gramps/plugins/webreport/narrativeweb.py:6883
+#: ../gramps/plugins/webreport/narrativeweb.py:6979
 msgid "Ancestors"
 msgstr "Esivanhemmat"
 
@@ -21596,9 +21640,9 @@ msgstr "Gramplet näyttää kaikki etunimet pilvikaaviona"
 
 #: ../gramps/plugins/gramplet/gramplet.gpr.py:179
 #: ../gramps/plugins/gramplet/gramplet.gpr.py:185
-#: ../gramps/plugins/view/pedigreeview.py:516
+#: ../gramps/plugins/view/pedigreeview.py:524
 #: ../gramps/plugins/view/view.gpr.py:125
-#: ../gramps/plugins/webreport/narrativeweb.py:7069
+#: ../gramps/plugins/webreport/narrativeweb.py:7165
 msgid "Pedigree"
 msgstr "Esipolvien taulu"
 
@@ -22015,10 +22059,10 @@ msgstr "Gramplet näyttää henkilöön tulevat linkit"
 #: ../gramps/plugins/gramplet/gramplet.gpr.py:943
 #: ../gramps/plugins/gramplet/gramplet.gpr.py:957
 #: ../gramps/plugins/gramplet/gramplet.gpr.py:971
-#: ../gramps/plugins/webreport/narrativeweb.py:2644
-#: ../gramps/plugins/webreport/narrativeweb.py:3133
-#: ../gramps/plugins/webreport/narrativeweb.py:5656
-#: ../gramps/plugins/webreport/narrativeweb.py:6665
+#: ../gramps/plugins/webreport/narrativeweb.py:2670
+#: ../gramps/plugins/webreport/narrativeweb.py:3166
+#: ../gramps/plugins/webreport/narrativeweb.py:5731
+#: ../gramps/plugins/webreport/narrativeweb.py:6761
 msgid "References"
 msgstr "Viitteet"
 
@@ -22047,7 +22091,7 @@ msgid "Gramplet showing the backlink references for a place"
 msgstr "Gramplet näyttää paikkaan tulevat linkit"
 
 #: ../gramps/plugins/gramplet/gramplet.gpr.py:907
-#: ../gramps/plugins/webreport/narrativeweb.py:2528
+#: ../gramps/plugins/webreport/narrativeweb.py:2553
 msgid "Source References"
 msgstr "Lähdeviitteet"
 
@@ -22249,17 +22293,14 @@ msgstr "Luo SoundEx koodeja"
 msgid "Place Enclosed By"
 msgstr "Paikan ympärillä"
 
-# uusi
 #: ../gramps/plugins/gramplet/gramplet.gpr.py:1271
 msgid "Gramplet showing the places enclosed by the active place"
 msgstr "Gramplet näyttää aktiivisen paikan ympäröimät paikat"
 
-# uusi
 #: ../gramps/plugins/gramplet/gramplet.gpr.py:1284
 msgid "Place Encloses"
 msgstr "Paikka ympäröi"
 
-# uusi
 #: ../gramps/plugins/gramplet/gramplet.gpr.py:1285
 msgid "Gramplet showing the places that the active place encloses"
 msgstr "Gramplet näyttää paikat, jotka ovat aktiivisen paikan sisällä"
@@ -22532,6 +22573,7 @@ msgstr "Kaksoisnapsauta nähdäksesi löydetyt"
 
 #: ../gramps/plugins/gramplet/statsgramplet.py:87
 #: ../gramps/plugins/textreport/summary.py:241
+#: ../gramps/plugins/webreport/narrativeweb.py:8076
 msgid "less than 1"
 msgstr "vähemmän kuin 1"
 
@@ -22539,49 +22581,63 @@ msgstr "vähemmän kuin 1"
 #: ../gramps/plugins/gramplet/statsgramplet.py:98
 #: ../gramps/plugins/graph/gvfamilylines.py:248
 #: ../gramps/plugins/textreport/summary.py:114
-#: ../gramps/plugins/webreport/narrativeweb.py:1858
-#: ../gramps/plugins/webreport/narrativeweb.py:1914
-#: ../gramps/plugins/webreport/narrativeweb.py:1971
-#: ../gramps/plugins/webreport/narrativeweb.py:6015
+#: ../gramps/plugins/webreport/narrativeweb.py:1873
+#: ../gramps/plugins/webreport/narrativeweb.py:1931
+#: ../gramps/plugins/webreport/narrativeweb.py:1996
+#: ../gramps/plugins/webreport/narrativeweb.py:6089
+#: ../gramps/plugins/webreport/narrativeweb.py:8087
+#: ../gramps/plugins/webreport/narrativeweb.py:8154
 msgid "Individuals"
 msgstr "Henkilöt"
 
 #: ../gramps/plugins/gramplet/statsgramplet.py:100
+#: ../gramps/plugins/webreport/narrativeweb.py:8090
+#: ../gramps/plugins/webreport/narrativeweb.py:8155
 msgid "Number of individuals"
 msgstr "Henkilöiden määrä"
 
 #: ../gramps/plugins/gramplet/statsgramplet.py:110
+#: ../gramps/plugins/webreport/narrativeweb.py:8096
+#: ../gramps/plugins/webreport/narrativeweb.py:8162
 msgid "Individuals with unknown gender"
 msgstr "Henkilöt, joiden sukupuoli on tuntematon"
 
 #: ../gramps/plugins/gramplet/statsgramplet.py:114
 #: ../gramps/plugins/textreport/summary.py:212
+#: ../gramps/plugins/webreport/narrativeweb.py:8100
+#: ../gramps/plugins/webreport/narrativeweb.py:8166
 msgid "Family Information"
 msgstr "Perhetiedot"
 
 #: ../gramps/plugins/gramplet/statsgramplet.py:120
+#: ../gramps/plugins/webreport/narrativeweb.py:8103
 msgid "Unique surnames"
 msgstr "Sukunimiä"
 
 #: ../gramps/plugins/gramplet/statsgramplet.py:124
 #: ../gramps/plugins/textreport/summary.py:229
+#: ../gramps/plugins/webreport/narrativeweb.py:8107
 msgid "Media Objects"
 msgstr "Mediatiedostot"
 
 #: ../gramps/plugins/gramplet/statsgramplet.py:126
+#: ../gramps/plugins/webreport/narrativeweb.py:8109
 msgid "Total number of media object references"
 msgstr "Mediatiedostojen viitteiden kokonaismäärä"
 
 #: ../gramps/plugins/gramplet/statsgramplet.py:130
+#: ../gramps/plugins/webreport/narrativeweb.py:8111
 msgid "Number of unique media objects"
 msgstr "Mediatiedostoja"
 
 #: ../gramps/plugins/gramplet/statsgramplet.py:135
+#: ../gramps/plugins/webreport/narrativeweb.py:8113
 msgid "Total size of media objects"
 msgstr "Mediatiedostojen yhteenlaskettu koko"
 
 #: ../gramps/plugins/gramplet/statsgramplet.py:139
 #: ../gramps/plugins/textreport/summary.py:259
+#: ../gramps/plugins/webreport/narrativeweb.py:8116
 msgid "Missing Media Objects"
 msgstr "Puuttuvia mediatiedostoja"
 
@@ -23170,37 +23226,30 @@ msgstr "Raportti jäi tyhjäksi"
 msgid "You did not specify anybody"
 msgstr "Et valinnut ketään"
 
-# uusi/muutettu20160606
 #: ../gramps/plugins/graph/gvfamilylines.py:424
 msgid "Number of people in database:"
 msgstr "Henkilömäärä tietokannassa:"
 
-# uusi/muutettu20160606
 #: ../gramps/plugins/graph/gvfamilylines.py:427
 msgid "Number of people of interest:"
 msgstr "Kiinnostavien henkilöiden määrä:"
 
-# uusi/muutettu20160606
 #: ../gramps/plugins/graph/gvfamilylines.py:430
 msgid "Number of families in database:"
 msgstr "Perheiden lukumäärä tietokannassa:"
 
-# uusi/muutettu20160606
 #: ../gramps/plugins/graph/gvfamilylines.py:433
 msgid "Number of families of interest:"
 msgstr "Kiinnostavien perheiden määrä:"
 
-# uusi/muutettu20160606
 #: ../gramps/plugins/graph/gvfamilylines.py:437
 msgid "Additional people removed:"
 msgstr "Lisähenkilöt poistettu:"
 
-# uusi/muutettu20160606
 #: ../gramps/plugins/graph/gvfamilylines.py:440
 msgid "Additional families removed:"
 msgstr "Lisäperheet poistettu:"
 
-# uusi/muutettu20160606
 #: ../gramps/plugins/graph/gvfamilylines.py:443
 msgid "Initial list of people of interest:"
 msgstr "Alustava lista kiinnostavista henkilöistä:"
@@ -23213,19 +23262,16 @@ msgid_plural "{number_of} children"
 msgstr[0] "{number_of} lapsi"
 msgstr[1] "{number_of} lasta"
 
-# uusi/muutettu20160606
 #: ../gramps/plugins/graph/gvfamilylines.py:1004
 #, python-format
 msgid "father: %s"
 msgstr "isä: %s"
 
-# uusi/muutettu20160606
 #: ../gramps/plugins/graph/gvfamilylines.py:1013
 #, python-format
 msgid "mother: %s"
 msgstr "äiti: %s"
 
-# uusi/muutettu20160606
 #: ../gramps/plugins/graph/gvfamilylines.py:1025
 #, python-format
 msgid "child: %s"
@@ -23376,7 +23422,6 @@ msgstr "Ammatteja ei oteta mukaan"
 msgid "Include description of most recent occupation"
 msgstr "Mukaan liitetään kuvaus viimeisimmästä ammatissa"
 
-# uusi20160501
 #: ../gramps/plugins/graph/gvrelgraph.py:754
 msgid "Include date, description and place of all occupations"
 msgstr "Sisältää päivämäärän, kuvauksen ja paikan kaikissa ammateissa"
@@ -23811,7 +23856,7 @@ msgid "Change Name"
 msgstr "Vaihda nimi"
 
 #: ../gramps/plugins/importer/importgeneweb.py:89
-#: ../gramps/plugins/lib/libgedcom.py:583
+#: ../gramps/plugins/lib/libgedcom.py:585
 msgid "Circumcision"
 msgstr "Ympärileikkaus"
 
@@ -23824,7 +23869,7 @@ msgid "Dotation"
 msgstr "Lahjoitus"
 
 #: ../gramps/plugins/importer/importgeneweb.py:100
-#: ../gramps/plugins/lib/libgedcom.py:589
+#: ../gramps/plugins/lib/libgedcom.py:591
 msgid "Excommunication"
 msgstr "Kirkosta erottaminen"
 
@@ -23833,7 +23878,7 @@ msgid "LDS Family Link"
 msgstr "LDS Family Link"
 
 #: ../gramps/plugins/importer/importgeneweb.py:103
-#: ../gramps/plugins/lib/libgedcom.py:591
+#: ../gramps/plugins/lib/libgedcom.py:593
 msgid "Funeral"
 msgstr "Hautajaiset"
 
@@ -24428,116 +24473,117 @@ msgstr ""
 "Ristiriita valitun tunnisteen %(ext)s ja todellisen tunnisteen välillä.\n"
 " Kirjoitetaan tiedostoa %(filename)s muodossa %(impliedext)s."
 
-#: ../gramps/plugins/lib/libgedcom.py:584
+#: ../gramps/plugins/lib/libgedcom.py:586
 msgid "Common Law Marriage"
 msgstr "Avoliitto"
 
-#: ../gramps/plugins/lib/libgedcom.py:585
-#: ../gramps/plugins/webreport/narrativeweb.py:9341
-#: ../gramps/plugins/webreport/webcal.py:1595
+#: ../gramps/plugins/lib/libgedcom.py:587
+#: ../gramps/plugins/webreport/narrativeweb.py:9624
+#: ../gramps/plugins/webreport/webcal.py:1610
 msgid "Destination"
 msgstr "Kohde"
 
-#: ../gramps/plugins/lib/libgedcom.py:586
+#: ../gramps/plugins/lib/libgedcom.py:588
 msgid "DNA"
 msgstr "DNA"
 
-#: ../gramps/plugins/lib/libgedcom.py:587
+#: ../gramps/plugins/lib/libgedcom.py:589
 msgid "Cause of Death"
 msgstr "Kuolinsyy"
 
-#: ../gramps/plugins/lib/libgedcom.py:588
+#: ../gramps/plugins/lib/libgedcom.py:590
 msgid "Employment"
 msgstr "Työpaikka"
 
-#: ../gramps/plugins/lib/libgedcom.py:590
+#: ../gramps/plugins/lib/libgedcom.py:592
 msgid "Eye Color"
 msgstr "Silmien väri"
 
-#: ../gramps/plugins/lib/libgedcom.py:592
+#: ../gramps/plugins/lib/libgedcom.py:594
 msgid "Height"
 msgstr "Korkeus"
 
-#: ../gramps/plugins/lib/libgedcom.py:593
+#: ../gramps/plugins/lib/libgedcom.py:595
 msgid "Initiatory (LDS)"
 msgstr "initiaattori (LDS)"
 
-#: ../gramps/plugins/lib/libgedcom.py:594
+#: ../gramps/plugins/lib/libgedcom.py:596
 msgid "Military ID"
 msgstr "Sotilastunnus"
 
-#: ../gramps/plugins/lib/libgedcom.py:595
+#: ../gramps/plugins/lib/libgedcom.py:597
 msgid "Mission (LDS)"
 msgstr "Lähetystyö (LDS)"
 
-#: ../gramps/plugins/lib/libgedcom.py:596
+#: ../gramps/plugins/lib/libgedcom.py:598
 msgid "Namesake"
 msgstr "Kaima"
 
-#: ../gramps/plugins/lib/libgedcom.py:597
+#: ../gramps/plugins/lib/libgedcom.py:599
 msgid "Ordinance"
 msgstr "Sakramentti"
 
-#: ../gramps/plugins/lib/libgedcom.py:599
+#: ../gramps/plugins/lib/libgedcom.py:601
 msgid "Separation"
 msgstr "Ero"
 
 #. Applies to Families
-#: ../gramps/plugins/lib/libgedcom.py:600
+#: ../gramps/plugins/lib/libgedcom.py:602
 msgid "Weight"
 msgstr "Kirjasinvahvuus"
 
-#: ../gramps/plugins/lib/libgedcom.py:804
+#: ../gramps/plugins/lib/libgedcom.py:806
 msgid "Line ignored "
 msgstr "Rivi ohitetaan "
 
 #. e.g. Illegal character (oxAB) (0xCB)... 1 NOTE xyz?pqr?lmn
-#: ../gramps/plugins/lib/libgedcom.py:1603
+#: ../gramps/plugins/lib/libgedcom.py:1404
 #, python-format
 msgid "Illegal character%s"
 msgstr "Virheellinen merkki%s"
 
-#: ../gramps/plugins/lib/libgedcom.py:1879
+#: ../gramps/plugins/lib/libgedcom.py:1680
 msgid "Your GEDCOM file is corrupted. It appears to have been truncated."
 msgstr "GEDCOM tiedostosi on rikki. Se vaikuttaa loppuvan kesken."
 
-#: ../gramps/plugins/lib/libgedcom.py:1962
+#: ../gramps/plugins/lib/libgedcom.py:1761
 #, python-format
 msgid "Import from GEDCOM (%s)"
 msgstr "Tuo GEDCOM-tiedosto (%s)"
 
-#: ../gramps/plugins/lib/libgedcom.py:2785
-#: ../gramps/plugins/lib/libgedcom.py:3229
+#: ../gramps/plugins/lib/libgedcom.py:2593
+#: ../gramps/plugins/lib/libgedcom.py:3042
 msgid "GEDCOM import"
 msgstr "GEDCOM tuonti"
 
-#: ../gramps/plugins/lib/libgedcom.py:2813
+#: ../gramps/plugins/lib/libgedcom.py:2621
 msgid "GEDCOM import report: No errors detected"
 msgstr "GEDCOM tuonnin raportti: Ei virheitä"
 
-#: ../gramps/plugins/lib/libgedcom.py:2815
+#: ../gramps/plugins/lib/libgedcom.py:2623
 #, python-format
 msgid "GEDCOM import report: %s errors detected"
 msgstr "GEDCOM tuonnin raportti: %s virhettä löytynyt"
 
-#: ../gramps/plugins/lib/libgedcom.py:3129
-#: ../gramps/plugins/lib/libgedcom.py:3161
+#: ../gramps/plugins/lib/libgedcom.py:2937
+#: ../gramps/plugins/lib/libgedcom.py:2961
+#: ../gramps/plugins/lib/libgedcom.py:2974
 msgid "Line ignored as not understood"
 msgstr "Rivistä ei saatu selvää, joten se jätettiin huomiotta."
 
-#: ../gramps/plugins/lib/libgedcom.py:3150
+#: ../gramps/plugins/lib/libgedcom.py:2963
 msgid "Tag recognized but not supported"
 msgstr "Tagi tunnistettu mutta ei tuettu"
 
-#: ../gramps/plugins/lib/libgedcom.py:3186
+#: ../gramps/plugins/lib/libgedcom.py:2999
 msgid "Skipped subordinate line"
 msgstr "Ohitettiin alistettu rivi"
 
-#: ../gramps/plugins/lib/libgedcom.py:3220
+#: ../gramps/plugins/lib/libgedcom.py:3033
 msgid "Records not imported into "
 msgstr "Tietueita ei tuotu paikkaan"
 
-#: ../gramps/plugins/lib/libgedcom.py:3256
+#: ../gramps/plugins/lib/libgedcom.py:3069
 #, python-format
 msgid ""
 "Error: %(msg)s  '%(gramps_id)s' (input as @%(xref)s@) not in input GEDCOM. "
@@ -24546,7 +24592,7 @@ msgstr ""
 "Virhe: %(msg)s  '%(gramps_id)s' (tuotuna @%(xref)s@) ei ole GEDCOM "
 "syöttötiedostossa. Tietue syntetisoitu"
 
-#: ../gramps/plugins/lib/libgedcom.py:3265
+#: ../gramps/plugins/lib/libgedcom.py:3078
 #, python-format
 msgid ""
 "Error: %(msg)s '%(gramps_id)s' (input as @%(xref)s@) not in input GEDCOM. "
@@ -24555,7 +24601,7 @@ msgstr ""
 "Virhe: %(msg)s '%(gramps_id)s' (syötteenä @%(xref)s@) ei GEDCOM aineistossa. "
 "Luotu tietue tyyppiominaisuudeltaan 'Tuntematon' "
 
-#: ../gramps/plugins/lib/libgedcom.py:3304
+#: ../gramps/plugins/lib/libgedcom.py:3117
 #, python-format
 msgid ""
 "Error: family '%(family)s' (input as @%(orig_family)s@) person %(person)s "
@@ -24566,7 +24612,7 @@ msgstr ""
 "%(person)s (tuonnissa %(orig_person)s) ei ole viitatun perheen jäsen. "
 "Henkilöltä poistettu viittaus perheeseen"
 
-#: ../gramps/plugins/lib/libgedcom.py:3382
+#: ../gramps/plugins/lib/libgedcom.py:3195
 #, python-format
 msgid ""
 "\n"
@@ -24586,186 +24632,208 @@ msgstr ""
 #. message means that the element %s was ignored, but
 #. expressed the wrong way round because the message is
 #. truncated for output
-#: ../gramps/plugins/lib/libgedcom.py:3454
+#: ../gramps/plugins/lib/libgedcom.py:3267
 #, python-format
 msgid "ADDR element ignored '%s'"
 msgstr "ADDR elementti jätetty huomiotta '%s'"
 
-#: ../gramps/plugins/lib/libgedcom.py:3474
+#: ../gramps/plugins/lib/libgedcom.py:3287
 msgid "TRLR (trailer)"
 msgstr "TRLR (trailer-osio)"
 
-#: ../gramps/plugins/lib/libgedcom.py:3503
+#: ../gramps/plugins/lib/libgedcom.py:3316
 msgid "(Submitter):"
 msgstr "(Luovuttaja):"
 
-#: ../gramps/plugins/lib/libgedcom.py:3534
-#: ../gramps/plugins/lib/libgedcom.py:7270
+#: ../gramps/plugins/lib/libgedcom.py:3340
+#: ../gramps/plugins/lib/libgedcom.py:7103
 msgid "GEDCOM data"
 msgstr "GEDCOM data"
 
-#: ../gramps/plugins/lib/libgedcom.py:3580
+#: ../gramps/plugins/lib/libgedcom.py:3386
 msgid "Unknown tag"
 msgstr "Tuntematon tagi"
 
-#: ../gramps/plugins/lib/libgedcom.py:3582
-#: ../gramps/plugins/lib/libgedcom.py:3596
-#: ../gramps/plugins/lib/libgedcom.py:3600
-#: ../gramps/plugins/lib/libgedcom.py:3621
+#: ../gramps/plugins/lib/libgedcom.py:3388
+#: ../gramps/plugins/lib/libgedcom.py:3402
+#: ../gramps/plugins/lib/libgedcom.py:3406
+#: ../gramps/plugins/lib/libgedcom.py:3427
 msgid "Top Level"
 msgstr "Ylin taso"
 
-#: ../gramps/plugins/lib/libgedcom.py:3696
+#: ../gramps/plugins/lib/libgedcom.py:3502
 #, python-format
 msgid "INDI (individual) Gramps ID %s"
 msgstr "INDI (henkilö) Gramps ID %s"
 
-#: ../gramps/plugins/lib/libgedcom.py:3815
+#: ../gramps/plugins/lib/libgedcom.py:3621
 msgid "Empty Alias <NAME PERSONAL> ignored"
 msgstr "Tyhjä Alias <NAME PERSONAL> ohitettu"
 
-#: ../gramps/plugins/lib/libgedcom.py:4967
+# 20160901uusi
+#: ../gramps/plugins/lib/libgedcom.py:3963
+#: ../gramps/plugins/lib/libgedcom.py:5712
+#: ../gramps/plugins/lib/libgedcom.py:6847
+msgid "FAX"
+msgstr "FAX"
+
+#: ../gramps/plugins/lib/libgedcom.py:4787
 #, python-format
 msgid "FAM (family) Gramps ID %s"
 msgstr "FAM (perhe) Gramps ID %s"
 
-#: ../gramps/plugins/lib/libgedcom.py:5319
-#: ../gramps/plugins/lib/libgedcom.py:6713
+#: ../gramps/plugins/lib/libgedcom.py:5140
+#: ../gramps/plugins/lib/libgedcom.py:6536
 msgid "Filename omitted"
 msgstr "Tiedostonimi ohitettu"
 
-#: ../gramps/plugins/lib/libgedcom.py:5342
-#: ../gramps/plugins/lib/libgedcom.py:6753
+#: ../gramps/plugins/lib/libgedcom.py:5163
+#: ../gramps/plugins/lib/libgedcom.py:6576
 #, python-format
 msgid "Could not import %s"
 msgstr "Ei voitu tuoda %s"
 
 # 20160720muutettu/uusi
-#: ../gramps/plugins/lib/libgedcom.py:5399
-#: ../gramps/plugins/lib/libgedcom.py:6854
+#: ../gramps/plugins/lib/libgedcom.py:5220
+#: ../gramps/plugins/lib/libgedcom.py:6677
 msgid "Media-Type"
 msgstr "Media-Tyyppi"
 
-# 20160720muutettu/uusi
-#: ../gramps/plugins/lib/libgedcom.py:5423
-#: ../gramps/plugins/lib/libgedcom.py:6744
+#: ../gramps/plugins/lib/libgedcom.py:5244
+#: ../gramps/plugins/lib/libgedcom.py:6567
 msgid "Multiple FILE in a single OBJE ignored"
 msgstr "Kerrannais FILE yksittäis OBJE jätetty huomiotta"
 
-#: ../gramps/plugins/lib/libgedcom.py:5456
-#: ../gramps/plugins/lib/libgedcom.py:7573
-#: ../gramps/plugins/lib/libgedcom.py:7613
+#: ../gramps/plugins/lib/libgedcom.py:5277
+#: ../gramps/plugins/lib/libgedcom.py:7401
+#: ../gramps/plugins/lib/libgedcom.py:7441
 msgid "Empty note ignored"
 msgstr "Tyhjä lisätieto jätettiin huomiotta"
 
 #. We have previously found a PLAC
-#: ../gramps/plugins/lib/libgedcom.py:5611
+#: ../gramps/plugins/lib/libgedcom.py:5428
 msgid "A second PLAC ignored"
 msgstr "Muu kuin 1. PLAC ohitetaan"
 
 #. For RootsMagic etc. Place Details e.g. address, hospital, cemetary
-#: ../gramps/plugins/lib/libgedcom.py:5749
+#: ../gramps/plugins/lib/libgedcom.py:5567
 msgid "Detail"
 msgstr "Tarkennus"
 
 #. We have perviously found an ADDR, or have populated location
 #. from PLAC title
-#: ../gramps/plugins/lib/libgedcom.py:5762
+#: ../gramps/plugins/lib/libgedcom.py:5580
 msgid "Location already populated; ADDR ignored"
 msgstr "Sijainti-tieto on hyödynnetty; ADDR ohitetaan"
 
 #. empty: discard, with warning and skip subs
 #. Note: level+2
-#: ../gramps/plugins/lib/libgedcom.py:5847
+#: ../gramps/plugins/lib/libgedcom.py:5653
 msgid "Empty event note ignored"
 msgstr "Tyhjä tapahtuman lisätieto ohitettu"
 
-#: ../gramps/plugins/lib/libgedcom.py:6165
-#: ../gramps/plugins/lib/libgedcom.py:7050
+# 20160901uusi
+#: ../gramps/plugins/lib/libgedcom.py:5724
+msgid "EMAIL"
+msgstr "EMAIL"
+
+# 20160901uusi
+#: ../gramps/plugins/lib/libgedcom.py:5736
+msgid "WWW"
+msgstr "WWW"
+
+#: ../gramps/plugins/lib/libgedcom.py:5995
+#: ../gramps/plugins/lib/libgedcom.py:6884
 msgid "Warn: ADDR overwritten"
 msgstr "Varoitus: ADDR kirjoitettu yli"
 
-#: ../gramps/plugins/lib/libgedcom.py:6330
+#: ../gramps/plugins/lib/libgedcom.py:6160
 msgid "Citation Justification"
 msgstr "Lainauksen perustelu"
 
-#: ../gramps/plugins/lib/libgedcom.py:6357
+#: ../gramps/plugins/lib/libgedcom.py:6188
 msgid "REFN ignored"
 msgstr "REFN ohitettu"
 
 #. SOURce with the given gramps_id had no title
-#: ../gramps/plugins/lib/libgedcom.py:6456
+#: ../gramps/plugins/lib/libgedcom.py:6287
 #, python-format
 msgid "No title - ID %s"
 msgstr "Lähteen nimike puuttuu - ID %s"
 
-#: ../gramps/plugins/lib/libgedcom.py:6461
+#: ../gramps/plugins/lib/libgedcom.py:6292
 #, python-format
 msgid "SOUR (source) Gramps ID %s"
 msgstr "SOUR (lähde) Gramps ID %s"
 
-#: ../gramps/plugins/lib/libgedcom.py:6720
+#: ../gramps/plugins/lib/libgedcom.py:6543
 #, python-format
 msgid "OBJE (multi-media object) Gramps ID %s"
 msgstr "OBJE (multi-media object) Gramps ID %s"
 
-#: ../gramps/plugins/lib/libgedcom.py:6954
+#: ../gramps/plugins/lib/libgedcom.py:6773
 #, python-format
 msgid "REPO (repository) Gramps ID %s"
 msgstr "REPO (arkisto) Gramps ID %s"
 
-#: ../gramps/plugins/lib/libgedcom.py:7185
+# 20160901uusi
+#: ../gramps/plugins/lib/libgedcom.py:6834
+#: ../gramps/plugins/lib/libgedcom.py:7801
+msgid "Only one phone number supported"
+msgstr "Tukee vain yhtä puhelinnumeroa"
+
+#: ../gramps/plugins/lib/libgedcom.py:7019
 msgid "HEAD (header)"
 msgstr "Head (ylätunniste)"
 
-#: ../gramps/plugins/lib/libgedcom.py:7207
+#: ../gramps/plugins/lib/libgedcom.py:7040
 msgid "Approved system identification"
 msgstr "Hyväksytty järjestelmän tunnistus"
 
-#: ../gramps/plugins/lib/libgedcom.py:7219
+#: ../gramps/plugins/lib/libgedcom.py:7052
 msgid "Generated By"
 msgstr "Tuotettu"
 
-#: ../gramps/plugins/lib/libgedcom.py:7235
+#: ../gramps/plugins/lib/libgedcom.py:7068
 msgid "Name of software product"
 msgstr "Sovellustuotteen nimi"
 
-#: ../gramps/plugins/lib/libgedcom.py:7249
+#: ../gramps/plugins/lib/libgedcom.py:7082
 msgid "Version number of software product"
 msgstr "Sovellustuotteen versio"
 
-#: ../gramps/plugins/lib/libgedcom.py:7267
+#: ../gramps/plugins/lib/libgedcom.py:7100
 #, python-format
 msgid "Business that produced the product: %s"
 msgstr "Sovellustuotteen valmistaja: %s"
 
-#: ../gramps/plugins/lib/libgedcom.py:7289
+#: ../gramps/plugins/lib/libgedcom.py:7122
 msgid "Name of source data"
 msgstr "Lähdeaineiston nimi"
 
-#: ../gramps/plugins/lib/libgedcom.py:7306
+#: ../gramps/plugins/lib/libgedcom.py:7139
 msgid "Copyright of source data"
 msgstr "Lähdeaineiston copyright"
 
-#: ../gramps/plugins/lib/libgedcom.py:7323
+#: ../gramps/plugins/lib/libgedcom.py:7156
 msgid "Publication date of source data"
 msgstr "Lähdeaineiston julkaisupäivä"
 
 #. feature request 2356: avoid genitive form
-#: ../gramps/plugins/lib/libgedcom.py:7337
+#: ../gramps/plugins/lib/libgedcom.py:7170
 #, python-format
 msgid "Import from %s"
 msgstr "Tuonti paikasta %s"
 
-#: ../gramps/plugins/lib/libgedcom.py:7376
+#: ../gramps/plugins/lib/libgedcom.py:7209
 msgid "Submission record identifier"
 msgstr "Luovutuksen tietuetunniste"
 
-#: ../gramps/plugins/lib/libgedcom.py:7389
+#: ../gramps/plugins/lib/libgedcom.py:7222
 msgid "Language of GEDCOM text"
 msgstr "GEDCOM tekstin kieli"
 
-#: ../gramps/plugins/lib/libgedcom.py:7415
+#: ../gramps/plugins/lib/libgedcom.py:7243
 #, python-format
 msgid ""
 "Import of GEDCOM file %(filename)s with DEST=%(by)s, could cause errors in "
@@ -24774,83 +24842,83 @@ msgstr ""
 "GEDCOM tiedoston %(filename)s, jossa DEST=%(by)s, tuonti saattaisi aiheuttaa "
 "virheitä syntyvään tietokantaan!"
 
-#: ../gramps/plugins/lib/libgedcom.py:7418
+#: ../gramps/plugins/lib/libgedcom.py:7246
 msgid "Look for nameless events."
 msgstr "Etsitään nimettömiä tapahtumia."
 
-#: ../gramps/plugins/lib/libgedcom.py:7442
+#: ../gramps/plugins/lib/libgedcom.py:7270
 msgid "Character set"
 msgstr "Merkistön koodaus"
 
-#: ../gramps/plugins/lib/libgedcom.py:7447
+#: ../gramps/plugins/lib/libgedcom.py:7275
 msgid "Character set and version"
 msgstr "Merkistön koodaus ja versio"
 
-#: ../gramps/plugins/lib/libgedcom.py:7464
+#: ../gramps/plugins/lib/libgedcom.py:7292
 msgid "GEDCOM version not supported"
 msgstr "GEDCOM versio ei ole tuettu"
 
-#: ../gramps/plugins/lib/libgedcom.py:7468
+#: ../gramps/plugins/lib/libgedcom.py:7296
 msgid "GEDCOM version"
 msgstr "GEDCOM versio"
 
 #. Allow Lineage-Linked etc. though it should be in uppercase
-#: ../gramps/plugins/lib/libgedcom.py:7476
+#: ../gramps/plugins/lib/libgedcom.py:7304
 msgid "GEDCOM FORM should be in uppercase"
 msgstr "GEDCOM FORM pitäisi olla isoilla kirjaimilla"
 
-#: ../gramps/plugins/lib/libgedcom.py:7478
+#: ../gramps/plugins/lib/libgedcom.py:7306
 msgid "GEDCOM FORM not supported"
 msgstr "GEDCOM FORM ei ole tuettu"
 
-#: ../gramps/plugins/lib/libgedcom.py:7481
+#: ../gramps/plugins/lib/libgedcom.py:7309
 msgid "GEDCOM form"
 msgstr "GEDCOM muoto"
 
-#: ../gramps/plugins/lib/libgedcom.py:7530
+#: ../gramps/plugins/lib/libgedcom.py:7358
 msgid "Creation date of GEDCOM"
 msgstr "GEDCOM luontipäivä"
 
-#: ../gramps/plugins/lib/libgedcom.py:7535
+#: ../gramps/plugins/lib/libgedcom.py:7363
 msgid "Creation date and time of GEDCOM"
 msgstr "GEDCOMin luontipäivä ja kellonaika"
 
-#: ../gramps/plugins/lib/libgedcom.py:7628
+#: ../gramps/plugins/lib/libgedcom.py:7456
 #, python-format
 msgid "NOTE Gramps ID %s"
 msgstr "LISÄTIEDOT Gramps ID %s"
 
-#: ../gramps/plugins/lib/libgedcom.py:7678
+#: ../gramps/plugins/lib/libgedcom.py:7506
 msgid "Submission: Submitter"
 msgstr "Luovuttaja"
 
-#: ../gramps/plugins/lib/libgedcom.py:7680
+#: ../gramps/plugins/lib/libgedcom.py:7508
 msgid "Submission: Family file"
 msgstr "Sukupuu"
 
-#: ../gramps/plugins/lib/libgedcom.py:7682
+#: ../gramps/plugins/lib/libgedcom.py:7510
 msgid "Submission: Temple code"
 msgstr "Temppelikoodi"
 
-#: ../gramps/plugins/lib/libgedcom.py:7684
+#: ../gramps/plugins/lib/libgedcom.py:7512
 msgid "Submission: Generations of ancestors"
 msgstr "Esivanhempien sukupolvet"
 
-#: ../gramps/plugins/lib/libgedcom.py:7686
+#: ../gramps/plugins/lib/libgedcom.py:7514
 msgid "Submission: Generations of descendants"
 msgstr "Jälkeläisten sukupolvet"
 
-#: ../gramps/plugins/lib/libgedcom.py:7688
+#: ../gramps/plugins/lib/libgedcom.py:7516
 msgid "Submission: Ordinance process flag"
 msgstr "Sijaistoimituksen tila"
 
 #. # Okay we have no clue which temple this is.
 #. # We should tell the user and store it anyway.
-#: ../gramps/plugins/lib/libgedcom.py:7912
+#: ../gramps/plugins/lib/libgedcom.py:7740
 msgid "Invalid temple code"
 msgstr "Virheellinen temppelikoodi"
 
-#: ../gramps/plugins/lib/libgedcom.py:8000
+#: ../gramps/plugins/lib/libgedcom.py:7834
 msgid ""
 "Your GEDCOM file is corrupted. The file appears to be encoded using the "
 "UTF16 character set, but is missing the BOM marker."
@@ -24858,7 +24926,7 @@ msgstr ""
 "GEDCOM tiedostosi on viallinen. Tiedosto näyttäisi käyttävän UTF16-"
 "merkkikoodausta, mutta siitä puuttuu vaadittu BOM-merkintä."
 
-#: ../gramps/plugins/lib/libgedcom.py:8003
+#: ../gramps/plugins/lib/libgedcom.py:7837
 msgid "Your GEDCOM file is empty."
 msgstr "GEDCOM tiedostosi on tyhjä."
 
@@ -25031,7 +25099,7 @@ msgid "She was born on %(birth_date)s."
 msgstr "Hän syntyi %(birth_date)s."
 
 #: ../gramps/plugins/lib/libnarrate.py:125
-#: ../gramps/plugins/webreport/webcal.py:1991
+#: ../gramps/plugins/webreport/webcal.py:2010
 #, python-format
 msgid "Born %(birth_date)s."
 msgstr "Syntyi %(birth_date)s."
@@ -25385,7 +25453,7 @@ msgstr "Kuoli %(death_date)s, ikä %(age)s."
 #. latin cross for html code
 #: ../gramps/plugins/lib/libnarrate.py:283
 #: ../gramps/plugins/lib/libnarrate.py:316
-#: ../gramps/plugins/webreport/webcal.py:1981
+#: ../gramps/plugins/webreport/webcal.py:2000
 #, python-format
 msgid "Died %(death_date)s."
 msgstr "Kuoli %(death_date)s."
@@ -28227,7 +28295,7 @@ msgid "Delete Person (%s)"
 msgstr "Poista henkilö (%s)"
 
 #: ../gramps/plugins/lib/libpersonview.py:375
-#: ../gramps/plugins/view/pedigreeview.py:666
+#: ../gramps/plugins/view/pedigreeview.py:676
 #: ../gramps/plugins/view/relview.py:421
 msgid "Person Filter Editor"
 msgstr "Henkilösuodinmuokkain"
@@ -28503,74 +28571,72 @@ msgstr "Vasen alakulma"
 msgid "Bottom Right"
 msgstr "Oikea alakulma"
 
-#: ../gramps/plugins/lib/maps/geography.py:300
+#: ../gramps/plugins/lib/maps/geography.py:308
 #: ../gramps/plugins/view/fanchartdescview.py:166
 #: ../gramps/plugins/view/fanchartview.py:164
 msgid "_Print..."
 msgstr "_Tulosta..."
 
-#: ../gramps/plugins/lib/maps/geography.py:302
+#: ../gramps/plugins/lib/maps/geography.py:310
 msgid "Print or save the Map"
 msgstr "Tulosta tai talleta kartta"
 
-#: ../gramps/plugins/lib/maps/geography.py:339
+#: ../gramps/plugins/lib/maps/geography.py:347
 msgid "Map Menu"
 msgstr "Karttavalikko"
 
-#: ../gramps/plugins/lib/maps/geography.py:342
+#: ../gramps/plugins/lib/maps/geography.py:350
 msgid "Remove cross hair"
 msgstr "Poista hiusristikko"
 
-#: ../gramps/plugins/lib/maps/geography.py:344
+#: ../gramps/plugins/lib/maps/geography.py:352
 msgid "Add cross hair"
 msgstr "Lisää hiusristikko"
 
-#: ../gramps/plugins/lib/maps/geography.py:351
+#: ../gramps/plugins/lib/maps/geography.py:359
 msgid "Unlock zoom and position"
 msgstr "Vapauta zoomaus ja sijainti"
 
-#: ../gramps/plugins/lib/maps/geography.py:353
+#: ../gramps/plugins/lib/maps/geography.py:361
 msgid "Lock zoom and position"
 msgstr "Kiinnitä zoomaus ja sijainti"
 
-#: ../gramps/plugins/lib/maps/geography.py:360
+#: ../gramps/plugins/lib/maps/geography.py:368
 msgid "Add place"
 msgstr "Lisää paikka"
 
-#: ../gramps/plugins/lib/maps/geography.py:365
+#: ../gramps/plugins/lib/maps/geography.py:373
 msgid "Link place"
 msgstr "Linkitä paikka"
 
-#: ../gramps/plugins/lib/maps/geography.py:370
+#: ../gramps/plugins/lib/maps/geography.py:378
 msgid "Add place from kml"
 msgstr "Lisää paikka kml-tiedostosta"
 
-#: ../gramps/plugins/lib/maps/geography.py:375
+#: ../gramps/plugins/lib/maps/geography.py:383
 msgid "Center here"
 msgstr "Keskitä tänne"
 
-#: ../gramps/plugins/lib/maps/geography.py:388
+#: ../gramps/plugins/lib/maps/geography.py:396
 #, python-format
 msgid "Replace '%(map)s' by =>"
 msgstr "Korvaa '%(map)s' tällä =>"
 
-#: ../gramps/plugins/lib/maps/geography.py:407
+#: ../gramps/plugins/lib/maps/geography.py:415
 #, python-format
 msgid "Clear the '%(map)s' tiles cache."
 msgstr "Tyhjennä '%(map)s' tiilien välimuisti."
 
-# 20160707uusi/muutettu
 #. parent-OK
-#: ../gramps/plugins/lib/maps/geography.py:853
+#: ../gramps/plugins/lib/maps/geography.py:861
 msgid "You can't use the print functionality"
 msgstr "Et voi käyttää tulostustoimintoja"
 
-# 20160707uusi/muutettu
-#: ../gramps/plugins/lib/maps/geography.py:854
+#: ../gramps/plugins/lib/maps/geography.py:862
 msgid "Your Gtk version is too old."
 msgstr "GTK versio on liian vanha."
 
-#: ../gramps/plugins/lib/maps/geography.py:895
+#: ../gramps/plugins/lib/maps/geography.py:903
 #: ../gramps/plugins/view/geoclose.py:550
 #: ../gramps/plugins/view/geoevents.py:345
 #: ../gramps/plugins/view/geoevents.py:378
@@ -28585,16 +28651,16 @@ msgstr "GTK versio on liian vanha."
 msgid "Center on this place"
 msgstr "Keskitä tähän paikkaan"
 
-#: ../gramps/plugins/lib/maps/geography.py:974
+#: ../gramps/plugins/lib/maps/geography.py:982
 msgid "Select a kml file used to add places"
 msgstr "Valitse kml tiedosto, lisätäksesi paikkoja"
 
 #. parent-OK
-#: ../gramps/plugins/lib/maps/geography.py:1039
+#: ../gramps/plugins/lib/maps/geography.py:1047
 msgid "You have at least two places with the same title."
 msgstr "Sinulla on ainakin kaksi samannimistä paikkaa."
 
-#: ../gramps/plugins/lib/maps/geography.py:1040
+#: ../gramps/plugins/lib/maps/geography.py:1048
 #, python-format
 msgid ""
 "The title of the places is:\n"
@@ -28611,19 +28677,19 @@ msgstr ""
 "\n"
 "%(bold_start)sEn voi suorittaa pyyntöäsi loppuun%(bold_end)s.\n"
 
-#: ../gramps/plugins/lib/maps/geography.py:1169
+#: ../gramps/plugins/lib/maps/geography.py:1177
 msgid "Nothing for this view."
 msgstr "Ei mitään tätä näkymää varten."
 
-#: ../gramps/plugins/lib/maps/geography.py:1170
+#: ../gramps/plugins/lib/maps/geography.py:1178
 msgid "Specific parameters"
 msgstr "Erityiset parametrit"
 
-#: ../gramps/plugins/lib/maps/geography.py:1188
+#: ../gramps/plugins/lib/maps/geography.py:1196
 msgid "Where to save the tiles for offline mode."
 msgstr "Tallennetaanko tiilet offline-tilaa varten."
 
-#: ../gramps/plugins/lib/maps/geography.py:1192
+#: ../gramps/plugins/lib/maps/geography.py:1200
 msgid ""
 "If you have no more space in your file system. You can remove all tiles "
 "placed in the above path.\n"
@@ -28632,15 +28698,15 @@ msgstr ""
 "Tilanpuutteen vuoksi voit tyhjentää yllä olevassa polussa olevat kohteet.\n"
 "Varovaisuutta! Ilman nettiyhteyttä et saa karttoja."
 
-#: ../gramps/plugins/lib/maps/geography.py:1197
+#: ../gramps/plugins/lib/maps/geography.py:1205
 msgid "Zoom used when centering"
 msgstr "Zoomia käytetään keskitettäessä"
 
-#: ../gramps/plugins/lib/maps/geography.py:1201
+#: ../gramps/plugins/lib/maps/geography.py:1209
 msgid "The maximum number of places to show"
 msgstr "Enin määrä näytettäviä paikkoja"
 
-#: ../gramps/plugins/lib/maps/geography.py:1205
+#: ../gramps/plugins/lib/maps/geography.py:1213
 msgid ""
 "Use keypad for shortcuts :\n"
 "Either we choose the + and - from the keypad if we select this,\n"
@@ -28650,11 +28716,11 @@ msgstr ""
 "Teemme valinnan + ja - näppäimillä, jos tähän päädymme,\n"
 "tai käytämme merkkejä näppäimistöltä."
 
-#: ../gramps/plugins/lib/maps/geography.py:1211
+#: ../gramps/plugins/lib/maps/geography.py:1219
 msgid "The map"
 msgstr "Kartta"
 
-#: ../gramps/plugins/lib/maps/geography.py:1227
+#: ../gramps/plugins/lib/maps/geography.py:1235
 msgid "Select tile cache directory for offline mode"
 msgstr "Valitse tiilille välimuistihakemisto käytettäväksi offline-tilassa"
 
@@ -28748,7 +28814,7 @@ msgid "Open on maps.google.com"
 msgstr "Avaa maps.google.com"
 
 #: ../gramps/plugins/mapservices/mapservice.gpr.py:69
-#: ../gramps/plugins/webreport/narrativeweb.py:9660
+#: ../gramps/plugins/webreport/narrativeweb.py:9944
 msgid "OpenStreetMap"
 msgstr "OpenStreetMap kartat"
 
@@ -28809,7 +28875,7 @@ msgstr "Tapahtumapaikka"
 #: ../gramps/plugins/quickview/all_events.py:60
 #: ../gramps/plugins/quickview/all_events.py:105
 #: ../gramps/plugins/quickview/all_events.py:117
-#: ../gramps/plugins/webreport/narrativeweb.py:6681
+#: ../gramps/plugins/webreport/narrativeweb.py:6777
 msgid "Event Type"
 msgstr "Tapahtumatyyppi"
 
@@ -28880,11 +28946,10 @@ msgstr "Vanhempi"
 
 #: ../gramps/plugins/quickview/all_relations.py:286
 #: ../gramps/plugins/view/relview.py:404
-#: ../gramps/plugins/webreport/narrativeweb.py:341
-#: ../gramps/plugins/webreport/narrativeweb.py:2699
-#: ../gramps/plugins/webreport/narrativeweb.py:2701
-#: ../gramps/plugins/webreport/narrativeweb.py:3227
-#: ../gramps/plugins/webreport/narrativeweb.py:6062
+#: ../gramps/plugins/webreport/narrativeweb.py:2728
+#: ../gramps/plugins/webreport/narrativeweb.py:2730
+#: ../gramps/plugins/webreport/narrativeweb.py:3260
+#: ../gramps/plugins/webreport/narrativeweb.py:6136
 msgid "Partner"
 msgstr "Kumppani"
 
@@ -29068,15 +29133,16 @@ msgstr "Henkilöt"
 #: ../gramps/plugins/view/view.gpr.py:250
 #: ../gramps/plugins/view/view.gpr.py:258
 #: ../gramps/plugins/view/view.gpr.py:289
-#: ../gramps/plugins/webreport/narrativeweb.py:346
-#: ../gramps/plugins/webreport/narrativeweb.py:1000
-#: ../gramps/plugins/webreport/narrativeweb.py:1316
-#: ../gramps/plugins/webreport/narrativeweb.py:1634
-#: ../gramps/plugins/webreport/narrativeweb.py:1863
-#: ../gramps/plugins/webreport/narrativeweb.py:1920
-#: ../gramps/plugins/webreport/narrativeweb.py:1982
-#: ../gramps/plugins/webreport/narrativeweb.py:4756
-#: ../gramps/plugins/webreport/narrativeweb.py:4853
+#: ../gramps/plugins/webreport/narrativeweb.py:994
+#: ../gramps/plugins/webreport/narrativeweb.py:1311
+#: ../gramps/plugins/webreport/narrativeweb.py:1486
+#: ../gramps/plugins/webreport/narrativeweb.py:1635
+#: ../gramps/plugins/webreport/narrativeweb.py:1878
+#: ../gramps/plugins/webreport/narrativeweb.py:1937
+#: ../gramps/plugins/webreport/narrativeweb.py:2007
+#: ../gramps/plugins/webreport/narrativeweb.py:4825
+#: ../gramps/plugins/webreport/narrativeweb.py:4922
+#: ../gramps/plugins/webreport/narrativeweb.py:7063
 msgid "Sources"
 msgstr "Lähteet"
 
@@ -29086,11 +29152,11 @@ msgstr "Lähteet"
 #: ../gramps/plugins/view/repoview.py:129
 #: ../gramps/plugins/view/view.gpr.py:235
 #: ../gramps/plugins/view/view.gpr.py:243
-#: ../gramps/plugins/webreport/narrativeweb.py:1864
-#: ../gramps/plugins/webreport/narrativeweb.py:1983
-#: ../gramps/plugins/webreport/narrativeweb.py:2995
-#: ../gramps/plugins/webreport/narrativeweb.py:7637
+#: ../gramps/plugins/webreport/narrativeweb.py:1879
+#: ../gramps/plugins/webreport/narrativeweb.py:2008
+#: ../gramps/plugins/webreport/narrativeweb.py:3025
 #: ../gramps/plugins/webreport/narrativeweb.py:7721
+#: ../gramps/plugins/webreport/narrativeweb.py:7806
 msgid "Repositories"
 msgstr "Arkistot"
 
@@ -29407,7 +29473,7 @@ msgid "No references for this %s"
 msgstr "Ei viitteitä kohteena %s"
 
 #: ../gramps/plugins/quickview/reporef.py:62
-#: ../gramps/plugins/webreport/narrativeweb.py:3008
+#: ../gramps/plugins/webreport/narrativeweb.py:3040
 msgid "Call number"
 msgstr "Hakuavain"
 
@@ -29637,7 +29703,6 @@ msgstr "Aakkosellinen hakemisto"
 msgid "Index"
 msgstr "Hakemisto"
 
-# 20160707uusi/muutettu
 #: ../gramps/plugins/textreport/alphabeticalindex.py:89
 #: ../gramps/plugins/textreport/tableofcontents.py:88
 msgid "Entire Book"
@@ -29823,7 +29888,6 @@ msgstr "Käytettävä tyyli käyttäjän tekstin loppuosalle."
 msgid "sp. %(spouse)s"
 msgstr "p. %(spouse)s"
 
-# uusi/muutettu20160606
 #: ../gramps/plugins/textreport/descendreport.py:324
 #, python-format
 msgid "sp. see %(reference)s: %(spouse)s"
@@ -29853,7 +29917,6 @@ msgstr "d'Aboville numerointi"
 msgid "Henry numbering"
 msgstr "Henry numerointi"
 
-# 20160720muutettu/uusi
 #: ../gramps/plugins/textreport/descendreport.py:521
 #: ../gramps/plugins/textreport/detdescendantreport.py:991
 msgid "Modified Henry numbering"
@@ -30534,7 +30597,7 @@ msgstr "Käytettävä tyyli vanhempien nimille"
 #: ../gramps/plugins/textreport/indivcomplete.py:178
 #, python-format
 msgid "%(str1)s in %(str2)s. "
-msgstr "%(str1)s, paikka %(str2)s"
+msgstr "%(str1)s %(str2)s. "
 
 #. for example (a stepfather): John Smith, relationship: Step
 #: ../gramps/plugins/textreport/indivcomplete.py:234
@@ -30547,7 +30610,7 @@ msgid "Alternate Parents"
 msgstr "Vaihtoehtoiset vanhemmat"
 
 #: ../gramps/plugins/textreport/indivcomplete.py:396
-#: ../gramps/plugins/webreport/narrativeweb.py:6952
+#: ../gramps/plugins/webreport/narrativeweb.py:7048
 msgid "Associations"
 msgstr "Liitokset"
 
@@ -32038,9 +32101,9 @@ msgid "Gramps Media Manager"
 msgstr "Medianhallinta"
 
 #: ../gramps/plugins/tool/mediamanager.py:95
-#: ../gramps/plugins/webreport/narrativeweb.py:1857
-#: ../gramps/plugins/webreport/narrativeweb.py:1970
-#: ../gramps/plugins/webreport/narrativeweb.py:4597
+#: ../gramps/plugins/webreport/narrativeweb.py:1871
+#: ../gramps/plugins/webreport/narrativeweb.py:1994
+#: ../gramps/plugins/webreport/narrativeweb.py:4666
 msgid "Introduction"
 msgstr "Johdanto"
 
@@ -32369,7 +32432,6 @@ msgstr "Puhelin:"
 msgid "_Email:"
 msgstr "Sähköposti:"
 
-# uusi
 #: ../gramps/plugins/tool/ownereditor.glade:385
 msgid "Right-click to copy from/to Researcher Preferences"
 msgstr "Hiiren kakkospainikkeella kopioidaan / Tutkija asetuksiin"
@@ -33254,7 +33316,7 @@ msgstr "Korkea ikä mutta ei kuollut"
 
 #: ../gramps/plugins/view/citationlistview.py:101
 #: ../gramps/plugins/view/citationtreeview.py:96
-#: ../gramps/plugins/webreport/narrativeweb.py:2565
+#: ../gramps/plugins/webreport/narrativeweb.py:2591
 msgid "Confidence"
 msgstr "Luotettavuus"
 
@@ -33622,7 +33684,7 @@ msgstr "Kokoon suhteutettu määrä jälkeläisiä"
 #. #        ??, 'interface.fanview-radialtext')
 #: ../gramps/plugins/view/fanchartdescview.py:329
 #: ../gramps/plugins/view/fanchartview.py:323
-#: ../gramps/plugins/view/pedigreeview.py:2045
+#: ../gramps/plugins/view/pedigreeview.py:2072
 #: ../gramps/plugins/view/relview.py:1701
 msgid "Layout"
 msgstr "Asetelma"
@@ -33644,7 +33706,7 @@ msgstr "Onko heidän ollut mahdollista tavata?"
 # 20160728/muutettu
 #: ../gramps/plugins/view/geoclose.py:177
 msgid "GeoClose"
-msgstr "Henkilöiden läheisyys"
+msgstr "Henkilöläheisyys"
 
 # 20160728/muutettu
 #: ../gramps/plugins/view/geoclose.py:230
@@ -34172,86 +34234,91 @@ msgstr "haud."
 msgid "short for cremated|crem."
 msgstr "krem."
 
-#: ../gramps/plugins/view/pedigreeview.py:1115
+#: ../gramps/plugins/view/pedigreeview.py:1127
 msgid "Jump to child..."
 msgstr "Siirry lapseen..."
 
-#: ../gramps/plugins/view/pedigreeview.py:1128
+#: ../gramps/plugins/view/pedigreeview.py:1140
 msgid "Jump to father"
 msgstr "Siirry isään"
 
-#: ../gramps/plugins/view/pedigreeview.py:1141
+#: ../gramps/plugins/view/pedigreeview.py:1153
 msgid "Jump to mother"
 msgstr "Siirry äitiin"
 
 #. parent-OK
-#: ../gramps/plugins/view/pedigreeview.py:1501
+#: ../gramps/plugins/view/pedigreeview.py:1513
 msgid "A person was found to be his/her own ancestor."
 msgstr "Löytyi henkilö, joka on määritelty omaksi esivanhemmakseen."
 
-#: ../gramps/plugins/view/pedigreeview.py:1545
+#: ../gramps/plugins/view/pedigreeview.py:1557
 msgid "Pre_vious"
 msgstr "_Edellinen"
 
-#: ../gramps/plugins/view/pedigreeview.py:1546
+#: ../gramps/plugins/view/pedigreeview.py:1558
 msgid "_Next"
 msgstr "_Seuraava"
 
 #. Mouse scroll direction setting.
-#: ../gramps/plugins/view/pedigreeview.py:1573
+#: ../gramps/plugins/view/pedigreeview.py:1585
 msgid "Mouse scroll direction"
 msgstr "Hiiren rullauksen suunta"
 
-#: ../gramps/plugins/view/pedigreeview.py:1577
+#: ../gramps/plugins/view/pedigreeview.py:1589
 msgid "Top <-> Bottom"
 msgstr "Ylhäältä <-> Alas"
 
-#: ../gramps/plugins/view/pedigreeview.py:1585
+#: ../gramps/plugins/view/pedigreeview.py:1597
 msgid "Left <-> Right"
 msgstr "Vasen <-> Oikea"
 
-#: ../gramps/plugins/view/pedigreeview.py:1826
+#: ../gramps/plugins/view/pedigreeview.py:1838
 #: ../gramps/plugins/view/relview.py:410
 msgid "Add New Parents..."
 msgstr "Lisää vanhemmat..."
 
-#: ../gramps/plugins/view/pedigreeview.py:1886
+#: ../gramps/plugins/view/pedigreeview.py:1898
 msgid "Family Menu"
 msgstr "Perhevalikko"
 
-#: ../gramps/plugins/view/pedigreeview.py:2018
+#: ../gramps/plugins/view/pedigreeview.py:2042
 msgid "Show images"
 msgstr "Näytä kuvat"
 
-#: ../gramps/plugins/view/pedigreeview.py:2021
+#: ../gramps/plugins/view/pedigreeview.py:2045
 msgid "Show marriage data"
 msgstr "Näytä vihkitiedot"
 
-#: ../gramps/plugins/view/pedigreeview.py:2024
+#: ../gramps/plugins/view/pedigreeview.py:2048
 msgid "Show unknown people"
 msgstr "Näytä tuntematon henkilö"
 
-#: ../gramps/plugins/view/pedigreeview.py:2027
+# 20160901uusi
+#: ../gramps/plugins/view/pedigreeview.py:2051
+msgid "Show tags"
+msgstr "Näytä tagit"
+
+#: ../gramps/plugins/view/pedigreeview.py:2054
 msgid "Tree style"
 msgstr "Puun muoto"
 
-#: ../gramps/plugins/view/pedigreeview.py:2029
+#: ../gramps/plugins/view/pedigreeview.py:2056
 msgid "Standard"
 msgstr "Vakio"
 
-#: ../gramps/plugins/view/pedigreeview.py:2030
+#: ../gramps/plugins/view/pedigreeview.py:2057
 msgid "Compact"
 msgstr "Tiivis"
 
-#: ../gramps/plugins/view/pedigreeview.py:2031
+#: ../gramps/plugins/view/pedigreeview.py:2058
 msgid "Expanded"
 msgstr "Laajennettu"
 
-#: ../gramps/plugins/view/pedigreeview.py:2034
+#: ../gramps/plugins/view/pedigreeview.py:2061
 msgid "Tree direction"
 msgstr "Puun suunta"
 
-#: ../gramps/plugins/view/pedigreeview.py:2041
+#: ../gramps/plugins/view/pedigreeview.py:2068
 msgid "Tree size"
 msgstr "Puun koko"
 
@@ -34605,61 +34672,47 @@ msgstr "Lainausten puu"
 msgid "A view displaying citations and sources in a tree format."
 msgstr "Näkymässä ovat lainaukset ja lähteet puumuodossa."
 
-#: ../gramps/plugins/webreport/narrativeweb.py:334
-msgid "Gramps&nbsp;ID"
-msgstr "Gramps&nbsp;ID"
-
-#: ../gramps/plugins/webreport/narrativeweb.py:340
-msgid "Church Parish"
-msgstr "Seurakunta"
-
-#: ../gramps/plugins/webreport/narrativeweb.py:345
-msgid "Postal Code"
-msgstr "Postinumero"
-
-#: ../gramps/plugins/webreport/narrativeweb.py:348
-msgid "State/ Province"
-msgstr "Lääni, Osavaltio tai Provinssi"
-
-#: ../gramps/plugins/webreport/narrativeweb.py:353
-msgid "Alternate Locations"
-msgstr "Vaihtoehtoiset sijainnit"
-
-#: ../gramps/plugins/webreport/narrativeweb.py:354
-msgid "Locations"
-msgstr "Sijainnit"
-
-#: ../gramps/plugins/webreport/narrativeweb.py:356
-msgid "<absent>"
-msgstr "<puuttuva>"
-
 #. add section title
-#: ../gramps/plugins/webreport/narrativeweb.py:749
-#: ../gramps/plugins/webreport/narrativeweb.py:2400
+#: ../gramps/plugins/webreport/narrativeweb.py:741
+#: ../gramps/plugins/webreport/narrativeweb.py:2425
 msgid "Narrative"
 msgstr "Kerrottua"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:1062
+#: ../gramps/plugins/webreport/narrativeweb.py:1056
 #, python-format
 msgid "%(type)s: %(value)s"
 msgstr "%(type)s: %(value)s"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:1674
+#: ../gramps/plugins/webreport/narrativeweb.py:1478
+#: ../gramps/plugins/webreport/narrativeweb.py:2939
+#: ../gramps/plugins/webreport/narrativeweb.py:2965
+#: ../gramps/plugins/webreport/narrativeweb.py:3826
+msgid "State/ Province"
+msgstr "Lääni, Osavaltio tai Provinssi"
+
+#: ../gramps/plugins/webreport/narrativeweb.py:1480
+#: ../gramps/plugins/webreport/narrativeweb.py:2940
+#: ../gramps/plugins/webreport/narrativeweb.py:2966
+msgid "Postal Code"
+msgstr "Postinumero"
+
+#: ../gramps/plugins/webreport/narrativeweb.py:1675
 #, python-format
 msgid "Generated by %(gramps_home_html_start)sGramps%(html_end)s %(version)s"
 msgstr "Tuotettu %(gramps_home_html_start)sGramps%(html_end)s %(version)s"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:1684
+#: ../gramps/plugins/webreport/narrativeweb.py:1685
 #, python-format
 msgid "Last change was the %(date)s"
 msgstr "Viimeisin muutos %(date)s"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:1686
+#: ../gramps/plugins/webreport/narrativeweb.py:1688
 #, python-format
 msgid " on %(date)s"
 msgstr " versiolla %(date)s"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:1701
+#: ../gramps/plugins/webreport/narrativeweb.py:1709
+#: ../gramps/plugins/webreport/narrativeweb.py:1714
 #, python-format
 msgid "%(http_break)sCreated for %(subject_url)s"
 msgstr "%(http_break)sLinkki kotihenkilöön %(subject_url)s"
@@ -34668,79 +34721,108 @@ msgstr "%(http_break)sLinkki kotihenkilöön %(subject_url)s"
 #. is the style sheet either Basic-Blue or Visually Impaired,
 #. and menu layout is Drop Down?
 #. Basic Blue style sheet with navigation menus
-#: ../gramps/plugins/webreport/narrativeweb.py:1816
-#: ../gramps/plugins/webstuff/webstuff.py:63
+#: ../gramps/plugins/webreport/narrativeweb.py:1829
+#: ../gramps/plugins/webstuff/webstuff.py:64
 msgid "Basic-Blue"
 msgstr "Perus -Sininen"
 
 #. Visually Impaired style sheet with its navigation menus
-#: ../gramps/plugins/webreport/narrativeweb.py:1817
-#: ../gramps/plugins/webstuff/webstuff.py:95
+#: ../gramps/plugins/webreport/narrativeweb.py:1830
+#: ../gramps/plugins/webstuff/webstuff.py:96
 msgid "Visually Impaired"
 msgstr "Visuaalisesti heikentynyt"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:1856
-#: ../gramps/plugins/webreport/narrativeweb.py:2022
+#: ../gramps/plugins/webreport/narrativeweb.py:1869
+#: ../gramps/plugins/webreport/narrativeweb.py:2047
 msgid "Html|Home"
 msgstr "Koti"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:1866
-#: ../gramps/plugins/webreport/narrativeweb.py:1991
-#: ../gramps/plugins/webreport/narrativeweb.py:5557
+#: ../gramps/plugins/webreport/narrativeweb.py:1881
+#: ../gramps/plugins/webreport/narrativeweb.py:2016
+#: ../gramps/plugins/webreport/narrativeweb.py:5632
 msgid "Thumbnails"
 msgstr "Pikkukuvat"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:1867
-#: ../gramps/plugins/webreport/narrativeweb.py:1998
-#: ../gramps/plugins/webreport/narrativeweb.py:5754
-#: ../gramps/plugins/webreport/narrativeweb.py:9536
+#: ../gramps/plugins/webreport/narrativeweb.py:1882
+#: ../gramps/plugins/webreport/narrativeweb.py:2023
+#: ../gramps/plugins/webreport/narrativeweb.py:5829
+#: ../gramps/plugins/webreport/narrativeweb.py:9820
 msgid "Download"
 msgstr "Lataus"
 
 #. Add xml, doctype, meta and stylesheets
-#: ../gramps/plugins/webreport/narrativeweb.py:1868
-#: ../gramps/plugins/webreport/narrativeweb.py:1932
-#: ../gramps/plugins/webreport/narrativeweb.py:1999
-#: ../gramps/plugins/webreport/narrativeweb.py:7803
-#: ../gramps/plugins/webreport/narrativeweb.py:7917
+#: ../gramps/plugins/webreport/narrativeweb.py:1883
+#: ../gramps/plugins/webreport/narrativeweb.py:1949
+#: ../gramps/plugins/webreport/narrativeweb.py:2024
+#: ../gramps/plugins/webreport/narrativeweb.py:7890
+#: ../gramps/plugins/webreport/narrativeweb.py:8004
 msgid "Address Book"
 msgstr "Osoitekirja"
 
 #. add contact column
-#: ../gramps/plugins/webreport/narrativeweb.py:1869
-#: ../gramps/plugins/webreport/narrativeweb.py:2006
-#: ../gramps/plugins/webreport/narrativeweb.py:2043
-#: ../gramps/plugins/webreport/narrativeweb.py:5871
+#: ../gramps/plugins/webreport/narrativeweb.py:1885
+#: ../gramps/plugins/webreport/narrativeweb.py:2031
+#: ../gramps/plugins/webreport/narrativeweb.py:2068
+#: ../gramps/plugins/webreport/narrativeweb.py:5945
 msgid "Contact"
 msgstr "Yhteystieto"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:1870
+#: ../gramps/plugins/webreport/narrativeweb.py:1887
 #: ../gramps/plugins/webreport/webplugins.gpr.py:55
 msgid "Web Calendar"
 msgstr "Nettikalenteri"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:2419
-#: ../gramps/plugins/webreport/narrativeweb.py:7836
+#: ../gramps/plugins/webreport/narrativeweb.py:1967
+#: ../gramps/plugins/webreport/narrativeweb.py:5300
+msgid "Previous"
+msgstr "Edellinen"
+
+#: ../gramps/plugins/webreport/narrativeweb.py:1969
+#: ../gramps/plugins/webreport/narrativeweb.py:5312
+msgid "Next"
+msgstr "Seuraava"
+
+#: ../gramps/plugins/webreport/narrativeweb.py:2444
+#: ../gramps/plugins/webreport/narrativeweb.py:7923
 msgid "Web Links"
 msgstr "Nettilinkit"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:2468
+#: ../gramps/plugins/webreport/narrativeweb.py:2493
 msgid " [Click to Go]"
 msgstr " [Napsauta siirtymiseksi]"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:2492
+#: ../gramps/plugins/webreport/narrativeweb.py:2517
 msgid "Latter-Day Saints/ LDS Ordinance"
 msgstr "Mormonisakramentti"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:2677
-#: ../gramps/plugins/webreport/narrativeweb.py:2678
-#: ../gramps/plugins/webreport/narrativeweb.py:6442
-#: ../gramps/plugins/webreport/narrativeweb.py:6728
+#: ../gramps/plugins/webreport/narrativeweb.py:2704
+#: ../gramps/plugins/webreport/narrativeweb.py:2705
+#: ../gramps/plugins/webreport/narrativeweb.py:6523
+#: ../gramps/plugins/webreport/narrativeweb.py:6824
 msgid "Family Map"
 msgstr "Perhekartta"
 
+#: ../gramps/plugins/webreport/narrativeweb.py:2937
+#: ../gramps/plugins/webreport/narrativeweb.py:2963
+msgid "Church Parish"
+msgstr "Seurakunta"
+
+#: ../gramps/plugins/webreport/narrativeweb.py:2953
+msgid "Alternate Locations"
+msgstr "Vaihtoehtoiset sijainnit"
+
+#: ../gramps/plugins/webreport/narrativeweb.py:2984
+msgid "Locations"
+msgstr "Sijainnit"
+
+#: ../gramps/plugins/webreport/narrativeweb.py:3215
+#: ../gramps/plugins/webreport/narrativeweb.py:4591
+#: ../gramps/plugins/webreport/narrativeweb.py:6158
+msgid "<absent>"
+msgstr "<puuttuva>"
+
 #. feature request 2356: avoid genitive form
-#: ../gramps/plugins/webreport/narrativeweb.py:3198
+#: ../gramps/plugins/webreport/narrativeweb.py:3231
 #, python-format
 msgid ""
 "This page contains an index of all the individuals in the database with the "
@@ -34751,34 +34833,35 @@ msgstr ""
 "on %s. Henkilön nimen napauttaminen vie sinut valitun henkilön sivulle."
 
 #. Name Column
-#: ../gramps/plugins/webreport/narrativeweb.py:3215
-#: ../gramps/plugins/webreport/narrativeweb.py:6050
+#: ../gramps/plugins/webreport/narrativeweb.py:3248
+#: ../gramps/plugins/webreport/narrativeweb.py:6124
 msgid "Given Name"
 msgstr "Etunimi"
 
 #. set progress bar pass for Repositories
-#: ../gramps/plugins/webreport/narrativeweb.py:3392
-#: ../gramps/plugins/webreport/narrativeweb.py:3722
-#: ../gramps/plugins/webreport/narrativeweb.py:4072
-#: ../gramps/plugins/webreport/narrativeweb.py:4729
-#: ../gramps/plugins/webreport/narrativeweb.py:4971
-#: ../gramps/plugins/webreport/narrativeweb.py:5979
-#: ../gramps/plugins/webreport/narrativeweb.py:7601
-#: ../gramps/plugins/webreport/narrativeweb.py:8295
-#: ../gramps/plugins/webreport/narrativeweb.py:8300
-#: ../gramps/plugins/webreport/narrativeweb.py:8831
-#: ../gramps/plugins/webreport/narrativeweb.py:8884
-#: ../gramps/plugins/webreport/narrativeweb.py:8904
-#: ../gramps/plugins/webreport/narrativeweb.py:8946
+#: ../gramps/plugins/webreport/narrativeweb.py:3429
+#: ../gramps/plugins/webreport/narrativeweb.py:3763
+#: ../gramps/plugins/webreport/narrativeweb.py:4133
+#: ../gramps/plugins/webreport/narrativeweb.py:4798
+#: ../gramps/plugins/webreport/narrativeweb.py:5039
+#: ../gramps/plugins/webreport/narrativeweb.py:6053
+#: ../gramps/plugins/webreport/narrativeweb.py:7685
+#: ../gramps/plugins/webreport/narrativeweb.py:8568
+#: ../gramps/plugins/webreport/narrativeweb.py:8573
+#: ../gramps/plugins/webreport/narrativeweb.py:9104
+#: ../gramps/plugins/webreport/narrativeweb.py:9157
+#: ../gramps/plugins/webreport/narrativeweb.py:9177
+#: ../gramps/plugins/webreport/narrativeweb.py:9186
+#: ../gramps/plugins/webreport/narrativeweb.py:9228
 msgid "Narrated Web Site Report"
 msgstr "Kertova-nettisivusto raportti"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:3393
+#: ../gramps/plugins/webreport/narrativeweb.py:3430
 msgid "Creating family pages..."
 msgstr "Luodaan perhesivuja..."
 
 #. Families list page message
-#: ../gramps/plugins/webreport/narrativeweb.py:3424
+#: ../gramps/plugins/webreport/narrativeweb.py:3461
 msgid ""
 "This page contains an index of all the families/ relationships in the "
 "database, sorted by their family name/ surname. Clicking on a person&#8217;s "
@@ -34788,23 +34871,23 @@ msgstr ""
 "perhenimen/sukunimen mukaan aakkostettuna. Henkilön napsauttaminen vie sinut "
 "valitun suhteen sivulle."
 
-#: ../gramps/plugins/webreport/narrativeweb.py:3470
-#: ../gramps/plugins/webreport/narrativeweb.py:3783
-#: ../gramps/plugins/webreport/narrativeweb.py:4132
-#: ../gramps/plugins/webreport/narrativeweb.py:4477
+#: ../gramps/plugins/webreport/narrativeweb.py:3507
+#: ../gramps/plugins/webreport/narrativeweb.py:3824
+#: ../gramps/plugins/webreport/narrativeweb.py:4193
+#: ../gramps/plugins/webreport/narrativeweb.py:4541
 msgid "Letter"
 msgstr "Kirjain"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:3513
+#: ../gramps/plugins/webreport/narrativeweb.py:3553
 msgid "Families beginning with letter "
 msgstr "Annetulla kirjaimella alkavat perheet"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:3723
+#: ../gramps/plugins/webreport/narrativeweb.py:3764
 msgid "Creating place pages"
 msgstr "Luodaan paikkasivut"
 
 #. place list page message
-#: ../gramps/plugins/webreport/narrativeweb.py:3755
+#: ../gramps/plugins/webreport/narrativeweb.py:3796
 msgid ""
 "This page contains an index of all the places in the database, sorted by "
 "their title. Clicking on a place&#8217;s title will take you to that "
@@ -34814,25 +34897,25 @@ msgstr ""
 "niiden nimien mukaan. Paikan nimen napauttaminen vie sinut valitun paikan "
 "sivulle."
 
-#: ../gramps/plugins/webreport/narrativeweb.py:3784
+#: ../gramps/plugins/webreport/narrativeweb.py:3825
 msgid "Place Name | Name"
 msgstr "Paikka"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:3829
+#: ../gramps/plugins/webreport/narrativeweb.py:3873
 #, python-format
 msgid "Places beginning with letter %s"
 msgstr "Kirjaimella %s alkavat paikat"
 
 #. section title
-#: ../gramps/plugins/webreport/narrativeweb.py:3973
+#: ../gramps/plugins/webreport/narrativeweb.py:4029
 msgid "Place Map"
 msgstr "Paikkavalikko"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:4073
+#: ../gramps/plugins/webreport/narrativeweb.py:4134
 msgid "Creating event pages"
 msgstr "Luodaan tapahtumasivut"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:4105
+#: ../gramps/plugins/webreport/narrativeweb.py:4166
 msgid ""
 "This page contains an index of all the events in the database, sorted by "
 "their type and date (if one is present). Clicking on an event&#8217;s Gramps "
@@ -34842,17 +34925,17 @@ msgstr ""
 "niiden tyypin ja mahdollisen päivämäärän (jos on) mukaan lajiteltuna. "
 "Tapahtuman Gramps ID-tunnuksen napsauttaminen avaa valitun tapahtuman sivun."
 
-#: ../gramps/plugins/webreport/narrativeweb.py:4200
+#: ../gramps/plugins/webreport/narrativeweb.py:4263
 #, python-format
 msgid "Event types beginning with letter %s"
 msgstr "Tapahtumatyypit jotka alkavat kirjaimella %s"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:4439
+#: ../gramps/plugins/webreport/narrativeweb.py:4503
 msgid "Surnames by person count"
 msgstr "Sukunimet henkilömäärän mukaisesti"
 
 #. page message
-#: ../gramps/plugins/webreport/narrativeweb.py:4446
+#: ../gramps/plugins/webreport/narrativeweb.py:4510
 msgid ""
 "This page contains an index of all the surnames in the database. Selecting a "
 "link will lead to a list of individuals in the database with this same "
@@ -34862,25 +34945,25 @@ msgstr ""
 "napsauttaminen vie luetteloon tietokannan henkilöistä, joilla on tämä sama "
 "sukunimi."
 
-#: ../gramps/plugins/webreport/narrativeweb.py:4491
+#: ../gramps/plugins/webreport/narrativeweb.py:4556
 msgid "Number of People"
 msgstr "Henkilöiden määrä"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:4536
+#: ../gramps/plugins/webreport/narrativeweb.py:4604
 #, python-format
 msgid "Surnames beginning with letter %s"
 msgstr "Kirjaimella %s alkavat sukunimet"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:4641
-#: ../gramps/plugins/webreport/webcal.py:561
+#: ../gramps/plugins/webreport/narrativeweb.py:4710
+#: ../gramps/plugins/webreport/webcal.py:568
 msgid "Home"
 msgstr "Koti"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:4730
+#: ../gramps/plugins/webreport/narrativeweb.py:4799
 msgid "Creating source pages"
 msgstr "Luodaan lähdesivut"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:4772
+#: ../gramps/plugins/webreport/narrativeweb.py:4841
 msgid ""
 "This page contains an index of all the sources in the database, sorted by "
 "their title. Clicking on a source&#8217;s title will take you to that "
@@ -34889,19 +34972,19 @@ msgstr ""
 "Tällä sivulla on lista kaikista tietokannan lähteistä aakkostettuna niiden "
 "nimikkeen mukaan. Nimikkeen napsauttaminen vie sinut ko. lähteen sivulle."
 
-#: ../gramps/plugins/webreport/narrativeweb.py:4791
+#: ../gramps/plugins/webreport/narrativeweb.py:4860
 msgid "Source Name|Name"
 msgstr "Lähde"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:4889
+#: ../gramps/plugins/webreport/narrativeweb.py:4958
 msgid "Publication information"
 msgstr "Julkaisutiedot"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:4972
+#: ../gramps/plugins/webreport/narrativeweb.py:5040
 msgid "Creating media pages"
 msgstr "Luodaan mediasivut"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:5020
+#: ../gramps/plugins/webreport/narrativeweb.py:5088
 msgid ""
 "This page contains an index of all the media objects in the database, sorted "
 "by their title. Clicking on the title will take you to that media "
@@ -34913,24 +34996,20 @@ msgstr ""
 "mediatiedoston sivulle. Jos näet median kokotiedot kuvan yläpuolella, kuvaa "
 "napsauttamalla näet täysimittaisen version kuvasta.  "
 
-#: ../gramps/plugins/webreport/narrativeweb.py:5045
+#: ../gramps/plugins/webreport/narrativeweb.py:5113
 msgid "Media | Name"
 msgstr "Mediatiedosto"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:5047
+#: ../gramps/plugins/webreport/narrativeweb.py:5115
 msgid "Mime Type"
 msgstr "Näyttötyyppi"
 
 # muutettu20160516
-#: ../gramps/plugins/webreport/narrativeweb.py:5111
+#: ../gramps/plugins/webreport/narrativeweb.py:5179
 msgid "Below unused media objects"
 msgstr "Alla käyttämättömät mediatiedostot"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:5228
-msgid "Previous"
-msgstr "Edellinen"
-
-#: ../gramps/plugins/webreport/narrativeweb.py:5229
+#: ../gramps/plugins/webreport/narrativeweb.py:5301
 #, python-format
 msgid ""
 "%(strong1_start)s%(page_number)d%(strong_end)s of %(strong2_start)s"
@@ -34939,24 +35018,20 @@ msgstr ""
 "%(strong1_start)s%(page_number)d%(strong_end)s / %(strong2_start)s"
 "%(total_pages)d%(strong_end)s"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:5240
-msgid "Next"
-msgstr "Seuraava"
-
 #. missing media error message
-#: ../gramps/plugins/webreport/narrativeweb.py:5243
+#: ../gramps/plugins/webreport/narrativeweb.py:5315
 msgid "The file has been moved or deleted."
 msgstr "Tiedosto on siirretty tai poistettu."
 
-#: ../gramps/plugins/webreport/narrativeweb.py:5398
+#: ../gramps/plugins/webreport/narrativeweb.py:5471
 msgid "File Type"
 msgstr "Tiedostotyyppi"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:5499
+#: ../gramps/plugins/webreport/narrativeweb.py:5574
 msgid "Missing media object:"
 msgstr "Puuttuva mediatiedosto:"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:5562
+#: ../gramps/plugins/webreport/narrativeweb.py:5637
 msgid ""
 "This page displays a indexed list of all the media objects in this "
 "database.  It is sorted by media title.  There is an index of all the media "
@@ -34968,11 +35043,11 @@ msgstr ""
 "kuvatiedostoista tietokannassa. Kuvakkeen napsauttaminen vie sinut valitun "
 "median sivulle."
 
-#: ../gramps/plugins/webreport/narrativeweb.py:5581
+#: ../gramps/plugins/webreport/narrativeweb.py:5656
 msgid "Thumbnail Preview"
 msgstr "Pikkukuvien esikatselu"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:5760
+#: ../gramps/plugins/webreport/narrativeweb.py:5835
 msgid ""
 "This page is for the user/ creator of this Family Tree/ Narrative website to "
 "share a couple of files with you regarding their family.  If there are any "
@@ -34986,20 +35061,20 @@ msgstr ""
 "Lataussivulla ja tiedostoilla on sama käyttöoikeusrajoitus kuin on muilla "
 "näillä nettisivuilla."
 
-#: ../gramps/plugins/webreport/narrativeweb.py:5786
+#: ../gramps/plugins/webreport/narrativeweb.py:5861
 msgid "File Name"
 msgstr "Tiedostonimi"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:5788
+#: ../gramps/plugins/webreport/narrativeweb.py:5863
 msgid "Last Modified"
 msgstr "Viimeisin muutos"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:5980
+#: ../gramps/plugins/webreport/narrativeweb.py:6054
 msgid "Creating individual pages"
 msgstr "Luodaan henkilösivut"
 
 #. Individual List page message
-#: ../gramps/plugins/webreport/narrativeweb.py:6023
+#: ../gramps/plugins/webreport/narrativeweb.py:6097
 msgid ""
 "This page contains an index of all the individuals in the database, sorted "
 "by their last names. Selecting the person&#8217;s name will take you to that "
@@ -35009,18 +35084,18 @@ msgstr ""
 "lajiteltuna. Henkilön nimen napsauttaminen vie sinut valitun henkilön "
 "sivulle."
 
-#: ../gramps/plugins/webreport/narrativeweb.py:6103
+#: ../gramps/plugins/webreport/narrativeweb.py:6182
 #, python-format
 msgid "Surnames %(surname)s beginning with letter %(letter)s"
 msgstr "Sukunimet %(surname)s alkaen kirjaimella %(letter)s"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:6582
+#: ../gramps/plugins/webreport/narrativeweb.py:6676
 #, python-format
 msgid "Tracking %s"
 msgstr "Jäljitetään %s"
 
 #. page description
-#: ../gramps/plugins/webreport/narrativeweb.py:6586
+#: ../gramps/plugins/webreport/narrativeweb.py:6680
 msgid ""
 "This map page represents that person and any descendants with all of their "
 "event/ places. If you place your mouse over the marker it will display the "
@@ -35033,23 +35108,23 @@ msgstr ""
 "viitteistä ovat aikajärjestyksessä (jos löytyy). Napsauttamalla nimeä "
 "viitteiden osassa siirryt valitun paikan sivulle."
 
-#: ../gramps/plugins/webreport/narrativeweb.py:6659
+#: ../gramps/plugins/webreport/narrativeweb.py:6751
 msgid "Drop Markers"
 msgstr "Pudota markkerit"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:6680
+#: ../gramps/plugins/webreport/narrativeweb.py:6776
 msgid "Place Title"
 msgstr "Paikan nimi"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:7162
+#: ../gramps/plugins/webreport/narrativeweb.py:7259
 msgid "Call Name"
 msgstr "Kutsumanimi"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:7180
+#: ../gramps/plugins/webreport/narrativeweb.py:7277
 msgid "Nick Name"
 msgstr "Lempinimi"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:7223
+#: ../gramps/plugins/webreport/narrativeweb.py:7323
 msgid "Age at Death"
 msgstr "Ikä kuollessa"
 
@@ -35057,39 +35132,39 @@ msgstr "Ikä kuollessa"
 #. actually be StepFather-in-law), but it is too expensive to
 #. calculate out the correct relationship using the Relationship
 #. Calculator
-#: ../gramps/plugins/webreport/narrativeweb.py:7338
+#: ../gramps/plugins/webreport/narrativeweb.py:7438
 msgid "Stepfather"
 msgstr "Isäpuoli"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:7348
+#: ../gramps/plugins/webreport/narrativeweb.py:7448
 msgid "Stepmother"
 msgstr "Äitipuoli"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:7371
+#: ../gramps/plugins/webreport/narrativeweb.py:7474
 msgid "Not siblings"
 msgstr "Ei sisaruksia"
 
 # 20160806muutettu
 # Suhde kotihenkilöön=Kotihenkilön suhde
-#: ../gramps/plugins/webreport/narrativeweb.py:7433
+#: ../gramps/plugins/webreport/narrativeweb.py:7536
 msgid "Relation to the center person"
 msgstr "Kotihenkilön suhde"
 
 # 20160806muutettu
 # Suhde kotihenkilöön=Suhde päähenkilöön
-#: ../gramps/plugins/webreport/narrativeweb.py:7470
+#: ../gramps/plugins/webreport/narrativeweb.py:7573
 msgid "Relation to main person"
 msgstr "Suhde päähenkilöön"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:7472
+#: ../gramps/plugins/webreport/narrativeweb.py:7575
 msgid "Relation within this family (if not by birth)"
 msgstr "Suhde tähän perheeseen (jollei syntymän kautta)"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:7602
+#: ../gramps/plugins/webreport/narrativeweb.py:7686
 msgid "Creating repository pages"
 msgstr "Luodaan arkistosivut"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:7645
+#: ../gramps/plugins/webreport/narrativeweb.py:7729
 msgid ""
 "This page contains an index of all the repositories in the database, sorted "
 "by their title. Clicking on a repositories&#8217;s title will take you to "
@@ -35098,12 +35173,12 @@ msgstr ""
 "Tällä sivulla on hakemisto kaikista tietokannan arkistoista lajiteltuna "
 "niiden nimen mukaan. Nimen napauttaminen vie sinut valitun arkiston sivulle."
 
-#: ../gramps/plugins/webreport/narrativeweb.py:7662
+#: ../gramps/plugins/webreport/narrativeweb.py:7747
 msgid "Repository |Name"
 msgstr "Arkisto"
 
 #. Address Book Page message
-#: ../gramps/plugins/webreport/narrativeweb.py:7811
+#: ../gramps/plugins/webreport/narrativeweb.py:7898
 msgid ""
 "This page contains an index of all the individuals in the database, sorted "
 "by their surname, with one of the following: Address, Residence, or Web "
@@ -35114,232 +35189,247 @@ msgstr ""
 "lajiteltuna, joilla on osoite, asuinpaikka tai nettilinkki tietokannassa. "
 "Henkilön nimen napauttaminen vie sinut valitun henkilön Osoitekirjasivulle."
 
-#: ../gramps/plugins/webreport/narrativeweb.py:7833
+#: ../gramps/plugins/webreport/narrativeweb.py:7920
 msgid "Full Name"
 msgstr "Koko nimi"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8090
+# 20160901uusi
+#: ../gramps/plugins/webreport/narrativeweb.py:8084
+msgid "Database overview"
+msgstr "Tietokannan kuvaus"
+
+# 20160901uusi
+#: ../gramps/plugins/webreport/narrativeweb.py:8150
+msgid "Narrative web content report for"
+msgstr "Kertova-nettisivusto sisältöraportti"
+
+#: ../gramps/plugins/webreport/narrativeweb.py:8359
 #, python-format
 msgid "Neither %(current)s nor %(parent)s are directories"
 msgstr "%(current)s ja %(parent)s eivät ole hakemistoja"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8099
-#: ../gramps/plugins/webreport/narrativeweb.py:8104
-#: ../gramps/plugins/webreport/narrativeweb.py:8117
-#: ../gramps/plugins/webreport/narrativeweb.py:8122
+#: ../gramps/plugins/webreport/narrativeweb.py:8368
+#: ../gramps/plugins/webreport/narrativeweb.py:8373
+#: ../gramps/plugins/webreport/narrativeweb.py:8386
+#: ../gramps/plugins/webreport/narrativeweb.py:8391
 #, python-format
 msgid "Could not create the directory: %s"
 msgstr "Hakemiston '%s' luonti epäonnistui"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8129
+#: ../gramps/plugins/webreport/narrativeweb.py:8398
 msgid "Invalid file name"
 msgstr "Virheellinen tiedoston nimi"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8130
+#: ../gramps/plugins/webreport/narrativeweb.py:8399
 msgid "The archive file must be a file, not a directory"
 msgstr "Arkistotiedosto ei voi olla hakemisto"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8261
+#: ../gramps/plugins/webreport/narrativeweb.py:8534
 #, python-format
 msgid "ID=%(grampsid)s, path=%(dir)s"
 msgstr "ID=%(grampsid)s, polku=%(dir)s"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8266
+#: ../gramps/plugins/webreport/narrativeweb.py:8539
 msgid "Missing media objects:"
 msgstr "Puuttuva mediatiedosto:"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8296
+#: ../gramps/plugins/webreport/narrativeweb.py:8569
 msgid "Applying Person Filter..."
 msgstr "Käytetään henkilösuodinta..."
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8301
+#: ../gramps/plugins/webreport/narrativeweb.py:8574
 msgid "Constructing list of other objects..."
 msgstr "Kerätään muiden kohteiden listaa..."
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8540
+#: ../gramps/plugins/webreport/narrativeweb.py:8813
 #, python-format
 msgid "Family of %(husband)s and %(spouse)s"
 msgstr "%(husband)s ja %(spouse)s muodostama perhe"
 
 #. Only the name of the husband is known
 #. Only the name of the wife is known
-#: ../gramps/plugins/webreport/narrativeweb.py:8546
-#: ../gramps/plugins/webreport/narrativeweb.py:8550
+#: ../gramps/plugins/webreport/narrativeweb.py:8819
+#: ../gramps/plugins/webreport/narrativeweb.py:8823
 #, python-format
 msgid "Family of %s"
 msgstr "Perhe %s"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8832
+#: ../gramps/plugins/webreport/narrativeweb.py:9105
 msgid "Creating GENDEX file"
 msgstr "GENDEX tiedostoa luodaan"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8885
+#: ../gramps/plugins/webreport/narrativeweb.py:9158
 msgid "Creating surname pages"
 msgstr "Luodaan sukunimisivut"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8905
+#: ../gramps/plugins/webreport/narrativeweb.py:9178
 msgid "Creating thumbnail preview page..."
 msgstr "Luodaan pikkukuvalla esikatselusivu..."
 
-#: ../gramps/plugins/webreport/narrativeweb.py:8947
+# 20160901uusi
+#: ../gramps/plugins/webreport/narrativeweb.py:9187
+msgid "Creating statistics page..."
+msgstr "Luodaan tilastosivu..."
+
+#: ../gramps/plugins/webreport/narrativeweb.py:9229
 msgid "Creating address book pages ..."
 msgstr "Luodaan osoitekirjasivuja..."
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9331
+#: ../gramps/plugins/webreport/narrativeweb.py:9614
 msgid "Store web pages in .tar.gz archive"
 msgstr "Talleta nettisivut .tar.gz arkistoon"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9333
+#: ../gramps/plugins/webreport/narrativeweb.py:9616
 msgid "Whether to store the web pages in an archive file"
 msgstr "Talletetaanko nettisivut .tar.gz arkistoon"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9344
-#: ../gramps/plugins/webreport/webcal.py:1598
+#: ../gramps/plugins/webreport/narrativeweb.py:9627
+#: ../gramps/plugins/webreport/webcal.py:1613
 msgid "The destination directory for the web files"
 msgstr "Kohdehakemisto nettitiedostoille"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9350
+#: ../gramps/plugins/webreport/narrativeweb.py:9633
 msgid "My Family Tree"
 msgstr "Sukupuuni"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9350
+#: ../gramps/plugins/webreport/narrativeweb.py:9633
 msgid "Web site title"
 msgstr "Nettisivuston otsikko"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9351
+#: ../gramps/plugins/webreport/narrativeweb.py:9634
 msgid "The title of the web site"
 msgstr "Nettisivuston otsikko"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9356
+#: ../gramps/plugins/webreport/narrativeweb.py:9639
 msgid "Select filter to restrict people that appear on web site"
 msgstr "Valitse suodin rajoittamaan henkilöitä jotka näkyvät nettisivustossa"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9369
-#: ../gramps/plugins/webreport/webcal.py:1641
+#: ../gramps/plugins/webreport/narrativeweb.py:9652
+#: ../gramps/plugins/webreport/webcal.py:1656
 msgid "File extension"
 msgstr "Tiedostotarkennin"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9372
-#: ../gramps/plugins/webreport/webcal.py:1644
+#: ../gramps/plugins/webreport/narrativeweb.py:9655
+#: ../gramps/plugins/webreport/webcal.py:1659
 msgid "The extension to be used for the web files"
 msgstr "Nettisivujen tiedostotarkennin"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9375
-#: ../gramps/plugins/webreport/webcal.py:1647
+#: ../gramps/plugins/webreport/narrativeweb.py:9658
+#: ../gramps/plugins/webreport/webcal.py:1662
 msgid "Copyright"
 msgstr "Tekijänoikeudet"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9378
-#: ../gramps/plugins/webreport/webcal.py:1650
+#: ../gramps/plugins/webreport/narrativeweb.py:9661
+#: ../gramps/plugins/webreport/webcal.py:1665
 msgid "The copyright to be used for the web files"
 msgstr "Nettisivujen tekijänoikeudet"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9381
-#: ../gramps/plugins/webreport/webcal.py:1656
+#: ../gramps/plugins/webreport/narrativeweb.py:9664
+#: ../gramps/plugins/webreport/webcal.py:1671
 msgid "StyleSheet"
 msgstr "Tyylitiedosto"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9386
-#: ../gramps/plugins/webreport/webcal.py:1659
+#: ../gramps/plugins/webreport/narrativeweb.py:9669
+#: ../gramps/plugins/webreport/webcal.py:1674
 msgid "The stylesheet to be used for the web pages"
 msgstr "Nettisivuilla käytettävä tyylitiedosto"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9391
+#: ../gramps/plugins/webreport/narrativeweb.py:9674
 msgid "Horizontal -- Default"
 msgstr "Vaakasuoraan -- oletus"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9392
+#: ../gramps/plugins/webreport/narrativeweb.py:9675
 msgid "Vertical   -- Left Side"
 msgstr "Pystysuoraan -- vasen sivu"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9393
+#: ../gramps/plugins/webreport/narrativeweb.py:9676
 msgid "Fade       -- WebKit Browsers Only"
 msgstr "Häivennä     -- vain WebKit moottoria käyttävät selaimet"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9394
-#: ../gramps/plugins/webreport/narrativeweb.py:9408
+#: ../gramps/plugins/webreport/narrativeweb.py:9677
+#: ../gramps/plugins/webreport/narrativeweb.py:9691
 msgid "Drop-Down  -- WebKit Browsers Only"
 msgstr "Pudota       -- vain WebKit moottoria käyttävät selaimet"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9396
+#: ../gramps/plugins/webreport/narrativeweb.py:9679
 msgid "Navigation Menu Layout"
 msgstr "Navigointi valikon asetelma"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9400
+#: ../gramps/plugins/webreport/narrativeweb.py:9683
 msgid "Choose which layout for the Navigation Menus."
 msgstr "Valitse navigointi valikon asetelma"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9407
+#: ../gramps/plugins/webreport/narrativeweb.py:9690
 msgid "Normal Outline Style"
 msgstr "Normaali asetelmatyyli"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9411
+#: ../gramps/plugins/webreport/narrativeweb.py:9694
 msgid "Citation Referents Layout"
 msgstr "Lainausviitteiden asetelma"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9415
+#: ../gramps/plugins/webreport/narrativeweb.py:9698
 msgid ""
 "Determine the default layout for the Source Page's Citation Referents section"
 msgstr ""
 "Määritä oletusasetelma käytettäväksi lähdesivun lainausviitteet osiossa"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9419
+#: ../gramps/plugins/webreport/narrativeweb.py:9702
 msgid "Include ancestor's tree"
 msgstr "Lisää kaavio esivanhemmista"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9420
+#: ../gramps/plugins/webreport/narrativeweb.py:9703
 msgid "Whether to include an ancestor graph on each individual page"
 msgstr "Lisätäänkö kaavio esivanhemmista jokaiselle henkilösivulle"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9425
+#: ../gramps/plugins/webreport/narrativeweb.py:9708
 msgid "Graph generations"
 msgstr "Kaavion sukupolvet"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9426
+#: ../gramps/plugins/webreport/narrativeweb.py:9709
 msgid "The number of generations to include in the ancestor graph"
 msgstr "Montako sukupolvea tulee esivanhempien kaavioon "
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9436
+#: ../gramps/plugins/webreport/narrativeweb.py:9720
 msgid "Page Generation"
 msgstr "Sivun luonti"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9439
+#: ../gramps/plugins/webreport/narrativeweb.py:9723
 msgid "Home page note"
 msgstr "Kotisivun lisätietoteksti"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9440
+#: ../gramps/plugins/webreport/narrativeweb.py:9724
 msgid "A note to be used on the home page"
 msgstr "Kotisivulla näytettävä lisätietoteksti"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9443
+#: ../gramps/plugins/webreport/narrativeweb.py:9727
 msgid "Home page image"
 msgstr "Kotisivun kuva"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9444
+#: ../gramps/plugins/webreport/narrativeweb.py:9728
 msgid "An image to be used on the home page"
 msgstr "Kotisivulla näytettävä kuva"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9447
+#: ../gramps/plugins/webreport/narrativeweb.py:9731
 msgid "Introduction note"
 msgstr "Johdannon lisätietoteksti"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9448
+#: ../gramps/plugins/webreport/narrativeweb.py:9732
 msgid "A note to be used as the introduction"
 msgstr "Johdantona käytettävä lisätietoteksti"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9451
+#: ../gramps/plugins/webreport/narrativeweb.py:9735
 msgid "Introduction image"
 msgstr "Johdannon kuva"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9452
+#: ../gramps/plugins/webreport/narrativeweb.py:9736
 msgid "An image to be used as the introduction"
 msgstr "Johdannossa käytettävä kuva"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9455
+#: ../gramps/plugins/webreport/narrativeweb.py:9739
 msgid "Publisher contact note"
 msgstr "Julkaisijan yhteystietojen lisätietoteksti"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9456
+#: ../gramps/plugins/webreport/narrativeweb.py:9740
 msgid ""
 "A note to be used as the publisher contact.\n"
 "If no publisher information is given,\n"
@@ -35349,11 +35439,11 @@ msgstr ""
 "Lisätietojen puuttuessa\n"
 "ei luoda kontaktisivuakaan"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9462
+#: ../gramps/plugins/webreport/narrativeweb.py:9746
 msgid "Publisher contact image"
 msgstr "Julkaisijan yhteystietoihin liittyvä kuva"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9463
+#: ../gramps/plugins/webreport/narrativeweb.py:9747
 msgid ""
 "An image to be used as the publisher contact.\n"
 "If no publisher information is given,\n"
@@ -35363,45 +35453,45 @@ msgstr ""
 "Lisätietojen puuttuessa\n"
 "ei luoda kontaktisivuakaan"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9469
+#: ../gramps/plugins/webreport/narrativeweb.py:9753
 msgid "HTML user header"
 msgstr "HTML ylätunniste"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9470
+#: ../gramps/plugins/webreport/narrativeweb.py:9754
 msgid "A note to be used as the page header"
 msgstr "Sivun ylätunnisteena käytettävä lisätietoteksti"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9473
+#: ../gramps/plugins/webreport/narrativeweb.py:9757
 msgid "HTML user footer"
 msgstr "HTML alatunniste"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9474
+#: ../gramps/plugins/webreport/narrativeweb.py:9758
 msgid "A note to be used as the page footer"
 msgstr "Sivun alatunnisteena käytettävä lisätietoteksti"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9477
+#: ../gramps/plugins/webreport/narrativeweb.py:9761
 msgid "Include images and media objects"
 msgstr "Lisää kuvat ja muut mediatiedostot"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9479
+#: ../gramps/plugins/webreport/narrativeweb.py:9763
 msgid "Whether to include a gallery of media objects"
 msgstr "Lisätäänkö kuvat ja muut mediatiedostot"
 
 # muutettu20160516
-#: ../gramps/plugins/webreport/narrativeweb.py:9485
+#: ../gramps/plugins/webreport/narrativeweb.py:9769
 msgid "Include unused images and media objects"
 msgstr "Liitä mukaan käyttämättömät kuvat ja mediatiedostot"
 
 # muutettu20160516
-#: ../gramps/plugins/webreport/narrativeweb.py:9486
+#: ../gramps/plugins/webreport/narrativeweb.py:9770
 msgid "Whether to include unused or unreferenced media objects"
 msgstr "Lisätäänkö käyttämättömät tai viittaamattomat mediatiedostot"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9491
+#: ../gramps/plugins/webreport/narrativeweb.py:9775
 msgid "Create and only use thumbnail- sized images"
 msgstr "Luo ja käytä vain esikatselukuvan kokoisia kuvia"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9493
+#: ../gramps/plugins/webreport/narrativeweb.py:9777
 msgid ""
 "This option allows you to create only thumbnail images instead of the full-"
 "sized images on the Media Page. This will allow you to have a much smaller "
@@ -35411,11 +35501,11 @@ msgstr ""
 "täysimittaisten kuvien sijaan. Näin kuormitat vähemmän "
 "nettipalveluntarjoajasi palvelinta."
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9502
+#: ../gramps/plugins/webreport/narrativeweb.py:9786
 msgid "Max width of initial image"
 msgstr "Alkuperäisen kuvan suurin leveys"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9504
+#: ../gramps/plugins/webreport/narrativeweb.py:9788
 msgid ""
 "This allows you to set the maximum width of the image shown on the media "
 "page. Set to 0 for no limit."
@@ -35423,11 +35513,11 @@ msgstr ""
 "Tämä sallii sinun asettavan mediasivulla näytettävän kuvan enimmäisleveyden. "
 "Aseta 0 kun rajoitusta ei ole."
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9509
+#: ../gramps/plugins/webreport/narrativeweb.py:9793
 msgid "Max height of initial image"
 msgstr "Alkuperäisen kuvan suurin korkeus"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9511
+#: ../gramps/plugins/webreport/narrativeweb.py:9795
 msgid ""
 "This allows you to set the maximum height of the image shown on the media "
 "page. Set to 0 for no limit."
@@ -35435,162 +35525,162 @@ msgstr ""
 "Tämä sallii sinun asettavan mediasivulla näytettävän kuvan "
 "enimmäiskorkeuden. Aseta 0 kun rajoitusta ei ole."
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9517
+#: ../gramps/plugins/webreport/narrativeweb.py:9801
 msgid "Suppress Gramps ID"
 msgstr "Jätä pois Gramps ID"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9518
+#: ../gramps/plugins/webreport/narrativeweb.py:9802
 msgid "Whether to include the Gramps ID of objects"
 msgstr "Lisätäänkö kohteiden Gramps ID"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9539
+#: ../gramps/plugins/webreport/narrativeweb.py:9823
 msgid "Include download page"
 msgstr "Lisää lataussivu"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9541
+#: ../gramps/plugins/webreport/narrativeweb.py:9825
 msgid "Whether to include a database download option"
 msgstr "Lisätäänkö tietokannan latausmahdollisuus"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9546
-#: ../gramps/plugins/webreport/narrativeweb.py:9558
+#: ../gramps/plugins/webreport/narrativeweb.py:9830
+#: ../gramps/plugins/webreport/narrativeweb.py:9842
 msgid "Download Filename"
 msgstr "Ladattavan tiedoston nimi"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9549
-#: ../gramps/plugins/webreport/narrativeweb.py:9561
+#: ../gramps/plugins/webreport/narrativeweb.py:9833
+#: ../gramps/plugins/webreport/narrativeweb.py:9845
 msgid "File to be used for downloading of database"
 msgstr "Tietokannan imuroinnissa käytettävä tiedosto"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9552
-#: ../gramps/plugins/webreport/narrativeweb.py:9564
+#: ../gramps/plugins/webreport/narrativeweb.py:9836
+#: ../gramps/plugins/webreport/narrativeweb.py:9848
 msgid "Description for download"
 msgstr "Latauksen kuvaus"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9553
+#: ../gramps/plugins/webreport/narrativeweb.py:9837
 msgid "Smith Family Tree"
 msgstr "Smith Sukupuu"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9554
-#: ../gramps/plugins/webreport/narrativeweb.py:9566
+#: ../gramps/plugins/webreport/narrativeweb.py:9838
+#: ../gramps/plugins/webreport/narrativeweb.py:9850
 msgid "Give a description for this file."
 msgstr "Annan tälle tiedostolle kuvaus."
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9565
+#: ../gramps/plugins/webreport/narrativeweb.py:9849
 msgid "Johnson Family Tree"
 msgstr "Johnson Sukupuu"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9575
-#: ../gramps/plugins/webreport/webcal.py:1801
+#: ../gramps/plugins/webreport/narrativeweb.py:9859
+#: ../gramps/plugins/webreport/webcal.py:1816
 msgid "Advanced Options"
 msgstr "Paperiasetukset"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9578
-#: ../gramps/plugins/webreport/webcal.py:1803
+#: ../gramps/plugins/webreport/narrativeweb.py:9862
+#: ../gramps/plugins/webreport/webcal.py:1818
 msgid "Character set encoding"
 msgstr "Merkistön koodaus"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9582
-#: ../gramps/plugins/webreport/webcal.py:1807
+#: ../gramps/plugins/webreport/narrativeweb.py:9866
+#: ../gramps/plugins/webreport/webcal.py:1822
 msgid "The encoding to be used for the web files"
 msgstr "Nettisivuilla käytettävä merkistökoodaus"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9586
+#: ../gramps/plugins/webreport/narrativeweb.py:9870
 msgid "Include link to active person on every page"
 msgstr "Lisää linkki kotihenkilöön jokaiselle sivulle"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9588
+#: ../gramps/plugins/webreport/narrativeweb.py:9872
 msgid "Include a link to the active person (if they have a webpage)"
 msgstr ""
 "Lisää linkki kotihenkilöön jokaiselle sivulle (jos heillä on nettisivu)"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9592
+#: ../gramps/plugins/webreport/narrativeweb.py:9876
 msgid "Include a column for birth dates on the index pages"
 msgstr "Lisää hakemistosivuille sarake syntymäajalle"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9593
+#: ../gramps/plugins/webreport/narrativeweb.py:9877
 msgid "Whether to include a birth column"
 msgstr "Lisätäänkö syntymäsarake"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9597
+#: ../gramps/plugins/webreport/narrativeweb.py:9881
 msgid "Include a column for death dates on the index pages"
 msgstr "Lisää hakemistosivuille sarake kuolinajalle"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9598
+#: ../gramps/plugins/webreport/narrativeweb.py:9882
 msgid "Whether to include a death column"
 msgstr "Lisätäänkö kuolinsarake"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9601
+#: ../gramps/plugins/webreport/narrativeweb.py:9885
 msgid "Include a column for partners on the index pages"
 msgstr "Lisää hakemistosivuille sarake kumppaneista"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9603
+#: ../gramps/plugins/webreport/narrativeweb.py:9887
 msgid "Whether to include a partners column"
 msgstr "Lisätäänkö kumppanisarake"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9606
+#: ../gramps/plugins/webreport/narrativeweb.py:9890
 msgid "Include a column for parents on the index pages"
 msgstr "Lisää hakemistosivuille sarake vanhemmista"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9608
+#: ../gramps/plugins/webreport/narrativeweb.py:9892
 msgid "Whether to include a parents column"
 msgstr "Lisätäänkö vanhemmat sarake"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9612
+#: ../gramps/plugins/webreport/narrativeweb.py:9896
 msgid "Include half and/ or step-siblings on the individual pages"
 msgstr "Lisää hakemistosivuille sarake sisaruspuolille"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9615
+#: ../gramps/plugins/webreport/narrativeweb.py:9899
 msgid ""
 "Whether to include half and/ or step-siblings with the parents and siblings"
 msgstr ""
 "Lisätäänkö hakemistosivuille sarake sisaruspuolille, vanhempineen ja "
 "sisaruksineen"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9620
+#: ../gramps/plugins/webreport/narrativeweb.py:9904
 msgid "Sort all children in birth order"
 msgstr "Lajittele kaikki lapset syntymäjärjestykseen"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9622
+#: ../gramps/plugins/webreport/narrativeweb.py:9906
 msgid "Whether to display children in birth order or in entry order?"
 msgstr "Näytetäänkö lapset syntymä- tai syöttöjärjestyksessä?"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9625
+#: ../gramps/plugins/webreport/narrativeweb.py:9909
 msgid "Include family pages"
 msgstr "Lisää perhesivut"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9626
+#: ../gramps/plugins/webreport/narrativeweb.py:9910
 msgid "Whether or not to include family pages."
 msgstr "Lisätäänkö perhesivut."
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9629
+#: ../gramps/plugins/webreport/narrativeweb.py:9913
 msgid "Include event pages"
 msgstr "Lisää tapahtumasivut"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9631
+#: ../gramps/plugins/webreport/narrativeweb.py:9915
 msgid "Add a complete events list and relevant pages or not"
 msgstr "Lisätäänkö täydellinen tapahtumalista ja ao. sivut vai ei"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9634
+#: ../gramps/plugins/webreport/narrativeweb.py:9918
 msgid "Include repository pages"
 msgstr "Lisää arkistosivut"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9636
+#: ../gramps/plugins/webreport/narrativeweb.py:9920
 msgid "Whether or not to include the Repository Pages."
 msgstr "Lisätäänkö arkistosivut"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9640
+#: ../gramps/plugins/webreport/narrativeweb.py:9924
 msgid "Include GENDEX file (/gendex.txt)"
 msgstr "Ota mukaan GENDEX tiedosto (/gendex.txt)"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9641
+#: ../gramps/plugins/webreport/narrativeweb.py:9925
 msgid "Whether to include a GENDEX file or not"
 msgstr "Lisätäänkö GENDEX tiedosto vai ei"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9644
+#: ../gramps/plugins/webreport/narrativeweb.py:9928
 msgid "Include address book pages"
 msgstr "Lisää osoitekirjan sivut"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9645
+#: ../gramps/plugins/webreport/narrativeweb.py:9929
 msgid ""
 "Whether or not to add Address Book pages,which can include e-mail and "
 "website addresses and personal address/ residence events."
@@ -35598,28 +35688,28 @@ msgstr ""
 "Otetaanko mukaan osoitekirjan sivut, jotka voivat sisältää sähköposti- ja "
 "nettiosoitteet sekä henkilökohtaiset osoite/asuinpaikka tapahtumat."
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9655
+#: ../gramps/plugins/webreport/narrativeweb.py:9939
 msgid "Place Map Options"
 msgstr "Paikkakarttojen valinnat"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9659
+#: ../gramps/plugins/webreport/narrativeweb.py:9943
 msgid "Google"
 msgstr "Google kartat"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9661
+#: ../gramps/plugins/webreport/narrativeweb.py:9945
 msgid "Map Service"
 msgstr "Karttapalvelu"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9665
+#: ../gramps/plugins/webreport/narrativeweb.py:9949
 msgid "Choose your choice of map service for creating the Place Map Pages."
 msgstr ""
 "Valitse karttapalvelu, jota haluat käyttää paikkakarttasivujen luonnissa"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9671
+#: ../gramps/plugins/webreport/narrativeweb.py:9955
 msgid "Include Place map on Place Pages"
 msgstr "Lisää paikkakartta paikkasivuille"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9673
+#: ../gramps/plugins/webreport/narrativeweb.py:9957
 msgid ""
 "Whether to include a place map on the Place Pages, where Latitude/ Longitude "
 "are available."
@@ -35627,11 +35717,11 @@ msgstr ""
 "Lisätäänkö mukaan paikkasivuille paikkakartta, jossa on leveys- ja "
 "pituuspiiritiedot."
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9678
+#: ../gramps/plugins/webreport/narrativeweb.py:9962
 msgid "Include Family Map Pages with all places shown on the map"
 msgstr "Ota mukaan perheen karttasivut joilla näytetään kartalla kaikki paikat"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9682
+#: ../gramps/plugins/webreport/narrativeweb.py:9966
 msgid ""
 "Whether or not to add an individual page map showing all the places on this "
 "page. This will allow you to see how your family traveled around the country."
@@ -35639,62 +35729,57 @@ msgstr ""
 "Lisätäänkö erillinen sivu karttaa varten. Siitä näkisi kuinka sukusi on "
 "liikkunut maassa ja maailmalla."
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9690
+#: ../gramps/plugins/webreport/narrativeweb.py:9974
 msgid "Family Links"
 msgstr "Perhelinja-kaavio"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9691
+#: ../gramps/plugins/webreport/narrativeweb.py:9975
 msgid "Drop"
 msgstr "Poista"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9692
+#: ../gramps/plugins/webreport/narrativeweb.py:9976
 msgid "Markers"
 msgstr "Markkerit"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9693
+#: ../gramps/plugins/webreport/narrativeweb.py:9977
 msgid "Google/ FamilyMap Option"
 msgstr "Google/Perhekartan valinnat"
 
-#: ../gramps/plugins/webreport/narrativeweb.py:9698
+#: ../gramps/plugins/webreport/narrativeweb.py:9982
 msgid ""
 "Select which option that you would like to have for the Google Maps Family "
 "Map pages..."
 msgstr "Valitse miten haluat GoogleMapin näyttävän perhekarttasi..."
 
-# uusi20160516
-#: ../gramps/plugins/webreport/narrativeweb.py:9708
+#: ../gramps/plugins/webreport/narrativeweb.py:9992
 msgid "Other inclusion (CMS, Web Calendar, Php)"
 msgstr "Muut mukaan otettavat (CMS, Web Calendar, Php)"
 
-# uusi
-#: ../gramps/plugins/webreport/narrativeweb.py:9712
+#: ../gramps/plugins/webreport/narrativeweb.py:9996
 msgid "Do we include these pages in a cms web ?"
 msgstr "Lisätäänkö nämä sivut cms nettiin ?"
 
 # lähdetekstiä muutettu
-#: ../gramps/plugins/webreport/narrativeweb.py:9716
-#: ../gramps/plugins/webreport/narrativeweb.py:9733
+#: ../gramps/plugins/webreport/narrativeweb.py:10000
+#: ../gramps/plugins/webreport/narrativeweb.py:10017
 msgid "URI"
 msgstr "URI-tunnus"
 
-# uusi
-#: ../gramps/plugins/webreport/narrativeweb.py:9722
+#: ../gramps/plugins/webreport/narrativeweb.py:10006
 msgid "Where do you place your web site ? default = /NAVWEB"
 msgstr "Minne haluat tallentaa nettisivusi? oletus = /NAVWEB"
 
-# uusi/muutettu20160516
-#: ../gramps/plugins/webreport/narrativeweb.py:9729
+#: ../gramps/plugins/webreport/narrativeweb.py:10013
 msgid "Do we include the web calendar ?"
 msgstr "Lisätäänkö web-kalenteri?"
 
-# uusi/muutettu20160516
-#: ../gramps/plugins/webreport/narrativeweb.py:9739
+#: ../gramps/plugins/webreport/narrativeweb.py:10023
 msgid "Where do you place your web site ? default = /WEBCAL"
 msgstr "Minne haluat tallentaa nettisivusi? oletus = /WEBCAL"
 
 #. adding title to hyperlink menu for screen readers and
 #. braille writers
-#: ../gramps/plugins/webreport/narrativeweb.py:10219
+#: ../gramps/plugins/webreport/narrativeweb.py:10508
 #, python-format
 msgid "Alphabet Menu: %s"
 msgstr "Aakkosmenu: %s"
@@ -35703,20 +35788,20 @@ msgstr "Aakkosmenu: %s"
 #. Number of directory levels up to get to self.html_dir / root
 #. Number of directory levels up to get to root
 #. generate progress pass for "Year At A Glance"
-#: ../gramps/plugins/webreport/webcal.py:324
-#: ../gramps/plugins/webreport/webcal.py:955
-#: ../gramps/plugins/webreport/webcal.py:1040
-#: ../gramps/plugins/webreport/webcal.py:1256
-#: ../gramps/plugins/webreport/webcal.py:1261
+#: ../gramps/plugins/webreport/webcal.py:327
+#: ../gramps/plugins/webreport/webcal.py:964
+#: ../gramps/plugins/webreport/webcal.py:1049
+#: ../gramps/plugins/webreport/webcal.py:1268
+#: ../gramps/plugins/webreport/webcal.py:1273
 msgid "Web Calendar Report"
 msgstr "Nettikalenteriraportti"
 
-#: ../gramps/plugins/webreport/webcal.py:325
+#: ../gramps/plugins/webreport/webcal.py:328
 #, python-format
 msgid "Calculating Holidays for year %04d"
 msgstr "Laskee juhlapyhiä vuodeksi %04d"
 
-#: ../gramps/plugins/webreport/webcal.py:481
+#: ../gramps/plugins/webreport/webcal.py:485
 #, python-format
 msgid ""
 "the \"WebCal\" will be the potential-email Subject|Created for "
@@ -35725,39 +35810,39 @@ msgstr ""
 "\"Nettikalenteri\" on mahdollinen sähköpostin aihe | Tuottaja "
 "%(html_email_author_start)sWebCal%(html_email_author_end)s"
 
-#: ../gramps/plugins/webreport/webcal.py:489
+#: ../gramps/plugins/webreport/webcal.py:493
 #, python-format
 msgid "Created for %(author)s"
 msgstr "Luodaan %(author)s"
 
 #. Add a link for year_glance() if requested
-#: ../gramps/plugins/webreport/webcal.py:567
+#: ../gramps/plugins/webreport/webcal.py:574
 msgid "Year Glance"
 msgstr "Vuosinäkymä"
 
-#: ../gramps/plugins/webreport/webcal.py:605
+#: ../gramps/plugins/webreport/webcal.py:612
 msgid "NarrativeWeb Home"
 msgstr "Kertovan nettisivuston kotisivu"
 
-#: ../gramps/plugins/webreport/webcal.py:607
+#: ../gramps/plugins/webreport/webcal.py:614
 msgid "Full year at a Glance"
 msgstr "Koko vuoden näkymä"
 
-#: ../gramps/plugins/webreport/webcal.py:956
+#: ../gramps/plugins/webreport/webcal.py:965
 msgid "Formatting months ..."
 msgstr "Muotoillaan kuukausia..."
 
-#: ../gramps/plugins/webreport/webcal.py:1041
+#: ../gramps/plugins/webreport/webcal.py:1050
 msgid "Creating Year At A Glance calendar"
 msgstr "Luodaan vuosikalenteria"
 
 #. page title
-#: ../gramps/plugins/webreport/webcal.py:1046
+#: ../gramps/plugins/webreport/webcal.py:1055
 #, python-format
 msgid "%(year)d, At A Glance"
 msgstr "Vuosikalenteri %(year)d"
 
-#: ../gramps/plugins/webreport/webcal.py:1061
+#: ../gramps/plugins/webreport/webcal.py:1070
 msgid ""
 "This calendar is meant to give you access to all your data at a glance "
 "compressed into one page. Clicking on a date will take you to a page that "
@@ -35767,218 +35852,217 @@ msgstr ""
 "päivää näet päivän tapahtumat erillisellä sivulla, jos tapahtumia on.\n"
 
 #. page title
-#: ../gramps/plugins/webreport/webcal.py:1114
+#: ../gramps/plugins/webreport/webcal.py:1123
 msgid "One Day Within A Year"
 msgstr "Yksi päivä vuodessa"
 
-#: ../gramps/plugins/webreport/webcal.py:1412
+#: ../gramps/plugins/webreport/webcal.py:1427
 #, python-format
 msgid "%(spouse)s and %(person)s"
 msgstr "%(spouse)s ja %(person)s"
 
 #. Display date as user set in preferences
-#: ../gramps/plugins/webreport/webcal.py:1432
+#: ../gramps/plugins/webreport/webcal.py:1447
 #, python-format
 msgid "Generated by %(gramps_home_html_start)sGramps%(html_end)s on %(date)s"
 msgstr ""
 "Tuotettu %(gramps_home_html_start)s Gramps%(html_end)s ohjelmalla %(date)s"
 
 #. page title
-#: ../gramps/plugins/webreport/webcal.py:1538
-#: ../gramps/plugins/webreport/webcal.py:1602
+#: ../gramps/plugins/webreport/webcal.py:1553
+#: ../gramps/plugins/webreport/webcal.py:1617
 msgid "My Family Calendar"
 msgstr "Sukukalenterini"
 
-#: ../gramps/plugins/webreport/webcal.py:1602
+#: ../gramps/plugins/webreport/webcal.py:1617
 msgid "Calendar Title"
 msgstr "Kalenteriotsikko"
 
-#: ../gramps/plugins/webreport/webcal.py:1603
+#: ../gramps/plugins/webreport/webcal.py:1618
 msgid "The title of the calendar"
 msgstr "Kalenterin otsikko"
 
-#: ../gramps/plugins/webreport/webcal.py:1671
+#: ../gramps/plugins/webreport/webcal.py:1687
 msgid "Create multiple year calendars"
 msgstr "Luo kalenteri useammalle vuodelle"
 
-#: ../gramps/plugins/webreport/webcal.py:1673
+#: ../gramps/plugins/webreport/webcal.py:1689
 msgid "Whether to create Multiple year calendars or not."
 msgstr "Luodaanko kalenteri useammalle vuodelle vai ei."
 
-#: ../gramps/plugins/webreport/webcal.py:1678
+#: ../gramps/plugins/webreport/webcal.py:1694
 msgid "Start Year for the Calendar(s)"
 msgstr "Kalenterien aloitusvuosi"
 
-#: ../gramps/plugins/webreport/webcal.py:1680
+#: ../gramps/plugins/webreport/webcal.py:1696
 msgid "Enter the starting year for the calendars between 1900 - 3000"
 msgstr "Syötä aloitusvuosi kalenteriin väliltä 1900-3000"
 
-#: ../gramps/plugins/webreport/webcal.py:1684
+#: ../gramps/plugins/webreport/webcal.py:1700
 msgid "End Year for the Calendar(s)"
 msgstr "Kalenterien päättymisvuosi"
 
-#: ../gramps/plugins/webreport/webcal.py:1686
+#: ../gramps/plugins/webreport/webcal.py:1702
 msgid "Enter the ending year for the calendars between 1900 - 3000."
 msgstr "Syötä päättymisvuosi kalenteriin väliltä 1900-3000."
 
-#: ../gramps/plugins/webreport/webcal.py:1703
+#: ../gramps/plugins/webreport/webcal.py:1719
 msgid "Holidays will be included for the selected country"
 msgstr "Lisää valitun valtion juhlapyhät"
 
-#: ../gramps/plugins/webreport/webcal.py:1727
+#: ../gramps/plugins/webreport/webcal.py:1742
 msgid "Home link"
 msgstr "Kotisivu-linkki"
 
-#: ../gramps/plugins/webreport/webcal.py:1728
+#: ../gramps/plugins/webreport/webcal.py:1743
 msgid ""
 "The link to be included to direct the user to the main page of the web site"
 msgstr "Lisätäänkö linkki, joka ohjaa käyttäjän nettisivuston pääsivulle"
 
-#: ../gramps/plugins/webreport/webcal.py:1744
+#: ../gramps/plugins/webreport/webcal.py:1759
 msgid "Jan - Jun Notes"
 msgstr "Tammi-kesäkuun tiedot"
 
-#: ../gramps/plugins/webreport/webcal.py:1746
+#: ../gramps/plugins/webreport/webcal.py:1761
 msgid "January Note"
 msgstr "Tammikuun tiedot"
 
-#: ../gramps/plugins/webreport/webcal.py:1747
+#: ../gramps/plugins/webreport/webcal.py:1762
 msgid "The note for the month of January"
 msgstr "Lisätiedot tammikuulle"
 
-#: ../gramps/plugins/webreport/webcal.py:1750
+#: ../gramps/plugins/webreport/webcal.py:1765
 msgid "February Note"
 msgstr "Helmikuun tiedot"
 
-#: ../gramps/plugins/webreport/webcal.py:1751
+#: ../gramps/plugins/webreport/webcal.py:1766
 msgid "The note for the month of February"
 msgstr "Lisätiedot helmikuulle"
 
-#: ../gramps/plugins/webreport/webcal.py:1754
+#: ../gramps/plugins/webreport/webcal.py:1769
 msgid "March Note"
 msgstr "Maaliskuun tiedot"
 
-#: ../gramps/plugins/webreport/webcal.py:1755
+#: ../gramps/plugins/webreport/webcal.py:1770
 msgid "The note for the month of March"
 msgstr "Lisätiedot maaliskuulle"
 
-#: ../gramps/plugins/webreport/webcal.py:1758
+#: ../gramps/plugins/webreport/webcal.py:1773
 msgid "April Note"
 msgstr "Huhtikuun tiedot"
 
-#: ../gramps/plugins/webreport/webcal.py:1759
+#: ../gramps/plugins/webreport/webcal.py:1774
 msgid "The note for the month of April"
 msgstr "Lisätiedot huhtikuulle"
 
-#: ../gramps/plugins/webreport/webcal.py:1762
+#: ../gramps/plugins/webreport/webcal.py:1777
 msgid "May Note"
 msgstr "Toukokuun tiedot"
 
-#: ../gramps/plugins/webreport/webcal.py:1763
+#: ../gramps/plugins/webreport/webcal.py:1778
 msgid "The note for the month of May"
 msgstr "Lisätiedot toukokuulle"
 
-#: ../gramps/plugins/webreport/webcal.py:1766
+#: ../gramps/plugins/webreport/webcal.py:1781
 msgid "June Note"
 msgstr "Kesäkuun tiedot"
 
-#: ../gramps/plugins/webreport/webcal.py:1767
+#: ../gramps/plugins/webreport/webcal.py:1782
 msgid "The note for the month of June"
 msgstr "Lisätiedot kesäkuulle"
 
-#: ../gramps/plugins/webreport/webcal.py:1770
+#: ../gramps/plugins/webreport/webcal.py:1785
 msgid "Jul - Dec Notes"
 msgstr "Heinä- joulukuun tiedot"
 
-#: ../gramps/plugins/webreport/webcal.py:1772
+#: ../gramps/plugins/webreport/webcal.py:1787
 msgid "July Note"
 msgstr "Heinäkuun tiedot"
 
-#: ../gramps/plugins/webreport/webcal.py:1773
+#: ../gramps/plugins/webreport/webcal.py:1788
 msgid "The note for the month of July"
 msgstr "Heinäkuun lisätiedot"
 
-#: ../gramps/plugins/webreport/webcal.py:1776
+#: ../gramps/plugins/webreport/webcal.py:1791
 msgid "August Note"
 msgstr "Elokuun tiedot"
 
-#: ../gramps/plugins/webreport/webcal.py:1777
+#: ../gramps/plugins/webreport/webcal.py:1792
 msgid "The note for the month of August"
 msgstr "Elokuun lisätiedot"
 
-#: ../gramps/plugins/webreport/webcal.py:1780
+#: ../gramps/plugins/webreport/webcal.py:1795
 msgid "September Note"
 msgstr "Syyskuun tiedot"
 
-#: ../gramps/plugins/webreport/webcal.py:1781
+#: ../gramps/plugins/webreport/webcal.py:1796
 msgid "The note for the month of September"
 msgstr "Syyskuun lisätiedot"
 
-#: ../gramps/plugins/webreport/webcal.py:1784
+#: ../gramps/plugins/webreport/webcal.py:1799
 msgid "October Note"
 msgstr "Lokakuun tiedot"
 
-#: ../gramps/plugins/webreport/webcal.py:1785
+#: ../gramps/plugins/webreport/webcal.py:1800
 msgid "The note for the month of October"
 msgstr "Lokakuun lisätiedot"
 
-#: ../gramps/plugins/webreport/webcal.py:1788
+#: ../gramps/plugins/webreport/webcal.py:1803
 msgid "November Note"
 msgstr "Marraskuun tiedot"
 
-#: ../gramps/plugins/webreport/webcal.py:1789
+#: ../gramps/plugins/webreport/webcal.py:1804
 msgid "The note for the month of November"
 msgstr "Marraskuun lisätiedot"
 
-#: ../gramps/plugins/webreport/webcal.py:1792
+#: ../gramps/plugins/webreport/webcal.py:1807
 msgid "December Note"
 msgstr "Joulukuun tiedot"
 
-#: ../gramps/plugins/webreport/webcal.py:1793
+#: ../gramps/plugins/webreport/webcal.py:1808
 msgid "The note for the month of December"
 msgstr "Joulukuun lisätiedot"
 
-#: ../gramps/plugins/webreport/webcal.py:1810
+#: ../gramps/plugins/webreport/webcal.py:1825
 msgid "Create one day event pages for Year At A Glance calendar"
 msgstr "Luodaan päiväsivut vuosikalenteriin"
 
-#: ../gramps/plugins/webreport/webcal.py:1812
+#: ../gramps/plugins/webreport/webcal.py:1827
 msgid "Whether to create one day pages or not"
 msgstr "Luodaanko päiväsivut vai ei."
 
-#: ../gramps/plugins/webreport/webcal.py:1815
+#: ../gramps/plugins/webreport/webcal.py:1830
 msgid "Link to Narrated Web Report"
 msgstr "Linkki Kertova-nettisivusto raporttiin"
 
-#: ../gramps/plugins/webreport/webcal.py:1816
+#: ../gramps/plugins/webreport/webcal.py:1831
 msgid "Whether to link data to web report or not"
 msgstr "Linkittäänkö tiedot Kertova-nettisivusto raporttiin vai ei"
 
-#: ../gramps/plugins/webreport/webcal.py:1822
+#: ../gramps/plugins/webreport/webcal.py:1837
 msgid "Link prefix"
 msgstr "Linkin etuliite"
 
-#: ../gramps/plugins/webreport/webcal.py:1823
+#: ../gramps/plugins/webreport/webcal.py:1838
 msgid "A Prefix on the links to take you to Narrated Web Report"
 msgstr "Etuliite linkeissä joilla siirryt Kertova-nettisivusto raporttiin"
 
-#: ../gramps/plugins/webreport/webcal.py:1990
+#: ../gramps/plugins/webreport/webcal.py:2009
 #, python-format
 msgid "%s old"
 msgstr "%s vanha"
 
-#: ../gramps/plugins/webreport/webcal.py:1999
+#: ../gramps/plugins/webreport/webcal.py:2018
 #, python-format
 msgid "%(couple)s, <em>wedding</em>"
 msgstr "%(couple)s, <em>häät</em>"
 
 # lähdetekstiä muutettu
-#: ../gramps/plugins/webreport/webcal.py:2007
+#: ../gramps/plugins/webreport/webcal.py:2026
 msgid "Until"
 msgstr "Saakka"
 
-#. translators: leave all/any {...} untranslated
-#: ../gramps/plugins/webreport/webcal.py:2015
+#: ../gramps/plugins/webreport/webcal.py:2035
 #, python-brace-format
 msgid "{couple}, {years} year anniversary"
 msgid_plural "{couple}, {years} year anniversary"
@@ -36010,45 +36094,48 @@ msgstr "Tarjoaa joukon nettiaineistoja"
 #. "default" is used as default
 #. default style sheet in the options
 #. Basic Ash style sheet
-#: ../gramps/plugins/webstuff/webstuff.py:59
+#: ../gramps/plugins/webstuff/webstuff.py:60
 msgid "Basic-Ash"
 msgstr "Perustyyli - Saarni"
 
 #. Basic Cypress style sheet
-#: ../gramps/plugins/webstuff/webstuff.py:67
+#: ../gramps/plugins/webstuff/webstuff.py:68
 msgid "Basic-Cypress"
 msgstr "Perustyyli - Sypressi"
 
 #. basic Lilac style sheet
-#: ../gramps/plugins/webstuff/webstuff.py:71
+#: ../gramps/plugins/webstuff/webstuff.py:72
 msgid "Basic-Lilac"
 msgstr "Perustyyli - Syreeni"
 
 #. basic Peach style sheet
-#: ../gramps/plugins/webstuff/webstuff.py:75
+#: ../gramps/plugins/webstuff/webstuff.py:76
 msgid "Basic-Peach"
 msgstr "Perustyyli - Persikka"
 
 #. basic Spruce style sheet
-#: ../gramps/plugins/webstuff/webstuff.py:79
+#: ../gramps/plugins/webstuff/webstuff.py:80
 msgid "Basic-Spruce"
 msgstr "Perustyyli - Kuusi"
 
 #. Mainz style sheet with its images
-#: ../gramps/plugins/webstuff/webstuff.py:83
+#: ../gramps/plugins/webstuff/webstuff.py:84
 msgid "Mainz"
 msgstr "Mainz"
 
 #. Nebraska style sheet
-#: ../gramps/plugins/webstuff/webstuff.py:91
+#: ../gramps/plugins/webstuff/webstuff.py:92
 msgid "Nebraska"
 msgstr "Nebraska"
 
 #. no style sheet option
-#: ../gramps/plugins/webstuff/webstuff.py:152
+#: ../gramps/plugins/webstuff/webstuff.py:153
 msgid "No style sheet"
 msgstr "Ei tyylitiedostoa"
 
+#~ msgid "Gramps&nbsp;ID"
+#~ msgstr "Gramps&nbsp;ID"
+
 #~ msgid "Form omitted"
 #~ msgstr "Muoto ohitettu"